squash commits

2025-01-07 18:54:46 +02:00
parent 855639487b
commit 62c0a21987
3632 changed files with 708443 additions and 999 deletions
@@ -0,0 +1,30 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9448878e2e40f1a4c9f8fd2b56832b13, type: 3}
+  m_Name: ForearmTwistRecipe
+  m_EditorClassIdentifier: 
+  label: 
+  resourcesOnly: 0
+  recipeType: Standard
+  DisplayValue: 
+  compatibleRaces: []
+  wardrobeRecipeThumbs: []
+  wardrobeSlot: None
+  Appended: 0
+  Hides: []
+  HideTags: []
+  suppressWardrobeSlots: []
+  activeWardrobeSet: []
+  MeshHideAssets: []
+  OverrideDNA:
+    PreloadValues: []
+  recipeString: '{"version":2,"packedSlotDataList":null,"slotsV2":[{"id":"ForearmTwist","scale":100,"copyIdx":-1,"overlays":[]}],"colors":[],"sharedColorCount":0,"race":null,"umaDna":{},"packedDna":[]}'
@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+guid: b4240924c651c4f1b840a7e4707660ac
+labels:
+- UMA_Text Recipe
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 35611
+  packageName: UMA 2
+  packageVersion: 2.13
+  assetPath: Assets/UMA/Content/Example/AdditionalSlots/ForearmTwist/ForearmTwistRecipe.asset
+  uploadId: 679826
@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &193108
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 493108}
+  - 114: {fileID: 11493108}
+  m_Layer: 0
+  m_Name: ForearmTwistScriptPrefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &493108
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 193108}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!114 &11493108
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 193108}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb235dc3846054e388b467b624c23bae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 193108}
+  m_IsPrefabParent: 1
+  m_IsExploded: 1
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 71a60c5768497428ca04a4238026a8fd
+NativeFormatImporter:
+  userData: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 35611
+  packageName: UMA 2
+  packageVersion: 2.13
+  assetPath: Assets/UMA/Content/Example/AdditionalSlots/ForearmTwist/ForearmTwistScriptPrefab.prefab
+  uploadId: 679826
@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+guid: 98c6dc40a5e2e4f3f92aabfafaf67c78
+labels:
+- UMA_Slot
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 35611
+  packageName: UMA 2
+  packageVersion: 2.13
+  assetPath: Assets/UMA/Content/Example/AdditionalSlots/ForearmTwist/ForearmTwistSlot.asset
+  uploadId: 679826
@@ -0,0 +1,56 @@
+using UnityEngine;
+
+namespace UMA
+{
+    /// <summary>
+    /// Auxillary slot which adds a TwistBone component for the forearms of a newly created character.
+    /// </summary>
+    public class ForearmTwistSlotScript : MonoBehaviour 
+	{
+		public string LeftHandBoneName = "LeftHand";
+		public string RightHandBoneName = "RightHand";
+		public string LeftForeArmTwistBoneName = "LeftForeArmTwist";
+		public string RightForeArmTwistBoneName = "RightForeArmTwist";
+
+		static int leftHandHash;
+		static int rightHandHash;
+		static int leftTwistHash;
+		static int rightTwistHash;
+		static bool hashesFound = false;
+
+		public void OnDnaApplied(UMAData umaData)
+		{
+			if (!hashesFound)
+			{
+				leftHandHash = UMAUtils.StringToHash(LeftHandBoneName);
+				rightHandHash = UMAUtils.StringToHash(RightHandBoneName);
+				leftTwistHash = UMAUtils.StringToHash(LeftForeArmTwistBoneName);
+				rightTwistHash = UMAUtils.StringToHash(RightForeArmTwistBoneName);
+				hashesFound = true;
+			}
+
+			GameObject leftHand = umaData.GetBoneGameObject(leftHandHash);
+			GameObject rightHand = umaData.GetBoneGameObject(rightHandHash);
+			GameObject leftTwist = umaData.GetBoneGameObject(leftTwistHash);
+			GameObject rightTwist = umaData.GetBoneGameObject(rightTwistHash);
+
+			if ((leftHand == null) || (rightHand == null) || (leftTwist == null) || (rightTwist == null))
+			{
+				if (Debug.isDebugBuild)
+                {
+                    Debug.LogError("Failed to add Forearm Twist to: " + umaData.name);
+                }
+
+                return;
+			}
+
+			if (umaData.gameObject.GetComponent<TwistBones>() == null)
+			{
+				var twist = umaData.gameObject.AddComponent<TwistBones>();
+				twist.twistValue = 0.5f;
+				twist.twistBone = new Transform[] { leftTwist.transform, rightTwist.transform };
+				twist.refBone = new Transform[] { leftHand.transform, rightHand.transform };
+			}
+		}
+	}
+}
@@ -0,0 +1,15 @@
+fileFormatVersion: 2
+guid: eb235dc3846054e388b467b624c23bae
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 35611
+  packageName: UMA 2
+  packageVersion: 2.13
+  assetPath: Assets/UMA/Content/Example/AdditionalSlots/ForearmTwist/ForearmTwistSlotScript.cs
+  uploadId: 679826