Changeset 3683 in orxonox.OLD

Timestamp:

Mar 30, 2005, 9:37:52 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: projectile speed issue: fixed some strange behaveour. still got the problem, that the the projectile have variable relative speeds to the player…

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (2 diffs)
• lib/coord/p_node.h (modified) (2 diffs)
• world_entities/player.cc (modified) (1 diff)
• world_entities/projectile.cc (modified) (5 diffs)
• world_entities/projectile.h (modified) (3 diffs)
• world_entities/test_gun.cc (modified) (3 diffs)

orxonox/trunk/src/defs/debug.h

@@ -63 +63 @@
 #define DEBUG_MODULE_COMMAND_NODE       0
 #define DEBUG_MODULE_GRAPHICS           0
-#define DEBUG_MODULE_LOAD               4
+#define DEBUG_MODULE_LOAD               1
 
 #define DEBUG_MODULE_IMPORTER           0

orxonox/trunk/src/lib/coord/p_node.cc

@@ -258 +258 @@
 
 /**
+   \brief shift coordinate (abs and rel)
+   \param shift vector
+
+   this function shifts the current coordinates about the vector shift. this is
+   usefull because from some place else you can:
+   PNode* someNode = ...;
+   Vector objectMovement = calculateShift();
+   someNode->shiftCoor(objectMovement);
+
+   elsewhere you would have to:
+   PNode* someNode = ...;
+   Vector objectMovement = calculateShift();
+   Vector currentCoor = someNode->getRelCoor();
+   Vector newCoor = currentCoor + objectMovement;
+   someNode->setRelCoor(newCoor);
+   
+   yea right... shorter...
+
+*/
+void PNode::shiftCoor (Vector shift)
+{
+  if( this->bAbsCoorChanged)
+    {
+      *this->absCoordinate = *this->absCoordinate + shift;
+    }
+  else 
+    {
+      *this->relCoordinate = *this->relCoordinate + shift;
+      this->bRelCoorChanged = true;
+    }
+}
+
+
+
+/**
    \brief get relative direction
    \returns relative direction to its parent
@@ -353 +388 @@
 */
 void PNode::shiftDir (Quaternion* shift)
+{}
+
+
+/**
+   \brief shift coordinate (abs and rel)
+   \param shift vector
+
+   this function shifts the current coordinates about the vector shift. this is
+   usefull because from some place else you can:
+   PNode* someNode = ...;
+   Quaternion objectMovement = calculateShift();
+   someNode->shiftCoor(objectMovement);
+
+   elsewhere you would have to:
+   PNode* someNode = ...;
+   Quaternion objectMovement = calculateShift();
+   Quaternion currentCoor = someNode->getRelCoor();
+   Quaternion newCoor = currentCoor + objectMovement;
+   someNode->setRelCoor(newCoor);
+   
+   yea right... shorter...
+
+   \todo implement this
+*/
+void PNode::shiftDir (Quaternion shift)
 {}
 

orxonox/trunk/src/lib/coord/p_node.h

@@ -64 +64 @@
   void setAbsCoor (Vector absCoord);
   void shiftCoor (Vector* shift);
+  void shiftCoor (Vector shift);
   //void shiftCoor (Vector shift);
 
@@ -73 +74 @@
   void setAbsDir (Quaternion absDir);
   void shiftDir (Quaternion* shift);
+  void shiftDir (Quaternion shift);
 
   float getSpeed();

orxonox/trunk/src/world_entities/player.cc

@@ -52 +52 @@
   acceleration = 10.0;
   //weapons:
-  Weapon* wp = new TestGun(this, new Vector(), new Quaternion);
+  Weapon* wp = new TestGun(this, new Vector(), new Quaternion());
   this->weapons->add(wp);
   this->activeWeapon = wp;  

orxonox/trunk/src/world_entities/projectile.cc

@@ -20 +20 @@
 
 #include "world_entity.h"
+#include "weapon.h"
 #include "null_parent.h"
 #include "model.h"
@@ -30 +31 @@
    \brief standard constructor
 */
-Projectile::Projectile () : WorldEntity()
+Projectile::Projectile (Weapon* weapon) : WorldEntity()
 {
   this->model = (Model*)ResourceManager::getInstance()->load("sphere", PRIM, RP_LEVEL);
+  this->weapon = weapon;
   this->flightDirection = NULL;
   this->currentLifeTime = 0.0f;
@@ -66 +68 @@
   Vector v(1, 0, 0);
   *this->flightDirection = flightDirection->apply(v);
+  this->flightDirection->normalize();
 }
 
@@ -86 +89 @@
 void Projectile::setSpeed(float speed)
 {
-  this->speed = speed;
+  this->speed = speed * 5;
   printf("Projectile::setting speed to: %f\n", this->speed);
 }
@@ -96 +99 @@
 void Projectile::tick (float time) 
 {
+  this->speed = this->weapon->getSpeed() * 5;  
+  this->shiftCoor(*this->flightDirection * this->speed * time);
+  printf("current speed is: %f\n", this->speed);
+
   this->currentLifeTime += time;
-  if( this->ttl < this->currentLifeTime)
-    {
-      *this->flightDirection = *this->flightDirection * this->speed * time;
-      this->shiftCoor(this->flightDirection);
-      this->flightDirection->debug();
-      return;
-    }
-  this->finalize();
-  //NullParent* np = NullParent::getInstance();
-  /* garbage colelction */
-  // \fix: there is no gc in this class, its all been done by GarbageCollector
+  if( this->ttl > this->currentLifeTime)
+    this->finalize();
 }
 

orxonox/trunk/src/world_entities/projectile.h

@@ -10 +10 @@
 
 class Vector;
+class Weapon;
 
 class Projectile : public WorldEntity 
@@ -16 +17 @@
 
  public:
-  Projectile ();
+  Projectile (Weapon* weapon);
   virtual ~Projectile ();
 
@@ -35 +36 @@
   float ttl;                           //!< time to life, after this time, the projectile will garbage collect itself
   Vector* flightDirection;             //!< direction in which the shoot flights
+  Weapon* weapon;                      //!< weapon the shoot belongs to
   
 };

orxonox/trunk/src/world_entities/test_gun.cc

@@ -41 +41 @@
 TestGun::TestGun (PNode* parent, Vector* coordinate, Quaternion* direction) 
   :  Weapon (parent, coordinate, direction) 
-{}
+{
+}
 
 
@@ -83 +84 @@
 {
   //printf("TestGun::fire() - firing weapon now ---------------------------\n");
-  Projectile* pj = new Projectile();
+  Projectile* pj = new Projectile(this);
 
   Vector* v = new Vector();
@@ -93 +94 @@
 
   pj->setFlightDirection(q);
-  //pj->setSpeed(this->getSpeed() * 0.025);
+  pj->setSpeed(this->getSpeed());