Commit Graph

2667 Commits

Author SHA1 Message Date
Emma Broman
36ddd84113 Merge branch 'master' into project/exoplanet-explorer 2024-08-29 11:30:34 +02:00
Emma Broman
311c69cc7a Update GUI hash
For a couple of small fixes. Non-breaking
2024-08-29 09:41:58 +02:00
Emma Broman
ed51c10bea Generalize exoplanet explorer (#3393)
* WIP: Read column and data infor from a json file

* WIP: Make column handling work again and load info from json file

* Revive custom formatting for numerical columns

* Small cleanup

* Fix some issues with columns that had mixed numerical and string-based values

* Move old custom column computations to python script

* Tiny refactor

* Fix issue with invalid sorting of items with nan values

Equal values should always be false

* Refactor some column-related helper functions

* Fix another issue with invalid compare function in sort

Equal values should be false

* Sort default columns by name

* Refactor column selection a bit

* Ensure name column is the first column

* Start splitting code up into different views - first one for column selection

* Tiny refactor

* Bring back the circle that shows color mapping

* Cleanup and fix some mismatching ImGui calls that lead to crashes

* Extract url and reference name and revive button

* Remove unused point cloud renderable (it hadn't been maintained)

* Small refactoring of exoplanet glyph renderable data handling

Now we only update the data once, not multiple times as the file changes

* Break out color mapping to its own component

* Fix colormapping to start with given default or first numeric column

* Start building feature for setting quick-access filters from file

* Make OR filtering work, but introducing filter groups

* remove unused shaders

* WIP: Move filtering view into its own componen (missing external filtering still)

* Make external selection work again

* Update year in copyright code snippet

* A bit of cleanup

* Make it possible to load dataset without exoplanet specific data

* Fix column selection not resetting correctly

* Update exoplanet base asset to match DU Update

* Specify data settings json file through a property in the module

* make it possible to load a new dataset during runtime

* Make it possible to edit added filters

* Move everything related to system view to its own file

* Fix issue with crashing on double click

* Refactor and make hover-behavior in table work again
2024-08-28 10:45:05 +02:00
Emma Broman
5577e6c807 Merge branch 'master' into project/exoplanet-explorer 2024-08-28 10:42:52 +02:00
Alexander Bock
bf8c2bbe13 Add missing information about color-enhancement for the Viking image 2024-08-23 10:30:15 +02:00
Emma Broman
6e6f425a0a Issue/3337 Custom UI group ordering (#3363)
* remove code for controlling group sorting in ImGui

We only use this for debug and the sorting here is no longer relevant

* Add feature to add custom ordering to UI groups

* Tiny cleanup

* Add numerical ordering for night sky planets

* Update Lua function name and create an event when ordering updated

* Set top-level ordering

* Add function documentation

* Add a custom ordering that previously was hardcoded in UI

* Apply suggestions from code review

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

* Rename GUI ordering function

* Update GUI hash

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-08-22 16:51:28 +02:00
Alexander Bock
f962a10e03 Add new maps for the Globe representation of Phobos (closes #1397) 2024-08-22 16:38:04 +02:00
Alexander Bock
d0b3cd6e89 Add example for ConstantRotation (#3384) 2024-08-21 10:34:08 +02:00
Alexander Bock
a138be3f92 Add example for StaticTranslation (#3385) 2024-08-21 10:33:59 +02:00
Alexander Bock
f2a9477eb5 Lua Securty Sandboxing (#3378)
* Add Lua sandboxing
* Convert existing files to use custom functions instead of now-prohibited library functions
2024-08-16 13:46:39 +02:00
Alexander Bock
9decd9aad2 Add examples for SpiceTranslation (#3376) 2024-08-16 13:45:40 +02:00
Alexander Bock
7ec6b6cfb5 Add examples for GlobeRotation (#3377)
* Add examples for GlobeRotation and make the longitude and latitude defintion non-optional
* Remove old GlobeRotation example
2024-08-16 13:45:24 +02:00
Alexander Bock
c7f2ab1a43 Define the supergalactic transformation matrix only once and reuse in other assets 2024-08-14 15:10:44 +02:00
Alexander Bock
1cef84ca74 Add an identifier to mission files and use that instead of the name 2024-08-14 10:22:41 +02:00
Alexander Bock
0b91fd2642 Global cleanup pass over asset files
- Lua style guides
- FrameConversions
- unloadMission, Add mission identifiers
2024-08-14 10:22:20 +02:00
Alexander Bock
5d2186f11d Add Esri Wayback layers (#3382) 2024-08-12 21:20:39 +02:00
Alexander Bock
0ec3d5e284 Add Sweden caching server to Earth map layer 2024-08-12 09:55:03 +02:00
Alexander Bock
d07edbdc77 Fixing arrangement for TimeFrames in assets 2024-08-07 06:58:50 +02:00
Alexander Bock
ca6c14e9b5 Make the SampleInterval for RenderableTrailTrajectory optional and use a sample per 2 days by default 2024-08-07 06:53:05 +02:00
Alexander Bock
19bb1c5d91 Update Rosetta kernels to extend coverage (#3370) 2024-08-06 11:45:25 +02:00
Ylva Selling
952f177c54 UI updates (#3358)
* Remove events for scenegraphnodes and screenspacerenderables

* Add events for updating the property tree

* Remove duplicate function calls

* Update src/properties/propertyowner.cpp

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

* Address PR comments and make helper functions with better comments

* Make uri function not return the identifier if the uri is not valid

* Rename fullyQualifiedIdentifier to uri

* Update gui hash

---------

Co-authored-by: Ylva Selling <ylva.selling@liu.se>
Co-authored-by: Emma Broman <emma.broman@liu.se>
2024-08-02 16:30:07 +02:00
Alexander Bock
dd73978fa2 Use correct UTC time string in Pluto trail 2024-08-02 14:57:13 +02:00
Alexander Bock
97e455f7af Update kernel data for Rosetta 2024-07-30 10:51:24 +02:00
Emma Broman
79dce8acfa Fix broken light pollution update
Broke in DU Update #3335 due to updated identifiers
2024-07-18 14:09:30 +02:00
Alexander Bock
e46cb269d0 Update WebGUI hash 2024-07-18 13:59:05 +02:00
Alexander Bock
99a976a53c Add an example to show the current in-game time in a screenspace object (closes #3312) 2024-07-18 12:02:09 +02:00
Alexander Bock
981a13a855 Add new TileProvider to select tile providers based on the date and apply to VIIRS Joint Polar Satellite System (#3350) 2024-07-18 11:18:57 +02:00
Alexander Bock
cabb8cb55b Add Down and Up keybinds to set the time to realtime and "now" respectively (closes #3275) 2024-07-18 11:11:26 +02:00
Malin E
01483ef982 Add support for model vertex colors (#3346)
* Add model vertex color support

* Fix an issue with the Tiangong model not loading properly and set a correct bounding sphere size for it

* Update caching for models

* Update previous model examples to the new format

* And add a new example to test the new vertex colors support

* Apply suggestions from code review

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

* Add a model example with lighting

* Improve the basic example and add a separate example for vertex colors

* Add visual test for vertex colors (#3348)

* Update the readme file for the visual tests

* Add asset instruction to the visual testing readme

* Add visual test for RenderableModel with vertex colors

* Apply suggestions from code review

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

* Update test when asset changed name

---------

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

* Update Ghoul

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-07-17 15:56:06 +02:00
Emma Broman
babbb4f97c 2024 Digital Universe Data Update (#3335)
* Update 2dF.asset

* Changes to the filename metadata, as wekll as the description.

* 2024 DU updates.

* Apply suggestions from code review

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>

Apply suggestions from code review

* Changes to the asset descriptions, the GUI path, and some of the settings.

* Fixed minor error in a variable name.

* Wrote the individual descriptions for each asset.

* Adjusted the size (brightness).

* Update identifier to one that works

* Update asset versions and correctly format asset files

* Reset exoplanet rings size

To make them visible when viewed further away, e..g at the distance of the radiosphere, and make the Kepler FoV more apparent

* Clean up scale variables

* Line-break long descriptions

As long as we expect users to manually edit files, they need to be readable

* Remove letters that sorts the grids by size

* Split allsky into two assets

Remove asset that was split in two and update DU meta asset

* Replace dwarfs texture with generic point texture resource

* Remove all DU version comments, to reduce "noise"

These would be confusing to our users

* Some final cleanup

* Remove commented radii

* Local Universe -> Nearby Surveys

* Remove asset versions

* Apply suggestions from code review

Co-authored-by: Malin E <malin.ejdbo@gmail.com>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>

* Remove background setting (non-existing) for spheres

* Rmeove commented out lines in star orbits asset

They are confusing, and the label file they refer to does not exist

* Apply suggestions from code review

* Fix some missing line breaks

* Update sync identifiers to match updates in BigBang PR

* Reuse point textures from the same resource instead of having one copy per dataset

The texture used is the same

* Set brown dwarfs dataset version to 1

* Update bookmarks file with updated star poistions

---------

Co-authored-by: Brian Abbott <80659386+brianpatrick@users.noreply.github.com>
Co-authored-by: brianpatrick <git@brianabbott.net>
Co-authored-by: Malin E <malin.ejdbo@gmail.com>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-07-17 11:25:26 +02:00
Emma Broman
cca2f7e272 Add possiblity to sort SGNs in GUI based on numerical value (#3340)
* Add possiblity to sort SGNs in GUI based on numerical value

And apply to grids

* Fix mistake in docs

* Apply suggestions from code review

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

* Rename Order -> Ordering and remove unused getter functions

* Update GUI hash to match the UI changes

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
2024-07-17 09:54:59 +02:00
Emma Broman
3c31d8d5a8 Remove newly added profiles, to reduce list in launcher 2024-07-16 11:38:26 +02:00
Emma Broman
9f9c7f3b03 Remove some redundant code that has been updated on master 2024-07-16 11:36:30 +02:00
Emma Broman
c802655743 Merge branch 'master' into project/exoplanet-explorer
# Conflicts:
#	config/equirectangular_gui.json
#	config/fullscreen1080.json
#	config/single_fisheye.json
#	config/single_fisheye_gui.json
#	config/single_sbs_stereo.json
#	config/spherical_mirror.json
#	config/spherical_mirror_gui.json
#	config/spout_output_cubemap.json
#	config/spout_output_equirectangular.json
#	config/spout_output_fisheye.json
#	config/spout_output_flat.json
#	config/two_nodes.json
#	data/assets/examples/nodeline.asset
#	data/profiles/juice.profile
#	data/profiles/jwst.profile
#	data/profiles/osirisrex.profile
#	data/profiles/voyager.profile
#	include/openspace/rendering/renderable.h
#	modules/base/CMakeLists.txt
#	modules/base/basemodule.cpp
#	modules/base/shaders/arrow_fs.glsl
#	modules/base/shaders/arrow_vs.glsl
#	modules/exoplanets/exoplanetsmodule_lua.inl
#	src/rendering/renderable.cpp
2024-07-15 13:27:07 +02:00
Emma Broman
c0f85857d4 "Fix" warning from hdf.asset (#3343)
The "proximity" parameter does not exist in the dataset. Just addd all tha parameters for color mapping.
2024-07-15 08:52:22 +02:00
Alexander Bock
b8e9193bc7 Add Lua function to calculate the number of seconds between dates and use it in assets (#3332) 2024-07-11 10:34:06 +02:00
Emma Broman
fcba068aca Add a point cloud example that changes the point orientation (#3327)
* Add a point cloud example that changes the point orientation

Note that it is really difficult to see what is going on without a texture, so added a texture to this exmaple as well.

* Apply suggestions from code review

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

* Update example identifier to be unique

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-06-26 10:44:09 +02:00
Alexander Bock
24e83d154e Make the 'Layer's specification in RenderableGlobe optional. Clean RenderableGlobe assets 2024-06-22 13:41:27 +02:00
Alexander Bock
95c841786a Fix spelling mistake in Haumea model 2024-06-22 09:16:42 +02:00
Emma Broman
c53a747ed5 Fix a faulty example GIU path 2024-06-20 16:11:43 +02:00
Alexander Bock
807699a890 Remove the large data files from the URLSynchronization example to make the file loadable 2024-06-20 11:49:46 +02:00
Alexander Bock
df6740c5e2 Use the correct way to scale the eiffel tower educational asset 2024-06-20 11:45:05 +02:00
Alexander Bock
2cc5a53aaa Remove version numbers from asset files 2024-06-19 11:26:07 +02:00
Alexander Bock
14cf12d23e Update the UI hash 2024-06-17 12:05:24 +02:00
Alexander Bock
01fa2898db FixedRotation rerequests a missing attached node or target node every frame to prevent incorrect initialization order 2024-06-15 18:07:39 +02:00
Alexander Bock
ba56433a78 Reeable SNPP VIIRS as the standard Earth layer 2024-06-15 00:47:31 +02:00
Alexander Bock
43645ce7a4 Fix existing assets; Make the goToGeo function without altitude in the profile work 2024-06-14 23:55:55 +02:00
Emma Broman
62b2a8c8c1 Fix renderable sphere example and add one for using local image (#3306)
* Fix renderable sphere example and add one for using local image
2024-06-13 10:43:54 +02:00
Emma Broman
8a42657deb Feature/examples naming (#3305)
* Update name and path format of examples that follow the new structure
* Fix a broken (updated) property name in an example
* Make other examples' GUI paths more consistent
* Put them all in the Examples folder
2024-06-13 10:42:00 +02:00
Gene Payne
93da7f42ba Removing all 'SSSB' elements in GUI path of the solarsystem/sssb assets (#3322)
A manual update of assets in solarsystem/sssb: tesla_roadster.asset, swifttuttle.asset, itokawa.asset, c2019y4atlas.asset
2024-06-12 09:09:24 -06:00