Commit Graph

11299 Commits

Author SHA1 Message Date
Alexander Bock
6e29d898cf Update copyright header 2024-02-06 15:53:24 +01:00
Emma Broman
2323a8ce50 Issue/2985 - Add asset with default cmaps (#3004)
* Allow changing color map during runtime

* Stary building asset with colormaps (currently using local files)

* Add option to invert the color maps

* Remove final use of local viridis file in example and fix broken cmap update

* Use synced resource for colormap files

* Update advanced colormapping example

* Apply suggestions from code review

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

* Update data/assets/util/default_colormaps.asset

* Capitalize first letter of exported keys, to be more consistent with rest of code base

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-02-05 15:47:25 +01:00
Emma Broman
2406a886ec Interpolating points (#3002)
* Add a class for rendering an interpolated point cloud (WIP)

* Make sure that we render the correct number of points

* Group interpolation properties into a property owner

* Update interpolation stuff (which was broken :) )

* Prevent interpolation from breaking with only one step or invalid interpolation values

* Add trigger properties for controlling interpolation

* Allow setting start interpolation value from asset

* Implement spline-based interpolation

* Cleanup, and interpolate to start and end

* And asset type documentation

* Add example asset

* Handle missing data values in interpolation

* Always show values at the knots, if there is one

* Experiment with more dynamic rendering (batching)

* Speed up interpolation by doing it on GPU instead of CPU

* Bring back spline interpolation (this time on GPU)

* Refactor initial data buffering

* Add a helper function to compute transformed positions

* Use vec3 positions instead of vec4 (less data to transfer)

* Update interpolation value documentation

* Apply suggestions from code review

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

* Increase interpolation speed max value

* Fix faulty indentation

* I banish thee, redundant empty line

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-01-30 09:43:11 +01:00
Gene Payne
bcc728cbfd Disable Mars MOC layers so original test layers show 2024-01-25 13:04:21 -07:00
Emma Broman
0925981a8c Fix faulty colors when computing HSV from invalid RGB values (with values not in [0,1])
Was noticable e.g. when rendering a lotof points that overlap and are belnded additively
2024-01-25 16:15:19 +01:00
Emma Broman
9d97028c3a Fix issue with overflowing color values for layers (closes #2880) 2024-01-25 13:50:36 +01:00
Alexander Bock
bd7668e892 Add the ability to arrayify an enum (closes #3003) 2024-01-24 16:56:39 +01:00
Alexander Bock
689bae756a Add new keybindings Shift+H to toggle all trails including the ISS (closes #3005) 2024-01-24 14:58:54 +01:00
Andreas Engberg
04ff09814d Add event topic (#3010)
* Add event topic

Add ability to subscribe to events via js-api

* Apply suggestions from code review

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

* Output an error if no status or event object is passed to payload

* fixed typo

* Report a warning if user tries to unsubscribe to a non registered event/type combination

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-01-24 13:51:55 +01:00
Alexander Bock
ef52155e83 Update the VideoPlayer correctly when writing out frames in SessionRecording 2024-01-18 16:14:23 +01:00
Alexander Bock
0e78e65175 Fix crash when registering replacement resource functions 2024-01-18 14:11:04 +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
27608634b2 Remove warnings (#2999)
* Remove warnings for MSVC, GCC, and Clang 17
2024-01-18 09:58:20 +01:00
timol085
9959c2b94c Add missing include file <sstream> for mac 2024-01-17 16:45:33 +01:00
Emma Broman
640ca3ed49 Feature/point cloud labels from csv (#2989)
* Add ability to load labels directly from CSV/SPECK for PointClouds

* Provide some more docs

* Update the example asset for point clouds

* Make both examples visible

* Some cleanup

* Apply suggestions from code review

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

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-01-17 13:46:49 +01:00
Gene Payne
787c93dec0 Merge pull request #2997 from OpenSpace/issue/2976
Fix for crash when reading meta of corrupt config file
2024-01-16 14:48:13 -07:00
Emma Broman
6fb4b89a12 Prevent setting ScaleExponent to an invalid value
May happen if no dataset was read or if the dataset only incudes (0,0,0)
2024-01-15 16:38:56 +01:00
Emma Broman
385d23303d Prevent point cloud from never getting ready if no dataset was added
Fixes issue that Voids were not begin rendered
2024-01-15 16:32:19 +01:00
Alexander Bock
15aaae3007 Spice kernel handling cleanup 2024-01-12 15:20:00 +01:00
Alexander Bock
3cf06d26a6 Make the RenderableFOV and Missions more resilient to empty values being passed 2024-01-12 15:16:40 +01:00
Alexander Bock
04a06520e5 Provide a warning instead of erroring out with the localResource/syncedResource -> resource change 2024-01-12 10:10:49 +01:00
GPayne
ab925174b5 Fix for crash when reading meta of corrupt config file 2024-01-11 14:31:00 -07:00
Alexander Bock
cae9834ec7 Add log rotation function to the Script log as well (closes #2995) 2024-01-09 15:44:22 +01:00
Alexander Bock
902da116e7 Remove interesting times (closes #2991) 2024-01-09 15:34:54 +01:00
Alexander Bock
4bf111115e Add precompiled headers to unit tests 2024-01-08 17:09:59 +01:00
Alexander Bock
97d1dc163b Add the ability for the log file to rotate (closes #2995) 2024-01-08 11:30:46 +01:00
Emma Broman
6dd497d38c Feature/add some docs (#2961)
* Add docs for PathInstruction

* Add docs for renderablecartesianaxes and navigationstate

* Write docs for ExoplanetDataPreparationTask

* Add some kind of documentation for the task base class

Was already showing in the list, but the property or decription was not included

* Apply suggestions from code review

* Address review comments

* Clarify confusing sentence

* Slight rephrasing
2024-01-04 13:55:21 +01:00
Alexander Bock
c1ee9079f1 Add the ability to drag-and-drop a video file to add it as a screenspacerenderable (closes #2988) 2023-12-23 22:33:53 +01:00
Alexander Bock
cc9f235c9d Add more debug outputs to the startup to be able to diagnose issues 2023-12-22 14:41:19 +01:00
Alexander Bock
952b263a8e Add Lua function to return a list of all loaded kernels 2023-12-22 14:40:58 +01:00
Alexander Bock
e64d4d66f4 Add the optional ability to export the model matrix into an ASCII recording 2023-12-22 14:19:18 +01:00
Emma Broman
84b9f384ce GUI Hash (small style updates) 2023-12-21 15:28:59 +01:00
Emma Broman
7ad27203b5 Update GUI hash
buttons hover style is now consistent
2023-12-21 10:01:25 +01:00
Andreas Engberg
6281da6798 Fixed loading screen log messages taking up real estate if set to false 2023-12-20 10:02:54 +01:00
Emma Broman
af5ebd7731 Issue/2949 - Fix for camera transition events (#2982)
* Fix variable name typo

* Update transitions to not care about which sphere we were previously in

* Also handle when anchor node changes

* Remove log messages used for testing, and unused variable

* Update src/navigation/navigationhandler.cpp

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

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-12-20 08:28:34 +01:00
Emma Broman
8a1b6aceb2 Keep track of aim from navigations state when creating a camera path (#2981) 2023-12-20 08:28:21 +01:00
Emma Broman
9c77a12269 Issue/2665 - Show timer for how long time left in camera path (#2980)
* Add a camera path topic and compute remaining time in path

* Remove unused parameter in function

* Include speed scale in estimation of time the path will take

* Includes cleanup and address review comments

* Round instead of ceil, to make countdown reach 0 in most cases

* Update GUI hash
2023-12-20 08:28:07 +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
Emma Broman
9897a9fd5a Update GUI hash (issue #2977) 2023-12-14 10:10:40 +01:00
Adam Rohdin
c91f7f5a9b RenderableOrbitalKepler trail now the whole trail properly 2023-12-12 17:37:20 +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
bc986fa887 Gracefully deal with empty ossync files in UrlSynchronization 2023-12-11 13:57:07 +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
Alexander Bock
0cf0fe492b Doxygen fixes 2023-12-09 00:16:25 +01:00