Changeset 3818 in orxonox.OLD for orxonox/trunk
- Timestamp:
- Apr 14, 2005, 12:12:01 AM (20 years ago)
- Location:
- orxonox/trunk/src/lib/math
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/math/vector.cc
r3817 r3818 32 32 \return the sum of both vectors 33 33 */ 34 /* 35 Vector Vector::operator+ (const Vector& v) const 36 { 37 return Vector(x + v.x, y + v.y, z + v.z); 38 } 39 */ 34 35 //Vector Vector::operator+ (const Vector& v) const 36 40 37 41 38 /** … … 44 41 \return the difference between the vectors 45 42 */ 46 /* 47 Vector Vector::operator- (const Vector& v) const 48 { 49 return Vector(x - v.x, y - v.y, z - v.z); 50 } 51 */ 43 //Vector Vector::operator- (const Vector& v) const 44 52 45 53 46 /** … … 56 49 \return the dot product of the vectors 57 50 */ 58 /* 59 float Vector::operator* (const Vector& v) const 60 { 61 return x * v.x + y * v.y+ z * v.z; 62 } 63 */ 51 //float Vector::operator* (const Vector& v) const 52 64 53 65 54 /** … … 68 57 \return the vector multipied by f 69 58 */ 70 Vector Vector::operator* (float f) const 71 { 72 return Vector(x * f, y * f, z * f); 73 } 59 //Vector Vector::operator* (float f) const 60 74 61 75 62 /** -
orxonox/trunk/src/lib/math/vector.h
r3817 r3818 32 32 Vector operator- (const Vector& v) const { return Vector(x - v.x, y - v.y, z - v.z); } 33 33 float operator* (const Vector& v) const { return x * v.x + y * v.y + z * v.z; } 34 Vector operator* (float f) const ;34 Vector operator* (float f) const { return Vector(x * f, y * f, z * f); } 35 35 Vector operator/ (float f) const; 36 36 float dot (const Vector& v) const;
Note: See TracChangeset
for help on using the changeset viewer.
