Changeset 3888 in orxonox.OLD for orxonox/trunk/src/world_entities/test_gun.cc

Timestamp:

Apr 19, 2005, 1:16:16 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: deconstructor cleanup in weapon/gun

File:

• orxonox/trunk/src/world_entities/test_gun.cc (modified) (4 diffs)

orxonox/trunk/src/world_entities/test_gun.cc

@@ -47 +47 @@
   this->leftRight = leftRight;
 
-  if( this->leftRight == 0)
-    this->projOffset = new Vector(1.0, 0.0, -0.35);
-  else if( this->leftRight == 1)
-    this->projOffset = new Vector(1.0, 0.0, 0.5);
-
-
-  //this->dummy1 = new WorldEntity(); // a world entity that is not drawed: use this for the weapon 
   this->objectComponent1 = new PNode();
   this->animation1 = new Animation3D(this->objectComponent1);
-
   parent->addChild(this->objectComponent1, PNODE_ALL);
 
@@ -63 +55 @@
   if( this->leftRight == W_LEFT)
     {
+      this->projectileOffset = Vector(1.0, 0.0, -0.35);
+
       this->animation1->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR); 
       this->animation1->addKeyFrame(Vector(-3.0, 0.1, 3.0), Quaternion(), 0.5, ANIM_LINEAR);
@@ -69 +63 @@
   else if( this->leftRight == W_RIGHT)
     {
+      this->projectileOffset = Vector(1.0, 0.0, 0.5);
+
       this->animation1->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
       this->animation1->addKeyFrame(Vector(-3.0, 0.1, -2.5), Quaternion(), 0.5, ANIM_LINEAR);
@@ -119 +115 @@
       return;
     }
+
   Projectile* pj = new TestBullet(this);
-
-  pj->setAbsCoor(this->getAbsCoor() + *this->projOffset);
+  pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
   pj->setAbsDir(this->getAbsDir());
-
   pj->setFlightDirection(this->getAbsDir());
   pj->setSpeed(this->getSpeed());
-
   this->worldEntities->add(pj);
   this->localTime = 0;