Commit Graph

262 Commits

Author SHA1 Message Date
Kalle Bladin 8b5ae21d6d Simpifiy and generalize the conversion from gdal datasets to textures. 2016-04-28 13:26:37 -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 fb97493e77 Solve merge conflict. 2016-04-27 16:46:46 -04:00
Kalle Bladin e98451ce13 Solve merge conflicts. 2016-04-27 16:19:35 -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 0c3f8a323c Remove unused code 2016-04-27 13:37:42 -04:00
Kalle Bladin 16116acdc2 Use the minimum radius in the ellipsoid to determine split level in chunknode. 2016-04-27 13:36:38 -04:00
Kalle Bladin 67de7e1bb8 Remove reference to ellipsoid in GeodeticPatch class 2016-04-27 12:58:30 -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
Kalle Bladin 82ab4cc3d2 Fix bug in ellipsoid. 2016-04-27 12:05:28 -04:00
Kalle Bladin 57c8ca58bf Document code and start debugging Ellipsoid. 2016-04-25 20:55:39 -04:00
Kalle Bladin e12771c9a6 Change from using a radius to using ellipsoid 2016-04-25 20:02:37 -04:00
Kalle Bladin 3f9d85bcb3 Create class Ellipsoid. 2016-04-25 18:47:18 -04:00
Erik Broberg ef93275aff ChunkNodes that are not visible are not rendered 2016-04-25 18:02:45 -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 3d1db76c16 Merge branch 'develop' into feature/globebrowsing 2016-04-21 17:07:18 -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
Erik Broberg f35cd4bb99 Added templated Angle class to handle angle arithmics 2016-04-21 14:03:21 -04:00
Alexander Bock def64f7c24 Correctly clear imageprojections in case the base texture is not RGB 2016-04-20 23:15:34 +02:00
Alexander Bock 0c9c5c397e Fixing crawling bug when encountering images with different length 2016-04-20 19:56:49 +02:00
Alexander Bock 193fb14117 Commit Python script that crawls the New Horizons public webpage for images 2016-04-20 19:34:23 +02:00
Kalle Bladin 97250b3c53 Merge branch 'develop' into feature/globebrowsing 2016-04-20 10:54:50 -04:00
Alexander Bock 4b4a7805c2 Fix the image orientation in the FBO passing for planetprojection 2016-04-20 15:44:06 +02:00
Alexander Bock c14aa7b11b Fix inverted texture problem
- Change texture indices of PowerScaledSphere
- Change texture generation in FBOBass for projections
- Updated NewHorizons to download unflipped texture
- Use new Ghoul version
2016-04-20 14:28:11 +02:00
Alexander Bock ea91d50b87 Start correcting fixes for wrong image origin 2016-04-20 13:07:01 +02:00
Alexander Bock acc6095ba3 Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes 2016-04-20 13:06:40 +02: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 152126f5a4 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-19 15:51:28 -04:00
Alexander Bock b11557ca6f Include GDAL as external in globebrowing CMakeLists 2016-04-19 21:34:26 +02: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 ada97704f8 Solve compilation problems for OSX. 2016-04-18 22:44:20 -04:00
Erik Broberg 4f873e3f97 Resolved merge conflicts 2016-04-18 20:36:01 -04:00