intial commit hifi: #21369 Implement parts of the JS "console" object

NeetBhagat committed 9 years ago

Commit 0f9cd5d1 parent 66415da8 files · +217 −8Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−1

@@ -485,7 +485,10 @@ void ScriptEngine::scriptPrintedMessage(const QString& message) { · 484 unmodified lines
485	qCDebug(scriptengine) << message;	485	qCDebug(scriptengine) << message;
486	emit printedMessage(message, getFilename());	486	emit printedMessage(message, getFilename());
487	}	487	}
488		488	void ScriptEngine::clearConsole() {
		489	qCDebug(scriptengine) << "Clearing debug window";
		490	emit clearDebugWindow();
		491	}
489	// Even though we never pass AnimVariantMap directly to and from javascript, the queued invokeMethod of	492	// Even though we never pass AnimVariantMap directly to and from javascript, the queued invokeMethod of
490	// callAnimationStateHandler requires that the type be registered.	493	// callAnimationStateHandler requires that the type be registered.
491	// These two are meaningful, if we ever do want to use them...	494	// These two are meaningful, if we ever do want to use them...
@@ -665,6 +668,7 @@ void ScriptEngine::init() { · 173 unmodified lines
665	registerGlobalObject("Entities", entityScriptingInterface.data());	668	registerGlobalObject("Entities", entityScriptingInterface.data());
666	registerGlobalObject("Quat", &_quatLibrary);	669	registerGlobalObject("Quat", &_quatLibrary);
667	registerGlobalObject("Vec3", &_vec3Library);	670	registerGlobalObject("Vec3", &_vec3Library);
		671	registerGlobalObject("console", &_consoleScriptingInterface);
668	registerGlobalObject("Mat4", &_mat4Library);	672	registerGlobalObject("Mat4", &_mat4Library);
669	registerGlobalObject("Uuid", &_uuidLibrary);	673	registerGlobalObject("Uuid", &_uuidLibrary);
670	registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());	674	registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());