696bc31861
Moving over more allocations to the memory pool
2020-08-05 11:19:09 +02:00
1acd9302b9
Phobos and Deimor radii in meters instead of km
...
Solves problems with goToGeo for these moons
2020-08-05 11:07:49 +02:00
25247c7a37
Create SceneGraphNodes in memory pool
2020-08-05 10:46:16 +02:00
e783807d66
Next step towards enabling a managed memory version of templatefactory
2020-08-04 21:56:39 +02:00
a34a29c21b
Merge remote-tracking branch 'origin/master' into feature/memorypool
2020-08-04 21:47:43 +02:00
92eb92a81b
Fix the planet loading asset
2020-08-04 14:17:29 +02:00
b3eb48f4e6
Merge branch 'master' into feature/memorypool
2020-08-04 13:23:24 +02:00
33df5b9fd3
Working version that still bypasses memorypools
2020-08-04 11:43:16 +02:00
95763de396
Add missing files for the default layers
2020-08-04 10:14:48 +02:00
c3cb10453b
Intermediate commit
2020-08-04 01:11:00 +02:00
1a98b57c3b
Update Ghoul repository
2020-08-04 00:11:39 +02:00
d9e03f402d
Added missing files.
2020-07-31 16:01:29 -04:00
393fbdca3d
OpenGL State Caching.
2020-07-31 15:59:28 -04:00
002565603e
Merge pull request #1259 from OpenSpace/issue/997
...
issue/997 - Assetize globe layers (sun, planets, dwarf planets and moons)
2020-07-31 15:36:53 +02:00
e5dae26989
Rename layers to remove verb
2020-07-31 15:36:34 +02:00
fb58aac2d4
Merge remote-tracking branch 'origin/master' into issue/997
...
# Conflicts:
# data/assets/scene/solarsystem/planets/mercury/mercury.asset
2020-07-31 15:02:30 +02:00
9d269eb668
Merge pull request #1258 from OpenSpace/issue/1238
...
Issue/1238
2020-07-31 14:29:22 +02:00
e8c220d92a
Small coding style fixes
2020-07-31 14:28:31 +02:00
cdbe8a49ae
Merge pull request #1261 from johnriedel/fix-1260
...
issue/1260 correct capitalization of asset file references
2020-07-27 10:10:34 +02:00
e1fafb4dd3
Fix capitalization of Mercury map files ( closes #1260 )
2020-07-23 11:30:03 +02:00
08173a258c
update mercury.asset file references to match capitalization of actual file name ( #1260 )
2020-07-22 17:30:56 -06:00
9b1c11763d
Spell mistake fix
2020-07-17 18:38:27 +02:00
93135d5b18
Warn if child overwrites specified bounding sphere
2020-07-17 18:35:55 +02:00
8d5a56e6ef
Use vec3 color representation for fixed color in RenderableStars
2020-07-16 09:57:37 +02:00
b70f8422a1
Hiding Screen space properties and updating documentation
2020-07-15 20:58:48 +02:00
9f10814466
Adding bounding sphere to ISS
2020-07-15 20:58:15 +02:00
8428c0da7b
Adding bounding sphere property to scenegraph node
2020-07-15 20:57:48 +02:00
3bb47efd81
Assetize globe layers (sun, planets, dwarf planets and moons)
2020-07-14 16:31:53 +02:00
41d5a6db5f
Merge pull request #1240 from OpenSpace/issue/1196
...
Issue/1196 - Unify usage of color, transparency/opacity
2020-07-13 12:23:33 +02:00
bfbff84cfe
Make LabelText an optional property issue #1237
2020-07-10 16:31:05 +02:00
cb19f730df
Mixed cleanup
2020-07-10 11:25:26 +02:00
8d45d25ed4
Append TODO comment with color and opacity info
...
This class was not working, so could not test it. As there was already a
todo comment I simply added to the comment.
2020-07-10 11:25:26 +02:00
2654164a6a
Separate opacity and color and tidy up shaders a bit
2020-07-10 11:25:26 +02:00
a9021ac8dc
Separate GlobeLabels vec4 color into opacity and vec3 color
...
This commit does not change the previous behavior. Note however that the behavior for opacity is a bit weird for this component.
2020-07-10 11:25:26 +02:00
ef0eef842d
Add opacity for text labels and fix constellation label opacity
2020-07-10 11:25:26 +02:00
bdb6e626ba
Color values specified with vec3 instead of vec4
2020-07-10 11:25:26 +02:00
66719c0881
Rename 'transparency' to 'colorFilter' in the ring classes
...
to avoid confusion with opacity name change. Also, the 'transparency'
used in the rings had a diffrent meaning than for the rest of the
rendered objects. It affects the filtering of the color values.
2020-07-10 11:25:18 +02:00
11f537e2e2
Fix issue with constellation art that left merge conflict annotations behind
2020-07-09 13:01:32 +02:00
254edd0490
Small indentation fix
2020-07-09 00:40:48 +02:00
1a0eaf2df0
Use opacity instead of transparency in TouchMarker
2020-07-08 15:54:12 +02:00
b14eba72f8
Change properties and variables to opacity instead of transparency
2020-07-08 15:54:12 +02:00
c65806d464
Update opacity property description in renderable base class
2020-07-08 15:54:11 +02:00
a7a72b1cc2
Merge pull request #1229 from OpenSpace/issue/733
...
Issue/733 - Add ability to create grids using a specialized renderable
2020-07-08 15:35:32 +02:00
a7ea25d311
Merge branch 'master' into issue/733
2020-07-08 15:33:39 +02:00
9b58782771
Clean up rotation matrices in DU grids
2020-07-08 15:07:31 +02:00
ad5907f602
Add missing meta test case for profiles
...
Fix double Meta section error message
2020-07-08 11:11:27 +02:00
bdc7f7b637
Add example assets and cleanup code
2020-07-08 09:39:21 +02:00
a700c33bdc
Merge pull request #1231 from OpenSpace/issue/1160
...
Added scaling properties to eclipses.
2020-07-07 13:19:26 +02:00
fb69d81a7a
Coding style fixes
2020-07-07 13:18:41 +02:00
19b8ea48f8
Merge pull request #1158 from OpenSpace/feature/profiles
...
Merging it Profiles that replace the previous `scene` specification
2020-07-07 13:00:44 +02:00
Alexander Bock