Changeset 4934 in orxonox.OLD for orxonox/trunk/src/world_entities

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/world_entities/weapons

Files:

• test_gun.cc (modified) (2 diffs)
• test_gun.h (modified) (2 diffs)
• weapon.cc (modified) (1 diff)
• weapon.h (modified) (1 diff)

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