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.51 by root, Fri Nov 26 03:48:40 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}
… …
92 91
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 z (vout.position) = clamp ( 96#if 0
98 ifelse (lz <= 0, 97 lz = (log (max (lz, 0) + 1) / log (1e30)) - 1;
99 lz, 98#else
99 lz = ifelse (lz <= 0,
100 0,
100 log (lz + 1) * (2 / log (1e10)) 101 log (lz + 1) / log (1e30)
101 ) - 1, 102 ) - 1;
102 -1.F, +1.F 103#endif
103 ) * w (vout.position); 104 z (vout.position) = lz * w (vout.position);
104 } 105 }
105 106
106 vsh_src = shader::shader_builder::stop (); 107 vsh_src = shader::shader_builder::stop ();
107 108
108 shader::shader_builder::start (); 109 shader::shader_builder::start ();
109 110
110 if (ctx.pass->l) 111 if (ctx.pass->l)
111 { 112 {
112 ctx.pass->l->fsh (); 113 ctx.pass->l->fsh ();
113
114 fsh (ctx); 114 fsh (ctx);
115 } 115 }
116 else 116 else
117 // many drivers need both vertex and fragment shader, 'caboom!' otherwise
117 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.);
118 119
119 fsh_src = shader::shader_builder::stop (); 120 fsh_src = shader::shader_builder::stop ();
120 121
121 shader::program_object po = shader::get_program (vsh_src, fsh_src); 122 shader::program_object po = shader::get_program (vsh_src, fsh_src);
122 matmap.insert (pass_data::matmap_t::value_type (this, po)); 123 matmap.insert (pass_data::matmap_t::value_type (this, po));
… …
125 } 126 }
126 else 127 else
127 i->second->enable (); 128 i->second->enable ();
128 129
129 if (ctx.pass->l) 130 if (ctx.pass->l)
130 ctx.pass->l->enable (); 131 ctx.pass->l->enable (ctx);
131} 132}
132 133
133void material::disable (view &ctx) 134void material::disable (view &ctx)
134{ 135{
135} 136}
… …
141{ 142{
142} 143}
143 144
144static shader::varying_3f normal; 145static shader::varying_3f normal;
145static 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}
146 170
147void test_material::vsh (view &ctx) 171void test_material::vsh (view &ctx)
148{ 172{
149 using namespace shader::compile; 173 using namespace shader::compile;
150 174
… …
198 texvar->disable (); 222 texvar->disable ();
199 material::disable (ctx); 223 material::disable (ctx);
200} 224}
201 225
202test_material *testmat; 226test_material *testmat;
227test_material2 *testmat2;
203 228

Diff Legend

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