diff --git a/.gitignore b/.gitignore index 8af868e..7b86c5a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ # Visual Studio cache directory .vs/ +.vscode/ # Gradle cache directory .gradle/ diff --git a/Assets/Scenes/Main Scene.unity b/Assets/Scenes/Main Scene.unity index ba60918..dbd8e48 100644 --- a/Assets/Scenes/Main Scene.unity +++ b/Assets/Scenes/Main Scene.unity @@ -270,9 +270,9 @@ MonoBehaviour: m_ModelSelectTransition: m_ModelDeSelectTransition: m_ControllerNode: 4 - m_SelectUsage: 3 - m_ActivateUsage: 2 - m_UIPressUsage: 2 + m_SelectUsage: 0 + m_ActivateUsage: 0 + m_UIPressUsage: 0 m_AxisToPressThreshold: 0.1 m_RotateAnchorLeft: 16 m_RotateAnchorRight: 17 @@ -457,9 +457,9 @@ MonoBehaviour: m_ModelSelectTransition: m_ModelDeSelectTransition: m_ControllerNode: 5 - m_SelectUsage: 3 - m_ActivateUsage: 2 - m_UIPressUsage: 2 + m_SelectUsage: 0 + m_ActivateUsage: 0 + m_UIPressUsage: 0 m_AxisToPressThreshold: 0.1 m_RotateAnchorLeft: 16 m_RotateAnchorRight: 17 @@ -869,6 +869,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8258196058206172477, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} + propertyPath: m_LocalScale.x + value: 32 + objectReference: {fileID: 0} + - target: {fileID: -8258196058206172477, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} + propertyPath: m_LocalScale.y + value: 32 + objectReference: {fileID: 0} - target: {fileID: -8258196058206172477, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1075,11 +1083,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1018638153358675470, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} propertyPath: m_LocalScale.x - value: 30.5 + value: 31 objectReference: {fileID: 0} - target: {fileID: 1018638153358675470, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} propertyPath: m_LocalScale.y - value: 30.5 + value: 31 objectReference: {fileID: 0} - target: {fileID: 1018638153358675470, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} propertyPath: m_LocalScale.z @@ -2336,7 +2344,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6c150c011a6544b4b8054bba7ee5e5ca, type: 3} m_Name: m_EditorClassIdentifier: - searchTiming_: 2 + searchTiming_: 1 type_: 0 altTabWindow_: 0 createChildWindows_: 0 @@ -2347,7 +2355,7 @@ MonoBehaviour: captureMode: 1 capturePriority: 0 captureRequestTiming: 0 - captureFrameRate: 120 + captureFrameRate: 60 drawCursor: 0 updateTitle: 1 searchAnotherWindowWhenInvalid: 0 @@ -2487,6 +2495,7 @@ GameObject: - component: {fileID: 995594088} - component: {fileID: 995594090} - component: {fileID: 995594087} + - component: {fileID: 995594091} m_Layer: 0 m_Name: RHand m_TagString: Untagged @@ -2503,7 +2512,7 @@ Transform: m_GameObject: {fileID: 995594085} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.01, y: -0.02, z: 0.05} - m_LocalScale: {x: 0.08, y: 0.08, z: 0.08} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: [] m_Father: {fileID: 367081678} m_RootOrder: 0 @@ -2530,7 +2539,7 @@ MeshRenderer: m_GameObject: {fileID: 995594085} m_Enabled: 1 m_CastShadows: 1 - m_ReceiveShadows: 1 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 @@ -2586,6 +2595,21 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &995594091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 995594085} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8ef9c214e7bbfb428a17f25d6f8a44c, type: 3} + m_Name: + m_EditorClassIdentifier: + Hand: 3 + duration: 0.05 + amplitude: 1 --- !u!1 &1146353685 stripped GameObject: m_CorrespondingSourceObject: {fileID: -7257406874482555907, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} @@ -2669,6 +2693,7 @@ GameObject: - component: {fileID: 1213452597} - component: {fileID: 1213452599} - component: {fileID: 1213452596} + - component: {fileID: 1213452600} m_Layer: 0 m_Name: LHand m_TagString: Untagged @@ -2685,7 +2710,7 @@ Transform: m_GameObject: {fileID: 1213452594} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.01, y: -0.02, z: 0.05} - m_LocalScale: {x: 0.08, y: 0.08, z: 0.08} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: [] m_Father: {fileID: 141732346} m_RootOrder: 0 @@ -2712,7 +2737,7 @@ MeshRenderer: m_GameObject: {fileID: 1213452594} m_Enabled: 1 m_CastShadows: 1 - m_ReceiveShadows: 1 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 @@ -2768,6 +2793,21 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &1213452600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1213452594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8ef9c214e7bbfb428a17f25d6f8a44c, type: 3} + m_Name: + m_EditorClassIdentifier: + Hand: 2 + duration: 0.05 + amplitude: 1 --- !u!1 &1278537032 stripped GameObject: m_CorrespondingSourceObject: {fileID: -1936309250871818275, guid: ea6463ca199d52046962b69f2ab654ef, type: 3} diff --git a/Assets/Scripts/Controller.cs b/Assets/Scripts/Controller.cs new file mode 100644 index 0000000..27239d4 --- /dev/null +++ b/Assets/Scripts/Controller.cs @@ -0,0 +1,65 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.XR; +public class Controller : MonoBehaviour +{ + // Start is called before the first frame update + public InputDeviceRole Hand; + //InputDevice device; + public float duration; + public float amplitude; + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + private void OnTriggerEnter(Collider other) + { + SendHapticOn(Hand, amplitude, duration); + } + + private void OnTriggerExit(Collider other) + { + SendHapticOn(Hand, amplitude, duration); + SendHapticOff(Hand); + } + + void SendHapticOn(InputDeviceRole Hand, float amplitude, float duration) + { + List devices = new List(); + InputDevices.GetDevicesWithRole(Hand, devices); + uint channel = 0; + foreach (var device in devices) + { + HapticCapabilities capabilities; + if (device.TryGetHapticCapabilities(out capabilities)) + { + if (capabilities.supportsImpulse) + { + device.SendHapticImpulse(channel, amplitude, duration); + } + } + } + } + void SendHapticOff(InputDeviceRole Hand) + { + List devices = new List(); + InputDevices.GetDevicesWithRole(Hand, devices); + foreach (var device in devices) + { + HapticCapabilities capabilities; + if (device.TryGetHapticCapabilities(out capabilities)) + { + if (capabilities.supportsImpulse) + device.StopHaptics(); + } + } + } +} diff --git a/Assets/Scripts/Controller.cs.meta b/Assets/Scripts/Controller.cs.meta new file mode 100644 index 0000000..e46092e --- /dev/null +++ b/Assets/Scripts/Controller.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c8ef9c214e7bbfb428a17f25d6f8a44c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 2045049..b706703 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,15 +1,15 @@ { "dependencies": { - "com.unity.collab-proxy": "1.15.4", + "com.unity.collab-proxy": "1.15.7", "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.12", "com.unity.ide.vscode": "1.2.4", - "com.unity.test-framework": "1.1.29", + "com.unity.test-framework": "1.1.30", "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.0-pre.6", - "com.unity.xr.management": "4.2.0", + "com.unity.xr.management": "4.2.1", "com.unity.xr.openxr": "1.3.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0983ccd..257e7d6 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.collab-proxy": { - "version": "1.15.4", + "version": "1.15.7", "depth": 0, "source": "registry", "dependencies": { @@ -75,7 +75,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.30", "depth": 0, "source": "registry", "dependencies": { @@ -150,7 +150,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.2.0", + "version": "4.2.1", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4c9401b..def2933 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.25f1 -m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418) +m_EditorVersion: 2020.3.26f1 +m_EditorVersionWithRevision: 2020.3.26f1 (7298b473bc1a)