CVS: data/Shaders reflect.frag, 1.1, 1.2 reflect.vert, 1.1, 1.2

Update of /var/cvs/FlightGear-0.9/data/Shaders
In directory baron.flightgear.org:/tmp/cvs-serv23635

Modified Files:
	reflect.frag reflect.vert 
Log Message:
Remove warnings

Index: reflect.frag
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Shaders/reflect.frag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reflect.frag	28 Mar 2010 11:18:34 -0000	1.1
+++ reflect.frag	29 Mar 2010 09:50:54 -0000	1.2
@@ -7,7 +7,7 @@
 varying vec3  vViewVec;
 varying vec3  reflVec;
 
-varying vec3 Diffuse;
+varying vec4 Diffuse;
 varying vec3 lightDir, halfVector;
 varying float alpha, fogCoord;
 
@@ -35,7 +35,7 @@
 
     //calculate the specular light
     if (NdotL > 0.0) {
-        color += vec4(Diffuse, 1.0) * NdotL;
+        color += Diffuse * NdotL;
         halfV = normalize(halfVector);
         NdotHV = max(dot(n, halfV), 0.0);
         if (gl_FrontMaterial.shininess > 0.0)

Index: reflect.vert
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Shaders/reflect.vert,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reflect.vert	28 Mar 2010 11:18:34 -0000	1.1
+++ reflect.vert	29 Mar 2010 09:50:56 -0000	1.2
@@ -5,7 +5,7 @@
 varying vec3 vViewVec;
 varying vec3 reflVec;
 
-varying vec3 Diffuse;
+varying vec4 Diffuse;
 varying vec3 normal, lightDir, halfVector;
 varying float alpha, fogCoord;
 
@@ -47,7 +47,7 @@
 
     // calculate the reflection vector
     vec4 reflect_eye = vec4(reflect(vertVec, VNormal), 0.0);
-    reflVec = normalize(gl_ModelViewMatrixInverse * reflect_eye);
+    reflVec = normalize(gl_ModelViewMatrixInverse * reflect_eye).xyz;
 
     gl_FrontColor = gl_Color;
     constantColor = gl_FrontMaterial.emission


------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev