Commit Graph

5116 Commits

Author SHA1 Message Date
Malin E e215e9f2a7 Add labels to the other grid classes too 2022-09-19 12:07:59 +02:00
Malin E 69790882b9 Merge branch 'master' into feature/grid-labels 2022-09-19 09:38:40 +02:00
Emma Broman 57dc7dd6b8 Add some missing includes 2022-09-16 08:18:54 +02:00
Malin E dcdfbf028f Add font size and face camera property 2022-09-14 13:25:45 +02:00
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
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 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 0055d331f2 Merge branch 'master' into feature/grids-update 2022-09-07 16:22:39 +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 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 14347cfaba Rename RenderableLabels to RenderableLabel
* Since it only creates one label and not several
2022-08-31 17:02:35 +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 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
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
Malin E 40267804bd Some clean up 2022-08-25 13:48:48 +02:00
Malin E 6aef6ebde4 Merge branch 'master' into feature/du-meshes-selection 2022-08-24 15:02:18 +02:00
Alexander Bock 979a5e3378 SkyBrowser Hash Handling (#2201)
* Add the loading of a hash for wwt image files and automatically force a redownload of the files if the hash has changed
* Move the wwtdataimages location into the sync folder
* Some general code cleanup
2022-08-22 15:16:07 +02:00
Malin E 5bdd3d0f8c Make the Constellations name file optional 2022-08-10 13:57:47 +02:00
Malin E 87a45e7376 Fix asset selection of constellations 2022-08-09 17:01:41 +02:00
Malin E ceaf85f606 Some more cleanup 2022-08-09 14:28:16 +02:00
Malin E 844c4ffb84 Merge branch 'master' into feature/du-meshes-selection 2022-08-09 09:02:16 +02:00
Malin E 54dcdcf0f1 Some clean up 2022-08-09 08:54:41 +02:00
Ylva Selling 160eab1c1e Remove display copy properly. Close #2200 2022-08-08 17:23:44 -04:00
Malin E 8c01d536b6 Restore RenderableDUMeshes class 2022-08-05 17:01:12 +02:00
Malin E 6efb99e551 Fix constellation bounds render issue 2022-08-05 16:59:04 +02:00
Malin E a2938c8384 Update label file cache format 2022-08-05 15:12:43 +02:00