mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,184 Commits 84 Branches 47 Tags
d91dd3dbb7d24ae1a9f48479f1d50ebed2bfbd39
Commit Graph

1268 Commits

Author SHA1 Message Date
Erik Broberg 751a157f86 Use smart pointers and std::make_shared in TileProviders 2016-06-21 18:25:50 -04:00
Erik Broberg c7ff3a4730 Remove unused GUI property chunkHeight 2016-06-21 17:21:37 -04:00
Erik Broberg 427cc0cc2b Reduce local chunk rendering code by use of loops 2016-06-21 17:21:00 -04:00
Erik Broberg badb4e8a73 Iterate over layer categories by loops istead od hard coded indices 2016-06-21 16:50:58 -04:00
Erik Broberg 9df878e237 Use smart pointers in ChunkLodGlobe and RenderableGlobe 2016-06-21 16:26:38 -04:00
Erik Broberg c24b768397 Clean up GUI code managing layer categories 2016-06-21 16:01:18 -04:00
Erik Broberg 974d5fdaec Solve merge conflict 2016-06-21 14:04:33 -04:00
Erik Broberg 57700da843 Add ReferencedBoolSelection to abstract away a lot of boilare plate code in GUI bool properties 2016-06-21 14:01:29 -04:00
Erik Broberg db6793f762 Make DebugRendering have its own SelectionProperty in GUI 2016-06-21 12:49:54 -04:00
Erik Broberg 5148380257 Typedef vertices and color in DebugRenderer 2016-06-21 12:35:15 -04:00
Kalle Bladin b64db9de8f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-21 12:27:04 -04:00
Kalle Bladin 1ab25d5845 Add new layer category grayscale overlay and use it for mars ctx global map. 2016-06-21 12:26:52 -04:00
Erik Broberg f4a1d12089 Enable easy access to screen space points for AABB3s through DebugRenderer 2016-06-21 12:25:38 -04:00
Alexander Bock e671a59ede Merge branch 'develop' into release/ips 2016-06-21 14:24:53 +02:00
Alexander Bock 3775bbe6b1 Always write values to the projected texture even when normal-test fails (closing #103) 2016-06-21 14:24:23 +02:00
Erik Broberg 51bb575ac6 Move code for rendering camera frustum to DebugRenderer 2016-06-20 21:37:28 -04:00
Erik Broberg 5a9ffbcd90 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-20 21:08:05 -04:00
Erik Broberg 4738c26a82 Use DebugRenderer to render the view frustum of the saved camera 2016-06-20 21:07:50 -04:00
Kalle Bladin c4251d603f Fix bug that causes disabling blending to write warnings. 2016-06-20 20:15:14 -04:00
Kalle Bladin 323e3c2b45 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-20 19:33:32 -04:00
Kalle Bladin db675d3993 Add Mars datasets. 2016-06-20 19:33:20 -04:00
Erik Broberg 8075c6e449 Fix bug that caused tileRequestQueue to not get flushed correctly 2016-06-20 12:06:28 -04:00
Erik Broberg df2b68042e Better variable names in DiskCache 2016-06-20 11:13:47 -04:00
Alexander Bock f7502de92f Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 22:06:58 +02:00
Erik Broberg 2360b9faf8 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-17 15:59:21 -04:00
Erik Broberg a5aa5ec1a8 Add mode CacheHitOnly for DiskCachedLoadJob and go back to use old TileLoadJob 2016-06-17 15:59:08 -04:00
Erik Broberg 553131c407 Enabling a simple black default tileIOResult for debugging 2016-06-17 15:55:00 -04:00
Kalle Bladin dd70733c2a Add gdal_data folder and pointing to it using CPLSetConfigOption to remove need of setting environment variable. 2016-06-17 15:52:32 -04:00
Alexander Bock c3eda5e4e6 Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 21:37:43 +02:00
Kalle Bladin 153d239790 Catch exceptions when not able to read a GDAL dataset. 2016-06-17 13:07:15 -04:00
Alexander Bock a4b0d36048 Reenable up-vector definition in RenderableModelProjection 2016-06-17 17:00:45 +02:00
Kalle Bladin 101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Alexander Bock e1460575f5 Reenable up-vector definition in RenderablePlanetProjection 2016-06-17 16:49:04 +02:00
Alexander Bock f2347a5f56 Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-17 11:31:33 +02:00
Alexander Bock cbb7a3e1db Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 11:31:17 +02:00
Alexander Bock 3d4e1ec19c Merge branch 'develop' into release/ips 
Conflicts:
	tests/main.cpp
 2016-06-17 11:31:11 +02:00
Erik Broberg ef228c7a5e Add basic class for disc caching of tile data 2016-06-17 00:50:20 -04:00
Erik Broberg 6107e245bc Implement serialization of TileIOResults 2016-06-16 21:04:39 -04:00
Michael Nilsson f9411385d6 remove unnecessary includes from dataprocessor 2016-06-16 16:56:30 -04:00
Michael Nilsson 35c3d3ce8b Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-16 14:40:39 -04:00
Michael Nilsson 268ca0ea75 change method for adding data values in dataprocessortext 2016-06-16 14:40:26 -04:00
Erik Broberg 5dcddfe5e9 Separate tile selection from tile provision 2016-06-16 00:08:13 -04:00
Erik Broberg 5451951146 Add decrement operators in ChunkIndex for calculation of parent index 2016-06-16 00:03:25 -04:00
Alexander Bock 78f3b42c3b Started cleanup of ScreenSpaceImage 2016-06-16 01:22:30 +02:00
Alexander Bock 77c8ecf6df Rename screnspace* to screenspace shaders 2016-06-16 01:02:13 +02:00
Alexander Bock ad1893fd6f Cleanup of ScreenSpaceRenderable 
Add missing includes to other files
 2016-06-16 01:00:10 +02:00
Alexander Bock 4fc838cbaf Compile fix for missing Boost 2016-06-16 00:58:31 +02:00
Alexander Bock 7548b5654b Make iSWA module dependent on Kameleon 2016-06-16 00:24:03 +02:00
Alexander Bock d03d484f40 Actually spell textureplane correctly 2016-06-16 00:12:22 +02:00
Alexander Bock 1fb0b40563 Rename cygnetplane to textureplane in CMakeLists 2016-06-16 00:08:47 +02:00