e3699a43a8
Update Ghoul and SGCT
...
Adapt to changes by using more string_view
2020-08-09 20:11:40 +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
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
65546d9863
Merge remote-tracking branch 'origin/master' into feature/memory-allocations
2020-08-06 13:59:35 +02:00
17702c2129
Fixed include for Visual Studio Version 16.7.0
2020-08-06 13:36:08 +02:00
1cfd716026
Revert "Fixed include for Visual studio Version 16.7.0"
...
This reverts commit 91862759d3
2020-08-06 13:35:33 +02:00
91862759d3
Fixed include for Visual studio Version 16.7.0
2020-08-06 13:28:16 +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
8073d3ab8b
Remove extra memory allocation each LuaConsole::update
2020-08-06 10:33:28 +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
c472ac131e
Removing more dynamic memory allocations
2020-08-05 15:45:06 +02:00
2691dae11f
Update Ghoul repository
2020-08-05 13:29:11 +02:00
696bc31861
Moving over more allocations to the memory pool
2020-08-05 11:19:09 +02:00
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
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
a34a29c21b
Merge remote-tracking branch 'origin/master' into feature/memorypool
2020-08-04 21:47:43 +02:00
92eb92a81b
Fix the planet loading asset
2020-08-04 14:17:29 +02:00
b3eb48f4e6
Merge branch 'master' into feature/memorypool
2020-08-04 13:23:24 +02:00
33df5b9fd3
Working version that still bypasses memorypools
2020-08-04 11:43:16 +02:00
95763de396
Add missing files for the default layers
2020-08-04 10:14:48 +02:00
c3cb10453b
Intermediate commit
2020-08-04 01:11:00 +02:00
1a98b57c3b
Update Ghoul repository
2020-08-04 00:11:39 +02:00
002565603e
Merge pull request #1259 from OpenSpace/issue/997
...
issue/997 - Assetize globe layers (sun, planets, dwarf planets and moons)
2020-07-31 15:36:53 +02:00
e5dae26989
Rename layers to remove verb
2020-07-31 15:36:34 +02:00
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
9d269eb668
Merge pull request #1258 from OpenSpace/issue/1238
...
Issue/1238
2020-07-31 14:29:22 +02:00
e8c220d92a
Small coding style fixes
2020-07-31 14:28:31 +02:00
cdbe8a49ae
Merge pull request #1261 from johnriedel/fix-1260
...
issue/1260 correct capitalization of asset file references
2020-07-27 10:10:34 +02:00
e1fafb4dd3
Fix capitalization of Mercury map files ( closes #1260 )
2020-07-23 11:30:03 +02:00
08173a258c
update mercury.asset file references to match capitalization of actual file name ( #1260 )
2020-07-22 17:30:56 -06:00
9b1c11763d
Spell mistake fix
2020-07-17 18:38:27 +02:00
93135d5b18
Warn if child overwrites specified bounding sphere
2020-07-17 18:35:55 +02:00
8d5a56e6ef
Use vec3 color representation for fixed color in RenderableStars
2020-07-16 09:57:37 +02:00
b70f8422a1
Hiding Screen space properties and updating documentation
2020-07-15 20:58:48 +02:00
9f10814466
Adding bounding sphere to ISS
2020-07-15 20:58:15 +02:00
8428c0da7b
Adding bounding sphere property to scenegraph node
2020-07-15 20:57:48 +02:00
3bb47efd81
Assetize globe layers (sun, planets, dwarf planets and moons)
2020-07-14 16:31:53 +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
bfbff84cfe
Make LabelText an optional property issue #1237
2020-07-10 16:31:05 +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
Alexander Bock