Changeset 3958 in orxonox.OLD

Timestamp:

Apr 25, 2005, 2:49:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: some more functionality to the vectors-class

Location:

orxonox/branches/particleEngine/src/lib

Files:

• coord/p_node.h (modified) (1 diff)
• graphics/particles/particle_emitter.cc (modified) (1 diff)
• math/vector.cc (modified) (1 diff)
• math/vector.h (modified) (2 diffs)

orxonox/branches/particleEngine/src/lib/coord/p_node.h

@@ -57 +57 @@
 
 
-  inline Vector getRelCoor () const { return this->relCoordinate; }
+  inline const Vector& getRelCoor () const { return this->relCoordinate; }
   void setRelCoor (const Vector& relCoord);
-  inline Vector getAbsCoor () const { return this->absCoordinate; }
+  inline const Vector& getAbsCoor () const { return this->absCoordinate; }
   void setAbsCoor (const Vector& absCoord);
   void shiftCoor (const Vector& shift);
 
-  inline Quaternion getRelDir () const { return this->relDirection; }
+  inline const Quaternion& getRelDir () const { return this->relDirection; }
   void setRelDir (const Quaternion& relDir);
-  inline Quaternion getAbsDir () const { return this->absDirection; }
+  inline const Quaternion& getAbsDir () const { return this->absDirection; }
   void setAbsDir (const Quaternion& absDir);
   void shiftDir (const Quaternion& shift);

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_emitter.cc

@@ -134 +134 @@
         randDir.normalize();
         randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir)).apply(this->direction);
-        randDir = *randDir.getNormalized()*velocity + (this->getVelocity() * system->inheritSpeed);
+        randDir = randDir.getNormalized()*velocity + (this->getVelocity() * system->inheritSpeed);
 
         system->addParticle(this->getAbsCoor(), randDir);

orxonox/branches/particleEngine/src/lib/math/vector.cc

@@ -100 +100 @@
 */
 
-Vector* Vector::getNormalized()
+const Vector Vector::getNormalized()
 {
   float l = len();
   if(unlikely(l != 1.0))
     {
-      return this;
+      return *this;
     }
   else if(unlikely(l == 0.0))
     {
-      return 0;
+      return Vector();
     }
 
-  return new Vector(x / l, y /l, z / l);
+  return Vector(x / l, y /l, z / l);
 }
 

orxonox/branches/particleEngine/src/lib/math/vector.h

@@ -31 +31 @@
 
   inline Vector operator+ (const Vector& v) const { return Vector(x + v.x, y + v.y, z + v.z); }
+  inline const Vector operator+= (const Vector& v) {this->x += v.x; this->y += v.y; this->z += v.z; return *this;}
   inline Vector operator- (const Vector& v) const { return Vector(x - v.x, y - v.y, z - v.z); }
+  inline const Vector operator-= (const Vector& v) {this->x -= v.x; this->y -= v.y; this->z -= v.z; return *this;}
   inline float operator* (const Vector& v) const { return x * v.x + y * v.y + z * v.z; }
+  inline const Vector operator*= (const Vector& v) {this->x *= v.x; this->y *= v.y; this->z *= v.z; return *this;}
   inline Vector operator* (float f) const { return Vector(x * f, y * f, z * f); }
+  inline const Vector operator*= (float f) {this->x *= f; this->y *= f; this->z *= f; return *this;}
   Vector operator/ (float f) const;
+  inline const Vector operator/= (float f) {this->x /= f; this->y /= f; this->z /= f; return *this;}
   float dot (const Vector& v) const;
-  inline Vector cross (const Vector& v) const {  return Vector(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x ); }
+  inline Vector cross (const Vector& v) const { return Vector(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x ); }
   void scale(const Vector& v);
   inline float len() const { return sqrt (x*x+y*y+z*z); }
@@ -50 +55 @@
                       z = z / l; 
                     }
-  Vector* getNormalized();
+  const Vector getNormalized();
   Vector abs();