Commit Graph

41 Commits

Author SHA1 Message Date
Kalle Bladin
0c33e2a2b6 Calculating uv coordinates to be used for sampling from tiled textures. 2016-04-18 19:52:01 -04:00
Kalle Bladin
6758f79d91 Solve merge conflict. 2016-04-15 17:22:59 -04:00
Kalle Bladin
7cdf991e76 Add use of textures to clipmap rendering. 2016-04-15 17:19:35 -04:00
Kalle Bladin
89d7b3ca8b Reading textures that are used for patch rendering. 2016-04-15 17:17:31 -04:00
Erik Broberg
527f83aacd Solved merge conflict 2016-04-15 15:52:09 -04:00
Erik Broberg
7ecae3003c View frustrum culling done directly in chunk node tree update traversal 2016-04-15 15:39:55 -04:00
Kalle Bladin
0f88b922f7 Define interface for TextureTileSet. 2016-04-15 10:38:40 -04:00
Kalle Bladin
56f9db60bc Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-14 20:27:58 -04:00
Kalle Bladin
4fd0b0643c Clearified latlon interface. 2016-04-14 20:27:43 -04:00
Erik Broberg
db6246e7c8 Added ChunkIndex to keep track of indices during tree traversal 2016-04-14 20:08:15 -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
Erik Broberg
3ec7badcf0 Camera: added convenience method for getting viewRotation and added inner class SyncData 2016-04-14 17:33:52 -04:00
Erik Broberg
840a982e6d Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-14 12:48:11 -04:00
Erik Broberg
299cd27f2c Fixed bug Camera (view rot matrix had translation components) and structured Camera code 2016-04-14 12:47:12 -04:00
kbladin
eeaa4925ba Clean up in the geometry classes. 2016-04-13 10:23:42 -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
Erik Broberg
baf8fa32ef Added class FrustrumCuller for CPU testing points wrt view frustrum 2016-04-12 20:33:08 -04:00
kbladin
05569611da Created clipmap geometry 2016-04-12 13:44:28 -04:00
Erik Broberg
0784fe22f8 Using log2 for calculating desired split level, but have to fake earth radius in ChunkLodGlobe 2016-04-11 20:52:08 -04:00
kbladin
48109dd664 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-11 17:35:00 -04:00
kbladin
21eab66080 Add new class ClipMapGeometry. 2016-04-11 17:34:50 -04:00
Erik Broberg
459633c0d3 Removed unused converter class 2016-04-11 17:17:43 -04:00
Erik Broberg
7dfcd7abcb Refactored RenderableLatLonPatch to a simple base class PatchRenderer 2016-04-11 16:57:47 -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
Erik Broberg
2e0e7a5bcc Refactoring. Cleaning up Latitude and Longitude representation and logic 2016-04-11 12:04:20 -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
kbladin
b0cd9fb7d7 Solve merge conflicts and changed rendering color for simple fragment shader. 2016-04-07 21:24:41 -04:00
Erik Broberg
d0773bcf32 Distant dependent LOD geometry. Demo purpose only. 2016-04-07 20:54:52 -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
Erik Broberg
efe2bef2d4 Created Chunk LOD Globe. Currently renders patches at constant depth 2016-04-06 17:10:29 -04:00
kbladin
f9a98a2d2a Lat lon patch follows camera and gets projected to a sphere. 2016-04-05 18:09:29 -04:00
kbladin
ee425a7d01 Implementing a patch class that will be used for clipmaps. 2016-04-05 14:45:03 -04:00
kbladin
1a4e115ca9 globemesh extends renderable. 2016-04-04 12:46:41 -04:00
kbladin
b8e8afaed8 Solve new compilation error 2016-04-04 12:29:01 -04:00
Karl Bladin
972af8b5f3 Solve merge conflict. 2016-04-04 12:04:46 -04:00
Karl Bladin
4b62c337e0 Rename planetbrowsing to globebrowsing 2016-04-04 12:01:39 -04:00