Mercurial > mm7
diff Engine/LOD.cpp @ 2574:dd36326a9994
More texture refactoring
GetLeather -> DrawTextureCustomHeight
author | a.parshin |
---|---|
date | Mon, 07 Mar 2016 03:48:40 +0200 |
parents | d87bfbd3bb3b |
children | a76d408c5132 |
line wrap: on
line diff
--- a/Engine/LOD.cpp Sat Mar 05 16:25:53 2016 +0200 +++ b/Engine/LOD.cpp Mon Mar 07 03:48:40 2016 +0200 @@ -1041,7 +1041,7 @@ void LODFile_IconsBitmaps::SyncLoadedFilesCount() { signed int loaded_files; // eax@1 - Texture *pTex; // edx@1 + Texture_MM7 *pTex; // edx@1 loaded_files = this->uNumLoadedFiles; for ( pTex = &this->pTextures[loaded_files]; !pTex->pName[0]; --pTex ) @@ -1143,7 +1143,7 @@ v3 = 1000; do { - Texture::Texture(v2); + Texture_MM7::Texture_MM7(v2); ++v2; --v3; } @@ -1732,8 +1732,8 @@ this->uTextureBlueBits = uTargetBBits; for ( uint i = 0; i < this->uNumLoadedFiles; ++i ) { - Texture DstBuf; // [sp+4h] [bp-50h]@6 - //Texture::Texture(&DstBuf); + Texture_MM7 DstBuf; // [sp+4h] [bp-50h]@6 + //Texture_MM7::Texture_MM7(&DstBuf); if ( this->pTextures[i].pPalette16 ) { File = FindContainer((const char *)this->pTextures[i].pName, 0); @@ -1764,7 +1764,7 @@ FILE *File; // eax@1 void *v7; // ebx@7 void *v8; // edi@7 - Texture DstBuf; // [sp+Ch] [bp-4Ch]@1 + Texture_MM7 DstBuf; // [sp+Ch] [bp-4Ch]@1 File = FindContainer(pContainer, 0); if ( !File ) @@ -1795,7 +1795,7 @@ } //----- (00410522) -------------------------------------------------------- -int LODFile_IconsBitmaps::_410522(Texture *pDst, const char *pContainer, unsigned int uTextureType) +int LODFile_IconsBitmaps::_410522(Texture_MM7 *pDst, const char *pContainer, unsigned int uTextureType) { void *v9; // ST2C_4@6 int v15; // ecx@12 @@ -2055,9 +2055,9 @@ } //----- (004101B1) -------------------------------------------------------- -int LODFile_IconsBitmaps::ReloadTexture(Texture *pDst, const char *pContainer, int mode) +int LODFile_IconsBitmaps::ReloadTexture(Texture_MM7 *pDst, const char *pContainer, int mode) { - Texture *v6; // esi@2 + Texture_MM7 *v6; // esi@2 unsigned int v7; // ebx@6 unsigned int v8; // ecx@6 signed int result; // eax@7 @@ -2113,9 +2113,9 @@ } //----- (0040FC08) -------------------------------------------------------- -int LODFile_IconsBitmaps::LoadTextureFromLOD(Texture *pOutTex, const char *pContainer, enum TEXTURE_TYPE eTextureType) +int LODFile_IconsBitmaps::LoadTextureFromLOD(Texture_MM7 *pOutTex, const char *pContainer, enum TEXTURE_TYPE eTextureType) { - Texture *v8; // esi@3 + Texture_MM7 *v8; // esi@3 enum TEXTURE_TYPE v12; // eax@14 signed int result; // esi@14 unsigned int v14; // eax@21 @@ -2183,7 +2183,7 @@ free(v19); if ( /*bUseLoResSprites*/false && v8->pBits & 2 ) { - pOutTex = (Texture *)(((signed int)v8->uSizeOfMaxLevelOfDetail >> 2) + pOutTex = (Texture_MM7 *)(((signed int)v8->uSizeOfMaxLevelOfDetail >> 2) + ((signed int)v8->uSizeOfMaxLevelOfDetail >> 4) + ((signed int)v8->uSizeOfMaxLevelOfDetail >> 6)); v22 = (size_t)pOutTex; @@ -2339,11 +2339,11 @@ return 1; } -Texture *LODFile_IconsBitmaps::LoadTexturePtr(const char *pContainer, enum TEXTURE_TYPE uTextureType) +Texture_MM7 *LODFile_IconsBitmaps::LoadTexturePtr(const char *pContainer, enum TEXTURE_TYPE uTextureType) { uint id = LoadTexture(pContainer, uTextureType); - Assert(id != -1 && L"Texture not found"); + Assert(id != -1 && L"Texture_MM7 not found"); return &pTextures[id]; } @@ -2393,12 +2393,12 @@ // return v4; } -Texture * LODFile_IconsBitmaps::GetTexture( int idx ) +Texture_MM7 * LODFile_IconsBitmaps::GetTexture( int idx ) { - Assert(idx < MAX_LOD_TEXTURES, "Texture index out of bounds (%u)", idx); + Assert(idx < MAX_LOD_TEXTURES, "Texture_MM7 index out of bounds (%u)", idx); if (idx == -1) { - //Log::Warning(L"Texture id = %d missing", idx); + //Log::Warning(L"Texture_MM7 id = %d missing", idx); return pTextures + LoadDummyTexture(); } return pTextures + idx;