Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 15 files). Show all
Unified · Split
| @@ -187,15 +187,6 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const · 186 unmodified lines | |||
| 187 | } | 187 | } |
| 188 | logException(output); | 188 | logException(output); |
| 189 | }); | 189 | }); |
| 190 | |||
| 191 | // this is where all unhandled exceptions end up getting logged | ||
| 192 | /* connect(this, &BaseScriptEngine::unhandledException, this, [this](const QScriptValue& err) { | ||
| 193 | auto output = err.engine() == this ? err : makeError(err); | ||
| 194 | if (!output.property("detail").isValid()) { | ||
| 195 | output.setProperty("detail", "UnhandledException"); | ||
| 196 | } | ||
| 197 | logException(output); | ||
| 198 | });*/ | ||
| 199 | } | 190 | } |
| 200 | 191 | ||
| 201 | QString ScriptEngine::getContext() const { | 192 | QString ScriptEngine::getContext() const { |
| @@ -481,21 +472,21 @@ void ScriptEngine::scriptErrorMessage(const QString& message) { · 279 unmodified lines | |||
| 481 | } | 472 | } |
| 482 | 473 | ||
| 483 | void ScriptEngine::scriptWarningMessage(const QString& message) { | 474 | void ScriptEngine::scriptWarningMessage(const QString& message) { |
| 484 | qCWarning(scriptengine) << message; | 475 | qCWarning(scriptengine) << qPrintable(message); |
| 485 | emit warningMessage(message, getFilename()); | 476 | emit warningMessage(message, getFilename()); |
| 486 | } | 477 | } |
| 487 | 478 | ||
| 488 | void ScriptEngine::scriptInfoMessage(const QString& message) { | 479 | void ScriptEngine::scriptInfoMessage(const QString& message) { |
| 489 | qCInfo(scriptengine) << message; | 480 | qCInfo(scriptengine) << qPrintable(message); |
| 490 | emit infoMessage(message, getFilename()); | 481 | emit infoMessage(message, getFilename()); |
| 491 | } | 482 | } |
| 492 | 483 | ||
| 493 | void ScriptEngine::scriptPrintedMessage(const QString& message) { | 484 | void ScriptEngine::scriptPrintedMessage(const QString& message) { |
| 494 | qCDebug(scriptengine) << message; | 485 | qCDebug(scriptengine) << qPrintable(message); |
| 495 | emit printedMessage(message, getFilename()); | 486 | emit printedMessage(message, getFilename()); |
| 496 | } | 487 | } |
| 497 | 488 | ||
| 498 | void ScriptEngine::clearConsole() { | 489 | void ScriptEngine::clearDebugLogWindow() { |
| 499 | emit clearDebugWindow(); | 490 | emit clearDebugWindow(); |
| 500 | } | 491 | } |
| 501 | 492 | ||
| @@ -678,11 +669,10 @@ void ScriptEngine::init() { · 176 unmodified lines | |||
| 678 | registerGlobalObject("Entities", entityScriptingInterface.data()); | 669 | registerGlobalObject("Entities", entityScriptingInterface.data()); |
| 679 | registerGlobalObject("Quat", &_quatLibrary); | 670 | registerGlobalObject("Quat", &_quatLibrary); |
| 680 | registerGlobalObject("Vec3", &_vec3Library); | 671 | registerGlobalObject("Vec3", &_vec3Library); |
| 681 | registerGlobalObject("console", &_consoleScriptingInterface); | ||
| 682 | registerGlobalObject("Mat4", &_mat4Library); | 672 | registerGlobalObject("Mat4", &_mat4Library); |
| 683 | registerGlobalObject("Uuid", &_uuidLibrary); | 673 | registerGlobalObject("Uuid", &_uuidLibrary); |
| 684 | registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data()); | 674 | registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data()); |
| 685 | 675 | registerGlobalObject("console", &_consoleScriptingInterface); | |
| 686 | registerGlobalObject("File", new FileScriptingInterface(this)); | 676 | registerGlobalObject("File", new FileScriptingInterface(this)); |
| 687 | 677 | ||
| 688 | qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue); | 678 | qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue); |