Commit Graph

8966 Commits

Author SHA1 Message Date
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
Malin E
2b4e1ae8fd Update name in PS4 and Xbox assets 2021-11-11 09:26:04 +01:00
Alexander Bock
109be85d48 Visual Studio 2022 compile fix 2021-11-08 23:34:41 +01:00
Emma Broman
baf67b8ed3 Temporary fix for exception when adding exoplanet systems (#1781)
The layer group might not yet be initialized when a layer is added, which leads to an exception when trying to find information about the layer group's layer manage and SGN for the event payload.
2021-11-05 14:42:34 +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
Alexander Bock
55ee3d2785 Remove the user data from the Lua function definition 2021-11-04 16:27:54 +01:00
Alexander Bock
e3e468d5ef Update submodules again 2021-11-04 13:29:09 +01:00
Malin E
3526e14e66 Add support for several joysticks at the smae time 2021-11-04 13:19:43 +01:00
Alexander Bock
f390051e1d Update submodules. Disable /ZI compile-flag when Tracy is enabled to prevent compile errors 2021-11-04 11:35:09 +01:00
Malin E
8bddf38f02 Split InputState into MouseInputState and KeyboardInputState 2021-11-03 15:28:37 +01:00
Malin E
23eed7f023 Move abstract function updateStateFromInput to the concrete classes 2021-11-03 14:41:29 +01:00
Alexander Bock
0c295ef15d Fix compile error introduced with previous commit 2021-11-02 15:11:34 +01:00
Alexander Bock
fb6807b1e0 Add the ability for lua libraries to define sublibraries 2021-11-01 22:44:32 +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
31b908952c Merge pull request #1759 from OpenSpace/feature/animation-fixes
JWST update
2021-10-25 13:50:40 +02: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
Malin E
d86923ebb7 Fix ScriptScheduler tests 2021-10-25 10:49:24 +02:00
Micah
28b9862b7c fix for url sync override dictionary value 2021-10-21 12:02:49 -04:00
Malin E
d23f220fd2 Add function to destroy the current state machine 2021-10-21 11:16:59 +02:00
GPayne
c887b1fa80 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2021-10-15 14:57:06 -06:00
GPayne
4211691c7f Update ghoul version for lua variant fix on linux 2021-10-15 14:56:31 -06:00
Gene Payne
f5ed0eae0c Typo fix in eventEngine for non-windows builds 2021-10-15 14:22:08 -06:00
ElonOlsson
a1517164f0 Merge pull request #1655 from OpenSpace/thesis/2020/radiation
Thesis/2020/radiation
2021-10-15 14:45:31 -04: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
Alexander Bock
4a860fb01d Some code facelifting 2021-10-14 10:31:46 +02:00
Alexander Bock
8d26f6e167 Set the user-agent when requesting a download (closes #1765). Also report the error code if a download fails 2021-10-13 21:46:08 +02:00
ElonOlsson
7905c7acc2 quick bug fix 2021-10-13 14:18:53 -04:00
Emma Broman
f38a7242e7 Fix the globetransformatons fix in previous commit (bc306c6f1b)
It broke the TimelineTranslation for when keyframes were using GlobeTranslations. The intial position was not set up correctly for these when the code for finding the globe was done in the update.

Bringing back the check in the matrix/position methods solved the problem. Probably the globe is guaranteed to be created when reaching this function
2021-10-12 13:25:24 +02:00
Malin E
1f0b44959f Clean up TimelineTranslation position calculation 2021-10-12 08:58:18 +02:00
Malin E
659cc09e4b Address PR comments 2021-10-12 08:52:03 +02:00
Emma Broman
bc306c6f1b Fix globe transformations not updating from height map if simulation time paused (#1766) 2021-10-12 08:37:25 +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
Emma Broman
d230675181 Add Lua function to get current application time 2021-10-11 15:43:06 +02:00
Malin E
8992f983c6 Address PR comments 2021-10-11 14:00:19 +02:00
Alexander Bock
7c7e5b2999 Remove some warnings 2021-10-11 13:38:00 +02:00
Emma Broman
aa2c94fa4c Support negative altitudes in GlobeTranslation
Necessary when height map is not used and a large negative offset is needed
2021-10-11 13:31:14 +02:00
Malin E
5152258c9a Add property to run or not run scripts at a time jump in
scriptsScheduler
2021-10-11 10:39:57 +02:00
Malin E
630360cfad Fix broken backward scripts in scriptScheduler 2021-10-11 10:29:20 +02:00
Gene Payne
e78be1e4bc Merge pull request #1760 from OpenSpace/issue/1757
Fixes Problem with Profile Properties Not Handling Table Entries (Issue 1757)
2021-10-08 14:52:48 -06:00
Malin E
e2c592e049 WIP: Add groups to scriptScheduler
* NOTE: This breaks the backwards scripts
2021-10-08 19:17:06 +02:00
Malin E
48597ec222 Merge branch 'master' into feature/animation-fixes 2021-10-08 16:22:18 +02:00
Malin E
db4f4e18ac Add action to toggle jwst trails 2021-10-08 16:20:54 +02:00
Malin E
983f7c2838 Fix forward JWST play script timing 2021-10-08 14:32:20 +02:00
GPayne
a2a8f93ba5 Moved string bracket trim function to ghoul library 2021-10-07 16:10:00 -06:00
Malin E
1a4ded3b3b Add action to switch forward/backward direction of timelapse 2021-10-07 13:44:41 +02:00