Commit Graph

97 Commits

Author SHA1 Message Date
Erik Broberg
f1d8e42dff Add TileProviderGroup and use to represent tile provides in same category 2016-07-12 14:59:35 -04:00
Erik Broberg
edf114cda2 Enable resetting tile providers from GUI, i.e. reloading tiles 2016-07-12 11:20:57 -04:00
Kalle
dd7abd355a GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels 2016-07-01 17:42:49 -04:00
Kalle
3c7d1e22fc Globe browsing interaction mode follows the rotation of the globe. 2016-07-01 12:46:16 -04:00
Kalle Bladin
ce72f57183 Minimum camera height above surface is now configurable. 2016-06-27 18:46:35 -04:00
Erik Broberg
0c935e5b59 Use current - instead of maximum - chunk level height tiles in ground collision test 2016-06-23 20:23:08 -04:00
Erik Broberg
6d11ba2946 Move blending bools from ChunkLodGlobe to TileProviderManager and init them to true 2016-06-22 20:51:28 -04:00
Erik Broberg
d7c45fcf60 Change prerender() to update() in TileProvider and related classes 2016-06-22 19:11:14 -04:00
Kalle Bladin
e8fc2250d5 Clean up in interaction mode abd push camera to the surface of the heightmap. 2016-06-22 17:48:59 -04:00
Kalle Bladin
cb4b6dbdf3 Clean up in code that clamps camera position to height map. 2016-06-22 13:55:02 -04:00
Kalle Bladin
9e80baa792 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-21 22:57:38 -04:00
Kalle Bladin
5e8018b715 Limit camera to not go below the ground in globebrowsing interaction mode. 2016-06-21 22:57:12 -04:00
Erik Broberg
953d8554dc Move commonly used GUI debug options to separate struct 2016-06-21 19:24:25 -04:00
Erik Broberg
14ea82d929 Remove unused GUI properties 2016-06-21 18:28:29 -04:00
Erik Broberg
c7ff3a4730 Remove unused GUI property chunkHeight 2016-06-21 17:21:37 -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
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
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
Kalle Bladin
101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Erik Broberg
bfd2441eaa Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-14 23:19:45 -04:00
Erik Broberg
abbede263f Enabling toggling rendering of bounding Chunk volumes from GUI 2016-06-14 23:19:28 -04:00
Kalle Bladin
627b8e635b Activated texture layers can be set from mod file. 2016-06-14 14:00:21 -04:00
Kalle Bladin
88555a1e1b Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-14 00:20:55 -04:00
Kalle Bladin
0b7ce79e80 Collapse layer category rendering code in to for loop. 2016-06-14 00:20:37 -04:00
Kalle Bladin
164e133ce9 Update tileprovidermanager to loop through texture categories. 2016-06-13 22:17:15 -04:00
Erik Broberg
8eb3621e03 Make limiting chunk level by available height data togglable from GUI 2016-06-13 21:40:14 -04:00
Kalle Bladin
b5f1a09b8c Cache uniform IDs upon recompiling of shader programs. Renaming of uniforms in shader code. 2016-06-13 18:57:18 -04:00
Erik Broberg
f850aa53e6 Make it easy to compare desiredChunkLevel approaches through a simple common interface 2016-06-13 18:15:30 -04:00
Kalle Bladin
144191ba51 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-10 12:02:34 -04:00
Kalle Bladin
75e8e04e3d Set max length of skirts and fix problem with toggeling of overlay. 2016-06-10 12:02:25 -04:00
Erik Broberg
795846f6ee Updated file structure and removed unused class GlobeMesh 2016-06-10 11:53:26 -04:00
Erik Broberg
3cc2733aad Merge branch 'feature/globe-atmosphere' into feature/globebrowsing 2016-06-09 19:59:52 -04:00
Erik Broberg
0ef0343efd Toggle show chunk edges from gui and calculate level weights only once per vertex 2016-06-09 17:14:46 -04:00
Kalle Bladin
2951df9653 Simplify interface for TileProviderManager. 2016-06-09 16:09:43 -04:00
Kalle Bladin
3980aeff57 Add the layer types water mask, nighttexture, and overlay as well as the option to toggle atmosphere. 2016-06-08 21:30:19 -04:00
Erik Broberg
3c0aa69b16 Move call to TileProviderManager::prerender() from patchrenderer to RenderableGlobe 2016-06-08 12:05:38 -04:00
Kalle Bladin
ec22683568 Use spice ephemeris for renderable globe. Still not considering rotation in rendering. 2016-06-07 22:47:05 -04:00
Kalle Bladin
dce89545d3 Remove option to toggle use of height map and color texture and fix related crash bug. 2016-06-07 18:36:01 -04:00
Kalle Bladin
e251e6f60f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-06 17:40:34 -04:00
Kalle Bladin
ba437809e0 Update culling to be done with double precision. 2016-06-06 17:40:11 -04:00
Erik Broberg
097c9cf1db Move TileProvider initialization to TileProviderManager 2016-06-05 22:13:50 -04:00
Erik Broberg
c3bd0bf4ee merge 2016-06-05 18:55:16 -04:00
Erik Broberg
5156071361 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-05 18:43:01 -04:00
Kalle Bladin
82d375373d Make it possible to activate and deactivate layer types and blending. 2016-06-05 18:38:19 -04:00
Erik Broberg
9aea10b03e Read and parse time format from XML at TemporalTileProvider construction 2016-06-03 16:33:28 -04:00