vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sphere shader

icc-effect-5.14.5
Martin Gräßlin 2011-04-29 14:12:48 +02:00
parent 4d463a4dc4
commit 57c101c04d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
effects/cube/cube.cpp
View File

@ -1416,6 +1416,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa
}
if (shader) {
origMatrix = shader->getUniformMatrix4x4("screenTransformation");
GLShader *currentShader = shader;
if (mode == Cylinder) {
shaderManager->pushShader(cylinderShader);
cylinderShader->setUniform("xCoord", (float)w->x());
@ -1427,6 +1428,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa
factor = timeLine.currentValue();
cylinderShader->setUniform("timeLine", factor);
data.shader = cylinderShader;
currentShader = cylinderShader;
}
if (mode == Sphere) {
shaderManager->pushShader(sphereShader);
@ -1439,11 +1441,12 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa
factor = timeLine.currentValue();
sphereShader->setUniform("timeLine", factor);
data.shader = sphereShader;
currentShader = sphereShader;
}
if (reflectionPainting) {
shader->setUniform("screenTransformation", m_reflectionMatrix * m_rotationMatrix * origMatrix);
currentShader->setUniform("screenTransformation", m_reflectionMatrix * m_rotationMatrix * origMatrix);
} else {
shader->setUniform("screenTransformation", m_rotationMatrix*origMatrix);
currentShader->setUniform("screenTransformation", m_rotationMatrix*origMatrix);
}
}
}

4
effects/cube/data/sphere.vert
View File

@ -26,6 +26,8 @@ uniform float height;
uniform float cubeAngle;
uniform vec2 u_offset;
uniform float timeLine;
uniform float textureWidth;
uniform float textureHeight;
attribute vec4 vertex;
attribute vec2 texCoord;
@ -34,7 +36,7 @@ varying vec2 varyingTexCoords;
void main()
{
varyingTexCoords = texCoord;
varyingTexCoords = texCoord / vec2(textureWidth, textureHeight);
vec4 transformedVertex = vertex;
transformedVertex.x = transformedVertex.x - width;
transformedVertex.y = transformedVertex.y - height;