Commit Graph

1895 Commits

Author SHA1 Message Date
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 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 ce5876c2c5 Cull in clipmap globe 2016-05-02 21:32:52 -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
Erik Broberg d7411b75c3 Loading tiles in separate thread 2016-05-02 13:18:14 -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
Kalle Bladin 81b2c69284 Solve merge conflict in texturetilesety 2016-05-02 11:44:55 -04:00
Kalle Bladin 1e352b7826 Testing simple global heightmapping using color textures. 2016-05-02 11:19:16 -04:00
Erik Broberg 3a3038e862 Carving out cachable geodetic tiles from GDAL datasets 2016-05-02 11:13:41 -04:00
Kalle Bladin 2df2d25305 Use dictionary to set radii of globe. 2016-04-28 22:07:45 -04:00
Erik Broberg 4656d997e4 Merge 2016-04-28 17:59:04 -04:00
Erik Broberg 414462c7d8 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-28 17:55:42 -04:00
Erik Broberg eb40b8945b Change TwmsTileProvider to TileProvider 2016-04-28 17:54:51 -04:00
Kalle Bladin 8d9457bc35 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-28 13:26:45 -04:00
Kalle Bladin 8b5ae21d6d Simpifiy and generalize the conversion from gdal datasets to textures. 2016-04-28 13:26:37 -04:00
Erik Broberg 0613d6df4f resolved merge conflict (and installed gdal locally) 2016-04-28 13:23:14 -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 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
Erik Broberg 55fb54ffce Added templated ConcurrentJobManager to manage specific tasks in a separate thread 2016-04-27 19:22:39 -04:00
Erik Broberg 97c7574aa3 Added simple templated Concurrent Queue class 2016-04-27 18:51:37 -04:00
Kalle Bladin fb97493e77 Solve merge conflict. 2016-04-27 16:46:46 -04:00
Erik Broberg abfa1a15fb Added templated class ConcurrentJobManager skeleton 2016-04-27 16:29:43 -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 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
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 c6c6e558db Change file names to match the new structure in test files. 2016-04-25 14:03:55 -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