Merge pull request #123 from Dnawrkshp/feat/rc4-animations

MilchRatchet · web-flow · commit fe9d9ec653f8 · 2026-03-11T06:16:07.000+01:00
Add support for DL animations
diff --git a/LibReplanetizer/Models/Animation/Animation.cs b/LibReplanetizer/Models/Animation/Animation.cs
@@ -109,10 +109,10 @@ private void GetDLVals(FileStream fs, GameType game, int modelOffset, int animat
             unk7 = header[0x13];
 
             int offsetSound = ReadInt(header, 0x14);
-            int offsetUnk = ReadInt(header, 0x18);
+            int offsetAnimInfo = ReadInt(header, 0x18);
             int offsetFrameHeader = ReadInt(header, 0x1C);
 
-            byte[] unkBytes = ReadBlock(fs, modelOffset + animationOffset + offsetUnk, offsetFrameHeader - offsetUnk);
+            byte[] animInfoBytes = ReadBlock(fs, modelOffset + animationOffset + offsetAnimInfo, offsetFrameHeader - offsetAnimInfo);
 
             byte[] frameHeaderBlock = ReadBlock(fs, modelOffset + animationOffset + offsetFrameHeader, 0x10);
 
@@ -135,6 +135,9 @@ private void GetDLVals(FileStream fs, GameType game, int modelOffset, int animat
             {
                 sounds.Add(ReadInt(extrasBlock, i * 4));
             }
+
+            // speed is not stored in anim header
+            speed = 1;
         }
 
         public byte[] Serialize(int baseOffset = 0, int fileOffset = 0)
diff --git a/LibReplanetizer/Models/Animation/BoneData.cs b/LibReplanetizer/Models/Animation/BoneData.cs
@@ -58,9 +58,9 @@ private void GetDLVals(byte[] boneDataBlock, int num)
             unk0x0C = ReadShort(boneDataBlock, offset + 0x0C);
             parent = ReadShort(boneDataBlock, offset + 0x0E);
 
-            if (parent == 0xFF)
+            if (parent == 0xFF || parent == 0x7F)
             {
-                // The root node is always marked with 0xFF.
+                // The root node is always marked with 0xFF/0x7F.
                 parent = 0;
             }
             else
diff --git a/LibReplanetizer/Models/Animation/Frame.cs b/LibReplanetizer/Models/Animation/Frame.cs
@@ -19,9 +19,25 @@ public class Frame
 
         private struct FrameBoneRotation
         {
-            public FrameBoneRotation(int x, int y, int z, int w)
+            public FrameBoneRotation(GameType game, int x, int y, int z, int w)
             {
-                this.rotation = new Quaternion(x / 32767f, y / 32767f, z / 32767f, w / 32767f);
+                if (game.num == 4)
+                {
+                    this.rotation = new Quaternion(ParseDlFloat(x), ParseDlFloat(y), ParseDlFloat(z), -ParseDlFloat(w));
+                }
+                else
+                {
+                    this.rotation = new Quaternion(x / 32767f, y / 32767f, z / 32767f, -w / 32767f);
+                }
+            }
+
+            private float ParseDlFloat(int v)
+            {
+                int vpos = v & 0x7fff;
+                if (v < 0)
+                    return vpos / -32767f;
+
+                return vpos / 32767f;
             }
 
             public Quaternion rotation;
@@ -115,7 +131,9 @@ public bool GetScalingUnk(int bone)
 
             if (exists)
             {
-                return translations.First(t => t.bone == bone).translation;
+                // dl can have multiple translations per bone
+                // doesn't seem to break the other rac games
+                return translations.Where(t => t.bone == bone).Select(x => x.translation).Aggregate((a, b) => a + b);
             }
 
             return null;
@@ -210,7 +228,7 @@ public Frame(FileStream fs, GameType game, int offset, int boneCount)
                 int y = ReadShort(frameBlock, i * 8 + 0x02);
                 int z = ReadShort(frameBlock, i * 8 + 0x04);
                 int w = ReadShort(frameBlock, i * 8 + 0x06);
-                rotations.Add(new FrameBoneRotation(x, y, z, -w));
+                rotations.Add(new FrameBoneRotation(game, x, y, z, w));
             }
 
             scalings = new List<FrameBoneScaling>();
@@ -249,13 +267,6 @@ public Frame(FileStream fs, GameType game, int offset, int boneCount)
         // Constructor for Deadlocked
         public Frame(byte[] frameBlock, int offset, int numRotations, int numScalings, int numTranslations)
         {
-            // This code is not correct and is causing crashes.
-            // TODO: (Milch) Implement support for Deadlocked animations.
-#if true
-            rotations = new List<FrameBoneRotation>();
-            scalings = new List<FrameBoneScaling>();
-            translations = new List<FrameBoneTranslation>();
-#else
             int rotationOffset = 0;
             rotations = new List<FrameBoneRotation>();
             for (int i = 0; i < numRotations; i++)
@@ -265,16 +276,16 @@ public Frame(byte[] frameBlock, int offset, int numRotations, int numScalings, i
                 int y = ReadShort(frameBlock, offset + i * 8 + 0x02);
                 int z = ReadShort(frameBlock, offset + i * 8 + 0x04);
                 int w = ReadShort(frameBlock, offset + i * 8 + 0x06);
-                rotations.Add(new FrameBoneRotation(x, y, z, -w));
+                rotations.Add(new FrameBoneRotation(GameType.DL, x, y, z, w));
             }
 
             int scalingOffset = rotationOffset + numRotations * 0x08;
             scalings = new List<FrameBoneScaling>();
             for (int i = 0; i < numScalings; i++)
             {
-                float x = ReadShort(frameBlock, offset + scalingOffset + i * 8 + 0x00) / 32767.0f;
-                float y = ReadShort(frameBlock, offset + scalingOffset + i * 8 + 0x02) / 32767.0f;
-                float z = ReadShort(frameBlock, offset + scalingOffset + i * 8 + 0x04) / 32767.0f;
+                float x = ReadShort(frameBlock, offset + scalingOffset + i * 8 + 0x00) / 4096.0f;
+                float y = ReadShort(frameBlock, offset + scalingOffset + i * 8 + 0x02) / 4096.0f;
+                float z = ReadShort(frameBlock, offset + scalingOffset + i * 8 + 0x04) / 4096.0f;
                 byte unk = frameBlock[offset + scalingOffset + i * 8 + 0x06];
                 byte bone = frameBlock[offset + scalingOffset + i * 8 + 0x07];
                 scalings.Add(new FrameBoneScaling(x, y, z, bone, unk));
@@ -284,14 +295,13 @@ public Frame(byte[] frameBlock, int offset, int numRotations, int numScalings, i
             translations = new List<FrameBoneTranslation>();
             for (int i = 0; i < numTranslations; i++)
             {
-                float x = ReadShort(frameBlock, offset + translationOffset + i * 8 + 0x00) / 32767.0f;
-                float y = ReadShort(frameBlock, offset + translationOffset + i * 8 + 0x02) / 32767.0f;
-                float z = ReadShort(frameBlock, offset + translationOffset + i * 8 + 0x04) / 32767.0f;
+                float x = ReadShort(frameBlock, offset + translationOffset + i * 8 + 0x00) / 1024.0f;
+                float y = ReadShort(frameBlock, offset + translationOffset + i * 8 + 0x02) / 1024.0f;
+                float z = ReadShort(frameBlock, offset + translationOffset + i * 8 + 0x04) / 1024.0f;
                 byte unk = frameBlock[offset + translationOffset + i * 8 + 0x06];
                 byte bone = frameBlock[offset + translationOffset + i * 8 + 0x07];
                 translations.Add(new FrameBoneTranslation(x, y, z, bone, unk));
             }
-#endif
         }
 
         public byte[] Serialize()
diff --git a/LibReplanetizer/Models/MobyModel.cs b/LibReplanetizer/Models/MobyModel.cs
@@ -180,6 +180,17 @@ public MobyModel(FileStream fs, GameType game, short modelID, int offset)
             color2 = ReadUint(headBlock, 0x40);
             unk6 = ReadUint(headBlock, 0x44);
 
+            // dynamically determine skeleton format
+            // since rc4 actually has some rc3 models in it
+            var skeletonGame = game;
+            if (boneDataPointer > 0 && boneMatrixPointer > 0 && boneCount > 0)
+            {
+                if (((boneDataPointer - boneMatrixPointer) / boneCount) == 0x30)
+                    skeletonGame = GameType.DL;
+                else
+                    skeletonGame = GameType.RaC3;
+            }
+
             // Animation block
             byte[] animationPointerBlock = ReadBlock(fs, offset + HEADERSIZE, animationCount * 0x04);
 
@@ -224,7 +235,7 @@ public MobyModel(FileStream fs, GameType game, short modelID, int offset)
                 byte[] boneMatrixBlock = ReadBlock(fs, offset + boneMatrixPointer, boneCount * 0x40);
                 for (int i = 0; i < boneCount; i++)
                 {
-                    boneMatrices.Add(new BoneMatrix(game, boneMatrixBlock, i));
+                    boneMatrices.Add(new BoneMatrix(skeletonGame, boneMatrixBlock, i));
                 }
             }
 
@@ -236,7 +247,7 @@ public MobyModel(FileStream fs, GameType game, short modelID, int offset)
                 byte[] boneDataBlock = ReadBlock(fs, offset + boneDataPointer, boneCount * 0x10);
                 for (int i = 0; i < boneCount; i++)
                 {
-                    boneDatas.Add(new BoneData(game, boneDataBlock, i));
+                    boneDatas.Add(new BoneData(skeletonGame, boneDataBlock, i));
                 }
             }
 
diff --git a/Replanetizer/Frames/ModelFrame.cs b/Replanetizer/Frames/ModelFrame.cs
@@ -384,8 +384,7 @@ public override void Render(float deltaTime)
                     // Collada specific settings
                     if (exportSettings.format == ExporterModelSettings.Format.Collada)
                     {
-                        // TODO: (Milch) Enable animations for Deadlocked once they are implemented.
-                        if (level.game != GameType.DL && selectedModel is MobyModel mobyModel && mobyModel.animations.Count > 0)
+                        if (selectedModel is MobyModel mobyModel && mobyModel.animations.Count > 0)
                         {
                             int animationChoice = (int) exportSettings.animationChoice;
                             if (ImGui.Combo("Animations", ref animationChoice, ExporterModelSettings.ANIMATION_CHOICE_STRINGS, ExporterModelSettings.ANIMATION_CHOICE_STRINGS.Length - 1))
@@ -432,8 +431,7 @@ public override void Render(float deltaTime)
                     // glTF specific settings
                     if (exportSettings.format == ExporterModelSettings.Format.glTF)
                     {
-                        // TODO: (Milch) Enable animations for Deadlocked once they are implemented.
-                        if (level.game != GameType.DL && selectedModel is MobyModel mobyModel && mobyModel.animations.Count > 0)
+                        if (selectedModel is MobyModel mobyModel && mobyModel.animations.Count > 0)
                         {
                             bool includeAnimations = (exportSettings.animationChoice != ExporterModelSettings.AnimationChoice.None);
 
@@ -483,8 +481,7 @@ public override void Render(float deltaTime)
 
                 ImGui.Separator();
 
-                // TODO: (Milch) Enable animations for Deadlocked once they are implemented.
-                if (level.game != GameType.DL && selectedModel is MobyModel mobModel && mobModel.animations.Count > 0)
+                if (selectedModel is MobyModel mobModel && mobModel.animations.Count > 0)
                 {
                     ImGui.Checkbox("Show Animations", ref rendererPayload.visibility.enableAnimations);
 

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,10 @@ private void GetDLVals(FileStream fs, GameType game, int modelOffset, int animat`
`109`	`109`	`unk7 = header[0x13];`
`110`	`110`
`111`	`111`	`int offsetSound = ReadInt(header, 0x14);`
`112`		`- int offsetUnk = ReadInt(header, 0x18);`
	`112`	`+ int offsetAnimInfo = ReadInt(header, 0x18);`
`113`	`113`	`int offsetFrameHeader = ReadInt(header, 0x1C);`
`114`	`114`
`115`		`- byte[] unkBytes = ReadBlock(fs, modelOffset + animationOffset + offsetUnk, offsetFrameHeader - offsetUnk);`
	`115`	`+ byte[] animInfoBytes = ReadBlock(fs, modelOffset + animationOffset + offsetAnimInfo, offsetFrameHeader - offsetAnimInfo);`
`116`	`116`
`117`	`117`	`byte[] frameHeaderBlock = ReadBlock(fs, modelOffset + animationOffset + offsetFrameHeader, 0x10);`
`118`	`118`
`@@ -135,6 +135,9 @@ private void GetDLVals(FileStream fs, GameType game, int modelOffset, int animat`
`135`	`135`	`{`
`136`	`136`	`sounds.Add(ReadInt(extrasBlock, i * 4));`
`137`	`137`	`}`
	`138`	`+`
	`139`	`+ // speed is not stored in anim header`
	`140`	`+ speed = 1;`
`138`	`141`	`}`
`139`	`142`
`140`	`143`	`public byte[] Serialize(int baseOffset = 0, int fileOffset = 0)`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,9 @@ private void GetDLVals(byte[] boneDataBlock, int num)`
`58`	`58`	`unk0x0C = ReadShort(boneDataBlock, offset + 0x0C);`
`59`	`59`	`parent = ReadShort(boneDataBlock, offset + 0x0E);`
`60`	`60`
`61`		`- if (parent == 0xFF)`
	`61`	`+ if (parent == 0xFF \|\| parent == 0x7F)`
`62`	`62`	`{`
`63`		`- // The root node is always marked with 0xFF.`
	`63`	`+ // The root node is always marked with 0xFF/0x7F.`
`64`	`64`	`parent = 0;`
`65`	`65`	`}`
`66`	`66`	`else`
Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,17 @@ public MobyModel(FileStream fs, GameType game, short modelID, int offset)`
`180`	`180`	`color2 = ReadUint(headBlock, 0x40);`
`181`	`181`	`unk6 = ReadUint(headBlock, 0x44);`
`182`	`182`
	`183`	`+ // dynamically determine skeleton format`
	`184`	`+ // since rc4 actually has some rc3 models in it`
	`185`	`+ var skeletonGame = game;`
	`186`	`+ if (boneDataPointer > 0 && boneMatrixPointer > 0 && boneCount > 0)`
	`187`	`+ {`
	`188`	`+ if (((boneDataPointer - boneMatrixPointer) / boneCount) == 0x30)`
	`189`	`+ skeletonGame = GameType.DL;`
	`190`	`+ else`
	`191`	`+ skeletonGame = GameType.RaC3;`
	`192`	`+ }`
	`193`	`+`
`183`	`194`	`// Animation block`
`184`	`195`	`byte[] animationPointerBlock = ReadBlock(fs, offset + HEADERSIZE, animationCount * 0x04);`
`185`	`196`
`@@ -224,7 +235,7 @@ public MobyModel(FileStream fs, GameType game, short modelID, int offset)`
`224`	`235`	`byte[] boneMatrixBlock = ReadBlock(fs, offset + boneMatrixPointer, boneCount * 0x40);`
`225`	`236`	`for (int i = 0; i < boneCount; i++)`
`226`	`237`	`{`
`227`		`- boneMatrices.Add(new BoneMatrix(game, boneMatrixBlock, i));`
	`238`	`+ boneMatrices.Add(new BoneMatrix(skeletonGame, boneMatrixBlock, i));`
`228`	`239`	`}`
`229`	`240`	`}`
`230`	`241`
`@@ -236,7 +247,7 @@ public MobyModel(FileStream fs, GameType game, short modelID, int offset)`
`236`	`247`	`byte[] boneDataBlock = ReadBlock(fs, offset + boneDataPointer, boneCount * 0x10);`
`237`	`248`	`for (int i = 0; i < boneCount; i++)`
`238`	`249`	`{`
`239`		`- boneDatas.Add(new BoneData(game, boneDataBlock, i));`
	`250`	`+ boneDatas.Add(new BoneData(skeletonGame, boneDataBlock, i));`
`240`	`251`	`}`
`241`	`252`	`}`
`242`	`253`
Original file line number	Diff line number	Diff line change
`@@ -384,8 +384,7 @@ public override void Render(float deltaTime)`
`384`	`384`	`// Collada specific settings`
`385`	`385`	`if (exportSettings.format == ExporterModelSettings.Format.Collada)`
`386`	`386`	`{`
`387`		`- // TODO: (Milch) Enable animations for Deadlocked once they are implemented.`
`388`		`- if (level.game != GameType.DL && selectedModel is MobyModel mobyModel && mobyModel.animations.Count > 0)`
	`387`	`+ if (selectedModel is MobyModel mobyModel && mobyModel.animations.Count > 0)`
`389`	`388`	`{`
`390`	`389`	`int animationChoice = (int) exportSettings.animationChoice;`
`391`	`390`	`if (ImGui.Combo("Animations", ref animationChoice, ExporterModelSettings.ANIMATION_CHOICE_STRINGS, ExporterModelSettings.ANIMATION_CHOICE_STRINGS.Length - 1))`
`@@ -432,8 +431,7 @@ public override void Render(float deltaTime)`
`432`	`431`	`// glTF specific settings`
`433`	`432`	`if (exportSettings.format == ExporterModelSettings.Format.glTF)`
`434`	`433`	`{`
`435`		`- // TODO: (Milch) Enable animations for Deadlocked once they are implemented.`
`436`		`- if (level.game != GameType.DL && selectedModel is MobyModel mobyModel && mobyModel.animations.Count > 0)`
	`434`	`+ if (selectedModel is MobyModel mobyModel && mobyModel.animations.Count > 0)`
`437`	`435`	`{`
`438`	`436`	`bool includeAnimations = (exportSettings.animationChoice != ExporterModelSettings.AnimationChoice.None);`
`439`	`437`
`@@ -483,8 +481,7 @@ public override void Render(float deltaTime)`
`483`	`481`
`484`	`482`	`ImGui.Separator();`
`485`	`483`
`486`		`- // TODO: (Milch) Enable animations for Deadlocked once they are implemented.`
`487`		`- if (level.game != GameType.DL && selectedModel is MobyModel mobModel && mobModel.animations.Count > 0)`
	`484`	`+ if (selectedModel is MobyModel mobModel && mobModel.animations.Count > 0)`
`488`	`485`	`{`
`489`	`486`	`ImGui.Checkbox("Show Animations", ref rendererPayload.visibility.enableAnimations);`
`490`	`487`