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

*** empty log message ***

Browse Source
This commit is contained in:
Robert Osfield 2001-09-28 16:56:19 +00:00
parent 57fd2b4bcb
commit 12f77f141e
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,6 +1,11 @@
OSG Change log OSG Change log
============== ==============
o Made spelling corrections in include/osgDB,osgUtil,osgGLUT,osgWX,
spelling mistakes picked up by a script written by Neil Salter.
o Made osg::Matrix::_mat private, and updated the rest of the osg
to use the Matrix::operate(row,col) method instead of _mat[row][col].
o Placed #ifdef USE_DEPRECATED_MATRIX_METHODS about pre/postScale, o Placed #ifdef USE_DEPRECATED_MATRIX_METHODS about pre/postScale,
pre/postTrans and pre/postRot methods since these are now pre/postTrans and pre/postRot methods since these are now
deprecated, there functionality replace by scale,trans,rotate deprecated, there functionality replace by scale,trans,rotate

4
include/osg/Matrix
View File

@ -48,8 +48,8 @@ class SG_EXPORT Matrix : public Object
bool operator == (const Matrix& m) const { return compare(m)==0; } bool operator == (const Matrix& m) const { return compare(m)==0; }
bool operator != (const Matrix& m) const { return compare(m)!=0; } bool operator != (const Matrix& m) const { return compare(m)!=0; }
inline float& operator()(int col, int row) { return _mat[row][col]; } inline float& operator()(int row, int col) { return _mat[row][col]; }
inline float operator()(int col, int row) const { return _mat[row][col]; } inline float operator()(int row, int col) const { return _mat[row][col]; }
void set( float const * const ); void set( float const * const );
void set( float a00, float a01, float a02, float a03, void set( float a00, float a01, float a02, float a03,

4
include/osg/StateSet
View File

@ -71,6 +71,10 @@ class SG_EXPORT StateSet : public Object
/** get specified StateAttribute for specified type. /** get specified StateAttribute for specified type.
* returns NULL if no type is contained within StateSet.*/ * returns NULL if no type is contained within StateSet.*/
StateAttribute* getAttribute(const StateAttribute::Type type);
/** get specified const StateAttribute for specified type.
* returns NULL if no type is contained within const StateSet.*/
const StateAttribute* getAttribute(const StateAttribute::Type type) const; const StateAttribute* getAttribute(const StateAttribute::Type type) const;
/** get specified RefAttributePair for specified type. /** get specified RefAttributePair for specified type.

11
src/osg/StateSet.cpp
View File

@ -123,6 +123,17 @@ void StateSet::setAttributeToInherit(const StateAttribute::Type type)
} }
} }
StateAttribute* StateSet::getAttribute(const StateAttribute::Type type)
{
AttributeList::iterator itr = _attributeList.find(type);
if (itr!=_attributeList.end())
{
return itr->second.first.get();
}
else
return NULL;
}
const StateAttribute* StateSet::getAttribute(const StateAttribute::Type type) const const StateAttribute* StateSet::getAttribute(const StateAttribute::Type type) const
{ {
AttributeList::const_iterator itr = _attributeList.find(type); AttributeList::const_iterator itr = _attributeList.find(type);