Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-04-18 10:08:33 -07:00
parent 9db0fe0d11
commit a4f562672a
2 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,23 +71,21 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf
}
EntityTreeRenderer::~EntityTreeRenderer() {
qDebug() << __FUNCTION__ << "---- BEGIN ----";
qDebug() << __FUNCTION__;
// NOTE: We don't need to delete _entitiesScriptEngine because
// it is registered with ScriptEngines, which will call deleteLater for us.
/*
if (_entitiesScriptEngine) {
qDebug() << __FUNCTION__ << "about to stop entity script engine.";
_entitiesScriptEngine->stop();
qDebug() << __FUNCTION__ << "about to delete entity script engine.";
delete _entitiesScriptEngine;
_entitiesScriptEngine = nullptr;
}
*/
qDebug() << __FUNCTION__ << "---- END ----";
}
static int entititesScriptEngineCount = 0;
int EntityTreeRenderer::_entititesScriptEngineCount = 0;
void EntityTreeRenderer::setupEntitiesScriptEngine() {
qDebug() << __FUNCTION__ << "---- BEGIN ----";
_entitiesScriptEngine = QSharedPointer<ScriptEngine>(new ScriptEngine(NO_SCRIPT, QString("Entities %1").arg(++_entititesScriptEngineCount)), ScriptEngine::doDeleteLater);
_scriptingServices->registerScriptEngineWithApplicationServices(_entitiesScriptEngine.data());
_entitiesScriptEngine->runInThread();
DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(_entitiesScriptEngine.data());
qDebug() << __FUNCTION__ << "---- END ----";
}
void EntityTreeRenderer::clear() {
qDebug() << __FUNCTION__ << "---- BEGIN ----";
@ -103,21 +101,10 @@ void EntityTreeRenderer::clear() {
_entitiesScriptEngine->stop();
qDebug() << __FUNCTION__ << " AFTER _entitiesScriptEngine->stop()";
qDebug() << __FUNCTION__ << " about to _entitiesScriptEngine->deleteLater()";
// NOTE: you can't actually delete it here we need to let Qt unwind and delete the object safely when ready
qDebug() << __FUNCTION__ << " about to call _entitiesScriptEngine->deleteLater() on thread[" << QThread::currentThread() << "], _entitiesScriptEngine's thread [" << _entitiesScriptEngine->thread() << "]";
_entitiesScriptEngine->deleteLater();
//QMetaObject::invokeMethod(_entitiesScriptEngine, "deleteLater");
qDebug() << __FUNCTION__ << " AFTER _entitiesScriptEngine->deleteLater()";
qDebug() << __FUNCTION__ << " about to create new _entitiesScriptEngine";
_entitiesScriptEngine = QSharedPointer<ScriptEngine>(new ScriptEngine(NO_SCRIPT, QString("Entities %1").arg(++entititesScriptEngineCount)), ScriptEngine::doDeleteLater);
_scriptingServices->registerScriptEngineWithApplicationServices(_entitiesScriptEngine.data());
_entitiesScriptEngine->runInThread();
DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(_entitiesScriptEngine.data());
qDebug() << __FUNCTION__ << " AFTER create new _entitiesScriptEngine";
// NOTE: you can't actually need to delete it here because when we call setupEntitiesScriptEngine it will
// assign a new instance to our shared pointer, which will deref the old instance and ultimately call
// the custom deleter which calls deleteLater
setupEntitiesScriptEngine();
}
auto scene = _viewState->getMain3DScene();
@ -147,10 +134,7 @@ void EntityTreeRenderer::init() {
entityTree->setFBXService(this);
if (_wantScripts) {
_entitiesScriptEngine = QSharedPointer<ScriptEngine>(new ScriptEngine(NO_SCRIPT, QString("Entities %1").arg(++entititesScriptEngineCount)), ScriptEngine::doDeleteLater);
_scriptingServices->registerScriptEngineWithApplicationServices(_entitiesScriptEngine.data());
_entitiesScriptEngine->runInThread();
DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(_entitiesScriptEngine.data());
setupEntitiesScriptEngine();
}
forceRecheckEntities(); // setup our state to force checking our inside/outsideness of entities

4
libraries/entities-renderer/src/EntityTreeRenderer.h
View file

@ -126,6 +126,8 @@ protected:
}
private:
void setupEntitiesScriptEngine();
void addEntityToScene(EntityItemPointer entity);
bool findBestZoneAndMaybeContainingEntities(const glm::vec3& avatarPosition, QVector<EntityItemID>* entitiesContainingAvatar);
@ -196,6 +198,8 @@ private:
QHash<EntityItemID, EntityItemPointer> _entitiesInScene;
// For Scene.shouldRenderEntities
QList<EntityItemID> _entityIDsLastInScene;
static int _entititesScriptEngineCount;
};