Commit Graph

83 Commits

Author SHA1 Message Date
Erik Broberg
ebb24f47f0 Merge 2016-06-01 21:48:23 -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
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
Kalle Bladin
aa5e64c31b Change length of skirts to be relative the size of the patches. 2016-05-31 12:49:08 -04:00
Kalle Bladin
7df7df6610 Implement skirts. 2016-05-27 16:48:23 -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
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
025a221df2 TileProvider enqueues tiles at lower level first 2016-05-16 19:10:39 -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
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
4e95aaab82 Using scaling and offset for heightmap based on dataset. 2016-05-12 11:06:49 -04:00
Kalle Bladin
41865bdc92 Chunked lod patches can be rendered in camera space. 2016-05-11 15:47:29 -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
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
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
Kalle Bladin
004f7c6185 Temporary solution to problem with too small tiles. 2016-05-05 19:32:59 -04:00
Kalle Bladin
338dfcfe4c Fix problem with edges between tiles in clipmap rendering. 2016-05-04 21:42:51 -04:00
Kalle Bladin
47ea06ca94 Render patches locally (camera space). 2016-05-04 15:52:36 -04:00
Kalle Bladin
6de208721d Separate shader files. 2016-05-04 13:19:46 -04:00
Kalle Bladin
d16c6a96d0 Color is separate from height map. 2016-05-04 12:49:17 -04:00
Kalle Bladin
e6e656f088 Changed rendering to a more pleasant color for debugging. 2016-05-03 21:27:17 -04:00
Kalle Bladin
360c0a8837 Fix bug with missaligned textures. 2016-05-03 21:10:51 -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
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
Erik Broberg
3a3038e862 Carving out cachable geodetic tiles from GDAL datasets 2016-05-02 11:13:41 -04:00
Erik Broberg
eb40b8945b Change TwmsTileProvider to TileProvider 2016-04-28 17:54:51 -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
Kalle Bladin
fb97493e77 Solve merge conflict. 2016-04-27 16:46:46 -04:00
Erik Broberg
dbf9293a31 Moved patchrenderer and frustumculler to folder rendering 2016-04-27 12:13:33 -04:00
Kalle Bladin
cc1e42d6ef Restructure files in folders 2016-04-25 13:58:32 -04:00