From b07efcd7fae19168825f7b9644b1fd11659e3621 Mon Sep 17 00:00:00 2001 From: mitsukaki Date: Fri, 27 Sep 2024 07:24:54 -0600 Subject: [PATCH] fix: now functional broken pose lock toggle --- Assets/Scenes/Dev.unity | 7 +++- .../Scripts/Util/PersistentPoseUtility.cs | 2 +- .../Animation/PoseEngine_Base.controller | 38 +++++++++---------- .../com.mitsukaki.poseengine/package.json | 2 +- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Assets/Scenes/Dev.unity b/Assets/Scenes/Dev.unity index fb7d05f..4859d27 100644 --- a/Assets/Scenes/Dev.unity +++ b/Assets/Scenes/Dev.unity @@ -366,7 +366,7 @@ PrefabInstance: - target: {fileID: 3813973895529122467, guid: ad80c516d1915004695018ca6cd579d3, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3813973895529122493, guid: ad80c516d1915004695018ca6cd579d3, type: 3} @@ -820,6 +820,11 @@ PrefabInstance: propertyPath: m_Name value: Test Avatar (1) objectReference: {fileID: 0} + - target: {fileID: 3813973895529122467, guid: ad80c516d1915004695018ca6cd579d3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3813973895529122493, guid: ad80c516d1915004695018ca6cd579d3, type: 3} propertyPath: unityVersion diff --git a/Packages/com.mitsukaki.poseengine/Editor/Scripts/Util/PersistentPoseUtility.cs b/Packages/com.mitsukaki.poseengine/Editor/Scripts/Util/PersistentPoseUtility.cs index 58f3759..d02ff62 100644 --- a/Packages/com.mitsukaki.poseengine/Editor/Scripts/Util/PersistentPoseUtility.cs +++ b/Packages/com.mitsukaki.poseengine/Editor/Scripts/Util/PersistentPoseUtility.cs @@ -100,7 +100,7 @@ public static void EnablePersistentPosing(PoseBuildContext context) // create the menu item for the object poseMenuItem.Control.name = "Persist Poses"; - poseMenuItem.Control.value = 0; + poseMenuItem.Control.value = 1.0f; poseMenuItem.Control.type = VRCExpressionsMenu.Control.ControlType.Toggle; poseMenuItem.Control.parameter = new VRCExpressionsMenu.Control.Parameter(); poseMenuItem.Control.parameter.name = "PoseEngine/PoseRestore/SaveEnabled"; diff --git a/Packages/com.mitsukaki.poseengine/Runtime/Animation/PoseEngine_Base.controller b/Packages/com.mitsukaki.poseengine/Runtime/Animation/PoseEngine_Base.controller index 52fc8ff..b553842 100644 --- a/Packages/com.mitsukaki.poseengine/Runtime/Animation/PoseEngine_Base.controller +++ b/Packages/com.mitsukaki.poseengine/Runtime/Animation/PoseEngine_Base.controller @@ -820,7 +820,7 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0.02 m_TransitionOffset: 0 - m_ExitTime: 0.35 + m_ExitTime: 0.81 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -1259,103 +1259,103 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/Lock/Feet m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/Lock/Hips m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/Lock/Hands m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/Lock/Head m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/Pose m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/Elevation m_Type: 1 m_DefaultFloat: 0.5 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/AlteringElevation m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/PoseState/Enter m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/PoseState/Exit m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/PoseState/DelayedEnter m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/ElevatorDown m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/ElevatorUp m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/Mirrored m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/PoseRestore/PoseID m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/PoseRestore/Mirrored m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PoseEngine/PoseRestore/NeedsAligning m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -1793,7 +1793,7 @@ MonoBehaviour: m_EditorClassIdentifier: enterPoseSpace: 1 fixedDelay: 1 - delayTime: 0.35 + delayTime: 0.8 debugString: PoseEngine/RestorationEntry --- !u!1102 &1210680347291248615 AnimatorState: diff --git a/Packages/com.mitsukaki.poseengine/package.json b/Packages/com.mitsukaki.poseengine/package.json index 750dd38..4a07d43 100644 --- a/Packages/com.mitsukaki.poseengine/package.json +++ b/Packages/com.mitsukaki.poseengine/package.json @@ -1,7 +1,7 @@ { "name": "com.mitsukaki.poseengine", "displayName": "Pose Engine", - "version": "0.6.1-beta.6", + "version": "0.6.1-beta.7", "unity": "2022.3", "description": "A tool for building locomotion & pose systems for VRChat avatars.", "author": {