immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #243 from OdyX/dev-fix-textures-loading 

Fix the detection of alpha-channel in textures as created by IMG_Load
dev-ui
Piotr Dziwiński 2013-10-28 10:11:54 -07:00
parent 19a7196b61 c2a717d5c9
commit 75871cc9ca
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/engine/engine.cpp
View File

@ -276,7 +276,7 @@ bool CEngine::Create()
Math::LoadOrthoProjectionMatrix(m_matProjInterface, 0.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f); Math::LoadOrthoProjectionMatrix(m_matProjInterface, 0.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f);
TextureCreateParams params; TextureCreateParams params;
params.format = TEX_IMG_RGB; params.format = TEX_IMG_AUTO;
params.minFilter = TEX_MIN_FILTER_NEAREST; params.minFilter = TEX_MIN_FILTER_NEAREST;
params.magFilter = TEX_MAG_FILTER_NEAREST; params.magFilter = TEX_MAG_FILTER_NEAREST;
params.mipmap = false; params.mipmap = false;

8
src/graphics/opengl/gldevice.cpp
View File

@ -606,7 +606,7 @@ Texture CGLDevice::CreateTexture(ImageData *data, const TextureCreateParams &par
} }
else if (params.format == TEX_IMG_AUTO) else if (params.format == TEX_IMG_AUTO)
{ {
if (data->surface->format->Amask != 0) if (data->surface->format->BytesPerPixel == 4)
{ {
if ((data->surface->format->Amask == 0xFF000000) && if ((data->surface->format->Amask == 0xFF000000) &&
(data->surface->format->Rmask == 0x00FF0000) && (data->surface->format->Rmask == 0x00FF0000) &&
@ -630,7 +630,7 @@ Texture CGLDevice::CreateTexture(ImageData *data, const TextureCreateParams &par
convert = true; convert = true;
} }
} }
else else if (data->surface->format->BytesPerPixel == 3)
{ {
if ((data->surface->format->Rmask == 0xFF0000) && if ((data->surface->format->Rmask == 0xFF0000) &&
(data->surface->format->Gmask == 0x00FF00) && (data->surface->format->Gmask == 0x00FF00) &&
@ -652,6 +652,10 @@ Texture CGLDevice::CreateTexture(ImageData *data, const TextureCreateParams &par
convert = true; convert = true;
} }
} }
else {
GetLogger()->Error("Unknown data surface format");
assert(false);
}
} }
else else
assert(false); assert(false);