2809 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Erik Broberg	1f62736bc6	Solve merge conflict	2016-06-22 18:35:22 -04:00
Erik Broberg	745c51c4e4	Add unimplemented initialize to InteractionModes	2016-06-22 18:22:46 -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
Erik Broberg	7c0e80b866	Enable basic saving and restoring camera position between runs	2016-06-22 17:37:55 -04:00
Erik Broberg	60da53c00e	Divide InteractionHandler and Interaction modes into different files	2016-06-22 14:42:24 -04:00
Kalle Bladin	cb4b6dbdf3	Clean up in code that clamps camera position to height map.	2016-06-22 13:55:02 -04:00
Erik Broberg	6e5796107c	Remove Camera pointer from all InteractionModes. Pass it into update() instead	2016-06-22 12:32:11 -04:00
Erik Broberg	16564a69e3	Remove InputState pointer from all InteractionModes. Pass it in in update() instead	2016-06-22 12:12:48 -04: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
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	751a157f86	Use smart pointers and std::make_shared in TileProviders	2016-06-21 18:25:50 -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	c24b768397	Clean up GUI code managing layer categories	2016-06-21 16:01:18 -04:00
Erik Broberg	974d5fdaec	Solve merge conflict	2016-06-21 14:04:33 -04:00
Erik Broberg	57700da843	Add ReferencedBoolSelection to abstract away a lot of boilare plate code in GUI bool properties	2016-06-21 14:01:29 -04:00
Kalle Bladin	69aef205af	Interaction mode inertia is no longer dependent on the framerate.	2016-06-21 13:42:56 -04:00
Erik Broberg	db6793f762	Make DebugRendering have its own SelectionProperty in GUI	2016-06-21 12:49:54 -04:00
Erik Broberg	5148380257	Typedef vertices and color in DebugRenderer	2016-06-21 12:35:15 -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
Kalle Bladin	1ab25d5845	Add new layer category grayscale overlay and use it for mars ctx global map.	2016-06-21 12:26:52 -04:00
Erik Broberg	f4a1d12089	Enable easy access to screen space points for AABB3s through DebugRenderer	2016-06-21 12:25:38 -04:00
Erik Broberg	51bb575ac6	Move code for rendering camera frustum to DebugRenderer	2016-06-20 21:37:28 -04:00
Erik Broberg	5a9ffbcd90	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-20 21:08:05 -04:00
Erik Broberg	4738c26a82	Use DebugRenderer to render the view frustum of the saved camera	2016-06-20 21:07:50 -04:00
Kalle Bladin	c4251d603f	Fix bug that causes disabling blending to write warnings.	2016-06-20 20:15:14 -04:00
Kalle Bladin	323e3c2b45	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-20 19:33:32 -04:00