77 Commits

Author	SHA1	Message	Date
Erik Broberg	64668e9feb	Merge from feature/globebrowsing	2016-08-02 19:25:23 -04:00
Erik Broberg	244c18fdc7	Solve merge conflicts: develop --> globebrowsing	2016-08-02 18:50:10 -04:00
Alexander Bock	f4f4e7de9e	More Jenkins compile fixes	2016-07-27 11:01:58 +02:00
Kalle	93d661bfc6	Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace-Development into feature/osirisrex	2016-07-22 17:06:02 -04:00
Kalle	5883d75047	Update render function in renderable model to avoid precision errors and remove psc dependency.	2016-07-22 17:05:34 -04:00
Erik Broberg	73e3c71b9a	Init StatsCollector to disabled and delete committed stats data	2016-07-21 17:42:35 -04:00
Erik Broberg	7568912a7d	Bounding chunk heights considers multiple heightmaps and handles missing data	2016-07-15 18:56:03 -04:00
Erik Broberg	2ec2c95cd7	Add forgotten updates for last commit	2016-07-15 17:16:48 -04:00
Erik Broberg	a2cd9bc19d	Add static const CHUNK::DEFAULT_HEIGHT to avoid magic numbers in code	2016-07-15 14:21:29 -04:00
Erik Broberg	d06c470636	Fix bounding heights (used for culling) for chunks with heightmap overlays	2016-07-15 13:48:00 -04:00
Erik Broberg	c25d1cdc88	Enable GUI toggling of visualization of heightmap resolution and intensities	2016-07-14 17:09:35 -04:00
Erik Broberg	e13c4c2162	Make desired level from projected area work (i.e. not get zero area) around the poles	2016-07-14 13:28:53 -04:00
Kalle	2c005406fd	Fix horizon culling bug	2016-07-13 11:49:57 -04:00
Erik Broberg	828ec96251	Remove debugoption limitedByAvailableData from GUI	2016-07-12 15:46:41 -04:00
Erik Broberg	6a482d4189	Improve dynamic limit of chunk level by available tile data	2016-07-12 15:34:51 -04:00
Erik Broberg	f1d8e42dff	Add TileProviderGroup and use to represent tile provides in same category	2016-07-12 14:59:35 -04:00
Erik Broberg	0d1c042b0e	Improve performance of chunk level evaluator by projected area	2016-07-12 13:10:20 -04:00
Kalle	6c10e89ec0	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-07-08 13:20:19 -04:00
Kalle	3985dea808	Height map overlay working but needs to be used for height sampling on cpu.	2016-07-08 12:42:41 -04:00
Erik Broberg	cb78456739	Enable getting a default tile from TileProviders. Used e.g. when no tiles are in memory	2016-07-08 12:30:19 -04:00
Kalle	fd05a88419	Create new layer category heightmap overlay used for local datasets with alpha channel.	2016-07-07 20:59:02 -04:00
Kalle	83881e33b2	GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels	2016-07-01 17:42:49 -04:00
kbladin	e8cfd8eee4	Solve crashing in deinitialization of debug renderer.	2016-06-30 18:12:21 -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	a9f7cf5444	DataCollector: Collect current time in millis and use long longs for integers	2016-06-27 19:18:54 -04:00
Erik Broberg	21c67e3199	Enable real time monitoring of StatsCollector data	2016-06-27 18:08:26 -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	064c9a5722	Add templated stats collector to store structured data in tables	2016-06-24 11:45:36 -04: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	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	3ed227df11	Rename HashKey to ChunkHashKey and define it as uint64_t	2016-06-22 20:25:39 -04:00
Erik Broberg	40afc93f7e	Make sure blending is initialized to true	2016-06-21 23:28:26 -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
Erik Broberg	658e2d51a8	Add ReverseBreadthFirst iteration order to ChunkNode	2016-06-21 19:57:15 -04:00
Erik Broberg	953d8554dc	Move commonly used GUI debug options to separate struct	2016-06-21 19:24:25 -04:00
Erik Broberg	14ea82d929	Remove unused GUI properties	2016-06-21 18:28:29 -04:00
Erik Broberg	c7ff3a4730	Remove unused GUI property chunkHeight	2016-06-21 17:21:37 -04:00
Erik Broberg	427cc0cc2b	Reduce local chunk rendering code by use of loops	2016-06-21 17:21:00 -04:00
Erik Broberg	badb4e8a73	Iterate over layer categories by loops istead od hard coded indices	2016-06-21 16:50:58 -04:00
Erik Broberg	9df878e237	Use smart pointers in ChunkLodGlobe and RenderableGlobe	2016-06-21 16:26:38 -04:00
Erik Broberg	974d5fdaec	Solve merge conflict	2016-06-21 14:04:33 -04:00
Erik Broberg	db6793f762	Make DebugRendering have its own SelectionProperty in GUI	2016-06-21 12:49:54 -04:00
Kalle Bladin	b64db9de8f	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-21 12:27:04 -04:00