Commit Graph

3340 Commits

Author SHA1 Message Date
Alexander Bock
40ed640bc8 Simplify the function signature of the FactoryManager function 2022-02-12 00:55:15 +01:00
Alexander Bock
6c3a715efc Merge branch 'master' of github.com:OpenSpace/OpenSpace 2022-02-11 10:23:27 +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
f45b782234 Remove all remaining virtual property related code 2022-02-10 14:28:15 +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
a7841ce405 Working unit tests (#1882)
* Enable all unit tests in Jenkins (closes #1666)
* Fix issue with Profile where the version number is not updated if the profile does not contain keybindings
* Fix issue with script schedule that would cause a crash when only one script is scheduled
* Fix test for colorimage, use correct path to unit test executable for non-windows platforms
* Provide stable class names for vector and matrix verifiers
2022-02-10 01:06:41 +01:00
Alexander Bock
5e3e27bbae Add support for InRange, NotInrange, and Operator verifiers for vector types 2022-02-03 23:39:17 +01:00
Emma Broman
91b0581d39 Introduce engine modes to handle Camera path and session recording transitions
* Clarifies which system is control over time and camera at what time
* Fixes #1845
* Prevent invalid switching between session recoring and camera path playback
* Some cleanup, mosly of SessionRecording and NavigationHandler. Also, remove ExternInteraction and some other unused/nonexisting functions
2022-02-03 16:08:21 +01:00
Emma Broman
6bc7d36920 Autopause camera paths using script
Makes the script propagate to all nodes, as well as being recorded during session recording
2022-02-03 16:08:21 +01:00
Emma Broman
c3ab68cd93 Fix faulty ScriptScheduler property info identifiers 2022-02-03 16:08:21 +01:00
Emma Broman
df56cdb68f Move scriptscheduler time update to function that handles time progression
To avoid potential future problems with scriptscheduler time progressing when simulation time doesn't
2022-02-03 16:08:21 +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
Alexander Bock
2cf268abf0 Fix crash when unloading layers; Fix issue accidentally unloading an asset too early 2022-01-26 23:02:59 +01:00
Alexander Bock
8070c307ce Add more informative error when a layer fails specification; Add error message when trying to unzip a file that does not exist 2022-01-26 23:02:55 +01:00
Emma Broman
37574522a3 Rename pathnav functions (goTo => flyTo) 2022-01-20 14:18:59 +01:00
Emma Broman
0da8afa550 Automatically pause simulation time when starting a camera path (adresses #1832) 2022-01-20 14:18:59 +01:00
Emma Broman
c89599ab64 Add bool property to toggle follow anchor node rotation (#1839)
And make property title formatting more consistent

closes #1822
2022-01-18 14:08:26 +01:00
Alexander Bock
2222d3d9e0 Update SGCT to enable taking screenshots of individual windows 2022-01-07 12:00:00 +01:00
Alexander Bock
c78ff28109 Update submodules, fix formatting for units 2022-01-05 17:06:47 +01:00
Alexander Bock
6673791b05 Shorten the configuration extraction 2022-01-02 14:02:39 +01:00
Alexander Bock
21df9066e1 Make use of the new map feature in codegen (#1801) 2022-01-02 13:36:41 +01:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock
4c9337a465 Fix issue when drag-dropping an image that has extra dots in the name (closes #1793) 2021-12-29 14:13:59 +01:00
Alexander Bock
8b4de949dc Correctly report issue if a required asset is not available; Fix issue loading a colormap for the gaia stars 2021-12-28 23:39:33 +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
Alexander Bock
76b9c7587b Adapt to explicit specifcation of texture size (#1794)
* Adapt to explicit specifcation of texture size
2021-12-26 19:19:04 +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
Alexander Bock
f8b5d4b662 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace
# Conflicts:
#	src/navigation/pathcurves/avoidcollisioncurve.cpp
2021-12-19 19:57:09 +04:00
Emma Broman
c7b47fc2c0 Slight improvement to AvoidCollision camera path
Fixes "bouncing motion" that sometime happened when going to a position that is close to the original position
2021-12-14 16:09:17 +01:00
Alexander Bock
d32af9117a Code style cleanup 2021-12-10 17:31:01 +01:00
Emma Broman
a921f983ca Fix broken navigation states: Now works with aim as well as anchor 2021-12-01 14:30:28 +01:00
Emma Broman
76ea508dab Tiny navigation code cleanup/fix 2021-12-01 11:31:53 +01:00
Malin E
cc0a7b05ce Add example asset for binding property to joystick 2021-11-30 12:11:08 +01:00
Malin E
8299e4db22 Address PR comments 2021-11-30 10:46:44 +01:00
Malin E
2753de1ab9 Merge branch 'master' into feature/multiple-joysticks 2021-11-30 10:14:45 +01:00
Emma Broman
b41d5efd25 Extra check to prevent zero length segments in ZoomOutOverview camera path 2021-11-23 11:15:59 +01:00
Emma Broman
d1821ae0e4 Add lua functions to get the bounding and interaction sphere values for a SGN 2021-11-23 10:00:51 +01:00
Alexander Bock
51fe17c320 Fix an issue where the removal of a screenspacerenderable is published after the screenspace renderable has already been destroyed 2021-11-21 00:46:50 +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
73895e4c62 Fix problems in avoid collision path when start and end position are the same 2021-11-17 09:39:03 +01:00
Malin E
5ae9bfcd14 Fix shouldInvert default value for joysticks 2021-11-15 12:56:38 +01:00
Emma Broman
3d3db47d76 Small include updates to adapt to inputstate changes 2021-11-12 14:07:07 +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
e075f8ae82 Merge branch 'master' into feature/multiple-joysticks
* Solve conflicts in navigationhandler.cpp
2021-11-12 09:51:05 +01:00
Malin E
a515f85234 Add ability to bind a joystick axis to a property value 2021-11-11 09:27:54 +01:00