Changeset 4966 in orxonox.OLD for orxonox/trunk/src/lib/math
- Timestamp:
- Jul 28, 2005, 5:53:15 PM (19 years ago)
- Location:
- orxonox/trunk/src/lib/math
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/math/vector.cc
r4836 r4966 29 29 /** 30 30 * returns the this-vector normalized to length 1.0 31 * @todo there is some error in this function, that i could not resolve. it just does not, what it is supposed to do. 31 32 */ 32 33 Vector Vector::getNormalized() const 33 34 { 34 float l = len(); 35 if(unlikely(l != 1.0)) 36 { 37 return *this; 38 } 39 else if(unlikely(l == 0.0)) 40 { 41 return *this; 42 } 43 44 return *this / l; 35 float l = this->len(); 36 if(unlikely(l == 1.0 || l == 0.0)) 37 return *this; 38 else 39 return (*this / l); 45 40 } 46 41 -
orxonox/trunk/src/lib/math/vector.h
r4897 r4966 54 54 inline const Vector& operator*= (float f) { this->x *= f; this->y *= f; this->z *= f; return *this; }; 55 55 /** @param f a factor to divide the vector with @returns the vector divided by f (this / f) */ 56 inline Vector operator/ (float f) const { if (unlikely(f == 0.0)) return Vector(0,0,0); else returnVector(this->x / f, this->y / f, this->z / f); };56 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); }; 57 57 /** @param f a factor to divide the vector with @returns the vector divided by f (this /= f) */ 58 58 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; };
Note: See TracChangeset
for help on using the changeset viewer.