Commit Graph

8993 Commits

Author SHA1 Message Date
Malin E 9df5457414 Merge branch 'feature/mars-moons' into project/spaceship-installation 2021-12-01 14:47:54 +01:00
Malin E 7191d536ad Add Mars moon models 2021-12-01 14:28:15 +01:00
Emma Broman 76ea508dab Tiny navigation code cleanup/fix 2021-12-01 11:31:53 +01:00
Malin E f1dca1e134 Set up start up state 2021-12-01 11:20:35 +01:00
Malin E ad89f5e98f Merge branch 'master' into project/spaceship-installation
* Solve conflicts in scene.cpp and scene_lua.inl
2021-12-01 10:42:14 +01:00
Alexander Bock 01a04a6faa Fix missing keybind for taking screenshots (closes #1786) 2021-11-26 14:50:19 +01:00
Alexander Bock c1696453a5 Shader compilation fix for newer NVidia drivers 2021-11-26 09:48:29 +01:00
Alexander Bock b966b29c05 Update SGCT repository to get rid of line ending issues 2021-11-24 15:31:20 +01:00
Malin E 6d89897c25 Merge branch 'feature/multiple-joysticks' into project/spaceship-installation 2021-11-24 13:29:24 +01:00
Malin E c1f57a7a46 Add OSC library and send messages of new joystick axis value and button
presses
2021-11-24 13:27:47 +01:00
Emma Broman 2c7bbc5dee Update GUI hash
Includes fix for broken touch gui
2021-11-23 11:42:33 +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 47a8287cf5 Add joystick assets and spaceship profile 2021-11-19 10:40:25 +01:00
Emma Broman dc8a0f7b0e Structure som properties and add option ot invert input 2021-11-19 09:13:28 +01:00
Emma Broman 77095b4467 Change angle names to match euler angles better 2021-11-19 08:38:57 +01:00
Emma Broman 51bd416fd0 Interpolate back to look at target at the end of a path 2021-11-19 08:15:28 +01:00
Emma Broman 85416e0cf9 Makes interaction during path work with joystick
Until we have a better implementation for binding joystick axes, just use the orbital navigator's joystickstates
2021-11-18 08:23:56 +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 3055f25c26 Initial navigation with mouse during path traversal 2021-11-17 14:14:15 +01:00
Emma Broman 474e96d267 Merge branch 'master' into feature/camera-control-during-path 2021-11-17 09:42:44 +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
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
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
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