From cf259c2f08b05d83bc3c27dc071f5da42484696e Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Thu, 26 Jan 2023 13:52:13 +0100 Subject: [PATCH 1/5] fix walls --- Assets/Scenes/FabLab/FabLab.unity | 22 +++++++++++++--------- Assets/XR/Settings/Open VR Settings.asset | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index eaa28c6..b0b9f1f 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -6504,7 +6504,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50010 + m_Name: pb_Mesh24078 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10949,7 +10949,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50598 + m_Name: pb_Mesh24674 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -13872,6 +13872,10 @@ PrefabInstance: propertyPath: m_Name value: doors objectReference: {fileID: 0} + - target: {fileID: 8107864071629968142, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} + propertyPath: m_LocalPosition.x + value: 0.059 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b736d76bebca444c936d3f9dbcbcb0b, type: 3} --- !u!4 &804182423 stripped @@ -15547,7 +15551,7 @@ Transform: m_GameObject: {fileID: 915677069} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6.032, y: -0.003, z: -0.001} - m_LocalScale: {x: 0.038434, y: 4.022701, z: 7.1114306} + m_LocalScale: {x: 0.07408153, y: 4.022701, z: 7.1114306} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1173886246} @@ -15586,7 +15590,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: dc56e50f367c1ca43a1562b07d1cbfc5, type: 2} + - {fileID: 2100000, guid: a5290ed10ae30ac4985f699c2e7a149c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -21775,7 +21779,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.x - value: -7.029276 + value: -7.01 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalPosition.y @@ -23097,7 +23101,7 @@ Transform: m_GameObject: {fileID: 1757592330} m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.00000058114523} m_LocalPosition: {x: -6.082, y: -0.0029997826, z: -0} - m_LocalScale: {x: 0.12212861, y: 4.022701, z: 7.1114306} + m_LocalScale: {x: 0.1861118, y: 4.022701, z: 7.1114306} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1173886246} @@ -25995,7 +25999,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: dc56e50f367c1ca43a1562b07d1cbfc5, type: 2} + - {fileID: 2100000, guid: a5290ed10ae30ac4985f699c2e7a149c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -29584,7 +29588,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2039536872} m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071069} - m_LocalPosition: {x: -0.044, y: -0.0029997826, z: 3.534} + m_LocalPosition: {x: -0.024724334, y: -0.0029997826, z: 3.534} m_LocalScale: {x: 0.038434, y: 4.022701, z: 12.063211} m_ConstrainProportionsScale: 0 m_Children: [] @@ -32844,7 +32848,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50776 + m_Name: pb_Mesh24844 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/XR/Settings/Open VR Settings.asset b/Assets/XR/Settings/Open VR Settings.asset index 62af21b..f9fd368 100644 --- a/Assets/XR/Settings/Open VR Settings.asset +++ b/Assets/XR/Settings/Open VR Settings.asset @@ -18,6 +18,6 @@ MonoBehaviour: StereoRenderingMode: 1 InitializationType: 1 EditorAppKey: application.generated.unity.unity3dtemplate.exe - ActionManifestFileRelativeFilePath: StreamingAssets/SteamVR/actions.json + ActionManifestFileRelativeFilePath: StreamingAssets\SteamVR\actions.json MirrorView: 2 HasCopiedDefaults: 0 From 7ad1df696289c9ca33b79b7346fbbaf912f083c1 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Thu, 26 Jan 2023 14:35:38 +0100 Subject: [PATCH 2/5] fix grab and trash --- Assets/Materials/Trash.mat | 83 ++++++++++ Assets/Materials/Trash.mat.meta | 8 + Assets/Scenes/FabLab/FabLab.unity | 244 ++++++++++++++++++++++++------ Assets/Scripts/Catalog.cs | 26 ++-- Assets/Scripts/CatalogElement.cs | 4 +- Assets/Scripts/FurnitureMover.cs | 6 +- Assets/Scripts/Trash.cs | 87 +++++++++++ Assets/Scripts/Trash.cs.meta | 11 ++ 8 files changed, 405 insertions(+), 64 deletions(-) create mode 100644 Assets/Materials/Trash.mat create mode 100644 Assets/Materials/Trash.mat.meta create mode 100644 Assets/Scripts/Trash.cs create mode 100644 Assets/Scripts/Trash.cs.meta diff --git a/Assets/Materials/Trash.mat b/Assets/Materials/Trash.mat new file mode 100644 index 0000000..ed45e4f --- /dev/null +++ b/Assets/Materials/Trash.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Trash + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 0.5 + - _Glossiness: 0.737 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 1 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 0, b: 0.07366419, a: 0.42745098} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Trash.mat.meta b/Assets/Materials/Trash.mat.meta new file mode 100644 index 0000000..610dcf1 --- /dev/null +++ b/Assets/Materials/Trash.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e4be7523f64df641b9ac39f39093c91 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index b0b9f1f..07d28a3 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -6234,11 +6234,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3} propertyPath: m_LocalPosition.y - value: 0.3921218 + value: 0.7629217 objectReference: {fileID: 0} - target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3} propertyPath: m_LocalPosition.z - value: 0.013928294 + value: 0.013927817 objectReference: {fileID: 0} - target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3} propertyPath: m_LocalRotation.w @@ -6407,6 +6407,10 @@ PrefabInstance: propertyPath: pointVisibleMaterial value: objectReference: {fileID: 2100000, guid: 510c6e0b8b5c948458c2b4bc3de5a637, type: 2} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: traceLayerMask.m_Bits + value: 384 + objectReference: {fileID: 0} - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} propertyPath: areaHighlightedMaterial value: @@ -8400,11 +8404,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.y - value: -0.33978105 + value: 0.031019092 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: -0.010123134 + value: -0.010122895 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -13768,11 +13772,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.y - value: -0.17465973 + value: 0.19614017 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.z - value: -0.014138341 + value: -0.014138818 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalRotation.w @@ -16734,6 +16738,120 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} +--- !u!1 &1104488937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1104488938} + - component: {fileID: 1104488942} + - component: {fileID: 1104488941} + - component: {fileID: 1104488940} + - component: {fileID: 1104488939} + m_Layer: 10 + m_Name: Trash + m_TagString: Trash + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1104488938 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1104488937} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.117, z: 0.2219} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1527984575637916538} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &1104488939 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1104488937} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!135 &1104488940 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1104488937} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1104488941 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1104488937} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0e4be7523f64df641b9ac39f39093c91, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1104488942 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1104488937} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1119201756 GameObject: m_ObjectHideFlags: 0 @@ -16823,7 +16941,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50740 + m_Name: pb_Mesh24816 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18544,11 +18662,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalScale.y - value: 0.20531806 + value: 0.2053181 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalScale.z - value: 0.20531791 + value: 0.20531794 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalPosition.x @@ -18556,11 +18674,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalPosition.y - value: 0.37300003 + value: 0.74380004 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalPosition.z - value: -0.23510015 + value: -0.23510039 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalRotation.w @@ -20247,6 +20365,68 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1475892020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1475892021} + - component: {fileID: 1475892022} + m_Layer: 26 + m_Name: FurnitureMover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1475892021 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475892020} + m_LocalRotation: {x: 0.1677507, y: -0.000000007450581, z: -0.000000004656613, w: 0.98582953} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1558616916} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 19.314, y: 0, z: 0} +--- !u!114 &1475892022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475892020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 92e268c9230c939469a5d6b56877fb57, type: 3} + m_Name: + m_EditorClassIdentifier: + pose: {fileID: 0} + interactWithUI: + actionPath: /actions/default/in/InteractUI + needsReinit: 0 + snapLeftAction: + actionPath: /actions/default/in/SnapTurnLeft + needsReinit: 0 + snapRightAction: + actionPath: /actions/default/in/SnapTurnRight + needsReinit: 0 + AutoPlacementEnvironmentMask: + serializedVersion: 2 + m_Bits: 1280 + pointer: {fileID: 0} + Grabbing: {fileID: 0} + color: {r: 0, g: 0, b: 0, a: 0} + thickness: 0.002 + clickColor: {r: 0, g: 1, b: 0, a: 1} --- !u!1001 &1481052597 PrefabInstance: m_ObjectHideFlags: 0 @@ -21186,41 +21366,11 @@ Transform: m_Father: {fileID: 1173886246} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1558616909 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 160596, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} +--- !u!4 &1558616916 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 485514, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} m_PrefabInstance: {fileID: 1290121935} m_PrefabAsset: {fileID: 0} ---- !u!114 &1558616915 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558616909} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 92e268c9230c939469a5d6b56877fb57, type: 3} - m_Name: - m_EditorClassIdentifier: - pose: {fileID: 0} - interactWithUI: - actionPath: /actions/default/in/InteractUI - needsReinit: 0 - snapLeftAction: - actionPath: /actions/default/in/SnapTurnLeft - needsReinit: 0 - snapRightAction: - actionPath: /actions/default/in/SnapTurnRight - needsReinit: 0 - AutoPlacementEnvironmentMask: - serializedVersion: 2 - m_Bits: 256 - pointer: {fileID: 0} - Grabbing: {fileID: 0} - color: {r: 0, g: 0, b: 0, a: 0} - thickness: 0.002 - clickColor: {r: 0, g: 1, b: 0, a: 1} --- !u!4 &1569489522 stripped Transform: m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} @@ -27282,7 +27432,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1888977163} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.077, y: -0.821, z: 1.791} + m_LocalPosition: {x: 0.077, y: -1.1918, z: 1.791} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -33372,11 +33522,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.y - value: 0.411 + value: 0.78180015 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.z - value: -0.19400012 + value: -0.19399989 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/Catalog.cs b/Assets/Scripts/Catalog.cs index fb2d5cc..b9d0b7e 100644 --- a/Assets/Scripts/Catalog.cs +++ b/Assets/Scripts/Catalog.cs @@ -25,6 +25,7 @@ public class Catalog : MonoBehaviour Instance = this; maxShownObjects = Furnitures.Count; spherePrefab = transform.Find("Sphere").gameObject; + Trash = transform.Find("Trash").gameObject; player = Player.instance; if (player == null) { @@ -70,25 +71,26 @@ public class Catalog : MonoBehaviour public void LeaveTrash(MovableFurniture Grabbing) { Grabbing.gameObject.SetActive(true); - CatalogElement element = Trash.GetComponent(); - element.ClearFurniture(); + /*CatalogElement element = Trash.GetComponent(); + element.ClearFurniture();*/ Trash.GetComponent().material.color = new Color(1, 0, 0, 0.5f); } - private void SpawnTrash() + /*private void SpawnTrash() { var sphere = Instantiate(spherePrefab); sphere.transform.parent = transform; sphere.transform.localScale = Vector3.one * objectScale; sphere.transform.localPosition = new Vector3(0, 1, 1) * distance; sphere.GetComponent().material.color = new Color(1, 0, 0, 0.5f); - sphere.GetComponent().enabled = false; - sphere.GetComponent().enabled = false; + Destroy(sphere.GetComponent()); + Destroy(sphere.GetComponent()); + sphere.AddComponent(); sphere.SetActive(true); sphere.tag = "Trash"; sphere.layer = 10; Trash = sphere; - } + }*/ private void ShowCatalog() { gameObject.transform.SetParent(player.hands[0].transform); @@ -98,7 +100,7 @@ public class Catalog : MonoBehaviour { SpawnSphere(i); } - SpawnTrash(); + //SpawnTrash(); StartCoroutine(CatalogCoroutine()); } @@ -145,10 +147,10 @@ public class Catalog : MonoBehaviour } } - public void OnGrabSphere(CatalogElement sphere, Valve.VR.InteractionSystem.Hand hand) + public void OnGrabSphere(CatalogElement sphere) { SpawnSphere(sphere.index); - MovableFurniture grab = hand.GetComponent().Grabbing; + MovableFurniture grab = FurnitureMover.Instance.Grabbing; if (grab != null) { return; @@ -161,12 +163,12 @@ public class Catalog : MonoBehaviour } script.CalculateBounds(); //script.OnPointerClickDown(); - hand.GetComponent().Grabbing = script; + FurnitureMover.Instance.Grabbing = script; } - public void OnReleaseSphere(CatalogElement sphere, Valve.VR.InteractionSystem.Hand hand) + public void OnReleaseSphere(CatalogElement sphere) { - hand.GetComponent().Grabbing = null; + FurnitureMover.Instance.Grabbing = null; } diff --git a/Assets/Scripts/CatalogElement.cs b/Assets/Scripts/CatalogElement.cs index 2051730..944d0c8 100644 --- a/Assets/Scripts/CatalogElement.cs +++ b/Assets/Scripts/CatalogElement.cs @@ -38,7 +38,7 @@ public class CatalogElement : Throwable attachPosition = transform.position; attachRotation = transform.rotation; - Catalog.Instance.OnGrabSphere(this, hand); + Catalog.Instance.OnGrabSphere(this); //hand.GetComponent().Grabbing = largeFurnitureModel.GetComponent(); } @@ -54,7 +54,7 @@ public class CatalogElement : Throwable rigidbody.interpolation = hadInterpolation; - Catalog.Instance.OnReleaseSphere(this, hand); + Catalog.Instance.OnReleaseSphere(this); Destroy(gameObject); } diff --git a/Assets/Scripts/FurnitureMover.cs b/Assets/Scripts/FurnitureMover.cs index e78aa4c..eabb306 100644 --- a/Assets/Scripts/FurnitureMover.cs +++ b/Assets/Scripts/FurnitureMover.cs @@ -42,9 +42,9 @@ public class FurnitureMover : MonoBehaviour private void Start() { Instance = this; - hand = GetComponent(); + hand = Player.instance.GetHand(1); ; if (pose == null) - pose = this.GetComponent(); + pose = hand.GetComponent(); if (pose == null) Debug.LogError("No SteamVR_Behaviour_Pose component found on this object", this); @@ -196,7 +196,7 @@ public class FurnitureMover : MonoBehaviour public void ReleaseFurniture(GameObject furniture) { - Catalog.Instance.ReleaseObject(furniture, gameObject.GetComponent()); + Catalog.Instance.ReleaseObject(furniture, hand); } private void OnPointerClickDown(object sender, PointerEventArgs e) { diff --git a/Assets/Scripts/Trash.cs b/Assets/Scripts/Trash.cs new file mode 100644 index 0000000..1db0638 --- /dev/null +++ b/Assets/Scripts/Trash.cs @@ -0,0 +1,87 @@ +using System.Collections; +using UnityEngine; +using Valve.VR.InteractionSystem; + +public class Trash : MonoBehaviour +{ + public GameObject largeFurnitureModel; + public int index; + private GameObject smallFurnitureModel; + private Vector3 returnPosition; + // Start is called before the first frame update + void Start() + { + returnPosition = transform.localPosition; + } + + // Update is called once per frame + void Update() + { + + } + + + + public void SetFurniture(GameObject furniture, float objectScale) + { + largeFurnitureModel = furniture; + smallFurnitureModel = Instantiate(furniture); + var throwables = smallFurnitureModel.GetComponentsInChildren(); + foreach (Throwable throwable in throwables) + { + Destroy(throwable); + }; + var rigidbodies = smallFurnitureModel.GetComponentsInChildren(); + foreach (Rigidbody rigidbody in rigidbodies) + { + Destroy(rigidbody); + }; + smallFurnitureModel.transform.parent = transform; + Destroy(smallFurnitureModel.GetComponent()); + Furniture objectBounds = smallFurnitureModel.AddComponent(); + objectBounds.CalculateBounds(); + var colldiers = smallFurnitureModel.GetComponentsInChildren(); + foreach (Collider collider in colldiers) + { + Destroy(collider); + }; + float rescale = (objectScale / 1.4f) / objectBounds.combinedBounds.size.magnitude; + smallFurnitureModel.transform.localScale *= rescale; + smallFurnitureModel.transform.localPosition = Vector3.down * 0.2f; + + StartCoroutine(KeepFurnitureAligned()); + } + + public void ClearFurniture() + { + Destroy(smallFurnitureModel); + } + + private IEnumerator ReturnSphere() + { + float time = 0; + Vector3 startPosition = transform.localPosition; + while (time <= 1) + { + transform.localPosition = Vector3.Lerp(startPosition, returnPosition, time); + time += Time.deltaTime * 4; + yield return null; + } + yield break; + } + + private IEnumerator KeepFurnitureAligned() + { + while (true) + { + smallFurnitureModel.transform.eulerAngles = new Vector3(0, smallFurnitureModel.transform.eulerAngles.y - (20 * Time.deltaTime), 0); + yield return null; + } + } + + + private void OnPointerEnter() + { + Debug.Log("enter"); + } +} diff --git a/Assets/Scripts/Trash.cs.meta b/Assets/Scripts/Trash.cs.meta new file mode 100644 index 0000000..92b3ef1 --- /dev/null +++ b/Assets/Scripts/Trash.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 274e05291e7b24c4e94f4be0000aee1e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 208632567ea81f0c574827f9dd7e652cede5fa92 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Thu, 26 Jan 2023 14:42:05 +0100 Subject: [PATCH 3/5] Fix some models --- Assets/Models/circuitboard.prefab | 2 +- Assets/Models/screwdriver.prefab | 110 ++++++++-------- Assets/Scenes/FabLab/FabLab.unity | 211 +++++++++++++++++++++++------- 3 files changed, 220 insertions(+), 103 deletions(-) diff --git a/Assets/Models/circuitboard.prefab b/Assets/Models/circuitboard.prefab index f9d3d0d..8957e75 100644 --- a/Assets/Models/circuitboard.prefab +++ b/Assets/Models/circuitboard.prefab @@ -109,7 +109,7 @@ MonoBehaviour: m_EditorClassIdentifier: activateActionSetOnAttach: actionSetPath: - hideHandOnAttach: 1 + hideHandOnAttach: 0 hideSkeletonOnAttach: 0 hideControllerOnAttach: 0 handAnimationOnPickup: 0 diff --git a/Assets/Models/screwdriver.prefab b/Assets/Models/screwdriver.prefab index 83284ba..beb0dd7 100644 --- a/Assets/Models/screwdriver.prefab +++ b/Assets/Models/screwdriver.prefab @@ -175,7 +175,7 @@ MonoBehaviour: m_EditorClassIdentifier: activateActionSetOnAttach: actionSetPath: - hideHandOnAttach: 1 + hideHandOnAttach: 0 hideSkeletonOnAttach: 0 hideControllerOnAttach: 0 handAnimationOnPickup: 0 @@ -213,6 +213,60 @@ MonoBehaviour: highlightOnHover: 1 hideHighlight: [] hoverPriority: 0 +--- !u!114 &1486307381670797623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1880102723515332267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 341 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 3 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} --- !u!114 &1904605114195921641 MonoBehaviour: m_ObjectHideFlags: 0 @@ -280,60 +334,6 @@ MonoBehaviour: spawnObjectOnCollision: {fileID: 1000012514662164, guid: ada35c93b68ad004d9b4e7bd686cf189, type: 3} colorSpawnedObject: 1 destroyOnTargetCollision: 1 ---- !u!114 &1486307381670797623 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1880102723515332267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} - m_Name: - m_EditorClassIdentifier: - attachmentFlags: 341 - attachmentOffset: {fileID: 0} - catchingSpeedThreshold: -1 - releaseVelocityStyle: 3 - releaseVelocityTimeOffset: -0.011 - scaleReleaseVelocity: 1.1 - scaleReleaseVelocityThreshold: -1 - scaleReleaseVelocityCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - restoreOriginalParent: 0 - onPickUp: - m_PersistentCalls: - m_Calls: [] - onDetachFromHand: - m_PersistentCalls: - m_Calls: [] - onHeldUpdate: - m_PersistentCalls: - m_Calls: [] - interactable: {fileID: 0} --- !u!1 &3509871167403709943 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2766212503428324877, guid: 21eef4e05fdb69a4a8aa0e4ef1007bab, type: 3} diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 07d28a3..ed8af21 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -7265,7 +7265,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 363747407} - - component: {fileID: 363747408} m_Layer: 0 m_Name: Computer Rig m_TagString: Untagged @@ -7293,22 +7292,6 @@ Transform: m_Father: {fileID: 146814758} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &363747408 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 363747406} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} - m_Name: - m_EditorClassIdentifier: - combinedBounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - wallMount: 0 --- !u!1001 &366020801 PrefabInstance: m_ObjectHideFlags: 0 @@ -7610,15 +7593,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.x - value: -1.5043453 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.y - value: 1.4918169 + value: 0.11 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalPosition.z - value: -15.434761 + value: -12.81 objectReference: {fileID: 0} - target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3} propertyPath: m_LocalRotation.w @@ -8452,10 +8435,9 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} --- !u!4 &472164268 stripped Transform: @@ -10715,7 +10697,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50646 + m_Name: pb_Mesh24722 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11192,7 +11174,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} @@ -13806,6 +13788,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 90 objectReference: {fileID: 0} + - target: {fileID: 9082827438125951081, guid: ab468a82ad445da4e9a084297505261f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.025 + objectReference: {fileID: 0} + - target: {fileID: 9082827438125951081, guid: ab468a82ad445da4e9a084297505261f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.723 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ab468a82ad445da4e9a084297505261f, type: 3} --- !u!4 &802860442 stripped @@ -14090,6 +14080,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 808552922} + - component: {fileID: 808552923} m_Layer: 0 m_Name: Imprimantes 3D m_TagString: Untagged @@ -14116,6 +14107,22 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &808552923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808552921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &815680570 PrefabInstance: m_ObjectHideFlags: 0 @@ -17838,6 +17845,27 @@ Transform: m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} m_PrefabInstance: {fileID: 743326945} m_PrefabAsset: {fileID: 0} +--- !u!1 &1164507841 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 670219874} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1164507842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1164507841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &1173886245 GameObject: m_ObjectHideFlags: 0 @@ -18788,7 +18816,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50254 + m_Name: pb_Mesh24330 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18952,7 +18980,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50046 + m_Name: pb_Mesh24114 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19185,7 +19213,8 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} --- !u!4 &1317084064 stripped Transform: @@ -19260,7 +19289,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50200 + m_Name: pb_Mesh24276 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -20497,6 +20526,27 @@ Transform: m_CorrespondingSourceObject: {fileID: 4812896578459389604, guid: 7c648947d00d08049bf9af26d1bc3db8, type: 3} m_PrefabInstance: {fileID: 1481052597} m_PrefabAsset: {fileID: 0} +--- !u!1 &1530350375 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 765875806} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1530350376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530350375} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &1532826547 PrefabInstance: m_ObjectHideFlags: 0 @@ -22838,6 +22888,11 @@ Transform: m_Father: {fileID: 794063582} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1670271076 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 1821824933} + m_PrefabAsset: {fileID: 0} --- !u!1 &1672585691 GameObject: m_ObjectHideFlags: 0 @@ -22989,6 +23044,32 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1710850078 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 293073268} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1710850079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710850078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 +--- !u!1 &1721687456 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 1782748917} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1727196003 PrefabInstance: m_ObjectHideFlags: 0 @@ -26241,6 +26322,22 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} m_PrefabInstance: {fileID: 1782748917} m_PrefabAsset: {fileID: 0} +--- !u!114 &1782748919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721687456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &1796368673 GameObject: m_ObjectHideFlags: 0 @@ -26582,6 +26679,22 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} m_PrefabInstance: {fileID: 1821824933} m_PrefabAsset: {fileID: 0} +--- !u!114 &1821824935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670271076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!4 &1822718828 stripped Transform: m_CorrespondingSourceObject: {fileID: 5554971243091150254, guid: 124ae331af1b2e845b7de5a2ccb168d4, type: 3} @@ -27416,7 +27529,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1888977164} - - component: {fileID: 1888977165} m_Layer: 0 m_Name: Computer Rig m_TagString: Untagged @@ -27444,22 +27556,6 @@ Transform: m_Father: {fileID: 435302310} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1888977165 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888977163} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} - m_Name: - m_EditorClassIdentifier: - combinedBounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - wallMount: 0 --- !u!4 &1889890278 stripped Transform: m_CorrespondingSourceObject: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} @@ -27994,6 +28090,27 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} m_PrefabInstance: {fileID: 1916827214} m_PrefabAsset: {fileID: 0} +--- !u!1 &1929959350 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 1329833007} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1929959351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1929959350} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &1941597267 GameObject: m_ObjectHideFlags: 0 @@ -29023,7 +29140,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh50174 + m_Name: pb_Mesh24250 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 From f817238ce9a4ef1ddcbe1bc71f3c7a77659eebf8 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Thu, 26 Jan 2023 15:00:23 +0100 Subject: [PATCH 4/5] batman & ironman poses --- Assets/Models/Blender/shelf.blend | 4 +- Assets/Models/Iron Man Variant.prefab | 239 ++++++++ Assets/Models/Iron Man Variant.prefab.meta | 7 + Assets/Models/LegoDarthVader Variant.prefab | 225 +++++++ .../Models/LegoDarthVader Variant.prefab.meta | 7 + Assets/Models/LegoDeadPool Variant.prefab | 225 +++++++ .../Models/LegoDeadPool Variant.prefab.meta | 7 + Assets/Models/batman Variant.prefab | 239 ++++++++ Assets/Models/batman Variant.prefab.meta | 7 + Assets/Models/shelf_empty.prefab | 222 ++++++- Assets/Poses/Batman.asset | 165 +++++ Assets/Poses/Batman.asset.meta | 8 + Assets/Poses/IronMan.asset | 165 +++++ Assets/Poses/IronMan.asset.meta | 8 + Assets/Scenes/FabLab/FabLab.unity | 566 +++++++++--------- 15 files changed, 1780 insertions(+), 314 deletions(-) create mode 100644 Assets/Models/Iron Man Variant.prefab create mode 100644 Assets/Models/Iron Man Variant.prefab.meta create mode 100644 Assets/Models/LegoDarthVader Variant.prefab create mode 100644 Assets/Models/LegoDarthVader Variant.prefab.meta create mode 100644 Assets/Models/LegoDeadPool Variant.prefab create mode 100644 Assets/Models/LegoDeadPool Variant.prefab.meta create mode 100644 Assets/Models/batman Variant.prefab create mode 100644 Assets/Models/batman Variant.prefab.meta create mode 100644 Assets/Poses/Batman.asset create mode 100644 Assets/Poses/Batman.asset.meta create mode 100644 Assets/Poses/IronMan.asset create mode 100644 Assets/Poses/IronMan.asset.meta diff --git a/Assets/Models/Blender/shelf.blend b/Assets/Models/Blender/shelf.blend index 77e2582..40b6502 100644 --- a/Assets/Models/Blender/shelf.blend +++ b/Assets/Models/Blender/shelf.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e16425a1fbc848eba502ba7d1d891a5037a4c3a38103551e5fb97e8ef0c2d4b -size 941488 +oid sha256:d0a36d0d5d01d0156db2ec1118b1f80ead8e0b8e429b5e0246ee247bd288e710 +size 901196 diff --git a/Assets/Models/Iron Man Variant.prefab b/Assets/Models/Iron Man Variant.prefab new file mode 100644 index 0000000..da524d7 --- /dev/null +++ b/Assets/Models/Iron Man Variant.prefab @@ -0,0 +1,239 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1488380924582843823 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalScale.x + value: 0.38358912 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalScale.y + value: 0.38358912 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalScale.z + value: 0.38358912 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalPosition.x + value: -0.38066483 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalPosition.y + value: 0.23444843 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalPosition.z + value: 2.1820936 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalRotation.y + value: -0.0000014603138 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalRotation.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_Name + value: Iron Man Variant + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} +--- !u!1 &1758272205314550014 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + m_PrefabInstance: {fileID: 1488380924582843823} + m_PrefabAsset: {fileID: 0} +--- !u!54 &4899828156213876616 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1758272205314550014} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &7628725550989399863 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1758272205314550014} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 1366794835595815834, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} +--- !u!114 &2809616519087702507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1758272205314550014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93b6a877adcbf94c89a9d6e0c0e844d, type: 3} + m_Name: + m_EditorClassIdentifier: + activateActionSetOnAttach: + actionSetPath: + hideHandOnAttach: 0 + hideSkeletonOnAttach: 0 + hideControllerOnAttach: 0 + handAnimationOnPickup: 0 + setRangeOfMotionOnPickup: -1 + useHandObjectAttachmentPoint: 1 + attachEaseIn: 0 + snapAttachEaseInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + snapAttachEaseInTime: 0.15 + snapAttachEaseInCompleted: 0 + skeletonPoser: {fileID: 0} + handFollowTransform: 1 + highlightOnHover: 1 + hideHighlight: [] + hoverPriority: 0 +--- !u!114 &4939849537856601462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1758272205314550014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 44 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 1 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} +--- !u!114 &6969910892239903489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1758272205314550014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} + m_Name: + m_EditorClassIdentifier: + poseEditorExpanded: 1 + blendEditorExpanded: 1 + poseNames: + - IronMan (MAIN) + overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} + overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} + skeletonMainPose: {fileID: 11400000, guid: d7f3fc46cc98d35468f6906385bd39f0, type: 2} + skeletonAdditionalPoses: [] + showLeftPreview: 0 + showRightPreview: 0 + previewLeftInstance: {fileID: 0} + previewRightInstance: {fileID: 0} + previewPoseSelection: 0 + blendingBehaviours: [] + scale: 1 diff --git a/Assets/Models/Iron Man Variant.prefab.meta b/Assets/Models/Iron Man Variant.prefab.meta new file mode 100644 index 0000000..be55c0e --- /dev/null +++ b/Assets/Models/Iron Man Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 57623ee931afbf44f82c7fe1274a1311 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/LegoDarthVader Variant.prefab b/Assets/Models/LegoDarthVader Variant.prefab new file mode 100644 index 0000000..98cd20f --- /dev/null +++ b/Assets/Models/LegoDarthVader Variant.prefab @@ -0,0 +1,225 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3340124808101023123 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalScale.x + value: 0.004926007 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalScale.y + value: 0.004926006 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalScale.z + value: 0.004926007 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalPosition.x + value: -0.012664795 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalPosition.y + value: 0.57064915 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalPosition.z + value: 3.3612938 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.0000012218952 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalRotation.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_Name + value: LegoDarthVader Variant + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} +--- !u!1 &2493841909946642626 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + m_PrefabInstance: {fileID: 3340124808101023123} + m_PrefabAsset: {fileID: 0} +--- !u!54 &2614096455480076436 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2493841909946642626} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1067218591876495852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2493841909946642626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93b6a877adcbf94c89a9d6e0c0e844d, type: 3} + m_Name: + m_EditorClassIdentifier: + activateActionSetOnAttach: + actionSetPath: + hideHandOnAttach: 0 + hideSkeletonOnAttach: 0 + hideControllerOnAttach: 0 + handAnimationOnPickup: 0 + setRangeOfMotionOnPickup: -1 + useHandObjectAttachmentPoint: 1 + attachEaseIn: 0 + snapAttachEaseInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + snapAttachEaseInTime: 0.15 + snapAttachEaseInCompleted: 0 + skeletonPoser: {fileID: 0} + handFollowTransform: 1 + highlightOnHover: 1 + hideHighlight: [] + hoverPriority: 0 +--- !u!114 &2923271336702560246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2493841909946642626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 44 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 1 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} +--- !u!114 &3632220126970041568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2493841909946642626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} + m_Name: + m_EditorClassIdentifier: + poseEditorExpanded: 1 + blendEditorExpanded: 1 + poseNames: + - '[not set]' + overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} + overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} + skeletonMainPose: {fileID: 0} + skeletonAdditionalPoses: [] + showLeftPreview: 0 + showRightPreview: 1 + previewLeftInstance: {fileID: 0} + previewRightInstance: {fileID: 0} + previewPoseSelection: 0 + blendingBehaviours: [] + scale: 1 diff --git a/Assets/Models/LegoDarthVader Variant.prefab.meta b/Assets/Models/LegoDarthVader Variant.prefab.meta new file mode 100644 index 0000000..f33213c --- /dev/null +++ b/Assets/Models/LegoDarthVader Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e36a1836156340248b3f5a4227eb6a2d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/LegoDeadPool Variant.prefab b/Assets/Models/LegoDeadPool Variant.prefab new file mode 100644 index 0000000..910fc5c --- /dev/null +++ b/Assets/Models/LegoDeadPool Variant.prefab @@ -0,0 +1,225 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &372263791592769470 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalScale.x + value: 0.009727307 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalScale.y + value: 0.009727308 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalScale.z + value: 0.009727308 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalPosition.x + value: -0.030664444 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalPosition.y + value: 0.36864853 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalPosition.z + value: 1.4510937 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + propertyPath: m_Name + value: LegoDeadPool Variant + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} +--- !u!1 &714913609321134831 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + m_PrefabInstance: {fileID: 372263791592769470} + m_PrefabAsset: {fileID: 0} +--- !u!54 &3706756380126257672 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714913609321134831} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &760999227076707835 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714913609321134831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 44 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 1 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} +--- !u!114 &8459362087713866821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714913609321134831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93b6a877adcbf94c89a9d6e0c0e844d, type: 3} + m_Name: + m_EditorClassIdentifier: + activateActionSetOnAttach: + actionSetPath: + hideHandOnAttach: 0 + hideSkeletonOnAttach: 0 + hideControllerOnAttach: 0 + handAnimationOnPickup: 0 + setRangeOfMotionOnPickup: -1 + useHandObjectAttachmentPoint: 1 + attachEaseIn: 0 + snapAttachEaseInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + snapAttachEaseInTime: 0.15 + snapAttachEaseInCompleted: 0 + skeletonPoser: {fileID: 0} + handFollowTransform: 1 + highlightOnHover: 1 + hideHighlight: [] + hoverPriority: 0 +--- !u!114 &9125176907604234830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714913609321134831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} + m_Name: + m_EditorClassIdentifier: + poseEditorExpanded: 1 + blendEditorExpanded: 1 + poseNames: + - '[not set]' + overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} + overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} + skeletonMainPose: {fileID: 0} + skeletonAdditionalPoses: [] + showLeftPreview: 0 + showRightPreview: 1 + previewLeftInstance: {fileID: 0} + previewRightInstance: {fileID: 0} + previewPoseSelection: 0 + blendingBehaviours: [] + scale: 1 diff --git a/Assets/Models/LegoDeadPool Variant.prefab.meta b/Assets/Models/LegoDeadPool Variant.prefab.meta new file mode 100644 index 0000000..f04387f --- /dev/null +++ b/Assets/Models/LegoDeadPool Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5bf5739ad1a7c7e44a6b131d8321738c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/batman Variant.prefab b/Assets/Models/batman Variant.prefab new file mode 100644 index 0000000..592550c --- /dev/null +++ b/Assets/Models/batman Variant.prefab @@ -0,0 +1,239 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4374302203648793017 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalScale.x + value: 0.0045359377 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalScale.y + value: 0.004535937 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalScale.z + value: 0.0045359377 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.38933563 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.20024872 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalPosition.z + value: 2.429494 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.000000029802319 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000029802319 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00015765427 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalRotation.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -89.982 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_Name + value: batman Variant + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} +--- !u!1 &3491923020580971752 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + m_PrefabInstance: {fileID: 4374302203648793017} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1337652673018887031 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491923020580971752} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &2129062515905764556 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491923020580971752} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 588533648186748948, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} +--- !u!114 &1384488508520170071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491923020580971752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 44 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 1 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} +--- !u!114 &2988820106704201243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491923020580971752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93b6a877adcbf94c89a9d6e0c0e844d, type: 3} + m_Name: + m_EditorClassIdentifier: + activateActionSetOnAttach: + actionSetPath: + hideHandOnAttach: 0 + hideSkeletonOnAttach: 0 + hideControllerOnAttach: 0 + handAnimationOnPickup: 0 + setRangeOfMotionOnPickup: -1 + useHandObjectAttachmentPoint: 1 + attachEaseIn: 0 + snapAttachEaseInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + snapAttachEaseInTime: 0.15 + snapAttachEaseInCompleted: 0 + skeletonPoser: {fileID: 0} + handFollowTransform: 1 + highlightOnHover: 1 + hideHighlight: [] + hoverPriority: 0 +--- !u!114 &6860858621117912442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491923020580971752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} + m_Name: + m_EditorClassIdentifier: + poseEditorExpanded: 1 + blendEditorExpanded: 1 + poseNames: + - Batman (MAIN) + overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} + overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} + skeletonMainPose: {fileID: 11400000, guid: 35307d4a9be0d3749b7d98d276ba243e, type: 2} + skeletonAdditionalPoses: [] + showLeftPreview: 0 + showRightPreview: 0 + previewLeftInstance: {fileID: 0} + previewRightInstance: {fileID: 0} + previewPoseSelection: 0 + blendingBehaviours: [] + scale: 1 diff --git a/Assets/Models/batman Variant.prefab.meta b/Assets/Models/batman Variant.prefab.meta new file mode 100644 index 0000000..c826210 --- /dev/null +++ b/Assets/Models/batman Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/shelf_empty.prefab b/Assets/Models/shelf_empty.prefab index 4a6cfce..d459f81 100644 --- a/Assets/Models/shelf_empty.prefab +++ b/Assets/Models/shelf_empty.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 4373656613854321104} - component: {fileID: 7637922860383089311} - component: {fileID: 4348504127986111419} + - component: {fileID: 1685068482609263266} m_Layer: 0 m_Name: Plank m_TagString: Untagged @@ -83,6 +84,19 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &1685068482609263266 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151859614629998926} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2, y: 2, z: 2} + m_Center: {x: 0, y: 0, z: 1.0000076} --- !u!1 &817123034334832562 GameObject: m_ObjectHideFlags: 0 @@ -94,6 +108,7 @@ GameObject: - component: {fileID: 6292331777379627211} - component: {fileID: 3753834416908518541} - component: {fileID: 5629230511514222605} + - component: {fileID: 8219574454025879410} m_Layer: 0 m_Name: Plank.001 m_TagString: Untagged @@ -166,6 +181,19 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &8219574454025879410 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817123034334832562} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2, y: 2, z: 2} + m_Center: {x: 0, y: 0, z: 36.33335} --- !u!1 &1565016516766354980 GameObject: m_ObjectHideFlags: 0 @@ -259,7 +287,6 @@ GameObject: m_Component: - component: {fileID: 2996515769384266075} - component: {fileID: 2709258200819239477} - - component: {fileID: 6645681851711596344} m_Layer: 0 m_Name: shelf_empty m_TagString: Untagged @@ -289,6 +316,9 @@ Transform: - {fileID: 2781697966167280641} - {fileID: 5613503160827514234} - {fileID: 5878205338461874499} + - {fileID: 7089163471913477987} + - {fileID: 4276685423596383711} + - {fileID: 4624794482352009251} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} @@ -308,19 +338,6 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} wallMount: 0 ---- !u!65 &6645681851711596344 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2512467202128557025} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 2.017374, y: 1.4093293, z: 4.320848} - m_Center: {x: -0.0065603256, y: 0.012041539, z: 2.1498158} --- !u!1 &2602268122132683364 GameObject: m_ObjectHideFlags: 0 @@ -415,6 +432,7 @@ GameObject: - component: {fileID: 1696234186987782576} - component: {fileID: 6763664956820690827} - component: {fileID: 362197538518680714} + - component: {fileID: 1750024609944769484} m_Layer: 0 m_Name: Plank.002 m_TagString: Untagged @@ -487,6 +505,19 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &1750024609944769484 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2884046772418411006} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2, y: 2, z: 2} + m_Center: {x: 0, y: 0, z: 71.6667} --- !u!1 &3615767594520240237 GameObject: m_ObjectHideFlags: 0 @@ -570,6 +601,51 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4362281881980236512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4276685423596383711} + - component: {fileID: 1366097347072860160} + m_Layer: 0 + m_Name: Walls (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4276685423596383711 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4362281881980236512} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.986, y: 0, z: 3.705} + m_LocalScale: {x: 1, y: 0.7, z: 0.03} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2996515769384266075} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1366097347072860160 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4362281881980236512} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.06715953, y: 2.0036957, z: 140.40587} + m_Center: {x: -0.024765432, y: 0.01817499, z: -52.36006} --- !u!1 &4588887904168053738 GameObject: m_ObjectHideFlags: 0 @@ -698,6 +774,96 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5871264614445339362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7089163471913477987} + - component: {fileID: 2591858058391926612} + m_Layer: 0 + m_Name: Walls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7089163471913477987 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5871264614445339362} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.94400024, y: 0, z: 3.705} + m_LocalScale: {x: 1, y: 0.7, z: 0.03} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2996515769384266075} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2591858058391926612 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5871264614445339362} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.06715953, y: 2.0036957, z: 140.40587} + m_Center: {x: -0.024765432, y: 0.01817499, z: -52.36006} +--- !u!1 &6102966110258896889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4624794482352009251} + - component: {fileID: 5984040510161690092} + m_Layer: 0 + m_Name: Walls (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4624794482352009251 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6102966110258896889} + m_LocalRotation: {x: -0, y: -0, z: -0.70710576, w: 0.7071079} + m_LocalPosition: {x: -0.073, y: -0.679, z: 3.705} + m_LocalScale: {x: 1, y: 0.7, z: 0.03} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2996515769384266075} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!65 &5984040510161690092 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6102966110258896889} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.06715953, y: 2.8536136, z: 140.40579} + m_Center: {x: -0.02476544, y: 0.10653682, z: -52.360085} --- !u!1 &6640510962220684130 GameObject: m_ObjectHideFlags: 0 @@ -709,6 +875,7 @@ GameObject: - component: {fileID: 2781697966167280641} - component: {fileID: 3020234109186093194} - component: {fileID: 2847253363038930626} + - component: {fileID: 3154147854577749798} m_Layer: 0 m_Name: Plank.003 m_TagString: Untagged @@ -781,6 +948,19 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &3154147854577749798 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6640510962220684130} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2, y: 2, z: 2} + m_Center: {x: 0, y: 0, z: 107.000046} --- !u!1 &8712456045789040059 GameObject: m_ObjectHideFlags: 0 @@ -792,6 +972,7 @@ GameObject: - component: {fileID: 5613503160827514234} - component: {fileID: 2866881517702111988} - component: {fileID: 7788739625590415122} + - component: {fileID: 8863512503420945526} m_Layer: 0 m_Name: Plank.004 m_TagString: Untagged @@ -864,3 +1045,16 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &8863512503420945526 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8712456045789040059} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2, y: 2, z: 2} + m_Center: {x: 0, y: 0, z: 142.3334} diff --git a/Assets/Poses/Batman.asset b/Assets/Poses/Batman.asset new file mode 100644 index 0000000..e8a4fcc --- /dev/null +++ b/Assets/Poses/Batman.asset @@ -0,0 +1,165 @@ +%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: e90911e410742a1498a167540c7865bf, type: 3} + m_Name: Batman + m_EditorClassIdentifier: + leftHand: + inputSource: 1 + thumbFingerMovementType: 0 + indexFingerMovementType: 0 + middleFingerMovementType: 0 + ringFingerMovementType: 0 + pinkyFingerMovementType: 0 + ignoreRootPoseData: 1 + ignoreWristPoseData: 1 + position: {x: -0.15535358, y: 0.000000003414527, z: -0.30495334} + rotation: {x: 0, y: -0, z: -0, w: -1} + bonePositions: + - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} + - {x: -0.1249, y: -0.0641, z: -0.015} + - {x: -0.012083233, y: 0.028070247, z: 0.025049694} + - {x: 0.040405963, y: -0.000000051561553, z: 0.000000045447194} + - {x: 0.032516792, y: -0.000000051137583, z: -0.000000012933195} + - {x: 0.030463902, y: 0.00000016269207, z: 0.0000000792839} + - {x: 0.0006324522, y: 0.026866155, z: 0.015001948} + - {x: 0.074205786, y: 0.0050019994, z: -0.00023392588} + - {x: 0.043933876, y: 0.0000022631139, z: 0.0000011087395} + - {x: 0.028699178, y: 0.000004455447, z: 0.000001381035} + - {x: 0.022821384, y: -0.00000014365155, z: 0.00000007651614} + - {x: 0.0021773134, y: 0.007119544, z: 0.016318738} + - {x: 0.07095288, y: -0.00077883265, z: -0.000997186} + - {x: 0.043108486, y: -0.00000009950596, z: -0.0000000067041825} + - {x: 0.033266045, y: -0.00000001320567, z: -0.000000021670374} + - {x: 0.025892371, y: 0.00000009984198, z: -0.0000000020352908} + - {x: 0.0005134356, y: -0.0065451227, z: 0.016347693} + - {x: 0.06587581, y: -0.0017857892, z: -0.00069344096} + - {x: 0.04069671, y: -0.000000095347104, z: -0.000000022934731} + - {x: 0.028746964, y: 0.00000010089892, z: 0.000000045306827} + - {x: 0.022430236, y: 0.00000010846127, z: -0.000000017428562} + - {x: -0.002478151, y: -0.01898137, z: 0.015213584} + - {x: 0.0628784, y: -0.0028440945, z: -0.0003315112} + - {x: 0.030219711, y: -0.00000003418319, z: -0.00000009332872} + - {x: 0.018186597, y: -0.0000000050220166, z: -0.00000020934549} + - {x: 0.01801794, y: -0.0000000200012, z: 0.0000000659746} + - {x: -0.0060591106, y: 0.05628522, z: 0.060063843} + - {x: -0.04041555, y: -0.043017667, z: 0.019344581} + - {x: -0.03935372, y: -0.07567404, z: 0.047048334} + - {x: -0.038340144, y: -0.09098663, z: 0.08257892} + - {x: -0.031805996, y: -0.08721431, z: 0.12101539} + boneRotations: + - {x: 0.0000000475481, y: 0.887805, z: -0.46021983, w: -0.000000038807222} + - {x: 0.9009976, y: -0.008128658, z: 0.2871888, w: -0.3250536} + - {x: -0.46411175, y: -0.623374, z: 0.2721063, w: 0.5674181} + - {x: 0.08293856, y: -0.019454371, z: -0.055129882, w: 0.9948384} + - {x: -0.0032133153, y: -0.021866836, z: 0.22201493, w: 0.9747928} + - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} + - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} + - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} + - {x: 0.049148347, y: 0.094583124, z: -0.22788282, w: 0.96783674} + - {x: -0.022144955, y: -0.012569891, z: -0.2613105, w: 0.96491885} + - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} + - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} + - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} + - {x: 0.12004137, y: 0.2327993, z: -0.5430338, w: 0.7978151} + - {x: 0.069659054, y: 0.17697607, z: -0.25511828, w: 0.94802} + - {x: 1.1639192e-17, y: -5.602331e-17, z: -0.040125635, w: 0.9991947} + - {x: -0.5166922, y: -0.4298879, z: -0.49554786, w: 0.5501435} + - {x: -0.031803455, y: 0.105617106, z: -0.20536979, w: 0.97244895} + - {x: 0.17615516, y: 0.07787938, z: -0.6255362, w: 0.756048} + - {x: 0.084940895, y: 0.05598685, z: -0.32453248, w: 0.9403878} + - {x: 6.938894e-18, y: -9.62965e-35, z: -1.3877788e-17, w: 1} + - {x: -0.5269183, y: -0.32674035, z: -0.5840246, w: 0.52394} + - {x: -0.025836557, y: 0.15397653, z: -0.07745232, w: 0.9846953} + - {x: 0.0013947003, y: 0.0012913644, z: -0.70634955, w: 0.7078607} + - {x: -0.010113827, y: 0.051127177, z: -0.082817696, w: 0.995201} + - {x: 0, y: 0, z: 1.9081958e-17, w: 1} + - {x: 0.20274544, y: 0.59426665, z: 0.2494411, w: 0.73723847} + - {x: 0.6235274, y: -0.66380864, z: -0.29373443, w: -0.29033053} + - {x: 0.6780625, y: -0.6592852, z: -0.26568344, w: -0.18704711} + - {x: 0.7367927, y: -0.6347571, z: -0.14393571, w: -0.18303718} + - {x: 0.7584072, y: -0.6393418, z: -0.12667806, w: -0.0036594148} + rightHand: + inputSource: 2 + thumbFingerMovementType: 0 + indexFingerMovementType: 0 + middleFingerMovementType: 0 + ringFingerMovementType: 0 + pinkyFingerMovementType: 0 + ignoreRootPoseData: 1 + ignoreWristPoseData: 1 + position: {x: 0.15535358, y: 0.000000003414527, z: -0.30495334} + rotation: {x: -0, y: -0, z: -0, w: 1} + bonePositions: + - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} + - {x: -0.1249, y: -0.0641, z: -0.015} + - {x: -0.012083233, y: 0.028070247, z: 0.025049694} + - {x: 0.040405963, y: -0.000000051561553, z: 0.000000045447194} + - {x: 0.032516792, y: -0.000000051137583, z: -0.000000012933195} + - {x: 0.030463902, y: 0.00000016269207, z: 0.0000000792839} + - {x: 0.0006324522, y: 0.026866155, z: 0.015001948} + - {x: 0.074205786, y: 0.0050019994, z: -0.00023392588} + - {x: 0.043933876, y: 0.0000022631139, z: 0.0000011087395} + - {x: 0.028699178, y: 0.000004455447, z: 0.000001381035} + - {x: 0.022821384, y: -0.00000014365155, z: 0.00000007651614} + - {x: 0.0021773134, y: 0.007119544, z: 0.016318738} + - {x: 0.07095288, y: -0.00077883265, z: -0.000997186} + - {x: 0.043108486, y: -0.00000009950596, z: -0.0000000067041825} + - {x: 0.033266045, y: -0.00000001320567, z: -0.000000021670374} + - {x: 0.025892371, y: 0.00000009984198, z: -0.0000000020352908} + - {x: 0.0005134356, y: -0.0065451227, z: 0.016347693} + - {x: 0.06587581, y: -0.0017857892, z: -0.00069344096} + - {x: 0.04069671, y: -0.000000095347104, z: -0.000000022934731} + - {x: 0.028746964, y: 0.00000010089892, z: 0.000000045306827} + - {x: 0.022430236, y: 0.00000010846127, z: -0.000000017428562} + - {x: -0.002478151, y: -0.01898137, z: 0.015213584} + - {x: 0.0628784, y: -0.0028440945, z: -0.0003315112} + - {x: 0.030219711, y: -0.00000003418319, z: -0.00000009332872} + - {x: 0.018186597, y: -0.0000000050220166, z: -0.00000020934549} + - {x: 0.01801794, y: -0.0000000200012, z: 0.0000000659746} + - {x: -0.0060591106, y: 0.05628522, z: 0.060063843} + - {x: -0.04041555, y: -0.043017667, z: 0.019344581} + - {x: -0.03935372, y: -0.07567404, z: 0.047048334} + - {x: -0.038340144, y: -0.09098663, z: 0.08257892} + - {x: -0.031805996, y: -0.08721431, z: 0.12101539} + boneRotations: + - {x: 0.0000000475481, y: 0.887805, z: -0.46021983, w: -0.000000038807222} + - {x: 0.9009976, y: -0.008128658, z: 0.2871888, w: -0.3250536} + - {x: -0.46411175, y: -0.623374, z: 0.2721063, w: 0.5674181} + - {x: 0.08293856, y: -0.019454371, z: -0.055129882, w: 0.9948384} + - {x: -0.0032133153, y: -0.021866836, z: 0.22201493, w: 0.9747928} + - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} + - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} + - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} + - {x: 0.049148344, y: 0.09458312, z: -0.2278828, w: 0.9678367} + - {x: -0.022144953, y: -0.012569891, z: -0.26131046, w: 0.96491885} + - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} + - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} + - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} + - {x: 0.12004137, y: 0.2327993, z: -0.5430338, w: 0.7978151} + - {x: 0.069659054, y: 0.17697607, z: -0.25511828, w: 0.94802} + - {x: 1.1639192e-17, y: -5.602331e-17, z: -0.040125635, w: 0.9991947} + - {x: -0.5166922, y: -0.4298879, z: -0.49554786, w: 0.5501435} + - {x: -0.031803455, y: 0.105617106, z: -0.20536979, w: 0.97244895} + - {x: 0.17615516, y: 0.07787938, z: -0.6255362, w: 0.756048} + - {x: 0.084940895, y: 0.05598685, z: -0.32453248, w: 0.9403878} + - {x: 6.938894e-18, y: -9.62965e-35, z: -1.3877788e-17, w: 1} + - {x: -0.5269183, y: -0.32674035, z: -0.5840246, w: 0.52394} + - {x: -0.025836557, y: 0.15397653, z: -0.07745232, w: 0.9846953} + - {x: 0.0013947003, y: 0.0012913644, z: -0.70634955, w: 0.7078607} + - {x: -0.010113827, y: 0.051127177, z: -0.082817696, w: 0.995201} + - {x: 0, y: 0, z: 1.9081958e-17, w: 1} + - {x: 0.20274544, y: 0.59426665, z: 0.2494411, w: 0.73723847} + - {x: 0.6235274, y: -0.66380864, z: -0.29373443, w: -0.29033053} + - {x: 0.6780625, y: -0.6592852, z: -0.26568344, w: -0.18704711} + - {x: 0.7367927, y: -0.6347571, z: -0.14393571, w: -0.18303718} + - {x: 0.7584072, y: -0.6393418, z: -0.12667806, w: -0.0036594148} + applyToSkeletonRoot: 1 diff --git a/Assets/Poses/Batman.asset.meta b/Assets/Poses/Batman.asset.meta new file mode 100644 index 0000000..a59d63b --- /dev/null +++ b/Assets/Poses/Batman.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35307d4a9be0d3749b7d98d276ba243e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Poses/IronMan.asset b/Assets/Poses/IronMan.asset new file mode 100644 index 0000000..b95f87f --- /dev/null +++ b/Assets/Poses/IronMan.asset @@ -0,0 +1,165 @@ +%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: e90911e410742a1498a167540c7865bf, type: 3} + m_Name: IronMan + m_EditorClassIdentifier: + leftHand: + inputSource: 1 + thumbFingerMovementType: 0 + indexFingerMovementType: 0 + middleFingerMovementType: 0 + ringFingerMovementType: 0 + pinkyFingerMovementType: 0 + ignoreRootPoseData: 1 + ignoreWristPoseData: 1 + position: {x: -0.15535358, y: 0.000000003414527, z: -0.30495334} + rotation: {x: 0, y: -0, z: -0, w: -1} + bonePositions: + - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} + - {x: -0.1249, y: -0.0641, z: -0.015} + - {x: -0.012083233, y: 0.028070247, z: 0.025049694} + - {x: 0.040405963, y: -0.000000051561553, z: 0.000000045447194} + - {x: 0.032516792, y: -0.000000051137583, z: -0.000000012933195} + - {x: 0.030463902, y: 0.00000016269207, z: 0.0000000792839} + - {x: 0.0006324522, y: 0.026866155, z: 0.015001948} + - {x: 0.074205786, y: 0.0050019994, z: -0.00023392588} + - {x: 0.043933876, y: 0.0000022631139, z: 0.0000011087395} + - {x: 0.028699178, y: 0.000004455447, z: 0.000001381035} + - {x: 0.022821384, y: -0.00000014365155, z: 0.00000007651614} + - {x: 0.0021773134, y: 0.007119544, z: 0.016318738} + - {x: 0.07095288, y: -0.00077883265, z: -0.000997186} + - {x: 0.043108486, y: -0.00000009950596, z: -0.0000000067041825} + - {x: 0.033266045, y: -0.00000001320567, z: -0.000000021670374} + - {x: 0.025892371, y: 0.00000009984198, z: -0.0000000020352908} + - {x: 0.0005134356, y: -0.0065451227, z: 0.016347693} + - {x: 0.06587581, y: -0.0017857892, z: -0.00069344096} + - {x: 0.04069671, y: -0.000000095347104, z: -0.000000022934731} + - {x: 0.028746964, y: 0.00000010089892, z: 0.000000045306827} + - {x: 0.022430236, y: 0.00000010846127, z: -0.000000017428562} + - {x: -0.002478151, y: -0.01898137, z: 0.015213584} + - {x: 0.0628784, y: -0.0028440945, z: -0.0003315112} + - {x: 0.030219711, y: -0.00000003418319, z: -0.00000009332872} + - {x: 0.018186597, y: -0.0000000050220166, z: -0.00000020934549} + - {x: 0.01801794, y: -0.0000000200012, z: 0.0000000659746} + - {x: -0.0060591106, y: 0.05628522, z: 0.060063843} + - {x: -0.04041555, y: -0.043017667, z: 0.019344581} + - {x: -0.03935372, y: -0.07567404, z: 0.047048334} + - {x: -0.038340144, y: -0.09098663, z: 0.08257892} + - {x: -0.031805996, y: -0.08721431, z: 0.12101539} + boneRotations: + - {x: 0.0000000475481, y: 0.887805, z: -0.46021983, w: -0.000000038807222} + - {x: 0.9009976, y: -0.008128658, z: 0.2871888, w: -0.3250536} + - {x: -0.46411175, y: -0.623374, z: 0.2721063, w: 0.5674181} + - {x: 0.08293856, y: -0.019454371, z: -0.055129882, w: 0.9948384} + - {x: -0.0032133153, y: -0.021866836, z: 0.22201493, w: 0.9747928} + - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} + - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} + - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} + - {x: 0.049148347, y: 0.094583124, z: -0.22788282, w: 0.96783674} + - {x: -0.022144955, y: -0.012569891, z: -0.2613105, w: 0.96491885} + - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} + - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} + - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} + - {x: 0.12004137, y: 0.2327993, z: -0.5430338, w: 0.7978151} + - {x: 0.069659054, y: 0.17697607, z: -0.25511828, w: 0.94802} + - {x: 1.1639192e-17, y: -5.602331e-17, z: -0.040125635, w: 0.9991947} + - {x: -0.5166922, y: -0.4298879, z: -0.49554786, w: 0.5501435} + - {x: -0.031803455, y: 0.105617106, z: -0.20536979, w: 0.97244895} + - {x: 0.17615516, y: 0.07787938, z: -0.6255362, w: 0.756048} + - {x: 0.084940895, y: 0.05598685, z: -0.32453248, w: 0.9403878} + - {x: 6.938894e-18, y: -9.62965e-35, z: -1.3877788e-17, w: 1} + - {x: -0.5269183, y: -0.32674035, z: -0.5840246, w: 0.52394} + - {x: -0.025836557, y: 0.15397653, z: -0.07745232, w: 0.9846953} + - {x: 0.0013947003, y: 0.0012913644, z: -0.70634955, w: 0.7078607} + - {x: -0.010113827, y: 0.051127177, z: -0.082817696, w: 0.995201} + - {x: 0, y: 0, z: 1.9081958e-17, w: 1} + - {x: 0.20274544, y: 0.59426665, z: 0.2494411, w: 0.73723847} + - {x: 0.6235274, y: -0.66380864, z: -0.29373443, w: -0.29033053} + - {x: 0.6780625, y: -0.6592852, z: -0.26568344, w: -0.18704711} + - {x: 0.7367927, y: -0.6347571, z: -0.14393571, w: -0.18303718} + - {x: 0.7584072, y: -0.6393418, z: -0.12667806, w: -0.0036594148} + rightHand: + inputSource: 2 + thumbFingerMovementType: 0 + indexFingerMovementType: 0 + middleFingerMovementType: 0 + ringFingerMovementType: 0 + pinkyFingerMovementType: 0 + ignoreRootPoseData: 1 + ignoreWristPoseData: 1 + position: {x: 0.15535358, y: 0.000000003414527, z: -0.30495334} + rotation: {x: -0, y: -0, z: -0, w: 1} + bonePositions: + - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} + - {x: -0.1249, y: -0.0641, z: -0.015} + - {x: -0.012083233, y: 0.028070247, z: 0.025049694} + - {x: 0.040405963, y: -0.000000051561553, z: 0.000000045447194} + - {x: 0.032516792, y: -0.000000051137583, z: -0.000000012933195} + - {x: 0.030463902, y: 0.00000016269207, z: 0.0000000792839} + - {x: 0.0006324522, y: 0.026866155, z: 0.015001948} + - {x: 0.074205786, y: 0.0050019994, z: -0.00023392588} + - {x: 0.043933876, y: 0.0000022631139, z: 0.0000011087395} + - {x: 0.028699178, y: 0.000004455447, z: 0.000001381035} + - {x: 0.022821384, y: -0.00000014365155, z: 0.00000007651614} + - {x: 0.0021773134, y: 0.007119544, z: 0.016318738} + - {x: 0.07095288, y: -0.00077883265, z: -0.000997186} + - {x: 0.043108486, y: -0.00000009950596, z: -0.0000000067041825} + - {x: 0.033266045, y: -0.00000001320567, z: -0.000000021670374} + - {x: 0.025892371, y: 0.00000009984198, z: -0.0000000020352908} + - {x: 0.0005134356, y: -0.0065451227, z: 0.016347693} + - {x: 0.06587581, y: -0.0017857892, z: -0.00069344096} + - {x: 0.04069671, y: -0.000000095347104, z: -0.000000022934731} + - {x: 0.028746964, y: 0.00000010089892, z: 0.000000045306827} + - {x: 0.022430236, y: 0.00000010846127, z: -0.000000017428562} + - {x: -0.002478151, y: -0.01898137, z: 0.015213584} + - {x: 0.0628784, y: -0.0028440945, z: -0.0003315112} + - {x: 0.030219711, y: -0.00000003418319, z: -0.00000009332872} + - {x: 0.018186597, y: -0.0000000050220166, z: -0.00000020934549} + - {x: 0.01801794, y: -0.0000000200012, z: 0.0000000659746} + - {x: -0.0060591106, y: 0.05628522, z: 0.060063843} + - {x: -0.04041555, y: -0.043017667, z: 0.019344581} + - {x: -0.03935372, y: -0.07567404, z: 0.047048334} + - {x: -0.038340144, y: -0.09098663, z: 0.08257892} + - {x: -0.031805996, y: -0.08721431, z: 0.12101539} + boneRotations: + - {x: 0.0000000475481, y: 0.887805, z: -0.46021983, w: -0.000000038807222} + - {x: 0.9009976, y: -0.008128658, z: 0.2871888, w: -0.3250536} + - {x: -0.46411175, y: -0.623374, z: 0.2721063, w: 0.5674181} + - {x: 0.08293856, y: -0.019454371, z: -0.055129882, w: 0.9948384} + - {x: -0.0032133153, y: -0.021866836, z: 0.22201493, w: 0.9747928} + - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} + - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} + - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} + - {x: 0.049148344, y: 0.09458312, z: -0.2278828, w: 0.9678367} + - {x: -0.022144953, y: -0.012569891, z: -0.26131046, w: 0.96491885} + - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} + - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} + - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} + - {x: 0.12004137, y: 0.2327993, z: -0.5430338, w: 0.7978151} + - {x: 0.069659054, y: 0.17697607, z: -0.25511828, w: 0.94802} + - {x: 1.1639192e-17, y: -5.602331e-17, z: -0.040125635, w: 0.9991947} + - {x: -0.5166922, y: -0.4298879, z: -0.49554786, w: 0.5501435} + - {x: -0.031803455, y: 0.105617106, z: -0.20536979, w: 0.97244895} + - {x: 0.17615516, y: 0.07787938, z: -0.6255362, w: 0.756048} + - {x: 0.084940895, y: 0.05598685, z: -0.32453248, w: 0.9403878} + - {x: 6.938894e-18, y: -9.62965e-35, z: -1.3877788e-17, w: 1} + - {x: -0.5269183, y: -0.32674035, z: -0.5840246, w: 0.52394} + - {x: -0.025836557, y: 0.15397653, z: -0.07745232, w: 0.9846953} + - {x: 0.0013947003, y: 0.0012913644, z: -0.70634955, w: 0.7078607} + - {x: -0.010113827, y: 0.051127177, z: -0.082817696, w: 0.995201} + - {x: 0, y: 0, z: 1.9081958e-17, w: 1} + - {x: 0.20274544, y: 0.59426665, z: 0.2494411, w: 0.73723847} + - {x: 0.6235274, y: -0.66380864, z: -0.29373443, w: -0.29033053} + - {x: 0.6780625, y: -0.6592852, z: -0.26568344, w: -0.18704711} + - {x: 0.7367927, y: -0.6347571, z: -0.14393571, w: -0.18303718} + - {x: 0.7584072, y: -0.6393418, z: -0.12667806, w: -0.0036594148} + applyToSkeletonRoot: 1 diff --git a/Assets/Poses/IronMan.asset.meta b/Assets/Poses/IronMan.asset.meta new file mode 100644 index 0000000..078311d --- /dev/null +++ b/Assets/Poses/IronMan.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7f3fc46cc98d35468f6906385bd39f0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index ed8af21..1a7e3f5 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2496,80 +2496,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} m_PrefabInstance: {fileID: 60326085} m_PrefabAsset: {fileID: 0} ---- !u!1001 &73665484 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 336078038} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalScale.x - value: 0.0024630034 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalScale.y - value: 0.002463003 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalScale.z - value: 0.0024630034 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalPosition.x - value: 1.299 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalPosition.y - value: 7.205 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalPosition.z - value: -12.959 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalRotation.w - value: 0.50000066 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalRotation.x - value: -0.49999937 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalRotation.y - value: -0.5000006 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalRotation.z - value: -0.49999943 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_Name - value: LegoDarthVader - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} ---- !u!4 &73665485 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - m_PrefabInstance: {fileID: 73665484} - m_PrefabAsset: {fileID: 0} --- !u!1001 &100437549 PrefabInstance: m_ObjectHideFlags: 0 @@ -7094,10 +7020,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 936418819} - - {fileID: 593389672} - - {fileID: 1916827215} - - {fileID: 1993409013} - - {fileID: 73665485} m_Father: {fileID: 45957245} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10855,80 +10777,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1001 &593389671 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 336078038} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalScale.x - value: 0.19179456 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalScale.y - value: 0.19179456 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalScale.z - value: 0.19179456 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalPosition.x - value: 1.4671 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalPosition.y - value: 6.6154 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalPosition.z - value: -12.775 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalRotation.w - value: 0.5000008 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalRotation.x - value: -0.49999928 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalRotation.y - value: -0.5000007 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalRotation.z - value: -0.49999928 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_Name - value: Iron Man - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} ---- !u!4 &593389672 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - m_PrefabInstance: {fileID: 593389671} - m_PrefabAsset: {fileID: 0} --- !u!43 &609333546 Mesh: m_ObjectHideFlags: 0 @@ -18599,6 +18447,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} +--- !u!1 &1247729019 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2493841909946642626, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + m_PrefabInstance: {fileID: 3340124808031553119} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1247729022 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247729019} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -2763777930776191228, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} --- !u!1001 &1269162462 PrefabInstance: m_ObjectHideFlags: 0 @@ -27115,6 +26982,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5262755222010251265, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} m_PrefabInstance: {fileID: 649466386} m_PrefabAsset: {fileID: 0} +--- !u!1 &1853227582 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 714913609321134831, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + m_PrefabInstance: {fileID: 372263791824569930} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1862386360 PrefabInstance: m_ObjectHideFlags: 0 @@ -28016,80 +27888,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5944924184166258373, guid: eb3d8cb3c156f024da1fc1d1c694b2b8, type: 3} m_PrefabInstance: {fileID: 1914260020} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1916827214 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 336078038} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalScale.x - value: 0.0022679686 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalScale.y - value: 0.0022679686 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalScale.z - value: 0.0022679686 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalPosition.x - value: 1.4842 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalPosition.y - value: 6.7391 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalPosition.z - value: -13.16 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalRotation.w - value: 0.50007886 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalRotation.x - value: -0.49992117 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalRotation.y - value: -0.50007886 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalRotation.z - value: -0.49992123 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -89.982 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_Name - value: batman - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} ---- !u!4 &1916827215 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - m_PrefabInstance: {fileID: 1916827214} - m_PrefabAsset: {fileID: 0} --- !u!1 &1929959350 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} @@ -29684,80 +29482,20 @@ Transform: m_CorrespondingSourceObject: {fileID: 589337997038399236, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3} m_PrefabInstance: {fileID: 1989420947} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1993409012 -PrefabInstance: +--- !u!64 &1993409016 +MeshCollider: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 336078038} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalScale.x - value: 0.0048636543 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalScale.y - value: 0.0048636543 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalScale.z - value: 0.0048636543 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalPosition.x - value: 1.4 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalPosition.y - value: 6.2499 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalPosition.z - value: -12.95 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalRotation.y - value: -0.70710677 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - propertyPath: m_Name - value: LegoDeadPool - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} ---- !u!4 &1993409013 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} - m_PrefabInstance: {fileID: 1993409012} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853227582} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 119786298737061702, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} --- !u!1001 &2030655353 PrefabInstance: m_ObjectHideFlags: 0 @@ -33536,6 +33274,124 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2137031754} m_Mesh: {fileID: 3367293876137858611, guid: 09746868085e56943934074de4b69bd7, type: 3} +--- !u!1001 &372263791824569930 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 936418819} + m_Modifications: + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_RootOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalPosition.x + value: -0.030664444 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalPosition.y + value: 0.36864853 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalPosition.z + value: 1.4510937 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 714913609321134831, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} + propertyPath: m_Name + value: LegoDeadPool + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} +--- !u!1001 &1488380924099050952 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 936418819} + m_Modifications: + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalPosition.x + value: -0.38066483 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalPosition.y + value: 0.23444843 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalPosition.z + value: 2.1820936 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalRotation.y + value: -0.0000014603138 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalRotation.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1381888125949129284, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1758272205314550014, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: m_Name + value: Iron Man + objectReference: {fileID: 0} + - target: {fileID: 6969910892239903489, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: poseNames.Array.size + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} --- !u!1001 &1527984575637916537 PrefabInstance: m_ObjectHideFlags: 0 @@ -33622,6 +33478,120 @@ Transform: m_CorrespondingSourceObject: {fileID: 1527984575184472644, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3} m_PrefabInstance: {fileID: 1527984575637916537} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3340124808031553119 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 936418819} + m_Modifications: + - target: {fileID: 2493841909946642626, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_Name + value: LegoDarthVader + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_RootOrder + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.012664795 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.57064915 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalPosition.z + value: 3.3612938 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalRotation.y + value: -0.0000012218952 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalRotation.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3012970468721928824, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} +--- !u!1001 &4374302205028708343 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 936418819} + m_Modifications: + - target: {fileID: 3491923020580971752, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_Name + value: batman + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.38933563 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.20024872 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalPosition.z + value: 2.429494 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalRotation.w + value: -0.000000029802319 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000029802319 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00015765427 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalRotation.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -89.982 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} --- !u!1001 &7278954555104977257 PrefabInstance: m_ObjectHideFlags: 0 From 3c5692af2aa9f928185d320d8d3a08d5fe2939a7 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Thu, 26 Jan 2023 15:07:41 +0100 Subject: [PATCH 5/5] fix poses and figurnies --- Assets/Models/Blender/Iron Man.blend.meta | 2 +- .../Models/Blender/LegoDarthVader.blend.meta | 2 +- Assets/Models/Blender/batman.blend.meta | 2 +- Assets/Models/LegoDarthVader Variant.prefab | 6 +- Assets/Models/LegoDeadPool Variant.prefab | 6 +- Assets/Poses/Batman.asset | 12 +- Assets/Poses/Batman2.asset | 165 ++++++++++++++++++ Assets/Poses/Batman2.asset.meta | 8 + Assets/Poses/Deadpool.asset | 165 ++++++++++++++++++ Assets/Poses/Deadpool.asset.meta | 8 + Assets/Poses/IronMan.asset | 8 +- Assets/Poses/circuitBoard.asset | 4 +- Assets/Scenes/FabLab/FabLab.unity | 52 +++++- 13 files changed, 417 insertions(+), 23 deletions(-) create mode 100644 Assets/Poses/Batman2.asset create mode 100644 Assets/Poses/Batman2.asset.meta create mode 100644 Assets/Poses/Deadpool.asset create mode 100644 Assets/Poses/Deadpool.asset.meta diff --git a/Assets/Models/Blender/Iron Man.blend.meta b/Assets/Models/Blender/Iron Man.blend.meta index fefc200..98f05bd 100644 --- a/Assets/Models/Blender/Iron Man.blend.meta +++ b/Assets/Models/Blender/Iron Man.blend.meta @@ -69,7 +69,7 @@ ModelImporter: useFileScale: 1 tangentSpace: normalSmoothAngle: 60 - normalImportMode: 0 + normalImportMode: 1 tangentImportMode: 3 normalCalculationMode: 4 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 diff --git a/Assets/Models/Blender/LegoDarthVader.blend.meta b/Assets/Models/Blender/LegoDarthVader.blend.meta index b5463a5..07118ef 100644 --- a/Assets/Models/Blender/LegoDarthVader.blend.meta +++ b/Assets/Models/Blender/LegoDarthVader.blend.meta @@ -69,7 +69,7 @@ ModelImporter: useFileScale: 1 tangentSpace: normalSmoothAngle: 60 - normalImportMode: 0 + normalImportMode: 1 tangentImportMode: 3 normalCalculationMode: 4 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 diff --git a/Assets/Models/Blender/batman.blend.meta b/Assets/Models/Blender/batman.blend.meta index b0e1dfb..785a561 100644 --- a/Assets/Models/Blender/batman.blend.meta +++ b/Assets/Models/Blender/batman.blend.meta @@ -69,7 +69,7 @@ ModelImporter: useFileScale: 1 tangentSpace: normalSmoothAngle: 60 - normalImportMode: 0 + normalImportMode: 1 tangentImportMode: 3 normalCalculationMode: 4 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 diff --git a/Assets/Models/LegoDarthVader Variant.prefab b/Assets/Models/LegoDarthVader Variant.prefab index 98cd20f..918ce29 100644 --- a/Assets/Models/LegoDarthVader Variant.prefab +++ b/Assets/Models/LegoDarthVader Variant.prefab @@ -211,13 +211,13 @@ MonoBehaviour: poseEditorExpanded: 1 blendEditorExpanded: 1 poseNames: - - '[not set]' + - Batman2 (MAIN) overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} - skeletonMainPose: {fileID: 0} + skeletonMainPose: {fileID: 11400000, guid: 8f255f7cded4ca54a98e29d41074390c, type: 2} skeletonAdditionalPoses: [] showLeftPreview: 0 - showRightPreview: 1 + showRightPreview: 0 previewLeftInstance: {fileID: 0} previewRightInstance: {fileID: 0} previewPoseSelection: 0 diff --git a/Assets/Models/LegoDeadPool Variant.prefab b/Assets/Models/LegoDeadPool Variant.prefab index 910fc5c..a589573 100644 --- a/Assets/Models/LegoDeadPool Variant.prefab +++ b/Assets/Models/LegoDeadPool Variant.prefab @@ -211,13 +211,13 @@ MonoBehaviour: poseEditorExpanded: 1 blendEditorExpanded: 1 poseNames: - - '[not set]' + - Deadpool (MAIN) overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} - skeletonMainPose: {fileID: 0} + skeletonMainPose: {fileID: 11400000, guid: 1ecf6a6a04df83c4f8034b438340a3b8, type: 2} skeletonAdditionalPoses: [] showLeftPreview: 0 - showRightPreview: 1 + showRightPreview: 0 previewLeftInstance: {fileID: 0} previewRightInstance: {fileID: 0} previewPoseSelection: 0 diff --git a/Assets/Poses/Batman.asset b/Assets/Poses/Batman.asset index e8a4fcc..75888ec 100644 --- a/Assets/Poses/Batman.asset +++ b/Assets/Poses/Batman.asset @@ -21,8 +21,8 @@ MonoBehaviour: pinkyFingerMovementType: 0 ignoreRootPoseData: 1 ignoreWristPoseData: 1 - position: {x: -0.15535358, y: 0.000000003414527, z: -0.30495334} - rotation: {x: 0, y: -0, z: -0, w: -1} + position: {x: -0.095470525, y: 0.052203447, z: 0.060196143} + rotation: {x: 0.018878648, y: -0.20631164, z: 0.08913487, w: -0.9742352} bonePositions: - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} - {x: -0.1249, y: -0.0641, z: -0.015} @@ -96,8 +96,8 @@ MonoBehaviour: pinkyFingerMovementType: 0 ignoreRootPoseData: 1 ignoreWristPoseData: 1 - position: {x: 0.15535358, y: 0.000000003414527, z: -0.30495334} - rotation: {x: -0, y: -0, z: -0, w: 1} + position: {x: 0.095470525, y: 0.052203447, z: 0.060196143} + rotation: {x: -0.018878648, y: -0.20631164, z: 0.08913487, w: 0.9742352} bonePositions: - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} - {x: -0.1249, y: -0.0641, z: -0.015} @@ -139,8 +139,8 @@ MonoBehaviour: - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} - - {x: 0.049148344, y: 0.09458312, z: -0.2278828, w: 0.9678367} - - {x: -0.022144953, y: -0.012569891, z: -0.26131046, w: 0.96491885} + - {x: 0.049148347, y: 0.094583124, z: -0.22788282, w: 0.96783674} + - {x: -0.022144955, y: -0.012569891, z: -0.2613105, w: 0.96491885} - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} diff --git a/Assets/Poses/Batman2.asset b/Assets/Poses/Batman2.asset new file mode 100644 index 0000000..5d04650 --- /dev/null +++ b/Assets/Poses/Batman2.asset @@ -0,0 +1,165 @@ +%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: e90911e410742a1498a167540c7865bf, type: 3} + m_Name: Batman2 + m_EditorClassIdentifier: + leftHand: + inputSource: 1 + thumbFingerMovementType: 0 + indexFingerMovementType: 0 + middleFingerMovementType: 0 + ringFingerMovementType: 0 + pinkyFingerMovementType: 0 + ignoreRootPoseData: 1 + ignoreWristPoseData: 1 + position: {x: -0.1754334, y: -0.06434509, z: 0.04330449} + rotation: {x: 0.018878648, y: -0.20631164, z: 0.08913487, w: -0.9742352} + bonePositions: + - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} + - {x: -0.1249, y: -0.0641, z: -0.015} + - {x: -0.012083233, y: 0.028070247, z: 0.025049694} + - {x: 0.040405963, y: -0.000000051561553, z: 0.000000045447194} + - {x: 0.032516792, y: -0.000000051137583, z: -0.000000012933195} + - {x: 0.030463902, y: 0.00000016269207, z: 0.0000000792839} + - {x: 0.0006324522, y: 0.026866155, z: 0.015001948} + - {x: 0.074205786, y: 0.0050019994, z: -0.00023392588} + - {x: 0.043933876, y: 0.0000022631139, z: 0.0000011087395} + - {x: 0.028699178, y: 0.000004455447, z: 0.000001381035} + - {x: 0.022821384, y: -0.00000014365155, z: 0.00000007651614} + - {x: 0.0021773134, y: 0.007119544, z: 0.016318738} + - {x: 0.07095288, y: -0.00077883265, z: -0.000997186} + - {x: 0.043108486, y: -0.00000009950596, z: -0.0000000067041825} + - {x: 0.033266045, y: -0.00000001320567, z: -0.000000021670374} + - {x: 0.025892371, y: 0.00000009984198, z: -0.0000000020352908} + - {x: 0.0005134356, y: -0.0065451227, z: 0.016347693} + - {x: 0.06587581, y: -0.0017857892, z: -0.00069344096} + - {x: 0.04069671, y: -0.000000095347104, z: -0.000000022934731} + - {x: 0.028746964, y: 0.00000010089892, z: 0.000000045306827} + - {x: 0.022430236, y: 0.00000010846127, z: -0.000000017428562} + - {x: -0.002478151, y: -0.01898137, z: 0.015213584} + - {x: 0.0628784, y: -0.0028440945, z: -0.0003315112} + - {x: 0.030219711, y: -0.00000003418319, z: -0.00000009332872} + - {x: 0.018186597, y: -0.0000000050220166, z: -0.00000020934549} + - {x: 0.01801794, y: -0.0000000200012, z: 0.0000000659746} + - {x: -0.0060591106, y: 0.05628522, z: 0.060063843} + - {x: -0.04041555, y: -0.043017667, z: 0.019344581} + - {x: -0.03935372, y: -0.07567404, z: 0.047048334} + - {x: -0.038340144, y: -0.09098663, z: 0.08257892} + - {x: -0.031805996, y: -0.08721431, z: 0.12101539} + boneRotations: + - {x: 0.0000000475481, y: 0.887805, z: -0.46021983, w: -0.000000038807222} + - {x: 0.9009976, y: -0.008128658, z: 0.2871888, w: -0.3250536} + - {x: -0.46411175, y: -0.623374, z: 0.2721063, w: 0.5674181} + - {x: 0.08293856, y: -0.019454371, z: -0.055129882, w: 0.9948384} + - {x: -0.0032133153, y: -0.021866836, z: 0.22201493, w: 0.9747928} + - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} + - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} + - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} + - {x: 0.049148347, y: 0.094583124, z: -0.22788282, w: 0.96783674} + - {x: -0.022144955, y: -0.012569891, z: -0.2613105, w: 0.96491885} + - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} + - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} + - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} + - {x: 0.12004137, y: 0.2327993, z: -0.5430338, w: 0.7978151} + - {x: 0.069659054, y: 0.17697607, z: -0.25511828, w: 0.94802} + - {x: 1.1639192e-17, y: -5.602331e-17, z: -0.040125635, w: 0.9991947} + - {x: -0.5166922, y: -0.4298879, z: -0.49554786, w: 0.5501435} + - {x: -0.031803455, y: 0.105617106, z: -0.20536979, w: 0.97244895} + - {x: 0.17615516, y: 0.07787938, z: -0.6255362, w: 0.756048} + - {x: 0.084940895, y: 0.05598685, z: -0.32453248, w: 0.9403878} + - {x: 6.938894e-18, y: -9.62965e-35, z: -1.3877788e-17, w: 1} + - {x: -0.5269183, y: -0.32674035, z: -0.5840246, w: 0.52394} + - {x: -0.025836557, y: 0.15397653, z: -0.07745232, w: 0.9846953} + - {x: 0.0013947003, y: 0.0012913644, z: -0.70634955, w: 0.7078607} + - {x: -0.010113827, y: 0.051127177, z: -0.082817696, w: 0.995201} + - {x: 0, y: 0, z: 1.9081958e-17, w: 1} + - {x: 0.20274544, y: 0.59426665, z: 0.2494411, w: 0.73723847} + - {x: 0.6235274, y: -0.66380864, z: -0.29373443, w: -0.29033053} + - {x: 0.6780625, y: -0.6592852, z: -0.26568344, w: -0.18704711} + - {x: 0.7367927, y: -0.6347571, z: -0.14393571, w: -0.18303718} + - {x: 0.7584072, y: -0.6393418, z: -0.12667806, w: -0.0036594148} + rightHand: + inputSource: 2 + thumbFingerMovementType: 0 + indexFingerMovementType: 0 + middleFingerMovementType: 0 + ringFingerMovementType: 0 + pinkyFingerMovementType: 0 + ignoreRootPoseData: 1 + ignoreWristPoseData: 1 + position: {x: 0.1788199, y: -0.06354057, z: 0.04642271} + rotation: {x: -0.018878648, y: -0.20631164, z: 0.08913487, w: 0.9742352} + bonePositions: + - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} + - {x: -0.1249, y: -0.0641, z: -0.015} + - {x: -0.012083233, y: 0.028070247, z: 0.025049694} + - {x: 0.040405963, y: -0.000000051561553, z: 0.000000045447194} + - {x: 0.032516792, y: -0.000000051137583, z: -0.000000012933195} + - {x: 0.030463902, y: 0.00000016269207, z: 0.0000000792839} + - {x: 0.0006324522, y: 0.026866155, z: 0.015001948} + - {x: 0.074205786, y: 0.0050019994, z: -0.00023392588} + - {x: 0.043933876, y: 0.0000022631139, z: 0.0000011087395} + - {x: 0.028699178, y: 0.000004455447, z: 0.000001381035} + - {x: 0.022821384, y: -0.00000014365155, z: 0.00000007651614} + - {x: 0.0021773134, y: 0.007119544, z: 0.016318738} + - {x: 0.07095288, y: -0.00077883265, z: -0.000997186} + - {x: 0.043108486, y: -0.00000009950596, z: -0.0000000067041825} + - {x: 0.033266045, y: -0.00000001320567, z: -0.000000021670374} + - {x: 0.025892371, y: 0.00000009984198, z: -0.0000000020352908} + - {x: 0.0005134356, y: -0.0065451227, z: 0.016347693} + - {x: 0.06587581, y: -0.0017857892, z: -0.00069344096} + - {x: 0.04069671, y: -0.000000095347104, z: -0.000000022934731} + - {x: 0.028746964, y: 0.00000010089892, z: 0.000000045306827} + - {x: 0.022430236, y: 0.00000010846127, z: -0.000000017428562} + - {x: -0.002478151, y: -0.01898137, z: 0.015213584} + - {x: 0.0628784, y: -0.0028440945, z: -0.0003315112} + - {x: 0.030219711, y: -0.00000003418319, z: -0.00000009332872} + - {x: 0.018186597, y: -0.0000000050220166, z: -0.00000020934549} + - {x: 0.01801794, y: -0.0000000200012, z: 0.0000000659746} + - {x: -0.0060591106, y: 0.05628522, z: 0.060063843} + - {x: -0.04041555, y: -0.043017667, z: 0.019344581} + - {x: -0.03935372, y: -0.07567404, z: 0.047048334} + - {x: -0.038340144, y: -0.09098663, z: 0.08257892} + - {x: -0.031805996, y: -0.08721431, z: 0.12101539} + boneRotations: + - {x: 0.0000000475481, y: 0.887805, z: -0.46021983, w: -0.000000038807222} + - {x: 0.9009976, y: -0.008128658, z: 0.2871888, w: -0.3250536} + - {x: -0.46411175, y: -0.623374, z: 0.2721063, w: 0.5674181} + - {x: 0.08293856, y: -0.019454371, z: -0.055129882, w: 0.9948384} + - {x: -0.0032133153, y: -0.021866836, z: 0.22201493, w: 0.9747928} + - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} + - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} + - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} + - {x: 0.049148347, y: 0.094583124, z: -0.22788282, w: 0.96783674} + - {x: -0.022144955, y: -0.012569891, z: -0.2613105, w: 0.96491885} + - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} + - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} + - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} + - {x: 0.12004137, y: 0.2327993, z: -0.5430338, w: 0.7978151} + - {x: 0.069659054, y: 0.17697607, z: -0.25511828, w: 0.94802} + - {x: 1.1639192e-17, y: -5.602331e-17, z: -0.040125635, w: 0.9991947} + - {x: -0.5166922, y: -0.4298879, z: -0.49554786, w: 0.5501435} + - {x: -0.031803455, y: 0.105617106, z: -0.20536979, w: 0.97244895} + - {x: 0.17615516, y: 0.07787938, z: -0.6255362, w: 0.756048} + - {x: 0.084940895, y: 0.05598685, z: -0.32453248, w: 0.9403878} + - {x: 6.938894e-18, y: -9.62965e-35, z: -1.3877788e-17, w: 1} + - {x: -0.5269183, y: -0.32674035, z: -0.5840246, w: 0.52394} + - {x: -0.025836557, y: 0.15397653, z: -0.07745232, w: 0.9846953} + - {x: 0.0013947003, y: 0.0012913644, z: -0.70634955, w: 0.7078607} + - {x: -0.010113827, y: 0.051127177, z: -0.082817696, w: 0.995201} + - {x: 0, y: 0, z: 1.9081958e-17, w: 1} + - {x: 0.20274544, y: 0.59426665, z: 0.2494411, w: 0.73723847} + - {x: 0.6235274, y: -0.66380864, z: -0.29373443, w: -0.29033053} + - {x: 0.6780625, y: -0.6592852, z: -0.26568344, w: -0.18704711} + - {x: 0.7367927, y: -0.6347571, z: -0.14393571, w: -0.18303718} + - {x: 0.7584072, y: -0.6393418, z: -0.12667806, w: -0.0036594148} + applyToSkeletonRoot: 1 diff --git a/Assets/Poses/Batman2.asset.meta b/Assets/Poses/Batman2.asset.meta new file mode 100644 index 0000000..de9e0e1 --- /dev/null +++ b/Assets/Poses/Batman2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f255f7cded4ca54a98e29d41074390c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Poses/Deadpool.asset b/Assets/Poses/Deadpool.asset new file mode 100644 index 0000000..60cfc72 --- /dev/null +++ b/Assets/Poses/Deadpool.asset @@ -0,0 +1,165 @@ +%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: e90911e410742a1498a167540c7865bf, type: 3} + m_Name: Deadpool + m_EditorClassIdentifier: + leftHand: + inputSource: 1 + thumbFingerMovementType: 0 + indexFingerMovementType: 0 + middleFingerMovementType: 0 + ringFingerMovementType: 0 + pinkyFingerMovementType: 0 + ignoreRootPoseData: 1 + ignoreWristPoseData: 1 + position: {x: -0.093371324, y: 0.029329678, z: 0.07622295} + rotation: {x: -0.70251954, y: -0.07461224, z: 0.21199653, w: -0.67524576} + bonePositions: + - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} + - {x: -0.1249, y: -0.0641, z: -0.015} + - {x: -0.012083233, y: 0.028070247, z: 0.025049694} + - {x: 0.040405963, y: -0.000000051561553, z: 0.000000045447194} + - {x: 0.032516792, y: -0.000000051137583, z: -0.000000012933195} + - {x: 0.030463902, y: 0.00000016269207, z: 0.0000000792839} + - {x: 0.0006324522, y: 0.026866155, z: 0.015001948} + - {x: 0.074205786, y: 0.0050019994, z: -0.00023392588} + - {x: 0.043933876, y: 0.0000022631139, z: 0.0000011087395} + - {x: 0.028699178, y: 0.000004455447, z: 0.000001381035} + - {x: 0.022821384, y: -0.00000014365155, z: 0.00000007651614} + - {x: 0.0021773134, y: 0.007119544, z: 0.016318738} + - {x: 0.07095288, y: -0.00077883265, z: -0.000997186} + - {x: 0.043108486, y: -0.00000009950596, z: -0.0000000067041825} + - {x: 0.033266045, y: -0.00000001320567, z: -0.000000021670374} + - {x: 0.025892371, y: 0.00000009984198, z: -0.0000000020352908} + - {x: 0.0005134356, y: -0.0065451227, z: 0.016347693} + - {x: 0.06587581, y: -0.0017857892, z: -0.00069344096} + - {x: 0.04069671, y: -0.000000095347104, z: -0.000000022934731} + - {x: 0.028746964, y: 0.00000010089892, z: 0.000000045306827} + - {x: 0.022430236, y: 0.00000010846127, z: -0.000000017428562} + - {x: -0.002478151, y: -0.01898137, z: 0.015213584} + - {x: 0.0628784, y: -0.0028440945, z: -0.0003315112} + - {x: 0.030219711, y: -0.00000003418319, z: -0.00000009332872} + - {x: 0.018186597, y: -0.0000000050220166, z: -0.00000020934549} + - {x: 0.01801794, y: -0.0000000200012, z: 0.0000000659746} + - {x: -0.0060591106, y: 0.05628522, z: 0.060063843} + - {x: -0.04041555, y: -0.043017667, z: 0.019344581} + - {x: -0.03935372, y: -0.07567404, z: 0.047048334} + - {x: -0.038340144, y: -0.09098663, z: 0.08257892} + - {x: -0.031805996, y: -0.08721431, z: 0.12101539} + boneRotations: + - {x: 0.0000000475481, y: 0.887805, z: -0.46021983, w: -0.000000038807222} + - {x: 0.9009976, y: -0.008128658, z: 0.2871888, w: -0.3250536} + - {x: -0.46411175, y: -0.623374, z: 0.2721063, w: 0.5674181} + - {x: 0.08293856, y: -0.019454371, z: -0.055129882, w: 0.9948384} + - {x: -0.0032133153, y: -0.021866836, z: 0.22201493, w: 0.9747928} + - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} + - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} + - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} + - {x: 0.049148347, y: 0.094583124, z: -0.22788282, w: 0.96783674} + - {x: -0.022144955, y: -0.012569891, z: -0.2613105, w: 0.96491885} + - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} + - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} + - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} + - {x: 0.12004137, y: 0.2327993, z: -0.5430338, w: 0.7978151} + - {x: 0.069659054, y: 0.17697607, z: -0.25511828, w: 0.94802} + - {x: 1.1639192e-17, y: -5.602331e-17, z: -0.040125635, w: 0.9991947} + - {x: -0.5166922, y: -0.4298879, z: -0.49554786, w: 0.5501435} + - {x: -0.031803455, y: 0.105617106, z: -0.20536979, w: 0.97244895} + - {x: 0.17615516, y: 0.07787938, z: -0.6255362, w: 0.756048} + - {x: 0.084940895, y: 0.05598685, z: -0.32453248, w: 0.9403878} + - {x: 6.938894e-18, y: -9.62965e-35, z: -1.3877788e-17, w: 1} + - {x: -0.5269183, y: -0.32674035, z: -0.5840246, w: 0.52394} + - {x: -0.025836557, y: 0.15397653, z: -0.07745232, w: 0.9846953} + - {x: 0.0013947003, y: 0.0012913644, z: -0.70634955, w: 0.7078607} + - {x: -0.010113827, y: 0.051127177, z: -0.082817696, w: 0.995201} + - {x: 0, y: 0, z: 1.9081958e-17, w: 1} + - {x: 0.20274544, y: 0.59426665, z: 0.2494411, w: 0.73723847} + - {x: 0.6235274, y: -0.66380864, z: -0.29373443, w: -0.29033053} + - {x: 0.6780625, y: -0.6592852, z: -0.26568344, w: -0.18704711} + - {x: 0.7367927, y: -0.6347571, z: -0.14393571, w: -0.18303718} + - {x: 0.7584072, y: -0.6393418, z: -0.12667806, w: -0.0036594148} + rightHand: + inputSource: 2 + thumbFingerMovementType: 0 + indexFingerMovementType: 0 + middleFingerMovementType: 0 + ringFingerMovementType: 0 + pinkyFingerMovementType: 0 + ignoreRootPoseData: 1 + ignoreWristPoseData: 1 + position: {x: 0.09293403, y: 0.029241312, z: 0.076029174} + rotation: {x: 0.7025201, y: -0.07461253, z: 0.2119968, w: 0.675245} + bonePositions: + - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} + - {x: -0.1249, y: -0.0641, z: -0.015} + - {x: -0.012083233, y: 0.028070247, z: 0.025049694} + - {x: 0.040405963, y: -0.000000051561553, z: 0.000000045447194} + - {x: 0.032516792, y: -0.000000051137583, z: -0.000000012933195} + - {x: 0.030463902, y: 0.00000016269207, z: 0.0000000792839} + - {x: 0.0006324522, y: 0.026866155, z: 0.015001948} + - {x: 0.074205786, y: 0.0050019994, z: -0.00023392588} + - {x: 0.043933876, y: 0.0000022631139, z: 0.0000011087395} + - {x: 0.028699178, y: 0.000004455447, z: 0.000001381035} + - {x: 0.022821384, y: -0.00000014365155, z: 0.00000007651614} + - {x: 0.0021773134, y: 0.007119544, z: 0.016318738} + - {x: 0.07095288, y: -0.00077883265, z: -0.000997186} + - {x: 0.043108486, y: -0.00000009950596, z: -0.0000000067041825} + - {x: 0.033266045, y: -0.00000001320567, z: -0.000000021670374} + - {x: 0.025892371, y: 0.00000009984198, z: -0.0000000020352908} + - {x: 0.0005134356, y: -0.0065451227, z: 0.016347693} + - {x: 0.06587581, y: -0.0017857892, z: -0.00069344096} + - {x: 0.04069671, y: -0.000000095347104, z: -0.000000022934731} + - {x: 0.028746964, y: 0.00000010089892, z: 0.000000045306827} + - {x: 0.022430236, y: 0.00000010846127, z: -0.000000017428562} + - {x: -0.002478151, y: -0.01898137, z: 0.015213584} + - {x: 0.0628784, y: -0.0028440945, z: -0.0003315112} + - {x: 0.030219711, y: -0.00000003418319, z: -0.00000009332872} + - {x: 0.018186597, y: -0.0000000050220166, z: -0.00000020934549} + - {x: 0.01801794, y: -0.0000000200012, z: 0.0000000659746} + - {x: -0.0060591106, y: 0.05628522, z: 0.060063843} + - {x: -0.04041555, y: -0.043017667, z: 0.019344581} + - {x: -0.03935372, y: -0.07567404, z: 0.047048334} + - {x: -0.038340144, y: -0.09098663, z: 0.08257892} + - {x: -0.031805996, y: -0.08721431, z: 0.12101539} + boneRotations: + - {x: 0.0000000475481, y: 0.887805, z: -0.46021983, w: -0.000000038807222} + - {x: 0.9009976, y: -0.008128658, z: 0.2871888, w: -0.3250536} + - {x: -0.46411175, y: -0.623374, z: 0.2721063, w: 0.5674181} + - {x: 0.08293856, y: -0.019454371, z: -0.055129882, w: 0.9948384} + - {x: -0.0032133153, y: -0.021866836, z: 0.22201493, w: 0.9747928} + - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} + - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} + - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} + - {x: 0.049148347, y: 0.094583124, z: -0.22788282, w: 0.96783674} + - {x: -0.022144955, y: -0.012569891, z: -0.2613105, w: 0.96491885} + - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} + - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} + - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} + - {x: 0.12004137, y: 0.2327993, z: -0.5430338, w: 0.7978151} + - {x: 0.069659054, y: 0.17697607, z: -0.25511828, w: 0.94802} + - {x: 1.1639192e-17, y: -5.602331e-17, z: -0.040125635, w: 0.9991947} + - {x: -0.5166922, y: -0.4298879, z: -0.49554786, w: 0.5501435} + - {x: -0.031803455, y: 0.105617106, z: -0.20536979, w: 0.97244895} + - {x: 0.17615516, y: 0.07787938, z: -0.6255362, w: 0.756048} + - {x: 0.084940895, y: 0.05598685, z: -0.32453248, w: 0.9403878} + - {x: 6.938894e-18, y: -9.62965e-35, z: -1.3877788e-17, w: 1} + - {x: -0.5269183, y: -0.32674035, z: -0.5840246, w: 0.52394} + - {x: -0.025836557, y: 0.15397653, z: -0.07745232, w: 0.9846953} + - {x: 0.0013947003, y: 0.0012913644, z: -0.70634955, w: 0.7078607} + - {x: -0.010113827, y: 0.051127177, z: -0.082817696, w: 0.995201} + - {x: 0, y: 0, z: 1.9081958e-17, w: 1} + - {x: 0.20274544, y: 0.59426665, z: 0.2494411, w: 0.73723847} + - {x: 0.6235274, y: -0.66380864, z: -0.29373443, w: -0.29033053} + - {x: 0.6780625, y: -0.6592852, z: -0.26568344, w: -0.18704711} + - {x: 0.7367927, y: -0.6347571, z: -0.14393571, w: -0.18303718} + - {x: 0.7584072, y: -0.6393418, z: -0.12667806, w: -0.0036594148} + applyToSkeletonRoot: 1 diff --git a/Assets/Poses/Deadpool.asset.meta b/Assets/Poses/Deadpool.asset.meta new file mode 100644 index 0000000..6254963 --- /dev/null +++ b/Assets/Poses/Deadpool.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ecf6a6a04df83c4f8034b438340a3b8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Poses/IronMan.asset b/Assets/Poses/IronMan.asset index b95f87f..763c2e4 100644 --- a/Assets/Poses/IronMan.asset +++ b/Assets/Poses/IronMan.asset @@ -21,7 +21,7 @@ MonoBehaviour: pinkyFingerMovementType: 0 ignoreRootPoseData: 1 ignoreWristPoseData: 1 - position: {x: -0.15535358, y: 0.000000003414527, z: -0.30495334} + position: {x: -0.098582394, y: 0.009014343, z: -0.13080388} rotation: {x: 0, y: -0, z: -0, w: -1} bonePositions: - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} @@ -96,7 +96,7 @@ MonoBehaviour: pinkyFingerMovementType: 0 ignoreRootPoseData: 1 ignoreWristPoseData: 1 - position: {x: 0.15535358, y: 0.000000003414527, z: -0.30495334} + position: {x: 0.09934957, y: 0.0019179455, z: -0.1373249} rotation: {x: -0, y: -0, z: -0, w: 1} bonePositions: - {x: -0.0344, y: -0.054700017, z: -0.000000091454766} @@ -139,8 +139,8 @@ MonoBehaviour: - {x: -1.3877788e-17, y: -1.3877788e-17, z: -5.551115e-17, w: 1} - {x: -0.6442515, y: -0.42213318, z: -0.4782025, w: 0.42197865} - {x: 0.0066233715, y: 0.15912895, z: -0.37669933, w: 0.9125414} - - {x: 0.049148344, y: 0.09458312, z: -0.2278828, w: 0.9678367} - - {x: -0.022144953, y: -0.012569891, z: -0.26131046, w: 0.96491885} + - {x: 0.049148347, y: 0.094583124, z: -0.22788282, w: 0.96783674} + - {x: -0.022144955, y: -0.012569891, z: -0.2613105, w: 0.96491885} - {x: 6.938894e-18, y: 1.9428903e-16, z: -1.348151e-33, w: 1} - {x: -0.5305983, y: -0.47585765, z: -0.4575781, w: 0.5316458} - {x: -0.13069032, y: 0.12720363, z: -0.24283288, w: 0.9527705} diff --git a/Assets/Poses/circuitBoard.asset b/Assets/Poses/circuitBoard.asset index 3947b68..26dc168 100644 --- a/Assets/Poses/circuitBoard.asset +++ b/Assets/Poses/circuitBoard.asset @@ -21,7 +21,7 @@ MonoBehaviour: pinkyFingerMovementType: 0 ignoreRootPoseData: 1 ignoreWristPoseData: 1 - position: {x: 0.11578988, y: -0.011355867, z: 0.054800924} + position: {x: 0.09193375, y: -0.0105542615, z: 0.04837813} rotation: {x: 0.009937813, y: -0.9225651, z: -0.3400633, w: -0.18202135} bonePositions: - {x: 0, y: 0, z: 0} @@ -96,7 +96,7 @@ MonoBehaviour: pinkyFingerMovementType: 0 ignoreRootPoseData: 1 ignoreWristPoseData: 1 - position: {x: -0.30429325, y: -0.032650914, z: 0.123982325} + position: {x: -0.1532734, y: -0.009657676, z: 0.061249018} rotation: {x: -0.009937813, y: -0.9225651, z: -0.3400633, w: 0.18202135} bonePositions: - {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 1a7e3f5..f871371 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -33387,8 +33387,12 @@ PrefabInstance: value: Iron Man objectReference: {fileID: 0} - target: {fileID: 6969910892239903489, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} - propertyPath: poseNames.Array.size - value: 1 + propertyPath: showLeftPreview + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6969910892239903489, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} + propertyPath: previewLeftInstance + value: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 57623ee931afbf44f82c7fe1274a1311, type: 3} @@ -33533,6 +33537,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -90 objectReference: {fileID: 0} + - target: {fileID: 3632220126970041568, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: showLeftPreview + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3632220126970041568, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} + propertyPath: previewLeftInstance + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e36a1836156340248b3f5a4227eb6a2d, type: 3} --- !u!1001 &4374302205028708343 @@ -33542,10 +33554,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 936418819} m_Modifications: + - target: {fileID: 3210197066396978677, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3491923020580971752, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} propertyPath: m_Name value: batman objectReference: {fileID: 0} + - target: {fileID: 3625128149977776716, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4268882279776697938, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} propertyPath: m_RootOrder value: 14 @@ -33590,6 +33610,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -89.982 objectReference: {fileID: 0} + - target: {fileID: 6051616385227434157, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6123300087915326860, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6860858621117912442, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: showLeftPreview + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6860858621117912442, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: previewLeftInstance + value: + objectReference: {fileID: 0} + - target: {fileID: 6860858621117912442, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: previewRightInstance + value: + objectReference: {fileID: 0} + - target: {fileID: 7623072866843710050, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8238980907475413861, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 321779ff3e715ab4c9d0b1ffb8dd8f2f, type: 3} --- !u!1001 &7278954555104977257