[Supertuxkart-commit] SF.net SVN: supertuxkart:[13381] main/trunk/data/shaders

[<cu...@us...>]

Revision: 13381
          http://sourceforge.net/p/supertuxkart/code/13381
Author:   curaga
Date:     2013-07-29 14:41:13 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
lightbeam: Remove unused uniform, add some spacing 

Modified Paths:
--------------
    main/trunk/data/shaders/lightbeam.frag
    main/trunk/data/shaders/lightbeam.vert

Modified: main/trunk/data/shaders/lightbeam.frag
===================================================================
--- main/trunk/data/shaders/lightbeam.frag	2013-07-29 14:40:42 UTC (rev 13380)
+++ main/trunk/data/shaders/lightbeam.frag	2013-07-29 14:41:13 UTC (rev 13381)
@@ -4,8 +4,9 @@
 // TODO: Soft edges when it intesects geometry
 // Some artefacts are still visible
 
-uniform sampler2D main_texture;
+uniform sampler2D tex;
 uniform float transparency;
+
 varying vec2 uv;
 varying vec3 eyeVec;
 varying vec3 normal;
@@ -13,7 +14,7 @@
 void main()
 {
 	float inter = dot(normal, eyeVec);
-	float m = texture2D(main_texture, vec2(0.5, uv.y)).r;
+	float m = texture2D(tex, vec2(0.5, uv.y)).r;
 	float alpha = inter * inter * inter * inter * m;
 
 	gl_FragColor = vec4(1.0, 1.0, 0.8, alpha);

Modified: main/trunk/data/shaders/lightbeam.vert
===================================================================
--- main/trunk/data/shaders/lightbeam.vert	2013-07-29 14:40:42 UTC (rev 13380)
+++ main/trunk/data/shaders/lightbeam.vert	2013-07-29 14:41:13 UTC (rev 13381)
@@ -1,7 +1,6 @@
 // Jean-manuel clemencon supertuxkart
 // Creates a cone lightbeam effect by smoothing edges
 
-uniform float time;
 varying vec2 uv;
 varying vec3 eyeVec;
 varying vec3 normal;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.