Commit Graph

63 Commits

Author SHA1 Message Date
Erik Broberg
3bb2161a09 1 Thread for Tile loading, allowing MaxConnections concurrent connections per RasterIO 2016-05-23 18:26: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
ce67314065 Naive and simple distance dependent interaction speed. Useful for debugging 2016-05-17 18:22:57 -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
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
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
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
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
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
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
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
5cade91a37 Created class Chunk with a corresponding rendering method 2016-05-10 20:00:15 -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
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
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
c73e6a59cd Use height maps defined in the mod file. 2016-05-04 11:22:31 -04:00
Kalle Bladin
3a947a9e18 New class TileProviderManager has control over tileproviders shared between different renderables. 2016-05-03 20:05:31 -04:00
Kalle Bladin
b5cee62792 Set preferred size of tiles for tile provider. 2016-05-03 16:58:21 -04:00
Kalle Bladin
a3221dd5e7 Include ellipsoid.hglsl as an include file for use in ellipsoidal mapping. 2016-05-03 16:26:00 -04:00
Kalle Bladin
6f4e39cc7d Generalize gdaldataconverter so it can handle any data type. 2016-05-03 16:00:29 -04:00
Kalle Bladin
ce5876c2c5 Cull in clipmap globe 2016-05-02 21:32:52 -04:00
Kalle Bladin
5f0997454c Create PatchCoverage to be returned from PatchCoverageProvide 2016-05-02 19:29:58 -04:00
Kalle Bladin
b0d00dbd66 Solve merge conflict 2016-05-02 17:30:59 -04:00
Kalle Bladin
e1f58ae5c9 Prototyping with four textures for clipmap rendering. 2016-05-02 16:47:51 -04:00
Kalle Bladin
32dc765c45 A simple test for PatchCoverageProvider 2016-05-02 12:29:18 -04:00
Kalle Bladin
facbd1a3b5 Use tile index from texture tile set (old index style makes rendering wrong). 2016-05-02 11:46:08 -04:00
Kalle Bladin
81b2c69284 Solve merge conflict in texturetilesety 2016-05-02 11:44:55 -04:00
Kalle Bladin
1e352b7826 Testing simple global heightmapping using color textures. 2016-05-02 11:19:16 -04:00
Erik Broberg
3a3038e862 Carving out cachable geodetic tiles from GDAL datasets 2016-05-02 11:13:41 -04:00
Kalle Bladin
2df2d25305 Use dictionary to set radii of globe. 2016-04-28 22:07:45 -04:00
Erik Broberg
eb40b8945b Change TwmsTileProvider to TileProvider 2016-04-28 17:54:51 -04:00
Erik Broberg
0613d6df4f resolved merge conflict (and installed gdal locally) 2016-04-28 13:23:14 -04:00
Erik Broberg
582c1044af Commented code to test tile loading with concurrent job manager. Texture Loader does not allow multithreading 2016-04-28 12:42:58 -04:00
Erik Broberg
4c133cdcce resolved conflict 2016-04-28 12:41:23 -04:00