Menu
▾
▴
[Supertuxkart-commit] SF.net SVN: supertuxkart:[14738] main/trunk/data/shaders
|
From: <sam...@us...> - 2013-12-19 23:58:29
|
Revision: 14738
http://sourceforge.net/p/supertuxkart/code/14738
Author: samuncle
Date: 2013-12-19 23:58:26 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Animated texture corrected. Thanks to vlj :)
Modified Paths:
--------------
main/trunk/data/shaders/bubble.vert
main/trunk/data/shaders/farplane.vert
main/trunk/data/shaders/grass.vert
main/trunk/data/shaders/gum_shield.vert
main/trunk/data/shaders/normalmap.vert
main/trunk/data/shaders/objectpass.vert
main/trunk/data/shaders/objectpass_rimlit.vert
main/trunk/data/shaders/pass.vert
main/trunk/data/shaders/rain.vert
main/trunk/data/shaders/skinning.vert
main/trunk/data/shaders/snow.vert
main/trunk/data/shaders/spheremap.vert
main/trunk/data/shaders/splatting.vert
main/trunk/data/shaders/water.vert
Modified: main/trunk/data/shaders/bubble.vert
===================================================================
--- main/trunk/data/shaders/bubble.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/bubble.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -23,7 +23,7 @@
void main()
{
- gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
gl_Position = ftransform();
float delta_x = cos(time*3.0) * sin( 4.0 * gl_TexCoord[0].st.s * 6.28318531 );
Modified: main/trunk/data/shaders/farplane.vert
===================================================================
--- main/trunk/data/shaders/farplane.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/farplane.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -1,6 +1,6 @@
void main() {
- gl_TexCoord[0] = gl_MultiTexCoord0;
- gl_TexCoord[1] = gl_MultiTexCoord1;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+ gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1;
gl_Position = (gl_ModelViewProjectionMatrix * gl_Vertex).xyww;
gl_FrontColor = gl_Color;
}
Modified: main/trunk/data/shaders/grass.vert
===================================================================
--- main/trunk/data/shaders/grass.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/grass.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -5,7 +5,7 @@
void main()
{
- gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
vec4 vertexPosition = gl_Vertex;
vertexPosition.xyz += windDir * gl_Color.r;
Modified: main/trunk/data/shaders/gum_shield.vert
===================================================================
--- main/trunk/data/shaders/gum_shield.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/gum_shield.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -29,7 +29,7 @@
void main()
{
- gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
vec4 viewp = gl_ModelViewMatrix * gl_Vertex;
eyeVec = normalize(-viewp).xyz;
Modified: main/trunk/data/shaders/normalmap.vert
===================================================================
--- main/trunk/data/shaders/normalmap.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/normalmap.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -5,10 +5,10 @@
void main()
{
- gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
normal = gl_NormalMatrix * gl_Normal;
tangent = gl_NormalMatrix * gl_MultiTexCoord1.xyz;
bitangent = gl_NormalMatrix * gl_MultiTexCoord2.xyz;
gl_Position = ftransform();
-}
\ No newline at end of file
+}
Modified: main/trunk/data/shaders/objectpass.vert
===================================================================
--- main/trunk/data/shaders/objectpass.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/objectpass.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -5,8 +5,8 @@
void main() {
nor = gl_NormalMatrix * gl_Normal;
- gl_TexCoord[0] = gl_MultiTexCoord0;
- gl_TexCoord[1] = gl_MultiTexCoord1;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+ gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1;
gl_Position = ftransform();
gl_FrontColor = gl_Color;
}
Modified: main/trunk/data/shaders/objectpass_rimlit.vert
===================================================================
--- main/trunk/data/shaders/objectpass_rimlit.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/objectpass_rimlit.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -9,7 +9,7 @@
eyenor = gl_NormalMatrix * gl_Normal;
viewpos = -normalize((gl_ModelViewMatrix * gl_Vertex).xyz);
- gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
gl_Position = ftransform();
gl_FrontColor = gl_Color;
}
Modified: main/trunk/data/shaders/pass.vert
===================================================================
--- main/trunk/data/shaders/pass.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/pass.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -1,6 +1,6 @@
void main() {
- gl_TexCoord[0] = gl_MultiTexCoord0;
- gl_TexCoord[1] = gl_MultiTexCoord1;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+ gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1;
gl_Position = ftransform();
gl_FrontColor = gl_Color;
}
Modified: main/trunk/data/shaders/rain.vert
===================================================================
--- main/trunk/data/shaders/rain.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/rain.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -29,5 +29,5 @@
gl_PointSize = screenw * projCorner.x / projCorner.w;
gl_Position = gl_ProjectionMatrix * eyepos;
- gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
}
Modified: main/trunk/data/shaders/skinning.vert
===================================================================
--- main/trunk/data/shaders/skinning.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/skinning.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -68,8 +68,8 @@
ModelTransform *= vertTran;
gl_Position = ModelTransform * gl_Vertex;
- gl_TexCoord[0] = gl_MultiTexCoord0;
- gl_TexCoord[1] = gl_MultiTexCoord1;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+ gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1;
/*
// Reflections.
Modified: main/trunk/data/shaders/snow.vert
===================================================================
--- main/trunk/data/shaders/snow.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/snow.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -1,6 +1,6 @@
void main()
{
- gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
gl_Position = ftransform();
gl_FrontColor = gl_Color;
Modified: main/trunk/data/shaders/spheremap.vert
===================================================================
--- main/trunk/data/shaders/spheremap.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/spheremap.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -24,7 +24,7 @@
void main()
{
- gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
gl_Position = ftransform();
vertex_color = gl_Color;
Modified: main/trunk/data/shaders/splatting.vert
===================================================================
--- main/trunk/data/shaders/splatting.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/splatting.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -22,8 +22,8 @@
void main()
{
- gl_TexCoord[0] = gl_MultiTexCoord0;
- gl_TexCoord[1] = gl_MultiTexCoord1;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+ gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1;
gl_Position = ftransform();
normal = gl_NormalMatrix * gl_Normal;
Modified: main/trunk/data/shaders/water.vert
===================================================================
--- main/trunk/data/shaders/water.vert 2013-12-19 00:13:17 UTC (rev 14737)
+++ main/trunk/data/shaders/water.vert 2013-12-19 23:58:26 UTC (rev 14738)
@@ -50,6 +50,6 @@
halfVec = v ;
gl_Position = gl_ModelViewProjectionMatrix * pos;
- gl_TexCoord[0] = gl_MultiTexCoord0;
- gl_TexCoord[1] = gl_MultiTexCoord1;
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+ gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|