Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-26 15:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Textures are no longer decoded for un-textured polygons (not sure if this fixes anything yet).

Browse source
This commit is contained in:
Bart Trzynadlowski 2011-07-22 18:56:35 +00:00
parent 5b373f687f
commit d2ecec7997
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Src/Graphics/Models.cpp
View file

@ -580,6 +580,7 @@ struct VBORef *CRender3D::CacheModel(ModelCache *Cache, int lutIdx, UINT16 texOf
P.numVerts = (P.header[0]&0x40)?4:3; P.numVerts = (P.header[0]&0x40)?4:3;
// Texture data // Texture data
texEnable = P.header[6]&0x04000000;
texFormat = (P.header[6]>>7)&7; texFormat = (P.header[6]>>7)&7;
texWidth = (32<<((P.header[3]>>3)&7)); texWidth = (32<<((P.header[3]>>3)&7));
texHeight = (32<<((P.header[3]>>0)&7)); texHeight = (32<<((P.header[3]>>0)&7));
@ -590,7 +591,7 @@ struct VBORef *CRender3D::CacheModel(ModelCache *Cache, int lutIdx, UINT16 texOf
texBaseY &= 2047; texBaseY &= 2047;
uvScale = (P.header[1]&0x40)?1.0f:(1.0f/8.0f); uvScale = (P.header[1]&0x40)?1.0f:(1.0f/8.0f);
// Determine whether this is an alpha polygon // Determine whether this is an alpha polygon (TODO: when testing textures, test if texturing enabled? Might not matter)
if (((P.header[6]&0x00800000)==0) || // translucent polygon if (((P.header[6]&0x00800000)==0) || // translucent polygon
(texFormat==7) || // RGBA4 texture (texFormat==7) || // RGBA4 texture
(texFormat==4)) // A4L4 texture (texFormat==4)) // A4L4 texture
@ -613,6 +614,7 @@ struct VBORef *CRender3D::CacheModel(ModelCache *Cache, int lutIdx, UINT16 texOf
} }
// Decode the texture // Decode the texture
if (texEnable)
DecodeTexture(texFormat, texBaseX, texBaseY, texWidth, texHeight); DecodeTexture(texFormat, texBaseX, texBaseY, texWidth, texHeight);
// Polygon normal is in upper 24 bits: sign + 1.22 fixed point // Polygon normal is in upper 24 bits: sign + 1.22 fixed point