OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- changed storage in texture manager to FGameTexture.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-15 21:34:33 +02:00
commit 437d4f8af0
3 changed files with 57 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/common/textures/texturemanager.h
View file

@ -29,7 +29,7 @@ private:
if ((unsigned)texnum >= Textures.Size()) return nullptr;
if (animate) texnum = Translation[texnum];
if (localize && Textures[texnum].HasLocalization) texnum = ResolveLocalizedTexture(texnum);
return Textures[texnum].Texture;
return Textures[texnum].Texture->GetTexture();
}
public:
// This only gets used in UI code so we do not need PALVERS handling.
@ -157,8 +157,8 @@ public:
return BuildTileData.Last();
}
FTexture* Texture(FTextureID id) { return Textures[id.GetIndex()].Texture; }
FGameTexture* GameTexture(FTextureID id) { return reinterpret_cast<FGameTexture*>(Textures[id.GetIndex()].Texture); }
FTexture* Texture(FTextureID id) { return Textures[id.GetIndex()].Texture->GetTexture(); }
FGameTexture* GameTexture(FTextureID id) { return Textures[id.GetIndex()].Texture; }
void SetTranslation(FTextureID fromtexnum, FTextureID totexnum);
private:
@ -169,7 +169,7 @@ private:
struct TextureHash
{
FTexture *Texture;
FGameTexture *Texture;
int HashNext;
bool HasLocalization;
};