Skip to content

GitLab

Commit 2af889ea authored by Haobo38's avatar Haobo38
Browse files

xr test

parent 80c9fd5d
Pipeline #94714 failed with stage
in 1 minute and 29 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Operational view/VRInteractions/Assets/Scenes/XR Interaction Toolkit.unity.meta 0 → 100644
View file @ 2af889ea
fileFormatVersion: 2
guid: 5f438715daabf5c43b9c9a4613ee9ff3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Operational view/VRInteractions/Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs
View file @ 2af889ea
......@@ -113,6 +113,14 @@ namespace Valve.VR
}
}
public virtual SteamVR_Action_Boolean Trigger
{
get
{
return SteamVR_Actions.default_Trigger;
}
}
public virtual SteamVR_Action_Vibration Haptic
{
get
......
Operational view/VRInteractions/Assets/SteamVR_Input/SteamVR_Input_Actions.cs
View file @ 2af889ea
......@@ -41,6 +41,8 @@ namespace Valve.VR
private static SteamVR_Action_Boolean p_default_OpenMenuOBJ;
private static SteamVR_Action_Boolean p_default_Trigger;
private static SteamVR_Action_Vibration p_default_Haptic;
private static SteamVR_Action_Vector2 p_platformer_Move;
......@@ -245,6 +247,14 @@ namespace Valve.VR
}
}
public static SteamVR_Action_Boolean default_Trigger
{
get
{
return SteamVR_Actions.p_default_Trigger.GetCopy<SteamVR_Action_Boolean>();
}
}
public static SteamVR_Action_Vibration default_Haptic
{
get
......@@ -692,6 +702,7 @@ namespace Valve.VR
SteamVR_Actions.default_SnapTurnLeft,
SteamVR_Actions.default_SnapTurnRight,
SteamVR_Actions.default_OpenMenuOBJ,
SteamVR_Actions.default_Trigger,
SteamVR_Actions.default_Haptic,
SteamVR_Actions.platformer_Move,
SteamVR_Actions.platformer_Jump,
......@@ -759,6 +770,7 @@ namespace Valve.VR
SteamVR_Actions.default_SnapTurnLeft,
SteamVR_Actions.default_SnapTurnRight,
SteamVR_Actions.default_OpenMenuOBJ,
SteamVR_Actions.default_Trigger,
SteamVR_Actions.platformer_Move,
SteamVR_Actions.platformer_Jump,
SteamVR_Actions.buggy_Steering,
......@@ -829,6 +841,7 @@ namespace Valve.VR
SteamVR_Actions.default_SnapTurnLeft,
SteamVR_Actions.default_SnapTurnRight,
SteamVR_Actions.default_OpenMenuOBJ,
SteamVR_Actions.default_Trigger,
SteamVR_Actions.platformer_Jump,
SteamVR_Actions.buggy_Brake,
SteamVR_Actions.buggy_Reset,
......@@ -897,6 +910,7 @@ namespace Valve.VR
SteamVR_Actions.default_SnapTurnLeft,
SteamVR_Actions.default_SnapTurnRight,
SteamVR_Actions.default_OpenMenuOBJ,
SteamVR_Actions.default_Trigger,
SteamVR_Actions.platformer_Move,
SteamVR_Actions.platformer_Jump,
SteamVR_Actions.buggy_Steering,
......@@ -962,6 +976,7 @@ namespace Valve.VR
SteamVR_Actions.p_default_SnapTurnLeft = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/SnapTurnLeft")));
SteamVR_Actions.p_default_SnapTurnRight = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/SnapTurnRight")));
SteamVR_Actions.p_default_OpenMenuOBJ = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/OpenMenuOBJ")));
SteamVR_Actions.p_default_Trigger = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/Trigger")));
SteamVR_Actions.p_default_Haptic = ((SteamVR_Action_Vibration)(SteamVR_Action.Create<SteamVR_Action_Vibration>("/actions/default/out/Haptic")));
SteamVR_Actions.p_platformer_Move = ((SteamVR_Action_Vector2)(SteamVR_Action.Create<SteamVR_Action_Vector2>("/actions/platformer/in/Move")));
SteamVR_Actions.p_platformer_Jump = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/platformer/in/Jump")));
......
Operational view/VRInteractions/Assets/StreamingAssets/SteamVR/actions.json
View file @ 2af889ea
......@@ -53,6 +53,10 @@
"name": "/actions/default/in/OpenMenuOBJ",
"type": "boolean"
},
{
"name": "/actions/default/in/Trigger",
"type": "boolean"
},
{
"name": "/actions/default/out/Haptic",
"type": "vibration"
......@@ -491,7 +495,8 @@
"/actions/htc_viu/in/viu_axis_4xy": "Axis4 X&Y",
"/actions/htc_viu/out/viu_vib_01": "Vibration",
"/actions/htc_viu/in/viu_skeleton_left": "Skeleton (Left)",
"/actions/htc_viu/in/viu_skeleton_right": "Skeleton (Right)"
"/actions/htc_viu/in/viu_skeleton_right": "Skeleton (Right)",
"/actions/default/in/Trigger": "Trigger"
}
]
}
\ No newline at end of file
Operational view/VRInteractions/Assets/StreamingAssets/SteamVR/bindings_vive_controller.json
View file @ 2af889ea
{
"controller_type": "vive_controller",
"description": "",
"name": "vive_controller",
"app_key": "application.generated.unity.vrinteractions.exe",
"bindings": {
"/actions/buggy": {
"chords": [],
"poses": [],
"haptics": [],
"sources": [
{
"path": "/user/hand/left/input/trigger",
......@@ -73,12 +73,30 @@
}
}
],
"poses": [],
"haptics": [],
"skeleton": []
},
"/actions/default": {
"chords": [],
"poses": [
{
"output": "/actions/default/in/pose",
"path": "/user/hand/left/pose/raw"
},
{
"output": "/actions/default/in/pose",
"path": "/user/hand/right/pose/raw"
}
],
"haptics": [
{
"output": "/actions/default/out/haptic",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/default/out/haptic",
"path": "/user/hand/right/output/haptic"
}
],
"sources": [
{
"path": "/user/hand/left/input/trigger",
......@@ -208,44 +226,44 @@
}
},
{
"path": "/user/hand/left/input/trigger",
"mode": "trigger",
"path": "/user/hand/left/input/application_menu",
"mode": "button",
"parameters": {},
"inputs": {
"pull": {
"output": "/actions/default/in/squeeze"
"click": {
"output": "/actions/default/in/openmenuobj"
}
}
},
{
"path": "/user/hand/right/input/trigger",
"mode": "trigger",
"path": "/user/hand/right/input/application_menu",
"mode": "button",
"parameters": {},
"inputs": {
"pull": {
"output": "/actions/default/in/squeeze"
"click": {
"output": "/actions/default/in/openmenuobj"
}
}
}
],
"poses": [
{
"output": "/actions/default/in/pose",
"path": "/user/hand/left/pose/raw"
},
{
"output": "/actions/default/in/pose",
"path": "/user/hand/right/pose/raw"
}
],
"haptics": [
{
"output": "/actions/default/out/haptic",
"path": "/user/hand/left/output/haptic"
"path": "/user/hand/left/input/trigger",
"mode": "trigger",
"parameters": {},
"inputs": {
"click": {
"output": "/actions/default/in/trigger"
}
}
},
{
"output": "/actions/default/out/haptic",
"path": "/user/hand/right/output/haptic"
"path": "/user/hand/right/input/trigger",
"mode": "trigger",
"parameters": {},
"inputs": {
"click": {
"output": "/actions/default/in/trigger"
}
}
}
],
"skeleton": [
......@@ -259,56 +277,19 @@
}
]
},
"/actions/platformer": {
"/actions/htc_viu": {
"chords": [],
"sources": [
{
"path": "/user/hand/left/input/trackpad",
"mode": "button",
"parameters": {},
"inputs": {
"click": {
"output": "/actions/platformer/in/jump"
}
}
},
{
"path": "/user/hand/right/input/trackpad",
"mode": "button",
"parameters": {},
"inputs": {
"click": {
"output": "/actions/platformer/in/jump"
}
}
},
"poses": [],
"haptics": [
{
"path": "/user/hand/left/input/trackpad",
"mode": "trackpad",
"parameters": {},
"inputs": {
"position": {
"output": "/actions/platformer/in/move"
}
}
"output": "/actions/htc_viu/out/viu_vib_01",
"path": "/user/hand/left/output/haptic"
},
{
"path": "/user/hand/right/input/trackpad",
"mode": "trackpad",
"parameters": {},
"inputs": {
"position": {
"output": "/actions/platformer/in/move"
}
}
"output": "/actions/htc_viu/out/viu_vib_01",
"path": "/user/hand/right/output/haptic"
}
],
"poses": [],
"haptics": [],
"skeleton": []
},
"/actions/htc_viu": {
"chords": [],
"sources": [
{
"path": "/user/hand/left/input/grip",
......@@ -453,17 +434,6 @@
}
}
],
"poses": [],
"haptics": [
{
"output": "/actions/htc_viu/out/viu_vib_01",
"path": "/user/hand/left/output/haptic"
},
{
"output": "/actions/htc_viu/out/viu_vib_01",
"path": "/user/hand/right/output/haptic"
}
],
"skeleton": [
{
"output": "/actions/htc_viu/in/viu_skeleton_left",
......@@ -474,6 +444,57 @@
"path": "/user/hand/right/input/skeleton/right"
}
]
},
"/actions/platformer": {
"chords": [],
"poses": [],
"haptics": [],
"sources": [
{
"path": "/user/hand/left/input/trackpad",
"mode": "button",
"parameters": {},
"inputs": {
"click": {
"output": "/actions/platformer/in/jump"
}
}
},
{
"path": "/user/hand/right/input/trackpad",
"mode": "button",
"parameters": {},
"inputs": {
"click": {
"output": "/actions/platformer/in/jump"
}
}
},
{
"path": "/user/hand/left/input/trackpad",
"mode": "trackpad",
"parameters": {},
"inputs": {
"position": {
"output": "/actions/platformer/in/move"
}
}
},
{
"path": "/user/hand/right/input/trackpad",
"mode": "trackpad",
"parameters": {},
"inputs": {
"position": {
"output": "/actions/platformer/in/move"
}
}
}
],
"skeleton": []
}
}
},
"controller_type": "vive_controller",
"description": "",
"name": "vive_controller"
}
\ No newline at end of file
Operational view/VRInteractions/Assets/XRI.meta 0 → 100644
View file @ 2af889ea
fileFormatVersion: 2
guid: 0eafd7ef3bfaf4248b079b17a39be9da
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Operational view/VRInteractions/Assets/XRI/Settings.meta 0 → 100644
View file @ 2af889ea
fileFormatVersion: 2
guid: 67666476b55e3bb4aac2dc040a89234f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Operational view/VRInteractions/Assets/XRI/Settings/Resources.meta 0 → 100644
View file @ 2af889ea
fileFormatVersion: 2
guid: b1f3b003ff30fe64691b795c31e8e5b9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Operational view/VRInteractions/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset 0 → 100644
View file @ 2af889ea
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 191492db6e452eb468b95433ec162164, type: 3}
m_Name: InteractionLayerSettings
m_EditorClassIdentifier:
m_LayerNames:
- Default
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Operational view/VRInteractions/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta 0 → 100644
View file @ 2af889ea
fileFormatVersion: 2
guid: adb10212340716942828c7d4a9f36cdd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Operational view/VRInteractions/Assets/XRI/Settings/XRInteractionEditorSettings.asset 0 → 100644
View file @ 2af889ea
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2d38fb1463c5c804b8847c20e8873623, type: 3}
m_Name: XRInteractionEditorSettings
m_EditorClassIdentifier:
m_InteractionLayerUpdaterShown: 1
m_ShowOldInteractionLayerMaskInInspector: 0
Operational view/VRInteractions/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta 0 → 100644
View file @ 2af889ea
fileFormatVersion: 2
guid: c07f6ce2b6884ee4bbafcec3a6e3eca6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Operational view/VRInteractions/Packages/manifest.json
View file @ 2af889ea
......@@ -9,6 +9,7 @@
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0",
"com.unity.xr.interaction.toolkit": "2.0.1",
"com.valvesoftware.unity.openvr": "file:../Assets/SteamVR/OpenVRUnityXRPackage/Editor/com.valvesoftware.unity.openvr-1.1.4.tgz",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
......
Operational view/VRInteractions/Packages/packages-lock.json
View file @ 2af889ea
......@@ -41,6 +41,15 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.2.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "2.0.0",
"depth": 1,
......@@ -112,8 +121,32 @@
"com.unity.modules.imgui": "1.0.0"
}
},
"com.unity.xr.core-utils": {
"version": "2.0.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.interaction.toolkit": {
"version": "2.0.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.inputsystem": "1.2.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.core-utils": "2.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.8",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.physics": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.7",
"version": "2.1.8",
"depth": 1,
"source": "registry",
"dependencies": {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment