Преглед изворни кода

Add MM tiddy deserialization

Also move the mune settings outside of MPS pose deserialization.
habeebweeb пре 4 година
родитељ
комит
7c3b8817c8

+ 6 - 4
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/Meido.cs

@@ -517,11 +517,13 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 int poseBufferLength = binaryReader.ReadInt32();
                 byte[] poseBuffer = binaryReader.ReadBytes(poseBufferLength);
                 GetCacheBoneData().SetFrameBinary(poseBuffer);
-                Body.MuneYureL(0f);
-                Body.MuneYureR(0f);
-                Body.jbMuneL.enabled = false;
-                Body.jbMuneR.enabled = false;
             }
+
+            Body.MuneYureL(0f);
+            Body.MuneYureR(0f);
+            Body.jbMuneL.enabled = false;
+            Body.jbMuneR.enabled = false;
+
             CachedPose = PoseInfo.Deserialize(binaryReader);
             // eye direction
             Body.quaDefEyeL = binaryReader.ReadQuaternion() * DefaultEyeRotL;

+ 4 - 3
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/MeidoDragPointManager.cs

@@ -144,9 +144,10 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             Bone[] bones = {
                 Bone.Hip, Bone.Pelvis, Bone.Spine, Bone.Spine0a, Bone.Spine1, Bone.Spine1a, Bone.Neck,
                 Bone.ClavicleL, Bone.ClavicleR, Bone.UpperArmL, Bone.UpperArmR, Bone.ForearmL, Bone.ForearmR,
-                Bone.ThighL, Bone.ThighR, Bone.CalfL, Bone.CalfR, Bone.HandL, Bone.HandR, Bone.FootL, Bone.FootR
+                Bone.ThighL, Bone.ThighR, Bone.CalfL, Bone.CalfR, Bone.MuneL, Bone.MuneR, Bone.MuneSubL, Bone.MuneSubR,
+                Bone.HandL, Bone.HandR, Bone.FootL, Bone.FootR
             };
-            int handIndex = Array.IndexOf(bones, Bone.CalfR);
+            int localRotationIndex = Array.IndexOf(bones, Bone.CalfR);
             for (Bone bone = Bone.Finger0L; bone <= Bone.Toe2NubR; ++bone)
             {
                 BoneTransform[bone].localRotation = binaryReader.ReadQuaternion();
@@ -155,7 +156,7 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             {
                 Bone bone = bones[i];
                 Quaternion rotation = binaryReader.ReadQuaternion();
-                if (i > handIndex) BoneTransform[bone].localRotation = rotation;
+                if (i > localRotationIndex) BoneTransform[bone].localRotation = rotation;
                 else BoneTransform[bone].rotation = rotation;
             }
             BoneTransform[Bone.Hip].position = binaryReader.ReadVector3();