59 Commits

Author	SHA1	Message	Date
Erik Broberg	0ef0343efd	Toggle show chunk edges from gui and calculate level weights only once per vertex	2016-06-09 17:14:46 -04:00
Kalle Bladin	3980aeff57	Add the layer types water mask, nighttexture, and overlay as well as the option to toggle atmosphere.	2016-06-08 21:30:19 -04:00
Erik Broberg	3c0aa69b16	Move call to TileProviderManager::prerender() from patchrenderer to RenderableGlobe	2016-06-08 12:05:38 -04:00
Kalle Bladin	ec22683568	Use spice ephemeris for renderable globe. Still not considering rotation in rendering.	2016-06-07 22:47:05 -04:00
Kalle Bladin	dce89545d3	Remove option to toggle use of height map and color texture and fix related crash bug.	2016-06-07 18:36:01 -04:00
Kalle Bladin	e251e6f60f	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-06 17:40:34 -04:00
Kalle Bladin	ba437809e0	Update culling to be done with double precision.	2016-06-06 17:40:11 -04:00
Erik Broberg	097c9cf1db	Move TileProvider initialization to TileProviderManager	2016-06-05 22:13:50 -04:00
Erik Broberg	c3bd0bf4ee	merge	2016-06-05 18:55:16 -04:00
Erik Broberg	5156071361	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-05 18:43:01 -04:00
Kalle Bladin	82d375373d	Make it possible to activate and deactivate layer types and blending.	2016-06-05 18:38:19 -04:00
Erik Broberg	9aea10b03e	Read and parse time format from XML at TemporalTileProvider construction	2016-06-03 16:33:28 -04:00
Erik Broberg	678e91816b	Setup a simple working demo with TemporalTileProvider as a TileProvider	2016-06-02 14:00:11 -04:00
Erik Broberg	2eaea4c7a9	Make TileProviderManager manage abstract TileProviders	2016-06-02 12:57:02 -04:00
Erik Broberg	0b62168317	rename TileProvider -> CachingTileProvider	2016-06-02 12:31:57 -04:00
Erik Broberg	de7fcc91f4	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-02 12:12:09 -04:00
Erik Broberg	3a9f39c6cd	Initialize only the first color texture and heightmap as active	2016-06-02 12:07:52 -04:00
Kalle Bladin	1e551a9e65	Change minimum value for lodScaleFactor	2016-06-02 12:04:07 -04:00
Erik Broberg	ebb24f47f0	Merge	2016-06-01 21:48:23 -04:00
Erik Broberg	785a72ab98	Remove all unused clipmap related code	2016-06-01 20:52:12 -04:00
Kalle Bladin	c241448007	Enable blending between ties of different levels to avoid some of the poping artifacts.	2016-06-01 20:47:07 -04:00
Kalle Bladin	0202828c73	Layers can be turned on and off during runtime and shaders will be recompiled accordingly.	2016-05-31 19:26:42 -04:00
Erik Broberg	7df837825a	Solved conflict	2016-05-27 17:12:28 -04:00
Erik Broberg	5c199e386c	The tile retrieval stack uses dependency injection to for easier reconfiguration	2016-05-27 16:59:10 -04:00
Kalle Bladin	118dfe32f8	Number of segments per patch can be set from mod file.	2016-05-27 14:05:50 -04:00
Kalle Bladin	e0814a23dd	The ellipsoid of a globe is used to determine how to move the camera in a new interaction mode.	2016-05-26 18:56:36 -04:00
Kalle Bladin	3925c30b43	Change size in boundingbox for the globe and the texture and patch size.	2016-05-25 18:03:13 -04:00
Kalle Bladin	99ecefa49a	Removed globe mesh from renderable globe	2016-05-25 13:21:39 -04:00
Erik Broberg	ce67314065	Naive and simple distance dependent interaction speed. Useful for debugging	2016-05-17 18:22:57 -04:00
Erik Broberg	33d1d1a31d	Enable rendering smallest (i.e. closest) chunk nodes first. Toggleable from GUI	2016-05-16 14:33:28 -04:00
Erik Broberg	6f953ecdfb	Flush tile request queue every X frame. Currently set to every 60 frame	2016-05-16 13:12:52 -04:00
Erik Broberg	276375a799	Added gui bool for toggling merge cullable chuch nodes, and made culling view frustum static	2016-05-13 19:53:45 -04:00
Erik Broberg	ca968b8589	Added AABB class, doing frustum culling based screen space AABB based on chunks 8 extreme points (min/max height per corner)	2016-05-13 15:15:08 -04:00
Erik Broberg	0c9ce5af70	Enabling 'Freeze camera used for chunk culling' from GUI. Helpful for culling debugging	2016-05-11 18:38:19 -04:00
Erik Broberg	6480ab3f11	Renamed ChunkLodGlobe to ChunkedLogGlobe and made DistanceSwitch not a renderable	2016-05-11 16:10:39 -04:00
Kalle Bladin	2b2c3166e4	Height mapping for chunked lod globe.	2016-05-10 13:29:07 -04:00
Kalle Bladin	5b2d60b126	Rendering chunked lod globe.	2016-05-09 22:53:37 -04:00
Kalle Bladin	47fa0efed8	Solve problems with building on OSX.	2016-05-08 21:46:28 -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	c73e6a59cd	Use height maps defined in the mod file.	2016-05-04 11:22:31 -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	a3221dd5e7	Include ellipsoid.hglsl as an include file for use in ellipsoidal mapping.	2016-05-03 16:26:00 -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	1e352b7826	Testing simple global heightmapping using color textures.	2016-05-02 11:19:16 -04:00
Kalle Bladin	2df2d25305	Use dictionary to set radii of globe.	2016-04-28 22:07:45 -04:00
Erik Broberg	0613d6df4f	resolved merge conflict (and installed gdal locally)	2016-04-28 13:23:14 -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