Commit Graph

8974 Commits

Author SHA1 Message Date
GPayne 49cdabe647 Second attempt at fixing tracy and websocketpp subs in sgct and ghoul 2021-12-06 17:32:35 -07:00
Emma Broman 57e662e8e2 Update a couple of broken tests 2021-12-06 13:47:29 +01:00
Emma Broman 59dc296cf1 Update ghoul to use new luaTableToString function
And update some tests based on the change
2021-12-06 13:21:39 +01:00
GPayne 36f06c494f Updating version of ghoul using updated tracy and websocketpp refs 2021-12-03 12:42:34 -07:00
GPayne 0c0e6957f6 Updating version of sgct which uses OpenSpace fork of tracy 2021-12-03 12:17:03 -07:00
Emma Broman a921f983ca Fix broken navigation states: Now works with aim as well as anchor 2021-12-01 14:30:28 +01:00
Emma Broman 76ea508dab Tiny navigation code cleanup/fix 2021-12-01 11:31:53 +01:00
Alexander Bock 01a04a6faa Fix missing keybind for taking screenshots (closes #1786) 2021-11-26 14:50:19 +01:00
Alexander Bock c1696453a5 Shader compilation fix for newer NVidia drivers 2021-11-26 09:48:29 +01:00
Alexander Bock b966b29c05 Update SGCT repository to get rid of line ending issues 2021-11-24 15:31:20 +01:00
Emma Broman 2c7bbc5dee Update GUI hash
Includes fix for broken touch gui
2021-11-23 11:42:33 +01:00
Emma Broman b41d5efd25 Extra check to prevent zero length segments in ZoomOutOverview camera path 2021-11-23 11:15:59 +01:00
Emma Broman d1821ae0e4 Add lua functions to get the bounding and interaction sphere values for a SGN 2021-11-23 10:00:51 +01:00
Alexander Bock 51fe17c320 Fix an issue where the removal of a screenspacerenderable is published after the screenspace renderable has already been destroyed 2021-11-21 00:46:50 +01:00
Emma Broman 73895e4c62 Fix problems in avoid collision path when start and end position are the same 2021-11-17 09:39:03 +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
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
Alexander Bock e3e468d5ef Update submodules again 2021-11-04 13:29:09 +01:00
Alexander Bock f390051e1d Update submodules. Disable /ZI compile-flag when Tracy is enabled to prevent compile errors 2021-11-04 11:35:09 +01:00
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
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 31b908952c Merge pull request #1759 from OpenSpace/feature/animation-fixes
JWST update
2021-10-25 13:50:40 +02:00
Malin E c94ce3c78a Move reparent script 2021-10-25 11:05:31 +02:00
Malin E a8c74979c1 Merge branch 'master' into feature/animation-fixes 2021-10-25 10:51:13 +02:00
Malin E d86923ebb7 Fix ScriptScheduler tests 2021-10-25 10:49:24 +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
GPayne c887b1fa80 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2021-10-15 14:57:06 -06:00
GPayne 4211691c7f Update ghoul version for lua variant fix on linux 2021-10-15 14:56:31 -06:00
Gene Payne f5ed0eae0c Typo fix in eventEngine for non-windows builds 2021-10-15 14:22:08 -06:00
ElonOlsson a1517164f0 Merge pull request #1655 from OpenSpace/thesis/2020/radiation
Thesis/2020/radiation
2021-10-15 14:45:31 -04:00
ElonOlsson d7f9c1a124 merge with master 2021-10-14 11:07:01 -04:00
ElonOlsson d0dfa67641 removed a space 2021-10-14 11:01:50 -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
Alexander Bock 8d26f6e167 Set the user-agent when requesting a download (closes #1765). Also report the error code if a download fails 2021-10-13 21:46:08 +02:00
ElonOlsson 7905c7acc2 quick bug fix 2021-10-13 14:18:53 -04: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
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
Emma Broman d230675181 Add Lua function to get current application time 2021-10-11 15:43:06 +02:00
Malin E 8992f983c6 Address PR comments 2021-10-11 14:00:19 +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 5152258c9a Add property to run or not run scripts at a time jump in
scriptsScheduler
2021-10-11 10:39:57 +02:00