mirror of
https://github.com/overte-org/overte.git
synced 2025-08-04 03:03:35 +02:00
more hacking
This commit is contained in:
parent
e3de994c4a
commit
2e7a43a7fb
1 changed files with 29 additions and 4 deletions
|
@ -587,27 +587,51 @@ void Application::cleanupBeforeQuit() {
|
||||||
}
|
}
|
||||||
|
|
||||||
Application::~Application() {
|
Application::~Application() {
|
||||||
EntityTree* tree = _entities.getTree();
|
qDebug() << "Application::~Application() ------------ START -----------------";
|
||||||
tree->lockForWrite();
|
|
||||||
_entities.getTree()->setSimulation(NULL);
|
|
||||||
tree->unlock();
|
|
||||||
|
|
||||||
|
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
EntityTree* tree = _entities.getTree();
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
tree->lockForWrite();
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
_entities.getTree()->setSimulation(NULL);
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
tree->unlock();
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
qInstallMessageHandler(NULL);
|
qInstallMessageHandler(NULL);
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
|
||||||
// ask the datagram processing thread to quit and wait until it is done
|
// ask the datagram processing thread to quit and wait until it is done
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
_nodeThread->quit();
|
_nodeThread->quit();
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
_nodeThread->wait();
|
_nodeThread->wait();
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
_octreeProcessor.terminate();
|
_octreeProcessor.terminate();
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
_entityEditSender.terminate();
|
_entityEditSender.terminate();
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
Menu::getInstance()->deleteLater();
|
Menu::getInstance()->deleteLater();
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
_myAvatar = NULL;
|
_myAvatar = NULL;
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
ModelEntityItem::cleanupLoadedAnimations() ;
|
ModelEntityItem::cleanupLoadedAnimations() ;
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
DependencyManager::destroy<GLCanvas>();
|
DependencyManager::destroy<GLCanvas>();
|
||||||
|
qDebug() << "Application::~Application() line:" << __LINE__;
|
||||||
|
|
||||||
qDebug() << "start destroying ResourceCaches Application::~Application() line:" << __LINE__;
|
qDebug() << "start destroying ResourceCaches Application::~Application() line:" << __LINE__;
|
||||||
DependencyManager::destroy<AnimationCache>();
|
DependencyManager::destroy<AnimationCache>();
|
||||||
|
@ -616,6 +640,7 @@ Application::~Application() {
|
||||||
DependencyManager::destroy<ScriptCache>();
|
DependencyManager::destroy<ScriptCache>();
|
||||||
DependencyManager::destroy<SoundCache>();
|
DependencyManager::destroy<SoundCache>();
|
||||||
qDebug() << "done destroying ResourceCaches Application::~Application() line:" << __LINE__;
|
qDebug() << "done destroying ResourceCaches Application::~Application() line:" << __LINE__;
|
||||||
|
qDebug() << "Application::~Application() ------------ DONE -----------------";
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::initializeGL() {
|
void Application::initializeGL() {
|
||||||
|
|
Loading…
Reference in a new issue