Emma Broman
474e96d267
Merge branch 'master' into feature/camera-control-during-path
2021-11-17 09:42:44 +01:00
Emma Broman
d7565f65ee
Add script to download the expolanets dataset for the dataprep task
...
* Python script to download all the columns needed
* Update task file. Use strings instead of std::filesystem::path, so that relative paths and tokens can be used
2021-11-15 13:44:57 +01:00
Emma Broman
3d3db47d76
Small include updates to adapt to inputstate changes
2021-11-12 14:07:07 +01:00
Malin E
e075f8ae82
Merge branch 'master' into feature/multiple-joysticks
...
* Solve conflicts in navigationhandler.cpp
2021-11-12 09:51:05 +01:00
Alexander Bock
109be85d48
Visual Studio 2022 compile fix
2021-11-08 23:34:41 +01:00
Emma Broman
baf67b8ed3
Temporary fix for exception when adding exoplanet systems ( #1781 )
...
The layer group might not yet be initialized when a layer is added, which leads to an exception when trying to find information about the layer group's layer manage and SGN for the event payload.
2021-11-05 14:42:34 +01:00
Alexander Bock
55ee3d2785
Remove the user data from the Lua function definition
2021-11-04 16:27:54 +01:00
Malin E
3526e14e66
Add support for several joysticks at the smae time
2021-11-04 13:19:43 +01:00
Malin E
8bddf38f02
Split InputState into MouseInputState and KeyboardInputState
2021-11-03 15:28:37 +01:00
eriksunden
24ce66aad4
Feature/tileinterpolation ( #1769 )
...
* Interpolation of tiles added to tileprovider, with additional new shaders to make this work.
* Asset file for testing interpolation
Co-authored-by: tobiasp93 <tobias.pettersson@liu.se >
Co-authored-by: Alexander Bock <alexander.bock@liu.se >
2021-11-01 09:24:40 +01:00
Malin E
a8c74979c1
Merge branch 'master' into feature/animation-fixes
2021-10-25 10:51:13 +02:00
Micah
28b9862b7c
fix for url sync override dictionary value
2021-10-21 12:02:49 -04:00
Malin E
d23f220fd2
Add function to destroy the current state machine
2021-10-21 11:16:59 +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
Emma Broman
f38a7242e7
Fix the globetransformatons fix in previous commit ( bc306c6f1b)
...
It broke the TimelineTranslation for when keyframes were using GlobeTranslations. The intial position was not set up correctly for these when the code for finding the globe was done in the update.
Bringing back the check in the matrix/position methods solved the problem. Probably the globe is guaranteed to be created when reaching this function
2021-10-12 13:25:24 +02:00
Malin E
1f0b44959f
Clean up TimelineTranslation position calculation
2021-10-12 08:58:18 +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
Alexander Bock
7c7e5b2999
Remove some warnings
2021-10-11 13:38:00 +02:00
Emma Broman
aa2c94fa4c
Support negative altitudes in GlobeTranslation
...
Necessary when height map is not used and a large negative offset is needed
2021-10-11 13:31:14 +02:00
Malin E
48597ec222
Merge branch 'master' into feature/animation-fixes
2021-10-08 16:22:18 +02:00
Malin E
992778bd50
Make JWSTPosition to a TimelineTranslation
...
* Switches from being parented to Earth to being parented to L2 at 2018
NOV 01 00:00:00
* JWSTPosition depends on two horizons files that have different
observers (Earth and L2)
2021-10-06 18:00:10 +02:00
ElonOlsson
03371c6cdb
Merge branch 'master' into thesis/2020/radiation
2021-10-05 14:52:38 -04:00
ElonOlsson
60e2abdbb8
bastille day 2000 renaming
2021-10-05 10:22:55 -04:00
Emma Broman
821e746c1a
Fix RenderablePlaneImageOnline not updating size on property change
2021-10-04 10:23:11 +02: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
