kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: Do not use short int in Matrix4D

Browse Source 
As discussed in https://forum.freecad.org/viewtopic.php?t=65959
replace short with int.
This commit is contained in:
wmayer
2025-05-12 12:12:10 +02:00
committed by Ladislav Michl
parent f92d33944b
commit 2f736ded84
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Base/Matrix.cpp
View File

@@ -277,8 +277,8 @@ void Matrix4D::rotLine(const Vector3d& vec, double fAngle)
double fsin {};
// set all entries to "0"
for (short iz = 0; iz < 4; iz++) {
for (short is = 0; is < 4; is++) {
for (int iz = 0; iz < 4; iz++) {
for (int is = 0; is < 4; is++) {
clMA.dMtrx4D[iz][is] = 0;
clMB.dMtrx4D[iz][is] = 0;
clMC.dMtrx4D[iz][is] = 0;
@@ -313,8 +313,8 @@ void Matrix4D::rotLine(const Vector3d& vec, double fAngle)
clMC.dMtrx4D[2][0] = -fsin * clRotAxis.y;
clMC.dMtrx4D[2][1] = fsin * clRotAxis.x;
for (short iz = 0; iz < 3; iz++) {
for (short is = 0; is < 3; is++) {
for (int iz = 0; iz < 3; iz++) {
for (int is = 0; is < 3; is++) {
clMRot.dMtrx4D[iz][is] =
clMA.dMtrx4D[iz][is] + clMB.dMtrx4D[iz][is] + clMC.dMtrx4D[iz][is];
}
@@ -522,14 +522,14 @@ void Matrix4D::inverse()
/**** Herausnehmen und Inversion der TranslationsMatrix
aus der TransformationMatrix ****/
for (short iz = 0; iz < 3; iz++) {
for (int iz = 0; iz < 3; iz++) {
clInvTrlMat.dMtrx4D[iz][3] = -dMtrx4D[iz][3];
}
/**** Herausnehmen und Inversion der RotationsMatrix
aus der TransformationMatrix ****/
for (short iz = 0; iz < 3; iz++) {
for (short is = 0; is < 3; is++) {
for (int iz = 0; iz < 3; iz++) {
for (int is = 0; is < 3; is++) {
clInvRotMat.dMtrx4D[iz][is] = dMtrx4D[is][iz];
}
}
@@ -651,8 +651,8 @@ void Matrix4D::inverseGauss()
void Matrix4D::getMatrix(double dMtrx[16]) const
{
for (short iz = 0; iz < 4; iz++) {
for (short is = 0; is < 4; is++) {
for (int iz = 0; iz < 4; iz++) {
for (int is = 0; is < 4; is++) {
dMtrx[4 * iz + is] = dMtrx4D[iz][is];
}
}
@@ -660,8 +660,8 @@ void Matrix4D::getMatrix(double dMtrx[16]) const
void Matrix4D::setMatrix(const double dMtrx[16])
{
for (short iz = 0; iz < 4; iz++) {
for (short is = 0; is < 4; is++) {
for (int iz = 0; iz < 4; iz++) {
for (int is = 0; is < 4; is++) {
dMtrx4D[iz][is] = dMtrx[4 * iz + is];
}
}
@@ -669,8 +669,8 @@ void Matrix4D::setMatrix(const double dMtrx[16])
void Matrix4D::getGLMatrix(double dMtrx[16]) const
{
for (short iz = 0; iz < 4; iz++) {
for (short is = 0; is < 4; is++) {
for (int iz = 0; iz < 4; iz++) {
for (int is = 0; is < 4; is++) {
dMtrx[iz + 4 * is] = dMtrx4D[iz][is];
}
}
@@ -678,8 +678,8 @@ void Matrix4D::getGLMatrix(double dMtrx[16]) const
void Matrix4D::setGLMatrix(const double dMtrx[16])
{
for (short iz = 0; iz < 4; iz++) {
for (short is = 0; is < 4; is++) {
for (int iz = 0; iz < 4; iz++) {
for (int is = 0; is < 4; is++) {
dMtrx4D[iz][is] = dMtrx[iz + 4 * is];
}
}
@@ -693,7 +693,7 @@ unsigned long Matrix4D::getMemSpace()
void Matrix4D::Print() const
{
// NOLINTBEGIN
for (short i = 0; i < 4; i++) {
for (int i = 0; i < 4; i++) {
printf("%9.3f %9.3f %9.3f %9.3f\n",
dMtrx4D[i][0],
dMtrx4D[i][1],
@@ -788,8 +788,8 @@ std::string Matrix4D::analyse() const
trp.transpose();
trp = trp * sub;
bool ortho = true;
for (unsigned short i = 0; i < 4 && ortho; i++) {
for (unsigned short j = 0; j < 4 && ortho; j++) {
for (unsigned int i = 0; i < 4 && ortho; i++) {
for (unsigned int j = 0; j < 4 && ortho; j++) {
if (i != j) {
if (fabs(trp[i][j]) > eps) {
ortho = false;

32
src/Base/Matrix.h
View File

@@ -106,13 +106,13 @@ public:
/// Comparison
inline bool operator==(const Matrix4D& mat) const;
/// Index operator
inline double* operator[](unsigned short usNdx);
inline double* operator[](unsigned int usNdx);
/// Index operator
inline const double* operator[](unsigned short usNdx) const;
inline const double* operator[](unsigned int usNdx) const;
/// Get vector of row
inline Vector3d getRow(unsigned short usNdx) const;
inline Vector3d getRow(unsigned int usNdx) const;
/// Get vector of column
inline Vector3d getCol(unsigned short usNdx) const;
inline Vector3d getCol(unsigned int usNdx) const;
/// Get vector of diagonal
inline Vector3d diagonal() const;
/// Get trace of the 3x3 matrix
@@ -120,9 +120,9 @@ public:
/// Get trace of the 4x4 matrix
inline double trace() const;
/// Set row to vector
inline void setRow(unsigned short usNdx, const Vector3d& vec);
inline void setRow(unsigned int usNdx, const Vector3d& vec);
/// Set column to vector
inline void setCol(unsigned short usNdx, const Vector3d& vec);
inline void setCol(unsigned int usNdx, const Vector3d& vec);
/// Set diagonal to vector
inline void setDiagonal(const Vector3d& vec);
/// Compute the determinant of the matrix
@@ -380,8 +380,8 @@ inline void Matrix4D::multVec(const Vector3f& src, Vector3f& dst) const
inline Matrix4D Matrix4D::operator*(double scalar) const
{
Matrix4D matrix;
for (unsigned short i = 0; i < 4; i++) {
for (unsigned short j = 0; j < 4; j++) {
for (unsigned int i = 0; i < 4; i++) {
for (unsigned int j = 0; j < 4; j++) {
matrix.dMtrx4D[i][j] = dMtrx4D[i][j] * scalar;
}
}
@@ -392,8 +392,8 @@ inline Matrix4D Matrix4D::operator*(double scalar) const
inline Matrix4D& Matrix4D::operator*=(double scalar)
{
// NOLINTBEGIN
for (unsigned short i = 0; i < 4; i++) {
for (unsigned short j = 0; j < 4; j++) {
for (unsigned int i = 0; i < 4; i++) {
for (unsigned int j = 0; j < 4; j++) {
dMtrx4D[i][j] *= scalar;
}
}
@@ -425,22 +425,22 @@ inline Vector3f& operator*=(Vector3f& vec, const Matrix4D& mat)
return vec;
}
inline double* Matrix4D::operator[](unsigned short usNdx)
inline double* Matrix4D::operator[](unsigned int usNdx)
{
return dMtrx4D[usNdx];
}
inline const double* Matrix4D::operator[](unsigned short usNdx) const
inline const double* Matrix4D::operator[](unsigned int usNdx) const
{
return dMtrx4D[usNdx];
}
inline Vector3d Matrix4D::getRow(unsigned short usNdx) const
inline Vector3d Matrix4D::getRow(unsigned int usNdx) const
{
return Vector3d(dMtrx4D[usNdx][0], dMtrx4D[usNdx][1], dMtrx4D[usNdx][2]);
}
inline Vector3d Matrix4D::getCol(unsigned short usNdx) const
inline Vector3d Matrix4D::getCol(unsigned int usNdx) const
{
return Vector3d(dMtrx4D[0][usNdx], dMtrx4D[1][usNdx], dMtrx4D[2][usNdx]);
}
@@ -460,14 +460,14 @@ inline double Matrix4D::trace() const
return dMtrx4D[0][0] + dMtrx4D[1][1] + dMtrx4D[2][2] + dMtrx4D[3][3];
}
inline void Matrix4D::setRow(unsigned short usNdx, const Vector3d& vec)
inline void Matrix4D::setRow(unsigned int usNdx, const Vector3d& vec)
{
dMtrx4D[usNdx][0] = vec.x;
dMtrx4D[usNdx][1] = vec.y;
dMtrx4D[usNdx][2] = vec.z;
}
inline void Matrix4D::setCol(unsigned short usNdx, const Vector3d& vec)
inline void Matrix4D::setCol(unsigned int usNdx, const Vector3d& vec)
{
dMtrx4D[0][usNdx] = vec.x;
dMtrx4D[1][usNdx] = vec.y;