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

From Mike Wittman, remove redundent const from in front of unsigned int.

Browse Source 
From Robert Osfield, updated wrappers
This commit is contained in:
Robert Osfield
2007-03-23 17:27:53 +00:00
parent 92865923f3
commit 37f4740c45
3 changed files with 123 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/osg/Drawable
View File

@@ -525,19 +525,19 @@ class OSG_EXPORT Drawable : public Object
virtual ~ConstAttributeFunctor() {}
virtual void apply(AttributeType,const unsigned int,const GLbyte*) {}
virtual void apply(AttributeType,const unsigned int,const GLshort*) {}
virtual void apply(AttributeType,const unsigned int,const GLint*) {}
virtual void apply(AttributeType,unsigned int,const GLbyte*) {}
virtual void apply(AttributeType,unsigned int,const GLshort*) {}
virtual void apply(AttributeType,unsigned int,const GLint*) {}
virtual void apply(AttributeType,const unsigned int,const GLubyte*) {}
virtual void apply(AttributeType,const unsigned int,const GLushort*) {}
virtual void apply(AttributeType,const unsigned int,const GLuint*) {}
virtual void apply(AttributeType,unsigned int,const GLubyte*) {}
virtual void apply(AttributeType,unsigned int,const GLushort*) {}
virtual void apply(AttributeType,unsigned int,const GLuint*) {}
virtual void apply(AttributeType,const unsigned int,const float*) {}
virtual void apply(AttributeType,const unsigned int,const Vec2*) {}
virtual void apply(AttributeType,const unsigned int,const Vec3*) {}
virtual void apply(AttributeType,const unsigned int,const Vec4*) {}
virtual void apply(AttributeType,const unsigned int,const Vec4ub*) {}
virtual void apply(AttributeType,unsigned int,const float*) {}
virtual void apply(AttributeType,unsigned int,const Vec2*) {}
virtual void apply(AttributeType,unsigned int,const Vec3*) {}
virtual void apply(AttributeType,unsigned int,const Vec4*) {}
virtual void apply(AttributeType,unsigned int,const Vec4ub*) {}
};
/** Return true if the Drawable subclass supports accept(ConstAttributeFunctor&).*/

44
src/osgWrappers/osg/Drawable.cpp
View File

@@ -630,59 +630,59 @@ BEGIN_VALUE_REFLECTOR(osg::Drawable::ConstAttributeFunctor)
I_Constructor0(____ConstAttributeFunctor,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLbyte *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const GLbyte *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_GLbyte_P1,
__void__apply__AttributeType__unsigned__C5_GLbyte_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLshort *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const GLshort *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_GLshort_P1,
__void__apply__AttributeType__unsigned__C5_GLshort_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLint *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const GLint *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_GLint_P1,
__void__apply__AttributeType__unsigned__C5_GLint_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLubyte *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const GLubyte *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_GLubyte_P1,
__void__apply__AttributeType__unsigned__C5_GLubyte_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLushort *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const GLushort *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_GLushort_P1,
__void__apply__AttributeType__unsigned__C5_GLushort_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLuint *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const GLuint *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_GLuint_P1,
__void__apply__AttributeType__unsigned__C5_GLuint_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const float *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const float *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_float_P1,
__void__apply__AttributeType__unsigned__C5_float_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec2 *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const osg::Vec2 *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_Vec2_P1,
__void__apply__AttributeType__unsigned__C5_Vec2_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec3 *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const osg::Vec3 *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_Vec3_P1,
__void__apply__AttributeType__unsigned__C5_Vec3_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec4 *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const osg::Vec4 *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_Vec4_P1,
__void__apply__AttributeType__unsigned__C5_Vec4_P1,
"",
"");
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec4ub *, x,
I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const osg::Vec4ub *, x,
Properties::VIRTUAL,
__void__apply__AttributeType__C5_unsigned__C5_Vec4ub_P1,
__void__apply__AttributeType__unsigned__C5_Vec4ub_P1,
"",
"");
END_REFLECTOR

90
src/osgWrappers/osgTerrain/Layer.cpp
View File

@@ -10,7 +10,10 @@
#include <osgIntrospection/StaticMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/Array>
#include <osg/CopyOp>
#include <osg/Image>
#include <osg/Shape>
#include <osgTerrain/Layer>
#include <osgTerrain/Locator>
@@ -22,6 +25,93 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::ArrayLayer)
I_BaseType(osgTerrain::Layer);
I_Constructor0(____ArrayLayer,
"",
"");
I_ConstructorWithDefaults2(IN, const osgTerrain::ArrayLayer &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____ArrayLayer__C5_ArrayLayer_R1__C5_osg_CopyOp_R1,
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
"");
I_Method1(void, setArray, IN, osg::Array *, array,
Properties::NON_VIRTUAL,
__void__setArray__osg_Array_P1,
"",
"");
I_Method0(osg::Array *, getArray,
Properties::NON_VIRTUAL,
__osg_Array_P1__getArray,
"",
"");
I_Method0(const osg::Array *, getArray,
Properties::NON_VIRTUAL,
__C5_osg_Array_P1__getArray,
"",
"");
I_SimpleProperty(osg::Array *, Array,
__osg_Array_P1__getArray,
__void__setArray__osg_Array_P1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::HeightFieldLayer)
I_BaseType(osgTerrain::Layer);
I_Constructor0(____HeightFieldLayer,
"",
"");
I_ConstructorWithDefaults2(IN, const osgTerrain::HeightFieldLayer &, hfLayer, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____HeightFieldLayer__C5_HeightFieldLayer_R1__C5_osg_CopyOp_R1,
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
"");
I_Method1(void, setHeightField, IN, osg::HeightField *, hf,
Properties::NON_VIRTUAL,
__void__setHeightField__osg_HeightField_P1,
"",
"");
I_Method0(osg::HeightField *, getHeightField,
Properties::NON_VIRTUAL,
__osg_HeightField_P1__getHeightField,
"",
"");
I_Method0(const osg::HeightField *, getHeightField,
Properties::NON_VIRTUAL,
__C5_osg_HeightField_P1__getHeightField,
"",
"");
I_SimpleProperty(osg::HeightField *, HeightField,
__osg_HeightField_P1__getHeightField,
__void__setHeightField__osg_HeightField_P1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::ImageLayer)
I_BaseType(osgTerrain::Layer);
I_Constructor0(____ImageLayer,
"",
"");
I_ConstructorWithDefaults2(IN, const osgTerrain::ImageLayer &, imageLayer, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____ImageLayer__C5_ImageLayer_R1__C5_osg_CopyOp_R1,
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
"");
I_Method1(void, setImage, IN, osg::Image *, image,
Properties::NON_VIRTUAL,
__void__setImage__osg_Image_P1,
"",
"");
I_Method0(osg::Image *, getImage,
Properties::NON_VIRTUAL,
__osg_Image_P1__getImage,
"",
"");
I_Method0(const osg::Image *, getImage,
Properties::NON_VIRTUAL,
__C5_osg_Image_P1__getImage,
"",
"");
I_SimpleProperty(osg::Image *, Image,
__osg_Image_P1__getImage,
__void__setImage__osg_Image_P1);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::Layer)
I_BaseType(osg::Object);
I_Constructor0(____Layer,