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

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.33 by root, Wed Nov 3 03:36:16 2004 UTC vs.
Revision 1.37 by root, Thu Nov 4 15:43:53 2004 UTC

 }
 test_material::test_material ()
 //: tex ("textures/osama.jpg"), texvar (tex.name)
 : tex ("textures/rockwall.jpg"), texvar (tex.name)
-, norm ("textures/rockwall_height.jpg"), normvar (norm.name)
+, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
 {
 }
 static shader::varying_3f normal, lightvec;
 static shader::varying_2f texcoord;
       temp_3f lc;
       temp_1f fac;
       lc = (*ctx.pass_data->l)();
+      temp_3f rot1, rot2, rot3;
+      yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F);
+      //rot1 = normal_matrix * rot1;
+      rot2 = float3 (x(rot1), z(rot1), -y(rot1));
+      rot3 = float3 (y(rot1), -x(rot1), z(rot1));
+      normal = mat3 (rot1, rot2, rot3) * normal;
       fac = dot (normalize (normal), normalize (lightvec));
-      fac = pow (max (fac, 0.0), 2);
+      fac = max (pow (max (fac, 0.0), 6), 0.3);
-      xyz (fout.frag_color) = texture_2d (texvar, texcoord) * lc * fac;
+      xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * lc * fac;
+      //xyz (fout.frag_color) = lc * fac;
     }
 }
 void test_material::enable (view &ctx)
 {
   normvar->disable ();
   texvar->disable ();
   material::disable (ctx);
 }
-test_material testmat;
+test_material *testmat;

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