Commit Graph

4463 Commits

Author SHA1 Message Date
ElonOlsson
60e2abdbb8 bastille day 2000 renaming 2021-10-05 10:22:55 -04:00
ElonOlsson
0737ae1834 last polishing questionmark 2021-09-24 13:08:10 -04:00
ElonOlsson
f46d37e67b small fixes and polishing 2021-09-22 16:14:07 -04:00
ElonOlsson
890d0a7bab removed some hotkeys, moved some and rebound to new keys 2021-09-21 14:54:02 -04:00
ElonOlsson
9d503ff86e Merge branch 'master' into thesis/2020/radiation 2021-09-17 11:06:15 -04:00
ElonOlsson
839e280a38 flux nodes shaders and interaction clean up 2021-09-16 16:29:42 -04:00
ElonOlsson
1833435172 removed flow functionality. Was never used and is more confusing than not imo. 2021-09-15 11:26:56 -04:00
ElonOlsson
5dea630b9d small fixes and merge of magnetogram images folders 2021-09-15 09:46:33 -04:00
Gene Payne
1c0b7c347a String-to-path fix for linux build 2021-09-14 15:45:39 -06:00
Micah
550e088d60 changes to shortcut topic for keyboard viewer 2021-09-14 12:28:57 -04:00
ElonOlsson
423d854615 Merge branch 'master' into thesis/2020/radiation 2021-09-13 18:23:33 -04:00
ElonOlsson
a812f338a8 clean up 2021-09-13 18:22:36 -04:00
ElonOlsson
b1c7635979 added changes from kameleon repo 2021-09-10 17:21:47 -04:00
ElonOlsson
ec7adfb71e fixed a merge conflict 2021-09-10 17:19:03 -04:00
ElonOlsson
505215964a more pr comments fixed 2021-09-10 17:11:44 -04:00
Alexander Bock
54b5327e50 Tiny cleanup 2021-09-09 11:27:45 +02:00
ElonOlsson
cd4ebd7532 more pr comment edits 2021-09-08 10:40:56 -04:00
ElonOlsson
70424290b7 some edits from PR comments 2021-09-08 09:50:58 -04:00
Emma Broman
506eaa6cc3 Fix GlobeRotation/Translation not updating if simulation time is paused 2021-09-06 14:46:12 +02:00
Emma Broman
82ecf60ea2 Issue/1527 - GlobeRotation (#1737)
* Add GlobeRotation and example

* Put latitude before longitude in GlobeTranslation files
2021-09-06 09:28:12 +02:00
ElonOlsson
b8f7a234ee more generic path to transfer function. Borrowing one from the bastille day folder 2021-09-03 12:01:07 -04:00
ElonOlsson
e8bc3ab19c -5000 to 5000 default min-max values on range for color quantity and masking 2021-09-03 11:45:13 -04:00
ElonOlsson
92ac9c2459 masked and colored magnetosphere asset with minMaxRange property 2021-09-03 11:21:17 -04:00
Micah
671894bd0b changes for action panel 2021-09-02 14:56:25 -04:00
ElonOlsson
f4b2c08d55 back side cull face bug fixed 2021-09-02 11:54:21 -04:00
ElonOlsson
4e6323cd8f just a few changes. Bug of cutplanes backside not showing up detected when sun is activated 2021-08-27 10:01:57 -04:00
ElonOlsson
8a63c15383 nothing 2021-08-24 15:08:14 -04:00
ElonOlsson
4411e0150b now shows first img of sequence before sequence if enabled instead of random img 2021-08-24 15:07:07 -04:00
Emma Broman
4fb88eb7af Fix some more functions that broke after Lua function cleanup
And simplify debugging axes usage
2021-08-24 16:27:26 +02:00
Alexander Bock
b649509bf0 Feature/model shader (#1723)
* Add support for RenderableModel to take custom shader code
 * Added example to highlight usage
2021-08-24 10:45:19 +02:00
ElonOlsson
21633a20c2 PR fixes, rotation corrected 2021-08-23 10:26:28 -04:00
Alexander Bock
9d8d4147e8 Feature/sync unsync (#1722)
Add Lua script to manually sync or unsync resources (closes #1713)
2021-08-23 13:42:08 +02:00
Alexander Bock
db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
Micah
27c270b217 update to rawtilereader size calculation. Closes #1716 2021-08-20 13:21:14 -04:00
Emma Broman
37d39868a9 Make flyTogeo work again
Broke after lua function cleanup PR
2021-08-20 16:41:54 +02:00
Emma Broman
41c146654f Add function to print out state machine to a dot file (#1721) 2021-08-20 13:20:35 +02:00
Alexander Bock
b2d12476dd Correctly specify the model size of the Apollo capsules (closes #1718) 2021-08-20 12:43:47 +02: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
8175a7eb5b Compile fix 2021-08-18 15:46:43 +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
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