ver 1.1.0

Author: yoship1639

ValheimVRM/MainPlugin.cs

@@ -10,7 +10,7 @@ public class MainPlugin : BaseUnityPlugin
     {
         public const string PluginGuid = "com.yoship1639.plugins.valheimvrm";
         public const string PluginName = "ValheimVRM";
-        public const string PluginVersion = "1.0.14.0";
+        public const string PluginVersion = "1.1.0.0";
 
         void Awake()
         {

ValheimVRM/VRMAnimationSync.cs

@@ -13,7 +13,6 @@ public class VRMAnimationSync : MonoBehaviour
 		private Animator orgAnim, vrmAnim;
 		private HumanPoseHandler orgPose, vrmPose;
 		private HumanPose hp = new HumanPose();
-		private float height = 0.0f;
 		private bool ragdoll;
 		private float offset;
 
@@ -37,8 +36,6 @@ void PoseHandlerCreate(Animator org, Animator vrm)
 			OnDestroy();
 			orgPose = new HumanPoseHandler(org.avatar, org.transform);
 			vrmPose = new HumanPoseHandler(vrm.avatar, vrm.transform);
-
-			height = vrmAnim.GetBoneTransform(HumanBodyBones.Hips).position.y - orgAnim.GetBoneTransform(HumanBodyBones.Hips).position.y;
 		}
 
 		void OnDestroy()
@@ -49,27 +46,81 @@ void OnDestroy()
 				vrmPose.Dispose();
 		}
 
-		void Update()
+		private float CalcFootSub()
 		{
-			if (ragdoll) return;
-			for (var i = 0; i < 55; i++)
-			{
-				var orgTrans = orgAnim.GetBoneTransform((HumanBodyBones)i);
-				var vrmTrans = vrmAnim.GetBoneTransform((HumanBodyBones)i);
+			var orgRightFoot = orgAnim.GetBoneTransform(HumanBodyBones.RightFoot).position;
+			var orgLeftFoot = orgAnim.GetBoneTransform(HumanBodyBones.LeftFoot).position;
+			var orgArgFoot = (orgRightFoot + orgLeftFoot) * 0.5f;
 
-				if (i > 0 && orgTrans != null && vrmTrans != null)
-				{
-					orgTrans.position = vrmTrans.position;
-				}
-			}
+			var vrmRightFoot = vrmAnim.GetBoneTransform(HumanBodyBones.RightFoot).position;
+			var vrmLeftFoot = vrmAnim.GetBoneTransform(HumanBodyBones.LeftFoot).position;
+			var vrmArgFoot = (vrmRightFoot + vrmLeftFoot) * 0.5f;
+
+			return (orgArgFoot - vrmArgFoot).y;
 		}
 
+		private static List<int> alreadyHashes = new List<int>();
+
+		// 最初: -161139084
+		// 通常: 229373857
+		// 最初立ち上がり: -1536343465
+		// 立ち上がり: -805461806
+		// 座り始め: 890925016
+		// 座り: -1544306596
+		// 椅子: -1829310159
+		// ベッド寝始め: 337039637
+		// ベッド: -1603096
+		// ベッド起き上がり: -496559199
+		// Crouch: -2015693266
+
+		private static List<int> adjustHipHashes = new List<int>()
+		{
+			-1536343465,
+			890925016,
+			-1544306596,
+			-1829310159,
+			337039637,
+			-1603096,
+			-496559199,
+		};
+
+
 		void LateUpdate()
 		{
+			vrmAnim.transform.localPosition = Vector3.zero;
+			var orgHipPos = orgAnim.GetBoneTransform(HumanBodyBones.Hips).position;
 			orgPose.GetHumanPose(ref hp);
 			vrmPose.SetHumanPose(ref hp);
 
-			var posY = orgAnim.GetBoneTransform(HumanBodyBones.Hips).position.y;
+			var nameHash = orgAnim.GetCurrentAnimatorStateInfo(0).shortNameHash;
+			var adjustFromHip = adjustHipHashes.Contains(nameHash);
+
+			//if (!alreadyHashes.Contains(nameHash))
+			//{
+			//	alreadyHashes.Add(nameHash);
+			//	Debug.Log(orgAnim.GetCurrentAnimatorClipInfo(0)[0].clip.name + ": " + nameHash);
+			//}
+
+			var vrmHip = vrmAnim.GetBoneTransform(HumanBodyBones.Hips);
+			if (adjustFromHip)
+			{
+				vrmHip.position = orgHipPos;
+			}
+			
+			var adjustHeight = 0.0f;
+			if (nameHash == 890925016 || nameHash == -1544306596 || nameHash == -1829310159) // Sitting
+			{
+				adjustHeight += 0.1f;
+			}
+
+			if (!adjustFromHip)
+			{
+				adjustHeight = CalcFootSub();
+			}
+
+			var pos = vrmHip.position;
+			pos.y += adjustHeight;
+			vrmHip.position = pos;
 
 			if (!ragdoll)
 			{
@@ -85,9 +136,7 @@ void LateUpdate()
 				}
 			}
 
-			var pos = vrmAnim.transform.position;
-			pos.y = posY + height + offset;
-			vrmAnim.transform.position = pos;
+			vrmAnim.transform.localPosition += Vector3.up * offset;
 		}
 	}
 }

ValheimVRM/ValheimVRM.cs

@@ -348,7 +348,7 @@ static void Postfix(Player __instance)
 
 						var lodGroup = orgVrm.AddComponent<LODGroup>();
 						var lod = new LOD(0.1f, orgVrm.GetComponentsInChildren<SkinnedMeshRenderer>());
-						lodGroup.SetLODs(new LOD[]{ lod });
+						if (Settings.ReadBool(playerName, "EnablePlayerFade", true)) lodGroup.SetLODs(new LOD[] { lod });
 						lodGroup.RecalculateBounds();
 
 						var orgLodGroup = __instance.GetComponentInChildren<LODGroup>();
@@ -424,6 +424,7 @@ static void Postfix(Player __instance)
 				{
 					springBone.m_stiffnessForce *= stiffness;
 					springBone.m_gravityPower *= gravity;
+					springBone.m_updateType = VRMSpringBone.SpringBoneUpdateType.FixedUpdate;
 					springBone.m_center = null;
 				}
 			}

ValheimVRM/ValheimVRM.csproj

@@ -3,7 +3,8 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>net462</TargetFramework>
-    <Version>1.0.14</Version>
+    <Version>1.1.0.0</Version>
+    <AssemblyVersion>1.1.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

index.html

@@ -225,6 +225,14 @@ <h3 class="title is-3">
 					<h3 class="title is-3">
 						更新履歴
 					</h3>
+					<label class="label">ver 1.1.0</label>
+					<ul>
+						<li>身長の低いキャラクタでも問題なくプレイできる様に修正</li>
+						<li>カメラがプレイヤーに近づいた時にフェードアウトさせない様にする設定項目を追加</li>
+						<li>ベッドに寝る時、椅子に座った時、床に座った時にY位置がずれる問題を修正</li>
+						<li>SpringBoneを物理更新時間に合わせる様に修正</li>
+						<li>Added English notation to the settings file.</li>
+					</ul>
 					<label class="label">ver 1.0.14</label>
 					<ul>
 						<li>SpringBoneが正常に動作しなかった問題を修正</li>