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.39 by root, Fri Nov 5 19:55:15 2004 UTC vs.
Revision 1.67 by root, Wed Jan 25 22:52:26 2006 UTC

… …
7#include "material.h" 7#include "material.h"
8#include "view.h" 8#include "view.h"
9#include "util.h" 9#include "util.h"
10 10
11GLuint 11GLuint
12texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) 12texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord, int flags)
13{ 13{
14 GLuint name; 14 GLuint name;
15 SDL_Surface *image; 15 SDL_Surface *image;
16 SDL_Rect area; 16 SDL_Rect area;
17 Uint32 saved_flags; 17 Uint32 saved_flags;
… …
53 53
54 /* Create an OpenGL texture for the image */ 54 /* Create an OpenGL texture for the image */
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, flags & DISABLE_MIPMAP ? GL_LINEAR : GL_LINEAR_MIPMAP_LINEAR);
59 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); 59 glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, flags & DISABLE_MIPMAP ? GL_FALSE : GL_TRUE);
60 glTexImage2D (GL_TEXTURE_2D,
61 0,
62 GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); 60 glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
61
62 if (flags & CLAMP)
63 {
64 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
65 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
66 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
67 }
68
63 SDL_FreeSurface (image); /* No longer needed */ 69 SDL_FreeSurface (image); /* No longer needed */
64 70
65 return name; 71 return name;
66} 72}
67 73
… …
69{ 75{
70} 76}
71 77
72void material::enable (view &ctx) 78void material::enable (view &ctx)
73{ 79{
74 pass::matmap_t &matmap = ctx.pass_data->matmap; 80 pass_data::matmap_t &matmap = ctx.pass->matmap;
75 81
76 pass::matmap_t::iterator i = matmap.find (this); 82 pass_data::matmap_t::iterator i = matmap.find (this);
77 83
78 if (i == matmap.end ()) 84 if (i == matmap.end ())
79 { 85 {
80 string vsh_src, fsh_src; 86 string vsh_src, fsh_src;
81 87
82 shader::shader_builder::start (); 88 shader::shader_builder::start ();
89
90 if (ctx.pass->l)
91 ctx.pass->l->vsh ();
92
83 vsh (ctx); 93 vsh (ctx);
84 94
85 if (ctx.pass_data->l) 95 // compute logarithmic depth - see the frustum matrix in view.C
86 ctx.pass_data->l->vsh ();
87
88 { 96 {
89 using namespace shader::compile; 97 using namespace shader::compile;
90 98
91 z (vout.position) = log2 (z (vout.position) / w (vout.position)) * w (vout.position); 99 temp_1f lz;
100
101 // TODO: negative z is not calculated in an a very acceptable way
102 lz = z (vout.position);
103 lz = sign (lz) * (log (abs (lz) + exp (1e0)) - 1e0) / log (1e30);
104 z (vout.position) = lz * w (vout.position);
92 } 105 }
93 106
94 vsh_src = shader::shader_builder::stop (); 107 vsh_src = shader::shader_builder::stop ();
95 108
109 shader::shader_builder::start ();
110
96 if (ctx.pass_data->l || 1) 111 if (ctx.pass->l)
97 { 112 {
98 shader::shader_builder::start (); 113 ctx.pass->l->fsh ();
99 shader::compile::fout.frag_color = shader::compile::float4 (1., 1., 0., 1.);
100 fsh (ctx); 114 fsh (ctx);
101
102 fsh_src = shader::shader_builder::stop ();
103 } 115 }
116 else
117 // many drivers need both vertex and fragment shader, 'caboom!' otherwise
118 shader::compile::fout.frag_color = shader::compile::vec4 (0., 0., 0., 0.);
119
120 fsh_src = shader::shader_builder::stop ();
104 121
105 shader::program_object po = shader::get_program (vsh_src, fsh_src); 122 shader::program_object po = shader::get_program (vsh_src, fsh_src);
106 matmap.insert (pass::matmap_t::value_type (this, po)); 123 matmap.insert (pass_data::matmap_t::value_type (this, po));
107 124
108 po->enable (); 125 po->enable ();
109 } 126 }
110 else 127 else
111 i->second->enable (); 128 i->second->enable ();
129
130 if (ctx.pass->l)
131 ctx.pass->l->enable (ctx);
112} 132}
113 133
114void material::disable (view &ctx) 134void material::disable (view &ctx)
115{ 135{
116} 136}
… …
120: tex ("textures/rockwall.jpg"), texvar (tex.name) 140: tex ("textures/rockwall.jpg"), texvar (tex.name)
121, norm ("textures/rockwall_normal.jpg"), normvar (norm.name) 141, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
122{ 142{
123} 143}
124 144
145skybox_material::skybox_material ()
146: tex (0)
147{
148}
149
150void skybox_material::enable (view &ctx)
151{
152 material::enable (ctx);
153}
154
155void skybox_material::disable (view &ctx)
156{
157 material::disable (ctx);
158}
159
160static shader::varying_2f skybox_texcoord;
161
162void skybox_material::vsh (view &ctx)
163{
164 using namespace shader::compile;
165
166 std_vsh ();
167 skybox_texcoord = xy (vin.tex_coord[0]);
168}
169
170void skybox_material::fsh (view &ctx)
171{
172 using namespace shader::compile;
173
174 xyz (fout.frag_color) = xyz (texture_2d (tex, skybox_texcoord));
175}
176
177void mat_timed::enable (view &ctx)
178{
179 material::enable (ctx);
180
181 time->set (timer::now);
182 sh_colour->set (vec3 (255, 0, 0) * (1.F / 255.F));
183}
184
185void mat_timed::disable (view &ctx)
186{
187 material::disable (ctx);
188}
189
190void mat_timed::vsh (view &ctx)
191{
192 using namespace shader::compile;
193 std_vsh ();
194
195 if (ctx.pass->l)
196 f_normal = normal_matrix * vin.normal;
197}
198
199void mat_timed::fsh (view &ctx)
200{
201 using namespace shader::compile;
202
203 if (ctx.pass->l)
204 {
205 temp_1f fac;
206 temp_3f normal;
207
208 normal = f_normal + 0.3 * pow (sin (f_normal * 3.14159 + time), 3);
209
210 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
211
212 xyz (fout.frag_color) = fac * shader::compile::vec3 (0.1,0.5,1);//ctx.pass->l->sh_colour * sh_colour * fac;
213 }
214}
215
216void mat_gouraud_shaded::enable (view &ctx)
217{
218 material::enable (ctx);
219
220 sh_colour->set (vec3 (c.r, c.g, c.b) * (1.F / 255.F));
221}
222
223void mat_gouraud_shaded::disable (view &ctx)
224{
225 material::disable (ctx);
226}
227
228void mat_gouraud_shaded::vsh (view &ctx)
229{
230 using namespace shader::compile;
231 std_vsh ();
232
233 if (ctx.pass->l)
234 f_normal = normal_matrix * vin.normal;
235}
236
237void mat_gouraud_shaded::fsh (view &ctx)
238{
239 using namespace shader::compile;
240
241 if (ctx.pass->l)
242 {
243 temp_1f fac;
244
245 fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
246
247 xyz (fout.frag_color) = ctx.pass->l->sh_colour * sh_colour * fac;
248 }
249}
250
125static shader::varying_3f normal, lightvec; 251static shader::varying_3f f_normal;
252
253void mat_debug::enable (view &ctx)
254{
255 material::enable (ctx);
256
257 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
258 glEnable (GL_BLEND);
259 glDepthMask (1);
260}
261
262void mat_debug::disable (view &ctx)
263{
264 material::disable (ctx);
265
266 glDisable (GL_BLEND);
267 glDepthMask (0);
268}
269
270void mat_debug::vsh (view &ctx)
271{
272 using namespace shader::compile;
273 std_vsh ();
274
275 if (ctx.pass->l)
276 f_normal = normal_matrix * vin.normal;
277}
278
279void mat_debug::fsh (view &ctx)
280{
281 using namespace shader::compile;
282
283 if (ctx.pass->l)
284 {
285 temp_1f fac;
286
287 fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
288
289 xyz (fout.frag_color) = shader::compile::vec3 (1.,0.,0.);
290 w (fout.frag_color) = 0.1;
291 }
292}
293
126static shader::varying_2f texcoord; 294static shader::varying_2f texcoord;
295static shader::varying_3f normal;
127 296
128void test_material::vsh (view &ctx) 297void test_material::vsh (view &ctx)
129{ 298{
130 using namespace shader::compile; 299 using namespace shader::compile;
131 300
132 std_vsh (); 301 std_vsh ();
133 302
134 if (ctx.pass_data->l) 303 if (ctx.pass->l)
135 { 304 {
136 texcoord = xy (vin.tex_coord[0]); 305 texcoord = xy (vin.tex_coord[0]);
137 normal = normal_matrix * vin.normal; 306 normal = normal_matrix * vin.normal;
138 lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex);
139 } 307 }
140} 308}
141 309
142void test_material::fsh (view &ctx) 310void test_material::fsh (view &ctx)
143{ 311{
144 using namespace shader::compile; 312 using namespace shader::compile;
145 313
146 if (ctx.pass_data->l) 314 if (ctx.pass->l)
147 { 315 {
148 temp_3f lc; 316 temp_3f lc;
149 temp_1f fac; 317 temp_1f fac;
150 318
151 lc = (*ctx.pass_data->l)();
152
153 temp_3f rot1, rot2, rot3; 319 temp_3f rot1, rot2, rot3;
154 320
155 yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F); 321 yxz (rot1) = (xyz (texture_2d (normvar, texcoord)) * 2.F - 1.F);
156 322
157 //rot1 = normal_matrix * rot1; 323 //rot1 = normal_matrix * rot1;
158 324
159 rot2 = float3 (x(rot1), z(rot1), -y(rot1)); 325 rot2 = shader::compile::vec3 (x(rot1), z(rot1), -y(rot1));
160 rot3 = float3 (y(rot1), -x(rot1), z(rot1)); 326 rot3 = shader::compile::vec3 (y(rot1), -x(rot1), z(rot1));
161 327
162 normal = mat3 (rot1, rot2, rot3) * normal; 328 normal = mat3 (rot1, rot2, rot3) * normal;
163 329
164 fac = dot (normalize (normal), normalize (lightvec)); 330 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
165 fac = max (pow (max (fac, 0.0), 6), 0.3); 331 fac = max (pow (max (fac, 0.0), 6), 0.3);
166 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * lc * fac; 332 xyz (fout.frag_color) = xyz (texture_2d (texvar, texcoord) + 0.2F)
333 * fac
334 * ctx.pass->l->sh_colour;
167 //xyz (fout.frag_color) = lc * fac; 335 //xyz (fout.frag_color) = lc * fac;
168 } 336 }
169} 337}
170 338
171void test_material::enable (view &ctx) 339void test_material::enable (view &ctx)
… …
181 texvar->disable (); 349 texvar->disable ();
182 material::disable (ctx); 350 material::disable (ctx);
183} 351}
184 352
185test_material *testmat; 353test_material *testmat;
354mat_gouraud_shaded *testmat2;
355mat_timed *testmat3;
356mat_debug *debugmat;
186 357

Diff Legend

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