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.58 by root, Mon Feb 7 08:51:18 2005 UTC vs.
Revision 1.65 by root, Tue Aug 9 23:58:43 2005 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, 0,
61 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
62 SDL_FreeSurface (image); /* No longer needed */ 69 SDL_FreeSurface (image); /* No longer needed */
63 70
64 return name; 71 return name;
65} 72}
66 73
… …
89 { 96 {
90 using namespace shader::compile; 97 using namespace shader::compile;
91 98
92 temp_1f lz; 99 temp_1f lz;
93 100
94 // TODO: negative z is not calculated in an acceptable way, clipping does horrible things(?) 101 // TODO: negative z is not calculated in an a very acceptable way
95 lz = z (vout.position); 102 lz = z (vout.position);
96#if 0 103 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); 104 z (vout.position) = lz * w (vout.position);
105 } 105 }
106 106
107 vsh_src = shader::shader_builder::stop (); 107 vsh_src = shader::shader_builder::stop ();
108 108
… …
140: tex ("textures/rockwall.jpg"), texvar (tex.name) 140: tex ("textures/rockwall.jpg"), texvar (tex.name)
141, norm ("textures/rockwall_normal.jpg"), normvar (norm.name) 141, norm ("textures/rockwall_normal.jpg"), normvar (norm.name)
142{ 142{
143} 143}
144 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) = 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 * float3 (0.1,0.5,1);//ctx.pass->l->sh_colour * sh_colour * fac;
213 }
214}
215
145void mat_gouraud_shaded::enable (view &ctx) 216void mat_gouraud_shaded::enable (view &ctx)
146{ 217{
147 material::enable (ctx); 218 material::enable (ctx);
148 219
149 sh_colour->set (vec3 (c.r, c.g, c.b) * (1.F / 255.F)); 220 sh_colour->set (vec3 (c.r, c.g, c.b) * (1.F / 255.F));
… …
172 temp_1f fac; 243 temp_1f fac;
173 244
174 fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec)); 245 fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec));
175 246
176 xyz (fout.frag_color) = ctx.pass->l->sh_colour * sh_colour * fac; 247 xyz (fout.frag_color) = ctx.pass->l->sh_colour * sh_colour * fac;
248 }
249}
250
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) = float3 (1.,0.,0.);
290 w (fout.frag_color) = 0.1;
177 } 291 }
178} 292}
179 293
180static shader::varying_2f texcoord; 294static shader::varying_2f texcoord;
181static shader::varying_3f normal; 295static shader::varying_3f normal;
… …
235 material::disable (ctx); 349 material::disable (ctx);
236} 350}
237 351
238test_material *testmat; 352test_material *testmat;
239mat_gouraud_shaded *testmat2; 353mat_gouraud_shaded *testmat2;
354mat_timed *testmat3;
355mat_debug *debugmat;
240 356

Diff Legend

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