Changeset 4932 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons

Timestamp:

Jul 22, 2005, 12:08:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: factory optimisations

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• projectile.cc (modified) (1 diff)
• projectile.h (modified) (3 diffs)
• test_bullet.cc (modified) (1 diff)
• test_bullet.h (modified) (1 diff)
• test_gun.cc (modified) (3 diffs)

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

@@ -31 +31 @@
  *  standard constructor
 */
-Projectile::Projectile (Weapon* weapon) : WorldEntity()
+Projectile::Projectile () : WorldEntity()
 {
   this->setClassID(CL_PROJECTILE, "Projectile");
 
-  this->weapon = weapon;
   this->lifeCycle = 0.0;
   this->lifeSpan = 0.75f; /* sec */

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

@@ -25 +25 @@
 
 class Vector;
-class Weapon;
 class ParticleEmitter;
 
@@ -31 +30 @@
 {
   public:
-    Projectile (Weapon* weapon);
+    Projectile ();
     virtual ~Projectile ();
 
@@ -57 +56 @@
 
     Vector                flightDirection;           //!< direction in which the shoot flighs
-    Weapon*               weapon;                    //!< weapon the shoot belongs to.
 
     Vector                velocity;                  //!< velocity of the projectile.

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

@@ -21 +21 @@
 #include "model.h"
 #include "vector.h"
+#include "object_manager.h"
 
 using namespace std;
 
+CREATE_FAST_FACTORY(TestBullet, CL_TEST_BULLET);
 
 /**
  *  standard constructor
 */
-TestBullet::TestBullet (Weapon* weapon) : Projectile(weapon)
+TestBullet::TestBullet () : Projectile()
 {
   this->setClassID(CL_TEST_BULLET, "TestBullet");

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

@@ -15 +15 @@
 {
  public:
-  TestBullet (Weapon* weapon);
+  TestBullet ();
   virtual ~TestBullet ();
 

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

@@ -35 +35 @@
 #include "object_manager.h"
 
-CREATE_FAST_OBJECT(TestGun, CL_TEST_GUN);
 
 using namespace std;
@@ -97 +96 @@
   this->weaponSource = new SoundSource(this->fireSound, this);
   this->weaponSource->setRolloffFactor(.1);*/
-  Projectile* p = new TestBullet(this);
+  Projectile* p = new TestBullet();
 
   //  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p);
@@ -156 +155 @@
 void TestGun::fire()
 {
-  Projectile* pj =  new TestBullet(this);//dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET & CL_MASK_LOWLEVEL_CLASS));
+  Projectile* pj =  new TestBullet();//dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET & CL_MASK_LOWLEVEL_CLASS));
 //  weaponSource->play();