Added GeometryTechinque to osgTerrain. Added usage of GeometryTechnique into osgterrain example

Added --width and --height command line options to osgdistortion to allow users
to control the window size.
This commit is contained in:
Robert Osfield
2007-03-21 16:34:04 +00:00
parent 2b52de5e9c
commit 541c3f13e9
19 changed files with 386 additions and 53 deletions

View File

@@ -24,7 +24,8 @@
#undef OUT
#endif
BEGIN_VALUE_REFLECTOR(osg::TransferFunction)
BEGIN_OBJECT_REFLECTOR(osg::TransferFunction)
I_BaseType(osg::Referenced);
I_Constructor0(____TransferFunction,
"",
"");

View File

@@ -3,6 +3,7 @@ include $(TOPDIR)/Make/makedefs
CXXFILES =\
Export.cpp\
GeometryTechnique.cpp\
Layer.cpp\
Locator.cpp\
TerrainNode.cpp\

View File

@@ -0,0 +1,61 @@
// ***************************************************************************
//
// Generated automatically by genwrapper.
// Please DO NOT EDIT this file!
//
// ***************************************************************************
#include <osgIntrospection/ReflectionMacros>
#include <osgIntrospection/TypedMethodInfo>
#include <osgIntrospection/StaticMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/CopyOp>
#include <osgTerrain/GeometryTechnique>
#include <osgUtil/CullVisitor>
#include <osgUtil/UpdateVisitor>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
#undef IN
#endif
#ifdef OUT
#undef OUT
#endif
BEGIN_OBJECT_REFLECTOR(osgTerrain::GeometryTechnique)
I_BaseType(osgTerrain::TerrainTechnique);
I_Constructor0(____GeometryTechnique,
"",
"");
I_ConstructorWithDefaults2(IN, const osgTerrain::GeometryTechnique &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____GeometryTechnique__C5_GeometryTechnique_R1__C5_osg_CopyOp_R1,
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
"");
I_Method0(void, initialize,
Properties::VIRTUAL,
__void__initialize,
"",
"");
I_Method1(void, update, IN, osgUtil::UpdateVisitor *, nv,
Properties::VIRTUAL,
__void__update__osgUtil_UpdateVisitor_P1,
"",
"");
I_Method1(void, cull, IN, osgUtil::CullVisitor *, nv,
Properties::VIRTUAL,
__void__cull__osgUtil_CullVisitor_P1,
"",
"");
I_Method0(void, cleanSceneGraph,
Properties::VIRTUAL,
__void__cleanSceneGraph,
"Clean scene graph from any terrain technique specific nodes. ",
"");
I_Method0(void, dirty,
Properties::VIRTUAL,
__void__dirty,
"Dirty so that cached data structurese are updated. ",
"");
END_REFLECTOR

View File

@@ -11,6 +11,7 @@
#include <osgIntrospection/Attributes>
#include <osg/CopyOp>
#include <osg/Vec3d>
#include <osgTerrain/Locator>
// Must undefine IN and OUT macros defined in Windows headers
@@ -30,5 +31,15 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::Locator)
____Locator__C5_Locator_R1__C5_osg_CopyOp_R1,
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
"");
I_Method2(bool, convertLocalToModel, IN, const osg::Vec3d &, local, IN, osg::Vec3d &, world,
Properties::PURE_VIRTUAL,
__bool__convertLocalToModel__C5_osg_Vec3d_R1__osg_Vec3d_R1,
"",
"");
I_Method2(bool, convertModelToWorld, IN, const osg::Vec3d &, local, IN, osg::Vec3d &, world,
Properties::PURE_VIRTUAL,
__bool__convertModelToWorld__C5_osg_Vec3d_R1__osg_Vec3d_R1,
"",
"");
END_REFLECTOR

View File

@@ -13,7 +13,9 @@
#include <osg/CopyOp>
#include <osg/NodeVisitor>
#include <osg/Object>
#include <osg/TransferFunction>
#include <osgTerrain/Layer>
#include <osgTerrain/Locator>
#include <osgTerrain/TerrainNode>
#include <osgTerrain/TerrainTechnique>
@@ -84,29 +86,78 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainNode)
__C5_TerrainTechnique_P1__getTerrainTechnique,
"Get the const TerrainTechnique. ",
"");
I_Method1(void, setHeightLayer, IN, osgTerrain::Layer *, layer,
I_Method1(void, setLocator, IN, osgTerrain::Locator *, locator,
Properties::NON_VIRTUAL,
__void__setHeightLayer__osgTerrain_Layer_P1,
__void__setLocator__Locator_P1,
"Set the coordinate frame locator of the terrain node. ",
"The locator takes non-dimensional s,t coordinates into the X,Y,Z world coords and back. ");
I_Method0(osgTerrain::Locator *, getLocator,
Properties::NON_VIRTUAL,
__Locator_P1__getLocator,
"Get the coordinate frame locator of the terrain node. ",
"");
I_Method0(const osgTerrain::Locator *, getLocator,
Properties::NON_VIRTUAL,
__C5_Locator_P1__getLocator,
"Get the coordinate frame locator of the terrain node. ",
"");
I_Method1(void, setElevationLayer, IN, osgTerrain::Layer *, layer,
Properties::NON_VIRTUAL,
__void__setElevationLayer__Layer_P1,
"",
"");
I_Method0(osgTerrain::Layer *, getHeightLayer,
I_Method0(osgTerrain::Layer *, getElevationLayer,
Properties::NON_VIRTUAL,
__osgTerrain_Layer_P1__getHeightLayer,
__Layer_P1__getElevationLayer,
"",
"");
I_Method1(void, addColorLayer, IN, osgTerrain::Layer *, layer,
I_Method0(const osgTerrain::Layer *, getElevationLayer,
Properties::NON_VIRTUAL,
__void__addColorLayer__osgTerrain_Layer_P1,
__C5_Layer_P1__getElevationLayer,
"",
"");
I_Method1(void, removeColorLayer, IN, osgTerrain::Layer *, layer,
I_Method1(void, setColorLayer, IN, osgTerrain::Layer *, layer,
Properties::NON_VIRTUAL,
__void__removeColorLayer__osgTerrain_Layer_P1,
__void__setColorLayer__osgTerrain_Layer_P1,
"",
"");
I_SimpleProperty(osgTerrain::Layer *, HeightLayer,
__osgTerrain_Layer_P1__getHeightLayer,
__void__setHeightLayer__osgTerrain_Layer_P1);
I_Method0(osgTerrain::Layer *, getColorLayer,
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,
"",
"");
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_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(osgTerrain::TerrainTechnique *, TerrainTechnique,
__TerrainTechnique_P1__getTerrainTechnique,
__void__setTerrainTechnique__osgTerrain_TerrainTechnique_P1);

View File

@@ -11,6 +11,7 @@
#include <osgIntrospection/Attributes>
#include <osg/CopyOp>
#include <osg/Object>
#include <osgTerrain/TerrainNode>
#include <osgTerrain/TerrainTechnique>
#include <osgUtil/CullVisitor>
@@ -24,7 +25,7 @@
#undef OUT
#endif
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique)
BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique)
I_BaseType(osg::Object);
I_Constructor0(____TerrainTechnique,
"",
@@ -33,6 +34,31 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique)
____TerrainTechnique__C5_TerrainTechnique_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_Method0(osgTerrain::TerrainNode *, getTerrainNode,
Properties::NON_VIRTUAL,
__TerrainNode_P1__getTerrainNode,
@@ -44,25 +70,30 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique)
"",
"");
I_Method0(void, initialize,
Properties::PURE_VIRTUAL,
Properties::VIRTUAL,
__void__initialize,
"",
"");
I_Method0(void, heightFieldHasBeenModified,
Properties::PURE_VIRTUAL,
__void__heightFieldHasBeenModified,
"",
"");
I_Method1(void, update, IN, osgUtil::UpdateVisitor *, nv,
Properties::PURE_VIRTUAL,
Properties::VIRTUAL,
__void__update__osgUtil_UpdateVisitor_P1,
"",
"");
I_Method1(void, cull, IN, osgUtil::CullVisitor *, nv,
Properties::PURE_VIRTUAL,
Properties::VIRTUAL,
__void__cull__osgUtil_CullVisitor_P1,
"",
"");
I_Method0(void, cleanSceneGraph,
Properties::VIRTUAL,
__void__cleanSceneGraph,
"Clean scene graph from any terrain technique specific nodes. ",
"");
I_Method0(void, dirty,
Properties::VIRTUAL,
__void__dirty,
"Dirty so that cached data structurese are updated. ",
"");
I_SimpleProperty(osgTerrain::TerrainNode *, TerrainNode,
__TerrainNode_P1__getTerrainNode,
0);