From e25d4c17e8943092f9046dab7fe1d7361dc9747c Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 25 Nov 2015 09:29:40 +1300
Subject: [PATCH] Fix InputController (Leap Motion) not able to be created

---
 .../src/scripting/ControllerScriptingInterface.cpp   | 12 ++++++------
 .../src/scripting/ControllerScriptingInterface.h     |  4 ++--
 libraries/script-engine/src/ScriptEngine.cpp         |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/interface/src/scripting/ControllerScriptingInterface.cpp b/interface/src/scripting/ControllerScriptingInterface.cpp
index 547f16ea8b..719bfe7f1f 100644
--- a/interface/src/scripting/ControllerScriptingInterface.cpp
+++ b/interface/src/scripting/ControllerScriptingInterface.cpp
@@ -84,11 +84,11 @@ glm::vec2 ControllerScriptingInterface::getViewportDimensions() const {
     return qApp->getUiSize();
 }
 
-controller::InputController::Pointer ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {
-    // This is where we retreive the Device Tracker category and then the sub tracker within it
+controller::InputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {
+    // This is where we retrieve the Device Tracker category and then the sub tracker within it
     auto icIt = _inputControllers.find(0);
     if (icIt != _inputControllers.end()) {
-        return (*icIt).second;
+        return (*icIt).second.get();
     } 
 
 
@@ -110,15 +110,15 @@ controller::InputController::Pointer ControllerScriptingInterface::createInputCo
                 controller::InputController::Pointer inputController = std::make_shared<InputController>(deviceID, trackerID, this);
                 controller::InputController::Key key = inputController->getKey();
                 _inputControllers.insert(InputControllerMap::value_type(key, inputController));
-                return inputController;
+                return inputController.get();
             }
         }
     }
 
-    return controller::InputController::Pointer();
+    return nullptr;
 }
 
-void ControllerScriptingInterface::releaseInputController(controller::InputController::Pointer input) {
+void ControllerScriptingInterface::releaseInputController(controller::InputController* input) {
     _inputControllers.erase(input->getKey());
 }
 
diff --git a/interface/src/scripting/ControllerScriptingInterface.h b/interface/src/scripting/ControllerScriptingInterface.h
index 4c69551dd2..22d8f8be1f 100644
--- a/interface/src/scripting/ControllerScriptingInterface.h
+++ b/interface/src/scripting/ControllerScriptingInterface.h
@@ -96,8 +96,8 @@ public slots:
     virtual glm::vec2 getViewportDimensions() const;
 
     /// Factory to create an InputController
-    virtual controller::InputController::Pointer createInputController(const QString& deviceName, const QString& tracker);
-    virtual void releaseInputController(controller::InputController::Pointer input);
+    virtual controller::InputController* createInputController(const QString& deviceName, const QString& tracker);
+    virtual void releaseInputController(controller::InputController* input);
 
 signals:
     void keyPressEvent(const KeyEvent& event);
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 995a92bf83..49009a3ad2 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -81,6 +81,9 @@ void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) {
     out = qobject_cast<AvatarData*>(object.toQObject());
 }
 
+Q_DECLARE_METATYPE(controller::InputController*)
+static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
+
 QScriptValue inputControllerToScriptValue(QScriptEngine *engine, controller::InputController* const &in) {
     return engine->newQObject(in);
 }
@@ -89,8 +92,6 @@ void inputControllerFromScriptValue(const QScriptValue &object, controller::Inpu
     out = qobject_cast<controller::InputController*>(object.toQObject());
 }
 
-
-
 static bool hasCorrectSyntax(const QScriptProgram& program) {
     const auto syntaxCheck = QScriptEngine::checkSyntax(program.sourceCode());
     if (syntaxCheck.state() != QScriptSyntaxCheckResult::Valid) {