… | |
… | |
69 | { |
69 | { |
70 | } |
70 | } |
71 | |
71 | |
72 | void material::enable (view &ctx) |
72 | void 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 | |
|
|
84 | if (ctx.pass->l) |
|
|
85 | ctx.pass->l->vsh (); |
|
|
86 | |
83 | vsh (ctx); |
87 | vsh (ctx); |
84 | |
88 | |
85 | if (ctx.pass_data->l) |
89 | // compute logarithmic depth - see the frustum matrix in view.C |
86 | ctx.pass_data->l->vsh (); |
|
|
87 | |
|
|
88 | { |
90 | { |
89 | using namespace shader::compile; |
91 | using namespace shader::compile; |
90 | |
92 | |
91 | z (vout.position) = log2 (z (vout.position) / w (vout.position)) * w (vout.position); |
93 | temp_1f lz; |
|
|
94 | |
|
|
95 | // TODO: negative z is not calculated in an acceptable way |
|
|
96 | lz = z (vout.position); |
|
|
97 | z (vout.position) = (log2 (lz) * (2 / log2 (1e10)) - 1) * w (vout.position); |
|
|
98 | #if 0 |
|
|
99 | z (vout.position) = |
|
|
100 | ifelse ( |
|
|
101 | z < 0, |
|
|
102 | -1, |
|
|
103 | log2 (lz) * (2 / log2 (1e10)) - 1 |
|
|
104 | ) * w (vout.position); |
|
|
105 | #endif |
92 | } |
106 | } |
93 | |
107 | |
94 | vsh_src = shader::shader_builder::stop (); |
108 | vsh_src = shader::shader_builder::stop (); |
95 | |
109 | |
|
|
110 | shader::shader_builder::start (); |
|
|
111 | |
96 | if (ctx.pass_data->l || 1) |
112 | if (ctx.pass->l) |
97 | { |
113 | { |
98 | shader::shader_builder::start (); |
114 | ctx.pass->l->fsh (); |
99 | shader::compile::fout.frag_color = shader::compile::float4 (1., 1., 0., 1.); |
115 | |
100 | fsh (ctx); |
116 | fsh (ctx); |
101 | |
|
|
102 | fsh_src = shader::shader_builder::stop (); |
|
|
103 | } |
117 | } |
|
|
118 | else |
|
|
119 | shader::compile::fout.frag_color = shader::compile::float4 (1., 0., 1., 1.); |
|
|
120 | |
|
|
121 | fsh_src = shader::shader_builder::stop (); |
104 | |
122 | |
105 | shader::program_object po = shader::get_program (vsh_src, fsh_src); |
123 | shader::program_object po = shader::get_program (vsh_src, fsh_src); |
106 | matmap.insert (pass::matmap_t::value_type (this, po)); |
124 | matmap.insert (pass_data::matmap_t::value_type (this, po)); |
107 | |
125 | |
108 | po->enable (); |
126 | po->enable (); |
109 | } |
127 | } |
110 | else |
128 | else |
111 | i->second->enable (); |
129 | i->second->enable (); |
|
|
130 | |
|
|
131 | if (ctx.pass->l) |
|
|
132 | ctx.pass->l->enable (); |
112 | } |
133 | } |
113 | |
134 | |
114 | void material::disable (view &ctx) |
135 | void material::disable (view &ctx) |
115 | { |
136 | { |
116 | } |
137 | } |
… | |
… | |
120 | : tex ("textures/rockwall.jpg"), texvar (tex.name) |
141 | : tex ("textures/rockwall.jpg"), texvar (tex.name) |
121 | , norm ("textures/rockwall_normal.jpg"), normvar (norm.name) |
142 | , norm ("textures/rockwall_normal.jpg"), normvar (norm.name) |
122 | { |
143 | { |
123 | } |
144 | } |
124 | |
145 | |
125 | static shader::varying_3f normal, lightvec; |
146 | static shader::varying_3f normal; |
126 | static shader::varying_2f texcoord; |
147 | static shader::varying_2f texcoord; |
127 | |
148 | |
128 | void test_material::vsh (view &ctx) |
149 | void test_material::vsh (view &ctx) |
129 | { |
150 | { |
130 | using namespace shader::compile; |
151 | using namespace shader::compile; |
131 | |
152 | |
132 | std_vsh (); |
153 | std_vsh (); |
133 | |
154 | |
134 | if (ctx.pass_data->l) |
155 | if (ctx.pass->l) |
135 | { |
156 | { |
136 | texcoord = xy (vin.tex_coord[0]); |
157 | texcoord = xy (vin.tex_coord[0]); |
137 | normal = normal_matrix * vin.normal; |
158 | normal = normal_matrix * vin.normal; |
138 | lightvec = xyz (ctx.pass_data->l->lightpos - model_view_matrix * vin.vertex); |
|
|
139 | } |
159 | } |
140 | } |
160 | } |
141 | |
161 | |
142 | void test_material::fsh (view &ctx) |
162 | void test_material::fsh (view &ctx) |
143 | { |
163 | { |
144 | using namespace shader::compile; |
164 | using namespace shader::compile; |
145 | |
165 | |
146 | if (ctx.pass_data->l) |
166 | if (ctx.pass->l) |
147 | { |
167 | { |
148 | temp_3f lc; |
168 | temp_3f lc; |
149 | temp_1f fac; |
169 | temp_1f fac; |
150 | |
170 | |
151 | lc = (*ctx.pass_data->l)(); |
|
|
152 | |
|
|
153 | temp_3f rot1, rot2, rot3; |
171 | temp_3f rot1, rot2, rot3; |
154 | |
172 | |
155 | yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F); |
173 | yxz (rot1) = (texture_2d (normvar, texcoord) * 2.F - 1.F); |
156 | |
174 | |
157 | //rot1 = normal_matrix * rot1; |
175 | //rot1 = normal_matrix * rot1; |
… | |
… | |
159 | rot2 = float3 (x(rot1), z(rot1), -y(rot1)); |
177 | rot2 = float3 (x(rot1), z(rot1), -y(rot1)); |
160 | rot3 = float3 (y(rot1), -x(rot1), z(rot1)); |
178 | rot3 = float3 (y(rot1), -x(rot1), z(rot1)); |
161 | |
179 | |
162 | normal = mat3 (rot1, rot2, rot3) * normal; |
180 | normal = mat3 (rot1, rot2, rot3) * normal; |
163 | |
181 | |
164 | fac = dot (normalize (normal), normalize (lightvec)); |
182 | fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec)); |
165 | fac = max (pow (max (fac, 0.0), 6), 0.3); |
183 | fac = max (pow (max (fac, 0.0), 6), 0.3); |
166 | xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * lc * fac; |
184 | xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac |
|
|
185 | * ctx.pass->l->sh_colour; |
167 | //xyz (fout.frag_color) = lc * fac; |
186 | //xyz (fout.frag_color) = lc * fac; |
168 | } |
187 | } |
169 | } |
188 | } |
170 | |
189 | |
171 | void test_material::enable (view &ctx) |
190 | void test_material::enable (view &ctx) |