[ViewVC] Diff of: cvs/libgender/material.C

Comparing libgender/material.C (file contents):
Revision 1.66 by root, Wed Jan 25 22:48:02 2006 UTC vs.
Revision 1.67 by root, Wed Jan 25 22:52:26 2006 UTC

 void skybox_material::fsh (view &ctx)
 {
   using namespace shader::compile;
-  xyz (fout.frag_color) = texture_2d (tex, skybox_texcoord);
+  xyz (fout.frag_color) = xyz (texture_2d (tex, skybox_texcoord));
 }
 void mat_timed::enable (view &ctx)
 {
   material::enable (ctx);
       temp_3f lc;
       temp_1f fac;
       temp_3f rot1, rot2, rot3;
-      yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
+      yxz (rot1) = (xyz (texture_2d (normvar, texcoord)) * 2.F - 1.F);
       //rot1 = normal_matrix * rot1;
       rot2 = shader::compile::vec3 (x(rot1), z(rot1), -y(rot1));
       rot3 = shader::compile::vec3 (y(rot1), -x(rot1), z(rot1));
       normal = mat3 (rot1, rot2, rot3) * normal;
       fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
       fac = max (pow (max (fac, 0.0), 6), 0.3);
-      xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
+      xyz (fout.frag_color) = xyz (texture_2d (texvar, texcoord) + 0.2F)
+                              * fac
                               * ctx.pass->l->sh_colour;
       //xyz (fout.frag_color) = lc * fac;
     }
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines