Commit Graph

296 Commits

Author SHA1 Message Date
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
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
Alexander Bock
60e3ed2170 General pass for coding style 2020-11-28 22:31:06 +01:00
GPayne
4de671e673 Fix for ascii files with windows line endings, or missing file extension 2020-11-25 13:34:50 -07:00
GPayne
0939c14639 Switched to stringstream of conversion input file, fixed binary read bug 2020-11-24 17:48:30 -07:00
GPayne
2c91c21be5 Temporarily block legacy versions, switched to using class member buffer 2020-11-23 00:14:15 -07:00
GPayne
3ba3d25a6b Changes to accept both unix and windows style path delimiters 2020-11-21 00:40:02 -07:00
GPayne
251c4d2317 Merging master into session recording changes for issue 1366 2020-11-20 10:32:58 -07:00
GPayne
763fb110d1 Removed a few obsolete functions 2020-11-19 20:23:59 -07:00
Gene Payne
822c3a2d26 Working session record conversions in tasks and OS application 2020-11-19 15:04:00 -07:00
Gene Payne
9c9f547a10 Some bug fixes for recursion problems 2020-11-18 10:20:38 -07:00
Gene Payne
76e82f273a Updates to header for sess rec legacy inherited class 2020-11-17 20:55:31 -07:00
Gene Payne
ff433fd404 Added convert file format version sess rec task for taskrunner 2020-11-17 20:54:46 -07:00
Alexander Bock
73d920d40d Make the linear speed dependent on the current framerate (closes #1369) 2020-11-16 14:00:18 +01:00
Alexander Bock
88f546ca7d Add property to disable joystickinput
Set that property to false by default to disable stray joystick input (closes #1370)
2020-11-16 11:36:16 +01:00
Gene Payne
86140d753e First draft of file format conversion ready for testing 2020-11-15 18:41:18 -07:00