Commit Graph

10114 Commits

Author SHA1 Message Date
Malin E 533b1965c7 Enable depth test for the grids 2022-09-14 11:18:39 +02:00
Malin E 1c3dd8080c Merge branch 'master' into feature/grid-labels 2022-09-14 10:42:56 +02:00
Gene Payne 7946a93ee5 Fix for linux crashing when reading OMM files
Linux doesn't use the '\r' line ending, so it doesn't recognize a line with only '\r' as being empty.
2022-09-13 16:10:03 -06:00
Emma Broman dbb973b0ec Update GUI hash
* Geo Location panel
* Dependency updates
* Getting started tour
+ some other changes/improvements
2022-09-13 10:53:30 +02:00
Gene Payne 31f859b589 Fixed string_view conversion bug in TaskRunner 2022-09-11 21:33:15 -06:00
Emma Broman ff89d7860c Use Sun position instead of SSB in Sun light source (see #2223) 2022-09-09 11:34:56 +02:00
Emma Broman 877e0fb61f Replace tabs with spaces in Eiffeltower asset 2022-09-09 11:16:36 +02:00
Malin E 9667db22c9 Small fixes 2022-09-09 10:27:17 +02:00
Malin E 4415e840a8 Use new label class for the new grids 2022-09-08 14:54:15 +02:00
Malin E 40e7d0a9bd Merge branch 'master' into feature/grid-labels
* Solve conflict in renderablegrid.h
2022-09-08 11:31:35 +02:00
Malin E 91eb006d4e Add labels to RenderableGrid class 2022-09-08 11:28:12 +02:00
Malin E 0d6f4ecac0 Change name from SpeckLabels to LabelsComponent 2022-09-08 10:08:39 +02:00
Malin E 44f7bd9225 Merge pull request #2216 from OpenSpace/feature/grids-update
Enable highlights in grids
2022-09-08 09:45:40 +02:00
Malin E 75fd08246c Switch from floats to doubles for the grids
* Avoids jittering problems when close to SSB
2022-09-08 09:41:00 +02:00
Malin E 492913d856 Merge pull request #2220 from OpenSpace/feature/jwst-trail-update
JWST trail update
2022-09-08 08:39:31 +02:00
Malin E 0055d331f2 Merge branch 'master' into feature/grids-update 2022-09-07 16:22:39 +02:00
Malin E 0a2f39dbf0 Make the argument in asset.localResource optional
* If nothing is provided, then the path to the current directory that the
  asset is located in is returned
2022-09-07 11:27:17 +02:00
Malin E 6478f0a92c Adjust asset files to use the new labels 2022-09-05 10:43:55 +02:00
Malin E c04bc24db9 Use new labels for billboards clounds 2022-09-02 14:54:01 +02:00
Malin E a28814117e Use the new labels for the Constellations 2022-09-02 14:15:02 +02:00
Malin E 55a8d19935 Merge branch 'master' into feature/grid-labels 2022-09-02 13:26:17 +02:00
Malin E c51c2ba12c Merge pull request #2213 from OpenSpace/feature/du-meshes-selection
Add ability to select constellations
2022-09-02 13:23:29 +02:00
Malin E 63bbd0d35d Remove extra commas in grid asset file 2022-09-02 10:49:36 +02:00
Malin E 611bce55cd Fix capital letters in module define 2022-09-01 14:26:31 +02:00
Malin E d76b3a902e Add generic Labels class 2022-09-01 14:15:20 +02:00
Malin E bd5aceeff9 Fix RenderableLabel specification in assets 2022-08-31 17:07:51 +02:00
Malin E 14347cfaba Rename RenderableLabels to RenderableLabel
* Since it only creates one label and not several
2022-08-31 17:02:35 +02:00
Malin E fe3e186536 Remove incorrect indentation in asset file 2022-08-31 16:01:15 +02:00
Malin E 1618b9382b Merge branch 'master' into feature/jwst-trail-update 2022-08-31 14:30:58 +02:00
Malin E bb638faf10 Move the scaling into the size parameter of the grids 2022-08-31 13:58:08 +02:00
Malin E 7b4b0ab202 Make the constellation lines data file a property 2022-08-31 13:44:31 +02:00
Malin E a095c62579 Merge branch 'master' into feature/grids-update 2022-08-31 11:00:19 +02:00
Malin E 719786452d Address some more PR commnets 2022-08-31 10:58:34 +02:00
Malin E 25782e25e9 Merge branch 'master' into feature/du-meshes-selection 2022-08-31 09:30:32 +02:00
Malin E 0ce7874b90 Address more PR comments 2022-08-31 09:10:18 +02:00
Malin E f247b500c0 Address some more PR comments 2022-08-30 18:03:47 +02:00
Emma Broman 47b36e5036 Add multiply color to renderableorbitdisc 2022-08-30 13:06:14 +02:00
Malin E fc27806acd Merge pull request #2214 from OpenSpace/issue/2194
Update the Ipac example asset
2022-08-30 11:52:07 +02:00
Malin E 933c971673 Start addressing PR comments 2022-08-29 16:27:33 +02:00
Malin E 3e142e5f2f Change default to not use highlight in grids 2022-08-29 13:57:40 +02:00
Malin E 4b88c5d308 Merge branch 'master' into feature/grids-update 2022-08-29 13:22:57 +02:00
Malin E dc55105000 Move loading of data error handling 2022-08-29 13:13:47 +02:00
Malin E 53b2d0e76c Address some more PR comments 2022-08-29 11:44:21 +02:00
Alexander Bock 3cf80e0fdc Linux compile fix 2022-08-29 08:09:33 +02:00
Malin E 41d52f7f04 Start addressing PR comments 2022-08-26 16:58:48 +02:00
Alexander Bock 664eb60f4f Increase the compile times by including more precompiled headers (#2217)
* Define WIN32_LEAN_AND_MEAN and VC_EXTRALEAN globally
* Use forked version of TUIO, some more work on precompiled headers
* Improvements for the Kameleon module
2022-08-26 16:32:21 +02:00
Malin E d1259c83a2 Small clean up 2022-08-26 14:10:02 +02:00
Malin E 767f6aa547 Use highlight feature on large grids 2022-08-26 13:46:33 +02:00
Malin E 7427544243 Add initial version of highlight feature
* Note that it currently does not work well if the number of segments are odd
2022-08-26 11:22:47 +02:00
Emma Broman 01eabd1b02 Consistent allocation of callback vectors 2022-08-26 09:13:02 +02:00