Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:17:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support for an HMD script debug log window

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-12-19 19:34:14 -08:00
parent df954cab10
commit 0c9ff87feb
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -5269,6 +5269,9 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>(); auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
scriptEngine->registerGlobalObject("Controller", scriptingInterface.data()); scriptEngine->registerGlobalObject("Controller", scriptingInterface.data());
UserInputMapper::registerControllerTypes(scriptEngine); UserInputMapper::registerControllerTypes(scriptEngine);
// connect this script engines printedMessage signal to the global ScriptEngines onPrintedMessage
connect(scriptEngine, &ScriptEngine::printedMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onPrintedMessage);
} }
bool Application::canAcceptURL(const QString& urlString) const { bool Application::canAcceptURL(const QString& urlString) const {

5
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -32,6 +32,11 @@ ScriptsModel& getScriptsModel() {
return scriptsModel; return scriptsModel;
} }
void ScriptEngines::onPrintedMessage(const QString& message) {
auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
emit printedMessage(message, scriptEngine->getFilename());
}
ScriptEngines::ScriptEngines() ScriptEngines::ScriptEngines()
: _scriptsLocationHandle("scriptsLocation", DESKTOP_LOCATION) : _scriptsLocationHandle("scriptsLocation", DESKTOP_LOCATION)
{ {

5
libraries/script-engine/src/ScriptEngines.h
View file

@ -74,10 +74,15 @@ signals:
void scriptCountChanged(); void scriptCountChanged();
void scriptsReloading(); void scriptsReloading();
void scriptLoadError(const QString& filename, const QString& error); void scriptLoadError(const QString& filename, const QString& error);
void printedMessage(const QString& message, const QString& filename);
public slots:
void onPrintedMessage(const QString& message);
protected slots: protected slots:
void onScriptFinished(const QString& fileNameString, ScriptEngine* engine); void onScriptFinished(const QString& fileNameString, ScriptEngine* engine);
protected: protected:
friend class ScriptEngine; friend class ScriptEngine;