mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-16 18:40:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,240 Commits 83 Branches 46 Tags
bbef4ea22be7f28cc742cc807d681e041db72553
Commit Graph

7240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Bock
bbef4ea22b Update keybindingmanager.cpp 
Fix tiny typo
 2020-09-09 11:04:46 +02:00
Jonathas Costa
9b8f2a8efc Added missing header to fix compilation on Linux. 2020-09-08 11:07:51 -04:00
Alexander Bock
e0671700fc Merge pull request #1281 from OpenSpace/issue/1277 
Issue/1277 - Layer assets should add themselves on initialize
 2020-09-07 15:41:12 +02:00
Alexander Bock
7c784e08c8 Merge pull request #1288 from OpenSpace/feature/openglstatecache 
Feature/openglstatecache
 2020-09-04 16:20:09 +02:00
Alexander Bock
13a62a5f79 Missing commit 2020-09-04 16:19:39 +02:00
Alexander Bock
463bb6b868 Update ghoul repository 2020-09-04 14:03:22 +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
539a8b8274 Merge pull request #1287 from OpenSpace/feature/general-performance 
Feature/general performance
 2020-09-04 13:53:11 +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
b99a4c7390 Update submodules 2020-09-04 13:47:26 +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
1b69842cdc Merge pull request #1290 from OpenSpace/feature/more-cleanup 
Feature/more cleanup
 2020-09-01 01:20:24 +02:00
Alexander Bock
7e06f310eb Update submodules 
Remove warnings and MSVC analyzer information messages
 2020-09-01 01:18:17 +02:00
Alexander Bock
d0508be631 First commit 2020-08-30 22:00:13 +02:00
Alexander Bock
313e1801a8 Update Ghoul repository 2020-08-25 13:53:26 +02:00
Alexander Bock
2cca451898 Coding style adaptations 
Adapt to changes in Ghoul
 2020-08-25 13:47:03 +02:00
Emma Broman
19c110a4c2 Update gui hash 2020-08-25 13:08:54 +02:00
Emma Broman
329798fa74 Merge pull request #1289 from OpenSpace/issue/1174 
Delta time steps server code cleanup
 2020-08-25 11:06:55 +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
11ad1df863 Removed personal configuration. 2020-08-24 13:50:36 -04: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
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