Commit Graph

73 Commits

Author SHA1 Message Date
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
Erik Broberg
678e91816b Setup a simple working demo with TemporalTileProvider as a TileProvider 2016-06-02 14:00:11 -04:00
Erik Broberg
2eaea4c7a9 Make TileProviderManager manage abstract TileProviders 2016-06-02 12:57:02 -04:00
Erik Broberg
0b62168317 rename TileProvider -> CachingTileProvider 2016-06-02 12:31:57 -04:00
Erik Broberg
de7fcc91f4 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-02 12:12:09 -04:00
Erik Broberg
3a9f39c6cd Initialize only the first color texture and heightmap as active 2016-06-02 12:07:52 -04:00
Kalle Bladin
1e551a9e65 Change minimum value for lodScaleFactor 2016-06-02 12:04:07 -04:00
Erik Broberg
ebb24f47f0 Merge 2016-06-01 21:48:23 -04:00
Erik Broberg
785a72ab98 Remove all unused clipmap related code 2016-06-01 20:52:12 -04:00
Kalle Bladin
c241448007 Enable blending between ties of different levels to avoid some of the poping artifacts. 2016-06-01 20:47:07 -04:00
Kalle Bladin
0202828c73 Layers can be turned on and off during runtime and shaders will be recompiled accordingly. 2016-05-31 19:26:42 -04:00
Erik Broberg
7df837825a Solved conflict 2016-05-27 17:12:28 -04:00
Erik Broberg
5c199e386c The tile retrieval stack uses dependency injection to for easier reconfiguration 2016-05-27 16:59:10 -04:00
Kalle Bladin
118dfe32f8 Number of segments per patch can be set from mod file. 2016-05-27 14:05:50 -04:00
Kalle Bladin
e0814a23dd The ellipsoid of a globe is used to determine how to move the camera in a new interaction mode. 2016-05-26 18:56:36 -04:00
Kalle Bladin
3925c30b43 Change size in boundingbox for the globe and the texture and patch size. 2016-05-25 18:03:13 -04:00
Kalle Bladin
99ecefa49a Removed globe mesh from renderable globe 2016-05-25 13:21:39 -04:00
Erik Broberg
ce67314065 Naive and simple distance dependent interaction speed. Useful for debugging 2016-05-17 18:22:57 -04:00
Erik Broberg
33d1d1a31d Enable rendering smallest (i.e. closest) chunk nodes first. Toggleable from GUI 2016-05-16 14:33:28 -04:00
Erik Broberg
6f953ecdfb Flush tile request queue every X frame. Currently set to every 60 frame 2016-05-16 13:12:52 -04:00
Erik Broberg
276375a799 Added gui bool for toggling merge cullable chuch nodes, and made culling view frustum static 2016-05-13 19:53:45 -04:00
Erik Broberg
ca968b8589 Added AABB class, doing frustum culling based screen space AABB based on chunks 8 extreme points (min/max height per corner) 2016-05-13 15:15:08 -04:00
Erik Broberg
0c9ce5af70 Enabling 'Freeze camera used for chunk culling' from GUI. Helpful for culling debugging 2016-05-11 18:38:19 -04:00
Erik Broberg
6480ab3f11 Renamed ChunkLodGlobe to ChunkedLogGlobe and made DistanceSwitch not a renderable 2016-05-11 16:10:39 -04:00
Kalle Bladin
2b2c3166e4 Height mapping for chunked lod globe. 2016-05-10 13:29:07 -04:00