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,126 Commits 99 Branches 46 Tags
0e3539bb23df6deb6769f5ea4483df40a152777f
Commit Graph

3504 Commits

Author SHA1 Message Date
Alexander Bock
0e3539bb23 Remove dynamic allocation in RenderableTrail 2020-08-06 11:39:33 +02:00
Alexander Bock
74c1b6cad5 Remove memory allocation in SpiceTranslation due to copy constructor of StringProperty 2020-08-06 10:56:36 +02:00
Alexander Bock
b78d1dd033 Merge branch 'master' into feature/memory-allocations 
# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h
 2020-08-05 19:06:04 +02:00
Alexander Bock
6e9db78f40 Remove performance measurements that have been supersceded by using Tracy 2020-08-05 18:28:08 +02:00
Alexander Bock
c472ac131e Removing more dynamic memory allocations 2020-08-05 15:45:06 +02:00
Alexander Bock
696bc31861 Moving over more allocations to the memory pool 2020-08-05 11:19:09 +02:00
Alexander Bock
25247c7a37 Create SceneGraphNodes in memory pool 2020-08-05 10:46:16 +02:00
Alexander Bock
e783807d66 Next step towards enabling a managed memory version of templatefactory 2020-08-04 21:56:39 +02:00
Alexander Bock
33df5b9fd3 Working version that still bypasses memorypools 2020-08-04 11:43:16 +02:00
Emma Broman
8d5a56e6ef Use vec3 color representation for fixed color in RenderableStars 2020-07-16 09:57:37 +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
Lovisa Hassler
bfbff84cfe Make LabelText an optional property issue #1237 2020-07-10 16:31:05 +02:00
Emma Broman
cb19f730df Mixed cleanup 2020-07-10 11:25:26 +02:00
Emma Broman
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
Emma Broman
2654164a6a Separate opacity and color and tidy up shaders a bit 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
Emma Broman
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
Alexander Bock
11f537e2e2 Fix issue with constellation art that left merge conflict annotations behind 2020-07-09 13:01:32 +02:00
Alexander Bock
254edd0490 Small indentation fix 2020-07-09 00:40:48 +02:00
Emma Broman
1a0eaf2df0 Use opacity instead of transparency in TouchMarker 2020-07-08 15:54:12 +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
bdc7f7b637 Add example assets and cleanup code 2020-07-08 09:39:21 +02:00
Alexander Bock
a700c33bdc Merge pull request #1231 from OpenSpace/issue/1160 
Added scaling properties to eclipses.
 2020-07-07 13:19:26 +02:00
Alexander Bock
fb69d81a7a Coding style fixes 2020-07-07 13:18:41 +02:00
Alexander Bock
96b775d939 Merge branch 'master' into feature/profiles 
# Conflicts:
#	data/assets/asteroids.scene
 2020-07-07 12:59:52 +02:00
Jonathas Costa
b60c6cd116 Added scaling properties to eclipses. 2020-07-01 13:13:04 -04:00
Jonathas Costa
d138bd97a9 Removed commented code. 2020-06-30 12:08:03 -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
Emma Broman
6b4c329a29 Refactor 2020-06-30 14:00:32 +02:00
Emma Broman
f247b714bd Add a radial grid 2020-06-30 13:48:50 +02:00
Jonathas Costa
e64f557bb4 Proposed solution. 2020-06-29 15:58:04 -04:00
Emma Broman
86c9810c95 Clean up RenderableBoxGrid 
Remove unused properties, matrix passed to shaders with float precision and reset blending state after rendering.
 2020-06-29 12:52:47 +02:00
Emma Broman
68b3d5a26e Add forgotten documentation 2020-06-29 12:52:47 +02:00
Emma Broman
7ba5c05388 Move grid renderables to their own folder 2020-06-29 12:52:47 +02:00
Emma Broman
8122d767b5 Create a new grid renderable 2020-06-29 12:52:34 +02:00
Jonathas Costa
071bea6b25 Fixed ISS' normals transformation. 2020-06-28 13:08:07 -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
Alexander Bock
8f090cfeab Added property for line width to the renderable contellation bounds (closes #1214) 2020-06-24 11:06:14 +02:00
Alexander Bock
66a2ba5c0c Merge pull request #1210 from OpenSpace/issue/1199-multi-monitor 
fixed reading config files, single_gui.xml, and updating webmodules 
closes 1199
 2020-06-23 15:22:22 +02:00
Alexander Bock
f138708fd9 Update SGCT to not require the specification of projection planes if 3D rendering in not required 
Remove comments as it is the preferred way of handling the web gui
 2020-06-23 15:18:25 +02:00
Alexander Bock
2a7932ecc2 Add checks for missing node name and directory parameters to the openspace.globebrowsing.addBlendingLayersFromDirectory function (closes #1101) 2020-06-22 22:03:29 +02:00
Micah Acinapura
621772dbb8 starting up webgui even if now window with guitag available 2020-06-22 11:58:38 -04:00
Micah Acinapura
386e7d9312 fixed reading config files, single_gui.xml, and updating webmodules for sgct init changes 2020-06-22 10:23:04 -04: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
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
Emma Broman
768d7d71bf Solve bug: default StaticRotation matrix not updated on change 2020-06-18 11:33:06 +02:00