… | |
… | |
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 | } |
… | |
… | |
93 | temp_1f lz; |
92 | temp_1f lz; |
94 | |
93 | |
95 | // TODO: negative z is not calculated in an acceptable way, clipping does horrible things(?) |
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 | #if 0 |
96 | #if 0 |
98 | lz = (log (max (lz, 0) + 1) / log (1e18)) - 1; |
97 | lz = (log (max (lz, 0) + 1) / log (1e30)) - 1; |
99 | #else |
98 | #else |
100 | lz = ifelse (lz <= 0, |
99 | lz = ifelse (lz <= 0, |
101 | 0, |
100 | 0, |
102 | log (lz + 1) / log (1e18) |
101 | log (lz + 1) / log (1e30) |
103 | ) - 1; |
102 | ) - 1; |
104 | #endif |
103 | #endif |
105 | z (vout.position) = lz * w (vout.position); |
104 | z (vout.position) = lz * w (vout.position); |
106 | } |
105 | } |
107 | |
106 | |
… | |
… | |
127 | } |
126 | } |
128 | else |
127 | else |
129 | i->second->enable (); |
128 | i->second->enable (); |
130 | |
129 | |
131 | if (ctx.pass->l) |
130 | if (ctx.pass->l) |
132 | ctx.pass->l->enable (); |
131 | ctx.pass->l->enable (ctx); |
133 | } |
132 | } |
134 | |
133 | |
135 | void material::disable (view &ctx) |
134 | void material::disable (view &ctx) |
136 | { |
135 | { |
137 | } |
136 | } |
… | |
… | |
141 | : tex ("textures/rockwall.jpg"), texvar (tex.name) |
140 | : tex ("textures/rockwall.jpg"), texvar (tex.name) |
142 | , norm ("textures/rockwall_normal.jpg"), normvar (norm.name) |
141 | , norm ("textures/rockwall_normal.jpg"), normvar (norm.name) |
143 | { |
142 | { |
144 | } |
143 | } |
145 | |
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; |
146 | static shader::varying_3f normal; |
181 | static shader::varying_3f normal; |
147 | static shader::varying_2f texcoord; |
|
|
148 | |
182 | |
149 | void test_material::vsh (view &ctx) |
183 | void test_material::vsh (view &ctx) |
150 | { |
184 | { |
151 | using namespace shader::compile; |
185 | using namespace shader::compile; |
152 | |
186 | |
… | |
… | |
200 | texvar->disable (); |
234 | texvar->disable (); |
201 | material::disable (ctx); |
235 | material::disable (ctx); |
202 | } |
236 | } |
203 | |
237 | |
204 | test_material *testmat; |
238 | test_material *testmat; |
|
|
239 | mat_gouraud_shaded *testmat2; |
205 | |
240 | |