Emma Broman
b651170565
Merge branch 'thesis/2019/camera-paths'
2021-08-17 15:52:46 +02:00
Emma Broman
11a901fa2f
Fix forgotten property rename when creating camera path
2021-08-17 15:39:01 +02:00
Emma Broman
b9661392b4
Merge pull request #1667 from OpenSpace/thesis/2019/camera-paths
...
Thesis/2019/camera paths
2021-08-17 08:57:20 +02:00
Emma Broman
2a5e6dc502
Make state machine's enter/exit scripts optional
2021-08-17 08:33:00 +02:00
ElonOlsson
743e2452f8
merge master to thesis branch
2021-08-16 15:23:49 -04:00
Emma Broman
8d7d8b9ba4
Feature/state machine ( #1705 )
...
* Fix script error in old state machine example
* Add a module with a more complex state machine, that can be created and controlled through the Lua API. Useful for interactive installations
* Add an example asset for the new state machine and rename the old linear "state machine" to luastatemachine
Co-authored-by: Malin Ejdbo <malin.ejdbo@gmail.com >
2021-08-16 09:29:45 +02:00
Emma Broman
a39dcf2567
Adress review comments
2021-08-15 19:34:10 +02:00
Emma Broman
5cf5824607
Add option to flyToGeo with North as up vector
2021-08-15 18:47:15 +02:00
elonolsson
5686f2b7ed
test for PAT credential
2021-08-13 16:19:51 -04:00
elon
9c2086170b
easily fixed comments on PR
2021-08-13 15:39:13 -04:00
elon
9e47e09654
update to new version of ghoul and kameleon
2021-08-09 11:09:42 -04: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
Alexander Bock
90157ce463
Warnings and compile fixes for MSVC
2021-07-30 15:01:21 +02:00
Alexander Bock
c96764aa1c
Remove Clang warnings
2021-07-30 14:56:55 +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
f676c780f5
Prevent resetting of empty tileproviders ( closes #1383 )
2021-07-28 15:10:01 +02:00
Alexander Bock
309bce2e30
Fix DebugAxis helper; Increase the sensitivity to prevent loss of color in debug axis ( closes #1560 )
2021-07-28 14:49:29 +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
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
d38968a5ad
Don't accidentally delete someone elses VBO and VAO ( closes #1694 )
2021-07-23 11:51:48 +02:00
Alexander Bock
527bc4d108
Add support for speck keywords that are mixed case ( closes #1689 )
2021-07-22 21:04:53 +02:00
Alexander Bock
fcc1083129
Make the Speckloader ignore tabs as well as spaces ( closes #1688 )
2021-07-22 20:51:01 +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
Emma Broman
18a0a89030
Remove fogotten camera file (moved to another folder)
2021-07-14 10:22:41 +02: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
Emma Broman
4c5f45fccb
Add debugging funciton to add cartesian axes for a scene graph node
2021-07-08 09:50:35 +02: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
Emma Broman
1b3597fac4
Update navigation includes in touch module
2021-07-07 10:44:17 +02:00
Micah Acinapura
c35ff0e8f2
adapt addFocusNodes for GlobeTranslation
2021-07-06 23:38:36 -04:00
Emma Broman
d4c06951da
Update faulty docs and function name for getGeoPosition ( #1662 ) ( #1677 )
...
New name: getLocalPositionFromGeo
2021-07-06 23:37:53 -04:00
Malin Ejdbo
b910282291
Merge branch 'master' into feature/radec-conversion
2021-07-05 09:38:12 +02:00
Micah Acinapura
a8fd08efef
Feature/render at distance ( #1665 )
...
Adding option to disable distance check for globes
Co-authored-by: Alexander Bock <mail@alexanderbock.eu >
2021-07-03 20:06:11 +02:00
Malin Ejdbo
bec5274ff0
Merge in master
2021-07-02 09:53:53 +02:00
Malin Ejdbo
dbffe34395
Address PR comments
2021-07-01 17:45:28 +02:00
Malin Ejdbo
21204e8367
Address PR comments
2021-07-01 17:38:28 +02:00
Malin Ejdbo
0d259b195c
Update Ra Dec conversion lua function documentation
2021-06-29 10:48:22 +02:00
Malin Ejdbo
9ef67d30c8
Remove redundant includes
2021-06-29 10:42:12 +02:00
Malin Ejdbo
7aafe39583
Add base texture or color to ModelProjection
2021-06-28 15:28:08 +02:00
Malin Ejdbo
2c47735757
Merge branch 'master' into feature/radec-conversion
2021-06-28 12:13:58 +02:00
Malin Ejdbo
d5a12f813e
Enable both strings and numbers to lua ra dec conversion function
2021-06-28 12:05:21 +02:00
Malin Ejdbo
cd7bd0fc4b
Move ra dec conversion lua function to the space module
2021-06-28 09:20:27 +02:00
Emma Broman
44080b2f94
On second though, use a slightly lower exponent...
2021-06-24 14:05:38 +02:00
Emma Broman
d2a4d3201b
Add exponent to GlobeTranslation altitude slider
2021-06-24 13:55:25 +02:00
Emma Broman
3d4c83cd9a
Prevent NaN values in StaticTranslation by limiting min and max size
...
Also disable exponential slider for now, as they are not working well with this kind of range
2021-06-24 13:51:22 +02:00
Emma Broman
8063b54fb8
Merge branch 'master' into thesis/2019/camera-paths
...
# Conflicts:
# src/navigation/navigationhandler.cpp
2021-06-23 16:31:14 +02:00
Emma Broman
6c9840121f
Remove old autonavigation module files
2021-06-23 15:16:08 +02:00
Emma Broman
4ae70283a7
Add path rendering code to debugging module
2021-06-23 15:07:42 +02:00
Emma Broman
a247f9d1b3
Move geo path creation to globebrowsing module
2021-06-23 15:07:05 +02:00
