Move controller test to app

Brad Davis committed 11 years ago

Commit 57be5991 parent f4380da33 files · +389 −295Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 33 files). Show all

Unified · Split

     out = qobject_cast<controller::InputController*>(object.toQObject());
 }
-ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
+ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, bool wantSignals) :
-    controller::ScriptingInterface* controllerScriptingInterface, bool wantSignals) :
     _scriptContents(scriptContents),
     _isFinished(false),
     _isInitialized(false),
     _timerFunctionMap(),
     _wantSignals(wantSignals),
-    _controllerScriptingInterface(controllerScriptingInterface),
     _fileNameString(fileNameString),
     _quatLibrary(),
     _vec3Library(),
     registerGlobalObject("Script", this);
     registerGlobalObject("Audio", &AudioScriptingInterface::getInstance());
-    registerGlobalObject("Controller", _controllerScriptingInterface);
+    auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
+    registerGlobalObject("Controller", scriptingInterface.data());
     registerGlobalObject("Entities", entityScriptingInterface.data());
     registerGlobalObject("Quat", &_quatLibrary);
     registerGlobalObject("Vec3", &_vec3Library);
     // constants
     globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));
-    if (_controllerScriptingInterface) {
+    if (scriptingInterface) {
-        _controllerScriptingInterface->registerControllerTypes(this);
+        scriptingInterface->registerControllerTypes(this);
     }