Browse Source

Impose soft 120 column limit and other style stuff

Methods that exceed column limit should look something like this
    Method(
        parameter1, parameter2
    )
    {
        // stuff
    }

Method calls should follow this structure
    Method(
        parameter1, parameter2
    );

The main thing to note is that the end parenthesis should be on its own
line
habeebweeb 4 years ago
parent
commit
35cf6a5ea7
19 changed files with 175 additions and 63 deletions
  1. 15 9
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Constants.cs
  2. 9 2
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Controls/DropDown.cs
  3. 3 1
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Controls/Slider.cs
  4. 7 2
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Panes/CallWindowPanes/MaidSelectorPane.cs
  5. 6 1
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Panes/MaidSwitcherPane.cs
  6. 3 1
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Windows/MainWindows/MaidFaceWindow.cs
  7. 20 8
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/DragPointManager.cs
  8. 2 1
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/EnvironmentManager.cs
  9. 5 3
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/MessageWindowManager.cs
  10. 21 5
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/WindowManager.cs
  11. 19 6
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragBody.cs
  12. 8 3
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragHead.cs
  13. 17 6
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragJointFinger.cs
  14. 9 3
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragJointForearm.cs
  15. 10 3
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragJointHand.cs
  16. 6 3
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragMune.cs
  17. 4 1
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragSpine.cs
  18. 6 3
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/MeidoPhotoStudio.cs
  19. 5 2
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Utility.cs

+ 15 - 9
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Constants.cs

@@ -40,7 +40,10 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             customPosePath = Path.Combine(modsPath, "Custom Poses");
             scenesPath = Path.Combine(modsPath, "Scenes");
             kankyoPath = Path.Combine(modsPath, "Environments");
-            configPath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), @"Config\MeidoPhotoStudio");
+            configPath = Path.Combine(
+                Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
+                @"Config\MeidoPhotoStudio"
+            );
 
             PoseDict = new Dictionary<string, List<string>>();
             PoseGroupList = new List<string>();
@@ -96,13 +99,14 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                             {
                                 editPoseList.Add(file);
                             }
-                            else if (file != "dance_cm3d2_001_zoukin" && file != "dance_cm3d2_001_mop" && file != "aruki_1_idougo_f"
-                                && file != "sleep2" && file != "stand_akire2" && !file.EndsWith("_3_") && !file.EndsWith("_5_")
-                                && !file.StartsWith("vr_") && !file.StartsWith("dance_mc") && !file.Contains("_kubi_")
-                                && !file.Contains("a01_") && !file.Contains("b01_") && !file.Contains("b02_")
-                                && !file.EndsWith("_m2") && !file.EndsWith("_m2_once_") && !file.StartsWith("h_")
-                                && !file.StartsWith("event_") && !file.StartsWith("man_") && !file.EndsWith("_m")
-                                && !file.Contains("_m_") && !file.Contains("_man_")
+                            else if (file != "dance_cm3d2_001_zoukin" && file != "dance_cm3d2_001_mop"
+                                && file != "aruki_1_idougo_f" && file != "sleep2" && file != "stand_akire2"
+                                && !file.EndsWith("_3_") && !file.EndsWith("_5_") && !file.StartsWith("vr_")
+                                && !file.StartsWith("dance_mc") && !file.Contains("_kubi_") && !file.Contains("a01_")
+                                && !file.Contains("b01_") && !file.Contains("b02_") && !file.EndsWith("_m2")
+                                && !file.EndsWith("_m2_once_") && !file.StartsWith("h_") && !file.StartsWith("event_")
+                                && !file.StartsWith("man_") && !file.EndsWith("_m") && !file.Contains("_m_")
+                                && !file.Contains("_man_")
                             )
                             {
                                 if (!path.Contains(@"\sex\")) otherPoseList.Add(file);
@@ -233,7 +237,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
             JObject translation = JObject.Parse(translationJson);
 
-            Translations = new Dictionary<string, Dictionary<string, string>>(StringComparer.InvariantCultureIgnoreCase);
+            Translations = new Dictionary<string, Dictionary<string, string>>(
+                StringComparer.InvariantCultureIgnoreCase
+            );
 
             foreach (JProperty translationProp in translation.AsJEnumerable())
             {

+ 9 - 2
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Controls/DropDown.cs

@@ -256,8 +256,15 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             dropdownStyle.margin = new RectOffset(0, 0, 0, 0);
             dropdownStyle.padding.top = dropdownStyle.padding.bottom = 2;
             dropdownStyle.normal.background = Utility.MakeTex(2, 2, new Color(0f, 0f, 0f, 0.5f));
-            dropdownStyle.onHover.background = dropdownStyle.hover.background = dropdownStyle.onNormal.background = new Texture2D(2, 2);
-            dropdownStyle.onHover.textColor = dropdownStyle.onNormal.textColor = dropdownStyle.hover.textColor = Color.black;
+            Texture2D whiteBackground = new Texture2D(2, 2);
+            dropdownStyle.onHover.background
+                = dropdownStyle.hover.background
+                = dropdownStyle.onNormal.background
+                = whiteBackground;
+            dropdownStyle.onHover.textColor
+                = dropdownStyle.onNormal.textColor
+                = dropdownStyle.hover.textColor
+                = Color.black;
 
             windowStyle = new GUIStyle(GUI.skin.box);
             windowStyle.padding = new RectOffset(0, 0, 0, 0);

+ 3 - 1
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Controls/Slider.cs

@@ -79,7 +79,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 GUILayout.Label(Label, sliderLabelStyle, GUILayout.ExpandWidth(false));
             }
             else sliderStyle.margin.top = 10;
-            float value = GUILayout.HorizontalSlider(Value, Left, Right, sliderStyle, GUI.skin.horizontalSliderThumb, layoutOptions);
+            float value = GUILayout.HorizontalSlider(
+                Value, Left, Right, sliderStyle, GUI.skin.horizontalSliderThumb, layoutOptions
+            );
             if (hasLabel) GUILayout.EndVertical();
             if (value != Value) Value = value;
         }

+ 7 - 2
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Panes/CallWindowPanes/MaidSelectorPane.cs

@@ -60,11 +60,16 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 {
                     int selectedIndex = selectedMaidList.IndexOf(i) + 1;
                     GUI.DrawTexture(new Rect(5, y + 5, buttonWidth - 10, buttonHeight - 10), Texture2D.whiteTexture);
-                    GUI.Label(new Rect(0, y + 5, buttonWidth - 10, buttonHeight), selectedIndex.ToString(), selectLabelStyle);
+                    GUI.Label(
+                        new Rect(0, y + 5, buttonWidth - 10, buttonHeight), selectedIndex.ToString(), selectLabelStyle
+                    );
                 }
 
                 GUI.DrawTexture(new Rect(5, y, buttonHeight, buttonHeight), meido.Image);
-                GUI.Label(new Rect(95, y + 30, buttonWidth - 80, buttonHeight), meido.NameJP, selectedMaid ? labelSelectedStyle : labelStyle);
+                GUI.Label(
+                    new Rect(95, y + 30, buttonWidth - 80, buttonHeight),
+                    meido.NameJP, selectedMaid ? labelSelectedStyle : labelStyle
+                );
 
             }
             GUI.EndScrollView();

+ 6 - 1
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Panes/MaidSwitcherPane.cs

@@ -41,7 +41,12 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
             GUILayout.BeginVertical();
             GUILayout.Space(30);
-            GUILayout.Label(meidoManager.HasActiveMeido ? meidoManager.ActiveMeido.NameJP : "", labelStyle, GUILayout.ExpandWidth(false));
+            GUILayout.Label(
+                meidoManager.HasActiveMeido
+                    ? meidoManager.ActiveMeido.NameJP
+                    : "",
+                labelStyle, GUILayout.ExpandWidth(false)
+            );
             GUILayout.EndVertical();
 
             NextButton.Draw(buttonStyle, GUILayout.Height(40), GUILayout.ExpandWidth(false));

+ 3 - 1
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/GUI/Windows/MainWindows/MaidFaceWindow.cs

@@ -23,7 +23,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
             this.maidFaceSliderPane = new MaidFaceSliderPane(this.meidoManager);
 
-            this.faceBlendDropdown = new Dropdown(Translation.GetList("faceBlendPresetsDropdown", Constants.FaceBlendList));
+            this.faceBlendDropdown = new Dropdown(
+                Translation.GetList("faceBlendPresetsDropdown", Constants.FaceBlendList)
+            );
             this.faceBlendDropdown.SelectionChange += (s, a) =>
             {
                 string faceBlend = Constants.FaceBlendList[this.faceBlendDropdown.SelectedItemIndex];

+ 20 - 8
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/DragPointManager.cs

@@ -113,8 +113,10 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             },
             [IKMode.BodyTransform] = new[] { DragInfo.Drag(Bone.Body), DragInfo.Drag(Bone.Cube) },
             [IKMode.BodySelect] = new[] { DragInfo.Drag(Bone.Head), DragInfo.Drag(Bone.Body) },
-            [IKMode.FingerRotLocalXZ] = IKGroup[IKMode.FingerRotLocalXZ].Select(bone => DragInfo.DragBone(bone)).ToArray(),
-            [IKMode.FingerRotLocalY] = IKGroup[IKMode.FingerRotLocalY].Select(bone => DragInfo.DragBone(bone)).ToArray()
+            [IKMode.FingerRotLocalXZ] = IKGroup[IKMode.FingerRotLocalXZ]
+                .Select(bone => DragInfo.DragBone(bone)).ToArray(),
+            [IKMode.FingerRotLocalY] = IKGroup[IKMode.FingerRotLocalY]
+                .Select(bone => DragInfo.DragBone(bone)).ToArray()
         };
         private Meido meido;
         private Maid maid;
@@ -333,7 +335,8 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 return dragPoint;
             };
 
-            Func<Transform[], Transform[], Transform[], bool, BaseDrag[]> MakeIKChainDragPoint = (upper, middle, lower, leg) =>
+            Func<Transform[], Transform[], Transform[], bool, BaseDrag[]> MakeIKChainDragPoint =
+                (upper, middle, lower, leg) =>
             {
                 GameObject[] dragPoints = new GameObject[3];
                 for (int i = 0; i < dragPoints.Length; i++)
@@ -390,13 +393,19 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                     (BoneTransform[Bone.Head].position.y * 1.2f + BoneTransform[Bone.HeadNub].position.y * 0.8f) / 2f,
                     BoneTransform[Bone.Head].position.z
                 ),
-                () => new Vector3(BoneTransform[Bone.Head].eulerAngles.x, BoneTransform[Bone.Head].eulerAngles.y, BoneTransform[Bone.Head].eulerAngles.z + 90f)
+                () => new Vector3(
+                    BoneTransform[Bone.Head].eulerAngles.x,
+                    BoneTransform[Bone.Head].eulerAngles.y,
+                    BoneTransform[Bone.Head].eulerAngles.z + 90f
+
+                )
             );
             DragHead dragHead = DragPoint[Bone.Head] as DragHead;
             dragHead.Select += (s, a) => OnMeidoSelect(new MeidoChangeEventArgs(meido.ActiveSlot, true, false));
 
             // Torso Dragpoint
-            DragPoint[Bone.Torso] = MakeDragPoint(PrimitiveType.Capsule, new Vector3(0.2f, 0.19f, 0.24f), transparentBlue)
+            DragPoint[Bone.Torso] =
+                MakeDragPoint(PrimitiveType.Capsule, new Vector3(0.2f, 0.19f, 0.24f), transparentBlue)
                 .AddComponent<DragTorso>();
             Transform spineTrans1 = BoneTransform[Bone.Spine1];
             Transform spineTrans2 = BoneTransform[Bone.Spine1a];
@@ -421,7 +430,8 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             );
 
             // Pelvis Dragpoint
-            DragPoint[Bone.Pelvis] = MakeDragPoint(PrimitiveType.Capsule, new Vector3(0.2f, 0.15f, 0.24f), transparentBlue)
+            DragPoint[Bone.Pelvis] =
+                MakeDragPoint(PrimitiveType.Capsule, new Vector3(0.2f, 0.15f, 0.24f), transparentBlue)
                 .AddComponent<DragPelvis>();
             Transform pelvisTrans = BoneTransform[Bone.Pelvis];
             Transform spineTrans = BoneTransform[Bone.Spine];
@@ -440,7 +450,8 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             );
 
             // Left Mune Dragpoint
-            DragPoint[Bone.MuneL] = MakeDragPoint(PrimitiveType.Sphere, new Vector3(0.12f, 0.12f, 0.12f), transparentBlue)
+            DragPoint[Bone.MuneL] =
+                MakeDragPoint(PrimitiveType.Sphere, new Vector3(0.12f, 0.12f, 0.12f), transparentBlue)
                 .AddComponent<DragMune>();
             Transform[] muneIKChainL = new Transform[3] {
                 BoneTransform[Bone.MuneL],
@@ -454,7 +465,8 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             );
 
             // Right Mune Dragpoint
-            DragPoint[Bone.MuneR] = MakeDragPoint(PrimitiveType.Sphere, new Vector3(0.12f, 0.12f, 0.12f), transparentBlue)
+            DragPoint[Bone.MuneR] =
+                MakeDragPoint(PrimitiveType.Sphere, new Vector3(0.12f, 0.12f, 0.12f), transparentBlue)
                 .AddComponent<DragMune>();
             Transform[] muneIKChainR = new Transform[3] {
                 BoneTransform[Bone.MuneR],

+ 2 - 1
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/EnvironmentManager.cs

@@ -40,7 +40,8 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             GameMain.Instance.BgMgr.ChangeBg("Theater");
 
             GameMain.Instance.MainCamera.GetComponent<Camera>().backgroundColor = new Color(0.0f, 0.0f, 0.0f);
-            UltimateOrbitCamera UOCamera = Utility.GetFieldValue<CameraMain, UltimateOrbitCamera>(GameMain.Instance.MainCamera, "m_UOCamera");
+            UltimateOrbitCamera UOCamera =
+                Utility.GetFieldValue<CameraMain, UltimateOrbitCamera>(GameMain.Instance.MainCamera, "m_UOCamera");
             UOCamera.enabled = true;
 
             GameMain.Instance.MainLight.Reset();

+ 5 - 3
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/MessageWindowManager.cs

@@ -16,9 +16,11 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             sysRoot = GameObject.Find("__GameMain__/SystemUI Root");
             this.msgWnd = GameMain.Instance.MsgWnd;
             this.msgGameObject = sysRoot.transform.Find("MessageWindowPanel").gameObject;
-            this.msgClass = new MessageClass(this.msgGameObject, this.msgWnd);// new MessageClass(this.msgGameObject, this.msgWnd);
-            this.nameLabel = UTY.GetChildObject(this.msgGameObject, "MessageViewer/MsgParent/SpeakerName/Name", false).GetComponent<UILabel>();
-            this.msgLabel = UTY.GetChildObject(this.msgGameObject, "MessageViewer/MsgParent/Message", false).GetComponent<UILabel>();
+            this.msgClass = new MessageClass(this.msgGameObject, this.msgWnd);
+            this.nameLabel = UTY.GetChildObject(this.msgGameObject, "MessageViewer/MsgParent/SpeakerName/Name", false)
+                .GetComponent<UILabel>();
+            this.msgLabel = UTY.GetChildObject(this.msgGameObject, "MessageViewer/MsgParent/Message", false)
+                .GetComponent<UILabel>();
             Utility.SetFieldValue<MessageClass, UILabel>(this.msgClass, "message_label_", this.msgLabel);
             Utility.SetFieldValue<MessageClass, UILabel>(this.msgClass, "name_label_", this.nameLabel);
             SetPhotoMessageWindowActive(true);

+ 21 - 5
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/WindowManager.cs

@@ -40,7 +40,11 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 DropdownHelper.Visible = value;
             }
         }
-        public WindowManager(MeidoManager meidoManager, EnvironmentManager environmentManager, MessageWindowManager messageWindowManager)
+        public WindowManager(
+            MeidoManager meidoManager,
+            EnvironmentManager environmentManager,
+            MessageWindowManager messageWindowManager
+        )
         {
             TabsPane.TabChange += ChangeTab;
             this.meidoManager = meidoManager;
@@ -127,7 +131,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 mainWindowRect.x = Mathf.Clamp(mainWindowRect.x, 0, Screen.width - mainWindowRect.width);
                 mainWindowRect.y = Mathf.Clamp(mainWindowRect.y, -mainWindowRect.height + 30, Screen.height - 50);
 
-                mainWindowRect = GUI.Window(Constants.mainWindowID, mainWindowRect, Windows[CurrentWindow].OnGUI, "", windowStyle);
+                mainWindowRect = GUI.Window(
+                    Constants.mainWindowID, mainWindowRect, Windows[CurrentWindow].OnGUI, "", windowStyle
+                );
             }
 
             if (MessageWindowVisible)
@@ -135,8 +141,16 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 messageWindowRect.width = Mathf.Clamp(Screen.width * 0.4f, 440, Mathf.Infinity);
                 messageWindowRect.height = Mathf.Clamp(Screen.height * 0.15f, 150, Mathf.Infinity);
 
-                messageWindowRect.x = Mathf.Clamp(messageWindowRect.x, -messageWindowRect.width + Utility.GetPix(20), Screen.width - Utility.GetPix(20));
-                messageWindowRect.y = Mathf.Clamp(messageWindowRect.y, -messageWindowRect.height + Utility.GetPix(20), Screen.height - Utility.GetPix(20));
+                messageWindowRect.x = Mathf.Clamp(
+                    messageWindowRect.x,
+                    -messageWindowRect.width + Utility.GetPix(20),
+                    Screen.width - Utility.GetPix(20)
+                );
+                messageWindowRect.y = Mathf.Clamp(
+                    messageWindowRect.y,
+                    -messageWindowRect.height + Utility.GetPix(20),
+                    Screen.height - Utility.GetPix(20)
+                );
 
                 if (!initializeWindows)
                 {
@@ -145,7 +159,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                     initializeWindows = true;
                 }
 
-                messageWindowRect = GUI.Window(Constants.messageWindowID, messageWindowRect, Windows[Window.Message].OnGUI, "", windowStyle);
+                messageWindowRect = GUI.Window(
+                    Constants.messageWindowID, messageWindowRect, Windows[Window.Message].OnGUI, "", windowStyle
+                );
             }
 
             if (DropdownVisible) DropdownHelper.HandleDropdown();

+ 19 - 6
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragBody.cs

@@ -51,7 +51,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
             maidScale = maid.transform.localScale.x;
             maidRot = maid.transform.localEulerAngles;
-            off = transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z));
+            off = transform.position - Camera.main.ScreenToWorldPoint(
+                new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)
+            );
             off2 = new Vector3(
                 transform.position.x - maid.transform.position.x,
                 transform.position.y - maid.transform.position.y,
@@ -83,7 +85,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
         protected override void Drag()
         {
-            Vector3 pos = Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)) + off - off2;
+            Vector3 pos = Camera.main.ScreenToWorldPoint(
+                new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)
+            ) + off - off2;
 
             if (dragType == DragType.MoveXZ)
             {
@@ -98,8 +102,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             if (dragType == DragType.RotY)
             {
                 Vector3 posOther = Input.mousePosition - mousePos;
-                maid.transform.eulerAngles =
-                    new Vector3(maid.transform.eulerAngles.x, maidRot.y - posOther.x / 3f, maid.transform.eulerAngles.z);
+                maid.transform.eulerAngles = new Vector3(
+                    maid.transform.eulerAngles.x, maidRot.y - posOther.x / 3f, maid.transform.eulerAngles.z
+                );
 
             }
 
@@ -113,8 +118,16 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 if (mousePos2 != Input.mousePosition)
                 {
                     maid.transform.localEulerAngles = maidRot;
-                    maid.transform.RotateAround(maid.transform.position, new Vector3(vector3_3.x, 0.0f, vector3_3.z), posOther.y / 4f);
-                    maid.transform.RotateAround(maid.transform.position, new Vector3(vector3_4.x, 0.0f, vector3_4.z), (-posOther.x / 6.0f));
+                    maid.transform.RotateAround(
+                        maid.transform.position,
+                        new Vector3(vector3_3.x, 0.0f, vector3_3.z),
+                        posOther.y / 4f
+                    );
+                    maid.transform.RotateAround(
+                        maid.transform.position,
+                        new Vector3(vector3_4.x, 0.0f, vector3_4.z),
+                        -posOther.x / 6.0f
+                    );
                 }
                 mousePos2 = Input.mousePosition;
             }

+ 8 - 3
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragHead.cs

@@ -106,7 +106,8 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             if (dragType == DragType.RotLocalY)
             {
                 head.localEulerAngles = rotate;
-                head.localRotation = Quaternion.Euler(head.localEulerAngles) * Quaternion.AngleAxis(vec31.x / 3f, Vector3.right);
+                head.localRotation = Quaternion.Euler(head.localEulerAngles)
+                    * Quaternion.AngleAxis(vec31.x / 3f, Vector3.right);
             }
 
             if (dragType == DragType.MoveXZ || dragType == DragType.MoveY)
@@ -117,8 +118,12 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 mousePosOther.y = vec31.y;
                 mousePosOther.x = vec31.x;
 
-                maid.body0.quaDefEyeL.eulerAngles = new Vector3(eyeRotL.x, eyeRotL.y - mousePosOther.x / 10f, eyeRotL.z - mousePosOther.y / 10f);
-                maid.body0.quaDefEyeR.eulerAngles = new Vector3(eyeRotR.x, eyeRotR.y + inv * mousePosOther.x / 10f, eyeRotR.z + mousePosOther.y / 10f);
+                maid.body0.quaDefEyeL.eulerAngles = new Vector3(
+                    eyeRotL.x, eyeRotL.y - mousePosOther.x / 10f, eyeRotL.z - mousePosOther.y / 10f
+                );
+                maid.body0.quaDefEyeR.eulerAngles = new Vector3(
+                    eyeRotR.x, eyeRotR.y + inv * mousePosOther.x / 10f, eyeRotR.z + mousePosOther.y / 10f
+                );
             }
         }
     }

+ 17 - 6
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragJointFinger.cs

@@ -13,7 +13,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
         private Vector3 off2;
         private bool baseFinger;
 
-        public DragJointFinger Initialize(Transform[] ikChain, bool baseFinger, Meido meido, Func<Vector3> position, Func<Vector3> rotation)
+        public DragJointFinger Initialize(
+            Transform[] ikChain, bool baseFinger,
+            Meido meido, Func<Vector3> position, Func<Vector3> rotation)
         {
             base.Initialize(meido, position, rotation);
             this.ikChain = ikChain;
@@ -54,11 +56,14 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             base.InitializeDrag();
 
             IKCtrlData ikData = maid.body0.IKCtrl.GetIKData("左手");
-            off = transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z));
+            off = transform.position - Camera.main.ScreenToWorldPoint(
+                new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)
+            );
             off2 = new Vector3(
                 transform.position.x - ikChain[hand].position.x,
                 transform.position.y - ikChain[hand].position.y,
-                transform.position.z - ikChain[hand].position.z);
+                transform.position.z - ikChain[hand].position.z
+            );
 
             jointRotation[upperArmRot] = ikChain[upperArm].localEulerAngles;
             jointRotation[handRot] = ikChain[hand].localEulerAngles;
@@ -70,7 +75,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             if (isPlaying) meido.IsStop = true;
 
             IKCtrlData ikData = maid.body0.IKCtrl.GetIKData("左手");
-            Vector3 pos = Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)) + off - off2;
+            Vector3 pos = Camera.main.ScreenToWorldPoint(
+                new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)
+            ) + off - off2;
 
             if (dragType == DragType.None)
             {
@@ -85,8 +92,12 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 }
                 else
                 {
-                    ikChain[hand].localEulerAngles = new Vector3(jointRotation[handRot].x, jointRotation[handRot].y, ikChain[hand].localEulerAngles.z);
-                    ikChain[upperArm].localEulerAngles = new Vector3(jointRotation[upperArmRot].x, jointRotation[upperArmRot].y, ikChain[upperArm].localEulerAngles.z);
+                    ikChain[hand].localEulerAngles = new Vector3(
+                        jointRotation[handRot].x, jointRotation[handRot].y, ikChain[hand].localEulerAngles.z
+                    );
+                    ikChain[upperArm].localEulerAngles = new Vector3(
+                        jointRotation[upperArmRot].x, jointRotation[upperArmRot].y, ikChain[upperArm].localEulerAngles.z
+                    );
                 }
             }
             else

+ 9 - 3
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragJointForearm.cs

@@ -13,7 +13,10 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
         private Vector3 off2;
         private bool knee = false;
 
-        public DragJointForearm Initialize(Transform[] ikChain, bool knee, Meido meido, Func<Vector3> position, Func<Vector3> rotation)
+        public DragJointForearm Initialize(
+            Transform[] ikChain, bool knee,
+            Meido meido, Func<Vector3> position, Func<Vector3> rotation
+        )
         {
             base.Initialize(meido, position, rotation);
             this.ikChain = ikChain;
@@ -53,11 +56,14 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
         {
             base.InitializeDrag();
 
-            off = transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z));
+            off = transform.position - Camera.main.ScreenToWorldPoint(
+                new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)
+            );
             off2 = new Vector3(
                 transform.position.x - ikChain[hand].position.x,
                 transform.position.y - ikChain[hand].position.y,
-                transform.position.z - ikChain[hand].position.z);
+                transform.position.z - ikChain[hand].position.z
+            );
 
             jointRotation[upperArmRot] = ikChain[upperArm].localEulerAngles;
             jointRotation[handRot] = ikChain[hand].localEulerAngles;

+ 10 - 3
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragJointHand.cs

@@ -14,7 +14,10 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
         private Vector3 off2;
         private int foot = 1;
 
-        public DragJointHand Initialize(Transform[] ikChain, bool foot, Meido meido, Func<Vector3> position, Func<Vector3> rotation)
+        public DragJointHand Initialize(
+            Transform[] ikChain, bool foot,
+            Meido meido, Func<Vector3> position, Func<Vector3> rotation
+        )
         {
             base.Initialize(meido, position, rotation);
             this.ikChain = ikChain;
@@ -72,7 +75,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             Transform[] ikChain = dragType == DragType.MoveXZ ? this.ikChainLock : this.ikChain;
 
             IKCtrlData ikData = maid.body0.IKCtrl.GetIKData("左手");
-            off = transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z));
+            off = transform.position - Camera.main.ScreenToWorldPoint(
+                new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)
+            );
             off2 = new Vector3(
                 transform.position.x - ikChain[hand].position.x,
                 transform.position.y - ikChain[hand].position.y,
@@ -88,7 +93,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             if (isPlaying) meido.IsStop = true;
 
             IKCtrlData ikData = maid.body0.IKCtrl.GetIKData("左手");
-            Vector3 pos = Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)) + off - off2;
+            Vector3 pos = Camera.main.ScreenToWorldPoint(
+                new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)
+            ) + off - off2;
 
             if (dragType == DragType.None || dragType == DragType.MoveXZ)
             {

+ 6 - 3
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragMune.cs

@@ -54,7 +54,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
         {
             base.InitializeDrag();
 
-            off = transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z));
+            off = transform.position - Camera.main.ScreenToWorldPoint(
+                new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)
+            );
             off2 = new Vector3(
                 transform.position.x - ikChain[hand].position.x,
                 transform.position.y - ikChain[hand].position.y,
@@ -71,12 +73,13 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
             if (isPlaying) meido.IsStop = true;
             IKCtrlData ikData = maid.body0.IKCtrl.GetIKData("左手");
-            Vector3 pos = Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)) + off - off2;
+            Vector3 pos = Camera.main.ScreenToWorldPoint(
+                new Vector3(Input.mousePosition.x, Input.mousePosition.y, worldPoint.z)
+            ) + off - off2;
 
             if (dragType == DragType.RotLocalXZ)
             {
                 IK.Porc(ikChain[upperArm], ikChain[foreArm], ikChain[hand], pos, Vector3.zero, ikData);
-                // IK.Porc(ikChain[upperArm], ikChain[foreArm], ikChain[hand], pos + (pos - ikChain[hand].position), Vector3.zero, ikData);
 
                 jointRotation[handRot] = ikChain[hand].localEulerAngles;
                 jointRotation[upperArmRot] = ikChain[upperArm].localEulerAngles;

+ 4 - 1
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/IK/DragSpine.cs

@@ -11,7 +11,10 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
         private Vector3 off2;
         private bool isHip;
 
-        public DragSpine Initialize(Transform spine, bool isHip, Meido meido, Func<Vector3> position, Func<Vector3> rotation)
+        public DragSpine Initialize(
+            Transform spine, bool isHip,
+            Meido meido, Func<Vector3> position, Func<Vector3> rotation
+        )
         {
             base.Initialize(meido, position, rotation);
             this.spine = spine;

+ 6 - 3
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/MeidoPhotoStudio.cs

@@ -73,9 +73,12 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
         {
             // Hide UI and dragpoints
             GameObject editUI = GameObject.Find("/UI Root/Camera");
-            GameObject fpsViewer = UTY.GetChildObject(GameMain.Instance.gameObject, "SystemUI Root/FpsCounter", false);
-            GameObject sysDialog = UTY.GetChildObject(GameMain.Instance.gameObject, "SystemUI Root/SystemDialog", false);
-            GameObject sysShortcut = UTY.GetChildObject(GameMain.Instance.gameObject, "SystemUI Root/SystemShortcut", false);
+            GameObject fpsViewer =
+                UTY.GetChildObject(GameMain.Instance.gameObject, "SystemUI Root/FpsCounter", false);
+            GameObject sysDialog =
+                UTY.GetChildObject(GameMain.Instance.gameObject, "SystemUI Root/SystemDialog", false);
+            GameObject sysShortcut =
+                UTY.GetChildObject(GameMain.Instance.gameObject, "SystemUI Root/SystemShortcut", false);
             if (editUI != null) editUI.SetActive(false);
             fpsViewer.SetActive(false);
             sysDialog.SetActive(false);

+ 5 - 2
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Utility.cs

@@ -44,7 +44,8 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
         internal static FieldInfo GetFieldInfo<T>(string field)
         {
-            BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
+            BindingFlags bindingFlags = BindingFlags.Instance
+                | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
             return typeof(T).GetField(field, bindingFlags);
         }
 
@@ -78,7 +79,9 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
         internal static string ScreenshotFilename()
         {
-            string screenShotDir = Path.Combine(GameMain.Instance.SerializeStorageManager.StoreDirectoryPath, "ScreenShot");
+            string screenShotDir = Path.Combine(
+                GameMain.Instance.SerializeStorageManager.StoreDirectoryPath, "ScreenShot"
+            );
             if (!Directory.Exists(screenShotDir))
             {
                 Directory.CreateDirectory(screenShotDir);