 Erik Broberg
|
d152ffc3a8
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-05-27 17:12:39 -04:00 |
|
|
Erik Broberg
|
7df837825a
|
Solved conflict
|
2016-05-27 17:12:28 -04:00 |
|
|
Kalle Bladin
|
7bd9f644c1
|
Add skirtedgrid files.
|
2016-05-27 17:11:48 -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
|
7df7df6610
|
Implement skirts.
|
2016-05-27 16:48:23 -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 |
|
|
Kalle Bladin
|
b3157137f5
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-05-27 11:39:15 -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 |
|
|
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
|
e5df1f8fee
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-05-25 21:49:08 -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 |
|
|
Kalle Bladin
|
f525eb53cc
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-05-25 18:03:21 -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 |
|
|
Erik Broberg
|
b91221c77c
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-05-25 15:49:01 -04:00 |
|
|
Erik Broberg
|
6dc2ced613
|
Removed unused class TextureTileSet
|
2016-05-25 15:48:46 -04:00 |
|
|
Kalle Bladin
|
99ecefa49a
|
Removed globe mesh from renderable globe
|
2016-05-25 13:21:39 -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 |
|
|
Erik Broberg
|
2f5bd47f45
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-05-17 18:23:12 -04:00 |
|
|
Erik Broberg
|
ce67314065
|
Naive and simple distance dependent interaction speed. Useful for debugging
|
2016-05-17 18:22:57 -04:00 |
|
|
Kalle Bladin
|
9ef9ae513e
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-05-17 16:54:34 -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 |
|
|
Erik Broberg
|
f30a322623
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-05-17 13:22:55 -04:00 |
|
|
Erik Broberg
|
974fff33fd
|
Fixed bug introduced in commit f484005... due to enum Chunk::Status was implicitely casted to bool. Changed enum to class
|
2016-05-17 13:22:45 -04:00 |
|
|
Kalle Bladin
|
8f394a2b80
|
Add local scopes to for loops in shaders.
|
2016-05-17 13:18:56 -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
|
33d1d1a31d
|
Enable rendering smallest (i.e. closest) chunk nodes first. Toggleable from GUI
|
2016-05-16 14:33:28 -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 |
|
|
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 |
|
|
Kalle Bladin
|
c4c65c98d8
|
Solve merge conflict and removed rendering of borders.
|
2016-05-13 19:01:47 -04:00 |
|
|
Erik Broberg
|
f48400523c
|
A Chunk not visible to the camera wants to get merged. Cleaned up ChunkRender render signature
|
2016-05-13 18:31:44 -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 |
|
|
Erik Broberg
|
ac24890195
|
Merge
|
2016-05-13 15:19:37 -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 |
|