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.44 by root, Sat Nov 6 14:49:03 2004 UTC vs.
Revision 1.49 by root, Sun Nov 7 22:07:05 2004 UTC

69{ 69{
70} 70}
71 71
72void material::enable (view &ctx) 72void material::enable (view &ctx)
73{ 73{
74 static shader::compile::varying_1f Z;//D 74 pass_data::matmap_t &matmap = ctx.pass->matmap;
75 75
76 pass::matmap_t &matmap = ctx.pass_data->matmap;
77
78 pass::matmap_t::iterator i = matmap.find (this); 76 pass_data::matmap_t::iterator i = matmap.find (this);
79 77
80 if (i == matmap.end ()) 78 if (i == matmap.end ())
81 { 79 {
82 string vsh_src, fsh_src; 80 string vsh_src, fsh_src;
83 81
84 shader::shader_builder::start (); 82 shader::shader_builder::start ();
85 83
86 if (ctx.pass_data->l) 84 if (ctx.pass->l)
87 ctx.pass_data->l->vsh (); 85 ctx.pass->l->vsh ();
88 86
89 vsh (ctx); 87 vsh (ctx);
90 88
89 // compute logarithmic depth - see the frustum matrix in view.C
91 { 90 {
92 using namespace shader::compile; 91 using namespace shader::compile;
93 92
94 Z = pow (z (vout.position) / 2.F, 0.2); 93 temp_1f lz;
95 z (vout.position) = (Z * 2 - 1) * w (vout.position); 94
96 //z (vout.position) = z (vout.position) - 1; 95 // TODO: negative z is not calculated in an acceptable way
96 lz = z (vout.position);
97 z (vout.position) = (ifelse (lz < 0, lz, log (lz) * (2 / log (1e10))) - 1) * w (vout.position);
97 } 98 }
98 99
99 vsh_src = shader::shader_builder::stop (); 100 vsh_src = shader::shader_builder::stop ();
100 101
101 shader::shader_builder::start (); 102 shader::shader_builder::start ();
102 103
103 if (ctx.pass_data->l) 104 if (ctx.pass->l)
104 { 105 {
105 ctx.pass_data->l->fsh (); 106 ctx.pass->l->fsh ();
106 107
107 fsh (ctx); 108 fsh (ctx);
108 } 109 }
109 else 110 else
110 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.); 111 shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.);
111 112
112 {
113 using namespace shader::compile;
114 //x (fout.frag_color) = Z;//D
115 //y (fout.frag_color) = Z;//D
116 //z (fout.frag_color) = Z;//D
117 }
118
119 fsh_src = shader::shader_builder::stop (); 113 fsh_src = shader::shader_builder::stop ();
120 114
121 shader::program_object po = shader::get_program (vsh_src, fsh_src); 115 shader::program_object po = shader::get_program (vsh_src, fsh_src);
122 matmap.insert (pass::matmap_t::value_type (this, po)); 116 matmap.insert (pass_data::matmap_t::value_type (this, po));
123 117
124 po->enable (); 118 po->enable ();
125 } 119 }
126 else 120 else
127 i->second->enable (); 121 i->second->enable ();
122
123 if (ctx.pass->l)
124 ctx.pass->l->enable ();
128} 125}
129 126
130void material::disable (view &ctx) 127void material::disable (view &ctx)
131{ 128{
132} 129}
145{ 142{
146 using namespace shader::compile; 143 using namespace shader::compile;
147 144
148 std_vsh (); 145 std_vsh ();
149 146
150 if (ctx.pass_data->l) 147 if (ctx.pass->l)
151 { 148 {
152 texcoord = xy (vin.tex_coord[0]); 149 texcoord = xy (vin.tex_coord[0]);
153 normal = normal_matrix * vin.normal; 150 normal = normal_matrix * vin.normal;
154 } 151 }
155} 152}
156 153
157void test_material::fsh (view &ctx) 154void test_material::fsh (view &ctx)
158{ 155{
159 using namespace shader::compile; 156 using namespace shader::compile;
160 157
161 if (ctx.pass_data->l) 158 if (ctx.pass->l)
162 { 159 {
163 temp_3f lc; 160 temp_3f lc;
164 temp_1f fac; 161 temp_1f fac;
165 162
166 temp_3f rot1, rot2, rot3; 163 temp_3f rot1, rot2, rot3;
172 rot2 = float3 (x(rot1), z(rot1), -y(rot1)); 169 rot2 = float3 (x(rot1), z(rot1), -y(rot1));
173 rot3 = float3 (y(rot1), -x(rot1), z(rot1)); 170 rot3 = float3 (y(rot1), -x(rot1), z(rot1));
174 171
175 normal = mat3 (rot1, rot2, rot3) * normal; 172 normal = mat3 (rot1, rot2, rot3) * normal;
176 173
177 fac = dot (normalize (normal), normalize (ctx.pass_data->l->sh_lightvec)); 174 fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec));
178 fac = max (pow (max (fac, 0.0), 6), 0.3); 175 fac = max (pow (max (fac, 0.0), 6), 0.3);
179 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac 176 xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac
180 * ctx.pass_data->l->sh_colour; 177 * ctx.pass->l->sh_colour;
181 //xyz (fout.frag_color) = lc * fac; 178 //xyz (fout.frag_color) = lc * fac;
182 } 179 }
183} 180}
184 181
185void test_material::enable (view &ctx) 182void test_material::enable (view &ctx)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines