Browse Source

More 'const', so that Rotate(vector) can be called on a const hsQuat&.

landing
Christian Walther 13 years ago
parent
commit
8e43df15b1
  1. 4
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsQuat.cpp
  2. 4
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsQuat.h

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsQuat.cpp

@ -65,14 +65,14 @@ hsQuat::hsQuat(hsScalar rad, const hsVector3* axis)
fZ = axis->fZ*s; fZ = axis->fZ*s;
} }
hsQuat hsQuat::Inverse() hsQuat hsQuat::Inverse() const
{ {
hsQuat q2 = Conjugate(); hsQuat q2 = Conjugate();
hsScalar msInv = 1.0f/q2.MagnitudeSquared(); hsScalar msInv = 1.0f/q2.MagnitudeSquared();
return (q2 * msInv); return (q2 * msInv);
} }
hsPoint3 hsQuat::Rotate(const hsScalarTriple* v) hsPoint3 hsQuat::Rotate(const hsScalarTriple* v) const
{ {
hsQuat qInv = Inverse(); hsQuat qInv = Inverse();
hsQuat qVec(v->fX, v->fY, v->fZ, 0); hsQuat qVec(v->fX, v->fY, v->fZ, 0);

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsQuat.h

@ -71,7 +71,7 @@ public:
{ fX = X; fY = Y; fZ = Z; fW = W; } { fX = X; fY = Y; fZ = Z; fW = W; }
void GetAngleAxis(hsScalar *rad, hsVector3 *axis) const; void GetAngleAxis(hsScalar *rad, hsVector3 *axis) const;
void SetAngleAxis(const hsScalar rad, const hsVector3 &axis); void SetAngleAxis(const hsScalar rad, const hsVector3 &axis);
hsPoint3 Rotate(const hsScalarTriple* v); hsPoint3 Rotate(const hsScalarTriple* v) const;
// Access operators // Access operators
hsScalar& operator[](int i) { return (&fX)[i]; } hsScalar& operator[](int i) { return (&fX)[i]; }
@ -94,7 +94,7 @@ public:
hsScalar MagnitudeSquared(); hsScalar MagnitudeSquared();
hsQuat Conjugate() const hsQuat Conjugate() const
{ return hsQuat(-fX,-fY,-fZ,fW); } { return hsQuat(-fX,-fY,-fZ,fW); }
hsQuat Inverse(); hsQuat Inverse() const;
// Binary operators // Binary operators
hsQuat operator-(const hsQuat&) const; hsQuat operator-(const hsQuat&) const;
hsQuat operator+(const hsQuat&) const; hsQuat operator+(const hsQuat&) const;

Loading…
Cancel
Save