Changeset 4287 in orxonox.OLD

Timestamp:

May 26, 2005, 12:22:19 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented the objectmanager debug functon, some small fixed in the ol code

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)
• util/object_manager.cc (modified) (1 diff)
• util/object_manager.h (modified) (1 diff)
• world_entities/player.cc (modified) (3 diffs)
• world_entities/test_gun.cc (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -56 +56 @@
 // DEFINE MODULES
 #define DEBUG_MODULE_ORXONOX            0
-#define DEBUG_MODULE_WORLD              1
-#define DEBUG_MODULE_PNODE              1
+#define DEBUG_MODULE_WORLD              0
+#define DEBUG_MODULE_PNODE              0
 #define DEBUG_MODULE_WORLD_ENTITY       0
-#define DEBUG_MODULE_COMMAND_NODE       4
+#define DEBUG_MODULE_COMMAND_NODE       0
 #define DEBUG_MODULE_GRAPHICS           0
 #define DEBUG_MODULE_LOAD               2
 
-#define DEBUG_MODULE_IMPORTER           3
+#define DEBUG_MODULE_IMPORTER           0
 #define DEBUG_MODULE_TRACK_MANAGER      0
 #define DEBUG_MODULE_GARBAGE_COLLECTOR  0
+#define DEBUG_MODULE_OBJECT_MANAGER     3
 #define DEBUG_MODULE_LIGHT              0
 #define DEBUG_MODULE_PLAYER             1
-#define DEBUG_MODULE_WEAPON             3
+#define DEBUG_MODULE_WEAPON             0
 #define DEBUG_MODULE_MATH               0
 #define DEBUG_MODULE_FONT               1
 #define DEBUG_MODULE_ANIM               1
-#define DEBUG_MODULE_PARTICLE           4
+#define DEBUG_MODULE_PARTICLE           1
 
 #define DEBUG_MODULE_NULL_PARENT        0

orxonox/trunk/src/story_entities/world.cc

@@ -40 +40 @@
 #include "track_manager.h"
 #include "garbage_collector.h"
+#include "object_manager.h"
 #include "animation_player.h"
 #include "particle_engine.h"
@@ -54 +55 @@
 
 #include "factory.h"
+
+#include "projectile.h"
 
 using namespace std;

orxonox/trunk/src/util/object_manager.cc

@@ -77 +77 @@
 BaseObject* ObjectManager::getFromDeadList(const char* className, int number)
 {}
+
+
+void ObjectManager::debug()
+{
+  PRINT(0)("\n==========================| ObjectManager::debug() |===\n");
+  PRINT(0)("=  Number of registerable classes: %i\n", CL_NUMBER );  
+  PRINT(0)("=  Currently cached objects: \n");
+  for(int i = 0; i < CL_NUMBER; ++i)
+    {
+      if(this->managedObjectList[i] != NULL)
+        PRINT(0)("=   o Class Nr. %i has cached %i object(s)\n", i, this->managedObjectList[i]->getSize());
+      else
+        PRINT(0)("=   o Class Nr. %i has cached 0 object(s)\n", i);
+    }
+  PRINT(0)("=======================================================\n");
+}

orxonox/trunk/src/util/object_manager.h

@@ -44 +44 @@
   BaseObject* getFromDeadList(const char* className, int number = 1);
 
+  void debug();
+
  private:
   ObjectManager(void);

orxonox/trunk/src/world_entities/player.cc

@@ -27 +27 @@
 #include "list.h"
 #include "stdincl.h"
+
+#include "object_manager.h"
+#include "projectile.h"
 
 using namespace std;
@@ -59 +62 @@
   this->weaponMan->addWeapon(wpRight, W_CONFIG2);
   this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
-
 }
 
@@ -104 +106 @@
   this->weaponMan->addWeapon(wpRight, W_CONFIG2);
   this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
+
+  BaseObject* p = new Projectile(wpRight);
+  ObjectManager::getInstance()->cache(CL_PROJECTILE, 100, *p);
+  ObjectManager::getInstance()->debug();
+
 }
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -31 +31 @@
 #include "list.h"
 #include "animation3d.h"
+
 
 using namespace std;