stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 13:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed a bug where textures for internal model skin names did not load when "Path" was specified in MODELDEF

Browse source
This commit is contained in:
biwa 2019-06-16 18:40:10 +02:00
parent 70b2be5e73
commit c2b18a913e
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/GZBuilder/Data/ModelData.cs
View file

@ -37,6 +37,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
internal List<Dictionary<int, string>> SurfaceSkinNames;
internal List<string> FrameNames;
internal List<int> FrameIndices;
internal string Path; // biwa
internal GZModel Model;
@ -71,6 +72,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
SurfaceSkinNames = new List<Dictionary<int, string>>();
FrameNames = new List<string>();
FrameIndices = new List<int>();
Path = string.Empty;
transform = Matrix.Identity;
transformstretched = Matrix.Identity;
hashcode = hashcounter++;

7
Source/Core/GZBuilder/md3/ModelReader.cs
View file

@ -185,7 +185,12 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3
continue;
}
Texture t = GetTexture(containers, result.Skins[m], device);
string path = result.Skins[m].Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
if(!String.IsNullOrEmpty(mde.Path))
path = Path.Combine(mde.Path, path);
Texture t = GetTexture(containers, path, device);
if(t == null)
{

2
Source/Core/ZDoom/ModeldefParser.cs
View file

@ -187,7 +187,7 @@ namespace CodeImp.DoomBuilder.ZDoom
if(mds.Frames.ContainsKey(targetsprite))
{
// Create model data
ModelData md = new ModelData { InheritActorPitch = mds.InheritActorPitch, UseActorPitch = mds.UseActorPitch, UseActorRoll = mds.UseActorRoll };
ModelData md = new ModelData { InheritActorPitch = mds.InheritActorPitch, UseActorPitch = mds.UseActorPitch, UseActorRoll = mds.UseActorRoll, Path = mds.DataPath };
// Things are complicated in GZDoom...
Matrix moffset = Matrix.Translation(mds.Offset.Y, -mds.Offset.X, mds.Offset.Z);

1
Source/Core/ZDoom/ModeldefStructure.cs
View file

@ -63,6 +63,7 @@ namespace CodeImp.DoomBuilder.ZDoom
public bool InheritActorPitch { get { return inheritactorpitch; } }
public bool UseActorPitch { get { return useactorpitch; } }
public bool UseActorRoll { get { return useactorroll; } }
public string DataPath { get { return path; } } // biwa
public Dictionary<string, HashSet<FrameStructure>> Frames { get { return frames; } }