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.41 by root, Sat Nov 6 01:56:20 2004 UTC vs.
Revision 1.63 by root, Mon Jul 18 01:40:01 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}
… …
69{ 68{
70} 69}
71 70
72void material::enable (view &ctx) 71void material::enable (view &ctx)
73{ 72{
74 pass::matmap_t &matmap = ctx.pass_data->matmap; 73 pass_data::matmap_t &matmap = ctx.pass->matmap;
75 74
76 pass::matmap_t::iterator i = matmap.find (this); 75 pass_data::matmap_t::iterator i = matmap.find (this);
77 76
78 if (i == matmap.end ()) 77 if (i == matmap.end ())
79 { 78 {
80 string vsh_src, fsh_src; 79 string vsh_src, fsh_src;
81 80
82 shader::shader_builder::start (); 81 shader::shader_builder::start ();
83 82
84 if (ctx.pass_data->l) 83 if (ctx.pass->l)
85 ctx.pass_data->l->vsh (); 84 ctx.pass->l->vsh ();
86 85
87 vsh (ctx); 86 vsh (ctx);
88 87
88 // compute logarithmic depth - see the frustum matrix in view.C
89 { 89 {
90 using namespace shader::compile; 90 using namespace shader::compile;
91 91
92 //z (vout.position) = log2 (z (vout.position) / w (vout.position)) * w (vout.position); 92 temp_1f lz;
93
94 // TODO: negative z is not calculated in an acceptable way, clipping does horrible things(?)
95 lz = z (vout.position);
96#if 0
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);
93 } 105 }
94 106
95 vsh_src = shader::shader_builder::stop (); 107 vsh_src = shader::shader_builder::stop ();
96 108
97 shader::shader_builder::start (); 109 shader::shader_builder::start ();
98 110
99 if (ctx.pass_data->l) 111 if (ctx.pass->l)
100 { 112 {
101 ctx.pass_data->l->fsh (); 113 ctx.pass->l->fsh ();
102
103 fsh (ctx); 114 fsh (ctx);
104 } 115 }
105 else 116 else
117 // many drivers need both vertex and fragment shader, 'caboom!' otherwise
106 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.); 118 shader::compile::fout.frag_color = shader::compile::float4 (0., 0., 0., 0.);
107 119
108 fsh_src = shader::shader_builder::stop (); 120 fsh_src = shader::shader_builder::stop ();
109 121
110 shader::program_object po = shader::get_program (vsh_src, fsh_src); 122 shader::program_object po = shader::get_program (vsh_src, fsh_src);
111 matmap.insert (pass::matmap_t::value_type (this, po)); 123 matmap.insert (pass_data::matmap_t::value_type (this, po));
112 124
113 po->enable (); 125 po->enable ();
114 } 126 }
115 else 127 else
116 i->second->enable (); 128 i->second->enable ();
129
130 if (ctx.pass->l)
131 ctx.pass->l->enable (ctx);
117} 132}
118 133
119void material::disable (view &ctx) 134void material::disable (view &ctx)
120{ 135{
121} 136}
… …
125: tex ("textures/rockwall.jpg"), texvar (tex.name) 140: tex ("textures/rockwall.jpg"), texvar (tex.name)
126, norm ("textures/rockwall_normal.jpg"), normvar (norm.name) 141, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
127{ 142{
128} 143}
129 144
145void mat_timed::enable (view &ctx)
146{
147 material::enable (ctx);
148
149 time->set (timer::now);
150 sh_colour->set (vec3 (255, 0, 0) * (1.F / 255.F));
151}
152
153void mat_timed::disable (view &ctx)
154{
155 material::disable (ctx);
156}
157
158void mat_timed::vsh (view &ctx)
159{
160 using namespace shader::compile;
161 std_vsh ();
162
163 if (ctx.pass->l)
164 f_normal = normal_matrix * vin.normal;
165}
166
167void mat_timed::fsh (view &ctx)
168{
169 using namespace shader::compile;
170
171 if (ctx.pass->l)
172 {
173 temp_1f fac;
174 temp_3f normal;
175
176 normal = f_normal + 0.3 * pow (sin (f_normal * 3.14159 + time), 3);
177
178 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
179
180 xyz (fout.frag_color) = fac * float3 (0.1,0.5,1);//ctx.pass->l->sh_colour * sh_colour * fac;
181 }
182}
183
184void mat_gouraud_shaded::enable (view &ctx)
185{
186 material::enable (ctx);
187
188 sh_colour->set (vec3 (c.r, c.g, c.b) * (1.F / 255.F));
189}
190
191void mat_gouraud_shaded::disable (view &ctx)
192{
193 material::disable (ctx);
194}
195
196void mat_gouraud_shaded::vsh (view &ctx)
197{
198 using namespace shader::compile;
199 std_vsh ();
200
201 if (ctx.pass->l)
202 f_normal = normal_matrix * vin.normal;
203}
204
205void mat_gouraud_shaded::fsh (view &ctx)
206{
207 using namespace shader::compile;
208
209 if (ctx.pass->l)
210 {
211 temp_1f fac;
212
213 fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
214
215 xyz (fout.frag_color) = ctx.pass->l->sh_colour * sh_colour * fac;
216 }
217}
218
219static shader::varying_3f f_normal;
220
221void mat_debug::enable (view &ctx)
222{
223 material::enable (ctx);
224
225 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
226 glEnable (GL_BLEND);
227 glDepthMask (1);
228}
229
230void mat_debug::disable (view &ctx)
231{
232 material::disable (ctx);
233
234 glDisable (GL_BLEND);
235 glDepthMask (0);
236}
237
238void mat_debug::vsh (view &ctx)
239{
240 using namespace shader::compile;
241 std_vsh ();
242
243 if (ctx.pass->l)
244 f_normal = normal_matrix * vin.normal;
245}
246
247void mat_debug::fsh (view &ctx)
248{
249 using namespace shader::compile;
250
251 if (ctx.pass->l)
252 {
253 temp_1f fac;
254
255 fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
256
257 xyz (fout.frag_color) = float3 (1.,0.,0.);
258 w (fout.frag_color) = 0.1;
259 }
260}
261
262static shader::varying_2f texcoord;
130static shader::varying_3f normal; 263static shader::varying_3f normal;
131static shader::varying_2f texcoord;
132 264
133void test_material::vsh (view &ctx) 265void test_material::vsh (view &ctx)
134{ 266{
135 using namespace shader::compile; 267 using namespace shader::compile;
136 268
137 std_vsh (); 269 std_vsh ();
138 270
139 if (ctx.pass_data->l) 271 if (ctx.pass->l)
140 { 272 {
141 texcoord = xy (vin.tex_coord[0]); 273 texcoord = xy (vin.tex_coord[0]);
142 normal = normal_matrix * vin.normal; 274 normal = normal_matrix * vin.normal;
143 } 275 }
144} 276}
145 277
146void test_material::fsh (view &ctx) 278void test_material::fsh (view &ctx)
147{ 279{
148 using namespace shader::compile; 280 using namespace shader::compile;
149 281
150 if (ctx.pass_data->l) 282 if (ctx.pass->l)
151 { 283 {
152 temp_3f lc; 284 temp_3f lc;
153 temp_1f fac; 285 temp_1f fac;
154 286
155 temp_3f rot1, rot2, rot3; 287 temp_3f rot1, rot2, rot3;
… …
161 rot2 = float3 (x(rot1), z(rot1), -y(rot1)); 293 rot2 = float3 (x(rot1), z(rot1), -y(rot1));
162 rot3 = float3 (y(rot1), -x(rot1), z(rot1)); 294 rot3 = float3 (y(rot1), -x(rot1), z(rot1));
163 295
164 normal = mat3 (rot1, rot2, rot3) * normal; 296 normal = mat3 (rot1, rot2, rot3) * normal;
165 297
166 fac = dot (normalize (normal), normalize (ctx.pass_data->l->sh_lightvec)); 298 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
167 fac = max (pow (max (fac, 0.0), 6), 0.3); 299 fac = max (pow (max (fac, 0.0), 6), 0.3);
168 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac 300 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
169 * ctx.pass_data->l->sh_colour; 301 * ctx.pass->l->sh_colour;
170 //xyz (fout.frag_color) = lc * fac; 302 //xyz (fout.frag_color) = lc * fac;
171 } 303 }
172} 304}
173 305
174void test_material::enable (view &ctx) 306void test_material::enable (view &ctx)
… …
184 texvar->disable (); 316 texvar->disable ();
185 material::disable (ctx); 317 material::disable (ctx);
186} 318}
187 319
188test_material *testmat; 320test_material *testmat;
321mat_gouraud_shaded *testmat2;
322mat_timed *testmat3;
323mat_debug *debugmat;
189 324

Diff Legend

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