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

From Louis Hamilton, fix to LightPoint's under 64 bit build, changing longs to ints in

Browse Source 
colour conversion code.
This commit is contained in:
Robert Osfield
2005-12-06 10:16:21 +00:00
parent 6971588592
commit 22d5390784
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgSim/LightPointDrawable.h
View File

@@ -40,18 +40,18 @@ class OSGSIM_EXPORT LightPointDrawable : public osg::Drawable
virtual const char* className() const { return "LightPointDrawable"; }
//typedef std::pair<unsigned long,osg::Vec3> ColorPosition;
//typedef std::pair<unsigned int,osg::Vec3> ColorPosition;
struct ColorPosition
{
unsigned long first;
unsigned int first;
osg::Vec3 second;
ColorPosition() {}
ColorPosition(unsigned long f,const osg::Vec3& s):first(f),second(s) {}
ColorPosition(unsigned int f,const osg::Vec3& s):first(f),second(s) {}
};
void reset();
inline unsigned long asRGBA(const osg::Vec4& color) const
inline unsigned int asRGBA(const osg::Vec4& color) const
{
return _endian==osg::BigEndian?color.asABGR():color.asRGBA();
}

4
src/osgWrappers/osg/Vec4d.cpp
View File

@@ -51,8 +51,8 @@ BEGIN_VALUE_REFLECTOR(osg::Vec4d)
I_Method0(osg::Vec4d::value_type, g);
I_Method0(osg::Vec4d::value_type, b);
I_Method0(osg::Vec4d::value_type, a);
I_Method0(unsigned long, asABGR);
I_Method0(unsigned long, asRGBA);
I_Method0(unsigned int, asABGR);
I_Method0(unsigned int, asRGBA);
I_Method0(bool, valid);
I_Method0(bool, isNaN);
I_Method0(osg::Vec4d::value_type, length);

4
src/osgWrappers/osg/Vec4f.cpp
View File

@@ -49,8 +49,8 @@ BEGIN_VALUE_REFLECTOR(osg::Vec4f)
I_Method0(osg::Vec4f::value_type, g);
I_Method0(osg::Vec4f::value_type, b);
I_Method0(osg::Vec4f::value_type, a);
I_Method0(unsigned long, asABGR);
I_Method0(unsigned long, asRGBA);
I_Method0(unsigned int, asABGR);
I_Method0(unsigned int, asRGBA);
I_Method0(bool, valid);
I_Method0(bool, isNaN);
I_Method0(osg::Vec4f::value_type, length);