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

From Paul Martz, typos and spelling fixes

Browse Source
This commit is contained in:
Robert Osfield
2004-09-07 10:07:11 +00:00
parent 46c830cc12
commit 767b397534
10 changed files with 175 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/osg/ColorMatrix
View File

@@ -19,43 +19,43 @@
namespace osg {
/** Texture Matrix state class for encapsulating OpenGL texture matrix functionality.*/
/** Encapsulates OpenGL color matrix functionality. */
class SG_EXPORT ColorMatrix : public StateAttribute
{
public :
ColorMatrix();
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
/** Copy constructor using CopyOp to manage deep vs shallow copy. */
ColorMatrix(const ColorMatrix& cm,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
StateAttribute(cm,copyop),
_matrix(cm._matrix) {}
META_StateAttribute(osg, ColorMatrix, COLORMATRIX);
/** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
/** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
COMPARE_StateAttribute_Types(ColorMatrix,sa)
// compare each paramter in turn against the rhs.
// Compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_matrix)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // Passed all the above comparison macros, so must be equal.
}
/** Set the color matrix */
/** Sets the color matrix. */
inline void setMatrix(const Matrix& matrix) { _matrix = matrix; }
/** Get the color matrix */
/** Gets the color matrix. */
inline Matrix& getMatrix() { return _matrix; }
/** Get the const color matrix */
/** Gets the const color matrix. */
inline const Matrix& getMatrix() const { return _matrix; }
/** apply as OpenGL texture matrix.*/
/** Applies as OpenGL texture matrix. */
virtual void apply(State& state) const;
protected: