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

Moved UByte4 i/ostream support into io_utils.

Browse Source
This commit is contained in:
Robert Osfield 2005-04-08 14:10:22 +00:00
parent b401b97bce
commit f46858c49b
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/osg/UByte4
View File

@ -16,8 +16,6 @@
#include <osg/Vec3> #include <osg/Vec3>
#include <ostream>
namespace osg { namespace osg {
/** General purpose float quad. /** General purpose float quad.
@ -147,19 +145,8 @@ class UByte4
return *this; return *this;
} }
friend inline std::ostream& operator << (std::ostream& output, const UByte4& vec)
{
output << (int)vec._v[0] << " "
<< (int)vec._v[1] << " "
<< (int)vec._v[2] << " "
<< (int)vec._v[3];
return output; // to enable cascading
}
}; // end of class UByte4 }; // end of class UByte4
} // end of namespace osg } // end of namespace osg
#endif #endif

17
include/osg/io_utils
View File

@ -17,12 +17,8 @@
#include <ostream> #include <ostream>
#include <istream> #include <istream>
#include <osg/Vec2f>
#include <osg/Vec2d>
#include <osg/Vec3f>
#include <osg/Vec3d>
#include <osg/Vec4f>
#include <osg/Vec4d> #include <osg/Vec4d>
#include <osg/UByte4>
#include <osg/Matrixf> #include <osg/Matrixf>
#include <osg/Matrixd> #include <osg/Matrixd>
@ -158,6 +154,17 @@ inline std::ostream& operator<< (std::ostream& os, const Matrixd& m )
return os; return os;
} }
//////////////////////////////////////////////////////////////////////////
// UByte4 steaming operators.
inline std::ostream& operator << (std::ostream& output, const UByte4& vec)
{
output << (int)vec._v[0] << " "
<< (int)vec._v[1] << " "
<< (int)vec._v[2] << " "
<< (int)vec._v[3];
return output; // to enable cascading
}
} // end of namespace osg } // end of namespace osg
#endif #endif