Commit Graph

3519 Commits

Author SHA1 Message Date
Emma Broman
63a61b3cba Tiny cleanup (const is good) 2020-08-25 11:04:14 +02:00
Emma Broman
fe13ff7e48 Some cleanup 2020-08-25 10:42:41 +02:00
Emma Broman
64b23e172a Include delta time steps in time topic
In case anyone wants to create a GUI that contains the delta time steps
2020-08-25 10:11:58 +02:00
Emma Broman
157df5ff93 Clean-up: Include delta time steps in time topic 2020-08-25 08:55:30 +02:00
Emma Broman
4293fad3e9 Add server topic for delta times and send data to GUI 2020-08-24 11:32:31 +02:00
Alexander Bock
a6d8d0e735 Small coding style fixes 2020-08-17 22:50:27 +02:00
Micah
edb7d9ba1d adding option to not reset velocity on anchor change 2020-08-13 20:16:46 -04:00
Alexander Bock
e3699a43a8 Update Ghoul and SGCT
Adapt to changes by using more string_view
2020-08-09 20:11:40 +02:00
Alexander Bock
968080abc4 Compile fix for Visual Studio 2019.7 2020-08-09 11:47:37 +02:00
Alexander Bock
dc5e2fb3a6 Merge pull request #1270 from OpenSpace/feature/memory-allocations
* Add MemoryManager to handle centralized memory
 * Create SceneGraphNodes, Renderable, and transformations in the new MemoryPool
 * Remove dynamic memory allocations throughout the codebase
 * Move the error message hack outside the scene render loop
2020-08-07 15:48:25 +02:00
Alexander Bock
a553f3eeff Remove optimization pragma 2020-08-07 15:46:34 +02:00
Alexander Bock
ca728a2f35 Remove some dynamic memory allocation from deferred atmosphere caster 2020-08-07 15:03:27 +02:00
Alexander Bock
d93be0f78d Small improvements in time conversion 2020-08-07 10:54:35 +02:00
Micah
7ecf77dc38 fix a bug in rawtilereader causing less map layers to be read 2020-08-06 16:58:40 -04:00
Alexander Bock
d39d4a91ec Move error message hack outside of scene render loop
Use std::string_view instead of std::string in more places
2020-08-06 16:02:45 +02:00
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