16 Commits

Author	SHA1	Message	Date
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	cab6951140	Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage	2016-03-16 11:47:58 -04:00
Sebastian Piwell	e6aca4b836	Spherical and Euclidean coordinate update each other	2016-03-16 11:47:53 -04:00
Michael Nilsson	f95bb727d7	removed camera parameter from screenspaceimage render function	2016-03-16 09:10:14 -04:00
Michael Nilsson	09f00fe81a	convertion to polar coordinates on flatscreen disable	2016-03-14 17:45:37 -04:00
Michael Nilsson	a94f877ac7	add occlusionDepth uniform to screenspaceimage	2016-03-14 10:39:20 -04: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	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	5a2833743d	add support for screenspacerenderables in renderengine	2016-03-08 17:59:06 -05:00
Michael Nilsson	aef82d5c9e	create screenspacerenderable	2016-03-08 15:11:59 -05:00