Alexander Bock
0c295ef15d
Fix compile error introduced with previous commit
2021-11-02 15:11:34 +01:00
Alexander Bock
fb6807b1e0
Add the ability for lua libraries to define sublibraries
2021-11-01 22:44:32 +01:00
Malin E
a8c74979c1
Merge branch 'master' into feature/animation-fixes
2021-10-25 10:51:13 +02:00
ElonOlsson
d7f9c1a124
merge with master
2021-10-14 11:07:01 -04:00
Malin E
fc4c3f1cfa
Merge branch 'master' into feature/animation-fixes
...
* Resolve conflicts in scene.cpp
2021-10-14 14:23:24 +02:00
Alexander Bock
4a860fb01d
Some code facelifting
2021-10-14 10:31:46 +02:00
Malin E
659cc09e4b
Address PR comments
2021-10-12 08:52:03 +02:00
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
Malin E
8992f983c6
Address PR comments
2021-10-11 14:00:19 +02:00
Malin E
5152258c9a
Add property to run or not run scripts at a time jump in
...
scriptsScheduler
2021-10-11 10:39:57 +02:00
Malin E
e2c592e049
WIP: Add groups to scriptScheduler
...
* NOTE: This breaks the backwards scripts
2021-10-08 19:17:06 +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
Malin E
26101b66cc
Add action to play timelapse in reverse
2021-10-06 13:05:14 +02:00
ElonOlsson
03371c6cdb
Merge branch 'master' into thesis/2020/radiation
2021-10-05 14:52:38 -04: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
Malin E
6deac09604
Merge branch 'master' into feature/animation-fixes
2021-09-28 08:40:16 +02:00
Malin E
802f1e0d33
Merge branch 'master' into feature/animation-fixes
2021-09-23 11:40:32 +02: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
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
ElonOlsson
423d854615
Merge branch 'master' into thesis/2020/radiation
2021-09-13 18:23:33 -04: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
ElonOlsson
743e2452f8
merge master to thesis branch
2021-08-16 15:23:49 -04: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
