Prep work on new TerrainGeometry Drawable which supports selective display list/VBO's usage.
Updated wrappers
This commit is contained in:
Robert Osfield
@@ -10,7 +10,12 @@
|
||||
#include <osgIntrospection/StaticMethodInfo>
|
||||
#include <osgIntrospection/Attributes>
|
||||
|
||||
#include <osg/Array>
|
||||
#include <osg/BoundingBox>
|
||||
#include <osg/CopyOp>
|
||||
#include <osg/Object>
|
||||
#include <osg/PrimitiveSet>
|
||||
#include <osg/RenderInfo>
|
||||
#include <osgTerrain/GeometryTechnique>
|
||||
#include <osgUtil/CullVisitor>
|
||||
#include <osgUtil/UpdateVisitor>
|
||||
@@ -59,3 +64,142 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::GeometryTechnique)
|
||||
"");
|
||||
END_REFLECTOR
|
||||
|
||||
BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainGeometry)
|
||||
I_BaseType(osg::Drawable);
|
||||
I_Constructor0(____TerrainGeometry,
|
||||
"",
|
||||
"");
|
||||
I_ConstructorWithDefaults2(IN, const osgTerrain::TerrainGeometry &, geometry, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
|
||||
____TerrainGeometry__C5_TerrainGeometry_R1__C5_osg_CopyOp_R1,
|
||||
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
|
||||
"");
|
||||
I_Method0(osg::Object *, cloneType,
|
||||
Properties::VIRTUAL,
|
||||
__osg_Object_P1__cloneType,
|
||||
"Clone the type of an object, with Object* return type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
|
||||
Properties::VIRTUAL,
|
||||
__osg_Object_P1__clone__C5_osg_CopyOp_R1,
|
||||
"Clone an object, with Object* return type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
|
||||
Properties::VIRTUAL,
|
||||
__bool__isSameKindAs__C5_osg_Object_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const char *, libraryName,
|
||||
Properties::VIRTUAL,
|
||||
__C5_char_P1__libraryName,
|
||||
"return the name of the object's library. ",
|
||||
"Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
|
||||
I_Method0(const char *, className,
|
||||
Properties::VIRTUAL,
|
||||
__C5_char_P1__className,
|
||||
"return the name of the object's class type. ",
|
||||
"Must be defined by derived classes. ");
|
||||
I_Method1(void, setVertices, IN, osg::Vec3Array *, vertices,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setVertices__osg_Vec3Array_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(osg::Vec3Array *, getVertices,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_Vec3Array_P1__getVertices,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const osg::Vec3Array *, getVertices,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osg_Vec3Array_P1__getVertices,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, setNormals, IN, osg::Vec3Array *, normals,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setNormals__osg_Vec3Array_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(osg::Vec3Array *, getNormals,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_Vec3Array_P1__getNormals,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const osg::Vec3Array *, getNormals,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osg_Vec3Array_P1__getNormals,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, setColors, IN, osg::Vec4Array *, colors,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setColors__osg_Vec4Array_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(osg::Vec4Array *, getColors,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_Vec4Array_P1__getColors,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const osg::Vec4Array *, getColors,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osg_Vec4Array_P1__getColors,
|
||||
"",
|
||||
"");
|
||||
I_Method2(void, setTexCoords, IN, unsigned int, unit, IN, osg::Array *, array,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setTexCoords__unsigned_int__osg_Array_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method1(osg::Array *, getTexCoords, IN, unsigned int, unit,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_Array_P1__getTexCoords__unsigned_int,
|
||||
"",
|
||||
"");
|
||||
I_Method1(const osg::Array *, getTexCoords, IN, unsigned int, unit,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osg_Array_P1__getTexCoords__unsigned_int,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, addPrimitiveSet, IN, osg::PrimitiveSet *, primitiveSet,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__addPrimitiveSet__osg_PrimitiveSet_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method1(osg::PrimitiveSet *, getPrimtitiveSet, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_PrimitiveSet_P1__getPrimtitiveSet__unsigned_int,
|
||||
"",
|
||||
"");
|
||||
I_Method1(const osg::PrimitiveSet *, getPrimtitiveSet, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osg_PrimitiveSet_P1__getPrimtitiveSet__unsigned_int,
|
||||
"",
|
||||
"");
|
||||
I_Method0(unsigned int, getNumPrimitiveSets,
|
||||
Properties::NON_VIRTUAL,
|
||||
__unsigned_int__getNumPrimitiveSets,
|
||||
"",
|
||||
"");
|
||||
I_Method0(osg::BoundingBox, computeBound,
|
||||
Properties::VIRTUAL,
|
||||
__osg_BoundingBox__computeBound,
|
||||
"Compute the bounding box around Drawables's geometry. ",
|
||||
"");
|
||||
I_Method1(void, drawImplementation, IN, osg::RenderInfo &, renderInfo,
|
||||
Properties::VIRTUAL,
|
||||
__void__drawImplementation__osg_RenderInfo_R1,
|
||||
"Draw Geometry directly ignoring an OpenGL display list which could be attached. ",
|
||||
"This is the internal draw method which does the drawing itself, and is the method to override when deriving from Geometry for user-drawn objects.");
|
||||
I_SimpleProperty(osg::Vec4Array *, Colors,
|
||||
__osg_Vec4Array_P1__getColors,
|
||||
__void__setColors__osg_Vec4Array_P1);
|
||||
I_SimpleProperty(osg::Vec3Array *, Normals,
|
||||
__osg_Vec3Array_P1__getNormals,
|
||||
__void__setNormals__osg_Vec3Array_P1);
|
||||
I_IndexedProperty(osg::Array *, TexCoords,
|
||||
__osg_Array_P1__getTexCoords__unsigned_int,
|
||||
__void__setTexCoords__unsigned_int__osg_Array_P1,
|
||||
0);
|
||||
I_SimpleProperty(osg::Vec3Array *, Vertices,
|
||||
__osg_Vec3Array_P1__getVertices,
|
||||
__void__setVertices__osg_Vec3Array_P1);
|
||||
END_REFLECTOR
|
||||
|
||||
|
||||
@@ -105,65 +105,88 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainNode)
|
||||
I_Method1(void, setElevationLayer, IN, osgTerrain::Layer *, layer,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setElevationLayer__Layer_P1,
|
||||
"",
|
||||
"Set the layer to use to define the elevations of the terrain. ",
|
||||
"");
|
||||
I_Method0(osgTerrain::Layer *, getElevationLayer,
|
||||
Properties::NON_VIRTUAL,
|
||||
__Layer_P1__getElevationLayer,
|
||||
"",
|
||||
"Get the layer to use to define the elevations of the terrain. ",
|
||||
"");
|
||||
I_Method0(const osgTerrain::Layer *, getElevationLayer,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_Layer_P1__getElevationLayer,
|
||||
"Get the const layer to use to define the elevations of the terrain. ",
|
||||
"");
|
||||
I_Method2(void, setColorLayer, IN, unsigned int, i, IN, osgTerrain::Layer *, layer,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setColorLayer__unsigned_int__osgTerrain_Layer_P1,
|
||||
"Set a color layer with specified layer number. ",
|
||||
"");
|
||||
I_Method1(osgTerrain::Layer *, getColorLayer, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__Layer_P1__getColorLayer__unsigned_int,
|
||||
"Get color layer with specified layer number. ",
|
||||
"");
|
||||
I_Method1(const osgTerrain::Layer *, getColorLayer, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_Layer_P1__getColorLayer__unsigned_int,
|
||||
"Set const color layer with specified layer number. ",
|
||||
"");
|
||||
I_Method2(void, setColorTransferFunction, IN, unsigned int, i, IN, osg::TransferFunction *, tf,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setColorTransferFunction__unsigned_int__osg_TransferFunction_P1,
|
||||
"Set a color transfer function with specified layer number. ",
|
||||
"");
|
||||
I_Method1(osg::TransferFunction *, getColorTransferFunction, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_TransferFunction_P1__getColorTransferFunction__unsigned_int,
|
||||
"Get color transfer function with specified layer number. ",
|
||||
"");
|
||||
I_Method1(const osg::TransferFunction *, getColorTransferFunction, IN, unsigned int, i,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osg_TransferFunction_P1__getColorTransferFunction__unsigned_int,
|
||||
"Get const color transfer function with specified layer number. ",
|
||||
"");
|
||||
I_Method0(unsigned int, getNumColorLayers,
|
||||
Properties::NON_VIRTUAL,
|
||||
__unsigned_int__getNumColorLayers,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, setColorLayer, IN, osgTerrain::Layer *, layer,
|
||||
I_Method1(void, setRequiresNormals, IN, bool, flag,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setColorLayer__osgTerrain_Layer_P1,
|
||||
"",
|
||||
__void__setRequiresNormals__bool,
|
||||
"Set whether the TerrainTechnique should create per vertex normals for lighting purposes. ",
|
||||
"");
|
||||
I_Method0(osgTerrain::Layer *, getColorLayer,
|
||||
I_Method0(bool, getRequiresNormals,
|
||||
Properties::NON_VIRTUAL,
|
||||
__Layer_P1__getColorLayer,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const osgTerrain::Layer *, getColorLayer,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_Layer_P1__getColorLayer,
|
||||
"",
|
||||
"");
|
||||
I_Method1(void, setColorTransferFunction, IN, osg::TransferFunction *, tf,
|
||||
Properties::NON_VIRTUAL,
|
||||
__void__setColorTransferFunction__osg_TransferFunction_P1,
|
||||
"",
|
||||
"");
|
||||
I_Method0(osg::TransferFunction *, getColorTransferFunction,
|
||||
Properties::NON_VIRTUAL,
|
||||
__osg_TransferFunction_P1__getColorTransferFunction,
|
||||
"",
|
||||
"");
|
||||
I_Method0(const osg::TransferFunction *, getColorTransferFunction,
|
||||
Properties::NON_VIRTUAL,
|
||||
__C5_osg_TransferFunction_P1__getColorTransferFunction,
|
||||
"",
|
||||
__bool__getRequiresNormals,
|
||||
"Get whether the TerrainTechnique should create per vertex normals for lighting purposes. ",
|
||||
"");
|
||||
I_Method0(osg::BoundingSphere, computeBound,
|
||||
Properties::VIRTUAL,
|
||||
__osg_BoundingSphere__computeBound,
|
||||
"Compute the bounding volume of the terrain by computing the union of the bounding volumes of all layers. ",
|
||||
"");
|
||||
I_SimpleProperty(osgTerrain::Layer *, ColorLayer,
|
||||
__Layer_P1__getColorLayer,
|
||||
__void__setColorLayer__osgTerrain_Layer_P1);
|
||||
I_SimpleProperty(osg::TransferFunction *, ColorTransferFunction,
|
||||
__osg_TransferFunction_P1__getColorTransferFunction,
|
||||
__void__setColorTransferFunction__osg_TransferFunction_P1);
|
||||
I_ArrayProperty(osgTerrain::Layer *, ColorLayer,
|
||||
__Layer_P1__getColorLayer__unsigned_int,
|
||||
__void__setColorLayer__unsigned_int__osgTerrain_Layer_P1,
|
||||
__unsigned_int__getNumColorLayers,
|
||||
0,
|
||||
0,
|
||||
0);
|
||||
I_IndexedProperty(osg::TransferFunction *, ColorTransferFunction,
|
||||
__osg_TransferFunction_P1__getColorTransferFunction__unsigned_int,
|
||||
__void__setColorTransferFunction__unsigned_int__osg_TransferFunction_P1,
|
||||
0);
|
||||
I_SimpleProperty(osgTerrain::Layer *, ElevationLayer,
|
||||
__Layer_P1__getElevationLayer,
|
||||
__void__setElevationLayer__Layer_P1);
|
||||
I_SimpleProperty(osgTerrain::Locator *, Locator,
|
||||
__Locator_P1__getLocator,
|
||||
__void__setLocator__Locator_P1);
|
||||
I_SimpleProperty(bool, RequiresNormals,
|
||||
__bool__getRequiresNormals,
|
||||
__void__setRequiresNormals__bool);
|
||||
I_SimpleProperty(osgTerrain::TerrainTechnique *, TerrainTechnique,
|
||||
__TerrainTechnique_P1__getTerrainTechnique,
|
||||
__void__setTerrainTechnique__osgTerrain_TerrainTechnique_P1);
|
||||
|
||||
Reference in New Issue
Block a user