Changeset 8145 in orxonox.OLD for trunk/src/lib/math

Timestamp:

Jun 5, 2006, 11:49:26 AM (18 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

Location:

trunk/src/lib/math

Files:

• rect2D.cc (modified) (1 diff)
• vector.h (modified) (1 diff)

trunk/src/lib/math/rect2D.cc

@@ -36 +36 @@
 Rect2D::Rect2D(float x, float y, float width, float height)
 {
-  this->setLeft(x), this->setTop(y);
+  this->setLeft(x),
+  this->setTop(y);
   this->setSize(width, height);
 }

trunk/src/lib/math/vector.h

@@ -79 +79 @@
   inline const Vector& operator= (const Vector& v) { this->x = v.x; this->y = v.y; this->z = v.z; return *this; };
   /** copy constructor* @param v the sVec3D to assign to this vector. @returns the vector v */
-  inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }
-  inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }
+  inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
+  inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
   /** @param v: the other vector \return the dot product of the vectors */
   float dot (const Vector& v) const { return x*v.x+y*v.y+z*v.z; };