 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 |
|
|
Erik Broberg
|
febe7326be
|
Read temporal meta data from XML config and use it for TileProvider selection
|
2016-06-05 18:39:11 -04:00 |
|
|
Kalle Bladin
|
82d375373d
|
Make it possible to activate and deactivate layer types and blending.
|
2016-06-05 18:38:19 -04:00 |
|
|
Kalle Bladin
|
9d59c25310
|
Failed experiment with anisotropic filtering.
|
2016-06-05 12:55:00 -04:00 |
|
|
Erik Broberg
|
9aea10b03e
|
Read and parse time format from XML at TemporalTileProvider construction
|
2016-06-03 16:33:28 -04:00 |
|
|
Kalle Bladin
|
c891cc8d85
|
Change sampling of textures from array to be fixed.
|
2016-06-02 17:42:58 -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
|
76b4cceb3c
|
Simply the getHighestResolutionTile function signature
|
2016-06-02 12:40:54 -04:00 |
|
|
Erik Broberg
|
0b62168317
|
rename TileProvider -> CachingTileProvider
|
2016-06-02 12:31:57 -04:00 |
|
|
Erik Broberg
|
87e1a623dd
|
Fix tile selection when chunk level > max dataset level
|
2016-06-02 12:29:09 -04:00 |
|
|
Erik Broberg
|
014da92270
|
Fixed bug causing level blending not working properly
|
2016-06-02 11:51:31 -04:00 |
|
|
Erik Broberg
|
4e9dfce160
|
Enable TileProvider to provide Nth highest resolution tile
|
2016-06-02 11:09:15 -04:00 |
|
|
Erik Broberg
|
8b19e2fadc
|
Remove default texture from TileProvider
|
2016-06-01 22:20:44 -04:00 |
|
|
Erik Broberg
|
ebb24f47f0
|
Merge
|
2016-06-01 21:48:23 -04:00 |
|
|
Erik Broberg
|
b8496f8d57
|
Add simple TemporalTileProvider implementation
|
2016-06-01 20:55:32 -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 |
|
|
Erik Broberg
|
447b4d4b62
|
Remove TileDataset with GDALDataset parameter as GDALOpen can take raw XML
|
2016-06-01 19:23:11 -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 |
|