mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-19 02:18:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,264 Commits 80 Branches 48 Tags
dedabeb612d7488d4e70a01b620e323e0cbdb379
Commit Graph

3264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Broberg dedabeb612 Use updated ghoul 2016-08-17 19:32:19 -04:00
Erik Broberg 09ad585be5 Rebase to feature/globebrowsing 2016-08-17 19:16:01 -04:00
Erik Broberg 1199acc7b9 Re-add and revert back to old ThreadPool. See ticket #128 2016-08-17 18:22:27 -04:00
Erik Broberg 194a4e8832 Use fixes in ghoul 2016-08-17 18:22:27 -04:00
Erik Broberg 964953da89 Use stripped out debug scene 2016-08-17 18:17:25 -04:00
Erik Broberg 9125073cc3 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-08-16 22:20:30 -04:00
Erik Broberg 3cb519ad77 Fix bug where TileDataLayout is created based on an uninitialized variable 2016-08-16 22:20:13 -04:00
Matthew Territo c7ea365300 Merge branch 'develop' into feature/globebrowsing 2016-08-15 13:06:17 -06:00
Alexander Bock dd9eeeb092 Remove the use of PowerScaledCoordinates in the RenderableModel as it caused an interpolation issue (closing #107) 2016-08-15 20:06:04 +02:00
Erik Broberg 5bddbcd683 Init lodScaleFactor to better reflect full screen resolution 2016-08-15 12:39:20 -04:00
Erik Broberg 559cfeb63e Init LodMars with only one enabled color texture layer 2016-08-15 12:34:49 -04:00
Erik Broberg b17ab87234 Merge branch 'develop' into feature/globebrowsing 2016-08-15 12:27:08 -04:00
Alexander Bock 214a3ffde6 Update Ghoul reference 2016-08-15 10:28:19 +02:00
Matthew Territo b418066375 Set camera direction on origin/focus change 2016-08-12 12:15:07 -06:00
Erik Broberg a4ee56c571 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-08-12 11:01:40 -04:00
Erik Broberg 42dc2da6f1 Each TileProvider has its own files located in tile/tileprovider/ 2016-08-12 00:14:13 -04:00
Matthew Territo 08c9862c32 Merge branch 'develop' into feature/globebrowsing 2016-08-11 21:59:38 -06:00
Matthew Territo cc0dfdf5d1 Add simple ability to cycle through FPS (instead of Frametime) with t / Shift+t 2016-08-11 20:56:18 -06:00
Erik Broberg 06dcc05729 Fix un-added file to previous commit 2016-08-11 22:12:34 -04:00
Erik Broberg 6cb3dd1fea Update AsyncTileReader according to new features of ghoul::ThreadPool 2016-08-11 22:04:15 -04:00
Matthew Territo c3ae58afba Add access to deltaTime/getDt in SGCT/WindowWrapper 2016-08-11 19:19:07 -06:00
Erik Broberg 1dd569a3e1 Solve merge conflicts and fix bug in LayeredTextureUniformProvider 2016-08-11 17:05:14 -04:00
Alexander Bock af672b6a4e - Update Ghoul reference 
- Remove not needed cmake files
- Make ConcurrentJobManager compile again
 2016-08-11 11:12:15 +02:00
Matthew Territo dd74204eb7 Add ghoul/misc/threadpool.h 
Fix namespaces to include ghoul::
 2016-08-03 15:04:47 -06:00
Alexander Bock 42542bbb68 Include Jenkins compile fix 2016-08-03 11:08:57 +02:00
Alexander Bock 662e25963b Move ThreadPool class from OpenSpace into Ghoul 2016-08-03 10:58:53 +02:00
Erik Broberg 95da433397 Re-enable scene switching again after incorrect merge from develop 2016-08-02 20:48:53 -04:00
Erik Broberg 244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Erik Broberg e832b953c1 Reenable showing height intensities and resolution (after commit 06a5336961) 2016-08-02 18:09:14 -04:00
Alexander Bock 22c2e705f9 Added ESRI AHTSE test datasets (probably incorrectly) 2016-08-02 11:40:55 +02:00
Alexander Bock 06a5336961 Fix debugging with Clang 
Removed include of vertex operations in fragment shader
 2016-08-02 11:39:57 +02:00
Alexander Bock cd1c17aa08 Let the destruction of the global PerformanceMeasurement shared data block also delete all local copies 
Closing #113
 2016-08-02 10:13:57 +02:00
Alexander Bock 3312ebd0fe Correctly increase the reference count on PerformanceManager 2016-08-01 23:55:49 +02:00
Alexander Bock 9b84511a11 Implement a reference counting so that the global memory layout can be created from multiple applications 2016-08-01 22:13:46 +02:00
Alexander Bock 50dd45fbb1 Add an indirection layer to the PerformanceManager to support multiple shared memory blocks in cases of multiple windows per node 2016-08-01 16:20:23 +02:00
Alexander Bock b72167a270 Add dependency calculation to the buildAllModuleCombination Jenkins script (closing #116) 2016-08-01 14:34:36 +02:00
Alexander Bock 5fb03eeb4a CMake generator fix for when no modules are selected 2016-08-01 14:13:42 +02:00
Alexander Bock c418536827 Add script to build OpenSpace with no modules enabled 2016-08-01 14:06:46 +02:00
Alexander Bock bf4989d396 Changing request URL for the Launcher 
Update gitignore file
 2016-08-01 13:59:10 +02:00
Alexander Bock 81c18b2b62 Updated URLs in code or comments 2016-08-01 11:05:50 +02:00
Alexander Bock 48b5ae9166 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-08-01 09:39:49 +02:00
Alexander Bock 93b30f5078 Some cleanup of RenderableShadowCylinder 2016-07-31 22:23:20 +02:00
Alexander Bock 3fb6d3aa84 Some cleanup of RenderableFov 2016-07-31 21:43:55 +02:00
Alexander Bock 484ef636c7 PerformanceManager will automatically delete SharedMemory object if it was left previously 2016-07-31 21:24:47 +02:00
Alexander Bock 7e98922bdd Enable rendering of IVecX properties in the GuiPropertyComponent 2016-07-31 21:24:12 +02:00
Alexander Bock 5f1fa3f755 Implement shadowing on RenderableRings 2016-07-31 20:22:29 +02:00
Alexander Bock 052e6007cd Rename static constants in Property class 2016-07-31 19:27:13 +02:00
Alexander Bock 6bd0ef7102 Make OpenSpaceModule a properties::PropertyOwner so that it can own properties 
Add properties owned by OpenSpaceModule to the global settings engine (closing #104)
 2016-07-31 19:26:55 +02:00
Alexander Bock 393f39de2e Let the module registration script return a lambda that will contain all modules, thus removing the static initialization order problem 2016-07-31 19:25:15 +02:00
Matthew Territo c159e027ee Fix for GUI on multi-node setups. 
Reinstated tests for _isMaster and isRegularRendering() with GUI to prevent slave crashes
 2016-07-29 14:27:58 -06:00