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

Added using base_class::set to the Matrix*Template class to enable the set() method from the base class to be used.

Browse Source
This commit is contained in:
Robert Osfield
2012-04-27 09:43:25 +00:00
parent b86c87d1a8
commit d32160abde
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/osg/Uniform
View File

@@ -132,6 +132,8 @@ class Matrix2Template : public MatrixTemplate<T, 2, 2>
}
~Matrix2Template() {}
using base_class::set;
void set(value_type a00, value_type a01,
value_type a10, value_type a11 )
{
@@ -165,6 +167,8 @@ class Matrix2x3Template : public MatrixTemplate<T, 2, 3>
}
~Matrix2x3Template() {}
using base_class::set;
void set( value_type a00, value_type a01, value_type a02,
value_type a10, value_type a11, value_type a12 )
{
@@ -192,6 +196,8 @@ class Matrix2x4Template : public MatrixTemplate<T, 2, 4>
}
~Matrix2x4Template() {}
using base_class::set;
void set( value_type a00, value_type a01, value_type a02, value_type a03,
value_type a10, value_type a11, value_type a12, value_type a13 )
{
@@ -220,6 +226,8 @@ class Matrix3x2Template : public MatrixTemplate<T, 3, 2>
}
~Matrix3x2Template() {}
using base_class::set;
void set( value_type a00, value_type a01,
value_type a10, value_type a11,
value_type a20, value_type a21 )
@@ -250,6 +258,8 @@ class Matrix3Template : public MatrixTemplate<T, 3, 3>
}
~Matrix3Template() {}
using base_class::set;
void set( value_type a00, value_type a01, value_type a02,
value_type a10, value_type a11, value_type a12,
value_type a20, value_type a21, value_type a22 )
@@ -287,6 +297,8 @@ class Matrix3x4Template : public MatrixTemplate<T, 3, 4>
}
~Matrix3x4Template() {}
using base_class::set;
void set( value_type a00, value_type a01, value_type a02, value_type a03,
value_type a10, value_type a11, value_type a12, value_type a13,
value_type a20, value_type a21, value_type a22, value_type a23 )
@@ -319,6 +331,8 @@ class Matrix4x2Template : public MatrixTemplate<T, 4, 2>
}
~Matrix4x2Template() {}
using base_class::set;
void set( value_type a00, value_type a01,
value_type a10, value_type a11,
value_type a20, value_type a21,
@@ -353,6 +367,8 @@ class Matrix4x3Template : public MatrixTemplate<T, 4, 3>
}
~Matrix4x3Template() {}
using base_class::set;
void set( value_type a00, value_type a01, value_type a02,
value_type a10, value_type a11, value_type a12,
value_type a20, value_type a21, value_type a22,