Changeset 3632 in orxonox.OLD

Timestamp:

Mar 22, 2005, 12:36:39 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: bullets now tick() but they shoot all over the place… some problems with the gundirection calculation

Location:

orxonox/trunk/src/world_entities

Files:

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

orxonox/trunk/src/world_entities/projectile.cc

@@ -34 +34 @@
   //this->model = new OBJModel("");
   this->projectileModel = new Primitive(P_SPHERE);
+  this->flightDirection = NULL;
+  this->speed = 1.0f;
 }
 
@@ -51 +53 @@
 
 /**
+   \brief this sets the flight direction of the projectile
+   \param directin in which to flight
+
+   this function will calculate a vector out of this to be used in the
+   tick function
+*/
+void Projectile::setFlightDirection(Quaternion* flightDirection)
+{
+  if( this->flightDirection == NULL)
+    this->flightDirection = new Vector();
+  Vector v(1, 0, 0);
+  *this->flightDirection = flightDirection->apply(v);
+}
+
+
+/**
    \brief signal tick, time dependent things will be handled here
    \param time since last tick
 */
 void Projectile::tick (float time) 
-{}
+{
+  *this->flightDirection = *this->flightDirection * speed;
+  this->shiftCoor(this->flightDirection);
+}
 
 /**

orxonox/trunk/src/world_entities/projectile.h

@@ -10 +10 @@
 
 class Primitive;
+class Vector;
 
 class Projectile : public WorldEntity 
@@ -19 +20 @@
   virtual ~Projectile ();
 
+  void setFlightDirection(Quaternion* flightDirection);
+
   virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void destroy ();
@@ -27 +30 @@
  private:
   //physical attriutes like: force, speed, acceleration etc.
-  Primitive* projectileModel;
-
+  Primitive* projectileModel;          //!< this serves temporary as a plasma bullet
+  float speed;                         //!< this is the speed of the projectile
+  Vector* flightDirection;             //!< direction in which the shoot flights
 };
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -83 +83 @@
 {
   printf("TestGun::fire() - firing weapon now ---------------------------\n");
-  WorldEntity* pj = new Projectile();
-  pj->setAbsCoor( &this->getAbsCoor());
-  pj->setAbsDir( &this->getAbsDir());
+  Projectile* pj = new Projectile();
+  Vector* v = new Vector();
+  *v = this->getAbsCoor();
+  pj->setAbsCoor(v);
+  Quaternion* q = new Quaternion();
+  *q = this->getAbsDir();
+  pj->setAbsDir(q);
+
+  pj->setFlightDirection(q);
+
   this->worldEntities->add(pj);
 }