310 Commits

Author	SHA1	Message	Date
Erik Broberg	a816b71a5a	Moved PatchCoverage specific logic from TileProvider to PatchCoverageProvider	2016-05-09 18:27:30 -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	418a661986	Fix bug when reading multi channel WMTS datasets.	2016-05-05 17:47:24 -04:00
Kalle Bladin	338dfcfe4c	Fix problem with edges between tiles in clipmap rendering.	2016-05-04 21:42:51 -04:00
Kalle Bladin	cc4c035f6b	Solve texture wrapping problem for clipmap rendering.	2016-05-04 19:46:05 -04:00
Kalle Bladin	04a363bab1	Merge branch 'develop' into feature/globebrowsing	2016-05-04 15:57:44 -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	c73e6a59cd	Use height maps defined in the mod file.	2016-05-04 11:22:31 -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	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
Michael Nilsson	e4a8683aba	fixed path to fboPass shaders in renderablePlanetProjection	2016-05-03 16:30:04 -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
Alexander Bock	3f9cd92767	Use correct shader in RenderablePlanet	2016-05-01 13:39:09 +02:00
Alexander Bock	eb4904fc17	Moving pscstandard shader into base	2016-05-01 13:21:57 +02:00
Alexander Bock	cfb895e2e9	Move fboPass shader into NewHorizons module	2016-05-01 13:14:36 +02:00
Alexander Bock	6daf8cb6a0	Move nighttexture shader into base module	2016-05-01 13:08:30 +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