FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Ulrich Hertlein, Fix for MatrixTemplate compile errors

Browse Source
This commit is contained in:
Robert Osfield
2012-04-06 10:42:17 +00:00
parent 5e315d5fab
commit 95cac0b549
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/Uniform
View File

@@ -219,7 +219,7 @@ class Matrix3Template : public MatrixTemplate<T, 3, 3>
public:
Matrix3Template() { base_class::reset(); }
Matrix3Template( const Matrix3Template& mat ) { set(mat.ptr()); }
Matrix3Template( const Matrix3Template& mat ) { base_class::set(mat.ptr()); }
Matrix3Template( value_type a00, value_type a10, value_type a20,
value_type a01, value_type a11, value_type a21,
value_type a02, value_type a12, value_type a22 )

32
src/osg/Uniform.cpp
View File

@@ -2146,7 +2146,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2& m2 ) const
{
if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT2) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m2.MatrixTemplate::set( &((*_floatArray)[j]) );
m2.base_class::set( &((*_floatArray)[j]) );
return true;
}
@@ -2154,7 +2154,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3& m3 ) const
{
if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT3) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m3.MatrixTemplate::set( &((*_floatArray)[j]) );
m3.base_class::set( &((*_floatArray)[j]) );
return true;
}
@@ -2170,7 +2170,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2x3& m2x3 ) const
{
if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT2x3) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m2x3.MatrixTemplate::set( &((*_floatArray)[j]) );
m2x3.base_class::set( &((*_floatArray)[j]) );
return true;
}
@@ -2178,7 +2178,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2x4& m2x4 ) const
{
if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT2x4) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m2x4.MatrixTemplate::set( &((*_floatArray)[j]) );
m2x4.base_class::set( &((*_floatArray)[j]) );
return true;
}
@@ -2186,7 +2186,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3x2& m3x2 ) const
{
if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT3x2) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m3x2.MatrixTemplate::set( &((*_floatArray)[j]) );
m3x2.base_class::set( &((*_floatArray)[j]) );
return true;
}
@@ -2194,7 +2194,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3x4& m3x4 ) const
{
if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT3x4) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m3x4.MatrixTemplate::set( &((*_floatArray)[j]) );
m3x4.base_class::set( &((*_floatArray)[j]) );
return true;
}
@@ -2202,7 +2202,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix4x2& m4x2 ) const
{
if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT4x2) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m4x2.MatrixTemplate::set( &((*_floatArray)[j]) );
m4x2.base_class::set( &((*_floatArray)[j]) );
return true;
}
@@ -2210,7 +2210,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix4x3& m4x3 ) const
{
if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT4x3) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m4x3.MatrixTemplate::set( &((*_floatArray)[j]) );
m4x3.base_class::set( &((*_floatArray)[j]) );
return true;
}
@@ -2256,7 +2256,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2d& m2 ) const
{
if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT2) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m2.MatrixTemplate::set( &((*_doubleArray)[j]) );
m2.base_class::set( &((*_doubleArray)[j]) );
return true;
}
@@ -2264,7 +2264,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3d& m3 ) const
{
if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT3) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m3.MatrixTemplate::set( &((*_doubleArray)[j]) );
m3.base_class::set( &((*_doubleArray)[j]) );
return true;
}
@@ -2284,7 +2284,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2x3d& m2x3 ) const
{
if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT2x3) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m2x3.MatrixTemplate::set( &((*_doubleArray)[j]) );
m2x3.base_class::set( &((*_doubleArray)[j]) );
return true;
}
@@ -2292,7 +2292,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2x4d& m2x4 ) const
{
if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT2x4) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m2x4.MatrixTemplate::set( &((*_doubleArray)[j]) );
m2x4.base_class::set( &((*_doubleArray)[j]) );
return true;
}
@@ -2300,7 +2300,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3x2d& m3x2 ) const
{
if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT3x2) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m3x2.MatrixTemplate::set( &((*_doubleArray)[j]) );
m3x2.base_class::set( &((*_doubleArray)[j]) );
return true;
}
@@ -2308,7 +2308,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3x4d& m3x4 ) const
{
if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT3x4) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m3x4.MatrixTemplate::set( &((*_doubleArray)[j]) );
m3x4.base_class::set( &((*_doubleArray)[j]) );
return true;
}
@@ -2316,7 +2316,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix4x2d& m4x2 ) const
{
if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT4x2) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m4x2.MatrixTemplate::set( &((*_doubleArray)[j]) );
m4x2.base_class::set( &((*_doubleArray)[j]) );
return true;
}
@@ -2324,7 +2324,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix4x3d& m4x3 ) const
{
if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT4x3) ) return false;
unsigned int j = index * getTypeNumComponents(getType());
m4x3.MatrixTemplate::set( &((*_doubleArray)[j]) );
m4x3.base_class::set( &((*_doubleArray)[j]) );
return true;
}