Commit Graph

1991 Commits

Author SHA1 Message Date
Malin E 275f04425c Split timelapse into forwards and backwards 2022-02-16 14:52:50 +01:00
Malin E cf4294480c Adjust JWST timelapse to only depend on launch time
* Before, each keyframe was depeding on hard-coded time stamps
2022-02-16 13:55:20 +01:00
Malin E a54d978ac6 Correct data end date 2022-02-14 11:23:16 +01:00
Malin E b26025cc12 Update jwst data path to work PC 2022-02-14 10:59:15 +01:00
Malin E 165b59d721 Merge branch 'master' into feature/jwst-update
* Solve conflicts in Earth Lagrange point files
2022-02-14 10:46:05 +01:00
Emma Broman 3406407435 Update gui hash (to get fix for #1775) 2022-02-11 17:10:49 +01:00
Alexander Bock 8b2e58ba9a Correctly mark dependency of EDL asset on Mars (closes #1872) 2022-02-10 22:49:00 +01:00
Alexander Bock 0e49606706 Feature/Science on the Sphere (#1863)
Add all available Science-on-a-Sphere datasets from their public FTP as assets.  Many of the datasets include large files that are downloaded the first time the asset is loaded
2022-02-10 13:53:30 +01:00
Alexander Bock 8b74493d96 Removing the asset_helper file (#1868)
- Remove the asset_helper file and call the onInitialize and onDeinitialize functions directly
 - Small compile fix on Windows
 - Removes the need for the registerIdentifierWithMeta function by automatically doing that for all asset.export statements
 - Allow the passing of either identifiers (as before) or entire tables to the removeSceneGraphNode, removeScreenSpaceRenderable, deleteLayer, removeAction, and export methods. In that case, the Identifier key from the table is extracted and used instead
2022-02-01 23:44:36 +01:00
Micah Acinapura 56460f818e Feature/asset meta update part2 (#1855)
* changes to asset/loader/meta to support adding nodes created at runtime

* update assets meta.

* update tle helper and gui to work with changes

* fixes #1840

* group titan trail and atmosphere with globe

* license for magnetosphere

Co-authored-by: ElonOlsson <olssonelon@gmail.com>
2022-01-31 15:58:41 -05:00
Malin Ejdbo 5124d4d56e Clean up and update jwst profile 2022-01-28 11:48:26 +01:00
Malin Ejdbo 354bf0a795 Lagrange point clean up 2022-01-28 11:13:30 +01:00
Malin Ejdbo d7750f17b6 Update sun trail of JWST to new data
* Issue with not aligning with L2 trail as explained in #1862
2022-01-28 10:47:40 +01:00
Malin Ejdbo 25e69977e7 Update to new data and update timelapse 2022-01-27 16:32:18 +01:00
GPayne 0462a0084d Fixed incorrect lowercase filename causing crash on non-windows systems 2022-01-24 21:31:27 -07:00
Emma Broman 26f5ce4c78 Update gui hash to get layer reordering feature 2022-01-18 19:14:16 +01:00
Alexander Bock ba16dfccad Add and apply an explicit mode parameter 2022-01-14 12:02:51 +01:00
Alexander Bock 550faec8fb Fix example, don't store DefaultTileProvider as unique_ptrs 2022-01-01 13:07:15 +01:00
Alexander Bock cdac4942b6 Merge branch 'master' into feature/tileproviders
# Conflicts:
#	ext/ghoul
#	modules/globebrowsing/src/tileprovider.cpp
#	modules/globebrowsing/src/tileprovider.h
2022-01-01 12:34:42 +01:00
Alexander Bock d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock 60b2f1b78b Make use of the new temporal tile provider type 2022-01-01 11:41:59 +01:00
Alexander Bock e97ce70107 Bring the example back to life 2021-12-31 16:04:23 +01:00
Alexander Bock 90dbb6a01f Rename Generative to Prototyped; Remove restriction on date format 2021-12-31 15:01:38 +01:00
Alexander Bock d81644ecc5 Move temporal information from the XML file format into the asset file 2021-12-31 12:23:28 +01:00
Alexander Bock d8226f7c1d Moving the map service configs in with the asset files 2021-12-29 13:50:15 +01:00
Alexander Bock 064a483b81 Cleanup and unifying coding style for asset files 2021-12-28 23:40:09 +01:00
Alexander Bock fdd995ba01 No longer require the filenames from a synced resource to start with a / 2021-12-28 00:10:01 +01:00
Malin E 01e17266b6 Merge pull request #1787 from OpenSpace/feature/multiple-joysticks
Feature/multiple joysticks
2021-12-22 13:22:01 +01:00
Alexander Bock debcb43ade Feature/assets (#1784)
General overhaul of the Asset loading system
2021-12-19 18:04:01 +01:00
Malin E 8766ba1242 Remove local variable in example 2021-11-30 17:22:46 +01:00
Malin E cc0a7b05ce Add example asset for binding property to joystick 2021-11-30 12:11:08 +01:00
Malin E 2753de1ab9 Merge branch 'master' into feature/multiple-joysticks 2021-11-30 10:14:45 +01:00
Alexander Bock 01a04a6faa Fix missing keybind for taking screenshots (closes #1786) 2021-11-26 14:50:19 +01:00
Emma Broman 2c7bbc5dee Update GUI hash
Includes fix for broken touch gui
2021-11-23 11:42:33 +01:00
Malin E 78b1f2c6e1 Remove support for sticky axis and sensitivity to Property type 2021-11-17 16:57:05 +01:00
Emma Broman d7565f65ee Add script to download the expolanets dataset for the dataprep task
* Python script to download all the columns needed
* Update task file. Use strings instead of std::filesystem::path, so that relative paths and tokens can be used
2021-11-15 13:44:57 +01:00
Malin E 5ae9bfcd14 Fix shouldInvert default value for joysticks 2021-11-15 12:56:38 +01:00
Malin E f591ba2195 Fix roll for controllers 2021-11-15 11:25:12 +01:00
Malin E 3fdae48092 Exchange normalisation property for joysticks to JoystickType
* Joysticks can either be "JoystickLike" or "TriggerLike", where the
  triggers are normalized and have the deadzone close to -1 instead to 0

* Solves issue with zoom friction not to turn off for controllers
2021-11-12 11:46:17 +01:00
Malin E 2b4e1ae8fd Update name in PS4 and Xbox assets 2021-11-11 09:26:04 +01:00
Malin E 5ed69aea6b Update joysitck assets
* NOTE: Xbox and PS4 names have not yet been added
2021-11-05 13:03:10 +01:00
eriksunden 24ce66aad4 Feature/tileinterpolation (#1769)
* Interpolation of tiles added to tileprovider, with additional new shaders to make this work.
 * Asset file for testing interpolation

Co-authored-by: tobiasp93 <tobias.pettersson@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2021-11-01 09:24:40 +01:00
Malin E c94ce3c78a Move reparent script 2021-10-25 11:05:31 +02:00
Malin E a8c74979c1 Merge branch 'master' into feature/animation-fixes 2021-10-25 10:51:13 +02:00
ElonOlsson d7f9c1a124 merge with master 2021-10-14 11:07:01 -04:00
ElonOlsson d0dfa67641 removed a space 2021-10-14 11:01:50 -04:00
Malin E fc4c3f1cfa Merge branch 'master' into feature/animation-fixes
* Resolve conflicts in scene.cpp
2021-10-14 14:23:24 +02:00
ElonOlsson 7905c7acc2 quick bug fix 2021-10-13 14:18:53 -04:00
Malin E 659cc09e4b Address PR comments 2021-10-12 08:52:03 +02:00
Alexander Bock 76dd45e5ce Event System (#1741)
* Add implementation of the EventEngine to handle global event chains
* Add properties to SceneGraphNodes to determine two distance radii for camera-based events
2021-10-11 21:53:00 +02:00