zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-21 11:21:04 +00:00
Code Issues Projects Releases Packages Wiki 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
parent 397b1520bc
commit 437d4f8af0
3 changed files with 57 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
src/common/textures/texturemanager.cpp
View file

@ -118,9 +118,9 @@ void FTextureManager::FlushAll()
{ {
for (int j = 0; j < 2; j++) for (int j = 0; j < 2; j++)
{ {
Textures[i].Texture->CleanHardwareTextures(true, true); Textures[i].Texture->GetTexture()->CleanHardwareTextures(true, true);
delete Textures[i].Texture->SoftwareTexture; delete Textures[i].Texture->GetTexture()->SoftwareTexture;
Textures[i].Texture->SoftwareTexture = nullptr; Textures[i].Texture->GetTexture()->SoftwareTexture = nullptr;
} }
} }
} }
@ -151,38 +151,39 @@ FTextureID FTextureManager::CheckForTexture (const char *name, ETextureType uset
for(i = HashFirst[MakeKey(name) % HASH_SIZE]; i != HASH_END; i = Textures[i].HashNext) for(i = HashFirst[MakeKey(name) % HASH_SIZE]; i != HASH_END; i = Textures[i].HashNext)
{ {
const FTexture *tex = Textures[i].Texture; auto tex = Textures[i].Texture;
if (stricmp (tex->Name, name) == 0 ) if (stricmp (tex->GetName(), name) == 0 )
{ {
// If we look for short names, we must ignore any long name texture. // If we look for short names, we must ignore any long name texture.
if ((flags & TEXMAN_ShortNameOnly) && tex->bFullNameTexture) if ((flags & TEXMAN_ShortNameOnly) && tex->isFullNameTexture())
{ {
continue; continue;
} }
auto texUseType = tex->GetUseType();
// The name matches, so check the texture type // The name matches, so check the texture type
if (usetype == ETextureType::Any) if (usetype == ETextureType::Any)
{ {
// All NULL textures should actually return 0 // All NULL textures should actually return 0
if (tex->UseType == ETextureType::FirstDefined && !(flags & TEXMAN_ReturnFirst)) return 0; if (texUseType == ETextureType::FirstDefined && !(flags & TEXMAN_ReturnFirst)) return 0;
if (tex->UseType == ETextureType::SkinGraphic && !(flags & TEXMAN_AllowSkins)) return 0; if (texUseType == ETextureType::SkinGraphic && !(flags & TEXMAN_AllowSkins)) return 0;
return FTextureID(tex->UseType==ETextureType::Null ? 0 : i); return FTextureID(texUseType==ETextureType::Null ? 0 : i);
} }
else if ((flags & TEXMAN_Overridable) && tex->UseType == ETextureType::Override) else if ((flags & TEXMAN_Overridable) && texUseType == ETextureType::Override)
{ {
return FTextureID(i); return FTextureID(i);
} }
else if (tex->UseType == usetype) else if (texUseType == usetype)
{ {
return FTextureID(i); return FTextureID(i);
} }
else if (tex->UseType == ETextureType::FirstDefined && usetype == ETextureType::Wall) else if (texUseType == ETextureType::FirstDefined && usetype == ETextureType::Wall)
{ {
if (!(flags & TEXMAN_ReturnFirst)) return FTextureID(0); if (!(flags & TEXMAN_ReturnFirst)) return FTextureID(0);
else return FTextureID(i); else return FTextureID(i);
} }
else if (tex->UseType == ETextureType::Null && usetype == ETextureType::Wall) else if (texUseType == ETextureType::Null && usetype == ETextureType::Wall)
{ {
// We found a NULL texture on a wall -> return 0 // We found a NULL texture on a wall -> return 0
return FTextureID(0); return FTextureID(0);
@ -191,12 +192,12 @@ FTextureID FTextureManager::CheckForTexture (const char *name, ETextureType uset
{ {
if (firsttype == ETextureType::Null || if (firsttype == ETextureType::Null ||
(firsttype == ETextureType::MiscPatch && (firsttype == ETextureType::MiscPatch &&
tex->UseType != firsttype && texUseType != firsttype &&
tex->UseType != ETextureType::Null) texUseType != ETextureType::Null)
) )
{ {
firstfound = i; firstfound = i;
firsttype = tex->UseType; firsttype = texUseType;
} }
} }
} }
@ -272,12 +273,13 @@ int FTextureManager::ListTextures (const char *name, TArray<FTextureID> &list, b
while (i != HASH_END) while (i != HASH_END)
{ {
const FTexture *tex = Textures[i].Texture; auto tex = Textures[i].Texture;
if (stricmp (tex->Name, name) == 0) if (stricmp (tex->GetName(), name) == 0)
{ {
auto texUseType = tex->GetUseType();
// NULL textures must be ignored. // NULL textures must be ignored.
if (tex->UseType!=ETextureType::Null) if (texUseType!=ETextureType::Null)
{ {
unsigned int j = list.Size(); unsigned int j = list.Size();
if (!listall) if (!listall)
@ -285,7 +287,7 @@ int FTextureManager::ListTextures (const char *name, TArray<FTextureID> &list, b
for (j = 0; j < list.Size(); j++) for (j = 0; j < list.Size(); j++)
{ {
// Check for overriding definitions from newer WADs // Check for overriding definitions from newer WADs
if (Textures[list[j].GetIndex()].Texture->UseType == tex->UseType) break; if (Textures[list[j].GetIndex()].Texture->GetUseType() == texUseType) break;
} }
} }
if (j==list.Size()) list.Push(FTextureID(i)); if (j==list.Size()) list.Push(FTextureID(i));
@ -361,7 +363,7 @@ bool FTextureManager::OkForLocalization(FTextureID texnum, const char *substitut
if (locmode == 2) return false; if (locmode == 2) return false;
// Mode 3 must also reject substitutions for non-IWAD content. // Mode 3 must also reject substitutions for non-IWAD content.
int file = fileSystem.GetFileContainer(Textures[texnum.GetIndex()].Texture->SourceLump); int file = fileSystem.GetFileContainer(Textures[texnum.GetIndex()].Texture->GetSourceLump());
if (file > fileSystem.GetMaxIwadNum()) return true; if (file > fileSystem.GetMaxIwadNum()) return true;
return false; return false;
@ -394,7 +396,7 @@ FTextureID FTextureManager::AddTexture (FTexture *texture)
hash = -1; hash = -1;
} }
TextureHash hasher = { texture, hash }; TextureHash hasher = { reinterpret_cast<FGameTexture*>(texture), hash };
int trans = Textures.Push (hasher); int trans = Textures.Push (hasher);
Translation.Push (trans); Translation.Push (trans);
if (bucket >= 0) HashFirst[bucket] = trans; if (bucket >= 0) HashFirst[bucket] = trans;
@ -439,14 +441,14 @@ void FTextureManager::ReplaceTexture (FTextureID picnum, FTexture *newtexture, b
if (unsigned(index) >= Textures.Size()) if (unsigned(index) >= Textures.Size())
return; return;
FTexture *oldtexture = Textures[index].Texture; auto oldtexture = Textures[index].Texture;
newtexture->Name = oldtexture->Name; newtexture->Name = oldtexture->GetName();
newtexture->UseType = oldtexture->UseType; newtexture->UseType = oldtexture->GetUseType();
Textures[index].Texture = newtexture; Textures[index].Texture = reinterpret_cast<FGameTexture*>(newtexture);
newtexture->id = oldtexture->id; newtexture->id = oldtexture->GetID();
oldtexture->Name = ""; oldtexture->GetTexture()->Name = "";
AddTexture(oldtexture); AddTexture(oldtexture->GetTexture());
} }
//========================================================================== //==========================================================================
@ -464,11 +466,11 @@ bool FTextureManager::AreTexturesCompatible (FTextureID picnum1, FTextureID picn
if (unsigned(index1) >= Textures.Size() || unsigned(index2) >= Textures.Size()) if (unsigned(index1) >= Textures.Size() || unsigned(index2) >= Textures.Size())
return false; return false;
FTexture *texture1 = Textures[index1].Texture; auto texture1 = Textures[index1].Texture;
FTexture *texture2 = Textures[index2].Texture; auto texture2 = Textures[index2].Texture;
// both textures must be the same type. // both textures must be the same type.
if (texture1 == NULL || texture2 == NULL || texture1->UseType != texture2->UseType) if (texture1 == NULL || texture2 == NULL || texture1->GetUseType() != texture2->GetUseType())
return false; return false;
// both textures must be from the same file // both textures must be from the same file
@ -569,15 +571,15 @@ void FTextureManager::AddHiresTextures (int wadnum)
FTexture * newtex = FTexture::CreateTexture ("", firsttx, ETextureType::Any); FTexture * newtex = FTexture::CreateTexture ("", firsttx, ETextureType::Any);
if (newtex != NULL) if (newtex != NULL)
{ {
FTexture * oldtex = Textures[tlist[i].GetIndex()].Texture; auto oldtex = Textures[tlist[i].GetIndex()].Texture;
// Replace the entire texture and adjust the scaling and offset factors. // Replace the entire texture and adjust the scaling and offset factors.
newtex->bWorldPanning = true; newtex->bWorldPanning = true;
newtex->SetDisplaySize(oldtex->GetDisplayWidth(), oldtex->GetDisplayHeight()); newtex->SetDisplaySize(oldtex->GetDisplayWidth(), oldtex->GetDisplayHeight());
newtex->_LeftOffset[0] = int(oldtex->GetScaledLeftOffset(0) * newtex->Scale.X); newtex->_LeftOffset[0] = int(oldtex->GetDisplayLeftOffset(0) * newtex->Scale.X);
newtex->_LeftOffset[1] = int(oldtex->GetScaledLeftOffset(1) * newtex->Scale.X); newtex->_LeftOffset[1] = int(oldtex->GetDisplayLeftOffset(1) * newtex->Scale.X);
newtex->_TopOffset[0] = int(oldtex->GetScaledTopOffset(0) * newtex->Scale.Y); newtex->_TopOffset[0] = int(oldtex->GetDisplayTopOffset(0) * newtex->Scale.Y);
newtex->_TopOffset[1] = int(oldtex->GetScaledTopOffset(1) * newtex->Scale.Y); newtex->_TopOffset[1] = int(oldtex->GetDisplayTopOffset(1) * newtex->Scale.Y);
ReplaceTexture(tlist[i], newtex, true); ReplaceTexture(tlist[i], newtex, true);
} }
} }
@ -654,14 +656,14 @@ void FTextureManager::ParseTextureDef(int lump, FMultipatchTextureBuilder &build
{ {
for(unsigned int i = 0; i < tlist.Size(); i++) for(unsigned int i = 0; i < tlist.Size(); i++)
{ {
FTexture * oldtex = Textures[tlist[i].GetIndex()].Texture; auto oldtex = Textures[tlist[i].GetIndex()].Texture;
int sl; int sl;
// only replace matching types. For sprites also replace any MiscPatches // only replace matching types. For sprites also replace any MiscPatches
// based on the same lump. These can be created for icons. // based on the same lump. These can be created for icons.
if (oldtex->UseType == type || type == ETextureType::Any || if (oldtex->GetUseType() == type || type == ETextureType::Any ||
(mode == TEXMAN_Overridable && oldtex->UseType == ETextureType::Override) || (mode == TEXMAN_Overridable && oldtex->GetUseType() == ETextureType::Override) ||
(type == ETextureType::Sprite && oldtex->UseType == ETextureType::MiscPatch && (type == ETextureType::Sprite && oldtex->GetUseType() == ETextureType::MiscPatch &&
(sl=oldtex->GetSourceLump()) >= 0 && fileSystem.GetFileNamespace(sl) == ns_sprites) (sl=oldtex->GetSourceLump()) >= 0 && fileSystem.GetFileNamespace(sl) == ns_sprites)
) )
{ {
@ -671,10 +673,10 @@ void FTextureManager::ParseTextureDef(int lump, FMultipatchTextureBuilder &build
// Replace the entire texture and adjust the scaling and offset factors. // Replace the entire texture and adjust the scaling and offset factors.
newtex->bWorldPanning = true; newtex->bWorldPanning = true;
newtex->SetDisplaySize(oldtex->GetDisplayWidth(), oldtex->GetDisplayHeight()); newtex->SetDisplaySize(oldtex->GetDisplayWidth(), oldtex->GetDisplayHeight());
newtex->_LeftOffset[0] = int(oldtex->GetScaledLeftOffset(0) * newtex->Scale.X); newtex->_LeftOffset[0] = int(oldtex->GetDisplayLeftOffset(0) * newtex->Scale.X);
newtex->_LeftOffset[1] = int(oldtex->GetScaledLeftOffset(1) * newtex->Scale.X); newtex->_LeftOffset[1] = int(oldtex->GetDisplayLeftOffset(1) * newtex->Scale.X);
newtex->_TopOffset[0] = int(oldtex->GetScaledTopOffset(0) * newtex->Scale.Y); newtex->_TopOffset[0] = int(oldtex->GetDisplayTopOffset(0) * newtex->Scale.Y);
newtex->_TopOffset[1] = int(oldtex->GetScaledTopOffset(1) * newtex->Scale.Y); newtex->_TopOffset[1] = int(oldtex->GetDisplayTopOffset(1) * newtex->Scale.Y);
ReplaceTexture(tlist[i], newtex, true); ReplaceTexture(tlist[i], newtex, true);
} }
} }
@ -952,7 +954,7 @@ void FTextureManager::AddTexturesForWad(int wadnum, FMultipatchTextureBuilder &b
void FTextureManager::SortTexturesByType(int start, int end) void FTextureManager::SortTexturesByType(int start, int end)
{ {
TArray<FTexture *> newtextures; TArray<FGameTexture *> newtextures;
// First unlink all newly added textures from the hash chain // First unlink all newly added textures from the hash chain
for (int i = 0; i < HASH_SIZE; i++) for (int i = 0; i < HASH_SIZE; i++)
@ -980,9 +982,9 @@ void FTextureManager::SortTexturesByType(int start, int end)
{ {
for(unsigned j = 0; j<newtextures.Size(); j++) for(unsigned j = 0; j<newtextures.Size(); j++)
{ {
if (newtextures[j] != NULL && newtextures[j]->UseType == texturetypes[i]) if (newtextures[j] != NULL && newtextures[j]->GetUseType() == texturetypes[i])
{ {
AddTexture(newtextures[j]); AddTexture(newtextures[j]->GetTexture());
newtextures[j] = NULL; newtextures[j] = NULL;
} }
} }
@ -992,8 +994,8 @@ void FTextureManager::SortTexturesByType(int start, int end)
{ {
if (newtextures[j] != NULL) if (newtextures[j] != NULL)
{ {
Printf("Texture %s has unknown type!\n", newtextures[j]->Name.GetChars()); Printf("Texture %s has unknown type!\n", newtextures[j]->GetName().GetChars());
AddTexture(newtextures[j]); AddTexture(newtextures[j]->GetTexture());
} }
} }
} }

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

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

1
src/common/textures/textures.h
View file

@ -677,6 +677,7 @@ public:
bool isMultiPatch() const { return wrapped.bMultiPatch; } bool isMultiPatch() const { return wrapped.bMultiPatch; }
bool isFullbrightDisabled() const { return wrapped.isFullbrightDisabled(); } bool isFullbrightDisabled() const { return wrapped.isFullbrightDisabled(); }
bool isFullbright() const { return wrapped.isFullbright(); } bool isFullbright() const { return wrapped.isFullbright(); }
bool isFullNameTexture() const { return wrapped.bFullNameTexture; }
bool expandSprites() const { return wrapped.bExpandSprite; } bool expandSprites() const { return wrapped.bExpandSprite; }
bool useWorldPanning() const { return wrapped.UseWorldPanning(); } bool useWorldPanning() const { return wrapped.UseWorldPanning(); }
void SetWorldPanning(bool on) { wrapped.SetWorldPanning(on); } void SetWorldPanning(bool on) { wrapped.SetWorldPanning(on); }