diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 22:53:06 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 22:53:06 +0200 |
commit | 7479f486b671acb2a6aea2c84a56b383aaba00ca (patch) | |
tree | 4043545a14234dfaa2d7d08d59c7ee9ee97f0de9 /src/math/conv.h | |
parent | 901f10b2bac18a2063cd21798f22b3917e8519b5 (diff) | |
parent | 57d33d79ea570773d84ad81d4a61f50e079979ef (diff) | |
download | colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.tar.gz colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.tar.bz2 colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.zip |
Forgotten fix in dev-graphics
Diffstat (limited to 'src/math/conv.h')
-rw-r--r-- | src/math/conv.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/src/math/conv.h b/src/math/conv.h deleted file mode 100644 index 43e6fbd..0000000 --- a/src/math/conv.h +++ /dev/null @@ -1,39 +0,0 @@ -/* math/conv.h - - Temporary conversion functions for D3DVECTOR and D3DMATRIX */ - -#pragma once - -#include <d3d.h> - -#include "vector.h" -#include "matrix.h" - -inline D3DVECTOR VEC_TO_D3DVEC(Math::Vector vec) -{ - return D3DVECTOR(vec.x, vec.y, vec.z); -} - -inline Math::Vector D3DVEC_TO_VEC(D3DVECTOR vec) -{ - return Math::Vector(vec.x, vec.y, vec.z); -} - -inline D3DMATRIX MAT_TO_D3DMAT(Math::Matrix mat) -{ - D3DMATRIX result; - mat.Transpose(); - for (int r = 0; r < 4; ++r) - { - for (int c = 0; c < 16; ++c) - result.m[r][c] = mat.m[4*c+r]; - } - return result; -} - -inline Math::Matrix D3DMAT_TO_MAT(D3DMATRIX mat) -{ - Math::Matrix result(mat.m); - result.Transpose(); - return result; -} |