Commit Graph

310 Commits

Author SHA1 Message Date
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
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Malin E
c4e763e6a1 Increase maximum number of buttons allowed on a joystick 2021-12-08 10:09:54 +01:00
Malin E
8299e4db22 Address PR comments 2021-11-30 10:46:44 +01:00
Malin E
78b1f2c6e1 Remove support for sticky axis and sensitivity to Property type 2021-11-17 16:57:05 +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
a515f85234 Add ability to bind a joystick axis to a property value 2021-11-11 09:27:54 +01:00
Malin E
3526e14e66 Add support for several joysticks at the smae time 2021-11-04 13:19:43 +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
GPayne
b00b900278 Get rid of some sessionrecording warnings 2021-09-22 15:58:59 -06:00
GPayne
5b63fff944 Merge branch 'master' into feature/profileOverScene 2021-09-12 21:11:12 -06:00
GPayne
51f6c9d45b Rearranged profile initializations and verified that all init correctly 2021-09-12 21:05:00 -06:00
GPayne
cd50c3e4cf Working non-assetized initializations for profile sections besides modules and interesting nodes 2021-09-07 21:55:44 -06:00
Alexander Bock
af617d1d10 Feature/lua function cleanup (#1719)
General cleanup of Lua functions and handling of variable extract from a Lua state
2021-08-19 16:02:14 +02:00
Alexander Bock
34985f64a6 Feature/keybindings (#1708)
* Add action manager to handle actions in replacement of keyboard shortcuts
* Implement new Action concept
* Remove the shortcutscomponent as it is no longer needed
* Update profile version from 1.0 to 1.1
* Add action dialog
* Restructure of key specification in keys.h
* Remove solid field-of-view keybind from the newhorizons profile as the setting no longer exists
2021-08-18 10:58:20 +02:00
Emma Broman
bfe25c311b Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	src/rendering/abufferrenderer.cpp
2021-08-09 15:21:08 +02:00
Emma Broman
2241673b15 Abort idleBehavior on camera interaction 2021-07-14 10:23:16 +02:00
GPayne
14af0e5a93 Time manager uses simulated application time during playback-with-frames 2021-07-11 14:43:54 -06:00
Emma Broman
16173d7afe Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts
# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl
2021-07-09 15:43:17 +02:00
Alexander Bock
8e5a7034ee Add the ability to optionally ignore the scale value read from session recordings 2021-07-04 19:45:54 +02:00
Emma Broman
8063b54fb8 Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	src/navigation/navigationhandler.cpp
2021-06-23 16:31:14 +02:00
Emma Broman
77bdfaefd6 Move camera path code into core and refactor navigation code a bit 2021-06-23 09:12:36 +02:00
Malin Ejdbo
d139b38d31 Seperate the different joystick configurations into their own assets 2021-06-11 16:30:16 +02:00
GPayne
0d5909b6a9 Merge master in 2021-05-24 23:49:51 -06:00
Malin E
ebaeb5d568 Merge pull request #1593 from OpenSpace/feature/space-mouse
Feature/space mouse
2021-05-24 14:01:05 +02:00
GPayne
e374eef72d Fixed merge conflicts with master 2021-05-20 19:55:49 -06:00
GPayne
3f9ae245c7 Added loop playback option to repeat playback file 2021-05-20 19:06:39 -06:00
GPayne
fb739d719e Restored support for session recording files in any directory 2021-05-20 12:44:29 -06:00
GPayne
5dfe4cb5c2 Added topic for new session recording pausing within playback 2021-05-20 12:09:11 -06:00
Malin Ejdbo
80eba3bdd9 Address PR comments 2021-05-20 13:44:45 +02:00
GPayne
413639e9fe Fixed problems with pausing time and time management 2021-05-19 19:47:51 -06:00
Malin Ejdbo
0d06c68f6f Clean up 2021-05-18 16:41:15 +02:00
Alexander Bock
92432caed2 Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string 2021-05-17 00:23:15 +02:00
GPayne
e95ca6c3e8 Fixed minor timing bugs while running full test of record/playback 2021-04-26 21:29:52 -06:00
Malin Ejdbo
08118ba7bb Add initial support for SpaceMouse as joystick input 2021-04-23 10:52:31 +02:00
GPayne
7371c5bd09 Fixes for tracking nodes that are used in a recording 2021-04-22 21:58:18 -06:00
GPayne
d012ee2fbb Added preprocessing to reject recording if used scenegraphnodes are not loaded 2021-04-20 16:22:01 -06:00
GPayne
e94fbb2adf Added reject lists for property and scripts during playback 2021-04-15 16:57:20 -06:00
GPayne
fbec2fe713 Updated save-to-disk when recording ends 2021-04-13 14:21:33 -06:00
GPayne
b00e1cc5ab Switched to using timeline in memory during recording 2021-04-09 11:28:15 -06:00
Gene Payne
d060780f99 Added method for saving current value of a property while recording 2021-03-22 12:21:32 -06:00
GPayne
681d2fcd71 Merge master in 2021-01-06 20:59:31 -07:00
Alexander Bock
7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Gene Payne
61aaf60825 Implemented pause-during-playback feature 2020-12-13 16:23:19 -07:00
Gene Payne
5ed85d8fcd Fix for property change interpolation during playback with screenshots 2020-12-11 12:40:22 -07:00
Alexander Bock
778b4e61b3 Revert "Better handle interpolation when setting interpolation time to 0"
This reverts commit 8cf5f96392.
2020-12-11 12:30:05 +01:00
Gene Payne
ba4e47b54e First pass at interpolation fix during playback with screenshots 2020-12-08 19:55:09 -07:00
Gene Payne
876493c6dd Comment-only changes with instructions for bumping SessionRecording version 2020-11-30 21:38:54 -07:00