diff options
| author | aap <aap@papnet.eu> | 2019-07-10 17:18:26 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-07-10 17:18:26 +0200 |
| commit | 4a36d64f15f898854bb8a76be86ac9a8c536b291 (patch) | |
| tree | 2ff1344fb2f1e9859ba15cd56c461d40683359f9 /src/math/Matrix.h | |
| parent | Merge pull request #128 from erorcun/erorcun (diff) | |
| download | re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.gz re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.bz2 re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.lz re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.xz re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.zst re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.zip | |
Diffstat (limited to 'src/math/Matrix.h')
| -rw-r--r-- | src/math/Matrix.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/math/Matrix.h b/src/math/Matrix.h index b7d6c207..2c0108c1 100644 --- a/src/math/Matrix.h +++ b/src/math/Matrix.h @@ -127,8 +127,8 @@ public: } void SetRotateXOnly(float angle){ - float c = cos(angle); - float s = sin(angle); + float c = Cos(angle); + float s = Sin(angle); m_matrix.right.x = 1.0f; m_matrix.right.y = 0.0f; @@ -149,8 +149,8 @@ public: m_matrix.pos.z = 0.0f; } void SetRotateYOnly(float angle){ - float c = cos(angle); - float s = sin(angle); + float c = Cos(angle); + float s = Sin(angle); m_matrix.right.x = c; m_matrix.right.y = 0.0f; @@ -171,8 +171,8 @@ public: m_matrix.pos.z = 0.0f; } void SetRotateZOnly(float angle){ - float c = cos(angle); - float s = sin(angle); + float c = Cos(angle); + float s = Sin(angle); m_matrix.right.x = c; m_matrix.right.y = s; @@ -193,12 +193,12 @@ public: m_matrix.pos.z = 0.0f; } void SetRotate(float xAngle, float yAngle, float zAngle) { - float cX = cos(xAngle); - float sX = sin(xAngle); - float cY = cos(yAngle); - float sY = sin(yAngle); - float cZ = cos(zAngle); - float sZ = sin(zAngle); + float cX = Cos(xAngle); + float sX = Sin(xAngle); + float cY = Cos(yAngle); + float sY = Sin(yAngle); + float cZ = Cos(zAngle); + float sZ = Sin(zAngle); m_matrix.right.x = cZ * cY - (sZ * sX) * sY; m_matrix.right.y = (cZ * sX) * sY + sZ * cY; |