Commit Graph

665 Commits

Author SHA1 Message Date
Malin E
0bf1fa3845 Merge branch 'master' into issue/1989 2022-04-19 11:33:18 +02:00
Alexander Bock
5751fe26d3 Cleanup handling of warnings (#2030) 2022-04-16 20:57:29 +02:00
Malin E
7165eeb8e1 Remove cap on number of axes and buttons for joysticks 2022-04-14 13:58:34 +02:00
Alexander Bock
c206da4a98 Coding style adaptations 2022-04-10 23:25:37 +02:00
GPayne
a7411def21 Code review fix for session recording #1905 2022-04-08 12:32:02 -06:00
GPayne
9d62b32831 Fix for ASCII recording to correctly handle multi-line keybinding script 2022-04-03 19:17:08 -06:00
Alexander Bock
acfb5d76ef Fix error introduced in the Lua function codegen update that accidentally changed some function names 2022-03-29 17:31:48 +02:00
Micah Acinapura
7c7a6e5cff sort file lists before showing user. closes #1559 (#1943) 2022-03-24 10:24:12 -04:00
Alexander Bock
3844df20c9 Feature/codegen lua (#1906)
Adapting Lua functions to new codegen functionality
Improve the documentation itself
Add some styling to generated documentation
Have parameter names for Lua-defined Lua function documentation

Co-authored-by: Emma Broman <emma.broman@liu.se>
2022-03-21 09:05:37 +01:00
Alexander Bock
a6f048e342 Add explicit checks whenever we are accessing another scene graph node (closes #1831) 2022-02-20 19:17:06 +01:00
Alexander Bock
e8072495ec Feature/warnings (#1885)
Remove many warnings from MSVC, Clang, and GCC
2022-02-16 18:33:12 +01:00
Alexander Bock
30212b6768 Adapt to new auto coding style 2022-02-10 15:20:21 +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
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
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +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
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
Alexander Bock
55ee3d2785 Remove the user data from the Lua function definition 2021-11-04 16: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
Alexander Bock
4a860fb01d Some code facelifting 2021-10-14 10:31:46 +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
Gene Payne
d0700c0b5d Merge pull request #1754 from OpenSpace/issue/1735
Removed hard-coded path expectations to allow drag & drop playback
2021-09-24 12:35:20 -06:00
GPayne
b00b900278 Get rid of some sessionrecording warnings 2021-09-22 15:58:59 -06:00
GPayne
6c5a81a677 Removed hard-coded path exepectations to allow drag-drop playback 2021-09-21 14:59:39 -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
db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02: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
GPayne
2e746e14f1 Formatting changes per code review 2021-07-30 13:41:49 -06:00
GPayne
283e1b5c16 Merge master into issue/1669 to fix build conflict 2021-07-30 13:13:14 -06:00
Alexander Bock
c0941a1243 Reset the anchor/aim node when removing a scenegraph node (closes #1402) 2021-07-29 14:22:41 +02:00
GPayne
e866a7da9e Merged master in 2021-07-19 22:41:25 -06:00
Emma Broman
8c7a2c5252 Also abort IdleBehavior when starting a session recording playback 2021-07-16 15:26:20 +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
Micah Acinapura
5a29f1a276 smaller value for adaptaive stereo hack 2021-07-07 10:39:53 -04:00
Gene Payne
018207b718 Issue/1669 (#1678)
* Potential fix for pause during playback-with-screenshots

* Fixed a typo that slipped in

* Added code from Emma to allow pausing during playback-with-frames
2021-07-07 10:33:44 -04:00
Emma Broman
85e7c6a146 A few exponential slider updates
* Add exponent to RenderableTrail period and resolution
* Lower exponent of stereoscopic depth slider, to give better control
2021-07-07 14:29:38 +02:00
GPayne
8226c9d8d0 Added code from Emma to allow pausing during playback-with-frames 2021-07-06 19:24:27 -06:00
GPayne
adcd93c9e3 Merge branch 'master' into issue/1669 2021-07-06 15:53:57 -06: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