146 Commits

Author	SHA1	Message	Date
Sebastian Piwell	d25f2e60ab	ScreenSpaceImage can take urls and is parent to ScreenSpaceCygnet	2016-05-06 16:12:30 -04:00
Sebastian Piwell	e6adcfba27	Replaced SimpleSphereGeometry with PowerScaledSphere	2016-05-06 10:32:09 -04:00
Sebastian Piwell	c284986c21	Implemented dataSphere	2016-05-05 17:57:52 -04:00
Sebastian Piwell	b56f85e968	Refactor of ISWACygnet class tree	2016-05-05 15:36:00 -04:00
Michael Nilsson	bf9a819617	windows fix, add base module as dependency to iswa	2016-05-04 12:43:59 -04:00
Michael Nilsson	3a80405c30	solve merge conflict	2016-05-04 12:10:49 -04:00
Michael Nilsson	0d49076c54	solve merge conflict with develop	2016-05-03 17:11:28 -04:00
Sebastian Piwell	1e4e8919c3	Set attributes of screenspacerenderable through dictionary	2016-05-03 15:35:33 -04:00
Michael Nilsson	4d61694f75	ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory	2016-05-03 10:39:32 -04:00
Alexander Bock	3f9cd92767	Use correct shader in RenderablePlanet	2016-05-01 13:39:09 +02:00
Alexander Bock	eb4904fc17	Moving pscstandard shader into base	2016-05-01 13:21:57 +02:00
Alexander Bock	6daf8cb6a0	Move nighttexture shader into base module	2016-05-01 13:08:30 +02:00
Alexander Bock	c6ffc48c10	Remove DynamicEphemeris as it is superseded by StaticEphemeris	2016-04-25 14:04:05 +02:00
Alexander Bock	472d35b7c4	Use correct orientation for renderableplaneprojection	2016-04-23 04:07:51 +02:00
Michael Nilsson	3d3e59eabe	solve merge conflict with develop	2016-04-20 16:38:41 -04:00
Michael Nilsson	c72536fbbc	untabify to make merge easier	2016-04-20 15:21:30 -04:00
Michael Nilsson	07dfafeddb	solve merge conflict with develop	2016-04-20 15:03:51 -04:00
Sebastian Piwell	cb49805b07	Update ghoul	2016-04-20 10:28:53 -04:00
Alexander Bock	ea91d50b87	Start correcting fixes for wrong image origin	2016-04-20 13:07:01 +02:00
Alexander Bock	acc6095ba3	Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes	2016-04-20 13:06:40 +02:00
Alexander Bock	906470f28e	Untabify the rest of the source files ... Update Ghoul repository	2016-04-18 20:14:29 +02:00
Alexander Bock	a21c9538b6	Untabify more files	2016-04-18 15:15:30 +02:00
Alexander Bock	c8da825098	Rename ImageSequencer2 to ImageSequencer	2016-04-18 15:14:59 +02:00
Alexander Bock	6b5681626b	Removing clang-analyze warnings	2016-04-13 11:46:07 -04:00
Alexander Bock	3de5fb3b55	Add FloatProperty to RenderableStars to modify transparency (closing #150)	2016-04-08 15:11:46 +02:00
Alexander Bock	72ccfe51e9	Ignore empty lines in Speck file reading (closing #133)	2016-04-08 15:06:13 +02:00
Alexander Bock	8f4d3c20eb	Untabify RenderableStars	2016-04-08 15:00:43 +02:00
Sebastian Piwell	6f1b9a9fab	Merge with screenspaceimage	2016-04-04 15:51:30 -04:00
Sebastian Piwell	453fbe300e	Remove screenspacerenderables in any order	2016-04-04 15:40:45 -04:00
Sebastian Piwell	8e996f5bab	Remove screenspacerenderables and iSWACygnets	2016-04-04 15:30:54 -04:00
Sebastian Piwell	3fbfb9bb33	Remove screenspacerenderables	2016-04-04 13:49:21 -04:00
Sebastian Piwell	e729723b06	Merge with feature/screenspacerenderable	2016-03-31 15:58:54 -04:00
Sebastian Piwell	d610171441	for simple testing	2016-03-31 15:54:29 -04:00
Sebastian Piwell	79979fe8dd	Clean up	2016-03-31 14:53:42 -04:00
Michael Nilsson	2bfe0129e4	add screenspacecygnets	2016-03-31 12:17:32 -04:00
Sebastian Piwell	a2fb30b432	Depth working again	2016-03-31 09:39:05 -04:00
Michael Nilsson	d7509ddc52	add loggerCat	2016-03-30 10:03:05 -04:00
Michael Nilsson	d390a70fb6	solve merge conflict	2016-03-30 09:51:34 -04:00
Michael Nilsson	3e7249157c	add some documentation	2016-03-30 09:17:49 -04:00
Emil Axelsson	80fe89dbc8	change interfaces from pointer to reference	2016-03-23 14:00:40 +01:00
Emil Axelsson	0b3cbaa961	fix bug in multimodelgeometry loading, initializing w to 0 for all vertices	2016-03-23 11:52:29 +01:00
Michael Nilsson	85225946b9	solved merge conflict	2016-03-18 13:57:28 -04:00
Michael Nilsson	af8880274c	discard fragment if alpha is 0 in screenspacerenderables	2016-03-18 13:52:11 -04:00
Sebastian Piwell	48021a46e2	Sort screenspacerenderables in correct render order	2016-03-18 12:02:46 -04:00
Sebastian Piwell	43add83e19	Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage	2016-03-18 11:11:50 -04:00
Sebastian Piwell	d77ba76d33	Crop framebuffers	2016-03-18 11:11:42 -04:00
Michael Nilsson	5553ec02c9	solved merge conflict	2016-03-18 10:35:40 -04:00
Michael Nilsson	70d7d3c82a	add alpha property to screenspacerenderable	2016-03-18 10:33:34 -04:00
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