|
@@ -4840,22 +4840,14 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
if (isBone[i])
|
|
|
{
|
|
|
- if ((ikMode[i] != 3 && ikMode[i] != 5 && ikMode[i] != 8) || ikMode[i] != ikModeOld[i]
|
|
|
- || isChange[i])
|
|
|
+ if ((ikMode[i] != 3 && ikMode[i] != 5 && ikMode[i] != 8)
|
|
|
+ || ikMode[i] != ikModeOld[i] || isChange[i]
|
|
|
+ )
|
|
|
{
|
|
|
float gizmoSizeSpine = 0.2f;
|
|
|
|
|
|
- gizmoNeck[i].Visible = false;
|
|
|
- gizmoFootL[i].Visible = false;
|
|
|
- gizmoHandR[i].Visible = false;
|
|
|
- gizmoHandL[i].Visible = false;
|
|
|
- gizmoFootR[i].Visible = false;
|
|
|
- gizmoPelvis[i].Visible = false;
|
|
|
-
|
|
|
if (ikMode[i] == 2 || ikMode[i] == 1)
|
|
|
{
|
|
|
- bool isDragging = GetFieldValue<GizmoRender, bool>(gizmoHandL[i], "is_drag_");
|
|
|
-
|
|
|
gizmoHandL[i].offsetScale = gizmoSizeSpine;
|
|
|
gizmoHandR[i].offsetScale = gizmoSizeSpine;
|
|
|
gizmoFootL[i].offsetScale = gizmoSizeSpine;
|
|
@@ -4863,13 +4855,20 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
if (ikMode[i] == 2)
|
|
|
{
|
|
|
+ gizmoNeck[i].Visible = true;
|
|
|
+ gizmoHandL[i].Visible = true;
|
|
|
+ gizmoHandR[i].Visible = true;
|
|
|
+ gizmoFootL[i].Visible = true;
|
|
|
+ gizmoFootR[i].Visible = true;
|
|
|
+ gizmoPelvis[i].Visible = false;
|
|
|
+
|
|
|
gizmoNeck[i].transform.position = Neck[i].transform.position;
|
|
|
gizmoHandL[i].transform.position = Spine1a2[i].transform.position;
|
|
|
gizmoHandR[i].transform.position = Spine12[i].transform.position;
|
|
|
gizmoFootL[i].transform.position = Spine0a2[i].transform.position;
|
|
|
gizmoFootR[i].transform.position = Spine2[i].transform.position;
|
|
|
|
|
|
- if (isDragging)
|
|
|
+ if (CustomGizmo.IsDrag)
|
|
|
{
|
|
|
Neck[i].transform.rotation = gizmoNeck[i].transform.rotation;
|
|
|
Spine1a2[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
@@ -4877,18 +4876,13 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
Spine0a2[i].transform.rotation = gizmoFootL[i].transform.rotation;
|
|
|
Spine2[i].transform.rotation = gizmoFootR[i].transform.rotation;
|
|
|
}
|
|
|
+
|
|
|
gizmoNeck[i].transform.rotation = Neck[i].transform.rotation;
|
|
|
gizmoHandL[i].transform.rotation = Spine1a2[i].transform.rotation;
|
|
|
gizmoHandR[i].transform.rotation = Spine12[i].transform.rotation;
|
|
|
gizmoFootL[i].transform.rotation = Spine0a2[i].transform.rotation;
|
|
|
gizmoFootR[i].transform.rotation = Spine2[i].transform.rotation;
|
|
|
|
|
|
- gizmoNeck[i].Visible = true;
|
|
|
- gizmoHandL[i].Visible = true;
|
|
|
- gizmoHandR[i].Visible = true;
|
|
|
- gizmoFootL[i].Visible = true;
|
|
|
- gizmoFootR[i].Visible = true;
|
|
|
-
|
|
|
gNeck[i].SetActive(false);
|
|
|
gSpine[i].SetActive(false);
|
|
|
gSpine0a[i].SetActive(false);
|
|
@@ -4897,29 +4891,43 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ gizmoNeck[i].Visible = false;
|
|
|
+ gizmoFootL[i].Visible = false;
|
|
|
+ gizmoHandR[i].Visible = false;
|
|
|
+ gizmoHandL[i].Visible = false;
|
|
|
+ gizmoFootR[i].Visible = false;
|
|
|
+ gizmoPelvis[i].Visible = true;
|
|
|
+
|
|
|
gizmoPelvis[i].transform.position = Pelvis2[i].transform.position;
|
|
|
|
|
|
- if (isDragging)
|
|
|
+ if (CustomGizmo.IsDrag)
|
|
|
{
|
|
|
Pelvis2[i].transform.rotation = gizmoPelvis[i].transform.rotation;
|
|
|
}
|
|
|
|
|
|
gizmoPelvis[i].transform.rotation = Pelvis2[i].transform.rotation;
|
|
|
|
|
|
- gizmoPelvis[i].Visible = true;
|
|
|
-
|
|
|
gPelvis[i].SetActive(false);
|
|
|
}
|
|
|
|
|
|
if (!isLock[i])
|
|
|
{
|
|
|
- if (isDragging)
|
|
|
+ if (CustomGizmo.IsDrag)
|
|
|
{
|
|
|
isStop[i] = true;
|
|
|
isLock[i] = true;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ gizmoNeck[i].Visible = false;
|
|
|
+ gizmoPelvis[i].Visible = false;
|
|
|
+ gizmoFootL[i].Visible = false;
|
|
|
+ gizmoHandR[i].Visible = false;
|
|
|
+ gizmoHandL[i].Visible = false;
|
|
|
+ gizmoFootR[i].Visible = false;
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -4930,7 +4938,12 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
gizmoFootL[i].offsetScale = gizmoSizeLimb;
|
|
|
gizmoFootR[i].offsetScale = gizmoSizeLimb;
|
|
|
|
|
|
- bool isDragging = GetFieldValue<GizmoRender, bool>(gizmoHandL[i], "is_drag_");
|
|
|
+ gizmoFootL[i].Visible = true;
|
|
|
+ gizmoHandR[i].Visible = true;
|
|
|
+ gizmoHandL[i].Visible = true;
|
|
|
+ gizmoFootR[i].Visible = true;
|
|
|
+
|
|
|
+ bool isDragging = CustomGizmo.IsDrag;
|
|
|
|
|
|
if (ikMode[i] == 3)
|
|
|
{
|
|
@@ -4938,6 +4951,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
gizmoHandR[i].transform.position = HandR1[i].transform.position;
|
|
|
gizmoFootL[i].transform.position = HandL2[i].transform.position;
|
|
|
gizmoFootR[i].transform.position = HandR2[i].transform.position;
|
|
|
+
|
|
|
if (isDragging)
|
|
|
{
|
|
|
HandL1[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
@@ -4959,6 +4973,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
gizmoHandR[i].transform.position = UpperArmR1[i].transform.position;
|
|
|
gizmoFootL[i].transform.position = UpperArmL2[i].transform.position;
|
|
|
gizmoFootR[i].transform.position = UpperArmR2[i].transform.position;
|
|
|
+
|
|
|
if (isDragging)
|
|
|
{
|
|
|
UpperArmL1[i].transform.rotation = gizmoHandL[i].transform.rotation;
|
|
@@ -4997,11 +5012,13 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
gizmoFootR[i].transform.rotation = ForearmR2[i].transform.rotation;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- gizmoHandL[i].Visible = true;
|
|
|
- gizmoHandR[i].Visible = true;
|
|
|
- gizmoFootL[i].Visible = true;
|
|
|
- gizmoFootR[i].Visible = true;
|
|
|
+ else
|
|
|
+ {
|
|
|
+ gizmoFootL[i].Visible = false;
|
|
|
+ gizmoHandR[i].Visible = false;
|
|
|
+ gizmoHandL[i].Visible = false;
|
|
|
+ gizmoFootR[i].Visible = false;
|
|
|
+ }
|
|
|
|
|
|
gHandL[i].SetActive(false);
|
|
|
gFootL[i].SetActive(false);
|
|
@@ -5010,7 +5027,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
if (!isLock[i])
|
|
|
{
|
|
|
- if (isDragging)
|
|
|
+ if (CustomGizmo.IsDrag)
|
|
|
{
|
|
|
isStop[i] = true;
|
|
|
isLock[i] = true;
|