From f8f1591442ce852494e9ee56f09320b35b84b199 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 18 Mar 2003 23:20:10 +0000 Subject: Killed MT_Scalar to float conversion warnings (should be explicit cast anyway). --- intern/moto/include/MT_Matrix3x3.h | 6 +++--- intern/moto/include/MT_Matrix4x4.h | 10 +++++----- intern/moto/include/MT_Tuple2.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'intern/moto') diff --git a/intern/moto/include/MT_Matrix3x3.h b/intern/moto/include/MT_Matrix3x3.h index c9597630ed1..712d48b8a64 100755 --- a/intern/moto/include/MT_Matrix3x3.h +++ b/intern/moto/include/MT_Matrix3x3.h @@ -157,9 +157,9 @@ public: } void getValue(float *m) const { - *m++ = m_el[0][0]; *m++ = m_el[1][0]; *m++ = m_el[2][0]; *m++ = 0.0; - *m++ = m_el[0][1]; *m++ = m_el[1][1]; *m++ = m_el[2][1]; *m++ = 0.0; - *m++ = m_el[0][2]; *m++ = m_el[1][2]; *m++ = m_el[2][2]; *m = 0.0; + *m++ = (float) m_el[0][0]; *m++ = (float) m_el[1][0]; *m++ = (float) m_el[2][0]; *m++ = (float) 0.0; + *m++ = (float) m_el[0][1]; *m++ = (float) m_el[1][1]; *m++ = (float) m_el[2][1]; *m++ = (float) 0.0; + *m++ = (float) m_el[0][2]; *m++ = (float) m_el[1][2]; *m++ = (float) m_el[2][2]; *m = (float) 0.0; } void getValue(double *m) const { diff --git a/intern/moto/include/MT_Matrix4x4.h b/intern/moto/include/MT_Matrix4x4.h index b4f271000dd..fc930055524 100755 --- a/intern/moto/include/MT_Matrix4x4.h +++ b/intern/moto/include/MT_Matrix4x4.h @@ -167,17 +167,17 @@ public: * Read the element from row i, column j. */ float getElement(int i, int j) { - return m_el[i][j]; + return (float) m_el[i][j]; } /** * Copy the contents to a contiguous block of 16 floats. */ void getValue(float *m) const { - *m++ = m_el[0][0]; *m++ = m_el[1][0]; *m++ = m_el[2][0]; *m++ = m_el[3][0]; - *m++ = m_el[0][1]; *m++ = m_el[1][1]; *m++ = m_el[2][1]; *m++ = m_el[3][1]; - *m++ = m_el[0][2]; *m++ = m_el[1][2]; *m++ = m_el[2][2]; *m++ = m_el[3][2]; - *m++ = m_el[0][3]; *m++ = m_el[1][3]; *m++ = m_el[2][3]; *m = m_el[3][3]; + *m++ = (float) m_el[0][0]; *m++ = (float) m_el[1][0]; *m++ = (float) m_el[2][0]; *m++ = (float) m_el[3][0]; + *m++ = (float) m_el[0][1]; *m++ = (float) m_el[1][1]; *m++ = (float) m_el[2][1]; *m++ = (float) m_el[3][1]; + *m++ = (float) m_el[0][2]; *m++ = (float) m_el[1][2]; *m++ = (float) m_el[2][2]; *m++ = (float) m_el[3][2]; + *m++ = (float) m_el[0][3]; *m++ = (float) m_el[1][3]; *m++ = (float) m_el[2][3]; *m = (float) m_el[3][3]; } /** diff --git a/intern/moto/include/MT_Tuple2.h b/intern/moto/include/MT_Tuple2.h index bb2ec67dc44..84280bec50a 100755 --- a/intern/moto/include/MT_Tuple2.h +++ b/intern/moto/include/MT_Tuple2.h @@ -75,7 +75,7 @@ public: const MT_Scalar *getValue() const { return m_co; } void getValue(float *vv) const { - vv[0] = m_co[0]; vv[1] = m_co[1]; + vv[0] = (float) m_co[0]; vv[1] = (float) m_co[1]; } void getValue(double *vv) const { -- cgit v1.2.3