Commit Graph

3612 Commits

Author SHA1 Message Date
Johann Granström
2401ee5b26 Refractor and clean code 2020-09-24 11:41:00 +02:00
aniisaaden
6cd82e8e8a Opacity & Size message types added 2020-09-22 14:51:27 +02:00
aniisaaden
424e99ebed OpenSpace and Glue can both send and receive messages, and update their properties. 2020-09-18 13:39:41 +02:00
aniisaaden
3282dc80b2 Softwareintegrationmodule and Softwareconnection are two separte files. 2020-09-18 11:53:17 +02:00
aniisaaden
3d2a14b830 Splitting classes to two separate files 2020-09-18 11:19:27 +02:00
johannagranstroem
17f41e0405 Space added 2020-09-17 17:35:02 +02:00
johannagranstrom
29a42e2c55 Started the process of creating a callback in our module for property changes in our renderable 2020-09-17 17:04:51 +02:00
aniisaaden
b0403489ac Implemented messaging prototype for OpenSpace sending updated property values - work in progress 2020-09-16 16:02:56 +02:00
aniisaaden
0407e8df7d Opacity bug fixed & removescenegraphnode functionality added 2020-09-16 11:13:04 +02:00
aniisaaden
4b8f1027fd Updated comments 2020-09-15 15:50:15 +02:00
aniisaaden
66b790e941 Renderable properties can be updated from Glue if identifier is given 2020-09-15 15:03:02 +02:00
aniisaaden
467ae2a546 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration 2020-09-15 11:17:57 +02:00
aniisaaden
465b377515 Went back to previous working version - commented out new changes for bug fixing 🐛 2020-09-15 11:15:48 +02:00
Alexander Bock
98bfee301d Various Xcode compile fixes 2020-09-14 10:38:46 +02:00
Alexander Bock
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
Alexander Bock
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
Alexander Bock
6eb0aea757 Address PR comments 2020-09-04 13:46:20 +02:00
Alexander Bock
20d1e391cb Adding a new ImGui component for explicitly adding GIBS layer 2020-09-01 02:27:08 +02:00
Alexander Bock
7e06f310eb Update submodules
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
aniisaaden
8c300d7d85 Master merge 2020-08-31 10:51:02 +02:00
Alexander Bock
d0508be631 First commit 2020-08-30 22:00:13 +02:00
Alexander Bock
2cca451898 Coding style adaptations
Adapt to changes in Ghoul
2020-08-25 13:47:03 +02:00
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
Jonathas Costa
25cd3fdc0b Merged master again. 2020-08-24 13:44:26 -04:00
Alexander Bock
95db615dab Merge branch 'master' into feature/general-performance 2020-08-24 15:09:45 +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
84706aa120 Add missing zone 2020-08-23 17:57:43 +02:00
Alexander Bock
406690d37c Remove some recurring calculations from frustum culling code 2020-08-23 17:54:58 +02:00
Alexander Bock
7ddb5e8d36 Add a dirty flag to only update the layermanager once per frame 2020-08-21 17:17:19 +02:00
Alexander Bock
c1fef73faf Fix for crash when changing number of layers in GlobeBrowsing 2020-08-21 17:08:52 +02:00
Alexander Bock
f1b05c23e7 Prevent Stack corruption 2020-08-21 15:40:52 +02:00
Alexander Bock
aa4d68aac9 Adding some zones to RenderableBillboardClouds 2020-08-21 14:39:54 +02:00
Alexander Bock
83622ce339 Add some more profilng code
Update Ghoul repository
2020-08-21 11:16:37 +02:00
Jonathas Costa
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
Alexander Bock
015168f651 update submodules
No longer show log levels in log messages from SGCT twice
2020-08-20 14:52:27 +02:00
Alexander Bock
1547609dad Remove dynamic memory allocations from the quantize function 2020-08-20 14:15:13 +02:00
Alexander Bock
dc63946fef Expose the const char* functionality for Spice to prevent unnecessary string creation 2020-08-20 11:08:49 +02:00
Alexander Bock
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
Alexander Bock
6ac5d536fa Update Ghoul repository
Adapt to Ghoul changes in MemoryPool
2020-08-19 16:19:25 +02:00
Alexander Bock
89af15126b Use global memory block for the models 2020-08-19 10:27:21 +02:00
Alexander Bock
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
Alexander Bock
d4291163ba Move ColorTexture from RenderableModel to ModelGeometry 2020-08-18 16:00:32 +02:00
Alexander Bock
4f2d612abe Only create RenderData if we actually want to render the Renderable 2020-08-18 13:43:51 +02:00
Alexander Bock
88b6fdd9fe Add more Tracy markers in different renderables 2020-08-18 12:58:40 +02:00
Alexander Bock
c4db2a8ff9 No longer keep textures for RenderablePlanesCloud in RAM 2020-08-18 11:02:44 +02:00
Alexander Bock
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
Alexander Bock
b49154b83e No longer allocated unused data in the Milkyway that is overwritten immediately 2020-08-18 10:40:17 +02:00