bfe25c311b
Merge branch 'master' into thesis/2019/camera-paths
...
# Conflicts:
# src/rendering/abufferrenderer.cpp
2021-08-09 15:21:08 +02:00
2e746e14f1
Formatting changes per code review
2021-07-30 13:41:49 -06:00
283e1b5c16
Merge master into issue/1669 to fix build conflict
2021-07-30 13:13:14 -06:00
dfca605d63
Add the optional ability to print a stacktrace with an OpenGL error ( closes #1700 )
2021-07-30 15:37:03 +02:00
5b3a66156c
Remove unnecessary template specification for lock_guard
2021-07-30 14:48:08 +02:00
c4bddacfeb
Remove nonfunctioning ABufferRenderer from RenderEngine
2021-07-30 12:01:07 +02:00
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
892adf62bf
Eliminate duplicate frames at time transitions when saving screenshot frames during playback
2021-07-19 23:33:10 -06:00
e866a7da9e
Merged master in
2021-07-19 22:41:25 -06:00
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
8c7a2c5252
Also abort IdleBehavior when starting a session recording playback
2021-07-16 15:26:20 +02:00
3025fbc200
Initialize OpenGLCache to nullptr to prevent faulty memory access (thanks Marco S)
2021-07-15 16:18:45 +02:00
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
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
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
7ba319e52e
Add option to orbit at constant latitude
2021-07-14 10:23:17 +02:00
2241673b15
Abort idleBehavior on camera interaction
2021-07-14 10:23:16 +02:00
8800f0b1cb
Refactor and add a speed scale
2021-07-14 10:23:16 +02:00
aeb0a2cf7f
Move StopBehavior to OrbitalNavigator and rename to IdleBehavior
2021-07-14 10:23:16 +02:00
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
18a0a89030
Remove fogotten camera file (moved to another folder)
2021-07-14 10:22:41 +02:00
14af0e5a93
Time manager uses simulated application time during playback-with-frames
2021-07-11 14:43:54 -06:00
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
771aa46fcd
Adress review comments
2021-07-09 15:35:14 +02:00
b910282291
Merge branch 'master' into feature/radec-conversion
2021-07-05 09:38:12 +02:00
8e5a7034ee
Add the ability to optionally ignore the scale value read from session recordings
2021-07-04 19:45:54 +02:00
ee3e0c8ae0
Start cleaning up and document some helper functions
2021-07-02 11:23:15 +02:00
0019360a2c
Tiny navigation code cleanup
2021-07-02 09:43:04 +02:00
1912f8f08b
Avoid non-supported ranges for exponential slider ( #1672 )
...
* Warn if setExponent is called with an invalid minmax range
* Disable bounding and interaction sphere exponent, to suppress warning
2021-07-02 08:11:37 +02:00
87da9a27ab
Feature/path normalization ( #1674 )
...
* Path normalization (making sure there are fewer cases of '"..."'
* Using more std::filesystem::path instead of std::string
* Update Ghoul
2021-07-01 23:46:22 +02:00
21204e8367
Address PR comments
2021-07-01 17:38:28 +02:00
9dc2b3348b
Clean up
2021-06-29 10:06:19 +02:00
2c47735757
Merge branch 'master' into feature/radec-conversion
2021-06-28 12:13:58 +02:00
d5a12f813e
Enable both strings and numbers to lua ra dec conversion function
2021-06-28 12:05:21 +02:00
6119b9b2a2
Make speed scale affect speed during path traversal
2021-06-24 15:04:25 +02:00
8063b54fb8
Merge branch 'master' into thesis/2019/camera-paths
...
# Conflicts:
# src/navigation/navigationhandler.cpp
2021-06-23 16:31:14 +02:00
43729ed911
Move path creation code into path class file
2021-06-23 15:58:48 +02:00
890c8ae25f
Restructure helper function slightly (gotta find out where to place them later on)
2021-06-23 15:18:00 +02:00
4ae70283a7
Add path rendering code to debugging module
2021-06-23 15:07:42 +02:00
77bdfaefd6
Move camera path code into core and refactor navigation code a bit
2021-06-23 09:12:36 +02:00
c39baac3a8
Add functions to convert a cartesian coordinate to a ra dec distance
2021-06-21 13:43:31 +02:00
741ed2ac05
Remove remnant of scriptlogtype in log message
2021-06-18 09:16:15 +02:00
b1f10b1b70
Add the ability to specify RenderEngine font sizes in the configuration file ( closes #1653 )
2021-06-17 15:39:16 +02:00
094ca18471
Merge branch 'master' into feature/radec-conversion
2021-06-17 11:19:51 +02:00
a69b636dea
Global sweep to cleanup the handling of floating point numbers and glm default initialization
2021-06-16 23:09:49 +02:00
660ff65baf
Rause code for the conversion for ra and dec
...
* float -> double
* Add error handling
2021-06-16 10:56:46 +02:00
c8d7d5c294
Merge branch 'master' into feature/radec-conversion
2021-06-15 15:44:24 +02:00
9043f7d3cd
Add initial version of lua ra dec conversion function
2021-06-15 09:18:33 +02:00
d139b38d31
Seperate the different joystick configurations into their own assets
2021-06-11 16:30:16 +02:00
402233da85
Change profile code to make it work with GCC 9.3
2021-05-31 13:23:47 +02:00
Emma Broman