summaryrefslogtreecommitdiffstats
path: root/src/math/conv.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-06-26 22:23:05 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-06-26 22:23:05 +0200
commitebed57aa22b772211387a5561f995eee8f5faed1 (patch)
tree9a0b08371df54c125957e63c7ecff81c001d4eaf /src/math/conv.h
parentfc5389d18816799ba2698914384cd099ba8a7a6c (diff)
downloadcolobot-ebed57aa22b772211387a5561f995eee8f5faed1.tar.gz
colobot-ebed57aa22b772211387a5561f995eee8f5faed1.tar.bz2
colobot-ebed57aa22b772211387a5561f995eee8f5faed1.zip
Whitespace and language change
- changed tabs to spaces and DOS line endings to Unix (except in CBot and metafile) - changed language to English - fixed #include <d3d.h> in d3dengine.h
Diffstat (limited to 'src/math/conv.h')
-rw-r--r--src/math/conv.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/math/conv.h b/src/math/conv.h
index bb6700b..43e6fbd 100644
--- a/src/math/conv.h
+++ b/src/math/conv.h
@@ -11,29 +11,29 @@
inline D3DVECTOR VEC_TO_D3DVEC(Math::Vector vec)
{
- return D3DVECTOR(vec.x, vec.y, vec.z);
+ 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);
+ 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;
+ 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;
+ Math::Matrix result(mat.m);
+ result.Transpose();
+ return result;
}