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

cleanup

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-04-18 10:37:15 -07:00
parent d1f6b371c9
commit 0520363da8
3 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -4177,14 +4177,12 @@ void Application::clearDomainOctreeDetails() {
// if we're about to quit, we really don't need to do any of these things...
if (_aboutToQuit) {
qCDebug(interfaceapp) << "No need to clear domain octree details we are shutting down...";
return;
}
qCDebug(interfaceapp) << "Clearing domain octree details...";
// reset the environment so that we don't erroneously end up with multiple
// reset the environment so that we don't erroneously end up with multiple
resetPhysicsReadyInformation();
// reset our node to stats and node to jurisdiction maps... since these must be changing...

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

@ -145,9 +145,7 @@ ScriptEngine::~ScriptEngine() {
qCDebug(scriptengine) << "Script Engine shutting down (destructor) for script:" << getFilename();
auto scriptEngines = DependencyManager::get<ScriptEngines>();
if (scriptEngines) {
qCDebug(scriptengine) << "About to remove ScriptEngine [" << getFilename() << "] from ScriptEngines!";
scriptEngines->removeScriptEngine(this);
qCDebug(scriptengine) << "AFTER remove ScriptEngine [" << getFilename() << "] from ScriptEngines!";
} else {
qCWarning(scriptengine) << "Script destroyed after ScriptEngines!";
}
@ -759,6 +757,7 @@ void ScriptEngine::stop() {
QMetaObject::invokeMethod(this, "stop");
return;
}
abortEvaluation(); // abort any script evaluation that may be active
_isFinished = true;
if (_wantSignals) {
emit runningStateChanged();

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

@ -127,10 +127,7 @@ public:
Q_INVOKABLE QUrl resolvePath(const QString& path) const;
// Entity Script Related methods
//Q_INVOKABLE void loadEntityScript(const EntityItemID& entityID, const QString& entityScript, bool forceRedownload = false); // will call the preload method once loaded
static void loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload);
Q_INVOKABLE void unloadEntityScript(const EntityItemID& entityID); // will call unload method
Q_INVOKABLE void unloadAllEntityScripts();
Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params = QStringList());
@ -230,11 +227,4 @@ protected:
static std::atomic<bool> _stoppingAllScripts;
};
/*
class ScriptEngine : public QObject {
Q_OBJECT
};
*/
#endif // hifi_ScriptEngine_h