Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-07 03:22:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed entity script reloads

Browse source
This commit is contained in:
ksuprynowicz 2023-08-28 23:34:19 +02:00
parent 166f7223d1
commit 1ab46f68e3
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,10 +226,7 @@ void EntityTreeRenderer::resetPersistentEntitiesScriptEngine() {
manager->stop();
manager->waitTillDoneRunning();
manager->disconnectNonEssentialSignals();
// TODO: script manager pointer is still in use somewhere after the cleanup in lambda.
// To prevent memory leaks on multiple reloads we would need to find all the usages and remove them.
// Script engines are correctly deleted later during shutdown currently.
qDebug() << "_nonPersistentEntitiesScriptManager lambda finished, script manager pointer use count: " << manager.use_count();
manager->removeFromScriptEngines();
});
}
_persistentEntitiesScriptManager = scriptManagerFactory(ScriptManager::ENTITY_CLIENT_SCRIPT, NO_SCRIPT,
@ -252,10 +249,7 @@ void EntityTreeRenderer::resetNonPersistentEntitiesScriptEngine() {
manager->stop();
manager->waitTillDoneRunning();
manager->disconnectNonEssentialSignals();
// TODO: script manager pointer is still in use somewhere after the cleanup in lambda.
// To prevent memory leaks on multiple reloads we would need to find all the usages and remove them.
// Script engines are correctly deleted later during shutdown currently.
qDebug() << "_nonPersistentEntitiesScriptManager lambda finished, script manager pointer use count: " << manager.use_count();
manager->removeFromScriptEngines();
});
}
_nonPersistentEntitiesScriptManager = scriptManagerFactory(ScriptManager::ENTITY_CLIENT_SCRIPT, NO_SCRIPT,

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

@ -184,6 +184,8 @@ public:
void addScriptEngine(ScriptManagerPointer);
void removeScriptEngine(ScriptManagerPointer);
ScriptGatekeeper scriptGatekeeper;
signals:
@ -336,7 +338,6 @@ protected slots:
protected:
ScriptManagerPointer reloadScript(const QString& scriptName, bool isUserLoaded = true) { return loadScript(scriptName, isUserLoaded, false, false, true); }
void removeScriptEngine(ScriptManagerPointer);
void onScriptEngineLoaded(const QString& scriptFilename);
void quitWhenFinished();
void onScriptEngineError(const QString& scriptFilename);

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

@ -519,6 +519,11 @@ void ScriptManager::waitTillDoneRunning(bool shutdown) {
}
}
void ScriptManager::removeFromScriptEngines() {
Q_ASSERT(_scriptEngines);
_scriptEngines.toStrongRef()->removeScriptEngine(shared_from_this());
}
QString ScriptManager::getFilename() const {
QStringList fileNameParts = _fileNameString.split("/");
QString lastPart;

9
libraries/script-engine/src/ScriptManager.h
View file

@ -471,6 +471,15 @@ public:
*/
void waitTillDoneRunning(bool shutdown = false);
/**
* @brief Removes shared pointer to script engine from the list of all script engines.
*
* This allows deletion of the script engine once all shared pointer instances are gone.
* This function is called for entity script engines when they are being destroyed.
*
*/
void removeFromScriptEngines();
/**
* @brief Load a script from a given URL
*