Commit Graph

1466 Commits

Author SHA1 Message Date
Christian Adamsson
9fdf98b7d2 Merged master into thesis/2020/radiation 2020-07-28 11:13:50 +02:00
Christian Adamsson
902a5d124a Merge conflicts resolved 2020-07-27 16:58:00 +02:00
Christian Adamsson
25b6a19b12 Functionality for higher resolution data and node manipulation 2020-07-27 16:40:25 +02:00
Emilie
21705b167b Added hotkey (Sun artificially positioned behind the observer, remove shading on Earth and Moon and show Moon trail) 2020-07-27 14:56:46 +02:00
Emilie
ebe1bad7d4 Added function to show selected streams + function for flow which extends over all nodes
It is now possible to show selected streams which is not dependent on flow. And flow is now no longer an enhance method, and extends over all the nodes. Also added small changes and code clean up
2020-07-24 11:46:58 +02:00
Christian Adamsson
672fd67e8a Code cleanup and refactoring 2020-07-23 12:34:16 +02:00
Alexander Bock
e1fafb4dd3 Fix capitalization of Mercury map files (closes #1260) 2020-07-23 11:30:03 +02:00
Christian Adamsson
8eaf7ac129 Added modeltranformation to cameraposition and earthposition 2020-07-22 16:50:52 +02:00
Emilie
cff35bc91c Added label for speed of light 2020-07-20 15:25:25 +02:00
Christian Adamsson
54d61d4981 Changed parent in asset file in order to get correct camera position 2020-07-20 15:00:10 +02:00
Emilie
d102965b9a Functions to draw arrow (commented)
+ file name changes
2020-07-17 13:33:52 +02:00
Emma Broman
8d5a56e6ef Use vec3 color representation for fixed color in RenderableStars 2020-07-16 09:57:37 +02:00
Christian Adamsson
cfcf84526e Changed parent in asset file 2020-07-15 14:49:45 +02:00
Christian Adamsson
c82b8aa420 Added new renderable for visualizing the speed of light 2020-07-13 17:10:31 +02:00
Christian Adamsson
5cc7eedee7 Merge remote-tracking branch 'origin/thesis/2020/radiation' into thesis/2020/radiation 2020-07-13 17:00:15 +02:00
Christian Adamsson
c0ec97aa15 Cleanup of code in .scene file 2020-07-13 16:58:29 +02:00
Emilie
9bbc189fb1 Added time restart button for CME 2020-07-13 14:34:40 +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
Christian Adamsson
be7e924fe1 Changed structure around loading in binaries and small changes 2020-07-13 10:37:15 +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
Emilie
4344b9435a Changed the appearance of the flow
Added another color table for the flow (brighter than the usual color table)
2020-07-08 16:50:59 +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
Christian Adamsson
c54ed88901 Merge remote-tracking branch 'origin/thesis/2020/radiation' into thesis/2020/radiation 2020-07-08 14:16:52 +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
Emilie
bd4b8106c6 Fixed issue with alpha channel
+ changed color table width
2020-07-07 10:49:43 +02:00
Christian Adamsson
d679214be0 two json files that describes streams close to earth 2020-07-06 13:01:52 +02:00
Christian Adamsson
a00402b61a Merge conflict solved 2020-07-03 15:31:54 +02:00
Christian Adamsson
ba94eb6b9e Tried to make keybindings and asset universal and not local, WIP 2020-07-03 15:30:17 +02:00
Christian Adamsson
97f7789c97 Added assets and tried making it accesable for new user with this branch 2020-07-03 15:28:53 +02:00
Emilie
88c5794ee5 Added size scaling and color table as one enhance method
Added size scaling and color table as one enhance method, fixed issue with drawing lines instead of node skipping. Moved legend.
2020-07-03 11:52:50 +02:00
Emilie
8ce69ee242 Small fixes and code cleanup 2020-07-01 17:01:53 +02:00
Christian Adamsson
87612778a6 Merge remote-tracking branch 'origin/thesis/2020/radiation' into thesis/2020/radiation 2020-07-01 16:58:06 +02:00
Christian Adamsson
80fc630dd6 Fixed new Keybindings and added more propertychanges 2020-07-01 16:57:51 +02:00
Emilie
1109b7d23b Fixed asset to show cut planes 2020-07-01 16:05:26 +02:00
Christian Adamsson
49fe5e933e Changed the way cut plane gets transformation 2020-07-01 13:22:56 +02:00
Emilie
b4d413338a Added functionality to color specific nodes close to Earth
with different color tables
2020-07-01 11:38:43 +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
Emilie
e89104641a node size dependent on Earth position fixed + moved legend 2020-06-30 15:29:29 +02:00
Christian Adamsson
9ab6041b40 Basic renderableplaneimagelocal asset added 2020-06-30 15:18:55 +02: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
Emilie
64eface23c node size dependent on Earth position fixed 2020-06-30 11:18:50 +02:00