|
@@ -29,7 +29,7 @@ TextureManager::~TextureManager() {
|
29
|
29
|
reset();
|
30
|
30
|
}
|
31
|
31
|
|
32
|
|
-unsigned char *TextureManager::generateColorTexture(unsigned char rgba[4],
|
|
32
|
+unsigned char *TextureManager::generateColorTexture(const unsigned char rgba[4],
|
33
|
33
|
unsigned int width, unsigned int height) {
|
34
|
34
|
assert(rgba != NULL);
|
35
|
35
|
assert(width > 0);
|
|
@@ -47,7 +47,7 @@ unsigned char *TextureManager::generateColorTexture(unsigned char rgba[4],
|
47
|
47
|
return image;
|
48
|
48
|
}
|
49
|
49
|
|
50
|
|
-int TextureManager::loadColorTexture(unsigned char rgba[4],
|
|
50
|
+int TextureManager::loadColorTexture(const unsigned char rgba[4],
|
51
|
51
|
unsigned int width, unsigned int height) {
|
52
|
52
|
assert(rgba != NULL);
|
53
|
53
|
assert(width > 0);
|
|
@@ -228,21 +228,12 @@ int TextureManager::loadBufferSlot(unsigned char *image,
|
228
|
228
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
|
229
|
229
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
|
230
|
230
|
|
231
|
|
- if (mFlags & fUseMipmaps) {
|
232
|
|
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
|
233
|
|
- GL_NEAREST_MIPMAP_LINEAR);
|
234
|
|
- //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
235
|
|
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
|
236
|
|
- GL_LINEAR_MIPMAP_LINEAR);
|
|
231
|
+ //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
|
232
|
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR);
|
|
233
|
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
|
237
|
234
|
|
238
|
|
- glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
|
239
|
|
- glTexImage2D(GL_TEXTURE_2D, 0, bytes, width, height, 0, glcMode, GL_UNSIGNED_BYTE, image);
|
240
|
|
- } else {
|
241
|
|
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
242
|
|
-
|
243
|
|
- glTexImage2D(GL_TEXTURE_2D, 0, glcMode, width, height, 0,
|
244
|
|
- glcMode, GL_UNSIGNED_BYTE, image);
|
245
|
|
- }
|
|
235
|
+ glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
|
|
236
|
+ glTexImage2D(GL_TEXTURE_2D, 0, bytes, width, height, 0, glcMode, GL_UNSIGNED_BYTE, image);
|
246
|
237
|
|
247
|
238
|
//glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
|
248
|
239
|
|