| … | |
… | |
| 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 | } |
| … | |
… | |
| 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 | } |
