version 2.5.1

This commit is contained in:
Sean Lu
2025-01-10 17:31:06 +08:00
parent 2554daa86e
commit 25a5fd2124
91 changed files with 16226 additions and 11225 deletions

View File

@@ -124,7 +124,7 @@ namespace VIVE.OpenXR.Samples.Anchor
void GetXRInputSubsystem()
{
List<XRInputSubsystem> xrSubsystemList = new List<XRInputSubsystem>();
SubsystemManager.GetInstances(xrSubsystemList);
SubsystemManager.GetSubsystems(xrSubsystemList);
foreach (var xrSubsystem in xrSubsystemList)
{
if (xrSubsystem.running)
@@ -675,6 +675,12 @@ namespace VIVE.OpenXR.Samples.Anchor
if (task.IsCompleted)
{
Task<(XrResult, string, byte[])> t = task as Task<(XrResult, string, byte[])>;
if (t == null)
{
tasks.Remove(task);
break;
}
if (t.Result.Item1 == XrResult.XR_SUCCESS)
{
// write to file

View File

@@ -349,9 +349,9 @@
},
{
"name": "IsTracked",
"type": "Value",
"type": "Button",
"id": "384094ab-6290-4de1-9b73-6dd7fae94298",
"expectedControlType": "Analog",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": true
@@ -1230,9 +1230,9 @@
},
{
"name": "IsTracked",
"type": "Value",
"type": "Button",
"id": "d1478f77-9424-45e1-bbe0-949fcfaec599",
"expectedControlType": "Analog",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": true

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fa549247e9994a84697e73e6d1288e2b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,71 @@
// Copyright HTC Corporation All Rights Reserved.
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.UI;
using UnityEngine.XR;
using VIVE.OpenXR;
[RequireComponent(typeof(Text))]
public class DebugIsTrackedOffset : MonoBehaviour
{
public InputActionReference isTracked1 = null;
public InputActionReference isTracked2 = null;
public InputActionReference isTracked3 = null;
public InputActionReference isTracked4 = null;
private Text m_Text = null;
private void Start()
{
m_Text = GetComponent<Text>();
}
void Update()
{
if (m_Text == null) { return; }
m_Text.text = "";
{
if (OpenXRHelper.GetButton(isTracked1, out bool value, out string msg))
{
m_Text.text += isTracked1.action.name + ": " + value;
}
else
{
m_Text.text += msg;
}
}
m_Text.text += "\n";
{
if (OpenXRHelper.GetButton(isTracked2, out bool value, out string msg))
{
m_Text.text += isTracked2.action.name + ": " + value;
}
else
{
m_Text.text += msg;
}
}
m_Text.text += "\n";
{
if (OpenXRHelper.GetButton(isTracked3, out bool value, out string msg))
{
m_Text.text += isTracked3.action.name + ": " + value;
}
else
{
m_Text.text += msg;
}
}
m_Text.text += "\n";
{
if (OpenXRHelper.GetButton(isTracked4, out bool value, out string msg))
{
m_Text.text += isTracked4.action.name + ": " + value;
}
else
{
m_Text.text += msg;
}
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2c5ffdf8ced75cf41a74cb761a3987dd
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,136 @@
// Copyright HTC Corporation All Rights Reserved.
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.UI;
using UnityEngine.XR;
using VIVE.OpenXR;
[RequireComponent(typeof(Text))]
public class DebugPoseData : MonoBehaviour
{
public string PoseName = "";
public InputActionReference isTracked = null;
public InputActionReference trackingState = null;
public InputActionReference position = null;
public InputActionReference rotation = null;
public InputActionReference pose = null;
private Text m_Text = null;
private void Start()
{
m_Text = GetComponent<Text>();
}
void Update()
{
if (m_Text == null) { return; }
m_Text.text = PoseName + " ----";
if (isTracked != null)
{
m_Text.text += "\nisTracked: ";
{
if (OpenXRHelper.GetButton(isTracked, out bool value, out string msg))
{
m_Text.text += value;
}
else
{
m_Text.text += msg;
}
}
}
if (trackingState != null)
{
m_Text.text += "\ntrackingState: ";
{
if (OpenXRHelper.GetInteger(trackingState, out InputTrackingState value, out string msg))
{
m_Text.text += value;
}
else
{
m_Text.text += msg;
}
}
}
if (position != null)
{
m_Text.text += "\nposition: ";
{
if (OpenXRHelper.GetVector3(position, out Vector3 value, out string msg))
{
m_Text.text += "(" + value.x.ToString("N3") + ", " + value.y.ToString("N3") + ", " + value.z.ToString("N3") + ")";
}
else
{
m_Text.text += msg;
}
}
}
if (rotation != null)
{
m_Text.text += "\nrotation: ";
{
if (OpenXRHelper.GetQuaternion(rotation, out Quaternion value, out string msg))
{
m_Text.text += "(" + value.x.ToString("N3") + ", " + value.y.ToString("N3") + ", " + value.z.ToString("N3") + ", " + value.w.ToString("N3") + ")";
}
else
{
m_Text.text += msg;
}
}
}
if (pose != null)
{
m_Text.text += "\npose.isTracked: ";
{
if (OpenXRHelper.GetPoseIsTracked(pose, out bool value, out string msg))
{
m_Text.text += value;
}
else
{
m_Text.text += msg;
}
}
m_Text.text += "\npose.trackingState: ";
{
if (OpenXRHelper.GetPoseTrackingState(pose, out InputTrackingState value, out string msg))
{
m_Text.text += value;
}
else
{
m_Text.text += msg;
}
}
m_Text.text += "\npose.position: ";
{
if (OpenXRHelper.GetPosePosition(pose, out Vector3 value, out string msg))
{
m_Text.text += "(" + value.x.ToString("N3") + ", " + value.y.ToString("N3") + ", " + value.z.ToString("N3") + ")";
}
else
{
m_Text.text += msg;
}
}
m_Text.text += "\npose.rotation: ";
{
if (OpenXRHelper.GetPoseRotation(pose, out Quaternion value, out string msg))
{
m_Text.text += "(" + value.x.ToString("N3") + ", " + value.y.ToString("N3") + ", " + value.z.ToString("N3") + ", " + value.w.ToString("N3") + ")";
}
else
{
m_Text.text += msg;
}
}
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 04725f4c022874d40a6e786b002b782a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -111,7 +111,14 @@ namespace VIVE.OpenXR.Samples
rotationTracked = ((uint)trackingState & (uint)InputTrackingState.Rotation) != 0;
bool tracked = isActive /*&& positionTracked */&& rotationTracked; // Show the object with 3DoF.
// Temporary workaround for PC platform: The isTracked value for HandInteractionEXT always returns false.
// For now, forcing it to true using a macro. This will be properly fixed in the next patch.
#if UNITY_STANDALONE
if (IsActive.action.ToString() == "Hand/isTrackedR" || IsActive.action.ToString() == "Hand/isTrackedL")
m_ObjectToHide.SetActive(true);
#else
m_ObjectToHide.SetActive(tracked);
#endif
}
}
}

View File

@@ -0,0 +1,439 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &165655209
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 165655211}
- component: {fileID: 165655210}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &165655210
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 165655209}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &165655211
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 165655209}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &577647561
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7207139244497761804, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_Name
value: VRSRig_withController
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244497761807, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244786812522, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_ClearFlags
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7207139244786812522, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_BackGroundColor.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244786812522, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_BackGroundColor.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207139244786812522, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
propertyPath: m_BackGroundColor.r
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
--- !u!1 &577647562 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7207139244497761804, guid: aa6466f3484ac344fb3c59a5b6398f84, type: 3}
m_PrefabInstance: {fileID: 577647561}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1436813407
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4106666293350236145, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_Name
value: VRSInputManager
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalPosition.x
value: -0.20003967
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalPosition.y
value: 0.3311797
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalPosition.z
value: 1.3696996
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4106666293350236147, guid: 247f35baba2bd814c96bea592859803d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 247f35baba2bd814c96bea592859803d, type: 3}
--- !u!1 &1888556275
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1888556277}
- component: {fileID: 1888556276}
m_Layer: 0
m_Name: Underlay
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1888556276
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1888556275}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 221c4e845ba39fa4396461ac8c3b9e8e, type: 3}
m_Name:
m_EditorClassIdentifier:
isPreviewingCylinder: 0
isPreviewingEquirect: 1
isPreviewingQuad: 0
generatedPreview: {fileID: 0}
layerType: 2
compositionDepth: 0
layerShape: 3
layerVisibility: 0
m_QuadWidth: 1
m_QuadHeight: 1
m_CylinderRadius: 1
m_CylinderHeight: 1
m_CylinderArcLength: 1
m_EquirectRadius: 10
m_EquirectScaleX: 1
m_EquirectScaleY: 1
m_EquirectBiasX: 0
m_EquirectBiasY: 0
m_EquirectCentralHorizontalAngle: 360
m_EquirectUpperVerticalAngle: 90
m_EquirectLowerVerticalAngle: -90
m_CylinderAngleOfArc: 180
lockMode: 0
isDynamicLayer: 0
isExternalSurface: 0
isCustomRects: 0
customRects: 2
externalSurfaceWidth: 1280
externalSurfaceHeight: 720
applyColorScaleBias: 0
solidEffect: 0
colorScale: {r: 1, g: 1, b: 1, a: 1}
colorBias: {r: 0, g: 0, b: 0, a: 0}
isProtectedSurface: 0
texture: {fileID: 2800000, guid: 536e6f3c92ead484baf6cebabecc58a7, type: 3}
textureRight: {fileID: 0}
renderPriority: 0
trackingOrigin: {fileID: 577647562}
generatedUnderlayMesh: {fileID: 0}
generatedFallbackMesh: {fileID: 0}
hmd: {fileID: 0}
--- !u!4 &1888556277
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1888556275}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c44817993abad6145928810ed11e7e49
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 MiB

View File

@@ -0,0 +1,135 @@
fileFormatVersion: 2
guid: 536e6f3c92ead484baf6cebabecc58a7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -22,6 +22,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- GRABPASS
- ALWAYS
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:

View File

@@ -54,6 +54,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "068b86ec-3f14-4d24-9b42-7057d00ab904",
"path": "<HandInteraction>{LeftHand}/isTracked",
"interactions": "",
"processors": "",
"groups": "",
"action": "isTrackedL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b605cbf6-38fb-422a-b12d-48e386a67e9a",
@@ -65,6 +76,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "fa2d2138-eb75-4cce-8088-3445f1560e97",
"path": "<HandInteraction>{RightHand}/isTracked",
"interactions": "",
"processors": "",
"groups": "",
"action": "isTrackedR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9535518b-92b1-45ff-9525-624d0c52de13",
@@ -76,6 +98,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4331ebf5-824f-405f-8a29-a4c4049c23d9",
"path": "<HandInteraction>{RightHand}/trackingState",
"interactions": "",
"processors": "",
"groups": "",
"action": "trackingStateR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "1ccbb62c-6370-4507-847e-8fda100510e8",
@@ -86,6 +119,17 @@
"action": "trackingStateL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f4e2d931-5b80-4e10-8e95-37c99a3d9536",
"path": "<HandInteraction>{LeftHand}/trackingState",
"interactions": "",
"processors": "",
"groups": "",
"action": "trackingStateL",
"isComposite": false,
"isPartOfComposite": false
}
]
},
@@ -160,6 +204,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0afb0794-9c98-41f7-9f58-8a1e64bc8bdc",
"path": "<HandInteraction>{LeftHand}/devicePose",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d41d33db-8b6c-4f21-9459-fd203551d990",
@@ -171,6 +226,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d46b4d0f-f908-4cd0-aece-22eb2318f8e7",
"path": "<HandInteraction>{RightHand}/devicePose",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "48b33d4f-e9f9-4890-b836-d7303386c8b0",
@@ -182,6 +248,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "005e532f-bb88-4636-8604-3c3dbf891803",
"path": "<HandInteraction>{LeftHand}/graspValue",
"interactions": "",
"processors": "",
"groups": "",
"action": "ValueL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "e43dc5cd-3e96-4453-b6b2-818250c91436",
@@ -193,6 +270,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ddd425a1-b196-4a6c-bbba-69f3fa9b44b8",
"path": "<HandInteraction>{RightHand}/graspValue",
"interactions": "",
"processors": "",
"groups": "",
"action": "ValueR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3e8a289a-aa43-44fd-bbdf-ed15035ad5ef",
@@ -204,6 +292,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9c47003b-b29e-49a8-8ee5-7700bdf3ef66",
"path": "<HandInteraction>{RightHand}/graspReady",
"interactions": "",
"processors": "",
"groups": "",
"action": "ReadyR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "79e10ffe-7276-4a95-b380-9d244bc2b213",
@@ -214,6 +313,17 @@
"action": "ReadyL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5f1f8ba8-8258-4293-8a1c-b7680ae212c0",
"path": "<HandInteraction>{LeftHand}/graspReady",
"interactions": "",
"processors": "",
"groups": "",
"action": "ReadyL",
"isComposite": false,
"isPartOfComposite": false
}
]
},
@@ -230,6 +340,24 @@
"interactions": "",
"initialStateCheck": false
},
{
"name": "PositionL",
"type": "PassThrough",
"id": "3c743437-254f-480d-ab2a-fbb7fa3a1c75",
"expectedControlType": "Vector3",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "RotationL",
"type": "PassThrough",
"id": "a61c5a21-e370-4bd7-91cc-4939db98a735",
"expectedControlType": "Quaternion",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "ValueL",
"type": "Value",
@@ -257,6 +385,24 @@
"interactions": "",
"initialStateCheck": false
},
{
"name": "PositionR",
"type": "PassThrough",
"id": "eb88b286-d41a-4441-8680-eae89ddd9427",
"expectedControlType": "Vector3",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "RotationR",
"type": "PassThrough",
"id": "4b410388-aabc-4cef-944e-68d5f68bcc44",
"expectedControlType": "Quaternion",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "ValueR",
"type": "Value",
@@ -288,6 +434,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "45cf0dab-fbfc-478f-aa3b-f74eafb029e9",
"path": "<HandInteraction>{LeftHand}/pointer",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "cbaae569-a034-4ce6-8cdd-eef5586aaa7e",
@@ -299,6 +456,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "bb49f848-f6b0-4a1a-b60c-1f08a8bdffcc",
"path": "<HandInteraction>{RightHand}/pointer",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "514be0ed-99f4-4f3a-a53b-672c0caeb1d5",
@@ -310,6 +478,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8e248108-0a74-421f-b2b6-0172ccf49da8",
"path": "<HandInteraction>{LeftHand}/pointerActivateValue",
"interactions": "",
"processors": "",
"groups": "",
"action": "ValueL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b3c9d90b-0ad0-42c6-9cda-1ac1d74719a5",
@@ -321,6 +500,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "afb0658c-57a3-4f84-99ce-f2b5731b081a",
"path": "<HandInteraction>{RightHand}/pointerActivateValue",
"interactions": "",
"processors": "",
"groups": "",
"action": "ValueR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "03ca7d96-43df-406f-8b41-c3b8168cbcbc",
@@ -332,6 +522,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ff1d9683-a045-4394-95f3-8b8637109b91",
"path": "<HandInteraction>{RightHand}/pointerActivateReady",
"interactions": "",
"processors": "",
"groups": "",
"action": "ReadyR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0f20788a-3543-4fd0-8e4e-9ad56108877e",
@@ -342,6 +543,299 @@
"action": "ReadyL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4df69cb3-1d60-4aab-9af4-528400022e93",
"path": "<HandInteraction>{LeftHand}/pointerActivateReady",
"interactions": "",
"processors": "",
"groups": "",
"action": "ReadyL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4af711ee-8f25-4a6b-900b-cce9a68655de",
"path": "<ViveHandInteractionExt>{LeftHand}/pointerPosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "056d875e-56e5-4783-b73c-7d2a83407530",
"path": "<HandInteraction>{LeftHand}/pointerPosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d47309f6-c5d1-4892-bf76-e51faa8b6137",
"path": "<ViveHandInteractionExt>{LeftHand}/pointerRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f4fade07-9a27-4a3a-9145-87fc4e6fc282",
"path": "<HandInteraction>{LeftHand}/pointerRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "61444e1e-91f4-45a7-8104-93317a4fcfa8",
"path": "<ViveHandInteractionExt>{RightHand}/pointerPosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d66724bb-6f33-46eb-8205-3912e3cdb72d",
"path": "<HandInteraction>{RightHand}/pointerPosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3f05dfd2-7dcb-46ee-a8c8-20c921c62793",
"path": "<ViveHandInteractionExt>{RightHand}/pointerRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c3aa63db-3ff8-4206-b62a-d1caf6ffafd5",
"path": "<HandInteraction>{RightHand}/pointerRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationR",
"isComposite": false,
"isPartOfComposite": false
}
]
},
{
"name": "HandPoke",
"id": "a4cfc781-c114-4451-96d5-857c3a9385fa",
"actions": [
{
"name": "PoseL",
"type": "PassThrough",
"id": "e9feeab8-c68c-47d7-8560-8f3b2c44d2bf",
"expectedControlType": "Pose",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "PositionL",
"type": "PassThrough",
"id": "eed73641-933c-4836-9ed7-f0f28ddbf9ec",
"expectedControlType": "Vector3",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "RotationL",
"type": "PassThrough",
"id": "5ad8d488-2973-487b-a19f-c8eb588c67d3",
"expectedControlType": "Quaternion",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "PoseR",
"type": "PassThrough",
"id": "1bac4e9e-ce3d-4218-bbca-255ef780cf6c",
"expectedControlType": "Pose",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "PositionR",
"type": "PassThrough",
"id": "cdd9430c-70f2-4854-b3ae-81b884e87168",
"expectedControlType": "Vector3",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "RotationR",
"type": "PassThrough",
"id": "81746764-95ef-48ce-b2e1-e05330f97e05",
"expectedControlType": "Quaternion",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
{
"name": "",
"id": "efd73d26-df7d-4b90-93c2-202a5f70c05c",
"path": "<ViveHandInteractionExt>{LeftHand}/pokePose",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8e9539c4-4aca-471f-b843-bd282a33616b",
"path": "<HandInteraction>{LeftHand}/pokePose",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "124f3c45-0d83-4302-9f2a-cb945f7c268e",
"path": "<ViveHandInteractionExt>{RightHand}/pokePose",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d6bd90fd-f8ab-4cc7-ab90-c604788b32e8",
"path": "<HandInteraction>{RightHand}/pokePose",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "29fcebb4-1111-4c52-becf-a20a4919c8bd",
"path": "<ViveHandInteractionExt>{RightHand}/pokePosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3f1a484f-a430-4f62-9587-47944d3ceb8a",
"path": "<HandInteraction>{RightHand}/pokePosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "72bb3809-4dba-4b8c-a35a-6c2078873256",
"path": "<ViveHandInteractionExt>{LeftHand}/pokeRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c64e7c60-8e41-47d7-80b3-8f8dd7c17071",
"path": "<HandInteraction>{LeftHand}/pokeRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "cae2d11b-bd7f-4fc4-b247-c21af26cf2d5",
"path": "<ViveHandInteractionExt>{RightHand}/pokeRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "59f0ff0b-c894-4fb7-b775-7a8dbc56c718",
"path": "<HandInteraction>{RightHand}/pokeRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "79dfac35-3c6f-45b2-8045-eeba5534cb14",
"path": "<ViveHandInteractionExt>{LeftHand}/pokePosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "6b420474-04e5-46bb-b76f-a4aef922dac4",
"path": "<HandInteraction>{LeftHand}/pokePosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionL",
"isComposite": false,
"isPartOfComposite": false
}
]
},
@@ -358,6 +852,24 @@
"interactions": "",
"initialStateCheck": false
},
{
"name": "PositionL",
"type": "PassThrough",
"id": "d0f34fc0-7d91-44ad-8fcb-2be82414f6ba",
"expectedControlType": "Vector3",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "RotationL",
"type": "PassThrough",
"id": "69f4a637-3eaf-490d-9de8-d9a08bff9fff",
"expectedControlType": "Quaternion",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "ValueL",
"type": "Value",
@@ -385,6 +897,24 @@
"interactions": "",
"initialStateCheck": false
},
{
"name": "PositionR",
"type": "PassThrough",
"id": "d46fd2f7-9611-4d4f-bc93-12999b1f862e",
"expectedControlType": "Vector3",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "RotationR",
"type": "PassThrough",
"id": "5ea8b91a-29fb-4e5a-bb65-f61664a39b2a",
"expectedControlType": "Quaternion",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "ValueR",
"type": "Value",
@@ -416,6 +946,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "e73a46a3-8913-44c6-a015-713f387ff238",
"path": "<HandInteraction>{LeftHand}/pinchPose",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "92e779f7-ba6f-417d-9f4c-9d5f81790686",
@@ -427,6 +968,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8c9406c8-c451-43cc-8a39-b8ec5d841c2b",
"path": "<HandInteraction>{RightHand}/pinchPose",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f5f748fd-da48-423b-864a-340e9934041f",
@@ -438,6 +990,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "dbc9eb68-a3a8-4309-b690-2215efd2af77",
"path": "<HandInteraction>{LeftHand}/pinchValue",
"interactions": "",
"processors": "",
"groups": "",
"action": "ValueL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "838dbd9a-6c54-4959-9a92-0168b20d3632",
@@ -449,6 +1012,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "79ebe950-0644-4adb-a13d-fd1d5e109e57",
"path": "<HandInteraction>{RightHand}/pinchValue",
"interactions": "",
"processors": "",
"groups": "",
"action": "ValueR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "30bc3116-8581-42b7-9a73-8f4ce570083e",
@@ -460,6 +1034,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "e50e1257-1b2b-46ab-99b2-231ccee5eeb6",
"path": "<HandInteraction>{RightHand}/pinchReady",
"interactions": "",
"processors": "",
"groups": "",
"action": "ReadyR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9591b4cc-cf0b-4096-91ae-848358b0f366",
@@ -470,52 +1055,103 @@
"action": "ReadyL",
"isComposite": false,
"isPartOfComposite": false
}
]
},
{
"name": "HandPoke",
"id": "a4cfc781-c114-4451-96d5-857c3a9385fa",
"actions": [
{
"name": "PoseL",
"type": "PassThrough",
"id": "e9feeab8-c68c-47d7-8560-8f3b2c44d2bf",
"expectedControlType": "Pose",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "PoseR",
"type": "PassThrough",
"id": "1bac4e9e-ce3d-4218-bbca-255ef780cf6c",
"expectedControlType": "Pose",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
{
"name": "",
"id": "efd73d26-df7d-4b90-93c2-202a5f70c05c",
"path": "<ViveHandInteractionExt>{LeftHand}/pokePose",
"id": "136c49a3-8f2b-476b-9adf-98e7ed1e6e9a",
"path": "<HandInteraction>{LeftHand}/pinchReady",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseL",
"action": "ReadyL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "124f3c45-0d83-4302-9f2a-cb945f7c268e",
"path": "<ViveHandInteractionExt>{RightHand}/pokePose",
"id": "9221267c-62a0-47cb-aeba-aca47714c033",
"path": "<ViveHandInteractionExt>{LeftHand}/pinchRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "PoseR",
"action": "RotationL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b4dcfb93-89e5-45cf-bde0-6c2adea454b3",
"path": "<HandInteraction>{LeftHand}/pinchRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b841def8-addf-4eae-808f-5160a5ff3ed5",
"path": "<ViveHandInteractionExt>{LeftHand}/pinchPosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3253d57e-11aa-4449-8960-16e8911854d5",
"path": "<HandInteraction>{LeftHand}/pinchPosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionL",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "88a63c73-43a1-469c-99b0-ef08bd0b95e7",
"path": "<ViveHandInteractionExt>{RightHand}/pinchPosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "bf69fb00-cf5a-40da-a774-437f1ea76d44",
"path": "<HandInteraction>{RightHand}/pinchPosition",
"interactions": "",
"processors": "",
"groups": "",
"action": "PositionR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "7f0a8dc7-c33a-4811-ad95-367df499cfb8",
"path": "<ViveHandInteractionExt>{RightHand}/pinchRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationR",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ef207392-905c-4a08-9e1f-7bdf0b66069a",
"path": "<HandInteraction>{RightHand}/pinchRotation",
"interactions": "",
"processors": "",
"groups": "",
"action": "RotationR",
"isComposite": false,
"isPartOfComposite": false
}

View File

@@ -1768,6 +1768,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -1808,6 +1809,18 @@ MonoBehaviour:
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: 5c275b7c-6878-407c-acb9-66806a61261b
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name:
m_Type: 0
@@ -1826,7 +1839,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &672225543
GameObject:
m_ObjectHideFlags: 0
@@ -2227,6 +2239,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -2245,6 +2258,14 @@ MonoBehaviour:
m_Groups:
m_Action: Position Input
m_Flags: 0
- m_Name:
m_Id: 226fcfb5-99d1-4280-be7d-6cab3c65b50e
m_Path: <HandInteraction>{RightHand}/pinchPosition
m_Interactions:
m_Processors:
m_Groups:
m_Action: Position Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_RotationInput:
@@ -2265,6 +2286,26 @@ MonoBehaviour:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
- m_Name:
m_Id: bcafb8fd-f86e-42bf-90ac-af906ad3c602
m_Path: <HandInteraction>{RightHand}/pinchRotation
m_Interactions:
m_Processors:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: de44ecc7-66b7-4528-a659-367b18da0fbc
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
@@ -2285,7 +2326,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1001 &743277234
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2939,6 +2979,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -2957,6 +2998,14 @@ MonoBehaviour:
m_Groups:
m_Action: Position Input
m_Flags: 0
- m_Name:
m_Id: 4364030c-a105-4d8e-a293-2110f00c6bd2
m_Path: <HandInteraction>{LeftHand}/pinchPosition
m_Interactions:
m_Processors:
m_Groups:
m_Action: Position Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_RotationInput:
@@ -2977,6 +3026,26 @@ MonoBehaviour:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
- m_Name:
m_Id: a3e41bb8-f7e1-4d78-982f-efb634541fad
m_Path: <HandInteraction>{LeftHand}/pinchRotation
m_Interactions:
m_Processors:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: c406c9d0-8b04-4a9b-8176-c2f2ecb97e6d
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
@@ -2997,7 +3066,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &1007103283
GameObject:
m_ObjectHideFlags: 0
@@ -3361,6 +3429,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -3401,6 +3470,18 @@ MonoBehaviour:
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: 03a60622-a192-4d59-b71c-846ad1399680
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name:
m_Type: 0
@@ -3419,7 +3500,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1001 &1226082257
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3736,6 +3816,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -3754,6 +3835,14 @@ MonoBehaviour:
m_Groups:
m_Action: Position Input
m_Flags: 0
- m_Name:
m_Id: 34a62fdc-c1b6-4cf1-a7de-b7024d3ca2cf
m_Path: <HandInteraction>{LeftHand}/pointerPosition
m_Interactions:
m_Processors:
m_Groups:
m_Action: Position Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_RotationInput:
@@ -3774,6 +3863,26 @@ MonoBehaviour:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
- m_Name:
m_Id: 6e74078d-e467-4dc6-8023-a29a8e78d576
m_Path: <HandInteraction>{LeftHand}/pointerRotation
m_Interactions:
m_Processors:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: 6a3020fa-bbda-4b50-adfe-31d7c651a205
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
@@ -3794,7 +3903,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &1414890483
GameObject:
m_ObjectHideFlags: 0
@@ -4053,6 +4161,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -4071,6 +4180,14 @@ MonoBehaviour:
m_Groups:
m_Action: Position Input
m_Flags: 0
- m_Name:
m_Id: 449e07f6-b6de-4297-8c24-68fa0c54203b
m_Path: <HandInteraction>{RightHand}/devicePosition
m_Interactions:
m_Processors:
m_Groups:
m_Action: Position Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_RotationInput:
@@ -4091,6 +4208,26 @@ MonoBehaviour:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
- m_Name:
m_Id: 2d2d7513-e9e2-44fe-a2f3-8519275ddf39
m_Path: <HandInteraction>{RightHand}/deviceRotation
m_Interactions:
m_Processors:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: f109a673-1db0-4c0a-90b3-7d2f485e71e1
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
@@ -4111,7 +4248,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1001 &1495351303
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4760,6 +4896,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -4778,6 +4915,14 @@ MonoBehaviour:
m_Groups:
m_Action: Position Input
m_Flags: 0
- m_Name:
m_Id: a98522ae-3d15-4f68-8b52-3e0b07bac073
m_Path: <HandInteraction>{RightHand}/pokePosition
m_Interactions:
m_Processors:
m_Groups:
m_Action: Position Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_RotationInput:
@@ -4798,6 +4943,26 @@ MonoBehaviour:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
- m_Name:
m_Id: a5a97017-b5d5-497d-b9e8-a4c31f49c490
m_Path: <HandInteraction>{RightHand}/pokeRotation
m_Interactions:
m_Processors:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: 1105b297-66c4-46e5-a497-8c5fada26fca
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
@@ -4818,7 +4983,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &1708107229
GameObject:
m_ObjectHideFlags: 0
@@ -5771,6 +5935,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -5811,6 +5976,18 @@ MonoBehaviour:
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: dbd06a1e-0881-4702-b7ef-a4bb81c023fd
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name:
m_Type: 0
@@ -5829,7 +6006,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &1947228662
GameObject:
m_ObjectHideFlags: 0
@@ -5893,6 +6069,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -5911,6 +6088,14 @@ MonoBehaviour:
m_Groups:
m_Action: Position Input
m_Flags: 0
- m_Name:
m_Id: b51f75c3-0d11-4a26-b603-185a4f559861
m_Path: <HandInteraction>{LeftHand}/pokePosition
m_Interactions:
m_Processors:
m_Groups:
m_Action: Position Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_RotationInput:
@@ -5931,6 +6116,26 @@ MonoBehaviour:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
- m_Name:
m_Id: 59e61b20-ab73-411d-8b56-ac6f0e182f9d
m_Path: <HandInteraction>{LeftHand}/pokeRotation
m_Interactions:
m_Processors:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: 52fe8957-1665-4732-a1a1-f95cc70a1c78
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
@@ -5951,7 +6156,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &1962967395
GameObject:
m_ObjectHideFlags: 0
@@ -6093,6 +6297,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -6111,6 +6316,14 @@ MonoBehaviour:
m_Groups:
m_Action: Position Input
m_Flags: 0
- m_Name:
m_Id: 2b53a195-ce43-4708-a385-e61a8c6ec293
m_Path: <HandInteraction>{LeftHand}/devicePosition
m_Interactions:
m_Processors:
m_Groups:
m_Action: Position Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_RotationInput:
@@ -6131,6 +6344,26 @@ MonoBehaviour:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
- m_Name:
m_Id: 5717e88d-f9be-4c5d-a42b-a82e179bc64d
m_Path: <HandInteraction>{LeftHand}/deviceRotation
m_Interactions:
m_Processors:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: ec3ea843-1c14-4b82-a1ca-3e61d0da8985
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
@@ -6151,7 +6384,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &2064717940
GameObject:
m_ObjectHideFlags: 0
@@ -6215,6 +6447,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -6255,6 +6488,18 @@ MonoBehaviour:
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: eb274547-769d-45f6-890b-abda078e5899
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name:
m_Type: 0
@@ -6273,7 +6518,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &2073298331
GameObject:
m_ObjectHideFlags: 0
@@ -6504,6 +6748,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -6522,6 +6767,14 @@ MonoBehaviour:
m_Groups:
m_Action: Position Input
m_Flags: 0
- m_Name:
m_Id: b9726b6c-9ecb-4694-982a-9099c7c1df5e
m_Path: <HandInteraction>{RightHand}/pointerPosition
m_Interactions:
m_Processors:
m_Groups:
m_Action: Position Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_RotationInput:
@@ -6542,6 +6795,26 @@ MonoBehaviour:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
- m_Name:
m_Id: fdb8ffda-f0d5-4c9b-b785-6afb920dafa8
m_Path: <HandInteraction>{RightHand}/pointerRotation
m_Interactions:
m_Processors:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: 0b86eacc-f773-400d-98a7-92e950a58b04
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
@@ -6562,7 +6835,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!4 &543450651583740275 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5562507940235781211, guid: a6579de606ad5b54893722f363b5371d, type: 3}
@@ -7983,6 +8255,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -8023,6 +8296,18 @@ MonoBehaviour:
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: 8d1a2e5f-8b6f-4fa9-a4d9-b17c00a26569
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name: Position
m_Type: 0
@@ -8057,7 +8342,6 @@ MonoBehaviour:
m_Action: Rotation
m_Flags: 0
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &6088718223833369450
GameObject:
m_ObjectHideFlags: 0
@@ -8172,6 +8456,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -8212,6 +8497,18 @@ MonoBehaviour:
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: 7b3328e4-c5ac-4bf5-86d8-e72901205f35
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name: Position
m_Type: 0
@@ -8246,7 +8543,6 @@ MonoBehaviour:
m_Action: Rotation
m_Flags: 0
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &6088718223950534255
GameObject:
m_ObjectHideFlags: 0
@@ -8736,6 +9032,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 0
m_Action:
@@ -8776,6 +9073,18 @@ MonoBehaviour:
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name: Tracking State Input
m_Type: 0
m_ExpectedControlType:
m_Id: ae1fc38a-9c71-495c-aab6-ed33ddf01498
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name: Position
m_Type: 0
@@ -8810,7 +9119,6 @@ MonoBehaviour:
m_Action: Rotation
m_Flags: 0
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1001 &7278110509245602027
PrefabInstance:
m_ObjectHideFlags: 0

View File

@@ -27,7 +27,7 @@ namespace UnityEngine.XR.OpenXR.Samples.ControllerSample
if (m_ActionReference != null
&& m_ActionReference.action != null
&& m_ActionReference.action.controls.Count > 0
//&& m_ActionReference.action.controls.Count > 0 // The Count of InputActionProperty will become 0 after switching interaction profiles.
&& m_ActionReference.action.enabled == true)
{
m_TargetGameobject.SetActive(true);

View File

@@ -24,7 +24,7 @@ namespace UnityEngine.XR.OpenXR.Samples.ControllerSample
if (m_TimeRemainingTillChange <= 0.0f)
{
List<XRInputSubsystem> inputSubsystems = new List<XRInputSubsystem>();
SubsystemManager.GetInstances(inputSubsystems);
SubsystemManager.GetSubsystems(inputSubsystems);
XRInputSubsystem subsystem = inputSubsystems?[0];
if (subsystem != null)
{

View File

@@ -138,7 +138,7 @@ namespace UnityEngine.XR.OpenXR.Samples.ControllerSample
XRInputSubsystem subsystem = null;
SubsystemManager.GetInstances(s_InputSubsystems);
SubsystemManager.GetSubsystems(s_InputSubsystems);
if(s_InputSubsystems.Count > 0)
{
subsystem = s_InputSubsystems[0];

View File

@@ -0,0 +1,37 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.XR;
namespace VIVE.OpenXR.Samples.OpenXRInput
{
public class RemoveRenderMask : MonoBehaviour
{
private void OnEnable()
{
StartCoroutine(RemoveOcclusionMask());
}
IEnumerator RemoveOcclusionMask()
{
// Find DisplaySubsystem
XRDisplaySubsystem display = null;
List<XRDisplaySubsystem> displaySubsystems = new List<XRDisplaySubsystem>();
do
{
SubsystemManager.GetSubsystems(displaySubsystems);
foreach (var d in displaySubsystems)
{
if (d.running)
{
display = d;
break;
}
}
yield return null;
} while (display == null);
Debug.Log("RemoveOcclusionMask XRSettings.occlusionMaskScale = 0");
XRSettings.occlusionMaskScale = 0;
XRSettings.useOcclusionMesh = false;
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7f60faf6b28b7954b9ddf397eda40dc7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -29,7 +29,7 @@ public class PlaneDetectionTestHandle : MonoBehaviour
void GetXRInputSubsystem()
{
List<XRInputSubsystem> xrSubsystemList = new List<XRInputSubsystem>();
SubsystemManager.GetInstances(xrSubsystemList);
SubsystemManager.GetSubsystems(xrSubsystemList);
foreach (var xrSubsystem in xrSubsystemList)
{
if (xrSubsystem.running)

View File

@@ -96,7 +96,11 @@ public class Controller : MonoBehaviour
{
GameObject ball = Instantiate(sphere, spawnPoint);
Rigidbody rb = ball.GetComponent<Rigidbody>();
#if UNITY_6000_0_OR_NEWER
rb.linearVelocity = ball.transform.parent.forward * shootVelocity;
#else
rb.velocity = ball.transform.parent.forward * shootVelocity;
#endif
rb.isKinematic = false;
ball.transform.parent = null;
}

View File

@@ -21,7 +21,11 @@ namespace UnityEngine.XR.OpenXR.Samples.MeshingFeature
{
if (transform.position.y < -10)
{
#if UNITY_6000_0_OR_NEWER
rb.linearVelocity = Vector3.zero;
#else
rb.velocity = Vector3.zero;
#endif
rb.angularVelocity = Vector3.zero;
rb.MovePosition(starting);
}

View File

@@ -85,7 +85,7 @@ namespace UnityEngine.XR.OpenXR.Samples.MeshingFeature
}
var meshSubsystems = new List<XRMeshSubsystem>();
SubsystemManager.GetInstances(meshSubsystems);
SubsystemManager.GetSubsystems(meshSubsystems);
if (meshSubsystems.Count == 1)
{
s_MeshSubsystem = meshSubsystems[0];

View File

@@ -23,6 +23,11 @@
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [
{
"name": "com.unity.textmeshpro",
"expression": "3.2.0-pre.10",
"define": "UNITY_TEXT_MESH_PRO_3_2_0_PRE_10_OR_NEWER"
},
{
"name": "com.unity.xr.openxr",
"expression": "1.6.0",
@@ -32,12 +37,7 @@
"name": "com.unity.xr.openxr",
"expression": "1.9.1",
"define": "UNITY_XR_OPENXR_1_9_1"
},
{
"name": "com.unity.textmeshpro",
"expression": "3.2.0-pre.10",
"define": "UNITY_TEXT_MESH_PRO_3_2_0_PRE_10_OR_NEWER"
}
],
"noEngineReferences": false
}
}

View File

@@ -23034,7 +23034,7 @@ GameObject:
- component: {fileID: 785420544}
- component: {fileID: 785420543}
- component: {fileID: 785420542}
- component: {fileID: 785420541}
- component: {fileID: 785420545}
m_Layer: 5
m_Name: QuitBtn
m_TagString: Untagged
@@ -23063,18 +23063,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -96}
m_SizeDelta: {x: 86.2, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &785420541
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 785420539}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b661f25ed5b57874290a0bafb5ad8234, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &785420542
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -23119,8 +23107,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 785420541}
m_TargetAssemblyTypeName: Wave.Essence.Extra.QuitApplication, Wave.Essence
- m_Target: {fileID: 785420545}
m_TargetAssemblyTypeName: VIVE.OpenXR.Toolkits.Common.LeaveScene, VIVE.OpenXR.Toolkits
m_MethodName: ExitGame
m_Mode: 1
m_Arguments:
@@ -23169,6 +23157,18 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 785420539}
m_CullTransparentMesh: 1
--- !u!114 &785420545
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 785420539}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 46285a19de0bb1b4f849a4b0bcfc5c0f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &792366970
GameObject:
m_ObjectHideFlags: 0
@@ -68792,6 +68792,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 1
m_Action:
@@ -68816,6 +68817,18 @@ MonoBehaviour:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 3113219943245244623, guid: 7731a6c81e069424eb7df31b19b84b41, type: 3}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name:
m_Type: 0
m_ExpectedControlType:
m_Id: 49637aaa-d811-48fe-9f86-4076b1bbf006
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name:
m_Type: 0
@@ -68834,7 +68847,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!4 &2336634745151424894
Transform:
m_ObjectHideFlags: 0
@@ -68947,6 +68959,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 1
m_Action:
@@ -68971,6 +68984,18 @@ MonoBehaviour:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: -5246335118593862002, guid: 7731a6c81e069424eb7df31b19b84b41, type: 3}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name:
m_Type: 0
m_ExpectedControlType:
m_Id: 49846443-d944-470e-969c-29e6fe616f69
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name:
m_Type: 0
@@ -68989,7 +69014,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &2336634745461817778
GameObject:
m_ObjectHideFlags: 0
@@ -69698,6 +69722,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_TrackingType: 0
m_UpdateType: 0
m_IgnoreTrackingState: 0
m_PositionInput:
m_UseReference: 1
m_Action:
@@ -69722,6 +69747,18 @@ MonoBehaviour:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: -3341103204585363708, guid: 7731a6c81e069424eb7df31b19b84b41, type: 3}
m_TrackingStateInput:
m_UseReference: 0
m_Action:
m_Name:
m_Type: 0
m_ExpectedControlType:
m_Id: 346b5aa3-6f99-4b26-847e-776c912c914e
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
m_PositionAction:
m_Name:
m_Type: 0
@@ -69740,7 +69777,6 @@ MonoBehaviour:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_HasMigratedActions: 1
--- !u!1 &2336634746049650654
GameObject:
m_ObjectHideFlags: 0