Commit Graph

10138 Commits

Author SHA1 Message Date
Ylva Selling
41b45de1fb Merge remote-tracking branch 'origin/master' into issue/2029 2022-10-06 15:13:01 -04:00
Emma Broman
ec3a765d1a Add an empty profile 2022-10-06 17:16:53 +02:00
Malin E
866b37fac3 Expose ambient intensity value for globes as a property 2022-09-28 12:03:41 +02:00
Malin E
0bf06427e2 Merge pull request #2242 from OpenSpace/feature/grid-labels
Labels update
2022-09-28 11:19:28 +02:00
Malin E
8129762524 Add loggercat for labelscomponent 2022-09-28 11:14:07 +02:00
Malin E
7883311740 Merge branch 'master' into feature/grid-labels 2022-09-28 10:51:11 +02:00
Malin E
71a2cf685a Remove not needed initialization 2022-09-23 15:35:29 +02:00
Gene Payne
eded668b95 Merge pull request #2226 from OpenSpace/issue/2209
Issue/2209 Fixes for Session Recording Conversion
2022-09-22 10:10:11 -06:00
Malin E
ac79e4dc07 Start addressing PR comments 2022-09-22 12:01:01 +02:00
Alexander Bock
f502922338 CMake cleanup (#2246)
* Simplification of the DLL copying mechanism on Windows
* Only deploy Qt on Windows
* Use set_target_properties function
2022-09-21 10:52:05 +02:00
Gene Payne
ae84f1b120 Renderable prop change updates buffers without reinitializing GL (#2241) 2022-09-20 15:40:12 -06:00
Malin E
34aa515f16 Fix issue with grid for different x and y values
* Also adjust grid example asset to showcase the highlight feature
2022-09-19 14:37:42 +02:00
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
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
GPayne
0ba064e141 Fix to account for possible empty string in session recording script 2022-09-11 21:42:46 -06:00
Gene Payne
31f859b589 Fixed string_view conversion bug in TaskRunner 2022-09-11 21:33:15 -06:00
GPayne
acf45e858b Fixed file path bug with converting session recording version 2022-09-11 19:42:56 -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