mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-01-16 21:08:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix sim build

Browse Source
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2025-01-05 10:15:30 +02:00
parent bf0e36858e
commit ca866bdb2a
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/math/Matrix.cpp
View File

@ -404,6 +404,7 @@ CMatrix::Rotate(float x, float y, float z)
float z2 = sZ * sY - (cZ * sX) * cY; float z2 = sZ * sY - (cZ * sX) * cY;
float z3 = cX * cY; float z3 = cX * cY;
#if !defined(DC_TEXCONV) && !defined(DC_SIM)
this->rx = fipr(x1, y1, z1, 0, rx, ry, rz, 0); this->rx = fipr(x1, y1, z1, 0, rx, ry, rz, 0);
this->ry = fipr(x2, y2, z2, 0, rx, ry, rz, 0); this->ry = fipr(x2, y2, z2, 0, rx, ry, rz, 0);
this->rz = fipr(x3, y3, z3, 0, rx, ry, rz, 0); this->rz = fipr(x3, y3, z3, 0, rx, ry, rz, 0);
@ -416,19 +417,20 @@ CMatrix::Rotate(float x, float y, float z)
this->px = fipr(x1, y1, z1, 0, px, py, pz, 0); this->px = fipr(x1, y1, z1, 0, px, py, pz, 0);
this->py = fipr(x2, y2, z2, 0, px, py, pz, 0); this->py = fipr(x2, y2, z2, 0, px, py, pz, 0);
this->pz = fipr(x3, y3, z3, 0, px, py, pz, 0); this->pz = fipr(x3, y3, z3, 0, px, py, pz, 0);
#else
// this->rx = x1 * rx + y1 * ry + z1 * rz; this->rx = x1 * rx + y1 * ry + z1 * rz;
// this->ry = x2 * rx + y2 * ry + z2 * rz; this->ry = x2 * rx + y2 * ry + z2 * rz;
// this->rz = x3 * rx + y3 * ry + z3 * rz; this->rz = x3 * rx + y3 * ry + z3 * rz;
// this->fx = x1 * ux + y1 * uy + z1 * uz; this->fx = x1 * ux + y1 * uy + z1 * uz;
// this->fy = x2 * ux + y2 * uy + z2 * uz; this->fy = x2 * ux + y2 * uy + z2 * uz;
// this->fz = x3 * ux + y3 * uy + z3 * uz; this->fz = x3 * ux + y3 * uy + z3 * uz;
// this->ux = x1 * ax + y1 * ay + z1 * az; this->ux = x1 * ax + y1 * ay + z1 * az;
// this->uy = x2 * ax + y2 * ay + z2 * az; this->uy = x2 * ax + y2 * ay + z2 * az;
// this->uz = x3 * ax + y3 * ay + z3 * az; this->uz = x3 * ax + y3 * ay + z3 * az;
// this->px = x1 * px + y1 * py + z1 * pz; this->px = x1 * px + y1 * py + z1 * pz;
// this->py = x2 * px + y2 * py + z2 * pz; this->py = x2 * px + y2 * py + z2 * pz;
// this->pz = x3 * px + y3 * py + z3 * pz; this->pz = x3 * px + y3 * py + z3 * pz;
#endif
#endif #endif
} }