ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libgender/material.C
(Generate patch)

Comparing libgender/material.C (file contents):
Revision 1.54 by root, Sat Dec 11 00:17:28 2004 UTC vs.
Revision 1.57 by root, Mon Feb 7 08:16:31 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}
… …
93 temp_1f lz; 92 temp_1f lz;
94 93
95 // TODO: negative z is not calculated in an acceptable way, clipping does horrible things(?) 94 // TODO: negative z is not calculated in an acceptable way, clipping does horrible things(?)
96 lz = z (vout.position); 95 lz = z (vout.position);
97#if 0 96#if 0
98 lz = (log (max (lz, 0) + 1) / log (1e18)) - 1; 97 lz = (log (max (lz, 0) + 1) / log (1e30)) - 1;
99#else 98#else
100 lz = ifelse (lz <= 0, 99 lz = ifelse (lz <= 0,
101 0, 100 0,
102 log (lz + 1) / log (1e18) 101 log (lz + 1) / log (1e30)
103 ) - 1; 102 ) - 1;
104#endif 103#endif
105 z (vout.position) = lz * w (vout.position); 104 z (vout.position) = lz * w (vout.position);
106 } 105 }
107 106
… …
127 } 126 }
128 else 127 else
129 i->second->enable (); 128 i->second->enable ();
130 129
131 if (ctx.pass->l) 130 if (ctx.pass->l)
132 ctx.pass->l->enable (); 131 ctx.pass->l->enable (ctx);
133} 132}
134 133
135void material::disable (view &ctx) 134void material::disable (view &ctx)
136{ 135{
137} 136}
… …
143{ 142{
144} 143}
145 144
146static shader::varying_3f normal; 145static shader::varying_3f normal;
147static shader::varying_2f texcoord; 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}
148 170
149void test_material::vsh (view &ctx) 171void test_material::vsh (view &ctx)
150{ 172{
151 using namespace shader::compile; 173 using namespace shader::compile;
152 174
… …
200 texvar->disable (); 222 texvar->disable ();
201 material::disable (ctx); 223 material::disable (ctx);
202} 224}
203 225
204test_material *testmat; 226test_material *testmat;
227test_material2 *testmat2;
205 228

Diff Legend

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