Commit Graph

9352 Commits

Author SHA1 Message Date
sylvass
b2ce062ce9 Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser
# Conflicts:
#	data/assets/util/webgui.asset
2022-03-02 16:41:11 -05:00
sylvass
21e572149e Fix comments from pull request 2022-03-02 16:39:44 -05:00
Emma Broman
2d3c76f222 Update gui hash to get camera path gui (closes #1854) 2022-03-02 18:58:41 +01:00
Emma Broman
a0433c0419 Use largest of boudning and interaction sphere for creating camera path (closes #1897) 2022-03-02 10:52:03 +01:00
Emma Broman
0c86254168 Give ISS node a bounding sphere that matches the size of the spacecraft 2022-03-02 10:50:56 +01:00
Emma Broman
e127dec602 Fix openspace.debugging.renderCameraPath leading to crash
Keep the path around after it's finished, so that we can render/analyze it. It will be cleared once the next path is generated anyways.
2022-03-02 09:28:20 +01:00
Emma Broman
dfc2402638 Shorten info message (pause during camera path) 2022-03-01 13:11:35 +01:00
sylvass
02c9ef4a7a Add missing files 2022-02-28 17:19:41 -05:00
Emma Broman
2919ad77ed Typo fix 2022-02-28 15:31:47 +01:00
Emma Broman
7295a25af3 Gui update
* Remove linear flight from touch UI
* Fix some weird drag behavior for layers (now only title is daggable, not the entire propertyowner)
2022-02-27 20:55:57 +01:00
Emma Broman
aeeeea7793 Reorder default path type property, so the most useful ones comes first
OBS! Breaking change for the installations that uses paths, as the option property uses the indices in the list to set the value
2022-02-27 20:52:38 +01:00
Emma Broman
6e751585b0 Add a property to change the default arrival distance for camera paths 2022-02-27 20:51:26 +01:00
Alexander Bock
e249af5c0e Long overdue mark for pre-release of next version 2022-02-26 22:44:16 +01:00
Alexander Bock
45c97c4a81 Enable more unit tests 2022-02-26 21:45:16 +01:00
Alexander Bock
37f2e017ec Remove Fallback layers (closes #1819) 2022-02-25 14:16:44 +01:00
Emma Broman
d0fcec569c Address stability problems for camera paths and make them more useful in general
* Change spline curve parameter interval from [0,1] to [0,nSegments], for slightly increased precision
* Use linear paths whenever precision isn't enough/paths are too long (and traverse linear paths differently, to make them less depending on the distance)
* Remove OrbitalNavigator.LinearFlight and instead add "Zoom to" helper functions (closes #1837 )
* Add check to prevent triggering awkward short paths, for example when flying to the current target or to the same geo position twice
* Refactor speed code and handle speed when path is shorter than start+closeup distance
* Add easing to speed dampening
* Add topic for engine mode (to be used for UI later)
* Cleaner log when creating paths (some previous info messages are now debug messages)

Related PR: OpenSpace/OpenSpace-WebGuiFrontend#70
2022-02-25 08:49:19 +01:00
Alexander Bock
02677b5180 Initializing GLFW and then destroying it has some performance implications on the application. Therefore use OS specific functions to get the window size 2022-02-23 14:37:05 +01:00
Alexander Bock
3f6fccb373 Correctly disable vsync if requested 2022-02-23 13:40:40 +01:00
Alexander Bock
7cb38b6c9c Update codegen and make use of the new parenting method 2022-02-23 13:20:36 +01:00
Alexander Bock
78fd5b78da Wait for initialization when adding assets at runtime. Correctly destroy the RenderableGalaxy shader when deinitializing (closes #1601) 2022-02-22 23:24:37 +01:00
sylvass
380e317f34 More cleanup before pull request 2022-02-22 16:25:46 -05:00
sylvass
d96ea9189d Reset files that shouldn't be changed for pull request 2022-02-22 16:20:40 -05:00
sylvass
46dc827180 Merge resolve from updating submodules 2022-02-22 15:36:05 -05:00
sylvass
bcf463ad66 Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser
# Conflicts:
#	data/assets/util/asset_helper.asset
#	data/assets/util/webgui.asset
2022-02-22 10:25:46 -05:00
sylvass
ee26ab4e08 Remove comments with other urls for the sky browser 2022-02-22 09:51:53 -05:00
sylvass
ea174f544e Remove unneccessary time variables 2022-02-22 09:51:06 -05:00
sylvass
4af95311b9 Add linewidth property to sky target 2022-02-22 09:50:55 -05:00
sylvass
96149a7978 Tidy up shader code 2022-02-22 09:50:26 -05:00
Alexander Bock
73f6938619 Correctly specify tags and fix usage of refreshRate and vsync parameters (closes #1890) 2022-02-21 21:27:25 +01:00
Alexander Bock
ae40493627 Add function allowing insight into currently loaded assets. Don't print info message when loading asset that was already loaded 2022-02-21 21:19:13 +01:00
Alexander Bock
abaaf437b6 Don't try to initialize an asset if the initialization has failed (closes #1830) 2022-02-20 19:30:23 +01:00
Alexander Bock
a6f048e342 Add explicit checks whenever we are accessing another scene graph node (closes #1831) 2022-02-20 19:17:06 +01:00
sylvass
8b71bbd0da Remove renderable sky browser (3D browser and related functionality) 2022-02-18 12:21:12 -05:00
sylvass
863b555747 Ensure all nodes in a cluset get the same border color for the browsers 2022-02-18 11:28:09 -05:00
Alexander Bock
797a81dbe6 Fix crash when trying to start Wormhole with any commandline arguments 2022-02-17 18:28:51 +01:00
Alexander Bock
cbe2e6cdcf Set the default window size to 66% of the primary window size (closes #1883) 2022-02-17 17:55:43 +01:00
Micah Acinapura
9e69300642 unified renderbin to renderable; adapted orbitalkepler to codegen; fi… (#1843)
* unified renderbin to renderable; adapted orbitalkepler to codegen; fixes 1842

* update for pr comments

* update for pr comments2
2022-02-17 10:58:32 -05:00
sylvass
5a07842b9e Add lua function to translate screen space renderable. Add documentation for the lua functions. 2022-02-17 08:55:03 -05:00
Alexander Bock
e8072495ec Feature/warnings (#1885)
Remove many warnings from MSVC, Clang, and GCC
2022-02-16 18:33:12 +01:00
Alexander Bock
40ed640bc8 Simplify the function signature of the FactoryManager function 2022-02-12 00:55:15 +01:00
Alexander Bock
44655e5faa Merge branch 'master' of github.com:OpenSpace/OpenSpace 2022-02-12 00:43:16 +01:00
Emma Broman
3406407435 Update gui hash (to get fix for #1775) 2022-02-11 17:10:49 +01:00
Alexander Bock
6c3a715efc Merge branch 'master' of github.com:OpenSpace/OpenSpace 2022-02-11 10:23:27 +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
d3c2ee2fe5 Don't let the meta info disappear into the void (closes #1876) 2022-02-10 22:24:59 +01:00
Alexander Bock
51937d9461 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2022-02-10 16:00:40 +01:00
Alexander Bock
30212b6768 Adapt to new auto coding style 2022-02-10 15:20:21 +01:00
Emma Broman
72110be88c Fixes to remove some warnings 2022-02-10 14:28:15 +01:00
Emma Broman
893c523517 More cleanup of virtual property remnants 2022-02-10 14:28:15 +01:00
Emma Broman
f45b782234 Remove all remaining virtual property related code 2022-02-10 14:28:15 +01:00