4477d406fe
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
2020-08-10 14:47:27 +02:00
901e6a4b35
Small change
2020-08-10 14:38:00 +02:00
968080abc4
Compile fix for Visual Studio 2019.7
2020-08-09 11:47:37 +02:00
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
a553f3eeff
Remove optimization pragma
2020-08-07 15:46:34 +02:00
ca728a2f35
Remove some dynamic memory allocation from deferred atmosphere caster
2020-08-07 15:03:27 +02:00
33c339ed31
Color update
2020-08-07 14:38:05 +02:00
0a4bed25fc
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
2020-08-07 14:21:40 +02:00
3bacb31a8f
Changed names of message types
2020-08-07 14:20:28 +02:00
02c7ebcec3
Renamed Connection class to SoftwareConnection and added message type for adding a new scene graph.
2020-08-07 13:52:07 +02:00
d93be0f78d
Small improvements in time conversion
2020-08-07 10:54:35 +02:00
7ecf77dc38
fix a bug in rawtilereader causing less map layers to be read
2020-08-06 16:58:40 -04:00
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
4c9b53c216
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
2020-08-06 14:13:00 +02:00
0e3539bb23
Remove dynamic allocation in RenderableTrail
2020-08-06 11:39:33 +02:00
74c1b6cad5
Remove memory allocation in SpiceTranslation due to copy constructor of StringProperty
2020-08-06 10:56:36 +02:00
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
6e9db78f40
Remove performance measurements that have been supersceded by using Tracy
2020-08-05 18:28:08 +02:00
baf27037c7
Simple message structure added. Messages recieved includes a header with protocol version, message type, length of message and the message. OS can receive new values for color, opacity and size when the values change.
2020-08-05 16:55:28 +02:00
c472ac131e
Removing more dynamic memory allocations
2020-08-05 15:45:06 +02:00
696bc31861
Moving over more allocations to the memory pool
2020-08-05 11:19:09 +02:00
25247c7a37
Create SceneGraphNodes in memory pool
2020-08-05 10:46:16 +02:00
e783807d66
Next step towards enabling a managed memory version of templatefactory
2020-08-04 21:56:39 +02:00
65b68f7201
Can receive message from Glue, includes length of identifiers.
2020-08-04 18:41:19 +02:00
5b77e66d2b
Added message functions, can receive string message if message length is specified.
2020-08-04 12:13:03 +02:00
33df5b9fd3
Working version that still bypasses memorypools
2020-08-04 11:43:16 +02:00
e28c9278f2
Added tcpsocket server to module, can connect to Glue but not send/receive messages
2020-07-29 16:27:47 +02:00
b0761a78c8
No error from pointscloud.asset, indention fix
2020-07-28 16:58:45 +02:00
a7efa3b6e6
Added Lua scripting
2020-07-27 14:41:45 +02:00
13f7978d0e
Size range changed
2020-07-23 16:20:15 +02:00
d1aba9ee30
Readability fixes
2020-07-20 16:54:54 +02:00
d9b51926c6
Added toggle visibility and opacity
2020-07-20 15:59:22 +02:00
2ea9a62e12
Renderablepointscloud now compatible with Glue-plugin
2020-07-20 14:56:35 +02:00
8d5a56e6ef
Use vec3 color representation for fixed color in RenderableStars
2020-07-16 09:57:37 +02:00
dda07f97fd
Readability changes
2020-07-15 14:14:28 +02:00
452d929dbe
Circular point renderable
2020-07-15 13:57:00 +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
b4ffd3677b
Removed old code
2020-07-10 16:50:46 +02:00
bfbff84cfe
Make LabelText an optional property issue #1237
2020-07-10 16:31:05 +02:00
3ce347b326
rendering from local file with ra & dec values
2020-07-10 15:46:09 +02:00
cb19f730df
Mixed cleanup
2020-07-10 11:25:26 +02:00
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
2654164a6a
Separate opacity and color and tidy up shaders a bit
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
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
f576eebe20
Created a basic point cloud renderable
2020-07-10 09:02:18 +02:00
11f537e2e2
Fix issue with constellation art that left merge conflict annotations behind
2020-07-09 13:01:32 +02:00
4f9713410d
Merge conflict resolved
2020-07-09 10:31:53 +02:00
aniisaaden