Changeset 4322 in orxonox.OLD for orxonox

Timestamp:

May 27, 2005, 1:27:02 AM (20 years ago)

Author:

patrick

Message:

now the objectmanagment works smoothly with the garbage collection: shoots (projectiles) are now precached (100 pieces) used from this pool and recyled

Location:

orxonox/trunk/src

Files:

• util/garbage_collector.cc (modified) (1 diff)
• util/object_manager.cc (modified) (3 diffs)
• util/object_manager.h (modified) (1 diff)
• world_entities/projectile.cc (modified) (1 diff)
• world_entities/test_bullet.cc (modified) (1 diff)

orxonox/trunk/src/util/garbage_collector.cc

@@ -139 +139 @@
           /* then finaly delete reference */
           //delete entity;
-          ObjectManager::getInstance()->addToDeadList(CL_TEST_BULLET, entity);
+          ObjectManager::getInstance()->addToDeadList(entity->getClassID(), entity);
         }
       entity = iterator->nextElement();

orxonox/trunk/src/util/object_manager.cc

@@ -40 +40 @@
 }
 
+
 /**
    \brief the singleton reference to this class
@@ -66 +67 @@
 
 
-void ObjectManager::addToDeadList(classList index, BaseObject* object)
+void ObjectManager::addToDeadList(int index, BaseObject* object)
 {
   if( likely(this->managedObjectList[index] != NULL))
@@ -75 +76 @@
 
 
-BaseObject* ObjectManager::getFromDeadList(classList index, int number)
+BaseObject* ObjectManager::getFromDeadList(int index, int number)
 {
   if( likely(this->managedObjectList[index] != NULL))

orxonox/trunk/src/util/object_manager.h

@@ -52 +52 @@
   
   void mCache(Projectile);
-  void addToDeadList(classList index, BaseObject* object);
-  BaseObject* getFromDeadList(classList index, int number = 1);
+  void addToDeadList(int index, BaseObject* object);
+  BaseObject* getFromDeadList(int index, int number = 1);
 
   void debug();

orxonox/trunk/src/world_entities/projectile.cc

@@ -33 +33 @@
 Projectile::Projectile (Weapon* weapon) : WorldEntity()
 {
+  this->setClassID(CL_PROJECTILE, "Projectile");
   this->weapon = weapon;
   this->flightDirection = NULL;

orxonox/trunk/src/world_entities/test_bullet.cc

@@ -33 +33 @@
 TestBullet::TestBullet (Weapon* weapon) : Projectile(weapon)
 {
+  this->setClassID(CL_TEST_BULLET, "TestBullet");
   this->model = (Model*)ResourceManager::getInstance()->load("models/test_projectile.obj", OBJ, RP_LEVEL);
 }