Commit Graph

1102 Commits

Author SHA1 Message Date
Alexander Bock
1f30719470 Add new NOAA21 asset, add end time for VIIRS asset and make the NOAA20 the new default layer 2024-06-04 16:55:05 +02:00
Alexander Bock
32867630cc Add an explicit layer order to globebrowsing layers rather than relying on insertion order (#3281)
* Add z-index feature for layers
* Give all default layers a z-index
* The given z-index makes the layers have the same order as in 0.19.0
* Giving z-indices to all non-overlay layers
* Remove the z-index adjustment for manual layers
* Added zIndex parsing for .info files (#3298)
* No need to explicitly check the zIndex against an empty string.  Make similar check for identifier work correctly

---------

Co-authored-by: Malin E <malin.ejdbo@gmail.com>
Co-authored-by: Micah Acinapura <micahnyc@gmail.com>
2024-06-04 16:29:33 +02:00
Gene Payne
2f280ed582 Update sssb data (#3291) 2024-06-03 09:29:06 -06:00
Alexander Bock
be6c3f801e Rename Glare->Core and Halo->Glare in RenderableStars 2024-05-24 18:41:04 +02:00
Alexander Bock
4f647d5085 Move Spout-based layer for Earth to examples folder 2024-05-23 21:42:15 +02:00
Alexander Bock
9828b96930 Add additional tags to minor moons, trails, and labels of Jupiter and Saturn (closes #3272) 2024-05-22 17:00:46 +02:00
Malin E
997d809ef7 Update Voyager Model to not be in parts and remove extra box (#3035)
* Update Voyager model to not be in parts
* Add asset meta information for voyager spacecrafts
2024-05-20 10:57:00 +02:00
Emma Broman
eb1cfec7bd Renderable property info walkthrough/cleanup (#3226)
A passover of all the Parameters descriptions and PropertyInfo descriptions of the renderables in the code base to make then more consistently and concisely formatted. Also fixed some small issues and added or updated descriptions.

* Start rephrasing propertyinfos for more consistency

* Update eclipse cone propertyinfos

* Update `RenderableFov` property infos and group colors in UI

* `RenderableGalaxy` and `RenderableGlobe`

* Update more descriptions

* Moore descriptions

* Update docs for `RenderableShadowCylinder` and add properties

* `RenderableSkyTarget`, and spheres (`ImageOnline` and `ImageLocal`)

* `RnederableSphericalGrid`, and update line width info of other types, for consistency

* `RenderableStars` and `RenderableTimeVaryingSphere`

* Update more propertyinfos

* Fix inconsistent mentioning of true/false

* change some phrasings for increased consistency

* Update Renderbin description to include Sticker bin and remove extra property

* Rename `OutlineWeight` -> `OutlineWidth`

* Extend description about enable depth test for models

* Clarify what relative values mean for `RenderableNodeArrow`

* Elaborate on `RenderableLabel` size property

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
Co-authored-by: Malin E <malin.ejdbo@gmail.com>
2024-05-20 09:24:40 +02:00
ElonOlsson
cd02ff73d1 Update density_volume.asset to use correct transferfunction 2024-05-07 14:30:35 -04:00
Ylva Selling
7757ec7976 Merge pull request #3212 from OpenSpace/issue/2996
Issue/2996 - documentation engine rewrite
2024-04-30 16:11:13 +02:00
Ylva Selling
c79de65486 Update data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera.asset
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-04-30 16:10:33 +02:00
Emma Broman
e6a8207dfe Update MIlkyway speck data version (closes #3196)
The cached data files may have to be removed for the change to take effect (at least until #3154 is fixed)
2024-04-25 16:14:59 +02:00
Adam Rohdin
392a521423 Fix for a lot of trail related stuff (#3193)
Fixes following issues: #625 , #1067 , #1212 , #1472 , #2072 , #2235, #2964
- Trails in `renderableTrailTrajectory` now goes through the spacecraft when using `AccurateTrailPositions`.
- Trail fading controls have been improved for classes using the `renderableTrail` class.
-  `renderableOrbitalKepler` (asteroids/satellites) can now be rendered as both trails and points (or both at once). Solution implements similar functionality/controls as `renderablePointCloud`.
- Default setting for SweepChunking has been changed from `true` to `false` (iterative calculations of `renderableTrailTrajectory`).
- Some fixes related to missing points or off-by-one errors related to trail rendering
2024-04-19 16:51:17 +02:00
Micah Acinapura
9f51549a2a Issue/2518 epicycle (#3195)
* added epicycle asset; updated trailFromEarth period and colors; added FromEarth trails to trail toggle;

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-04-19 13:11:32 +02:00
Alexander Bock
4476184746 Updating the star rendering (#3164)
* Adding a new star renderer
* Remove PSF-based rendering
2024-04-18 14:13:19 +02:00
Emma Broman
82ddbc57f8 Include orientation data in new point cloud and remove RenderablePlanesCloud (#3168)
* WIP start including rotation data

* Fix option to use orientation data or not

* Renames to reflect that points are no longer billboarded (at least not always)

* Increase max value for scale factor

* Fix correct scaling for tully and deep sky objects

* Remove the old RenderablePlanesCloud, we don't need it anymore

* Add unit handling for size scaling from data values

* Clarify some documentation about the points being rendered as planes

* Update datasets to the new ones on the server

* Use quaternions for orientation instead of vectors (simplifies interpolation and requires less data)

* Make interpolation of orientation work

* Fix size for deep sky objects being too small due to data being radius rather than diameter

* Add IsRadius flag for deepsky

* Update asset versions (major number update, due to breaking changes)

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-04-18 14:06:55 +02:00
Micah Acinapura
41143d8483 Added asset showing only the Big Dipper (#3157)
* added big dipper only asset

* code review updates
2024-04-16 08:29:20 +02:00
Andreas Engberg
cd30d5f1d3 Fixed broken asset 2024-04-09 16:05:02 +02:00
Ylva Selling
22c00f2437 Clean up typos and duplicates in documentation 2024-04-08 13:45:01 +02:00
Alexander Bock
51c26454f7 Fix Euclid asset (closes #3165) 2024-04-07 17:11:08 +02:00
Emma Broman
2af06fb641 Add asset setting to skip first data point in RenderablePointCloud (#3161)
* Add asset setting to skip first data point

To hide our galaxy in the Tully datasets

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-04-05 14:20:11 +02:00
Emma Broman
3f8bff5a62 General performance improvements (#3142)
* Adding some Tracy zones
* Move point cloud dataset loading to initialize function to speed up startup 
* Switch order of operations in memoryaware tile cache to speed up startup
* Move point cloud dataset loading to initialize function
* Add more Zone Scoped and rearrange SDSS loading
* More speed up

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2024-03-28 01:10:07 +01:00
Alexander Bock
892a474a20 Move Sun light source specification from sun.asset to transforms.asset 2024-03-26 01:12:56 +01:00
Alexander Bock
024d457cc9 Remove end time from JWST (closes #3135) 2024-03-24 23:09:30 +01:00
Emma Broman
99ae87bd03 Remove comment about faulty color mapping that is no longer an issue (#2983) 2024-03-20 11:38:34 +01:00
Emma Broman
f36868d1c4 Feature/textured points (#3068)
* WIP: Start usign texture arrays instead of just a single texture

Now the texture array is sucessfully created, sent over and sampled on the GPU

* Include information about the texture format alpha channel and do a conversion

* Make one draw wcall per texture array

* Add scale to size mapping and move to a separate component

* WIP: Make single textures work again, with texture array

Although this breaks the polygon cloud..

* Also make the polygon cloud work again

* Refactor rendering code

* handle array layer seprately from texture coordinates

* Make sure use size mapping uniform is always set

Fixes point cloud disappearing when multi-textures points are enabled

* Add has value check to size mapping

* Fix indentation

* Make sure points are rendered even when no texture is used

* Clean up texture handling a bit and add comment about storage creation

* Add comment and temporary asset changes

* Clean up handling of color mode (number of colro channels)

* Make interpolated points work with new rendering code

* Refactor

* Bring back check for valid index for color and size data

* Make sure to check if the provided data file exists

* Fix full path ont showing in error message

* Refactor rendering code a bit

* Change how the multitexture setup is configured in the asset and add documentation

Separating made documentation a lot easier..

* Add a todo comment for future discussion

* Add settings for texture compression

* Preserve aspects ratio of rendered textures

* Restructure input parameters for texture details

* Simplify color mode - we decided to not support grayscale

* Add option to set "useAlpha" from asset

* Enable texture per default and fix aspect ratio problem when no texture is used

* tiny refactor

* Fix polygon rendering that broke when adding texture compression

* Remove color in polygon shader

The color would be applied twice in rendering

* Restructure textures code and prevent loading the same texture twice

* Better handling of extra texture parameter in speck files

That does not lead to limitations in using dashes in texture names

* Add some docs and communicate texture mode to the user

* Fix so that single texture can be changed during runtime

* Allow changing compression and usealpha during runtime

* Update texture storage allocation to something that works in older OpenGL versions

* Add a check that checks if we use more texture layers than allowed

* Even more robust check of texture line in speck file (allow extra whitespaces)

* Update data mapping to include texture information and clean up code a bit

* Error handling and prevent loading non-used textures in texture map

* Update some docs

* Small cleanup

* Add one more error message for fault texture map file format

* Remove test version of tully images dataset

* Small refactor

* Add example asset

* Update Ghoul - for larger uniform cache

* Purge texture from ram when we're done with it

* Cleanup (comments, ugly png check, etc)

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Apply suggestions from code review

* Adress some more review comments and fix broken asset

* More code review fixes

* Read provided sizemapping parameter from asset

* Fix warnings from trying to shift 16 bit int 32 bits :)

* simplify datamapping hash string

* Update comment that was not 100% correct. The file names may be specified as relative paths to a folder

* Small update based on previous code review comments

* Fix multi textured points gui path not same as other points

* Update Folder description to reduce some confusion

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

* Prevent updates to polygon cloud texture during runtime

This lead to rendering problems.

* Add describing comments to data files

* Clarify why speck version is disabled per default

* Update and clarify confusing size mapping parameters

* Apply suggestions from code review

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>

* Apply suggestions from code review

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
2024-03-19 13:17:25 +01:00
Alexander Bock
6c89de373a Add the ability to convert TLE files to SPICE kernels and apply change to ISS (#3073)
* Fix orientation of ISS with dynamic frame kernel
2024-03-17 00:59:36 +01:00
Alexander Bock
0d96df01b0 Add map layer to show the last 5000 years of eclipses (#3069)
Add new asset showing 5000 years of eclipses from the Scientific Visualization Studio
2024-03-06 10:07:50 +01:00
Alexander Bock
187808f84e Add the Tiangong space station 2024-02-28 11:56:26 +01:00
Emma Broman
15429ddbc6 Fix wrong kernels being used for Neptune's inner moons
Copy paste error in kernel handling update
2024-02-20 15:47:35 +01:00
Joakim Kilby
be95530ce3 Update rotation source frame specification in apollo15.asset 2024-02-19 10:10:35 +01:00
Alexander Bock
232a0e016d Add ESA's Bepicolombo mission (#3000) 2024-01-18 14:02:55 +01:00
Emma Broman
54cf26755c Feature/point cloud scaling (#2994)
* Try using angular max size rather than max pixel size

* Update property name and use for shader

* Add docs and remove mention of angle from user's perspective

* People will wonder, so add some details as to what the value represents

* Fix inconsistent punctuation in property texts with multiple sentences

* Slight clarification of transformation matrix usage

* Add values to asset files

* Increase max size of example points a bit

* Remove/Update comment

* Add TODO comment about potential optimization

* Reduce max size of SDSS and quasars a bit

* Address review comment

* Decrease 6df and increase globular clusters size as per review comment

* Remove any mention of pixel size in the example asset

* Remove some more mentions of pixel size

* Write view space position to G-buffer  to prevent atm. from shining through points
2024-01-18 13:23:22 +01:00
Alexander Bock
15aaae3007 Spice kernel handling cleanup 2024-01-12 15:20:00 +01:00
Emma Broman
c165098cdc Point cloud rewrite (RIP RenderableBillboardsCloud) (#2932)
* Start refactoring billboardscloud renderable

* Remove extra unit computation in geometry shader

* More refactor and fix size parameter not working without colormap (it never did)

* Remove redundant bool in shader

* Divide settings into property owners

* Refactor colormap

* More refactoring (utilize properties for visiblity)

* Remove redundant extra data structures for options

* Move data logic to the colormap settings structure

* Remove confusing correction size properties

* Separate polygon cloud into its own renderable

* Clean up some unused code

* Update some property descriptions

* Split some more code out into functions

* Remove odd and unused "linear filtering"

Should be reimplemented ina better way in a general color map overhaul

* Start refactoring some more properties

* Make color optional and remove redundant color assignments in assets

* Refactor color-parameter input and make range mapping work correctly

* Code cleanup (unused code and fix data types)

* Rename ScaleFactor to ScaleExponent

* Add a scale factor as well, as they're easier to use, and clarify documentation

* Fix faultily renamed scale factors

* Remove confusing multiplication for scale exponent

* Fix problem with points not appearing when _drawElements was set to true

* Move all colormapsettings into its own table in the asset files

* Move scaling/sizing into its own table as well

* Group sizing properties and remove min pixel size limit (was always zero)

* Add some docs and rename a parameter to avoid repetition

* Remove IsExact colormap and add an option to hide outliers

OBS! Still need to update the actual cmap files

* Add property to disable size mapping

* Increase pixel size of polyon texture - reduces jagged edges

* Remove unused points class

* Rename files and billboard class, to make it clearer that it is a point cloud

* Move size mapping into size settings

* Move color map properties out into its own component

* Move color map related computations into the new component

* Add outlier colors, to cover some specific color mapping issues

* Automatically fill parameter options if no colormap parameters were defined

* Move all color-related parameters to under one property owner

* Inlcude changes from matrix maintenance

* Add a checkbox to disable additive blending

* Remove a unused variable in shader

* DO color maping on the graphics card instead of CPU, using a texture

* WIP remove old "Outliers" and start introducing concept of no data colors instead

* Move speck loader to core and divide into a general data loader and a speck specific loader (In preparation for adding CSV support)

* More labelscomponent to core

* Fix a faulty header

* Handle NaN values

* Rename color map component property owner

It's not just the color map, but the settings for the entire mapping

* Hide point with nan value is show missing data is not selected

* Fix labels component documentation after move

* Add option to not provide any texture, and use a sphere generated form the shader

* Don't crash when loading unsupported data formats :)

* Add some TODO comments that should be addressed before merge

* Move renderables from DU module to base, and do some header cleanup

* Move colormapping component to core ad rename it to make it clear that it is not the color map itself

* Add above, below and nan color values to cmap loading

* Remove missing Data value specs in asset (and use belowRange in cmap instead)

* Make warning about wrong color number more verbose

* Add TODO comment about colormap, and actually used color in prev version, to localdwarfs

* WIP: Load CSV files

* Update some property visbility

* Check if chosen parameter options actually exist

* Fix fault column check

* Update example asset to cover more different cases

* Use new asset.resource loading

* Update asset versions (major update)

* Add parent documentation for RenderablePolygonCloud

* Add point cloud example with size scaling and add TODO comment

* Add example with textured points

* Don't blend textured points

* Fix problem with shaders being confused about texture units

* Bring back deepsky points color

* Start implementing more sophisticated datamapping for point data files

* Allow reading datamapping from input dictionary

* Load dataset in constructor instead

Solves problem with color map columns not loading for big datasets when loaded the first time

* Fix crash from reading column value that is interpreted as inf

* Inlcude information about data mapping when caching dataset

Updating the parameters now leads to an updated caching of the data file

* Adapt to tolower update

* Add option to specify columns to exclude in load (for CSV files)

* Start updating some docs

* Add a readonly property that shows the number of data points

* Rename example asset to shorter name

* Add option for not using cache when loading dataset

* Fix some errors in example asset

* Set scaleExponent from max position if not specified

That way the points are always visible, even when no exponent is given

* Restructure and add explanations in example asset

* Add option to not cache labels component data file

* Add example file with labels and units

* Compute fade distances in model coordinates instead of world space (issue #1746)

* Add possiblity to invert fading and add exmaple asset

* Make a separate propertyowner for fading settings

* Update docs

* Add example asset with custom data mapping

* Address some of my own review comments

* Read provided Parameter from asset

* Read ValueRange from asset

* Add example asset for more advanced color mapping settings

* Allow using the same column for two position coordinate axes

* Update src/rendering/colormappingcomponent.cpp

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Update src/data/datamapping.cpp

* Use helper function for tolowercase

* Simplify some std::optional handling, and fix broken assignment from code review fix

* Update data file versions to get updated cmap files

* Include a progress bar to show progress of CSV data loading

* Update csv data-to-float parsing for clang

* Add a description about why `openspace.absPath` is used in the file instead of `asset.resource`

* Apply suggestions from code review

* Apply suggestions from code review

* Add some missing info in documentation

* Place size-related property descriptions next to each other

* Remove the explicitly set renderbin

* Fix overly complicated description

* Fix polygon texture not being used

* Add polygon cloud example

* only bind texture and activate texture unit when required

* Rename alpha to opacity in shader

* Fix value range not loading, and make first parameter in list the default

* Rename Pixel Size property

* Use base 10 for scale exponent instead of base e

* Update src/data/datamapping.cpp

* Update modules/base/shaders/billboardpoint_gs.glsl

* Remove some redundant asset settings (Home label)

* Review comments

* Add TODO comment for localdwarfs asset (Speck file reading problems)

* Oops, forgot part of the comment

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* More code review fixes

* Fix faulty isReady check when labels are included

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* More code review updates

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-12-19 13:20:07 +01:00
Alexander Bock
6fee06aa4e Reorganization of Spice file handling (#2975)
* Fix VideoTileLayer -> VideoTileProvider
* Move kernel loading into spice files
* Define Spice IDs inside assets
* General asset cleanup and organization
2023-12-12 10:57:24 +01:00
Alexander Bock
aaa6522029 Add Euclid mission (#2970) 2023-12-11 20:37:55 +01:00
Alexander Bock
dbc1403be6 Remove asset initialization warnings 2023-12-11 14:11:08 +01:00
Alexander Bock
bc71bd6186 More small asset fixes 2023-12-11 13:34:51 +01:00
Alexander Bock
e3870b8f11 Asset cleanup
# Conflicts:
#	data/assets/scene/solarsystem/missions/apollo/11/lem.asset
2023-12-11 13:14:56 +01:00
Alexander Bock
5038c55e1b General asset cleanup and organization 2023-12-11 13:13:34 +01:00
Alexander Bock
f238bf8780 Fix VideoTileLayer -> VideoTileProvider 2023-12-11 13:13:26 +01:00
Malin E
690878bc87 Layers maintenance (#2917)
* Separate layers for the Moon and Earth

* One asset each for each server, New York, Utah, and Sweden

* Add the layers asset files for Earth and Moon

* Add new layers structure for Mars and Europa

* Add layers assets for Mercury and Enceladus

* Add more layer assets for all servers

* Add layer assets for each server on the top asset level

* Rename Venus Utah cloud combo layer asset (breaking change)

* Clean up layer asset descriptions

* Update layer asset version name

* Fix base layers error

* Add configuration option to choose layers server

* Add Lua functions to access configuration settings

* Extend configuration Lua function

* Add layer server setting in setting gui + add 'None' as a server option

* Add base layers when server 'None' is used

* Add tests for the new Layer Server setting
2023-12-06 16:17:23 +01:00
Alexander Bock
a8675abed8 Harmonize quotation symboles for asset require 2023-12-04 14:15:09 +01:00
Micah Acinapura
eca9d375e7 update to new chlorophyll layer from gibs (#2959) 2023-11-21 19:15:42 -05:00
Andreas Engberg
f3c4fc54db Update UrlSynchronization to limit amount of downloads (#2586) (#2933)
Limits the number of URL synchronization downloads by time stamping files for X seconds fixes (#2586). 
Also, show the amount of downloaded data as soon as the download is started fix (#2460)

* Adds time validity to UrlSynchronized files (#2586)

Updated affected asset files. Satellite asset files lasts for 24h by default now. Other assets are updated to work as before. Obs timestamp is computed using UTC time.

* Code cleanup

* Update httpsynchronization.cpp

* Applied suggestions from code review

* Update multi-line comment to `//`

* Remove accidental commas in .asset files

Co-authored-by: Emma Broman <emma.broman@liu.se>

* Fixed PR comments + bug in .asset file

* Refactor code

* Reports downloaded data as early as possible, fixes (#2460)

* More files

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Emma Broman <emma.broman@liu.se>
2023-11-14 17:08:38 +01:00
Emma Broman
709cb24bbb Simplify Apollo LEM Model Rotation - Allows using IdleBehavior to orbit around up (#2916)
* Simplify Apollo LEM Model Rotation and allow using IdleBehavior to orbit around up-vector

* Add rotation values from Carter
2023-11-09 11:18:45 +01:00
Alexander Bock
d0efe88aa2 Fix capitalization of lagrange points GuiPath (closes #2934) 2023-11-06 16:25:41 +01:00
Alexander Bock
b43a13d39e Merge asset.localResource and asset.syncedResource (#2906) 2023-10-19 11:59:25 +02:00
Micah Acinapura
c56ca4d71c Update default_layers for Europa
Made the local layer for Europa default as the new york is broken and the Sweden is misaligned.
2023-10-06 13:54:40 -04:00