… | |
… | |
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 | } |
… | |
… | |
69 | { |
68 | { |
70 | } |
69 | } |
71 | |
70 | |
72 | void material::enable (view &ctx) |
71 | void material::enable (view &ctx) |
73 | { |
72 | { |
74 | pass::matmap_t &matmap = ctx.pass_data->matmap; |
73 | pass_data::matmap_t &matmap = ctx.pass->matmap; |
75 | |
74 | |
76 | pass::matmap_t::iterator i = matmap.find (this); |
75 | pass_data::matmap_t::iterator i = matmap.find (this); |
77 | |
76 | |
78 | if (i == matmap.end ()) |
77 | if (i == matmap.end ()) |
79 | { |
78 | { |
80 | string vsh_src, fsh_src; |
79 | string vsh_src, fsh_src; |
81 | |
80 | |
82 | shader::shader_builder::start (); |
81 | shader::shader_builder::start (); |
83 | |
82 | |
84 | if (ctx.pass_data->l) |
83 | if (ctx.pass->l) |
85 | ctx.pass_data->l->vsh (); |
84 | ctx.pass->l->vsh (); |
86 | |
85 | |
87 | vsh (ctx); |
86 | vsh (ctx); |
88 | |
87 | |
89 | // compute logarithmic depth - see the frustum matrix in view.C |
88 | // compute logarithmic depth - see the frustum matrix in view.C |
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); |
|
|
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 |
97 | z (vout.position) = (log2 (lz) * (2 / log2 (1e10)) - 1) * w (vout.position); |
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_data->l) |
111 | if (ctx.pass->l) |
105 | { |
112 | { |
106 | ctx.pass_data->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::matmap_t::value_type (this, po)); |
123 | matmap.insert (pass_data::matmap_t::value_type (this, po)); |
117 | |
124 | |
118 | po->enable (); |
125 | po->enable (); |
119 | } |
126 | } |
120 | else |
127 | else |
121 | i->second->enable (); |
128 | i->second->enable (); |
122 | |
129 | |
123 | if (ctx.pass_data->l) |
130 | if (ctx.pass->l) |
124 | ctx.pass_data->l->enable (); |
131 | ctx.pass->l->enable (ctx); |
125 | } |
132 | } |
126 | |
133 | |
127 | void material::disable (view &ctx) |
134 | void material::disable (view &ctx) |
128 | { |
135 | { |
129 | } |
136 | } |
… | |
… | |
133 | : tex ("textures/rockwall.jpg"), texvar (tex.name) |
140 | : tex ("textures/rockwall.jpg"), texvar (tex.name) |
134 | , norm ("textures/rockwall_normal.jpg"), normvar (norm.name) |
141 | , norm ("textures/rockwall_normal.jpg"), normvar (norm.name) |
135 | { |
142 | { |
136 | } |
143 | } |
137 | |
144 | |
|
|
145 | void mat_gouraud_shaded::enable (view &ctx) |
|
|
146 | { |
|
|
147 | material::enable (ctx); |
|
|
148 | |
|
|
149 | sh_colour->set (vec3 (c.r, c.g, c.b) * (1.F / 255.F)); |
|
|
150 | } |
|
|
151 | |
|
|
152 | void mat_gouraud_shaded::disable (view &ctx) |
|
|
153 | { |
|
|
154 | material::disable (ctx); |
|
|
155 | } |
|
|
156 | |
|
|
157 | void mat_gouraud_shaded::vsh (view &ctx) |
|
|
158 | { |
|
|
159 | using namespace shader::compile; |
|
|
160 | std_vsh (); |
|
|
161 | |
|
|
162 | if (ctx.pass->l) |
|
|
163 | f_normal = normal_matrix * vin.normal; |
|
|
164 | } |
|
|
165 | |
|
|
166 | void mat_gouraud_shaded::fsh (view &ctx) |
|
|
167 | { |
|
|
168 | using namespace shader::compile; |
|
|
169 | |
|
|
170 | if (ctx.pass->l) |
|
|
171 | { |
|
|
172 | temp_1f fac; |
|
|
173 | |
|
|
174 | fac = dot (normalize (f_normal), normalize (ctx.pass->l->sh_lightvec)); |
|
|
175 | |
|
|
176 | xyz (fout.frag_color) = ctx.pass->l->sh_colour * sh_colour * fac; |
|
|
177 | } |
|
|
178 | } |
|
|
179 | |
|
|
180 | static shader::varying_2f texcoord; |
138 | static shader::varying_3f normal; |
181 | static shader::varying_3f normal; |
139 | static shader::varying_2f texcoord; |
|
|
140 | |
182 | |
141 | void test_material::vsh (view &ctx) |
183 | void test_material::vsh (view &ctx) |
142 | { |
184 | { |
143 | using namespace shader::compile; |
185 | using namespace shader::compile; |
144 | |
186 | |
145 | std_vsh (); |
187 | std_vsh (); |
146 | |
188 | |
147 | if (ctx.pass_data->l) |
189 | if (ctx.pass->l) |
148 | { |
190 | { |
149 | texcoord = xy (vin.tex_coord[0]); |
191 | texcoord = xy (vin.tex_coord[0]); |
150 | normal = normal_matrix * vin.normal; |
192 | normal = normal_matrix * vin.normal; |
151 | } |
193 | } |
152 | } |
194 | } |
153 | |
195 | |
154 | void test_material::fsh (view &ctx) |
196 | void test_material::fsh (view &ctx) |
155 | { |
197 | { |
156 | using namespace shader::compile; |
198 | using namespace shader::compile; |
157 | |
199 | |
158 | if (ctx.pass_data->l) |
200 | if (ctx.pass->l) |
159 | { |
201 | { |
160 | temp_3f lc; |
202 | temp_3f lc; |
161 | temp_1f fac; |
203 | temp_1f fac; |
162 | |
204 | |
163 | temp_3f rot1, rot2, rot3; |
205 | temp_3f rot1, rot2, rot3; |
… | |
… | |
169 | rot2 = float3 (x(rot1), z(rot1), -y(rot1)); |
211 | rot2 = float3 (x(rot1), z(rot1), -y(rot1)); |
170 | rot3 = float3 (y(rot1), -x(rot1), z(rot1)); |
212 | rot3 = float3 (y(rot1), -x(rot1), z(rot1)); |
171 | |
213 | |
172 | normal = mat3 (rot1, rot2, rot3) * normal; |
214 | normal = mat3 (rot1, rot2, rot3) * normal; |
173 | |
215 | |
174 | fac = dot (normalize (normal), normalize (ctx.pass_data->l->sh_lightvec)); |
216 | fac = dot (normalize (normal), normalize (ctx.pass->l->sh_lightvec)); |
175 | fac = max (pow (max (fac, 0.0), 6), 0.3); |
217 | fac = max (pow (max (fac, 0.0), 6), 0.3); |
176 | xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac |
218 | xyz (fout.frag_color) = (texture_2d (texvar, texcoord) + 0.2F) * fac |
177 | * ctx.pass_data->l->sh_colour; |
219 | * ctx.pass->l->sh_colour; |
178 | //xyz (fout.frag_color) = lc * fac; |
220 | //xyz (fout.frag_color) = lc * fac; |
179 | } |
221 | } |
180 | } |
222 | } |
181 | |
223 | |
182 | void test_material::enable (view &ctx) |
224 | void test_material::enable (view &ctx) |
… | |
… | |
192 | texvar->disable (); |
234 | texvar->disable (); |
193 | material::disable (ctx); |
235 | material::disable (ctx); |
194 | } |
236 | } |
195 | |
237 | |
196 | test_material *testmat; |
238 | test_material *testmat; |
|
|
239 | mat_gouraud_shaded *testmat2; |
197 | |
240 | |