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.57 by root, Mon Feb 7 08:16:31 2005 UTC vs.
Revision 1.64 by root, Mon Jul 18 04:28:40 2005 UTC

… …
89 { 89 {
90 using namespace shader::compile; 90 using namespace shader::compile;
91 91
92 temp_1f lz; 92 temp_1f lz;
93 93
94 // TODO: negative z is not calculated in an acceptable way, clipping does horrible things(?) 94 // TODO: negative z is not calculated in an a very acceptable way
95 lz = z (vout.position); 95 lz = z (vout.position);
96#if 0 96 lz = sign (lz) * (log (abs (lz) + exp (1e0)) - 1e0) / log (1e30);
97 lz = (log (max (lz, 0) + 1) / log (1e30)) - 1;
98#else
99 lz = ifelse (lz <= 0,
100 0,
101 log (lz + 1) / log (1e30)
102 ) - 1;
103#endif
104 z (vout.position) = lz * w (vout.position); 97 z (vout.position) = lz * w (vout.position);
105 } 98 }
106 99
107 vsh_src = shader::shader_builder::stop (); 100 vsh_src = shader::shader_builder::stop ();
108 101
… …
140: tex ("textures/rockwall.jpg"), texvar (tex.name) 133: tex ("textures/rockwall.jpg"), texvar (tex.name)
141, norm ("textures/rockwall_normal.jpg"), normvar (norm.name) 134, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
142{ 135{
143} 136}
144 137
138void mat_timed::enable (view &ctx)
139{
140 material::enable (ctx);
141
142 time->set (timer::now);
143 sh_colour->set (vec3 (255, 0, 0) * (1.F / 255.F));
144}
145
146void mat_timed::disable (view &ctx)
147{
148 material::disable (ctx);
149}
150
151void mat_timed::vsh (view &ctx)
152{
153 using namespace shader::compile;
154 std_vsh ();
155
156 if (ctx.pass->l)
157 f_normal = normal_matrix * vin.normal;
158}
159
160void mat_timed::fsh (view &ctx)
161{
162 using namespace shader::compile;
163
164 if (ctx.pass->l)
165 {
166 temp_1f fac;
167 temp_3f normal;
168
169 normal = f_normal + 0.3 * pow (sin (f_normal * 3.14159 + time), 3);
170
171 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
172
173 xyz (fout.frag_color) = fac * float3 (0.1,0.5,1);//ctx.pass->l->sh_colour * sh_colour * fac;
174 }
175}
176
177void mat_gouraud_shaded::enable (view &ctx)
178{
179 material::enable (ctx);
180
181 sh_colour->set (vec3 (c.r, c.g, c.b) * (1.F / 255.F));
182}
183
184void mat_gouraud_shaded::disable (view &ctx)
185{
186 material::disable (ctx);
187}
188
189void mat_gouraud_shaded::vsh (view &ctx)
190{
191 using namespace shader::compile;
192 std_vsh ();
193
194 if (ctx.pass->l)
195 f_normal = normal_matrix * vin.normal;
196}
197
198void mat_gouraud_shaded::fsh (view &ctx)
199{
200 using namespace shader::compile;
201
202 if (ctx.pass->l)
203 {
204 temp_1f fac;
205
206 fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
207
208 xyz (fout.frag_color) = ctx.pass->l->sh_colour * sh_colour * fac;
209 }
210}
211
212static shader::varying_3f f_normal;
213
214void mat_debug::enable (view &ctx)
215{
216 material::enable (ctx);
217
218 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
219 glEnable (GL_BLEND);
220 glDepthMask (1);
221}
222
223void mat_debug::disable (view &ctx)
224{
225 material::disable (ctx);
226
227 glDisable (GL_BLEND);
228 glDepthMask (0);
229}
230
231void mat_debug::vsh (view &ctx)
232{
233 using namespace shader::compile;
234 std_vsh ();
235
236 if (ctx.pass->l)
237 f_normal = normal_matrix * vin.normal;
238}
239
240void mat_debug::fsh (view &ctx)
241{
242 using namespace shader::compile;
243
244 if (ctx.pass->l)
245 {
246 temp_1f fac;
247
248 fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
249
250 xyz (fout.frag_color) = float3 (1.,0.,0.);
251 w (fout.frag_color) = 0.1;
252 }
253}
254
255static shader::varying_2f texcoord;
145static shader::varying_3f normal; 256static shader::varying_3f normal;
146static shader::varying_2f texcoord;
147
148void test_material2::vsh (view &ctx)
149{
150 using namespace shader::compile;
151 std_vsh ();
152
153 if (ctx.pass->l)
154 {
155 normal = normal_matrix * vin.normal;
156 }
157}
158
159void test_material2::fsh (view &ctx)
160{
161 using namespace shader::compile;
162
163 if (ctx.pass->l)
164 {
165 temp_1f fac;
166 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
167 xyz (fout.frag_color) = ctx.pass->l->sh_colour * fac;//normalize (ctx.pass->l->sh_lightvec);
168 }
169}
170 257
171void test_material::vsh (view &ctx) 258void test_material::vsh (view &ctx)
172{ 259{
173 using namespace shader::compile; 260 using namespace shader::compile;
174 261
… …
222 texvar->disable (); 309 texvar->disable ();
223 material::disable (ctx); 310 material::disable (ctx);
224} 311}
225 312
226test_material *testmat; 313test_material *testmat;
227test_material2 *testmat2; 314mat_gouraud_shaded *testmat2;
315mat_timed *testmat3;
316mat_debug *debugmat;
228 317

Diff Legend

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