Commit Graph

95 Commits

Author SHA1 Message Date
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
Erik Broberg
4c133cdcce resolved conflict 2016-04-28 12:41:23 -04:00
Kalle Bladin
fb97493e77 Solve merge conflict. 2016-04-27 16:46:46 -04:00
Erik Broberg
821667d135 Removed patchrenderer from folder other 2016-04-27 12:32:28 -04:00
Erik Broberg
25d96cb17d Changed FrustrumCuller to FrustumCuller 2016-04-27 12:22:29 -04:00
Erik Broberg
958c8a7828 removed old file 2016-04-27 12:19:38 -04:00
Erik Broberg
dbf9293a31 Moved patchrenderer and frustumculler to folder rendering 2016-04-27 12:13:33 -04:00
Erik Broberg
1799e2b488 Resolved merge conflicts 2016-04-25 16:14:04 -04:00
Erik Broberg
e6195486ae GDAL trying opening WMS config file 2016-04-25 16:01:09 -04:00
Kalle Bladin
cc1e42d6ef Restructure files in folders 2016-04-25 13:58:32 -04:00
Kalle Bladin
a8b7573354 Solve merge conflict and changed to rendering only clipmap globe 2016-04-25 13:02:10 -04:00
Erik Broberg
473c7782c2 resolved merge conflict 2016-04-25 12:35:28 -04:00
Kalle Bladin
5043c90aa6 Change name from geometry to trianglesoup 2016-04-25 12:26:57 -04:00
Erik Broberg
f253edad53 Proof of concept - real time tile fetching 2016-04-25 12:25:11 -04:00
Kalle Bladin
198c284e23 Using number of segments per patch in rendering. 2016-04-22 12:38:13 -04:00
Kalle Bladin
3c8434bee0 Rename resolution to segments in grid classes. 2016-04-22 12:14:37 -04:00
Kalle Bladin
47da09064e Redefine x resolution and y resolution to be the number of grid cells in each direction. 2016-04-22 11:53:52 -04:00
Kalle Bladin
aaf86ca86f Add class InnerClipMapGrid which renders the last part of the clipmap. 2016-04-22 11:28:54 -04:00
Kalle Bladin
c7bfe0b2c0 Changed structure for grid classes. 2016-04-21 21:46:49 -04:00
Kalle Bladin
17a83c0270 Convert from gdal format to Texture 2016-04-21 17:43:08 -04:00
Erik Broberg
069c9f51d8 merge 2016-04-21 14:23:21 -04:00
Erik Broberg
3432605e7b ChunkNode merges its children facing away from the camera as much as possible without being visible to the camera. Test by enabling front face culling. 2016-04-21 14:07:06 -04:00
Kalle Bladin
f819ca771f Changed documentation style. 2016-04-19 19:47:59 -04:00
Kalle Bladin
5531446f5d Rendering of clip maps is now more convenient. 2016-04-19 19:38:47 -04:00
Kalle Bladin
6ff6ff1ace Smallest patch of clipmap is rendered separately. 2016-04-19 18:42:25 -04:00
Kalle Bladin
9146fc48c8 Restructured and commented. 2016-04-19 15:20:18 -04:00
Kalle Bladin
aaa099d542 Solve conflict and fixed old code that did not run on OSX due to use of depricated shader functionality. 2016-04-18 23:05:19 -04:00