7265 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Bock	95db615dab	Merge branch 'master' into feature/general-performance	2020-08-24 15:09:45 +02:00
Alexander Bock	3b786c0bb8	Merge pull request #1282 from OpenSpace/issue/1174 ... Issue/1174 - step between delta time steps using GUI or keybindings	2020-08-24 14:17:30 +02:00
Alexander Bock	96625b8467	Merge pull request #1286 from OpenSpace/issue/1189 ... Add text to the render window if Tracy is enabled	2020-08-24 13:58:58 +02:00
Alexander Bock	dad5b8fb10	Merge branch 'master' into issue/1189 ... # Conflicts: # CMakeLists.txt	2020-08-24 13:58:42 +02:00
Alexander Bock	a95b332441	Merge pull request #1280 from OpenSpace/feature/remove-asset-request ... Feature/remove asset request	2020-08-24 13:54:04 +02:00
Emma Broman	08b42f32de	Add a couple of test cases for delta time steps in profile	2020-08-24 11:32:32 +02:00
Emma Broman	f8a31d11cc	Cleanup	2020-08-24 11:32:32 +02:00
Emma Broman	6475b1154d	Update some documentation for interpolating functions	2020-08-24 11:32:32 +02:00
Emma Broman	43a628e321	Add negative versions of the time steps per default and remove duplicates	2020-08-24 11:32:32 +02:00
Emma Broman	7692180bad	Verify values on input and save delta times to profile when saving settings	2020-08-24 11:32:32 +02:00
Emma Broman	a636faeaac	Add option to immediately set delta time step, without interpolation	2020-08-24 11:32:32 +02:00
Emma Broman	4293fad3e9	Add server topic for delta times and send data to GUI	2020-08-24 11:32:31 +02:00
Emma Broman	457dabe9b7	Add list of delta time steps, stepping functions and keybindings	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
Gene Payne	0756bcb3c8	Fixed a missing tab in jupiter-family_comet asset entry	2020-08-21 09:20:11 -06: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
Emma Broman	0b34e32ba7	Fix bug with marked interesting nodes not showing up in GUI	2020-08-21 14:30:13 +02:00
Alexander Bock	15e6b5519f	Making the documentation generation a bit more performant ... Outsource the file writing to a second thread to start the rendering earlier	2020-08-21 14:10:33 +02:00
Alexander Bock	83622ce339	Add some more profilng code ... Update Ghoul repository	2020-08-21 11:16:37 +02:00
Jonathas Costa	8aa087843b	Merged master again.	2020-08-20 20:09:52 -04: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
Jonathas Costa	b7886ab463	Updated Ghoul and removed unused code.	2020-08-20 11:53:10 -04:00
Alexander Bock	5aa2db2831	One more usecase of not creating a temporary std::string	2020-08-20 15:27:52 +02:00
Alexander Bock	1f2a97d7fd	Merge branch 'master' into feature/general-performance	2020-08-20 15:20:05 +02:00
Alexander Bock	8ea467b6a2	Actually remove VLD	2020-08-20 15:18:38 +02:00
Alexander Bock	8730b721f4	Remove unused vTune code ... Remove unused VLD code	2020-08-20 15:17:12 +02:00
Alexander Bock	7f5568581a	Debug mode compile fix	2020-08-20 15:10:39 +02: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	2621e16ec4	Pass the format string for the ephemeris conversion as a string_view to prevent an extra memory allocation	2020-08-19 11:12:45 +02:00
Alexander Bock	0ae699e345	Merge branch 'feature/multiple-models' into feature/general-performance	2020-08-19 10:27:39 +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
Emma Broman	8cca55019d	Remove unused layer helper asset	2020-08-18 11:38:49 +02:00
Emma Broman	2d33a0f554	Add layers to globe on layer asset initialization	2020-08-18 11:38:43 +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
Alexander Bock	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
Alexander Bock	71415e3cdb	Update Ghoul repository	2020-08-18 10:09:28 +02:00