Commit Graph

5699 Commits

Author SHA1 Message Date
Malin E
340bd38044 Merge branch 'master' into project/b612-asteroid-uncertainty 2024-01-19 13:44:54 +01:00
Malin E
7f6e689a98 Make sure normals are in the right direction for tube 2024-01-19 13:42:45 +01:00
Malin E
62ff94505f Fix big with triangle generation for tube 2024-01-19 11:39:04 +01:00
Alexander Bock
ef52155e83 Update the VideoPlayer correctly when writing out frames in SessionRecording 2024-01-18 16:14:23 +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
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
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
3cf06d26a6 Make the RenderableFOV and Missions more resilient to empty values being passed 2024-01-12 15:16:40 +01:00
Alexander Bock
902da116e7 Remove interesting times (closes #2991) 2024-01-09 15:34:54 +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
Malin E
abf6acf894 Make value component optional in tube data 2024-01-04 11:59:42 +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
Malin E
ddef96934d Add option to remove smooth shading on tube 2023-12-14 13:44:43 +01:00
Malin E
15f45c4fb0 Merge branch 'master' into project/b612-asteroid-uncertainty 2023-12-13 14:54:21 +01:00
Adam Rohdin
c91f7f5a9b RenderableOrbitalKepler trail now the whole trail properly 2023-12-12 17:37:20 +01:00
Alexander Bock
bc986fa887 Gracefully deal with empty ossync files in UrlSynchronization 2023-12-11 13:57:07 +01:00
Alexander Bock
0cf0fe492b Doxygen fixes 2023-12-09 00:16:25 +01:00
Emma Broman
19f8e70822 Issue/2955 (#2972)
* Fix up-direction not being correctly computed in all cases (issue #2955)

Might be some precision-related problem going on, not sure. But since we know that up (or North) is always positive z for globes, we can just use that as up-vector directly

* Replace another place where we do the same calculation (although this function is never used)

* Remove unused function
2023-12-08 11:51:23 +01:00
Malin E
04a201acf4 Add wireframe mode for the tube 2023-12-08 10:59:02 +01:00
Malin E
8a69d6653e Add property to take off bottom and top of tube 2023-12-07 15:00:49 +01:00
Malin E
7093860511 Merge branch 'master' into project/b612-asteroid-uncertainty 2023-12-07 13:39:21 +01:00
Alexander Bock
3dadf9c5fa Only create RingComponents and ShadowComponents when they are actually needed 2023-12-01 09:35:38 +01:00
Alexander Bock
3a9716a535 No need to use the .set method of properties directly 2023-11-28 21:37:52 +01:00
Malin E
8f654eae50 Add transfer function for renderable tube 2023-11-28 16:21:57 +01:00
Emma Broman
c525565e84 Utilize new functions for converting strings to upper/lower case (#2956)
* Utilize new functions for converting strings to upper/lower case

* Adapt to updated file name

* Use new function signature

* Update ghoul
2023-11-28 14:57:01 +01:00
Malin E
4a83bb9b8d Add value to tube data 2023-11-28 14:15:52 +01:00
Malin E
536ba1eb5b Fix perform shading property bug 2023-11-23 14:57:17 +01:00
Malin E
e3e1bdcfa6 Restructure tube verticies 2023-11-23 09:54:36 +01:00
Malin E
7a3af2c991 Merge branch 'master' into project/b612-asteroid-uncertainty 2023-11-23 09:22:36 +01:00
Malin E
eeb9ec319d Some small clean up 2023-11-21 16:43:44 +01:00
Emma Broman
722c58f50a Allow zero duration when flying to globe position
Consistent with other fly to functions
2023-11-21 13:59:05 +01:00
Malin E
5b930487b2 Add hard shadows to edges of the tube 2023-11-21 11:47:58 +01:00
Alexander Bock
7db7c40841 Doxygen style overhaul (#2954)
Reformatting the existing Doxygen comments to be unified
2023-11-20 23:39:17 +01:00
Alexander Bock
4ee078502b Doxygen (#2953)
* Update Doxygen and add new CSS file
* Remove Doxygen warnings
2023-11-19 16:35:14 +01:00
Alexander Bock
3c35d23062 Verifier cleanup (#2952)
* Add a description to structs
* Cleanup
2023-11-19 11:51:19 +01:00
Malin E
d88c25c33e Add shading 2023-11-17 13:41:51 +01:00
Malin E
803f79b3c7 Some clean up 2023-11-17 10:15:30 +01:00
Malin E
26e60edd9d First version of working tube from data 2023-11-16 13:34:37 +01:00
Malin E
c2200acf90 Make it based on data (top and bottom) 2023-11-15 14:24:55 +01:00
Emma Broman
639419a51b Issue/1440 - Exoplanet Panel and settings update (#2943)
* Add tags that can be used to set object visibility from UI

* Add module property for hiding/showing orbiting uncertainty disc

* Add tag for 1 AU ring and change color to something that's different from orbits

* Add property for circle color

* Add temporary gui hash for easier testing

* Update modules/exoplanets/exoplanetsmodule.cpp

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

* Update GUI hash to correct commit on webgui master

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-11-15 14:18:04 +01:00
Malin E
482a463284 Something renders 2023-11-15 13:42:10 +01: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
Andreas Engberg
d38f2583ca Fixed: Stopping all http downloads if user exits program 2023-11-07 09:19:22 +01:00
Andreas Engberg
e5672e2652 Update HttpSynchronization to keep track of files downloaded (#2587) (#2930)
* Update HttpSynchronization to keep track of files downloaded (#2587)

Reads ossync file on synchronization and download files that are missing

* Apply suggestions from code review

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

* Apply suggestions from code review

* Fixed merge conflict errors

* Fixed asset being rejected on successful sync

* Add enum for download fail/success, sleep between download retries.

Removed comments and todos

* Fixed PR comments

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-11-06 11:06:35 +01:00
Alexander Bock
870850db07 Enable warnings for missing case labels and subsequent cleanup. Updated ghoul, sgct, and codegen repository for same 2023-11-05 22:16:06 +01:00
Malin E
44ca7bf3c7 Merge branch 'master' into project/b612-asteroid-uncertainty 2023-10-25 13:30:58 +02:00
Malin E
1a32c5a4ca Add initial (non working) verison of new renderable tube 2023-10-25 12:03:05 +02:00