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
|
3de5fb3b55
|
Add FloatProperty to RenderableStars to modify transparency (closing #150)
|
2016-04-08 15:11:46 +02:00 |
|
Sebastian Piwell
|
a2fb30b432
|
Depth working again
|
2016-03-31 09:39:05 -04:00 |
|
Michael Nilsson
|
af8880274c
|
discard fragment if alpha is 0 in screenspacerenderables
|
2016-03-18 13:52:11 -04:00 |
|
Michael Nilsson
|
70d7d3c82a
|
add alpha property to screenspacerenderable
|
2016-03-18 10:33:34 -04:00 |
|
Michael Nilsson
|
4b6b34cd74
|
added test case for screenspaceimage
|
2016-03-17 17:45:27 -04:00 |
|
Michael Nilsson
|
fd5a3a7a1f
|
fix issue with abufferrenderer not working with screenspacerenderables
|
2016-03-16 16:38:05 -04:00 |
|
Michael Nilsson
|
a94f877ac7
|
add occlusionDepth uniform to screenspaceimage
|
2016-03-14 10:39:20 -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
|
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 |
|