zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-03 17:32:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The mutipatch texture builder did not set the source lump.

Browse source
This commit is contained in:
Christoph Oelckers 2020-06-08 23:00:06 +02:00
parent 58bc12ee19
commit a330b46d1a
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/textures/formats/multipatchtexture.h
View file

@ -170,6 +170,6 @@ public:
} }
void AddTexturesLumps(int lump1, int lump2, int patcheslump); void AddTexturesLumps(int lump1, int lump2, int patcheslump);
void ParseTexture(FScanner &sc, ETextureType usetype); void ParseTexture(FScanner &sc, ETextureType usetype, int deflump);
void ResolveAllPatches(); void ResolveAllPatches();
}; };

4
src/common/textures/multipatchtexturebuilder.cpp
View file

@ -606,7 +606,7 @@ void FMultipatchTextureBuilder::ParsePatch(FScanner &sc, BuildInfo &info, TexPar
// //
//========================================================================== //==========================================================================
void FMultipatchTextureBuilder::ParseTexture(FScanner &sc, ETextureType UseType) void FMultipatchTextureBuilder::ParseTexture(FScanner &sc, ETextureType UseType, int deflump)
{ {
BuildInfo &buildinfo = BuiltTextures[BuiltTextures.Reserve(1)]; BuildInfo &buildinfo = BuiltTextures[BuiltTextures.Reserve(1)];
@ -637,6 +637,7 @@ void FMultipatchTextureBuilder::ParseTexture(FScanner &sc, ETextureType UseType)
sc.MustGetStringName(","); sc.MustGetStringName(",");
sc.MustGetNumber(); sc.MustGetNumber();
buildinfo.Height = sc.Number; buildinfo.Height = sc.Number;
buildinfo.DefinitionLump = deflump;
bool offset2set = false; bool offset2set = false;
if (sc.CheckString("{")) if (sc.CheckString("{"))
@ -911,6 +912,7 @@ void FMultipatchTextureBuilder::ResolveAllPatches()
{ {
auto img = new FMultiPatchTexture(buildinfo.Width, buildinfo.Height, buildinfo.Parts, buildinfo.bComplex, buildinfo.textual); auto img = new FMultiPatchTexture(buildinfo.Width, buildinfo.Height, buildinfo.Parts, buildinfo.bComplex, buildinfo.textual);
auto itex = new FImageTexture(img); auto itex = new FImageTexture(img);
itex->SetSourceLump(buildinfo.DefinitionLump);
AddImageToTexture(itex, buildinfo); AddImageToTexture(itex, buildinfo);
} }
BuiltTextures.Delete(i); BuiltTextures.Delete(i);

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

@ -782,23 +782,23 @@ void FTextureManager::ParseTextureDef(int lump, FMultipatchTextureBuilder &build
} }
else if (sc.Compare("texture")) else if (sc.Compare("texture"))
{ {
build.ParseTexture(sc, ETextureType::Override); build.ParseTexture(sc, ETextureType::Override, lump);
} }
else if (sc.Compare("sprite")) else if (sc.Compare("sprite"))
{ {
build.ParseTexture(sc, ETextureType::Sprite); build.ParseTexture(sc, ETextureType::Sprite, lump);
} }
else if (sc.Compare("walltexture")) else if (sc.Compare("walltexture"))
{ {
build.ParseTexture(sc, ETextureType::Wall); build.ParseTexture(sc, ETextureType::Wall, lump);
} }
else if (sc.Compare("flat")) else if (sc.Compare("flat"))
{ {
build.ParseTexture(sc, ETextureType::Flat); build.ParseTexture(sc, ETextureType::Flat, lump);
} }
else if (sc.Compare("graphic")) else if (sc.Compare("graphic"))
{ {
build.ParseTexture(sc, ETextureType::MiscPatch); build.ParseTexture(sc, ETextureType::MiscPatch, lump);
} }
else if (sc.Compare("#include")) else if (sc.Compare("#include"))
{ {

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

@ -253,6 +253,7 @@ public:
bool isCanvas() const { return bHasCanvas; } bool isCanvas() const { return bHasCanvas; }
int GetSourceLump() { return SourceLump; } // needed by the scripted GetName method. int GetSourceLump() { return SourceLump; } // needed by the scripted GetName method.
void SetSourceLump(int sl) { SourceLump = sl; }
bool FindHoles(const unsigned char * buffer, int w, int h); bool FindHoles(const unsigned char * buffer, int w, int h);
void CopySize(FTexture* BaseTexture) void CopySize(FTexture* BaseTexture)