[Vegastrike-cvs] SF.net SVN: vegastrike: [11405] trunk/data4.x/programs

[<hel...@us...>]

Revision: 11405
          http://vegastrike.svn.sourceforge.net/vegastrike/?rev=11405&view=rev
Author:   hellcatv
Date:     2007-08-27 19:13:27 -0700 (Mon, 27 Aug 2007)

Log Message:
-----------
forgot to only conditionally add in the ambient terms of the second lite since we only know the first light (sun) exists

Modified Paths:
--------------
    trunk/data4.x/programs/default.vp
    trunk/data4.x/programs/mac.fp
    trunk/data4.x/programs/mac.vp

Modified: trunk/data4.x/programs/default.vp
===================================================================
--- trunk/data4.x/programs/default.vp	2007-08-28 02:08:07 UTC (rev 11404)
+++ trunk/data4.x/programs/default.vp	2007-08-28 02:13:27 UTC (rev 11405)
@@ -28,7 +28,9 @@
   gl_TexCoord[6].xyz=source1pos/source1len;
   gl_TexCoord[2].w=gl_TexCoord[3].w=gl_TexCoord[4].w=gl_TexCoord[1].w=0.0;
   ///set primary color to the front light[0] ambient and light model ambient + emissive material properties
-  vec4 pc=gl_FrontLightProduct[0].ambient+gl_FrontLightProduct[1].ambient+gl_FrontLightModelProduct.sceneColor;
+  vec4 pc=gl_FrontLightProduct[0].ambient+gl_FrontLightModelProduct.sceneColor;
+  if (light_enabled[1]!=0)
+    pc+=gl_FrontLightProduct[1].ambient;
   vec4 sc=vec4(0);
   if (max_light_enabled>=2) {
     for (int li=2;li<gl_MaxLights;++li) {//computed in engine

Modified: trunk/data4.x/programs/mac.fp
===================================================================
--- trunk/data4.x/programs/mac.fp	2007-08-28 02:08:07 UTC (rev 11404)
+++ trunk/data4.x/programs/mac.fp	2007-08-28 02:13:27 UTC (rev 11405)
@@ -80,7 +80,7 @@
 //add in the dot of light and normal* diffuse mat*diffuse light
   ambient+=max(nDotL0,0.0)*gl_FrontLightProduct[0].diffuse;
   if (light_enabled[1]!=0)
-    ambient+=max(nDotL1,0.0)*gl_FrontLightProduct[1].diffuse;
+    ambient+=gl_FrontLightProduct[1].ambient+max(nDotL1,0.0)*gl_FrontLightProduct[1].diffuse;
 //find the color of specularity of this surface... lookup in env map the normal
   vec4 specularity=gl_SecondaryColor+texture2D(envMap,EnvMapGen(reflection));
 //add in the lDotR product

Modified: trunk/data4.x/programs/mac.vp
===================================================================
--- trunk/data4.x/programs/mac.vp	2007-08-28 02:08:07 UTC (rev 11404)
+++ trunk/data4.x/programs/mac.vp	2007-08-28 02:13:27 UTC (rev 11405)
@@ -22,7 +22,7 @@
   //tc5.xyz=normalize(gl_LightSource[0].position.xyz*position.w-position.xyz*gl_LightSource[0].position.w);//find the direction of the vertex to the light...if not directional position.w==1
   //tc2.w=tc3.w=tc4.w=tc5.w=tc1.w=0.0;
   ///set primary color to the front light[0] ambient and light model ambient + emissive material properties
-  vec4 pc=gl_FrontLightProduct[0].ambient+gl_FrontLightProduct[1].ambient+gl_FrontLightModelProduct.sceneColor;
+  vec4 pc=gl_FrontLightProduct[0].ambient+gl_FrontLightModelProduct.sceneColor;
   vec4 sc=vec4(0);
   for (int li=2;li<5;++li) {//computed in engine
     if (true) {//only compute for enabled lights