Changeset 4966 in orxonox.OLD for orxonox

Timestamp:

Jul 28, 2005, 5:53:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Turret is fixed onto the ship as it should.
TestGun fires staight again
PNode now know getParent(), as this is a quite usefull function
Vector still has an error in the getNormalized function, and i am not able to determine the cause of this

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.h (modified) (1 diff)
• lib/math/vector.cc (modified) (1 diff)
• lib/math/vector.h (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)

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

@@ -97 +97 @@
   void setParent (PNode* parent);
   void setParent (const char* name);
+  /** @returns the parent of this PNode */
+  PNode* getParent () const { return this->parent; };
 
   void setParentMode (PARENT_MODE parentMode);

orxonox/trunk/src/lib/math/vector.cc

@@ -29 +29 @@
 /**
  *  returns the this-vector normalized to length 1.0
+ * @todo there is some error in this function, that i could not resolve. it just does not, what it is supposed to do.
 */
 Vector Vector::getNormalized() const
 {
-  float l = len();
-  if(unlikely(l != 1.0))
-    {
-      return *this;
-    }
-  else if(unlikely(l == 0.0))
-    {
-      return *this;
-    }
-
-  return *this / l;
+  float l = this->len();
+  if(unlikely(l == 1.0 || l == 0.0))
+    return *this;
+  else
+    return (*this / l);
 }
 

orxonox/trunk/src/lib/math/vector.h

@@ -54 +54 @@
   inline const Vector& operator*= (float f) { this->x *= f; this->y *= f; this->z *= f; return *this; };
   /** @param f a factor to divide the vector with @returns the vector divided by f (this / f) */
-  inline Vector operator/ (float f) const {if (unlikely(f == 0.0)) return Vector(0,0,0); else return Vector(this->x / f, this->y / f, this->z / f); };
+  inline Vector operator/ (float f) const {return (unlikely(f == 0.0))?Vector(0,0,0):Vector(this->x / f, this->y / f, this->z / f); };
   /** @param f a factor to divide the vector with @returns the vector divided by f (this /= f) */
   inline const Vector& operator/= (float f) {if (unlikely(f == 0.0)) {this->x=0;this->y=0;this->z=0;} else {this->x /= f; this->y /= f; this->z /= f;} return *this; };

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -160 +160 @@
   Projectile* pj =  dynamic_cast<Projectile*>(this->getProjectileFactory()->resurrect());
 
+/*
   PNode* target = this->getWeaponManager()->getFixedTarget();
-
   if (target != NULL)
   {
     pj->setVelocity(this->getVelocity()+(target->getAbsCoor() - this->getAbsCoor())*.5);//this->getVelocity());
   }
-  else
-    pj->setVelocity(target->getVelocity());
-
+  else*/
+  pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*20);
 
   pj->setAbsCoor(this->getEmissionPoint());

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -93 +93 @@
   Vector direction = this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
   direction.normalize();
-  Quaternion quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+  Quaternion quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
 
   this->setAbsDir(quat);