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.49 by root, Sun Nov 7 22:07:05 2004 UTC vs.
Revision 1.64 by root, Mon Jul 18 04:28:40 2005 UTC

… …
55 glGenTextures (1, &name); 55 glGenTextures (1, &name);
56 glBindTexture (GL_TEXTURE_2D, name); 56 glBindTexture (GL_TEXTURE_2D, name);
57 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); 57 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
58 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); 58 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
59 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); 59 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
60 glTexImage2D (GL_TEXTURE_2D, 60 glTexImage2D (GL_TEXTURE_2D, 0,
61 0,
62 GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); 61 GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
63 SDL_FreeSurface (image); /* No longer needed */ 62 SDL_FreeSurface (image); /* No longer needed */
64 63
65 return name; 64 return name;
66} 65}
… …
90 { 89 {
91 using namespace shader::compile; 90 using namespace shader::compile;
92 91
93 temp_1f lz; 92 temp_1f lz;
94 93
95 // TODO: negative z is not calculated in an acceptable way 94 // TODO: negative z is not calculated in an a very acceptable way
96 lz = z (vout.position); 95 lz = z (vout.position);
97 z (vout.position) = (ifelse (lz < 0, lz, log (lz) * (2 / log (1e10))) - 1) * w (vout.position); 96 lz = sign (lz) * (log (abs (lz) + exp (1e0)) - 1e0) / log (1e30);
97 z (vout.position) = lz * w (vout.position);
98 } 98 }
99 99
100 vsh_src = shader::shader_builder::stop (); 100 vsh_src = shader::shader_builder::stop ();
101 101
102 shader::shader_builder::start (); 102 shader::shader_builder::start ();
103 103
104 if (ctx.pass->l) 104 if (ctx.pass->l)
105 { 105 {
106 ctx.pass->l->fsh (); 106 ctx.pass->l->fsh ();
107
108 fsh (ctx); 107 fsh (ctx);
109 } 108 }
110 else 109 else
110 // many drivers need both vertex and fragment shader, 'caboom!' otherwise
111 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.); 111 shader::compile::fout.frag_color = shader::compile::float4 (0., 0., 0., 0.);
112 112
113 fsh_src = shader::shader_builder::stop (); 113 fsh_src = shader::shader_builder::stop ();
114 114
115 shader::program_object po = shader::get_program (vsh_src, fsh_src); 115 shader::program_object po = shader::get_program (vsh_src, fsh_src);
116 matmap.insert (pass_data::matmap_t::value_type (this, po)); 116 matmap.insert (pass_data::matmap_t::value_type (this, po));
… …
119 } 119 }
120 else 120 else
121 i->second->enable (); 121 i->second->enable ();
122 122
123 if (ctx.pass->l) 123 if (ctx.pass->l)
124 ctx.pass->l->enable (); 124 ctx.pass->l->enable (ctx);
125} 125}
126 126
127void material::disable (view &ctx) 127void material::disable (view &ctx)
128{ 128{
129} 129}
… …
133: tex ("textures/rockwall.jpg"), texvar (tex.name) 133: tex ("textures/rockwall.jpg"), texvar (tex.name)
134, norm ("textures/rockwall_normal.jpg"), normvar (norm.name) 134, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
135{ 135{
136} 136}
137 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;
138static shader::varying_3f normal; 256static shader::varying_3f normal;
139static shader::varying_2f texcoord;
140 257
141void test_material::vsh (view &ctx) 258void test_material::vsh (view &ctx)
142{ 259{
143 using namespace shader::compile; 260 using namespace shader::compile;
144 261
… …
192 texvar->disable (); 309 texvar->disable ();
193 material::disable (ctx); 310 material::disable (ctx);
194} 311}
195 312
196test_material *testmat; 313test_material *testmat;
314mat_gouraud_shaded *testmat2;
315mat_timed *testmat3;
316mat_debug *debugmat;
197 317

Diff Legend

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