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.49 by root, Sun Nov 7 22:07:05 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}
… …
90 { 89 {
91 using namespace shader::compile; 90 using namespace shader::compile;
92 91
93 temp_1f lz; 92 temp_1f lz;
94 93
95 // TODO: negative z is not calculated in an acceptable way 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) = (ifelse (lz < 0, lz, log (lz) * (2 / log (1e10))) - 1) * w (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);
98 } 105 }
99 106
100 vsh_src = shader::shader_builder::stop (); 107 vsh_src = shader::shader_builder::stop ();
101 108
102 shader::shader_builder::start (); 109 shader::shader_builder::start ();
103 110
104 if (ctx.pass->l) 111 if (ctx.pass->l)
105 { 112 {
106 ctx.pass->l->fsh (); 113 ctx.pass->l->fsh ();
107
108 fsh (ctx); 114 fsh (ctx);
109 } 115 }
110 else 116 else
117 // many drivers need both vertex and fragment shader, 'caboom!' otherwise
111 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.);
112 119
113 fsh_src = shader::shader_builder::stop (); 120 fsh_src = shader::shader_builder::stop ();
114 121
115 shader::program_object po = shader::get_program (vsh_src, fsh_src); 122 shader::program_object po = shader::get_program (vsh_src, fsh_src);
116 matmap.insert (pass_data::matmap_t::value_type (this, po)); 123 matmap.insert (pass_data::matmap_t::value_type (this, po));
… …
119 } 126 }
120 else 127 else
121 i->second->enable (); 128 i->second->enable ();
122 129
123 if (ctx.pass->l) 130 if (ctx.pass->l)
124 ctx.pass->l->enable (); 131 ctx.pass->l->enable (ctx);
125} 132}
126 133
127void material::disable (view &ctx) 134void material::disable (view &ctx)
128{ 135{
129} 136}
… …
135{ 142{
136} 143}
137 144
138static shader::varying_3f normal; 145static shader::varying_3f normal;
139static 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}
140 170
141void test_material::vsh (view &ctx) 171void test_material::vsh (view &ctx)
142{ 172{
143 using namespace shader::compile; 173 using namespace shader::compile;
144 174
… …
192 texvar->disable (); 222 texvar->disable ();
193 material::disable (ctx); 223 material::disable (ctx);
194} 224}
195 225
196test_material *testmat; 226test_material *testmat;
227test_material2 *testmat2;
197 228

Diff Legend

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