Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-13 13:16:02 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SpringBonePaused to IsSpringBoneEnabled. invert boolean

Browse Source
This commit is contained in:
ousttrue
2024-07-16 18:51:20 +09:00
parent af9e18c09c
commit 5b47fab89f
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs
View File

@@ -51,12 +51,12 @@ namespace UniVRM10
}
}
public bool SpringBonePaused
public bool IsSpringBoneEnabled
{
get => m_externalData.Paused;
get => m_externalData.IsSpringBoneEnabled;
set
{
m_externalData.Paused = value;
m_externalData.IsSpringBoneEnabled = value;
m_fastSpringBoneBuffer.ExternalData = m_externalData;
}
}

6
Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableExternalData.cs
View File

@@ -8,6 +8,10 @@ namespace UniVRM10.FastSpringBones.Blittables
public struct BlittableExternalData
{
public Vector3 ExternalForce;
public bool Paused;
/// <summary>
/// if false, spring bone is paused.
/// </summary>
public bool IsSpringBoneEnabled;
}
}

12
Assets/VRM10/Runtime/FastSpringBone/System/UpdateFastSpringBoneJob.cs
View File

@@ -147,16 +147,16 @@ namespace UniVRM10.FastSpringBones.System
headTransform.localRotation = headTransform.rotation;
}
if (spring.ExternalData->Paused)
{
// SpringBone の結果を Transform に反映しないが logic の更新は継続する。
// 再開したときに暴れない。
}
else
if (spring.ExternalData->IsSpringBoneEnabled)
{
// SpringBone の結果を Transform に反映する
Transforms[logic.headTransformIndex + transformIndexOffset] = headTransform;
}
else
{
// SpringBone の結果を Transform に反映しないが logic の更新は継続する。
// 再開したときに暴れない。
}
Logics[logicIndex] = logic;
}
}

6
Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
View File

@@ -28,7 +28,7 @@ namespace UniVRM10.VRM10Viewer
Toggle m_showBoxMan = default;
[SerializeField]
Toggle m_puaseSpringBone = default;
Toggle m_pauseSpringBone = default;
[SerializeField]
Toggle m_enableLipSync = default;
@@ -262,7 +262,7 @@ namespace UniVRM10.VRM10Viewer
var toggles = GameObject.FindObjectsOfType<Toggle>();
#endif
m_showBoxMan = toggles.First(x => x.name == "ShowBoxMan");
m_puaseSpringBone = toggles.First(x => x.name == "PauseSpringBone");
m_pauseSpringBone = toggles.First(x => x.name == "PauseSpringBone");
m_enableLipSync = toggles.First(x => x.name == "EnableLipSync");
m_enableAutoBlink = toggles.First(x => x.name == "EnableAutoBlink");
m_enableAutoExpression = toggles.First(x => x.name == "EnableAutoExpression");
@@ -410,7 +410,7 @@ namespace UniVRM10.VRM10Viewer
m_loaded.Runtime.VrmAnimation = Motion;
}
m_loaded.Runtime.SpringBonePaused = m_puaseSpringBone.isOn;
m_loaded.Runtime.IsSpringBoneEnabled = !m_pauseSpringBone.isOn;
}
}
}