Changeset 4934 in orxonox.OLD

Timestamp:

Jul 22, 2005, 6:41:46 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: resurection of shoots works perfectly… now it is the question of how to recollect them… most probably the GarbageCollector… this will be one step deeper then..

Location:

orxonox/trunk/src

Files:

• util/object_manager.h (modified) (9 diffs)
• world_entities/weapons/test_gun.cc (modified) (2 diffs)
• world_entities/weapons/test_gun.h (modified) (2 diffs)
• world_entities/weapons/weapon.cc (modified) (1 diff)
• world_entities/weapons/weapon.h (modified) (1 diff)

orxonox/trunk/src/util/object_manager.h

@@ -63 +63 @@
 
   protected:
+    FastFactory (ClassID classID, const char* fastFactoryName = NULL);
+
     /** sets the Next factory in the list @param nextFactory the next factory */
     inline void setNext( FastFactory* nextFastFactory) { this->next = nextFastFactory; };
@@ -68 +70 @@
     FastFactory* getNext() const { return this->next; };
 
-    virtual BaseObject* fabricate(ClassID classID) = NULL;
-
-  private:
-    FastFactory (ClassID classID, const char* fastFactoryName = NULL);
+//    virtual BaseObject* fabricate(ClassID classID) = NULL;
+
+    static FastFactory* searchFastFactory(ClassID classID, const char* fastFactoryName = NULL);
+
+  private:
     static void registerFastFactory(FastFactory* fastFactory);
-    static FastFactory* searchFastFactory(ClassID classID, const char* fastFactoryName = NULL);
 
   protected:
@@ -92 +94 @@
 {
   public:
-    static FastFactory* getFastFactory(ClassID classID, const char* fastFactoryName = NULL);
+    static tFastFactory<T>* getFastFactory(ClassID classID, const char* fastFactoryName = NULL);
 
     void prepare(unsigned int count);
@@ -126 +128 @@
 
 template<class T>
-    FastFactory* tFastFactory<T>::getFastFactory(ClassID classID, const char* fastFactoryName)
+    tFastFactory<T>* tFastFactory<T>::getFastFactory(ClassID classID, const char* fastFactoryName)
 {
   tFastFactory<T>* tmpFac = NULL;
   if (FastFactory::getFirst() != NULL)
-    tmpFac = FastFactory::getFirst()->searchFastFactory(classID, fastFactoryName);
+    tmpFac = static_cast<tFastFactory<T>*>(FastFactory::getFirst()->searchFastFactory(classID, fastFactoryName));
 
   if (tmpFac != NULL)
     return tmpFac;
   else
-    return new tFastFactory<T>;
+    return new tFastFactory<T>(classID, fastFactoryName);
 }
 
@@ -142 +144 @@
     T* tFastFactory<T>::fabricate()
 {
-  FastObjectMember<T>* tmpFirstDead = this->deadList;
+  FastObjectMember<T>* tmpFirstDead = new FastObjectMember<T>;
   tmpFirstDead->objectPointer = new T();
   tmpFirstDead->next = this->deadList;
@@ -148 +150 @@
 
   this->deadList = tmpFirstDead;
-  return this->deadList;
+  return tmpFirstDead->objectPointer;
 }
 
@@ -154 +156 @@
     void tFastFactory<T>::prepare(unsigned int count)
 {
-  if (this->storedDeadObjects + this->storedLivingObjects >= count)
+/*  if (this->storedDeadObjects + this->storedLivingObjects >= count)
   {
     PRINTF(3)("not creating new Objects for class %s, because the requested count already exists\n", this->getClassName());
-  }
-  for (int i = this->storedDeadObjects + this->storedLivingObjects; i < count; i++)
+  }*/
+  for (int i = this->storedDeadObjects; i < count; i++)
   {
     this->fabricate();
@@ -167 +169 @@
     T* tFastFactory<T>::resurect()
 {
+  PRINTF(4)("Resurecting Object of type %s\n", this->getName());
   if (unlikely(this->deadList == NULL))
   {
@@ -179 +182 @@
 
     tmpC->next = this->unusedContainers;
-    this->unusedContainers->tmpC;
-
-    return tmpC;
+    this->unusedContainers = tmpC;
+
+    return tmpC->objectPointer;
   }
 }

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -111 +111 @@
 
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
+
+  this->bulletFactory = tFastFactory<TestBullet>::getFastFactory(CL_TEST_BULLET, "TestBullet");
+  this->bulletFactory->prepare(100);
 }
 
@@ -155 +158 @@
 void TestGun::fire()
 {
-  Projectile* pj =  new TestBullet();//dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET & CL_MASK_LOWLEVEL_CLASS));
+  Projectile* pj =  this->bulletFactory->resurect();//new TestBullet();//dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET & CL_MASK_LOWLEVEL_CLASS));
 //  weaponSource->play();
 

orxonox/trunk/src/world_entities/weapons/test_gun.h

@@ -30 +30 @@
 class Quaternion;
 class Animation3D;
+class TestBullet;
 
 
 class TestGun : public Weapon
-{
+  {
   public:
     TestGun (PNode* parent, const Vector& coordinate, const Quaternion& direction, int leftRight);
@@ -54 +55 @@
     int leftRight;   // this will become an enum
 
+    tFastFactory<TestBullet>*       bulletFactory;  //!< The factory for fast interaction with the TestBullet Class.
 
 
-};
 
+  };
 #endif /* _TEST_GUN_H */

orxonox/trunk/src/world_entities/weapons/weapon.cc

@@ -398 +398 @@
 void Weapon::tickW(float dt)
 {
-  printf("%s ", stateToChar(this->currentState));
+  //printf("%s ", stateToChar(this->currentState));
 
   // setting up the timing properties

orxonox/trunk/src/world_entities/weapons/weapon.h

@@ -26 +26 @@
 class Animation3D;
 class TiXmlElement;
+template<class T> class tFastFactory;
 
 //! An enumerator defining Actions a Weapon can take