Commit Graph

2053 Commits

Author SHA1 Message Date
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
GPayne a2a8f93ba5 Moved string bracket trim function to ghoul library 2021-10-07 16:10:00 -06:00
GPayne c36ea36a43 Code review changes 2021-10-07 00:26:29 -06:00
GPayne 80546313fd Fixed handling of strings with quotes or brackets, and better table push 2021-10-03 21:03:32 -06:00
GPayne 9464530cdd Changes to get lua table entries working using variant type 2021-10-01 16:44:20 -06:00
GPayne 450b101cd5 Adding support for lua table as a possible profile properties value 2021-09-28 20:35:53 -06:00
GPayne 2abf191f09 Improve scale value precision in ascii format recordings 2021-09-22 16:00:09 -06:00
GPayne b00b900278 Get rid of some sessionrecording warnings 2021-09-22 15:58:59 -06:00
GPayne a4d84d8703 Code review changes on new profile initialization 2021-09-16 23:11:02 -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 284c68f952 Finished support for modules and markInterestingNodes 2021-09-08 09:21:56 -06:00
GPayne cd50c3e4cf Working non-assetized initializations for profile sections besides modules and interesting nodes 2021-09-07 21:55:44 -06:00
Emma Broman 5620cec153 Add an OrbitAroundUp IdleBehavior
Rotates around the y-axis of the node instead of the z-axis. Would be great if the nodes themselves knew about which axis of rotation would be to prefer.
2021-09-06 15:52:50 +02:00
Emma Broman 1516c066c9 Don't scale camera path speed if no duration was given
Just using the current distance for camera speed works better than setting a default duration based on the path length
2021-08-25 15:58:28 +02:00
GPayne 194741d136 Reverted to combining assets into combined init followed by post-init 2021-08-25 00:02:45 -06:00
BlueVista bfd220374d Feature/fontcolor (#1726)
* Added two properties to control the font color of the Rotation, Zoom, and Roll toggles.
2021-08-24 10:45:44 +02:00
GPayne 4016180b8c Replaced engine init single asset call with separate profile conversions 2021-08-22 22:48:44 -06:00
Alexander Bock db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
GPayne 52e4f75b32 Separate profile conversion to assets into sections 2021-08-20 15:56:41 -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 5d11af00dc Rename curve type to path type
And clarify documentation a little. "Path type" makes more sense to a user, who is never actually exposed to the concept of curves
2021-08-16 12:59:00 +02:00
Emma Broman a39dcf2567 Adress review comments 2021-08-15 19:34:10 +02:00
Emma Broman 4ccc47161c Add an AvoidCollisionWithLookAt curve
Same path as AvoidCollision, but with lookat rotation instead of slerp. Useful (needed) for some cases in the interactive installations, but should be replaced later on as it leads to fast rotations
2021-08-13 15:55:06 +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 dfca605d63 Add the optional ability to print a stacktrace with an OpenGL error (closes #1700) 2021-07-30 15:37:03 +02:00
Alexander Bock 5b3a66156c Remove unnecessary template specification for lock_guard 2021-07-30 14:48:08 +02:00
Alexander Bock c4bddacfeb Remove nonfunctioning ABufferRenderer from RenderEngine 2021-07-30 12:01:07 +02:00
Alexander Bock e994e900ee Feature/intel atmosphere (#1691)
* Add object names to atmosphere textures
* Fix for rendering atmospheres on Intel chips
* General cleanup of the atmosphere rendering code to make a it more modular
2021-07-22 20:42:21 +02:00
GPayne 892adf62bf Eliminate duplicate frames at time transitions when saving screenshot frames during playback 2021-07-19 23:33:10 -06:00
GPayne e866a7da9e Merged master in 2021-07-19 22:41:25 -06:00
Emma Broman 3fc4c50836 Group the linear flight properties together in the UI
Note that it does break any previous usage of the linear flight, due to a the new propertyowner leading to updated URIs
2021-07-16 15:44:17 +02:00
Emma Broman 8c7a2c5252 Also abort IdleBehavior when starting a session recording playback 2021-07-16 15:26:20 +02:00
Alexander Bock 3025fbc200 Initialize OpenGLCache to nullptr to prevent faulty memory access (thanks Marco S) 2021-07-15 16:18:45 +02:00
Emma Broman cc2a255868 IdleBehavior interpolation for dampening and abort on more interactions
* Abort on: changing anchor, starting a path or navigating manually
* Add interpolation to dampen start and end of idle behavior motion
2021-07-14 16:34:50 +02:00
Emma Broman 2905fef7d9 Update camera scaling based on anchor pos even if path is playing
Previously this was only done hwen the Orbitalnavigator controlled the camera
2021-07-14 10:54:30 +02:00
Emma Broman be9df994c8 Allow applying idle behavior on path finish
Ideally we want to specify this per individual path, but for now do it with a property for the PathNavigator
2021-07-14 10:23:17 +02:00
Emma Broman 7ba319e52e Add option to orbit at constant latitude 2021-07-14 10:23:17 +02:00
Emma Broman 2241673b15 Abort idleBehavior on camera interaction 2021-07-14 10:23:16 +02:00
Emma Broman 8800f0b1cb Refactor and add a speed scale 2021-07-14 10:23:16 +02:00
Emma Broman aeb0a2cf7f Move StopBehavior to OrbitalNavigator and rename to IdleBehavior 2021-07-14 10:23:16 +02:00
Emma Broman de8005be4d Split up path helper functions to separate, more specific, files
Some in Ghoul and some in OpenSpace core util
2021-07-14 10:22:48 +02:00
Emma Broman 18a0a89030 Remove fogotten camera file (moved to another folder) 2021-07-14 10:22:41 +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
Emma Broman 771aa46fcd Adress review comments 2021-07-09 15:35:14 +02:00