Changeset 4464 in orxonox.OLD for orxonox

Timestamp:

Jun 2, 2005, 1:18:44 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: reimplemented the shoot speed function

Location:

orxonox/trunk/src/world_entities

Files:

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

orxonox/trunk/src/world_entities/projectile.cc

@@ -93 +93 @@
 }
 
+
+/**
+   \brief sets the velocity vector to a spec speed
+   \param velocity: vector of the velocity
+*/
+void Projectile::setVelocity(const Vector &velocity)
+{
+  this->offsetVel = this->velocity = velocity;
+  this->offsetVel.normalize();
+  this->velocity += (this->offsetVel * 50.0);
+}
+
+
 /**
    \brief signal tick, time dependent things will be handled here
@@ -99 +112 @@
 void Projectile::tick (float time) 
 {
-  Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.7);
+  Vector v = this->velocity * (time);
   this->shiftCoor(v);
 

orxonox/trunk/src/world_entities/projectile.h

@@ -22 +22 @@
 
 #include "world_entity.h"
+#include "vector.h"
 
 class Vector;
@@ -36 +37 @@
   void setFlightDirection(Quaternion flightDirection);
   void setSpeed(float speed);
+  void setVelocity(const Vector &velocity);
   void setTTL(float ttl);
 
@@ -52 +54 @@
   Weapon* weapon;                      //!< weapon the shoot belongs to
   
+  Vector velocity;                     //!< velocity of the projectile
+  Vector offsetVel;                    //!< offset velocity TEMP
 };
 

orxonox/trunk/src/world_entities/test_bullet.cc

@@ -58 +58 @@
 void TestBullet::tick (float time) 
 {
-  Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
+  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
+  Vector v = this->velocity * (time);
   this->shiftCoor(v);
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -145 +145 @@
 
   Projectile* pj = dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));
-
-  //printf( "object ref %p\n", ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));
-
-  //Projectile* pj = new TestBullet(this);
   pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
   pj->setAbsDir(this->getAbsDir());
-  pj->setFlightDirection(this->getAbsDir());
-  pj->setSpeed(this->getSpeed());
+  pj->setVelocity(this->getVelocity());
   this->worldEntities->add(pj);
   this->localTime = 0;