| … | |
… | |
| 7 | #include "material.h" |
7 | #include "material.h" |
| 8 | #include "view.h" |
8 | #include "view.h" |
| 9 | #include "util.h" |
9 | #include "util.h" |
| 10 | |
10 | |
| 11 | GLuint |
11 | GLuint |
| 12 | texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord) |
12 | texture::load_texture (SDL_Surface * surface, GLfloat * tex2oord, int flags) |
| 13 | { |
13 | { |
| 14 | GLuint name; |
14 | GLuint name; |
| 15 | SDL_Surface *image; |
15 | SDL_Surface *image; |
| 16 | SDL_Rect area; |
16 | SDL_Rect area; |
| 17 | Uint32 saved_flags; |
17 | Uint32 saved_flags; |
| … | |
… | |
| 53 | |
53 | |
| 54 | /* Create an OpenGL texture for the image */ |
54 | /* Create an OpenGL texture for the image */ |
| 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, flags & DISABLE_MIPMAP ? GL_LINEAR : GL_LINEAR_MIPMAP_LINEAR); |
| 59 | glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); |
59 | glTexParameteri (GL_TEXTURE_2D, GL_GENERATE_MIPMAP, flags & DISABLE_MIPMAP ? GL_FALSE : GL_TRUE); |
| 60 | glTexImage2D (GL_TEXTURE_2D, 0, |
|
|
| 61 | GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); |
60 | glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, surface->w, surface->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); |
|
|
61 | |
|
|
62 | if (flags & CLAMP) |
|
|
63 | { |
|
|
64 | glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); |
|
|
65 | glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); |
|
|
66 | glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); |
|
|
67 | } |
|
|
68 | |
| 62 | SDL_FreeSurface (image); /* No longer needed */ |
69 | SDL_FreeSurface (image); /* No longer needed */ |
| 63 | |
70 | |
| 64 | return name; |
71 | return name; |
| 65 | } |
72 | } |
| 66 | |
73 | |
| … | |
… | |
| 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 | skybox_material::skybox_material () |
|
|
146 | : tex (0) |
|
|
147 | { |
|
|
148 | } |
|
|
149 | |
|
|
150 | void skybox_material::enable (view &ctx) |
|
|
151 | { |
|
|
152 | material::enable (ctx); |
|
|
153 | } |
|
|
154 | |
|
|
155 | void skybox_material::disable (view &ctx) |
|
|
156 | { |
|
|
157 | material::disable (ctx); |
|
|
158 | } |
|
|
159 | |
|
|
160 | static shader::varying_2f skybox_texcoord; |
|
|
161 | |
|
|
162 | void skybox_material::vsh (view &ctx) |
|
|
163 | { |
|
|
164 | using namespace shader::compile; |
|
|
165 | |
|
|
166 | std_vsh (); |
|
|
167 | skybox_texcoord = xy (vin.tex_coord[0]); |
|
|
168 | } |
|
|
169 | |
|
|
170 | void skybox_material::fsh (view &ctx) |
|
|
171 | { |
|
|
172 | using namespace shader::compile; |
|
|
173 | |
|
|
174 | xyz (fout.frag_color) = texture_2d (tex, skybox_texcoord); |
|
|
175 | } |
|
|
176 | |
| 138 | void mat_timed::enable (view &ctx) |
177 | void mat_timed::enable (view &ctx) |
| 139 | { |
178 | { |
| 140 | material::enable (ctx); |
179 | material::enable (ctx); |
| 141 | |
180 | |
| 142 | time->set (timer::now); |
181 | time->set (timer::now); |
