mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,173 Commits 99 Branches 46 Tags
e93f1833bee6ca95ab433dc333635a34c04224ef
Commit Graph

1415 Commits

Author SHA1 Message Date
Alexander Bock
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
Alexander Bock
d4291163ba Move ColorTexture from RenderableModel to ModelGeometry 2020-08-18 16:00:32 +02:00
Emma Broman
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
Alexander Bock
92eb92a81b Fix the planet loading asset 2020-08-04 14:17:29 +02:00
Alexander Bock
95763de396 Add missing files for the default layers 2020-08-04 10:14:48 +02:00
Alexander Bock
e5dae26989 Rename layers to remove verb 2020-07-31 15:36:34 +02:00
Alexander Bock
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
Alexander Bock
9d269eb668 Merge pull request #1258 from OpenSpace/issue/1238 
Issue/1238
 2020-07-31 14:29:22 +02:00
Alexander Bock
e1fafb4dd3 Fix capitalization of Mercury map files (closes #1260) 2020-07-23 11:30:03 +02:00
Emma Broman
8d5a56e6ef Use vec3 color representation for fixed color in RenderableStars 2020-07-16 09:57:37 +02:00
Lovisa Hassler
9f10814466 Adding bounding sphere to ISS 2020-07-15 20:58:15 +02:00
Emma Broman
3bb47efd81 Assetize globe layers (sun, planets, dwarf planets and moons) 2020-07-14 16:31:53 +02:00
Emma Broman
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
Emma Broman
cb19f730df Mixed cleanup 2020-07-10 11:25:26 +02:00
Emma Broman
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
Emma Broman
ef0eef842d Add opacity for text labels and fix constellation label opacity 2020-07-10 11:25:26 +02:00
Emma Broman
bdb6e626ba Color values specified with vec3 instead of vec4 2020-07-10 11:25:26 +02:00
Alexander Bock
11f537e2e2 Fix issue with constellation art that left merge conflict annotations behind 2020-07-09 13:01:32 +02:00
Emma Broman
b14eba72f8 Change properties and variables to opacity instead of transparency 2020-07-08 15:54:12 +02:00
Emma Broman
a7ea25d311 Merge branch 'master' into issue/733 2020-07-08 15:33:39 +02:00
Emma Broman
9b58782771 Clean up rotation matrices in DU grids 2020-07-08 15:07:31 +02:00
Emma Broman
bdc7f7b637 Add example assets and cleanup code 2020-07-08 09:39:21 +02:00
Alexander Bock
96b775d939 Merge branch 'master' into feature/profiles 
# Conflicts:
#	data/assets/asteroids.scene
 2020-07-07 12:59:52 +02:00
Alexander Bock
cae025f530 Merge pull request #1230 from OpenSpace/issue/1217 
Issue/1217
 2020-06-30 21:16:04 +02:00
Jonathas Costa
8c15767d53 updated Radio Sphere's orientation. 2020-06-30 13:17:28 -04:00
Jonathas Costa
607a13da31 Added new Renderbin PostDeferredTransparency and PreDeferredTransparency. Fixed trails definitions when needed and satellites too. 2020-06-30 12:05:07 -04:00
Emma Broman
f7b8061601 Cleanup: remove gridMatrix property from sphericalgrid 
It is sufficient to use a Transform
 2020-06-30 15:06:54 +02:00
Jonathas Costa
e64f557bb4 Proposed solution. 2020-06-29 15:58:04 -04:00
Emma Broman
6c57e395e7 Call correct function when adding cartesian axes 2020-06-26 11:06:50 +02:00
Micah
076a96e651 updated assets and guihash to hide hidden items 2020-06-26 00:05:51 -04:00
Micah Acinapura
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
GPayne
7e143cec31 Adding C/2019 Y4 comet to asteroids scene (issue #1201) 2020-06-25 14:45:59 -06:00
Micah
841b7f1543 du size updates with carter 2020-06-23 16:46:27 -04:00
Alexander Bock
89f1835994 Add the option to add vertical offset to the on-screen log 
Set the default vertical offset when using the user interface
 2020-06-22 22:15:34 +02:00
Alexander Bock
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
Micah
aefb5fd48e updated asteroid colors with carter 2020-06-22 13:10:15 -04:00
Alexander Bock
09555ede1c Cleaning up the profile files 
Removing the old scene files
 2020-06-22 18:47:28 +02:00
Alexander Bock
b12b28f454 Merge branch 'master' into feature/profiles 
# Conflicts:
#	data/assets/scene/milkyway/constellations/constellation_art.asset
 2020-06-22 12:57:07 +02:00
Alexander Bock
4ebd7c66c7 Update the constellation art 2020-06-22 10:56:41 +02:00
Alexander Bock
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
Alexander Bock
b51b0898fc Remove 'require'/'request' parameters from asset inclusion in profiles 2020-06-22 10:05:19 +02:00
Alexander Bock
fbd903b4ff Move profiles to their own folder 2020-06-22 09:33:00 +02:00
Alexander Bock
d2fd3b8f1f Include helper assets and base assets explicitly 
Add a new function to export profile struct to module text
 2020-06-17 11:12:01 +02:00
Alexander Bock
52ca39fc22 Replace 'required' with 'require' and 'requested' with 'request' 
Continue the work of factoring out the serialization and deserialization of the profile files
 2020-06-17 09:33:41 +02:00
Alexander Bock
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
Alexander Bock
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
Alexander Bock
fbf8dc76a0 Merge branch 'master' into feature/profiles-cleanup 2020-06-15 10:30:10 +02:00
Alexander Bock
1e9df1cb4b Merge branch 'master' into feature/profiles 
# Conflicts:
#	include/openspace/scene/assetloader.h
#	src/scene/assetloader.cpp
 2020-06-14 17:54:25 +02:00
GPayne
b3ee03b8db Merge remote-tracking branch 'origin/master' 2020-06-13 18:26:29 -06:00
GPayne
4c6e94b9f8 Added meta tags to all asteroid/comet asset files 2020-06-13 18:26:05 -06:00