mirror of
https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git
synced 2025-01-22 15:18:33 -05:00
Merge remote-tracking branch 'origin/development' into test/input-test
Merging input and development
This commit is contained in:
commit
c81cd6d2af
5
.vscode/extensions.json
vendored
Normal file
5
.vscode/extensions.json
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
{
|
||||
"recommendations": [
|
||||
"visualstudiotoolsforunity.vstuc"
|
||||
]
|
||||
}
|
||||
10
.vscode/launch.json
vendored
Normal file
10
.vscode/launch.json
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Attach to Unity",
|
||||
"type": "vstuc",
|
||||
"request": "attach"
|
||||
}
|
||||
]
|
||||
}
|
||||
55
.vscode/settings.json
vendored
Normal file
55
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,55 @@
|
||||
{
|
||||
"files.exclude": {
|
||||
"**/.DS_Store": true,
|
||||
"**/.git": true,
|
||||
"**/.gitmodules": true,
|
||||
"**/*.booproj": true,
|
||||
"**/*.pidb": true,
|
||||
"**/*.suo": true,
|
||||
"**/*.user": true,
|
||||
"**/*.userprefs": true,
|
||||
"**/*.unityproj": true,
|
||||
"**/*.dll": true,
|
||||
"**/*.exe": true,
|
||||
"**/*.pdf": true,
|
||||
"**/*.mid": true,
|
||||
"**/*.midi": true,
|
||||
"**/*.wav": true,
|
||||
"**/*.gif": true,
|
||||
"**/*.ico": true,
|
||||
"**/*.jpg": true,
|
||||
"**/*.jpeg": true,
|
||||
"**/*.png": true,
|
||||
"**/*.psd": true,
|
||||
"**/*.tga": true,
|
||||
"**/*.tif": true,
|
||||
"**/*.tiff": true,
|
||||
"**/*.3ds": true,
|
||||
"**/*.3DS": true,
|
||||
"**/*.fbx": true,
|
||||
"**/*.FBX": true,
|
||||
"**/*.lxo": true,
|
||||
"**/*.LXO": true,
|
||||
"**/*.ma": true,
|
||||
"**/*.MA": true,
|
||||
"**/*.obj": true,
|
||||
"**/*.OBJ": true,
|
||||
"**/*.asset": true,
|
||||
"**/*.cubemap": true,
|
||||
"**/*.flare": true,
|
||||
"**/*.mat": true,
|
||||
"**/*.meta": true,
|
||||
"**/*.prefab": true,
|
||||
"**/*.unity": true,
|
||||
"build/": true,
|
||||
"Build/": true,
|
||||
"Library/": true,
|
||||
"library/": true,
|
||||
"obj/": true,
|
||||
"Obj/": true,
|
||||
"ProjectSettings/": true,
|
||||
"temp/": true,
|
||||
"Temp/": true
|
||||
},
|
||||
"dotnet.defaultSolution": "MAVRIC.sln"
|
||||
}
|
||||
@ -379,8 +379,8 @@ Rigidbody:
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 1
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
@ -530,7 +530,7 @@ MonoBehaviour:
|
||||
m_RotationOrder: 4
|
||||
m_ThrowVelocityScale: 1.5
|
||||
m_ThrowAngularVelocityScale: 1
|
||||
m_ForceGravityOnDetach: 0
|
||||
m_ForceGravityOnDetach: 1
|
||||
m_RetainTransformParent: 1
|
||||
m_AttachPointCompatibilityMode: 0
|
||||
m_StartingSingleGrabTransformers: []
|
||||
@ -894,6 +894,120 @@ MeshRenderer:
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &2383595057096189641
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7191601780445793351}
|
||||
- component: {fileID: 8162120969493816073}
|
||||
- component: {fileID: 7398400143197239005}
|
||||
m_Layer: 0
|
||||
m_Name: Flip_Pad_Pull_Out (Socket)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7191601780445793351
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2383595057096189641}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.000000059604616, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.00033500555, z: -0.00012999527}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 421256685097331234}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!135 &8162120969493816073
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2383595057096189641}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.00025
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &7398400143197239005
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2383595057096189641}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_InteractionManager: {fileID: 0}
|
||||
m_InteractionLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_InteractionLayers:
|
||||
m_Bits: 32
|
||||
m_AttachTransform: {fileID: 0}
|
||||
m_KeepSelectedTargetValid: 1
|
||||
m_DisableVisualsWhenBlockedInGroup: 0
|
||||
m_StartingSelectedInteractable: {fileID: 0}
|
||||
m_StartingTargetFilter: {fileID: 0}
|
||||
m_HoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_HoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_SelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_SelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_StartingHoverFilters: []
|
||||
m_StartingSelectFilters: []
|
||||
m_OnHoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnHoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ShowInteractableHoverMeshes: 1
|
||||
m_InteractableHoverMeshMaterial: {fileID: 0}
|
||||
m_InteractableCantHoverMeshMaterial: {fileID: 0}
|
||||
m_SocketActive: 1
|
||||
m_InteractableHoverScale: 1.1
|
||||
m_RecycleDelayTime: 1
|
||||
m_HoverSocketSnapping: 0
|
||||
m_SocketSnappingRadius: 0.1
|
||||
m_SocketScaleMode: 0
|
||||
m_FixedScale: {x: 1, y: 1, z: 1}
|
||||
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
|
||||
--- !u!1 &2430839488996525746
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1470,7 +1584,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6805840251457248530}
|
||||
- {fileID: 6456035007540429744}
|
||||
- {fileID: 7191601780445793351}
|
||||
m_Father: {fileID: 2477252259466568489}
|
||||
m_LocalEulerAnglesHint: {x: 86, y: 0, z: 0}
|
||||
--- !u!33 &3790417273332515381
|
||||
@ -1845,111 +1959,6 @@ MeshRenderer:
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &6165883632583038797
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6456035007540429744}
|
||||
- component: {fileID: 7491122695439327624}
|
||||
- component: {fileID: 2542004312418342111}
|
||||
- component: {fileID: 3856986954198828731}
|
||||
m_Layer: 0
|
||||
m_Name: Flip_Pad_Pull_Out
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6456035007540429744
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6165883632583038797}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.000000089406946, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.00033500112, z: -0.00013000034}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 421256685097331234}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &7491122695439327624
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6165883632583038797}
|
||||
m_Mesh: {fileID: 1219518195786479877, guid: 9ab71472b5bb94890a03b7ca5ec138fa, type: 3}
|
||||
--- !u!23 &2542004312418342111
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6165883632583038797}
|
||||
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: 12d57f81b6c8b4e2594491000f517ebd, 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!65 &3856986954198828731
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6165883632583038797}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.0005044888, y: 0.00028706918, z: 0.00007960753}
|
||||
m_Center: {x: -0.0000000018626451, y: -0.0000000019354047, z: -0.000000003576135}
|
||||
--- !u!1 &6210601333934497842
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2601,8 +2610,8 @@ Rigidbody:
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 1
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
@ -2752,7 +2761,7 @@ MonoBehaviour:
|
||||
m_RotationOrder: 4
|
||||
m_ThrowVelocityScale: 1.5
|
||||
m_ThrowAngularVelocityScale: 1
|
||||
m_ForceGravityOnDetach: 0
|
||||
m_ForceGravityOnDetach: 1
|
||||
m_RetainTransformParent: 1
|
||||
m_AttachPointCompatibilityMode: 0
|
||||
m_StartingSingleGrabTransformers: []
|
||||
@ -3063,8 +3072,8 @@ Rigidbody:
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 1
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
@ -3214,7 +3223,7 @@ MonoBehaviour:
|
||||
m_RotationOrder: 4
|
||||
m_ThrowVelocityScale: 1.5
|
||||
m_ThrowAngularVelocityScale: 1
|
||||
m_ForceGravityOnDetach: 0
|
||||
m_ForceGravityOnDetach: 1
|
||||
m_RetainTransformParent: 1
|
||||
m_AttachPointCompatibilityMode: 0
|
||||
m_StartingSingleGrabTransformers: []
|
||||
|
||||
@ -90,7 +90,7 @@ ModelImporter:
|
||||
armStretch: 0.05
|
||||
legStretch: 0.05
|
||||
feetSpacing: 0
|
||||
globalScale: 0.001
|
||||
globalScale: 0.1
|
||||
rootMotionBoneName:
|
||||
hasTranslationDoF: 0
|
||||
hasExtraRoot: 0
|
||||
|
||||
@ -748,30 +748,6 @@ MonoBehaviour:
|
||||
focusResponse:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 8905706300752561573}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 8681397286677477019}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 3970644888107419690}
|
||||
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
|
||||
Assembly-CSharp
|
||||
@ -1296,6 +1272,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
interactable: {fileID: 0}
|
||||
isLocked: 1
|
||||
unlockedLayerMask:
|
||||
m_Bits: 1
|
||||
--- !u!1 &2672275468392498656
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2996,7 +2974,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3299088965526146119
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3105,8 +3083,8 @@ Rigidbody:
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 1
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
@ -3256,7 +3234,7 @@ MonoBehaviour:
|
||||
m_RotationOrder: 4
|
||||
m_ThrowVelocityScale: 1.5
|
||||
m_ThrowAngularVelocityScale: 1
|
||||
m_ForceGravityOnDetach: 0
|
||||
m_ForceGravityOnDetach: 1
|
||||
m_RetainTransformParent: 0
|
||||
m_AttachPointCompatibilityMode: 0
|
||||
m_StartingSingleGrabTransformers: []
|
||||
@ -3276,6 +3254,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
interactable: {fileID: 0}
|
||||
isLocked: 1
|
||||
unlockedLayerMask:
|
||||
m_Bits: 1
|
||||
--- !u!1001 &3316605137565340392
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3284,6 +3264,14 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 6554210300994472440}
|
||||
m_Modifications:
|
||||
- target: {fileID: 308438123433256243, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
propertyPath: m_UseGravity
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 308438123433256243, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
propertyPath: m_IsKinematic
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -86
|
||||
@ -3382,8 +3370,20 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7398400143197239005, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
propertyPath: m_StartingSelectedInteractable
|
||||
value:
|
||||
objectReference: {fileID: 4206626928681935766}
|
||||
- target: {fileID: 7798793048474624085, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
propertyPath: m_UseGravity
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7798793048474624085, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
propertyPath: m_IsKinematic
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
propertyPath: m_MovementType
|
||||
value: 0
|
||||
@ -3521,6 +3521,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
interactable: {fileID: 0}
|
||||
isLocked: 1
|
||||
unlockedLayerMask:
|
||||
m_Bits: 1
|
||||
--- !u!114 &5809729421961169329 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 9126189417414843225, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
@ -3556,6 +3558,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
interactable: {fileID: 0}
|
||||
isLocked: 1
|
||||
unlockedLayerMask:
|
||||
m_Bits: 1
|
||||
--- !u!114 &6261687912628628780 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
@ -3586,11 +3590,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
interactable: {fileID: 0}
|
||||
isLocked: 1
|
||||
--- !u!1 &8905706300752561573 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
m_PrefabInstance: {fileID: 3316605137565340392}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
unlockedLayerMask:
|
||||
m_Bits: 1
|
||||
--- !u!1 &9191249259938328202 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5875810263984471138, guid: b27049639847946ddac425fa7721eb71, type: 3}
|
||||
@ -3631,3 +3632,5 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
interactable: {fileID: 0}
|
||||
isLocked: 1
|
||||
unlockedLayerMask:
|
||||
m_Bits: 1
|
||||
|
||||
@ -200,6 +200,14 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1024681846135835656}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3774238497440674398, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3}
|
||||
propertyPath: isLocked
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3970644888107419690, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3}
|
||||
propertyPath: isLocked
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5446038345979176515, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Cartridge-Interactable
|
||||
@ -244,6 +252,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8075794149781177989, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3}
|
||||
propertyPath: isLocked
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8075794149781177989, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3}
|
||||
propertyPath: lockedLayerMask.m_Bits
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8138633126094991808, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3}
|
||||
propertyPath: isLocked
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
@ -123,6 +123,11 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!54 &59573854 stripped
|
||||
Rigidbody:
|
||||
m_CorrespondingSourceObject: {fileID: 7812820016551315205, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
m_PrefabInstance: {fileID: 1835422393}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!20 &135570299 stripped
|
||||
Camera:
|
||||
m_CorrespondingSourceObject: {fileID: 731506051283350118, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
@ -133,6 +138,7 @@ Light:
|
||||
m_CorrespondingSourceObject: {fileID: 4610388823093620668, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
m_PrefabInstance: {fileID: 1835422393}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
--- !u!1001 &933098601
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -235,6 +241,18 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
=======
|
||||
--- !u!54 &593329662 stripped
|
||||
Rigidbody:
|
||||
m_CorrespondingSourceObject: {fileID: 584571707657079726, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
m_PrefabInstance: {fileID: 1835422393}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!54 &1111219719 stripped
|
||||
Rigidbody:
|
||||
m_CorrespondingSourceObject: {fileID: 7885669140710470493, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
m_PrefabInstance: {fileID: 1835422393}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
>>>>>>> origin/development
|
||||
--- !u!1001 &1520454031
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -292,6 +310,7 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
|
||||
<<<<<<< HEAD
|
||||
--- !u!1 &1710956167
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -396,6 +415,13 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Timeout: 10
|
||||
m_XROrigin: {fileID: 962261297}
|
||||
=======
|
||||
--- !u!54 &1723099566 stripped
|
||||
Rigidbody:
|
||||
m_CorrespondingSourceObject: {fileID: 365544109579859515, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
m_PrefabInstance: {fileID: 1835422393}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
>>>>>>> origin/development
|
||||
--- !u!1001 &1835422393
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -548,6 +574,7 @@ PrefabInstance:
|
||||
propertyPath: m_Camera
|
||||
value:
|
||||
objectReference: {fileID: 135570299}
|
||||
<<<<<<< HEAD
|
||||
- target: {fileID: 1175774885428520624, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
@ -640,6 +667,16 @@ PrefabInstance:
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
=======
|
||||
- target: {fileID: 1749934368914098634, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: rigidbody
|
||||
value:
|
||||
objectReference: {fileID: 593329662}
|
||||
- target: {fileID: 1960013199680762814, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: rigidbody
|
||||
value:
|
||||
objectReference: {fileID: 59573854}
|
||||
>>>>>>> origin/development
|
||||
- target: {fileID: 2193716159056342434, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@ -1208,6 +1245,7 @@ PrefabInstance:
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
- target: {fileID: 5914587796856932062, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
@ -1288,6 +1326,16 @@ PrefabInstance:
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
=======
|
||||
- target: {fileID: 6863889943897360229, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: rigidbody
|
||||
value:
|
||||
objectReference: {fileID: 1111219719}
|
||||
- target: {fileID: 6890982149484982304, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: rigidbody
|
||||
value:
|
||||
objectReference: {fileID: 1723099566}
|
||||
>>>>>>> origin/development
|
||||
- target: {fileID: 6899455370481246272, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
/// Traken from https://forum.unity.com/threads/how-to-prevent-interactable-from-being-selected-while-in-socket.1317246/#post-9101254
|
||||
|
||||
using System;
|
||||
using Sirenix.OdinInspector;
|
||||
using UnityEngine.Assertions;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
@ -11,18 +13,27 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering
|
||||
#region Fields
|
||||
|
||||
[Tooltip("The interactor that this filter is associated with. If none, will attempt to find on self.")]
|
||||
[SerializeField]
|
||||
private XRBaseInteractable interactable;
|
||||
|
||||
[FormerlySerializedAs("m_locked")] [SerializeField]
|
||||
private bool isLocked = false;
|
||||
[SerializeField] private XRBaseInteractable interactable;
|
||||
|
||||
[FormerlySerializedAs("m_locked")]
|
||||
[SerializeField] private bool isLocked = false;
|
||||
|
||||
[SerializeField] private InteractionLayerMask unlockedLayerMask = 1 << 0; // Default value is "Default" layer
|
||||
|
||||
#endregion
|
||||
|
||||
#region Properties
|
||||
|
||||
public bool IsLocked { get => isLocked; set => isLocked = value; }
|
||||
|
||||
|
||||
public bool IsLocked
|
||||
{
|
||||
get => isLocked;
|
||||
set
|
||||
{
|
||||
isLocked = value;
|
||||
UpdateInteractionLayerMask();
|
||||
}
|
||||
}
|
||||
|
||||
public bool canProcess => true;
|
||||
|
||||
#endregion
|
||||
@ -34,59 +45,49 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering
|
||||
interactable = interactable ? interactable : GetComponent<XRBaseInteractable>();
|
||||
Assert.IsNotNull(interactable);
|
||||
}
|
||||
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
AddFilters();
|
||||
UpdateInteractionLayerMask();
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
RemoveFilters();
|
||||
}
|
||||
|
||||
private void AddFilters()
|
||||
{
|
||||
if (interactable == null) return;
|
||||
|
||||
// Add filter to interactable
|
||||
interactable.startingHoverFilters.Add(this);
|
||||
interactable.startingSelectFilters.Add(this);
|
||||
|
||||
// Make extra sure that the filter is added to the interactable
|
||||
interactable.hoverFilters.Add(this);
|
||||
interactable.selectFilters.Add(this);
|
||||
}
|
||||
|
||||
private void RemoveFilters()
|
||||
{
|
||||
if (interactable == null) return;
|
||||
|
||||
// Remove filter from interactable
|
||||
interactable.startingHoverFilters.Remove(this);
|
||||
interactable.startingSelectFilters.Remove(this);
|
||||
interactable.hoverFilters.Remove(this);
|
||||
interactable.selectFilters.Remove(this);
|
||||
}
|
||||
|
||||
|
||||
public bool Process(IXRHoverInteractor interactor, IXRHoverInteractable interactable)
|
||||
{
|
||||
return Process();
|
||||
}
|
||||
|
||||
|
||||
public bool Process(IXRSelectInteractor interactor, IXRSelectInteractable interactable)
|
||||
{
|
||||
return Process();
|
||||
}
|
||||
|
||||
|
||||
private bool Process()
|
||||
{
|
||||
if (interactable == null)
|
||||
return false;
|
||||
|
||||
return !isLocked;
|
||||
UpdateInteractionLayerMask();
|
||||
|
||||
return canProcess;
|
||||
}
|
||||
|
||||
|
||||
private void UpdateInteractionLayerMask()
|
||||
{
|
||||
if (interactable == null)
|
||||
{
|
||||
Debug.LogError($"Interactable is null on {gameObject.name}");
|
||||
return;
|
||||
}
|
||||
|
||||
if (IsLocked)
|
||||
{
|
||||
// Remove layer from interactable
|
||||
interactable.interactionLayers &= ~unlockedLayerMask;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Add layer to interactable
|
||||
interactable.interactionLayers |= unlockedLayerMask;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@ -15,6 +15,7 @@ MonoBehaviour:
|
||||
features: []
|
||||
m_renderMode: 1
|
||||
m_depthSubmissionMode: 0
|
||||
m_symmetricProjection: 0
|
||||
--- !u!114 &-8895518590110429109
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -290,6 +291,7 @@ MonoBehaviour:
|
||||
- {fileID: -5611916350011621528}
|
||||
m_renderMode: 1
|
||||
m_depthSubmissionMode: 0
|
||||
m_symmetricProjection: 0
|
||||
--- !u!114 &-6368128839055358620
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -609,6 +611,7 @@ MonoBehaviour:
|
||||
- {fileID: 2220871646205782247}
|
||||
m_renderMode: 1
|
||||
m_depthSubmissionMode: 0
|
||||
m_symmetricProjection: 0
|
||||
--- !u!114 &-2985913013423072367
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -895,6 +898,7 @@ MonoBehaviour:
|
||||
- {fileID: -7581625304019661375}
|
||||
m_renderMode: 1
|
||||
m_depthSubmissionMode: 0
|
||||
m_symmetricProjection: 0
|
||||
--- !u!114 &-34596358968032513
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -953,7 +957,11 @@ MonoBehaviour:
|
||||
- {fileID: -64324148185763206}
|
||||
- {fileID: 4257799398954384198}
|
||||
- {fileID: -9211917895290312687}
|
||||
<<<<<<< HEAD
|
||||
- {fileID: 2764461147872528805}
|
||||
=======
|
||||
- {fileID: 8014290140957049348}
|
||||
>>>>>>> origin/development
|
||||
--- !u!114 &32361891232910083
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1633,6 +1641,7 @@ MonoBehaviour:
|
||||
- {fileID: -5644509607064669464}
|
||||
m_renderMode: 1
|
||||
m_depthSubmissionMode: 0
|
||||
m_symmetricProjection: 0
|
||||
--- !u!114 &4451366187881382638
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2007,6 +2016,10 @@ MonoBehaviour:
|
||||
manifestName: cambria
|
||||
enabled: 1
|
||||
forceRemoveInternetPermission: 1
|
||||
symmetricProjection: 0
|
||||
systemSplashScreen: {fileID: 0}
|
||||
lateLatchingMode: 0
|
||||
lateLatchingDebug: 0
|
||||
--- !u!114 &7558681416710770871
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2047,6 +2060,22 @@ MonoBehaviour:
|
||||
company:
|
||||
priority: 0
|
||||
required: 0
|
||||
--- !u!114 &8014290140957049348
|
||||
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: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
|
||||
m_Name: WebGL
|
||||
m_EditorClassIdentifier:
|
||||
features: []
|
||||
m_renderMode: 1
|
||||
m_depthSubmissionMode: 0
|
||||
m_symmetricProjection: 0
|
||||
--- !u!114 &8165340515022376955
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{
|
||||
"dependencies": {
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"com.unity.collab-proxy": "2.2.0",
|
||||
>>>>>>> origin/development
|
||||
"com.unity.feature.development": "1.0.1",
|
||||
"com.unity.feature.vr": "1.0.0",
|
||||
"com.unity.learn.iet-framework": "3.1.3",
|
||||
@ -11,7 +15,11 @@
|
||||
"com.unity.xr.hands": "1.3.0",
|
||||
"com.unity.xr.interaction.toolkit": "2.5.2",
|
||||
"com.unity.xr.management": "4.4.0",
|
||||
<<<<<<< HEAD
|
||||
"com.unity.xr.openxr": "1.8.2",
|
||||
=======
|
||||
"com.unity.xr.openxr": "1.9.1",
|
||||
>>>>>>> origin/development
|
||||
"com.unity.modules.ai": "1.0.0",
|
||||
"com.unity.modules.androidjni": "1.0.0",
|
||||
"com.unity.modules.animation": "1.0.0",
|
||||
|
||||
@ -9,6 +9,16 @@
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"com.unity.collab-proxy": {
|
||||
"version": "2.2.0",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
>>>>>>> origin/development
|
||||
"com.unity.editorcoroutines": {
|
||||
"version": "1.0.0",
|
||||
"depth": 1,
|
||||
@ -28,8 +38,13 @@
|
||||
"depth": 0,
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
<<<<<<< HEAD
|
||||
"com.unity.ide.visualstudio": "2.0.21",
|
||||
"com.unity.ide.rider": "3.0.25",
|
||||
=======
|
||||
"com.unity.ide.visualstudio": "2.0.22",
|
||||
"com.unity.ide.rider": "3.0.26",
|
||||
>>>>>>> origin/development
|
||||
"com.unity.ide.vscode": "1.2.5",
|
||||
"com.unity.editorcoroutines": "1.0.0",
|
||||
"com.unity.performance.profile-analyzer": "1.2.2",
|
||||
@ -43,11 +58,19 @@
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.xr.oculus": "4.1.1",
|
||||
<<<<<<< HEAD
|
||||
"com.unity.xr.openxr": "1.8.2"
|
||||
}
|
||||
},
|
||||
"com.unity.ide.rider": {
|
||||
"version": "3.0.25",
|
||||
=======
|
||||
"com.unity.xr.openxr": "1.9.1"
|
||||
}
|
||||
},
|
||||
"com.unity.ide.rider": {
|
||||
"version": "3.0.26",
|
||||
>>>>>>> origin/development
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
@ -56,7 +79,11 @@
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.ide.visualstudio": {
|
||||
<<<<<<< HEAD
|
||||
"version": "2.0.21",
|
||||
=======
|
||||
"version": "2.0.22",
|
||||
>>>>>>> origin/development
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
@ -121,7 +148,11 @@
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.mathematics": "1.2.1",
|
||||
<<<<<<< HEAD
|
||||
"com.unity.burst": "1.8.4",
|
||||
=======
|
||||
"com.unity.burst": "1.8.9",
|
||||
>>>>>>> origin/development
|
||||
"com.unity.render-pipelines.core": "14.0.9",
|
||||
"com.unity.shadergraph": "14.0.9"
|
||||
}
|
||||
@ -305,13 +336,13 @@
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.xr.openxr": {
|
||||
"version": "1.8.2",
|
||||
"version": "1.9.1",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.xr.management": "4.0.1",
|
||||
"com.unity.xr.management": "4.4.0",
|
||||
"com.unity.xr.legacyinputhelpers": "2.1.2",
|
||||
"com.unity.inputsystem": "1.4.4",
|
||||
"com.unity.inputsystem": "1.6.3",
|
||||
"com.unity.xr.core-utils": "2.1.1"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
|
||||
@ -1,2 +1,7 @@
|
||||
<<<<<<< HEAD
|
||||
m_EditorVersion: 2022.3.11f1
|
||||
m_EditorVersionWithRevision: 2022.3.11f1 (d00248457e15)
|
||||
=======
|
||||
m_EditorVersion: 2022.3.13f1
|
||||
m_EditorVersionWithRevision: 2022.3.13f1 (5f90a5ebde0f)
|
||||
>>>>>>> origin/development
|
||||
|
||||
Loading…
Reference in New Issue
Block a user