From 777b30dbedcbbf41178718656885acd1d4b14173 Mon Sep 17 00:00:00 2001 From: Axel Galand Date: Wed, 11 Jan 2023 16:43:50 +0100 Subject: [PATCH] valve index station prefab --- Assets/Models/Base_Station.prefab | 71 ++++++++++++ Assets/Models/Base_Station.prefab.meta | 7 ++ Assets/Models/Blender/Base_Station.blend | 3 + Assets/Models/Blender/Base_Station.blend.meta | 106 ++++++++++++++++++ Assets/Scenes/FabLab/FabLab.unity | 12 +- .../XR/Settings/OpenXR Package Settings.asset | 89 ++++++++------- 6 files changed, 242 insertions(+), 46 deletions(-) create mode 100644 Assets/Models/Base_Station.prefab create mode 100644 Assets/Models/Base_Station.prefab.meta create mode 100644 Assets/Models/Blender/Base_Station.blend create mode 100644 Assets/Models/Blender/Base_Station.blend.meta diff --git a/Assets/Models/Base_Station.prefab b/Assets/Models/Base_Station.prefab new file mode 100644 index 0000000..8317fe7 --- /dev/null +++ b/Assets/Models/Base_Station.prefab @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &378217906447368849 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalScale.x + value: 0.0011996 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalScale.y + value: 0.0011996 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalScale.z + value: 0.0011996 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: cebc9e68e283d4f438ff552731202af1, type: 3} + propertyPath: m_Name + value: Base_Station + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cebc9e68e283d4f438ff552731202af1, type: 3} diff --git a/Assets/Models/Base_Station.prefab.meta b/Assets/Models/Base_Station.prefab.meta new file mode 100644 index 0000000..80f720a --- /dev/null +++ b/Assets/Models/Base_Station.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: db311a19e9de71343abeaae7f6fb1581 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/Base_Station.blend b/Assets/Models/Blender/Base_Station.blend new file mode 100644 index 0000000..3d76781 --- /dev/null +++ b/Assets/Models/Blender/Base_Station.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d65b44cc273400f58a2a597ec846bf76550a1e2d743a83ac3a1ba7b2ec104705 +size 791236 diff --git a/Assets/Models/Blender/Base_Station.blend.meta b/Assets/Models/Blender/Base_Station.blend.meta new file mode 100644 index 0000000..0914ae8 --- /dev/null +++ b/Assets/Models/Blender/Base_Station.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: cebc9e68e283d4f438ff552731202af1 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 58d3959..8e398e6 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -4818,7 +4818,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30534 + m_Name: pb_Mesh70162 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5059,7 +5059,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30656 + m_Name: pb_Mesh70286 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6216,7 +6216,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30914 + m_Name: pb_Mesh70552 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -7313,7 +7313,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30980 + m_Name: pb_Mesh70622 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11438,7 +11438,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30718 + m_Name: pb_Mesh70344 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15245,7 +15245,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30638 + m_Name: pb_Mesh70268 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index ab2dbb1..16014d1 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -53,11 +53,11 @@ MonoBehaviour: m_Name: ConformanceAutomationFeature WSA m_EditorClassIdentifier: m_enabled: 0 - nameUi: - version: - featureIdInternal: - openxrExtensionStrings: - company: + nameUi: Conformance Automation + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.conformance + openxrExtensionStrings: XR_EXT_conformance_automation + company: Unity priority: 0 required: 0 --- !u!114 &-4693673571103967739 @@ -183,11 +183,11 @@ MonoBehaviour: m_Name: MicrosoftMotionControllerProfile WSA m_EditorClassIdentifier: m_enabled: 0 - nameUi: - version: - featureIdInternal: + nameUi: Microsoft Motion Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.microsoftmotioncontroller openxrExtensionStrings: - company: + company: Unity priority: 0 required: 0 --- !u!114 &-3151758654511686062 @@ -268,7 +268,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} m_Name: WSA m_EditorClassIdentifier: - features: [] + features: + - {fileID: -5243643472531049846} + - {fileID: 2655292621330283607} + - {fileID: -872226360648484675} + - {fileID: 3812627763205499290} + - {fileID: -1266899550521025873} + - {fileID: -3368411826774385968} + - {fileID: -91471754951427841} + - {fileID: 7917191985073258131} + - {fileID: 6958461540210388227} m_renderMode: 1 m_depthSubmissionMode: 0 --- !u!114 &-1266899550521025873 @@ -284,11 +293,11 @@ MonoBehaviour: m_Name: MicrosoftHandInteraction WSA m_EditorClassIdentifier: m_enabled: 0 - nameUi: - version: - featureIdInternal: - openxrExtensionStrings: - company: + nameUi: Microsoft Hand Interaction Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.handtracking + openxrExtensionStrings: XR_MSFT_hand_interaction + company: Unity priority: 0 required: 0 --- !u!114 &-872226360648484675 @@ -304,11 +313,11 @@ MonoBehaviour: m_Name: HTCViveControllerProfile WSA m_EditorClassIdentifier: m_enabled: 0 - nameUi: - version: - featureIdInternal: + nameUi: HTC Vive Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.htcvive openxrExtensionStrings: - company: + company: Unity priority: 0 required: 0 --- !u!114 &-597278450409038007 @@ -384,11 +393,11 @@ MonoBehaviour: m_Name: OculusTouchControllerProfile WSA m_EditorClassIdentifier: m_enabled: 0 - nameUi: - version: - featureIdInternal: + nameUi: Oculus Touch Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.oculustouch openxrExtensionStrings: - company: + company: Unity priority: 0 required: 0 --- !u!114 &-28559063667281078 @@ -486,11 +495,11 @@ MonoBehaviour: m_Name: EyeGazeInteraction WSA m_EditorClassIdentifier: m_enabled: 0 - nameUi: - version: - featureIdInternal: - openxrExtensionStrings: - company: + nameUi: Eye Gaze Interaction Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.eyetracking + openxrExtensionStrings: XR_EXT_eye_gaze_interaction + company: Unity priority: 0 required: 0 --- !u!114 &3300019730029629235 @@ -568,11 +577,11 @@ MonoBehaviour: m_Name: KHRSimpleControllerProfile WSA m_EditorClassIdentifier: m_enabled: 0 - nameUi: - version: - featureIdInternal: + nameUi: Khronos Simple Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile openxrExtensionStrings: - company: + company: Unity priority: 0 required: 0 --- !u!114 &3887130056630618105 @@ -681,11 +690,11 @@ MonoBehaviour: m_Name: ValveIndexControllerProfile WSA m_EditorClassIdentifier: m_enabled: 0 - nameUi: - version: - featureIdInternal: + nameUi: Valve Index Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.valveindex openxrExtensionStrings: - company: + company: Unity priority: 0 required: 0 --- !u!114 &7448106177769721064 @@ -721,11 +730,11 @@ MonoBehaviour: m_Name: RuntimeDebuggerOpenXRFeature WSA m_EditorClassIdentifier: m_enabled: 0 - nameUi: - version: - featureIdInternal: + nameUi: Runtime Debugger + version: 1 + featureIdInternal: com.unity.openxr.features.runtimedebugger openxrExtensionStrings: - company: + company: Unity priority: 0 required: 0 cacheSize: 1048576