e0671700fc
Merge pull request #1281 from OpenSpace/issue/1277
...
Issue/1277 - Layer assets should add themselves on initialize
2020-09-07 15:41:12 +02:00
95db615dab
Merge branch 'master' into feature/general-performance
2020-08-24 15:09:45 +02:00
7603edf906
Add the ability to add multiple ModelGeometry's for a RenderableModel to show models with multiple OBJ files without needing to create multiple scene graph nodes
2020-08-18 16:34:54 +02:00
d4291163ba
Move ColorTexture from RenderableModel to ModelGeometry
2020-08-18 16:00:32 +02:00
2d33a0f554
Add layers to globe on layer asset initialization
2020-08-18 11:38:43 +02:00
df803af68a
Replace request and requestAll with require and requireAll
2020-08-18 00:19:01 +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
92eb92a81b
Fix the planet loading asset
2020-08-04 14:17:29 +02:00
95763de396
Add missing files for the default layers
2020-08-04 10:14:48 +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
e1fafb4dd3
Fix capitalization of Mercury map files ( closes #1260 )
2020-07-23 11:30:03 +02:00
8d5a56e6ef
Use vec3 color representation for fixed color in RenderableStars
2020-07-16 09:57:37 +02:00
9f10814466
Adding bounding sphere to ISS
2020-07-15 20:58:15 +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
cb19f730df
Mixed cleanup
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
11f537e2e2
Fix issue with constellation art that left merge conflict annotations behind
2020-07-09 13:01:32 +02:00
b14eba72f8
Change properties and variables to opacity instead of transparency
2020-07-08 15:54:12 +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
96b775d939
Merge branch 'master' into feature/profiles
...
# Conflicts:
# data/assets/asteroids.scene
2020-07-07 12:59:52 +02:00
cae025f530
Merge pull request #1230 from OpenSpace/issue/1217
...
Issue/1217
2020-06-30 21:16:04 +02:00
8c15767d53
updated Radio Sphere's orientation.
2020-06-30 13:17:28 -04:00
607a13da31
Added new Renderbin PostDeferredTransparency and PreDeferredTransparency. Fixed trails definitions when needed and satellites too.
2020-06-30 12:05:07 -04:00
f7b8061601
Cleanup: remove gridMatrix property from sphericalgrid
...
It is sufficient to use a Transform
2020-06-30 15:06:54 +02:00
e64f557bb4
Proposed solution.
2020-06-29 15:58:04 -04:00
076a96e651
updated assets and guihash to hide hidden items
2020-06-26 00:05:51 -04:00
6db7d503a3
Linux fixes clang ( #1216 )
...
* Changes to work on Linux.
* Multiple small fixes for Linux.
* Changes to have trails working on Linux again.
* Bring back AA Trail Lines on Linux.
* Included new branch with correction in cfitsio library linking.
* Updated SGCT.
* Changes to work on Linux.
* Remove extra #endif
* Changes to compile in Clang on Linux.
* Other fixes.
* Bring back some of the changes lost and updated clang building commands.
* requiring 10.15 for sgct, upadating sgct
Co-authored-by: Jonathas <jon.costa@gmail.com >
Co-authored-by: Tom Schober <tom@tomschober.com >
Co-authored-by: Alexander Bock <mail@alexanderbock.eu >
2020-06-25 18:55:20 -04:00
841b7f1543
du size updates with carter
2020-06-23 16:46:27 -04:00
f0b74fe799
Adding the GHRSST L4 MUR Sea Surface temperature as a replacement for the L4 G1SST that is no longer serving data ( closes #1204 )
2020-06-22 21:40:45 +02:00
aefb5fd48e
updated asteroid colors with carter
2020-06-22 13:10:15 -04:00
09555ede1c
Cleaning up the profile files
...
Removing the old scene files
2020-06-22 18:47:28 +02:00
b12b28f454
Merge branch 'master' into feature/profiles
...
# Conflicts:
# data/assets/scene/milkyway/constellations/constellation_art.asset
2020-06-22 12:57:07 +02:00
4ebd7c66c7
Update the constellation art
2020-06-22 10:56:41 +02:00
96940bac86
* Fixed GUI labeling of Uranus label
...
* Fixed spelling error in CTX blended label on Mars
* Removed now-unused debug layers on RenderableGlobes
2020-06-22 10:32:48 +02:00
e5719952b1
Add the ability to load images lazily for RenderablePlanes
...
Add ability to purge textures from RAM if they are read-only
Make use of both for constellation images to reduce the memory footprint
(cherry picked from commit 7f0c92430f
2020-06-15 16:08:28 +02:00
7f0c92430f
Add the ability to load images lazily for RenderablePlanes
...
Add ability to purge textures from RAM if they are read-only
Make use of both for constellation images to reduce the memory footprint
2020-06-15 16:07:16 +02:00
b3ee03b8db
Merge remote-tracking branch 'origin/master'
2020-06-13 18:26:29 -06:00
4c6e94b9f8
Added meta tags to all asteroid/comet asset files
2020-06-13 18:26:05 -06:00
65a3b0d801
asteroid colors with marina
2020-06-13 12:40:56 -04:00
5c5d9f36eb
Merge pull request #1195 from OpenSpace/issue/1102
...
Fixes for spherical grids were flickering.
Although they are not flickering anymore, a better correction is needed in the future
2020-06-13 16:47:56 +02:00
92f0a57cf6
Tiny cleanup
2020-06-13 16:47:35 +02:00
2ac4cac01c
Update meta information
2020-06-13 16:41:31 +02:00
789372bf40
Merge pull request #1191 from OpenSpace/issue/1165-iss-update
...
New ISS texture model
Closes #1165
2020-06-13 16:38:40 +02:00
976bf3f79b
Small cleanup
2020-06-13 16:38:06 +02:00
Alexander Bock