History

Resolve comments of @zappoman. -- Rename "asserts" to "assert" -- Log printing methods will accept lists of objects or strings.

NeetBhagat committed 9 years ago

Commit 2909aa91 parent a6b1b174 files · +141 −81Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+11−1
@@ -672,8 +672,18 @@ void ScriptEngine::init() { · 671 unmodified lines
672672 registerGlobalObject("Mat4", &_mat4Library);
673673 registerGlobalObject("Uuid", &_uuidLibrary);
674674 registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());
675− registerGlobalObject("console", &_consoleScriptingInterface);
676675 registerGlobalObject("File", new FileScriptingInterface(this));
676+ registerGlobalObject("console", &_consoleScriptingInterface);
677+ registerFunction("console", "info", ConsoleScriptingInterface::info, currentContext()->argumentCount());
678+ registerFunction("console", "log", ConsoleScriptingInterface::log, currentContext()->argumentCount());
679+ registerFunction("console", "debug", ConsoleScriptingInterface::debug, currentContext()->argumentCount());
680+ registerFunction("console", "warn", ConsoleScriptingInterface::warn, currentContext()->argumentCount());
681+ registerFunction("console", "error", ConsoleScriptingInterface::error, currentContext()->argumentCount());
682+ registerFunction("console", "exception", ConsoleScriptingInterface::exception, currentContext()->argumentCount());
683+ registerFunction("console", "assert", ConsoleScriptingInterface::assertion, currentContext()->argumentCount());
684+ registerFunction("console", "group", ConsoleScriptingInterface::group, 1);
685+ registerFunction("console", "groupCollapsed", ConsoleScriptingInterface::groupCollapsed, 1);
686+ registerFunction("console", "groupEnd", ConsoleScriptingInterface::groupEnd, 0);
677687
678688 qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue);
679689 qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue);