mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-24 21:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,994 Commits 83 Branches 46 Tags
bb551432e3ffd39cae5cb4e342eabd79ee38296f
Commit Graph

363 Commits

Author SHA1 Message Date
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
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
Erik Broberg
4c3604420e Added maximumRadius() and setting cache values from separate method instead of init list 2016-05-12 11:37:47 -04:00
Kalle Bladin
4e95aaab82 Using scaling and offset for heightmap based on dataset. 2016-05-12 11:06:49 -04:00
Erik Broberg
f825efa5e5 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-11 18:43:09 -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
41865bdc92 Chunked lod patches can be rendered in camera space. 2016-05-11 15:47:29 -04:00
Kalle Bladin
1e37e62bdc Solve merge conflict. 2016-05-11 11:02:03 -04:00
Kalle Bladin
2cde44c822 Debugging culling and tree splitting 2016-05-11 10:56:37 -04:00
Erik Broberg
ef11f45e38 Avoid unused calculations in Chunk update. Patches are 100x100 2016-05-10 21:31:24 -04:00
Erik Broberg
4c914510db replaced getChildIndices with getChild in ChunkIndex 2016-05-10 20:21:27 -04:00
Erik Broberg
f528ea9cb7 merge 2016-05-10 20:02:14 -04:00
Erik Broberg
5cade91a37 Created class Chunk with a corresponding rendering method 2016-05-10 20:00:15 -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
e6d6c15874 ChunkNodes store their own ChunkIndex 2016-05-10 17:26:58 -04:00
Erik Broberg
bc99692192 Merge 2016-05-10 15:57:24 -04:00
Erik Broberg
dbf7aa97ce Merged ChunkIndex and GeodeticTileIndex 2016-05-10 15:47:58 -04:00
Kalle Bladin
2b2c3166e4 Height mapping for chunked lod globe. 2016-05-10 13:29:07 -04:00
Kalle Bladin
9d1b6a33b6 Add class horizonculler and fix for explicit opengl types. 2016-05-09 23:19:49 -04:00
Kalle Bladin
5b2d60b126 Rendering chunked lod globe. 2016-05-09 22:53:37 -04:00