Commit Graph

1963 Commits

Author SHA1 Message Date
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
Alexander Bock 13eb07c87c Set correct window name in Single and fisheye configuration files 2016-05-01 13:39:26 +02:00
Alexander Bock 3f9cd92767 Use correct shader in RenderablePlanet 2016-05-01 13:39:09 +02:00
Alexander Bock 29187fdf52 Removing quadFrag, singlepassraycaster and twopassraycaster shaders 2016-05-01 13:24:59 +02:00
Alexander Bock eb4904fc17 Moving pscstandard shader into base 2016-05-01 13:21:57 +02:00
Alexander Bock 14b06d7e32 Removing pointcloud and postFX shaders 2016-05-01 13:21:34 +02:00
Alexander Bock d237ae4e1c Remove generated shaders path 2016-05-01 13:16:26 +02:00
Alexander Bock cfb895e2e9 Move fboPass shader into NewHorizons module 2016-05-01 13:14:36 +02:00
Alexander Bock 3fbff9c0a3 Remove unused files 2016-05-01 13:14:19 +02:00
Alexander Bock 6daf8cb6a0 Move nighttexture shader into base module 2016-05-01 13:08:30 +02:00
Alexander Bock f3a5b976ad Remove old OpenCL kernels 2016-05-01 12:38:16 +02:00
Alexander Bock 8043963c20 Updated CREDITS file
Updated LICENSE file
2016-05-01 12:37:21 +02:00
Alexander Bock 0b30bf642e Correctly show milkyway background texture for all scenes 2016-04-30 14:25:54 +02:00
Alexander Bock 20532d704f Rename Lua functions to preInitialization and postInitialization
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02:00
Alexander Bock b4fa20bfaa Changing interaction handler to have a default inverted roll
Updated Ghoul
2016-04-30 13:16:41 +02:00
Alexander Bock 95751691b0 Merge branch 'develop' into feature/startupscripts 2016-04-30 10:26:24 +02:00
Alexander Bock bfbf823959 Update default Qt version to 5.6
Fixed compilation issue on Mac
2016-04-30 10:24:49 +02: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