395 Commits

Author	SHA1	Message	Date
kbladin	a89f474502	Solve merge conflict and add properties for friction and interaction parameters.	2016-06-30 14:07:51 -04:00
Erik Broberg	5030465bb8	Add a local test texture and a new TileProvider severing a single tile	2016-06-29 15:18:25 -04:00
Erik Broberg	1d856151ed	Implement and use factory pattern for TileProvider instantiation	2016-06-29 13:47:11 -04:00
Erik Broberg	5896d7eb71	Dont read padded texture tiles atm..	2016-06-29 13:45:36 -04:00
Erik Broberg	072a97ee10	Make TileProviders default to disabled if unspecified in mode file	2016-06-29 12:41:36 -04:00
Erik Broberg	fd95871825	Improve TileProvider interface by removing getAsyncReader()	2016-06-29 11:31:50 -04:00
Erik Broberg	992c828cce	Render vertex and heightmap resolution. Fix offsetted pixel read bug in TileDataset	2016-06-29 00:32:25 -04:00
Erik Broberg	626350b0dd	Add GLSL function to compensate for GDAL sampling offset	2016-06-28 21:35:33 -04:00
Erik Broberg	3e53ff45b0	Visualize grid resolution when base layers are disabled	2016-06-28 19:28:54 -04:00
Erik Broberg	cdc3daedca	Clear up some code in TileDataset	2016-06-28 18:35:35 -04:00
Erik Broberg	dd8bdc69b7	Move tile datatype related stuff to separate file	2016-06-28 11:59:19 -04:00
Erik Broberg	81676ed98f	Move TileIOResult to separate file	2016-06-28 11:18:57 -04:00
Erik Broberg	ddf7342563	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-28 11:03:41 -04:00
Kalle Bladin	fcaee68424	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-27 20:18:02 -04:00
Erik Broberg	a9f7cf5444	DataCollector: Collect current time in millis and use long longs for integers	2016-06-27 19:18:54 -04:00
Kalle Bladin	ce72f57183	Minimum camera height above surface is now configurable.	2016-06-27 18:46:35 -04:00
Erik Broberg	21c67e3199	Enable real time monitoring of StatsCollector data	2016-06-27 18:08:26 -04:00
Kalle Bladin	9d8932218f	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-27 16:17:22 -04:00
Kalle Bladin	627f00faba	Generalize tile fetching to consider datasets without overviews.	2016-06-27 16:17:10 -04:00
Erik Broberg	6843b37a3d	Add D3 javascript visualization of chunk statistics generated by StatsCollector	2016-06-24 16:35:35 -04:00
Erik Broberg	b9f3b03af3	Fix bug causing StatsCollector to crash during dump to file if a StatsCollection is empty	2016-06-24 14:51:25 -04:00
Erik Broberg	b5c85184da	Restructure StatsCollectors to keep track of both integers and doubles	2016-06-24 13:52:30 -04:00
Erik Broberg	064c9a5722	Add templated stats collector to store structured data in tables	2016-06-24 11:45:36 -04:00
Alexander Bock	9705c33c16	Disable default module setting for galaxy, globebrowsing, and multiresvolume ... Update Ghoul repository	2016-06-24 10:55:49 +02:00
Erik Broberg	0c935e5b59	Use current - instead of maximum - chunk level height tiles in ground collision test	2016-06-23 20:23:08 -04:00
Erik Broberg	e59dd7a391	Enable finding a ChunkNode in ChunkNode tree based on a Geodetic2 point	2016-06-23 20:16:47 -04:00
Erik Broberg	a6baa5107a	Add test if GeodeticPatch contains a Geodetic2	2016-06-23 20:02:24 -04:00
Erik Broberg	533453a943	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-22 21:08:05 -04:00
Erik Broberg	516e6b36ba	Use std::make_shared instead of new	2016-06-22 21:07:47 -04:00
Kalle Bladin	ad79831014	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-22 21:07:10 -04:00
Kalle Bladin	a23c38e5b3	Improve chunk bounds.	2016-06-22 21:06:56 -04:00
Erik Broberg	6d11ba2946	Move blending bools from ChunkLodGlobe to TileProviderManager and init them to true	2016-06-22 20:51:28 -04:00
Erik Broberg	87c1fdc4de	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-22 20:25:50 -04:00
Erik Broberg	3ed227df11	Rename HashKey to ChunkHashKey and define it as uint64_t	2016-06-22 20:25:39 -04:00
Kalle Bladin	38e774882a	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-22 19:19:05 -04:00
Kalle Bladin	b573c6104a	Use anisotropic filtering for tiles.	2016-06-22 19:18:58 -04:00
Erik Broberg	d7c45fcf60	Change prerender() to update() in TileProvider and related classes	2016-06-22 19:11:14 -04:00
Kalle Bladin	fa4bb15489	Solve merge conflict.	2016-06-22 18:05:08 -04:00
Kalle Bladin	e8fc2250d5	Clean up in interaction mode abd push camera to the surface of the heightmap.	2016-06-22 17:48:59 -04:00
Kalle Bladin	cb4b6dbdf3	Clean up in code that clamps camera position to height map.	2016-06-22 13:55:02 -04:00
Alexander Bock	37e18441dc	Support GDAL on non-Windows platforms ... Fix compile fix with TileProviderManager Fix projection error on PlanetProjection	2016-06-22 08:51:58 +02:00
Kalle Bladin	7ff909c1fa	Solve bug that caused wrong sampling of tile data on CPU.	2016-06-21 23:37:25 -04:00
Erik Broberg	40afc93f7e	Make sure blending is initialized to true	2016-06-21 23:28:26 -04:00
Kalle Bladin	4d57c7d8e4	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-21 23:20:28 -04:00
Erik Broberg	623cc8ccc0	Quick fix of bug causing height tiles with missing data to be ignored and rendered as usual	2016-06-21 23:15:13 -04:00
Kalle Bladin	9e80baa792	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-21 22:57:38 -04:00
Kalle Bladin	5e8018b715	Limit camera to not go below the ground in globebrowsing interaction mode.	2016-06-21 22:57:12 -04:00
Erik Broberg	0163f02511	Add regular BFS to ChunkNodes	2016-06-21 21:42:08 -04:00
Erik Broberg	ed92baefbd	Move debug rendering of chunk to separate function	2016-06-21 21:27:11 -04:00
Erik Broberg	911cf7a77d	Move rendering function calls from Chunk and ChunkNode to ChunkedLodGlobe	2016-06-21 21:09:19 -04:00