Changeset 4301 in orxonox.OLD for orxonox/branches/physics/src/orxonox.cc

Timestamp:

May 26, 2005, 3:20:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -4 4283:HEAD ../../trunk/ .
no conflicts

File:

• orxonox/branches/physics/src/orxonox.cc (modified) (4 diffs)

orxonox/branches/physics/src/orxonox.cc

@@ -35 +35 @@
 #include "graphics_engine.h"
 #include "resource_manager.h"
+#include "object_manager.h"
 #include "text_engine.h"
 #include "factory.h"
@@ -56 +57 @@
   this->world = NULL;
   this->localinput = NULL;
+  this->resourceManager = NULL;
+  this->objectManager = NULL;
 
   this->argc = 0;
@@ -72 +75 @@
   delete GraphicsEngine::getInstance(); // deleting the Graphics
   delete ResourceManager::getInstance(); // deletes the Resource Manager
+  delete ObjectManager::getInstance();
   delete TextEngine::getInstance();
 }
@@ -225 +229 @@
   TextEngine::getInstance();
 
+  PRINT(3)("initializing ObjectManager\n");
+  this->objectManager = ObjectManager::getInstance();
+
   return 0;
 }