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

removing debug messages

Browse source
This commit is contained in:
ZappoMan 2015-02-23 09:44:18 -08:00
parent e5ef61e27e
commit a8d48e592f
3 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -68,7 +68,6 @@ EntityTreeRenderer::~EntityTreeRenderer() {
// this _sandboxScriptEngine implementation is confusing and potentially error prone because it's not a full fledged
// ScriptEngine that has been fully connected. We did this so that scripts that were ill-formed could be evaluated
// but not execute against the application.
qDebug() << "EntityTreeRenderer::~EntityTreeRenderer() delete _sandboxScriptEngine!!!!!";
delete _sandboxScriptEngine;
_sandboxScriptEngine = NULL;
}
@ -171,7 +170,7 @@ QString EntityTreeRenderer::loadScriptContents(const QString& scriptMaybeURLorTe
QScriptValue EntityTreeRenderer::loadEntityScript(EntityItem* entity) {
if (_shuttingDown) {
return QScriptValue(); // no entity...
return QScriptValue(); // since we're shutting down, we don't load any more scripts
}
if (!entity) {

39
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -94,43 +94,33 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam
_isUserLoaded(false),
_arrayBufferClass(new ArrayBufferClass(this))
{
qDebug() << "[" << QThread::currentThread() << "]" << "ScriptEngine::ScriptEngine() " << getFilename() << "[" << this << "]";
_allKnownScriptEngines.insert(this);
}
ScriptEngine::~ScriptEngine() {
qDebug() << "[" << QThread::currentThread() << "]" << "ScriptEngine::~ScriptEngine() " << getFilename();
_allKnownScriptEngines.remove(this);
}
QSet<ScriptEngine*> ScriptEngine::_allKnownScriptEngines;
void ScriptEngine::gracefullyStopAllScripts(QObject* application) {
qDebug() << "[" << QThread::currentThread() << "]" << "ScriptEngine::gracefullyStopAllScripts() ----------- START ------------------";
void ScriptEngine::stopAllScripts(QObject* application) {
QMutableSetIterator<ScriptEngine*> i(_allKnownScriptEngines);
while (i.hasNext()) {
ScriptEngine* scriptEngine = i.next();
qDebug() << (void*)scriptEngine;
if (scriptEngine->isRunning()) {
qDebug() << "scriptEngine still alive:" << scriptEngine->getFilename() << "[" << scriptEngine << "]";
// NOTE: typically all script engines are running. But there's at least one known exception to this, the
// "entities sandbox" which is only used to evaluate entities scripts to test their validity before using
// them. We don't need to stop scripts that aren't running.
if (scriptEngine->isRunning()) {
QEventLoop loop;
QObject::connect(scriptEngine, &ScriptEngine::doneRunning, &loop, &QEventLoop::quit);
scriptEngine->disconnect(application);
scriptEngine->stop();
qDebug() << "waiting on script to stop... ";
loop.exec();
qDebug() << "done waiting... ";
} else {
qDebug() << "WARNING! scriptEngine [" << (void*)scriptEngine << "] still in _allKnownScriptEngines but not running??? <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<";
}
}
qDebug() << "[" << QThread::currentThread() << "]" << "ScriptEngine::gracefullyStopAllScripts() ----------- DONE ------------------";
}
QString ScriptEngine::getFilename() const {
@ -411,14 +401,12 @@ void ScriptEngine::run() {
}
if (_isFinished) {
qDebug() << "ScriptEngine::run()... while() about to break " << getFilename();
break;
}
QCoreApplication::processEvents();
if (_isFinished) {
qDebug() << "ScriptEngine::run()... while() about to break " << getFilename();
break;
}
@ -548,7 +536,6 @@ void ScriptEngine::run() {
}
lastUpdate = now;
}
qDebug() << "ScriptEngine::run()... about to emit scriptEnding() " << getFilename();
emit scriptEnding();
// kill the avatar identity timer
@ -566,25 +553,19 @@ void ScriptEngine::run() {
// If we were on a thread, then wait till it's done
if (thread()) {
qDebug() << "ScriptEngine::run()... about to call thread()->quit() " << getFilename();
thread()->quit();
}
qDebug() << "ScriptEngine::run()... about to emit finished() " << getFilename();
emit finished(_fileNameString);
_isRunning = false;
qDebug() << "ScriptEngine::run()... about to emit runningStateChanged() " << getFilename();
emit runningStateChanged();
qDebug() << "ScriptEngine::run()... about to emit doneRunning() " << getFilename();
emit doneRunning();
qDebug() << "ScriptEngine::run()... DONE WITH run()... " << getFilename();
}
void ScriptEngine::stop() {
qDebug() << "ScriptEngine::stop()... " << getFilename();
_isFinished = true;
emit runningStateChanged();
}
@ -666,12 +647,10 @@ void ScriptEngine::print(const QString& message) {
emit printedMessage(message);
}
/**
* If a callback is specified, the included files will be loaded asynchronously and the callback will be called
* when all of the files have finished loading.
* If no callback is specified, the included files will be loaded synchronously and will block execution until
* all of the files have finished loading.
*/
// If a callback is specified, the included files will be loaded asynchronously and the callback will be called
// when all of the files have finished loading.
// If no callback is specified, the included files will be loaded synchronously and will block execution until
// all of the files have finished loading.
void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callback) {
QList<QUrl> urls;
for (QString file : includeFiles) {

2
libraries/script-engine/src/ScriptEngine.h
View file

@ -93,7 +93,7 @@ public:
QString getFilename() const;
static void gracefullyStopAllScripts(QObject* application);
static void stopAllScripts(QObject* application);
public slots:
void loadURL(const QUrl& scriptURL);