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

Comparing libgender/material.C (file contents):
Revision 1.47 by root, Sun Nov 7 03:01:03 2004 UTC vs.
Revision 1.48 by root, Sun Nov 7 03:28:20 2004 UTC

69{ 69{
70} 70}
71 71
72void material::enable (view &ctx) 72void material::enable (view &ctx)
73{ 73{
74 pass::matmap_t &matmap = ctx.pass_data->matmap; 74 pass_data::matmap_t &matmap = ctx.pass->matmap;
75 75
76 pass::matmap_t::iterator i = matmap.find (this); 76 pass_data::matmap_t::iterator i = matmap.find (this);
77 77
78 if (i == matmap.end ()) 78 if (i == matmap.end ())
79 { 79 {
80 string vsh_src, fsh_src; 80 string vsh_src, fsh_src;
81 81
82 shader::shader_builder::start (); 82 shader::shader_builder::start ();
83 83
84 if (ctx.pass_data->l) 84 if (ctx.pass->l)
85 ctx.pass_data->l->vsh (); 85 ctx.pass->l->vsh ();
86 86
87 vsh (ctx); 87 vsh (ctx);
88 88
89 // compute logarithmic depth - see the frustum matrix in view.C 89 // compute logarithmic depth - see the frustum matrix in view.C
90 { 90 {
107 107
108 vsh_src = shader::shader_builder::stop (); 108 vsh_src = shader::shader_builder::stop ();
109 109
110 shader::shader_builder::start (); 110 shader::shader_builder::start ();
111 111
112 if (ctx.pass_data->l) 112 if (ctx.pass->l)
113 { 113 {
114 ctx.pass_data->l->fsh (); 114 ctx.pass->l->fsh ();
115 115
116 fsh (ctx); 116 fsh (ctx);
117 } 117 }
118 else 118 else
119 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.); 119 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.);
120 120
121 fsh_src = shader::shader_builder::stop (); 121 fsh_src = shader::shader_builder::stop ();
122 122
123 shader::program_object po = shader::get_program (vsh_src, fsh_src); 123 shader::program_object po = shader::get_program (vsh_src, fsh_src);
124 matmap.insert (pass::matmap_t::value_type (this, po)); 124 matmap.insert (pass_data::matmap_t::value_type (this, po));
125 125
126 po->enable (); 126 po->enable ();
127 } 127 }
128 else 128 else
129 i->second->enable (); 129 i->second->enable ();
130 130
131 if (ctx.pass_data->l) 131 if (ctx.pass->l)
132 ctx.pass_data->l->enable (); 132 ctx.pass->l->enable ();
133} 133}
134 134
135void material::disable (view &ctx) 135void material::disable (view &ctx)
136{ 136{
137} 137}
150{ 150{
151 using namespace shader::compile; 151 using namespace shader::compile;
152 152
153 std_vsh (); 153 std_vsh ();
154 154
155 if (ctx.pass_data->l) 155 if (ctx.pass->l)
156 { 156 {
157 texcoord = xy (vin.tex_coord[0]); 157 texcoord = xy (vin.tex_coord[0]);
158 normal = normal_matrix * vin.normal; 158 normal = normal_matrix * vin.normal;
159 } 159 }
160} 160}
161 161
162void test_material::fsh (view &ctx) 162void test_material::fsh (view &ctx)
163{ 163{
164 using namespace shader::compile; 164 using namespace shader::compile;
165 165
166 if (ctx.pass_data->l) 166 if (ctx.pass->l)
167 { 167 {
168 temp_3f lc; 168 temp_3f lc;
169 temp_1f fac; 169 temp_1f fac;
170 170
171 temp_3f rot1, rot2, rot3; 171 temp_3f rot1, rot2, rot3;
177 rot2 = float3 (x(rot1), z(rot1), -y(rot1)); 177 rot2 = float3 (x(rot1), z(rot1), -y(rot1));
178 rot3 = float3 (y(rot1), -x(rot1), z(rot1)); 178 rot3 = float3 (y(rot1), -x(rot1), z(rot1));
179 179
180 normal = mat3 (rot1, rot2, rot3) * normal; 180 normal = mat3 (rot1, rot2, rot3) * normal;
181 181
182 fac = dot (normalize (normal), normalize (ctx.pass_data->l->sh_lightvec)); 182 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
183 fac = max (pow (max (fac, 0.0), 6), 0.3); 183 fac = max (pow (max (fac, 0.0), 6), 0.3);
184 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac 184 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
185 * ctx.pass_data->l->sh_colour; 185 * ctx.pass->l->sh_colour;
186 //xyz (fout.frag_color) = lc * fac; 186 //xyz (fout.frag_color) = lc * fac;
187 } 187 }
188} 188}
189 189
190void test_material::enable (view &ctx) 190void test_material::enable (view &ctx)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines