archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Killed MT_Scalar to float conversion warnings (should be

Browse Source 
explicit cast anyway).
This commit is contained in:
Daniel Dunbar
2003-03-18 23:20:10 +00:00
parent ccf7749594
commit f8f1591442
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/moto/include/MT_Matrix3x3.h
View File

@@ -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 {

10
intern/moto/include/MT_Matrix4x4.h
View File

@@ -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];
}
/**

2
intern/moto/include/MT_Tuple2.h
View File

@@ -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 {