Changeset 4332 in orxonox.OLD for orxonox/branches/physics/src/util

Timestamp:

May 27, 2005, 7:14:55 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

Location:

orxonox/branches/physics/src/util

Files:

• animation/animation_player.cc (modified) (1 diff)
• event (copied) (copied from orxonox/trunk/src/util/event)
• event/event.cc (copied) (copied from orxonox/trunk/src/util/event/event.cc)
• event/event.h (copied) (copied from orxonox/trunk/src/util/event/event.h)
• event/event_handler.cc (copied) (copied from orxonox/trunk/src/util/event/event_handler.cc)
• event/event_handler.h (copied) (copied from orxonox/trunk/src/util/event/event_handler.h)
• event/event_listener.cc (copied) (copied from orxonox/trunk/src/util/event/event_listener.cc)
• event/event_listener.h (copied) (copied from orxonox/trunk/src/util/event/event_listener.h)
• garbage_collector.cc (modified) (3 diffs)
• loading/game_loader.cc (modified) (1 diff)
• loading/load_param.h (modified) (1 diff)
• object_manager.cc (modified) (4 diffs)
• object_manager.h (modified) (5 diffs)
• resource_manager.cc (modified) (1 diff)
• track/track_manager.cc (modified) (1 diff)
• track/track_node.cc (modified) (1 diff)

orxonox/branches/physics/src/util/animation/animation_player.cc

@@ -28 +28 @@
 AnimationPlayer::AnimationPlayer () 
 {
-   this->setClassName ("AnimationPlayer");
+   this->setClassID(CL_ANIMATION_PLAYER, "AnimationPlayer");
 
    this->animationList = new tList<Animation>();

orxonox/branches/physics/src/util/garbage_collector.cc

@@ -38 +38 @@
 GarbageCollector::GarbageCollector () 
 {
-   this->setClassName ("GarbageCollection");
+   this->setClassID(CL_GARBAGE_COLLECTOR, "GarbageCollector");
    this->time = 0;
    this->delay = 1.5f; /* clean up all 5.0 seconds */
@@ -139 +139 @@
           /* then finaly delete reference */
           //delete entity;
-          ObjectManager::getInstance()->addToDeadList(CL_TEST_BULLET, entity);
-          ObjectManager::getInstance()->debug();
+          ObjectManager::getInstance()->addToDeadList(entity->getClassID(), entity);
         }
       entity = iterator->nextElement();
@@ -148 +147 @@
   PRINTF(3)("=============================\n");
 
+  ObjectManager::getInstance()->debug();
+
   /* reset time to count again up to this->delay */
   this->time = 0;

orxonox/branches/physics/src/util/loading/game_loader.cc

@@ -82 +82 @@
       delete campaignName;
     }
+  World* world0 = new World(DEBUG_WORLD_0);
+  world0->setNextStoryID(WORLD_ID_GAMEEND);
+  this->currentCampaign->addEntity(world0, WORLD_ID_2);
 }
 

orxonox/branches/physics/src/util/loading/load_param.h

@@ -180 +180 @@
   static LoadClassDescription* addClass(const char* className);
   LoadParamDescription* addParam(const char* paramName);
+  
 
   static void printAll(const char* fileName = NULL);

orxonox/branches/physics/src/util/object_manager.cc

@@ -28 +28 @@
 ObjectManager::ObjectManager () 
 {
-  this->setClassName ("ObjectManager");
+  this->setClassID(CL_OBJECT_MANAGER, "ObjectManager");
   
-  //this->managedObjectList = new BaseObject*[CL_NUMBER];
   this->managedObjectList = new tList<BaseObject>*[CL_NUMBER];
+  for(int i = 0; i < CL_NUMBER; ++i)
+    {
+      this->managedObjectList[i] = NULL;
+    }
 
   this->garbageCollector = GarbageCollector::getInstance();
 }
+
 
 /**
@@ -62 +66 @@
 
 
-void ObjectManager::cache(classList index, int number, const BaseObject &copyObject)
-{
-  //this->managedObjectList[index] = new BaseObject[number];
-  this->managedObjectList[index] = new tList<BaseObject>();
-  for(int i = 0; i < number; ++i)
-    {
-      this->managedObjectList[index]->add(new BaseObject(copyObject));
-    }
-}
-
-
-void ObjectManager::addToDeadList(classList index, BaseObject* object)
+void ObjectManager::addToDeadList(int index, BaseObject* object)
 {
   if( likely(this->managedObjectList[index] != NULL))
     this->managedObjectList[index]->add(object);
   else
-    PRINTF(0)(" Error: unable to add object to the list nr. %i: no list initialized - ignoring\n", index);
+    PRINTF(0)(" Critical: unable to add object to the list nr. %i: no list initialized - ignoring\n", index);
 }
 
 
-BaseObject* ObjectManager::getFromDeadList(classList index, int number)
+BaseObject* ObjectManager::getFromDeadList(int index, int number)
 {
   if( likely(this->managedObjectList[index] != NULL))
@@ -88 +81 @@
       BaseObject* obj = this->managedObjectList[index]->firstElement();
       this->managedObjectList[index]->remove(obj);
+      if( unlikely(obj == NULL))
+        {
+          PRINTF(0)("Critical: there was no object anymore in the dead list! This could result in Segfaults\n");
+        }
       return obj;
     }
   else
-    PRINTF(0)(" Error: unable to get object from the list nr. %i: no elements initialized - ignoring\n", index);
+    PRINTF(0)(" Critical: unable to get object from the list nr. %i: no elements initialized - ignoring\n", index);
+  return NULL;
 }
 
@@ -102 +100 @@
   for(int i = 0; i < CL_NUMBER; ++i)
     {
-      if(this->managedObjectList[i] != NULL)
+      if( this->managedObjectList[i] != NULL)
         PRINT(0)("=   o Class Nr. %i has cached %i object(s)\n", i, this->managedObjectList[i]->getSize());
       else

orxonox/branches/physics/src/util/object_manager.h

@@ -8 +8 @@
     - recycle deleted objects: specific for Projectils since there is a lot of world entity creation/deletion (and this needs a lot of time)
     - control the garbage collector
+
+    TO ADD SUPPORT FOR A CLASS do the following steps:
+    1. include the hader file : #include "class_header.h"
+    2. add the class to the type enum classList {}; in class_list.h
+    3. define a function void mCache( ClassName ) in class ObjectManager
+
 */
 
@@ -15 +21 @@
 
 #include "base_object.h"
-
-#define OM_
+#include "projectile.h"
+#include "list.h"
 
 #include "class_list.h"
-
+  
 
 class WorldEntity;
@@ -25 +31 @@
 
 
-template<class T> class tList; 
-template<class T> class ManagedObject;
+//! This defines the "template" makro function for cache(...)
+#define mCache( Class ) \
+ cache(classList index, int number, Class * copyObject)        \
+{                                                              \
+  this->managedObjectList[index] = new tList<BaseObject>(); \
+  for(int i = 0; i < number; ++i)\
+    {\
+      this->managedObjectList[index]->add(new Class (*copyObject));\
+    }\
+}
+
+
 
 //! the object manager itself
@@ -35 +51 @@
   virtual ~ObjectManager(void);
   
-  void cache(classList index, int number, const BaseObject &copyObject);
-  void addToDeadList(classList index, BaseObject* object);
-  BaseObject* getFromDeadList(classList index, int number = 1);
+  void mCache(Projectile);
+  void addToDeadList(int index, BaseObject* object);
+  BaseObject* getFromDeadList(int index, int number = 1);
 
   void debug();
@@ -43 +59 @@
  private:
   ObjectManager(void);
+
   static ObjectManager* singletonRef;
 
-  //BaseObject** managedObjectList;
   tList<BaseObject>** managedObjectList;
   GarbageCollector* garbageCollector;

orxonox/branches/physics/src/util/resource_manager.cc

@@ -38 +38 @@
 ResourceManager::ResourceManager () 
 {
-   this->setClassName ("ResourceManager");
+   this->setClassID(CL_RESOURCE_MANAGER, "ResourceManager");
    this->dataDir = NULL;
    this->setDataDir("./");

orxonox/branches/physics/src/util/track/track_manager.cc

@@ -370 +370 @@
 TrackManager::TrackManager(void)
 {
-  this->setClassName("TrackManager");
+  this->setClassID(CL_TRACK_MANAGER, "TrackManager");
   
   TrackManager::singletonRef = this; // do this because otherwise the TrackNode cannot get The instance of the TrackManager

orxonox/branches/physics/src/util/track/track_node.cc

@@ -32 +32 @@
 TrackNode::TrackNode () 
 {
-  this->setClassName("TrackNode");
+  this->setClassID(CL_TRACK_NODE, "TrackNode");
   this->setName("TrackNode"); /* absolete but still used... */