Commit Graph

4522 Commits

Author SHA1 Message Date
Emma Broman
d01134cfcc Rename layer subowners so that all names start with a capital
For consistency. This has bothered me for quite a while

Don't think it should be a breaking change, as the keys in any potential assets are obtained from the codegen/documentation parameters
2022-01-18 14:48:53 +01:00
Alexander Bock
2ed8113047 Fixing the Folder based TemporalTileProvider 2022-01-17 11:27:30 +01:00
Alexander Bock
111397979b Merge pull request #1800 from OpenSpace/feature/tileproviders
Feature/tileproviders
2022-01-14 12:03:52 +01:00
Alexander Bock
ba16dfccad Add and apply an explicit mode parameter 2022-01-14 12:02:51 +01:00
Emma Broman
7c3d6b4c4d Change how moveLayer works slightly, so it is easier to use in a GUI implementation
* "newPosition" is now considered to be the item's new position (index) in the list
* also update the documentation a little
2022-01-12 09:39:12 +01:00
Alexander Bock
c78ff28109 Update submodules, fix formatting for units 2022-01-05 17:06:47 +01:00
Alexander Bock
cf664cd749 Hotfix to make the Sloan Digital Sky Survey work again 2022-01-02 15:02:37 +01:00
Alexander Bock
21df9066e1 Make use of the new map feature in codegen (#1801) 2022-01-02 13:36:41 +01:00
Alexander Bock
88dc5e90d1 Add documentation 2022-01-01 22:39:30 +01:00
Alexander Bock
9668745860 Cleanup 2022-01-01 22:25:56 +01:00
Alexander Bock
468eb887db Support interpolation in Folder mode 2022-01-01 22:11:12 +01:00
Alexander Bock
1a4e0d2c88 Some more cleanup 2022-01-01 20:59:01 +01:00
Alexander Bock
9c7d01dcfb More cleanup 2022-01-01 14:57:49 +01:00
Alexander Bock
d4bd58600d Some more cleanup 2022-01-01 13:22:54 +01:00
Alexander Bock
550faec8fb Fix example, don't store DefaultTileProvider as unique_ptrs 2022-01-01 13:07:15 +01:00
Alexander Bock
2d341a875d Happy local new year 2022-01-01 12:35:36 +01:00
Alexander Bock
cdac4942b6 Merge branch 'master' into feature/tileproviders
# Conflicts:
#	ext/ghoul
#	modules/globebrowsing/src/tileprovider.cpp
#	modules/globebrowsing/src/tileprovider.h
2022-01-01 12:34:42 +01:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock
e2ea30ac1c First version of providing a folder-based temporal tileprovider 2021-12-31 20:12:25 +01:00
Alexander Bock
7e62f7af1d Turn the color map into a 1D texture 2021-12-31 18:02:53 +01:00
Alexander Bock
e97ce70107 Bring the example back to life 2021-12-31 16:04:23 +01:00
Alexander Bock
90dbb6a01f Rename Generative to Prototyped; Remove restriction on date format 2021-12-31 15:01:38 +01:00
Alexander Bock
d81644ecc5 Move temporal information from the XML file format into the asset file 2021-12-31 12:23:28 +01:00
Alexander Bock
0b496c32a9 TileProvider cleanup 2021-12-30 23:26:10 +01:00
Alexander Bock
cd2fc3f88a Splitting tile providers back into individual files 2021-12-30 11:52:34 +01:00
Alexander Bock
8b4de949dc Correctly report issue if a required asset is not available; Fix issue loading a colormap for the gaia stars 2021-12-28 23:39:33 +01:00
Alexander Bock
1245a9f9fa Remove some unnecessary state from TemporalTileProvider and return value from update functions 2021-12-27 22:16:42 +01:00
Alexander Bock
7cf5c37474 Image sequence tileprovider (#1798)
* Fix for rendering DoublePropertys in ImGui
* Adding an ImageSequenceTileProvider that loads a folder of images and makes them available through a user-selectable index
2021-12-27 18:58:05 +01:00
Alexander Bock
76b9c7587b Adapt to explicit specifcation of texture size (#1794)
* Adapt to explicit specifcation of texture size
2021-12-26 19:19:04 +01:00
Malin E
01e17266b6 Merge pull request #1787 from OpenSpace/feature/multiple-joysticks
Feature/multiple joysticks
2021-12-22 13:22:01 +01:00
Alexander Bock
debcb43ade Feature/assets (#1784)
General overhaul of the Asset loading system
2021-12-19 18:04:01 +01:00
Alexander Bock
d32af9117a Code style cleanup 2021-12-10 17:31:01 +01:00
Malin E
2753de1ab9 Merge branch 'master' into feature/multiple-joysticks 2021-11-30 10:14:45 +01:00
Alexander Bock
c1696453a5 Shader compilation fix for newer NVidia drivers 2021-11-26 09:48:29 +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