preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-05 02:35:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #248 from unknownbrackets/matrix

Browse Source 
Add methods to translate and scale matrices in one go
This commit is contained in:
Henrik Rydgård committed 2014-12-20 10:25:01 +01:00
2 parents d942ab2d47 c3538f46dc
commit 64de93e8be
1 file changed
+25
Download Patch File Download Diff File Expand all files Collapse all files
math/lin/matrix4x4.h
+25
View File
@@ -73,6 +73,13 @@ public:
wy = trans.y;
wz = trans.z;
}
void setTranslationAndScaling(const Vec3 &trans, const Vec3 &scale) {
setScaling(scale);
wx = trans.x;
wy = trans.y;
wz = trans.z;
}
Matrix4x4 inverse() const;
Matrix4x4 simpleInverse() const;
Matrix4x4 transpose() const;
@@ -141,6 +148,24 @@ public:
void toText(char *buffer, int len) const;
void print() const;
static Matrix4x4 fromPRS(const Vec3 &position, const Quaternion &normal, const Vec3 &scale);
void translateAndScale(const Vec3 &trans, const Vec3 &scale) {
xx = xx * scale.x + xw * trans.x;
xy = xy * scale.y + xw * trans.y;
xz = xz * scale.z + xw * trans.z;
yx = yx * scale.x + yw * trans.x;
yy = yy * scale.y + yw * trans.y;
yz = yz * scale.z + yw * trans.z;
zx = zx * scale.x + zw * trans.x;
zy = zy * scale.y + zw * trans.y;
zz = zz * scale.z + zw * trans.z;
wx = wx * scale.x + ww * trans.x;
wy = wy * scale.y + ww * trans.y;
wz = wz * scale.z + ww * trans.z;
}
};
#endif // _MATH_LIN_MATRIX4X4_H