flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed round and renamed length in vector / matrix

Browse Source
This commit is contained in:
Klaus Basan
2013-05-01 00:00:03 +02:00
parent ad6ac0186b
commit 837809b96d
6 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/blackmisc/mathvector3dbase.h
View File

@@ -65,7 +65,7 @@ protected:
* \brief Easy access to derived class (CRTP template parameter)
* \return
*/
ImplVector const* derived() const
ImplVector const *derived() const
{
return static_cast<ImplVector const *>(this);
}
@@ -74,7 +74,7 @@ protected:
* \brief Easy access to derived class (CRTP template parameter)
* \return
*/
ImplVector* derived()
ImplVector *derived()
{
return static_cast<ImplVector *>(this);
}
@@ -378,24 +378,6 @@ public:
return v;
}
/*!
* \brief Length
* \return
*/
double length()const
{
return this->m_i + this->m_j + this->m_k;
}
/*!
* \brief Length squared
* \return
*/
double lengthSquared()const
{
return this->m_i * this->m_i + this->m_j * this->m_j + this->m_k * this->m_k;
}
/*!
* \brief Converted to matrix
* \return
@@ -403,25 +385,34 @@ public:
CMatrix3x1 toMatrix3x1() const;
/*!
* \brief Magnitude
* \brief length / magnitude
* \return
*/
double magnitude() const
double length() const
{
return sqrt(this->lengthSquared());
return sqrt(this->m_i * this->m_i + this->m_j * this->m_j + this->m_k * this->m_k);
}
/*!
* \brief Round this vector
* \return
*/
ImplVector &round()
void round()
{
const double epsilon = 1E-10;
this->m_i = BlackMisc::Math::CMath::roundEpsilon(this->m_i, epsilon);
this->m_j = BlackMisc::Math::CMath::roundEpsilon(this->m_j, epsilon);
this->m_k = BlackMisc::Math::CMath::roundEpsilon(this->m_k, epsilon);
return *derived();
}
/*!
* \brief Rounded vector
* \return
*/
ImplVector roundedVector() const
{
ImplVector v = *derived();
v.round();
return v;
}
};