From bc838ac0b476f586723ecf81a8e8cb86d647e8d6 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 15 Jun 2016 11:41:28 -0700
Subject: [PATCH] Fix vive json

---
 interface/resources/controllers/vive.json       | 5 ++---
 interface/src/scripting/HMDScriptingInterface.h | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/resources/controllers/vive.json b/interface/resources/controllers/vive.json
index 677ec1ccfc..6be672900a 100644
--- a/interface/resources/controllers/vive.json
+++ b/interface/resources/controllers/vive.json
@@ -3,11 +3,10 @@
     "channels": [
         { "from": "Vive.LY", "when": "Vive.LSY", "filters": ["invert"], "to": "Standard.LY" },
         { "from": "Vive.LX", "when": "Vive.LSX", "to": "Standard.LX" },
-
         { 
         	"from": "Vive.LT", "to": "Standard.LT",
         	"filters": [
-                { "type": "deadZone", "min": 0.05 },
+                { "type": "deadZone", "min": 0.05 }
             ]
         },
         { "from": "Vive.LeftGrip", "to": "Standard.LeftGrip" },
@@ -19,7 +18,7 @@
         { 
         	"from": "Vive.RT", "to": "Standard.RT",
         	"filters": [
-                { "type": "deadZone", "min": 0.05 },
+                { "type": "deadZone", "min": 0.05 }
             ]
         },
         { "from": "Vive.RightGrip", "to": "Standard.RightGrip" },
diff --git a/interface/src/scripting/HMDScriptingInterface.h b/interface/src/scripting/HMDScriptingInterface.h
index e2985b1ce5..2739522adf 100644
--- a/interface/src/scripting/HMDScriptingInterface.h
+++ b/interface/src/scripting/HMDScriptingInterface.h
@@ -33,12 +33,13 @@ public:
     Q_INVOKABLE glm::vec3 calculateRayUICollisionPoint(const glm::vec3& position, const glm::vec3& direction) const;
     Q_INVOKABLE glm::vec2 overlayFromWorldPoint(const glm::vec3& position) const;
     Q_INVOKABLE glm::vec3 worldPointFromOverlay(const glm::vec2& overlay) const;
-
     Q_INVOKABLE glm::vec2 sphericalToOverlay(const glm::vec2 & sphericalPos) const;
     Q_INVOKABLE glm::vec2 overlayToSpherical(const glm::vec2 & overlayPos) const;
     Q_INVOKABLE QString preferredAudioInput() const;
     Q_INVOKABLE QString preferredAudioOutput() const;
+
     Q_INVOKABLE bool setHandLasers(int hands, bool enabled, const glm::vec4& color, const glm::vec3& direction) const;
+
     Q_INVOKABLE void disableHandLasers(int hands) const;
     /// Suppress the activation of any on-screen keyboard so that a script operation will 
     /// not be interrupted by a keyboard popup