KeepersCompound
/
ThiefLightmapper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: KeepersCompound:1b13d92b9949c67adb886d54e11b0144eac3985c
Branches Tags
KeepersCompound:main
KeepersCompound:cli-separation
..
compare: KeepersCompound:65dda0194d0ae1140e4e8d1ec0f5cd89c7ba7401
Branches Tags
KeepersCompound:cli-separation
KeepersCompound:main

No commits in common. "1b13d92b9949c67adb886d54e11b0144eac3985c" and "65dda0194d0ae1140e4e8d1ec0f5cd89c7ba7401" have entirely different histories.
1b13d92b99 ... 65dda0194d

2 changed files with 1 additions and 33 deletions
Show Stats Expand all files Collapse all files

32
KeepersCompound.LGS/Database/Chunks/Link.cs
View File

@ -83,22 +83,6 @@ public class LinkChunk : IChunk, IMergable
public void Merge(IMergable other)
{
// !HACK: We always merge into gamesys so we can pre-trim garbage here
var count = links.Count;
for (var i = count - 1; i >= 0; i--)
{
var link = links[i];
if (link.linkId.IsConcrete())
{
links.RemoveAt(i);
}
}
if (links.Count != count)
{
Console.WriteLine($"Trimmed links: {count} -> {links.Count}");
}
links.AddRange(((LinkChunk)other).links);
}
}
@ -149,22 +133,6 @@ public class LinkDataMetaProp : IChunk, IMergable
public void Merge(IMergable other)
{
// !HACK: We always merge into gamesys so we can pre-trim garbage here
var count = linkData.Count;
for (var i = count - 1; i >= 0; i--)
{
var link = linkData[i];
if (link.linkId.IsConcrete())
{
linkData.RemoveAt(i);
}
}
if (linkData.Count != count)
{
Console.WriteLine($"Trimmed link data: {count} -> {linkData.Count}");
}
linkData.AddRange(((LinkDataMetaProp)other).linkData);
}
}

2
KeepersCompound.LGS/ModelFile.cs
View File

@ -317,7 +317,7 @@ public class ModelFile
var objTrans = Matrix4x4.Identity;
if (subObj.Joint != -1)
{
var ang = subObj.Joint >= joints.Length ? 0 : float.DegreesToRadians(joints[subObj.Joint]);
var ang = float.DegreesToRadians(joints[subObj.Joint]);
// TODO: Is this correct? Should I use a manual rotation matrix?
var jointRot = Matrix4x4.CreateFromYawPitchRoll(0, ang, 0);
objTrans = jointRot * subObj.Transform;