ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/libgender/material.C
(Generate patch)

Comparing cvsroot/libgender/material.C (file contents):
Revision 1.25 by root, Mon Nov 1 01:57:03 2004 UTC vs.
Revision 1.29 by root, Tue Nov 2 02:59:33 2004 UTC

… …
91 using namespace shader::compile; 91 using namespace shader::compile;
92 92
93 p.vsh->start (); 93 p.vsh->start ();
94 94
95 temp_4f wpos; 95 temp_4f wpos;
96 varying_1f camdist, zpos;
97 varying_2f texcoord;
98 varying_3f lightvec, normal;
96 99
97 wpos = model_view_projection_matrix * vin.vertex; 100 wpos = model_view_matrix * vin.vertex;
98 101
99 //wpos = wpos / abs (w (wpos)); 102 temp_1f wz;
103 //wz = log2 (abs (wz)) * sign (wz);
100 104
101 vout.position = wpos; 105 vout.position = projection_matrix * wpos;
102 vout.tex_coord[0] = vin.tex_coord[0]; 106 texcoord = xy (vin.tex_coord[0]);
103 xyz (vout.tex_coord[1]) = normal_matrix * vin.normal; 107 normal = normal_matrix * vin.normal;
104 xyz (vout.tex_coord[2]) = xyz (lightpos - model_view_matrix * vin.vertex); 108 lightvec = xyz (lightpos - model_view_matrix * vin.vertex);
105 w (vout.tex_coord[2]) = 1.; 109 camdist = 1 - max (length (lightvec) / 10000., 0);
106 xw (vout.tex_coord[3]) = shader::compile::vec2 (length (xyz (vout.tex_coord[2])), 1.);
107 110
108 p.vsh->end ();
109 p.vsh->compile (); 111 p.vsh->stop ();
110 112
111 p.fsh->start (); 113 p.fsh->start ();
112 114
113 temp_1f fac; 115 temp_1f fac;
114 temp_2f disp; 116 temp_2f disp;
115 temp_1f dx, dy; 117 temp_1f dx, dy;
116 temp_1f bumpnormal; 118 temp_1f bumpnormal;
117 temp_1f dist; 119 temp_1f dist;
118 120
119 dist = min (x(fin.tex_coord[3]), 100.); 121 fac = dot (normalize (normal), normalize (lightvec));
120
121 fac = dot (normalize (xyz (fin.tex_coord[1])), xyz (normalize (fin.tex_coord[2])));
122 //fac = dot (shader::compile::vec3 (normalize (fin.tex_coord[1]) + normalize (fin.tex_coord[2])) * 0.5, bumpnormal); 122 //fac = dot (shader::compile::vec3 (normalize (fin.tex_coord[1]) + normalize (fin.tex_coord[2])) * 0.5, bumpnormal);
123 //fac = dot (bumpnormal, normalize (fin.tex_coord[2])); 123 //fac = dot (bumpnormal, normalize (fin.tex_coord[2]));
124 //fac = pow (max (fac, 0.0), 8); 124 fac = pow (max (fac, 0.0), 2);
125 xyz (fout.frag_color) = (texture_2d (texvar, fin.tex_coord[0] - disp)) * max (fac, 1.2 * (1 - dist / 100.)); 125 xyz (fout.frag_color) = texture_2d (texvar, texcoord) * (fac + 0.4) * camdist;
126 126
127 p.fsh->end ();
128 p.fsh->compile (); 127 p.fsh->stop ();
129 p.link (); 128 p.link ();
130} 129}
131 130
132void test_material::enable (view &ctx) 131void test_material::enable (view &ctx)
133{ 132{

Diff Legend

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