d79d77f7e5
Add missing header
2020-09-25 15:51:10 +02:00
840424cc61
Resolve merge conflicts
2020-09-25 15:50:34 +02:00
eb330fed8f
Don't bind texture if nullptr
...
Lead to an exception when enabling the exoplanets renderablebillboardclouds during runtime. Should probably investigate why the renderBillboard function is called with a nullptr texture in the first place...
2020-09-25 08:55:41 +02:00
98bfee301d
Various Xcode compile fixes
2020-09-14 10:38:46 +02:00
af6e15da40
Merge remote-tracking branch 'origin/master' into feature/openglstatecache
...
# Conflicts:
# ext/ghoul
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# src/util/screenlog.cpp
2020-09-04 14:02:17 +02:00
00a00c9cc8
Merge branch 'master' into feature/general-performance
...
# Conflicts:
# apps/OpenSpace/main.cpp
# modules/server/src/topics/timetopic.cpp
2020-09-04 13:49:00 +02:00
6eb0aea757
Address PR comments
2020-09-04 13:46:20 +02:00
20d1e391cb
Adding a new ImGui component for explicitly adding GIBS layer
2020-09-01 02:27:08 +02:00
7e06f310eb
Update submodules
...
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
d0508be631
First commit
2020-08-30 22:00:13 +02:00
2cca451898
Coding style adaptations
...
Adapt to changes in Ghoul
2020-08-25 13:47:03 +02:00
63a61b3cba
Tiny cleanup (const is good)
2020-08-25 11:04:14 +02:00
fe13ff7e48
Some cleanup
2020-08-25 10:42:41 +02:00
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
157df5ff93
Clean-up: Include delta time steps in time topic
2020-08-25 08:55:30 +02:00
25cd3fdc0b
Merged master again.
2020-08-24 13:44:26 -04:00
95db615dab
Merge branch 'master' into feature/general-performance
2020-08-24 15:09:45 +02:00
4293fad3e9
Add server topic for delta times and send data to GUI
2020-08-24 11:32:31 +02:00
84706aa120
Add missing zone
2020-08-23 17:57:43 +02:00
406690d37c
Remove some recurring calculations from frustum culling code
2020-08-23 17:54:58 +02:00
7ddb5e8d36
Add a dirty flag to only update the layermanager once per frame
2020-08-21 17:17:19 +02:00
c1fef73faf
Fix for crash when changing number of layers in GlobeBrowsing
2020-08-21 17:08:52 +02:00
f1b05c23e7
Prevent Stack corruption
2020-08-21 15:40:52 +02:00
aa4d68aac9
Adding some zones to RenderableBillboardClouds
2020-08-21 14:39:54 +02:00
83622ce339
Add some more profilng code
...
Update Ghoul repository
2020-08-21 11:16:37 +02:00
f0c397d6be
Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).
2020-08-20 15:34:40 -04:00
015168f651
update submodules
...
No longer show log levels in log messages from SGCT twice
2020-08-20 14:52:27 +02:00
1547609dad
Remove dynamic memory allocations from the quantize function
2020-08-20 14:15:13 +02:00
dc63946fef
Expose the const char* functionality for Spice to prevent unnecessary string creation
2020-08-20 11:08:49 +02:00
e93f1833be
Make more use of temporary string objects in the TimeQuantizer
...
Add GPU markers to the rendering
2020-08-19 18:26:11 +02:00
6ac5d536fa
Update Ghoul repository
...
Adapt to Ghoul changes in MemoryPool
2020-08-19 16:19:25 +02:00
89af15126b
Use global memory block for the models
2020-08-19 10:27:21 +02:00
7603edf906
Add the ability to add multiple ModelGeometry's for a RenderableModel to show models with multiple OBJ files without needing to create multiple scene graph nodes
2020-08-18 16:34:54 +02:00
d4291163ba
Move ColorTexture from RenderableModel to ModelGeometry
2020-08-18 16:00:32 +02:00
4f2d612abe
Only create RenderData if we actually want to render the Renderable
2020-08-18 13:43:51 +02:00
88b6fdd9fe
Add more Tracy markers in different renderables
2020-08-18 12:58:40 +02:00
c4db2a8ff9
No longer keep textures for RenderablePlanesCloud in RAM
2020-08-18 11:02:44 +02:00
2b6d95057b
Don't keep the majority of textures in RAM if they are not needed, further reducing the memory footprint
2020-08-18 10:48:56 +02:00
b49154b83e
No longer allocated unused data in the Milkyway that is overwritten immediately
2020-08-18 10:40:17 +02:00
38caff9c02
Move a lot of the initialization of the RenderableGalaxy from the initializeGL to the initialize method to make use of the multithreading
...
Don't keep the volume in RAM when it has been uploaded to the GPU
2020-08-18 10:30:05 +02:00
b16ee5b35a
Adapt to changes in Ghoul regarding string_view
...
Fix compile error if Trace logging is not enabled
Limit the number of threads to a maximum of 4 for asset initialization
2020-08-18 10:07:38 +02:00
4d9dda9a73
Merge remote-tracking branch 'origin/master' into feature/general-performance
2020-08-18 08:56:30 +02:00
a6d8d0e735
Small coding style fixes
2020-08-17 22:50:27 +02:00
723530d525
Use quintic instead of sixtic speed, for better responsiveness and match with orbit stop behaviour
2020-08-17 11:28:11 +02:00
f2d3be8257
Use a smaller delta, to reduce visual artefacts
2020-08-17 11:10:52 +02:00
327d0090fa
Add forgotten string concatentation
2020-08-17 10:36:47 +02:00
925138c4cf
Add possibility to change size of rendered spheres/lines
2020-08-16 21:04:17 +02:00
cc52dc6277
Add property for scaling default speed - to use in dome presentation
2020-08-16 11:32:39 +02:00
97811d82d0
Fix error with time quantizer string conversion
...
Fix error with uninitialized memory in GlobeBrowsing
Remove dynamic memory allocation from on-screen rendering
2020-08-14 14:10:54 +02:00
edb7d9ba1d
adding option to not reset velocity on anchor change
2020-08-13 20:16:46 -04:00
Emma Broman