From d3f9059e0bdf963e6c16e31b20f3fa6b32dc9b09 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Mon, 28 Jun 2021 01:42:18 -0400 Subject: [PATCH 1/2] removed unused profiles~ folder --- XRTK.XRUX/Assets/XRTK.Generated/SymbolicLinkSettings.asset | 5 +---- XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~/temp.txt | 0 XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~/temp.txt.meta | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~/temp.txt delete mode 100644 XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~/temp.txt.meta diff --git a/XRTK.XRUX/Assets/XRTK.Generated/SymbolicLinkSettings.asset b/XRTK.XRUX/Assets/XRTK.Generated/SymbolicLinkSettings.asset index f85f40a..bcbab55 100644 --- a/XRTK.XRUX/Assets/XRTK.Generated/SymbolicLinkSettings.asset +++ b/XRTK.XRUX/Assets/XRTK.Generated/SymbolicLinkSettings.asset @@ -12,7 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ff8a5d57a9af497db320551240c892c2, type: 3} m_Name: SymbolicLinkSettings m_EditorClassIdentifier: - symbolicLinks: - - sourceRelativePath: /XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~ - targetRelativePath: /XRTK.XRUX/Assets/XRTK.Generated/XRUX/Profiles - isActive: 1 + symbolicLinks: [] diff --git a/XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~/temp.txt b/XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~/temp.txt deleted file mode 100644 index e69de29..0000000 diff --git a/XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~/temp.txt.meta b/XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~/temp.txt.meta deleted file mode 100644 index ba00a2d..0000000 --- a/XRTK.XRUX/Packages/com.xrtk.xrux/Profiles~/temp.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: bcb7f6cf3baf0b7408d7cd274bc7219f -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From 0f3d3c591768076bfa7ceb88d5b5a3e5921a8afa Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Mon, 28 Jun 2021 01:42:45 -0400 Subject: [PATCH 2/2] added a base button prefab --- XRTK.XRUX/Assets/Example Scenes/base.unity | 191 +++++++----------- .../Runtime/Prefabs/Button.prefab | 126 ++++++++++++ .../Runtime/Prefabs/Button.prefab.meta | 7 + 3 files changed, 201 insertions(+), 123 deletions(-) create mode 100644 XRTK.XRUX/Packages/com.xrtk.xrux/Runtime/Prefabs/Button.prefab create mode 100644 XRTK.XRUX/Packages/com.xrtk.xrux/Runtime/Prefabs/Button.prefab.meta diff --git a/XRTK.XRUX/Assets/Example Scenes/base.unity b/XRTK.XRUX/Assets/Example Scenes/base.unity index fba01d3..b9807af 100644 --- a/XRTK.XRUX/Assets/Example Scenes/base.unity +++ b/XRTK.XRUX/Assets/Example Scenes/base.unity @@ -204,99 +204,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &958692833 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 958692834} - - component: {fileID: 958692837} - - component: {fileID: 958692836} - - component: {fileID: 958692835} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &958692834 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958692833} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1456804358} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &958692835 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958692833} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &958692836 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958692833} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - 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 ---- !u!33 &958692837 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958692833} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &978420912 GameObject: m_ObjectHideFlags: 0 @@ -389,34 +296,72 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1456804357 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1456804358} - m_Layer: 0 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1456804358 -Transform: +--- !u!1001 &6322911504029342293 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1456804357} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 958692834} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6322911504722249808, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_Name + value: Button + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6322911504722249811, guid: 2326a0aac62c7d64d926902de0b22257, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2326a0aac62c7d64d926902de0b22257, type: 3} diff --git a/XRTK.XRUX/Packages/com.xrtk.xrux/Runtime/Prefabs/Button.prefab b/XRTK.XRUX/Packages/com.xrtk.xrux/Runtime/Prefabs/Button.prefab new file mode 100644 index 0000000..f3151e3 --- /dev/null +++ b/XRTK.XRUX/Packages/com.xrtk.xrux/Runtime/Prefabs/Button.prefab @@ -0,0 +1,126 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6322911503070668724 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6322911503070668727} + - component: {fileID: 6322911503070668720} + - component: {fileID: 6322911503070668721} + - component: {fileID: 6322911503070668726} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6322911503070668727 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6322911503070668724} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.01} + m_Children: [] + m_Father: {fileID: 6322911504722249811} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6322911503070668720 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6322911503070668724} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6322911503070668721 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6322911503070668724} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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 +--- !u!65 &6322911503070668726 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6322911503070668724} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6322911504722249808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6322911504722249811} + m_Layer: 0 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6322911504722249811 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6322911504722249808} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6322911503070668727} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/XRTK.XRUX/Packages/com.xrtk.xrux/Runtime/Prefabs/Button.prefab.meta b/XRTK.XRUX/Packages/com.xrtk.xrux/Runtime/Prefabs/Button.prefab.meta new file mode 100644 index 0000000..f37627f --- /dev/null +++ b/XRTK.XRUX/Packages/com.xrtk.xrux/Runtime/Prefabs/Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2326a0aac62c7d64d926902de0b22257 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: