Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/world_entities/test_gun.cc

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

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

orxonox/branches/physics/src/world_entities/test_gun.cc

@@ -40 +40 @@
    creates a new weapon
 */
-TestGun::TestGun (PNode* parent, Vector* coordinate, Quaternion* direction, int leftRight) 
+TestGun::TestGun (PNode* parent, const Vector& coordinate, const Quaternion& direction, int leftRight) 
   :  Weapon (parent, coordinate, direction) 
 {
@@ -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->objectComponent1 = new PNode();
+  this->animation1 = new Animation3D(this->objectComponent1);
+  parent->addChild(this->objectComponent1, PNODE_ALL);
 
+  this->animation1->setInfinity(ANIM_INF_CONSTANT);
+  // ANIM_LINEAR was ANIM_NEG_EXP
+  if( this->leftRight == W_LEFT)
+    {
+      this->projectileOffset = Vector(1.0, 0.0, -0.35);
 
-  this->dummy1 = new WorldEntity(); // a world entity that is not drawed: use this for the weapon 
-  this->animation = new Animation3D(dummy1);
+      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);
+      this->animation1->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR);
+    }
+  else if( this->leftRight == W_RIGHT)
+    {
+      this->projectileOffset = Vector(1.0, 0.0, 0.5);
 
-  parent->addChild(this->dummy1, PNODE_ALL);
-
-  this->animation->setInfinity(ANIM_INF_CONSTANT);
-  // ANIM_LINEAR was ANIM_NEG_EXP
-  if( this->leftRight == 0)
-    {
-      this->animation->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR); 
-      this->animation->addKeyFrame(Vector(-3.0, 0.1, 3.0), Quaternion(), 0.5, ANIM_LINEAR);
-      this->animation->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR);
+      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);
+      this->animation1->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
     }
-  else if( this->leftRight == 1)
-    {
-      this->animation->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
-      this->animation->addKeyFrame(Vector(-3.0, 0.1, -2.5), Quaternion(), 0.5, ANIM_LINEAR);
-      this->animation->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
-    }
-  /*
-  if( this->leftRight == 0)
-    {
-      this->animation->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.0, ANIM_NEG_EXP); 
-      this->animation->addKeyFrame(Vector(-3.0, 0.1, 3.0), Quaternion(), 0.1, ANIM_NEG_EXP);
-      this->animation->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.5, ANIM_NEG_EXP);
-    }
-  else if( this->leftRight == 1)
-    {
-      this->animation->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.0, ANIM_NEG_EXP);
-      this->animation->addKeyFrame(Vector(-3.0, 0.1, -2.5), Quaternion(), 0.1, ANIM_NEG_EXP);
-      this->animation->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.5, ANIM_NEG_EXP);
-    }
-  */
 }
 
@@ -127 +110 @@
 void TestGun::fire()
 {
-  if( this->localTime < this->idleTime)
+  if( !this->hasWeaponIdleTimeElapsed())
     {
       this->weaponIdle();
       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;
   
-  this->animation->replay();
+  this->animation1->replay();
 }
 
@@ -190 +171 @@
 void TestGun::draw () 
 {
-  
-  /* draw gun body 1 */
+  /* draw gun body */
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
   float matrix[4][4];
-  
-  if( this->leftRight == 0)
-    {
-      glTranslatef (this->getAbsCoor ().x, 
-                    this->getAbsCoor ().y, 
-                    this->getAbsCoor ().z);
-      
-      this->getAbsDir ().matrix (matrix);
-      glMultMatrixf((float*)matrix);
-      this->model->draw(1);
-    }
-  else if( this->leftRight == 1)
-    {
-      glTranslatef (this->getAbsCoor ().x, 
-                    this->getAbsCoor ().y, 
-                    this->getAbsCoor ().z);
-      
-      this->getAbsDir ().matrix (matrix);
-      glMultMatrixf((float*)matrix);
-      glScalef(1.0, 1.0, -1.0);
-      this->model->draw(1);
-    }
-
+  glTranslatef (this->getAbsCoor ().x, 
+                this->getAbsCoor ().y, 
+                this->getAbsCoor ().z);  
+  this->getAbsDir ().matrix (matrix);
+  glMultMatrixf((float*)matrix);
+  if( this->leftRight == W_RIGHT)
+    glScalef(1.0, 1.0, -1.0);
+  this->model->draw(1);
   glPopMatrix();
 
-
-  /* draw gun coil 1 */
+  /* draw objectComponent1: gun coil - animated stuff */
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  
-  glTranslatef (this->dummy1->getAbsCoor ().x, 
-                this->dummy1->getAbsCoor ().y, 
-                this->dummy1->getAbsCoor ().z);
-
-  this->dummy1->getAbsDir ().matrix (matrix);
+  glTranslatef (this->objectComponent1->getAbsCoor ().x, 
+                this->objectComponent1->getAbsCoor ().y, 
+                this->objectComponent1->getAbsCoor ().z);
+  this->objectComponent1->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);
   this->model->draw(0);