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

Added osg::UByte4 class, which can be used to represent packed colors.

Browse Source 
Changed osg::UByte4Array across to use the new osg::UByte4 class rather
than a GLuint as do previously.

Cleaned up some of the paramters in osg::Vec4.
This commit is contained in:
Robert Osfield
2002-07-15 22:18:47 +00:00
parent 5530406c9a
commit e280b50d31
3 changed files with 195 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/osg/Vec4
View File

@@ -96,7 +96,6 @@ class Vec4
(unsigned long)clampTo((_v[0]*255.0f),0.0f,255.0f);
}
inline const bool valid() const { return !isNaN(); }
inline const bool isNaN() const { return osg::isNaN(_v[0]) || osg::isNaN(_v[1]) || osg::isNaN(_v[2]) || osg::isNaN(_v[3]); }
@@ -110,13 +109,13 @@ class Vec4
}
/// multiply by scalar
inline Vec4 operator * (const float& rhs) const
inline Vec4 operator * (const float rhs) const
{
return Vec4(_v[0]*rhs, _v[1]*rhs, _v[2]*rhs, _v[3]*rhs);
}
/// unary multiply by scalar
inline Vec4& operator *= (const float& rhs)
inline Vec4& operator *= (const float rhs)
{
_v[0]*=rhs;
_v[1]*=rhs;
@@ -126,13 +125,13 @@ class Vec4
}
/// divide by scalar
inline Vec4 operator / (const float& rhs) const
inline Vec4 operator / (const float rhs) const
{
return Vec4(_v[0]/rhs, _v[1]/rhs, _v[2]/rhs, _v[3]/rhs);
}
/// unary divide by scalar
inline Vec4& operator /= (const float& rhs)
inline Vec4& operator /= (const float rhs)
{
_v[0]/=rhs;
_v[1]/=rhs;