Commit Graph

13 Commits

Author SHA1 Message Date
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 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
Alexander Bock f266f0bcee Updated copyright header 2016-02-05 22:47:37 +01:00
Alexander Bock 86e6c21f96 - Make missing SGCT a non-fatal error in CMake
- Add screen sizes to the abuffer dictionary
- Use the new method for setting the screen size in the star rendering
2016-02-04 21:41:17 +01:00
Emil Axelsson d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock 72ba616414 Merge branch 'develop' into feature/remote_redesign
Conflicts:
	modules/base/shaders/path_fs.glsl
2015-07-07 20:31:01 +02:00
Alexander Bock 9e06b612a7 Remove the unused location declarations in the shader to make OpenSpace compatible with OpenGL 4.0 2015-07-07 11:17:56 +02:00
Alexander Bock 003a438602 Removed while loops from path_vs that caused driver issues with big w values
Removed error that caused the postDraw method not to be called on slave nodes
2015-07-04 15:41:43 +02:00
Alexander Bock 40c42ff772 Fix the scaling of renderablemodel by making the magnification a floatproperty 2015-07-01 17:56:51 +02:00
Alexander Bock 9d733eb613 Moving Kameleon into its own module
Moving fieldline rendering into its own module
2015-05-26 23:51:15 +02:00
Alexander Bock ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00