Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 5 files). Show all
Unified · Split
| @@ -367,10 +367,10 @@ void ScriptEngine::init() { · 366 unmodified lines | |||
| 367 | registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data()); | 367 | registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data()); |
| 368 | qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue); | 368 | qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue); |
| 369 | qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue); | 369 | qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue); |
| 370 | 370 | ||
| 371 | // constants | 371 | // constants |
| 372 | globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE))); | 372 | globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE))); |
| 373 | 373 | ||
| 374 | auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); | 374 | auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); |
| 375 | registerGlobalObject("Controller", scriptingInterface.data()); | 375 | registerGlobalObject("Controller", scriptingInterface.data()); |
| 376 | UserInputMapper::registerControllerTypes(this); | 376 | UserInputMapper::registerControllerTypes(this); |
| @@ -706,7 +706,7 @@ void ScriptEngine::run() { · 329 unmodified lines | |||
| 706 | } | 706 | } |
| 707 | } | 707 | } |
| 708 | lastUpdate = now; | 708 | lastUpdate = now; |
| 709 | 709 | ||
| 710 | // Debug and clear exceptions | 710 | // Debug and clear exceptions |
| 711 | hadUncaughtExceptions(*this, _fileNameString); | 711 | hadUncaughtExceptions(*this, _fileNameString); |
| 712 | } | 712 | } |
| @@ -1263,4 +1263,4 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS · 550 unmodified lines | |||
| 1263 | entityScript.property(methodName).call(entityScript, args); | 1263 | entityScript.property(methodName).call(entityScript, args); |
| 1264 | } | 1264 | } |
| 1265 | } | 1265 | } |
| 1266 | } | 1266 | } |