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

Comparing libgender/material.C (file contents):
Revision 1.60 by root, Fri Feb 11 14:54:55 2005 UTC vs.
Revision 1.61 by root, Fri Feb 11 15:17:47 2005 UTC

 void mat_timed::enable (view &ctx)
 {
   material::enable (ctx);
-  time->set (timer::now - (int)timer::now);
+  time->set (timer::now);
   sh_colour->set (vec3 (255, 0, 0) * (1.F / 255.F));
 }
 void mat_timed::disable (view &ctx)
 {
   material::disable (ctx);
 }
+shader::varying_3f fish;
 void mat_timed::vsh (view &ctx)
 {
   using namespace shader::compile;
   std_vsh ();
   if (ctx.pass->l)
+   {
     f_normal = normal_matrix * vin.normal;
+    fish = xyz(vin.vertex) + zxy (vin.vertex) * 0.2;
+   }
 }
 void mat_timed::fsh (view &ctx)
 {
   using namespace shader::compile;
   if (ctx.pass->l)
     {
       temp_1f fac;
+      temp_3f normal;
+      normal = f_normal + 0.3 * pow (sin (fish * 0.1 + float3 (time * 2, time * 3.14, time * 1.55)), 3);
-      fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
+      fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
-      //fac = (fac / 100) * (mod (time, 100)) ;
-      fac = time;
-      xyz (fout.frag_color) = sin (time * 3.14159265*2);//ctx.pass->l->sh_colour * sh_colour * fac;
+      xyz (fout.frag_color) = fac * float3 (0.1,0.5,1);//ctx.pass->l->sh_colour * sh_colour * fac;
     }
 }
 void mat_gouraud_shaded::enable (view &ctx)
 {

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