243 Commits

Author	SHA1	Message	Date
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	db9923dc05	Do Time -> TileProvider mapping only once per frame	2016-06-06 14:25:37 -04:00
Erik Broberg	c95363a732	Fix bug that caused multiple calls glBufferData(...)	2016-06-06 13:35:11 -04:00
Erik Broberg	08af82a82a	Inject TileCache into TileProvider	2016-06-06 13:04:21 -04:00
Erik Broberg	2c37ac07a0	Select CachingTileProvider or TemporalTileProvider based on input XML	2016-06-06 12:26:23 -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
Erik Broberg	febe7326be	Read temporal meta data from XML config and use it for TileProvider selection	2016-06-05 18:39:11 -04:00
Kalle Bladin	82d375373d	Make it possible to activate and deactivate layer types and blending.	2016-06-05 18:38:19 -04:00
Kalle Bladin	9d59c25310	Failed experiment with anisotropic filtering.	2016-06-05 12:55:00 -04:00
Erik Broberg	9aea10b03e	Read and parse time format from XML at TemporalTileProvider construction	2016-06-03 16:33:28 -04:00
Kalle Bladin	c891cc8d85	Change sampling of textures from array to be fixed.	2016-06-02 17:42:58 -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	76b4cceb3c	Simply the getHighestResolutionTile function signature	2016-06-02 12:40:54 -04:00
Erik Broberg	0b62168317	rename TileProvider -> CachingTileProvider	2016-06-02 12:31:57 -04:00
Erik Broberg	87e1a623dd	Fix tile selection when chunk level > max dataset level	2016-06-02 12:29:09 -04:00
Erik Broberg	a5fbacd92e	Avoid program crash when no layer is active	2016-06-02 12:26: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
Kalle Bladin	718a8a1431	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-02 11:53:25 -04:00
Erik Broberg	014da92270	Fixed bug causing level blending not working properly	2016-06-02 11:51:31 -04:00
Kalle Bladin	14eb1c0563	Clean up chunked lod patch shaders.	2016-06-02 11:16:10 -04:00
Erik Broberg	4e9dfce160	Enable TileProvider to provide Nth highest resolution tile	2016-06-02 11:09:15 -04:00
Erik Broberg	8b19e2fadc	Remove default texture from TileProvider	2016-06-01 22:20:44 -04:00
Erik Broberg	ebb24f47f0	Merge	2016-06-01 21:48:23 -04:00
Erik Broberg	b8496f8d57	Add simple TemporalTileProvider implementation	2016-06-01 20:55:32 -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
Erik Broberg	447b4d4b62	Remove TileDataset with GDALDataset parameter as GDALOpen can take raw XML	2016-06-01 19:23:11 -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
Kalle Bladin	aa5e64c31b	Change length of skirts to be relative the size of the patches.	2016-05-31 12:49:08 -04:00
Kalle Bladin	096c19e49f	Change definition of for loop statements in shader preprocessor to include both max and min.	2016-05-31 12:17:40 -04:00
Erik Broberg	d152ffc3a8	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-05-27 17:12:39 -04:00
Erik Broberg	7df837825a	Solved conflict	2016-05-27 17:12:28 -04:00
Kalle Bladin	7bd9f644c1	Add skirtedgrid files.	2016-05-27 17:11:48 -04:00
Erik Broberg	b8ab68647b	Added unimplemented class TemporalTileProvider	2016-05-27 17:01:18 -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	7df7df6610	Implement skirts.	2016-05-27 16:48:23 -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	02a83cfb5a	The data type to be read by GDAL can be changed explicitly.	2016-05-27 13:39:40 -04:00
Kalle Bladin	b3157137f5	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-05-27 11:39:15 -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
Erik Broberg	21965ff915	Factored out async reading from tile data provision, creating an endpoint for future disk caching of tile	2016-05-26 18:17:20 -04:00
Erik Broberg	e5df1f8fee	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-05-25 21:49:08 -04:00
Erik Broberg	698a50bc40	removed unused AsyncReader code and moved GDAL related stuff from TileProvider til TextureDataProvider	2016-05-25 21:48:54 -04:00
Kalle Bladin	f525eb53cc	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-05-25 18:03:21 -04:00