Commit Graph

83 Commits

Author SHA1 Message Date
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 b8ab68647b Added unimplemented class TemporalTileProvider 2016-05-27 17:01:18 -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 02a83cfb5a The data type to be read by GDAL can be changed explicitly. 2016-05-27 13:39:40 -04:00
Erik Broberg 21965ff915 Factored out async reading from tile data provision, creating an endpoint for future disk caching of tile 2016-05-26 18:17:20 -04:00
Erik Broberg 698a50bc40 removed unused AsyncReader code and moved GDAL related stuff from TileProvider til TextureDataProvider 2016-05-25 21:48:54 -04:00
Erik Broberg 6dc2ced613 Removed unused class TextureTileSet 2016-05-25 15:48:46 -04:00
Erik Broberg 3bb2161a09 1 Thread for Tile loading, allowing MaxConnections concurrent connections per RasterIO 2016-05-23 18:26:25 -04:00
Erik Broberg 50a0141cce Keeping track of tiles with IO errors, and display parent instead 2016-05-23 16:37:31 -04:00
Erik Broberg b74e3bbb5b Removed unused include of atomic - avoids annoying comiler warnings 2016-05-20 17:03:25 -04:00
Erik Broberg 8844775a1f TileProviderManager owns a common thread pool for all TileProviders 2016-05-20 13:20:46 -04:00
Erik Broberg bb551432e3 ConcurrentJobManager uses ThreadPool to do parallel Gdal RasterIO calls. Some tile gets corrupted... 2016-05-20 12:55:37 -04:00
Erik Broberg bfb8e1a92d Added functionality for fetching tile using GDALAsyncReader. Not working yet, so requests are still serial 2016-05-19 21:23:46 -04:00
Erik Broberg bcb107890f Breaking down GDAL data fetching into sub tasks which can be reused later in async data fetching 2016-05-19 12:18:31 -04:00
Erik Broberg efa78e6756 TextureDataProvider is no longer templated 2016-05-18 16:52:58 -04:00
Erik Broberg 1615b92162 Changed gdaldataconverter to TextureDataProvider. Clean up public interface and added skeleton interface for async data fetching 2016-05-18 10:53:56 -04:00
Kalle Bladin 039c5293c2 Render several texture layers on top of each other with more datasets. 2016-05-17 16:54:21 -04:00
Kalle Bladin fdc4690117 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-16 20:52:14 -04:00
Kalle Bladin daf1b5873e Rendering using many layers. 2016-05-16 20:48:23 -04:00
Erik Broberg a9d34d4d25 Added thread pool class and a simple unit test 2016-05-16 20:28:16 -04:00
Erik Broberg 025a221df2 TileProvider enqueues tiles at lower level first 2016-05-16 19:10:39 -04:00
Erik Broberg 8639190b9e solved merge conflict: new signature for TileProvider constructor 2016-05-16 13:14:46 -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
Kalle Bladin fecfcc5bd8 Fix problems for compiling and running on OSX. 2016-05-16 10:27:20 -04:00
Kalle Bladin 6ddec421b7 Solve problem with too big texture tiles requested. 2016-05-13 20:27:30 -04:00
Kalle Bladin 6601282402 Fix rendering bugs and commented a TODO in layeredtextureshaderprovider.cpp 2016-05-13 18:19:29 -04:00
Kalle Bladin 6c13686229 Layered texture shader provider used to get shaders up to date. Not everything implemented yet. 2016-05-13 17:32:14 -04:00
Kalle Bladin edf08d2b3d Use datastructure TextureTile for tiles in shader. 2016-05-12 13:15:50 -04:00
Kalle Bladin ec8299da69 Solve merge conflict. 2016-05-12 11:46:59 -04:00
Kalle Bladin 4e95aaab82 Using scaling and offset for heightmap based on dataset. 2016-05-12 11:06:49 -04:00
Erik Broberg 6480ab3f11 Renamed ChunkLodGlobe to ChunkedLogGlobe and made DistanceSwitch not a renderable 2016-05-11 16:10:39 -04:00
Erik Broberg ef11f45e38 Avoid unused calculations in Chunk update. Patches are 100x100 2016-05-10 21:31:24 -04:00
Kalle Bladin 85d9ff8eee Solve merge conflict. 2016-05-10 19:36:17 -04:00
Kalle Bladin 574d7bfe79 Rendering small patches does not create new tiles. 2016-05-10 19:26:16 -04:00
Erik Broberg dbf7aa97ce Merged ChunkIndex and GeodeticTileIndex 2016-05-10 15:47:58 -04:00
Kalle Bladin 9d1b6a33b6 Add class horizonculler and fix for explicit opengl types. 2016-05-09 23:19:49 -04:00
Erik Broberg fa53b67846 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-09 22:12:29 -04:00
Erik Broberg f8d257b5bc TileProvider serves tiles with highest available resolution and a corresponding translation and scaling, given a tileIndex 2016-05-09 22:12:19 -04:00
Erik Broberg a816b71a5a Moved PatchCoverage specific logic from TileProvider to PatchCoverageProvider 2016-05-09 18:27:30 -04:00
Erik Broberg acfda284c9 Convenience methods in GeodeticTileIndex 2016-05-09 18:15:26 -04:00
Kalle Bladin 47fa0efed8 Solve problems with building on OSX. 2016-05-08 21:46:28 -04:00
Erik Broberg b63f427cff Fixed bug in GdalDataConverter<T>::geodeticToPixel which caused some tile texture data to be read and displayed incorrectly 2016-05-07 00:10:23 -04:00
Kalle Bladin 004f7c6185 Temporary solution to problem with too small tiles. 2016-05-05 19:32:59 -04:00
Kalle Bladin 418a661986 Fix bug when reading multi channel WMTS datasets. 2016-05-05 17:47:24 -04:00
Kalle Bladin 338dfcfe4c Fix problem with edges between tiles in clipmap rendering. 2016-05-04 21:42:51 -04:00
Kalle Bladin cc4c035f6b Solve texture wrapping problem for clipmap rendering. 2016-05-04 19:46:05 -04:00
Kalle Bladin 360c0a8837 Fix bug with missaligned textures. 2016-05-03 21:10:51 -04:00