21 Commits

Author	SHA1	Message	Date
Sebastian Piwell	daa06cb387	Scale fix	2016-03-17 18:11:47 -04:00
Sebastian Piwell	8bc736acec	Add render functions to screenspaceframebuffer	2016-03-17 17:52:07 -04:00
Sebastian Piwell	31f1e91b06	Tests for screenSpaceFramebuffer	2016-03-17 15:38:21 -04:00
Sebastian Piwell	5bb4e3640d	Solved merge conflict	2016-03-16 17:42:51 -04:00
Sebastian Piwell	171aa46150	Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage ... Conflicts: include/openspace/rendering/screenspacerenderable.h modules/base/rendering/screenspaceimage.cpp src/rendering/screenspacerenderable.cpp	2016-03-16 17:42:13 -04:00
Sebastian Piwell	0f963ee3b8	Created screenspaceframebuffer	2016-03-16 17:27:10 -04:00
Michael Nilsson	fd5a3a7a1f	fix issue with abufferrenderer not working with screenspacerenderables	2016-03-16 16:38:05 -04:00
Sebastian Piwell	e6aca4b836	Spherical and Euclidean coordinate update each other	2016-03-16 11:47:53 -04:00
Sebastian Piwell	6bea326151	Correct euclidean to spherical conversion	2016-03-16 09:09:22 -04:00
Sebastian Piwell	2a110768c8	Better test mouse controls for screenspaceimages	2016-03-15 09:21:17 -04:00
Sebastian Piwell	34ca17563f	Occlussion for fisheye and singel_two_win	2016-03-11 18:51:10 -05:00
Sebastian Piwell	cfd68f2921	ScreenSpaceImage occlussion	2016-03-11 17:08:05 -05:00
Michael Nilsson	7dfdb2083e	solved merge conflict	2016-03-11 15:09:07 -05:00
Michael Nilsson	c746338553	added viewprojection matrix to screenspaceimage shaderprogram	2016-03-11 09:36:49 -05:00
Sebastian Piwell	f01299fe69	Add screenspacerenderables at runtime	2016-03-10 17:41:10 -05:00
Sebastian Piwell	a53e289a20	Position, scale and texturepath properties	2016-03-10 15:04:44 -05:00
Sebastian Piwell	afc3883d4d	Flat screen property	2016-03-10 13:01:05 -05:00
Sebastian Piwell	07d6662957	ScreenSpaceRenderabled enabled propery in GUI	2016-03-10 11:19:22 -05:00
Sebastian Piwell	bdaf8dd956	Texture on screnspaceimage	2016-03-09 16:57:29 -05:00
Sebastian Piwell	dab046b302	Create ScrenSpaceImage at runtime for testing purposes	2016-03-09 10:45:53 -05:00
Michael Nilsson	aef82d5c9e	create screenspacerenderable	2016-03-08 15:11:59 -05:00