Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-16 08:32:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

some cleanup

Browse source
This commit is contained in:
ZappoMan 2015-02-25 16:31:43 -08:00
parent af43ba3444
commit b03928cec7
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -215,7 +215,6 @@ bool setupEssentials(int& argc, char** argv) {
DependencyManager::registerInheritance<AvatarHashMap, AvatarManager>();
// Set dependencies
//auto glCanvasGlobal = DependencyManager::set<GLCanvasGlobal>();
auto addressManager = DependencyManager::set<AddressManager>();
auto nodeList = DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
auto geometryCache = DependencyManager::set<GeometryCache>();
@ -532,8 +531,6 @@ void Application::aboutToQuit() {
}
void Application::cleanupBeforeQuit() {
qDebug() << "Application::cleanupBeforeQuit() ------------ BEGIN --------------";
_datagramProcessor.shutdown(); // tell the datagram processor we're shutting down, so it can short circuit
_entities.shutdown(); // tell the entities system we're shutting down, so it will stop running scripts
ScriptEngine::stopAllScripts(this); // stop all currently running global scripts
@ -577,12 +574,9 @@ void Application::cleanupBeforeQuit() {
// destroy the AudioClient so it and its thread have a chance to go down safely
DependencyManager::destroy<AudioClient>();
qDebug() << "Application::cleanupBeforeQuit() ------------ END --------------";
}
Application::~Application() {
qDebug() << "Application::~Application() ------------ BEGIN --------------";
EntityTree* tree = _entities.getTree();
tree->lockForWrite();
_entities.getTree()->setSimulation(NULL);
@ -601,19 +595,13 @@ Application::~Application() {
ModelEntityItem::cleanupLoadedAnimations() ;
//DependencyManager::destroy<GLCanvasGlobal>();
qDebug() << "Application::~Application() ------------ BEGIN CACHE CLEANUP --------------";
DependencyManager::destroy<AnimationCache>();
DependencyManager::destroy<TextureCache>();
DependencyManager::destroy<GeometryCache>();
DependencyManager::destroy<ScriptCache>();
DependencyManager::destroy<SoundCache>();
qDebug() << "Application::~Application() ------------ END CACHE CLEANUP --------------";
qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages
qDebug() << "Application::~Application() ------------ END --------------";
}
void Application::initializeGL() {

5
interface/src/GLCanvas.h
View file

@ -16,17 +16,12 @@
#include <QGLWidget>
#include <QTimer>
//#include <DependencyManager.h>
/// customized canvas that simply forwards requests/events to the singleton application
class GLCanvas : public QGLWidget {
Q_OBJECT
public:
GLCanvas();
virtual ~GLCanvas() {
qDebug() << "Deleting GLCanvas";
}
bool isThrottleRendering() const;