modify code style.

hecomi · Mar 13, 2018 · f1b533d · f1b533d
1 parent e5236a9
commit f1b533d
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 38 deletions.
diff --git a/Assets/VrGrabber/Scripts/VrgIDevice.cs b/Assets/VrGrabber/Scripts/VrgIDevice.cs
@@ -3,12 +3,14 @@
 namespace VrGrabber
 {
 
-public enum ControllerSide {
+public enum ControllerSide 
+{
     Left,
     Right,
 }
 
-public interface IDevice {
+public interface IDevice 
+{
     Vector3 GetLocalPosition(ControllerSide side);
     Quaternion GetLocalRotation(ControllerSide side);
     float GetHold(ControllerSide side);

diff --git a/Assets/VrGrabber/Scripts/VrgNodeTracker.cs b/Assets/VrGrabber/Scripts/VrgNodeTracker.cs
@@ -1,13 +1,13 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.XR;
 
-public class VrgNodeTracker : MonoBehaviour {
+public class VrgNodeTracker : MonoBehaviour 
+{
     [SerializeField]
     XRNode node = XRNode.LeftHand;
 
-    private void Update() {
+    void Update() 
+    {
         transform.SetPositionAndRotation(InputTracking.GetLocalPosition(node), InputTracking.GetLocalRotation(node));
     }
 }
diff --git a/Assets/VrGrabber/Scripts/VrgOculusTouchDevice.cs b/Assets/VrGrabber/Scripts/VrgOculusTouchDevice.cs
@@ -4,34 +4,42 @@
 namespace VrGrabber
 {
 
-public class VrgOculusTouchDevice : IDevice {
-    private OVRInput.Controller GetOVRController(ControllerSide side) {
+public class VrgOculusTouchDevice : IDevice 
+{
+    private OVRInput.Controller GetOVRController(ControllerSide side) 
+    {
         return (side == ControllerSide.Left) ?
             OVRInput.Controller.LTouch :
             OVRInput.Controller.RTouch;
     }
 
-    public Vector3 GetLocalPosition(ControllerSide side) {
+    public Vector3 GetLocalPosition(ControllerSide side) 
+    {
         return OVRInput.GetLocalControllerPosition(GetOVRController(side));
     }
 
-    public Quaternion GetLocalRotation(ControllerSide side) {
+    public Quaternion GetLocalRotation(ControllerSide side) 
+    {
         return OVRInput.GetLocalControllerRotation(GetOVRController(side));
     }
 
-    public float GetHold(ControllerSide side) {
+    public float GetHold(ControllerSide side) 
+    {
         return OVRInput.Get(OVRInput.Axis1D.PrimaryHandTrigger, GetOVRController(side));
     }
 
-    public bool GetHover(ControllerSide side) {
+    public bool GetHover(ControllerSide side) 
+    {
         return OVRInput.Get(OVRInput.Touch.PrimaryThumbstick, GetOVRController(side));
     }
 
-    public bool GetClick(ControllerSide side) {
+    public bool GetClick(ControllerSide side) 
+    {
         return OVRInput.Get(OVRInput.Button.PrimaryThumbstick, GetOVRController(side));
     }
 
-    public Vector2 GetCoord(ControllerSide side) {
+    public Vector2 GetCoord(ControllerSide side) 
+    {
         return OVRInput.Get(OVRInput.Axis2D.PrimaryThumbstick, GetOVRController(side));
     }
 }

diff --git a/Assets/VrGrabber/Scripts/VrgWinMRMotionControllerDevice.cs b/Assets/VrGrabber/Scripts/VrgWinMRMotionControllerDevice.cs
@@ -1,14 +1,16 @@
-using System;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.XR;
 using UnityEngine.XR.WSA.Input;
 
 namespace VrGrabber
 {
 
-public class VrgWinMRMotionControllerDevice : IDevice {
-    public bool GetClick(ControllerSide side) {
-        switch (side) {
+public class VrgWinMRMotionControllerDevice : IDevice 
+{
+    public bool GetClick(ControllerSide side) 
+    {
+        switch (side) 
+        {
             case ControllerSide.Left:
                 return Input.GetKey(KeyCode.JoystickButton16);
             case ControllerSide.Right:
@@ -18,34 +20,45 @@ public bool GetClick(ControllerSide side) {
         }
     }
 
-    public Vector2 GetCoord(ControllerSide side) {
+    public Vector2 GetCoord(ControllerSide side) 
+    {
         var interactionStates = InteractionManager.GetCurrentReading();
-        foreach (var state in interactionStates) {
-            if (side == ControllerSide.Left && state.source.handedness == InteractionSourceHandedness.Left
-                || side == ControllerSide.Right && state.source.handedness == InteractionSourceHandedness.Right) {
+        foreach (var state in interactionStates) 
+        {
+            if (side == ControllerSide.Left  && state.source.handedness == InteractionSourceHandedness.Left || 
+                side == ControllerSide.Right && state.source.handedness == InteractionSourceHandedness.Right) 
+            {
                 return state.touchpadPosition;
             }
         }
         return Vector2.zero;
     }
 
-    public float GetHold(ControllerSide side) {
+    public float GetHold(ControllerSide side) 
+    {
         var interactionStates = InteractionManager.GetCurrentReading();
-        foreach (var state in interactionStates) {
-            if (side == ControllerSide.Left && state.source.handedness == InteractionSourceHandedness.Left
-                || side == ControllerSide.Right && state.source.handedness == InteractionSourceHandedness.Right) {
-                if (state.grasped) {
-                    return 1.0f;
-                } else {
-                    return 0.0f;
+        foreach (var state in interactionStates) 
+        {
+            if (side == ControllerSide.Left  && state.source.handedness == InteractionSourceHandedness.Left || 
+                side == ControllerSide.Right && state.source.handedness == InteractionSourceHandedness.Right) 
+            {
+                if (state.grasped) 
+                {
+                    return 1f;
+                } 
+                else 
+                {
+                    return 0f;
                 }
             }
         }
         return 0.0f;
     }
 
-    public bool GetHover(ControllerSide side) {
-        switch (side) {
+    public bool GetHover(ControllerSide side) 
+    {
+        switch (side) 
+        {
             case ControllerSide.Left:
                 return Input.GetKey(KeyCode.JoystickButton18);
             case ControllerSide.Right:
@@ -55,8 +68,10 @@ public bool GetHover(ControllerSide side) {
         }
     }
 
-    public Vector3 GetLocalPosition(ControllerSide side) {
-        switch (side) {
+    public Vector3 GetLocalPosition(ControllerSide side) 
+    {
+        switch (side) 
+        {
             case ControllerSide.Left:
                 return InputTracking.GetLocalPosition(XRNode.LeftHand);
             case ControllerSide.Right:
@@ -66,8 +81,10 @@ public Vector3 GetLocalPosition(ControllerSide side) {
         }
     }
 
-    public Quaternion GetLocalRotation(ControllerSide side) {
-        switch (side) {
+    public Quaternion GetLocalRotation(ControllerSide side) 
+    {
+        switch (side) 
+        {
             case ControllerSide.Left:
                 return InputTracking.GetLocalRotation(XRNode.LeftHand);
             case ControllerSide.Right: