Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 33 files). Show all
Unified · Split
| @@ -84,8 +84,7 @@ void inputControllerFromScriptValue(const QScriptValue &object, controller::Inpu · 83 unmodified lines | ||
| 84 | 84 | out = qobject_cast<controller::InputController*>(object.toQObject()); |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | −ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, | |
| 88 | − controller::ScriptingInterface* controllerScriptingInterface, bool wantSignals) : | |
| 87 | +ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, bool wantSignals) : | |
| 89 | 88 | |
| 90 | 89 | _scriptContents(scriptContents), |
| 91 | 90 | _isFinished(false), |
| @@ -93,7 +92,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 1 unmodified line | ||
| 93 | 92 | _isInitialized(false), |
| 94 | 93 | _timerFunctionMap(), |
| 95 | 94 | _wantSignals(wantSignals), |
| 96 | − _controllerScriptingInterface(controllerScriptingInterface), | |
| 97 | 95 | _fileNameString(fileNameString), |
| 98 | 96 | _quatLibrary(), |
| 99 | 97 | _vec3Library(), |
| @@ -310,7 +308,8 @@ void ScriptEngine::init() { · 210 unmodified lines | ||
| 310 | 308 | |
| 311 | 309 | registerGlobalObject("Script", this); |
| 312 | 310 | registerGlobalObject("Audio", &AudioScriptingInterface::getInstance()); |
| 313 | − registerGlobalObject("Controller", _controllerScriptingInterface); | |
| 311 | + auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); | |
| 312 | + registerGlobalObject("Controller", scriptingInterface.data()); | |
| 314 | 313 | registerGlobalObject("Entities", entityScriptingInterface.data()); |
| 315 | 314 | registerGlobalObject("Quat", &_quatLibrary); |
| 316 | 315 | registerGlobalObject("Vec3", &_vec3Library); |
| @@ -320,8 +319,8 @@ void ScriptEngine::init() { · 3 unmodified lines | ||
| 320 | 319 | // constants |
| 321 | 320 | globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE))); |
| 322 | 321 | |
| 323 | − if (_controllerScriptingInterface) { | |
| 324 | − _controllerScriptingInterface->registerControllerTypes(this); | |
| 322 | + if (scriptingInterface) { | |
| 323 | + scriptingInterface->registerControllerTypes(this); | |
| 325 | 324 | } |
| 326 | 325 | |
| 327 | 326 | |