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

Revised the osg::ClampColor API to allow vertex, fragment and read color clamping to

Browse Source 
be applied together.
This commit is contained in:
Robert Osfield
2006-09-12 09:26:42 +00:00
parent 63907dbbaf
commit 5915584b37
3 changed files with 46 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osg/ClampColor.cpp
View File

@@ -20,14 +20,16 @@
using namespace osg;
ClampColor::ClampColor():
_target(CLAMP_FRAGMENT_COLOR),
_mode(FIXED_ONLY)
_clampVertexColor(GL_FIXED_ONLY),
_clampFragmentColor(GL_FIXED_ONLY),
_clampReadColor(GL_FIXED_ONLY)
{
}
ClampColor::ClampColor(Target target, Mode mode):
_target(target),
_mode(mode)
ClampColor::ClampColor(GLenum vertexMode, GLenum fragmentMode, GLenum readMode):
_clampVertexColor(vertexMode),
_clampFragmentColor(fragmentMode),
_clampReadColor(readMode)
{
}
@@ -50,7 +52,9 @@ void ClampColor::apply(State& state) const
return;
}
extensions->glClampColor(static_cast<GLenum>(_target), static_cast<GLenum>(_mode));
extensions->glClampColor(GL_CLAMP_VERTEX_COLOR, _clampVertexColor);
extensions->glClampColor(GL_CLAMP_FRAGMENT_COLOR, _clampFragmentColor);
extensions->glClampColor(GL_CLAMP_READ_COLOR, _clampReadColor);
}

31
src/osgWrappers/osg/ClampColor.cpp
View File

@@ -24,23 +24,11 @@
#undef OUT
#endif
BEGIN_ENUM_REFLECTOR(osg::ClampColor::Target)
I_EnumLabel(osg::ClampColor::CLAMP_VERTEX_COLOR);
I_EnumLabel(osg::ClampColor::CLAMP_FRAGMENT_COLOR);
I_EnumLabel(osg::ClampColor::CLAMP_READ_COLOR);
END_REFLECTOR
BEGIN_ENUM_REFLECTOR(osg::ClampColor::Mode)
I_EnumLabel(osg::ClampColor::FIXED_ONLY);
I_EnumLabel(osg::ClampColor::FALSE);
I_EnumLabel(osg::ClampColor::TRUE);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osg::ClampColor)
I_BaseType(osg::StateAttribute);
I_Constructor0();
I_Constructor2(IN, osg::ClampColor::Target, target, IN, osg::ClampColor::Mode, mode);
I_ConstructorWithDefaults2(IN, const osg::ClampColor &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
I_Constructor3(IN, GLenum, vertexMode, IN, GLenum, fragmentMode, IN, GLenum, readMode);
I_ConstructorWithDefaults2(IN, const osg::ClampColor &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
I_Method0(osg::Object *, cloneType);
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);
I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj);
@@ -48,15 +36,18 @@ BEGIN_OBJECT_REFLECTOR(osg::ClampColor)
I_Method0(const char *, className);
I_Method0(osg::StateAttribute::Type, getType);
I_Method1(int, compare, IN, const osg::StateAttribute &, sa);
I_Method1(void, setTarget, IN, osg::ClampColor::Target, target);
I_Method0(osg::ClampColor::Target, getTarget);
I_Method1(void, setMode, IN, osg::ClampColor::Mode, mode);
I_Method0(osg::ClampColor::Mode, getMode);
I_Method1(void, setClampVertexColor, IN, GLenum, mode);
I_Method0(GLenum, getClampVertexColor);
I_Method1(void, setClampFragmentColor, IN, GLenum, mode);
I_Method0(GLenum, getClampFragmentColor);
I_Method1(void, setClampReadColor, IN, GLenum, mode);
I_Method0(GLenum, getClampReadColor);
I_Method1(void, apply, IN, osg::State &, state);
I_StaticMethod2(osg::ClampColor::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized);
I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::ClampColor::Extensions *, extensions);
I_Property(osg::ClampColor::Mode, Mode);
I_Property(osg::ClampColor::Target, Target);
I_Property(GLenum, ClampFragmentColor);
I_Property(GLenum, ClampReadColor);
I_Property(GLenum, ClampVertexColor);
I_ReadOnlyProperty(osg::StateAttribute::Type, Type);
END_REFLECTOR