Commit Graph

3406 Commits

Author SHA1 Message Date
GPayne 598f2f473a Fixed json syntax error in writing profile meta 2021-09-19 12:27:07 -06:00
GPayne c72211c322 Code review change to remove ambiguous lua push after conversion 2021-09-17 14:20:07 -06:00
GPayne a4d84d8703 Code review changes on new profile initialization 2021-09-16 23:11:02 -06:00
Emma Broman d160ac8bc8 Add Lua function to directly create path to a navigation state
Note that paths to navstates still have to be improved, but this makes out life easier when testing
2021-09-16 13:58:04 +02:00
Emma Broman 3b0a2e4c06 Rename 'generatePath' to 'createPath'
shorter, better, faster (and I keep writing this by mistake all the time)
2021-09-16 13:22:36 +02:00
Malin Ejdbo febd4c3b53 Add enable property to the ScriptScheduler
* NOTE: A rebuild of the globals library will be required to make this
commit compile
2021-09-14 17:11:30 +02:00
Malin Ejdbo a7cc3a46bd Merge branch 'master' into feature/animation-fixes 2021-09-14 13:05:18 +02:00
Malin E a61afa6404 Update JWST animation 2021-09-14 11:51:03 +02: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
Malin E 5b69cf45f1 Avoid crash in parallellconnection if there is no connection 2021-09-06 16:22:36 +02: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 46cb439a3f Tiny pathnavigation cleanup 2021-09-06 09:38:39 +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 39a6220678 Provide useful error message on SpecificationError when creating a camera path 2021-08-17 15:46:50 +02:00
Emma Broman 97f6d5aa6c Rename path instruction "Type" to "TargetType", for clarity 2021-08-16 16:29:46 +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 1765296e5b Fix problem with ignored model translation when going to specific position 2021-08-12 19:25:00 +02:00
Emma Broman 0c0b9c9fc1 Fix faulty include 2021-08-10 09:02:52 +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 f6d74870bb Don't disable the CEF UI when turning off Master rendering (#1699) 2021-07-30 12:24:46 +02:00
Alexander Bock c4bddacfeb Remove nonfunctioning ABufferRenderer from RenderEngine 2021-07-30 12:01:07 +02:00
Alexander Bock c0941a1243 Reset the anchor/aim node when removing a scenegraph node (closes #1402) 2021-07-29 14:22:41 +02:00
Alexander Bock 3e7f0d24ad Add support for DMS format support in the DashboardItemGlobeLocation (closes #1632) 2021-07-27 16:35:41 +02:00
Alexander Bock a13f94da21 Add ability to print all types of information in the printInfo/... functions (closes #1635) 2021-07-27 11:26:41 +02:00
Alexander Bock 7abc964b0e Add the ability to read files from disk (closes #1636) 2021-07-26 13:35:20 +02:00
Alexander Bock e5b88ead92 Make it possible to pass any number of arguments to the print functions (#1635) 2021-07-26 11:52:43 +02:00
Alexander Bock 3ae1028a85 Print the identifier of the offending scene graph node when the specification fails 2021-07-26 11:03:06 +02:00
Alexander Bock 817621617e Check for nan in camera setting (closes #1686), add tracy zones to atmosphere rendering 2021-07-23 14:17:16 +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 ec3881f9b0 Add some missing documentation in OrbitalNavigator 2021-07-16 15:58:42 +02: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