Commit Graph

53 Commits

Author SHA1 Message Date
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
bc99692192 Merge 2016-05-10 15:57:24 -04:00
Kalle Bladin
2b2c3166e4 Height mapping for chunked lod globe. 2016-05-10 13:29:07 -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
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
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
b5cee62792 Set preferred size of tiles for tile provider. 2016-05-03 16:58:21 -04:00
Kalle Bladin
c18e05821c Fix bug in latlon spheremapping program. 2016-05-03 16:29:53 -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
e1f58ae5c9 Prototyping with four textures for clipmap rendering. 2016-05-02 16:47:51 -04:00
Kalle Bladin
1e352b7826 Testing simple global heightmapping using color textures. 2016-05-02 11:19:16 -04:00
Kalle Bladin
78339e909c Load TWMS using GDAL. Iimage is flipped in y direction and the reading is not general enough yet. 2016-04-27 23:21:42 -04:00
Kalle Bladin
8af4e1ddce Change rendering of patches to map to ellipsoids instead of spheres. 2016-04-27 16:16:26 -04:00
Kalle Bladin
67de7e1bb8 Remove reference to ellipsoid in GeodeticPatch class 2016-04-27 12:58:30 -04:00
Kalle Bladin
3f9d85bcb3 Create class Ellipsoid. 2016-04-25 18:47:18 -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
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
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
5531446f5d Rendering of clip maps is now more convenient. 2016-04-19 19:38:47 -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
Kalle Bladin
0c33e2a2b6 Calculating uv coordinates to be used for sampling from tiled textures. 2016-04-18 19:52:01 -04:00
Kalle Bladin
89d7b3ca8b Reading textures that are used for patch rendering. 2016-04-15 17:17:31 -04:00
Kalle Bladin
4fd0b0643c Clearified latlon interface. 2016-04-14 20:27:43 -04:00
Kalle Bladin
acf4297491 Changed definition of ordering in LatLon 2016-04-14 19:35:24 -04:00
Kalle Bladin
9a31b11639 Added classes TextureTile and TextureTileSet. 2016-04-14 19:29:58 -04:00
kbladin
23b28f9024 Solved merge conflict. 2016-04-12 22:37:20 -04:00
kbladin
12d2dc23fb Clipmap prototype working. 2016-04-12 21:27:17 -04:00
kbladin
05569611da Created clipmap geometry 2016-04-12 13:44:28 -04:00
kbladin
7592edf024 Solve merge conflict and removed unused code. 2016-04-11 13:41:06 -04:00
kbladin
552bdc1786 Remove NURBS interpolation in favor of global lat-lon maping in shader due to mis match in UV coordinates. 2016-04-11 12:09:45 -04:00
kbladin
4e0fc13035 Two patches to imitate clipmaps. Apparently the UV coordinates are not mapped correctly on the sphere patches which is a big problem. 2016-04-08 16:06:06 -04:00
kbladin
cb9cce717c Cleaned up code in latlonpatch. 2016-04-08 12:33:51 -04:00
Erik Broberg
61883afd2f Sending dummy UVs from simple_vs to simple_fs to avoid shader crash 2016-04-08 10:38:18 -04:00
kbladin
b0cd9fb7d7 Solve merge conflicts and changed rendering color for simple fragment shader. 2016-04-07 21:24:41 -04:00
kbladin
83d55b87f8 Nurbs working to exactly define spherical patches. Ugly code but it can be cleaned up. 2016-04-07 20:49:52 -04:00
kbladin
16349686d5 Using NURBS to interpolate patch vertex positions. 2016-04-07 15:25:33 -04:00