Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-26 12:22:41 +01:00
Code Issues Projects Releases Activity

changed palette texture loading

Browse Source
This commit is contained in:
Daniel Evans 2013-09-14 04:00:16 +00:00
parent 1e83463e71
commit 5e6e829584
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework2/GTARenderer.cpp
View File

@ -49,7 +49,7 @@ const char *fragmentShaderSource = "#version 130\n"
"void main()"
"{"
" vec4 c = texture2D(texture, TexCoords);"
//" if(c.a < 0.9) discard;"
" if(c.a < 0.1) discard;"
" float fogZ = (gl_FragCoord.z / gl_FragCoord.w);"
" float fogfac = clamp( (FogEnd-fogZ)/(FogEnd-FogStart), 0.0, 1.0 );"
//" float l = clamp(dot(Normal, SunDirection), 0.0, 1);"

17
framework2/TextureLoader.cpp
View File

@ -70,13 +70,18 @@ bool TextureLoader::loadFromMemory(char *data, GTAData *gameData)
{
uint32_t fullColor[texNative.width * texNative.height];
size_t paletteSize = 1024;
uint8_t* coldata = reinterpret_cast<uint8_t*>(rootSection.raw() + sizeof(RW::BSSectionHeader) + sizeof(RW::BSTextureNative) + paletteSize);
uint32_t* palette = reinterpret_cast<uint32_t*>(rootSection.raw() + sizeof(RW::BSSectionHeader) + sizeof(RW::BSTextureNative) - 4);
bool hasAlpha = (texNative.rasterformat & RW::BSTextureNative::FORMAT_8888) == RW::BSTextureNative::FORMAT_8888;
char* dataBase = rootSection.raw() + sizeof(RW::BSSectionHeader) + sizeof(RW::BSTextureNative);
for(size_t j = 0, iTex = 0; j < texNative.width * texNative.height; ++j)
// Where does this -4 offset come from.
uint8_t* coldata = reinterpret_cast<uint8_t*>(dataBase - 4 + paletteSize + sizeof(uint32_t));
uint32_t raster_size = *reinterpret_cast<uint32_t*>(dataBase - 4 + paletteSize);
uint32_t* palette = reinterpret_cast<uint32_t*>(dataBase - 4);
uint32_t amask = hasAlpha ? 0xFF000000 : 0x0;
for(size_t j = 0; j < raster_size; ++j)
{
iTex = j;
fullColor[iTex] = palette[coldata[j]];
fullColor[j] = palette[coldata[j]] | amask;
}
if(atlas) {
@ -89,7 +94,7 @@ bool TextureLoader::loadFromMemory(char *data, GTAData *gameData)
glGenTextures(1, &textureName);
glBindTexture(GL_TEXTURE_2D, textureName);
glTexImage2D(
GL_TEXTURE_2D, 0, texNative.alpha ? GL_RGBA : GL_RGB,
GL_TEXTURE_2D, 0, GL_RGBA,
texNative.width, texNative.height, 0,
GL_RGBA, GL_UNSIGNED_BYTE, fullColor
);