21 Commits

Author	SHA1	Message	Date
Michael Nilsson	f5d223c557	include camera in screenspaceimage	2016-03-16 09:19:28 -04:00
Sebastian Piwell	6bea326151	Correct euclidean to spherical conversion	2016-03-16 09:09:22 -04:00
Michael Nilsson	49aa80c859	rotation instead of translation in polar coordinates mode	2016-03-15 09:20:29 -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
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
Michael Nilsson	fe2d90eb8f	solved conflict	2016-03-10 15:57:59 -05:00
Michael Nilsson	9b3f2141a2	windows fix in screenspaceimage	2016-03-10 15:52:48 -05:00
Sebastian Piwell	540f7821b8	Compile fix	2016-03-10 15:08:43 -05:00
Sebastian Piwell	d27560957d	Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage ... Conflicts: modules/base/rendering/screenspaceimage.cpp	2016-03-10 15:06:34 -05:00
Sebastian Piwell	a53e289a20	Position, scale and texturepath properties	2016-03-10 15:04:44 -05:00
Michael Nilsson	49eece4d43	change test image url to relative path in screenspaceimage	2016-03-10 14:44:15 -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	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