Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 21 files). Show all
Unified · Split
| @@ -308,8 +308,6 @@ void ScriptEngine::init() { · 307 unmodified lines | ||
| 308 | 308 | |
| 309 | 309 | registerGlobalObject("Script", this); |
| 310 | 310 | registerGlobalObject("Audio", &AudioScriptingInterface::getInstance()); |
| 311 | − auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); | |
| 312 | − registerGlobalObject("Controller", scriptingInterface.data()); | |
| 313 | 311 | registerGlobalObject("Entities", entityScriptingInterface.data()); |
| 314 | 312 | registerGlobalObject("Quat", &_quatLibrary); |
| 315 | 313 | registerGlobalObject("Vec3", &_vec3Library); |
| @@ -319,11 +317,9 @@ void ScriptEngine::init() { · 3 unmodified lines | ||
| 319 | 317 | // constants |
| 320 | 318 | globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE))); |
| 321 | 319 | |
| 322 | − if (scriptingInterface) { | |
| 323 | − scriptingInterface->registerControllerTypes(this); | |
| 324 | − } | |
| 325 | − | |
| 326 | − | |
| 320 | + auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); | |
| 321 | + registerGlobalObject("Controller", scriptingInterface.data()); | |
| 322 | + UserInputMapper::registerControllerTypes(this); | |
| 327 | 323 | } |
| 328 | 324 | |
| 329 | 325 | void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) { |