From c000f77502e51c26770449434183ee8592875748 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 14 Mar 2007 12:31:53 +0000 Subject: [PATCH] Updated wrappers --- .../osgTerrain/wrapper_osgTerrain.dsp | 12 ++++- src/osgWrappers/osg/GraphicsContext.cpp | 1 + src/osgWrappers/osgTerrain/GNUmakefile | 6 ++- src/osgWrappers/osgTerrain/Layer.cpp | 53 +++++++++++++++++++ src/osgWrappers/osgTerrain/Locator.cpp | 34 ++++++++++++ .../{HeightFieldNode.cpp => TerrainNode.cpp} | 32 +++++------ ...FieldRenderer.cpp => TerrainTechnique.cpp} | 24 ++++----- 7 files changed, 130 insertions(+), 32 deletions(-) create mode 100644 src/osgWrappers/osgTerrain/Layer.cpp create mode 100644 src/osgWrappers/osgTerrain/Locator.cpp rename src/osgWrappers/osgTerrain/{HeightFieldNode.cpp => TerrainNode.cpp} (86%) rename src/osgWrappers/osgTerrain/{HeightFieldRenderer.cpp => TerrainTechnique.cpp} (67%) diff --git a/VisualStudio/osgWrappers/osgTerrain/wrapper_osgTerrain.dsp b/VisualStudio/osgWrappers/osgTerrain/wrapper_osgTerrain.dsp index 589faeef4..ae7b7ea08 100644 --- a/VisualStudio/osgWrappers/osgTerrain/wrapper_osgTerrain.dsp +++ b/VisualStudio/osgWrappers/osgTerrain/wrapper_osgTerrain.dsp @@ -100,11 +100,19 @@ SOURCE=..\..\..\src\osgWrappers\osgTerrain\Export.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgTerrain\HeightFieldNode.cpp +SOURCE=..\..\..\src\osgWrappers\osgTerrain\Layer.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgTerrain\HeightFieldRenderer.cpp +SOURCE=..\..\..\src\osgWrappers\osgTerrain\Locator.cpp +# End Source File + +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgTerrain\TerrainNode.cpp +# End Source File + +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgTerrain\TerrainTechnique.cpp # End Source File # End Group diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index 5715501fc..a4c26ada3 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -441,6 +441,7 @@ BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext::Traits) I_PublicMemberProperty(bool, useMultiThreadedOpenGLEngine); I_PublicMemberProperty(bool, useCursor); I_PublicMemberProperty(osg::GraphicsContext *, sharedContext); + I_PublicMemberProperty(osg::ref_ptr< osg::Referenced >, inhertedWindowData); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext::WindowingSystemInterface) diff --git a/src/osgWrappers/osgTerrain/GNUmakefile b/src/osgWrappers/osgTerrain/GNUmakefile index ff409116a..cdbabd16f 100644 --- a/src/osgWrappers/osgTerrain/GNUmakefile +++ b/src/osgWrappers/osgTerrain/GNUmakefile @@ -3,8 +3,10 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ Export.cpp\ - HeightFieldNode.cpp\ - HeightFieldRenderer.cpp\ + Layer.cpp\ + Locator.cpp\ + TerrainNode.cpp\ + TerrainTechnique.cpp\ LIBS += -losgTerrain -losg -losgIntrospection -losgDB -losgUtil -losgFX $(GL_LIBS) $(OTHER_LIBS) diff --git a/src/osgWrappers/osgTerrain/Layer.cpp b/src/osgWrappers/osgTerrain/Layer.cpp new file mode 100644 index 000000000..15a67e6b0 --- /dev/null +++ b/src/osgWrappers/osgTerrain/Layer.cpp @@ -0,0 +1,53 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#include + +#include +#include +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::Layer) + I_BaseType(osg::Object); + I_Constructor0(____Layer, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgTerrain::Layer &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____Layer__C5_Layer_R1__C5_osg_CopyOp_R1, + "Copy constructor using CopyOp to manage deep vs shallow copy. ", + ""); + I_Method1(void, setLocator, IN, osgTerrain::Locator *, locator, + Properties::NON_VIRTUAL, + __void__setLocator__Locator_P1, + "", + ""); + I_Method0(osgTerrain::Locator *, getLocator, + Properties::NON_VIRTUAL, + __Locator_P1__getLocator, + "", + ""); + I_Method0(const osgTerrain::Locator *, getLocator, + Properties::NON_VIRTUAL, + __C5_Locator_P1__getLocator, + "", + ""); + I_SimpleProperty(osgTerrain::Locator *, Locator, + __Locator_P1__getLocator, + __void__setLocator__Locator_P1); +END_REFLECTOR + diff --git a/src/osgWrappers/osgTerrain/Locator.cpp b/src/osgWrappers/osgTerrain/Locator.cpp new file mode 100644 index 000000000..9435a11ca --- /dev/null +++ b/src/osgWrappers/osgTerrain/Locator.cpp @@ -0,0 +1,34 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#include + +#include +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::Locator) + I_BaseType(osg::Object); + I_Constructor0(____Locator, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgTerrain::Locator &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____Locator__C5_Locator_R1__C5_osg_CopyOp_R1, + "Copy constructor using CopyOp to manage deep vs shallow copy. ", + ""); +END_REFLECTOR + diff --git a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp b/src/osgWrappers/osgTerrain/TerrainNode.cpp similarity index 86% rename from src/osgWrappers/osgTerrain/HeightFieldNode.cpp rename to src/osgWrappers/osgTerrain/TerrainNode.cpp index 737c018fd..e38366a29 100644 --- a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp +++ b/src/osgWrappers/osgTerrain/TerrainNode.cpp @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -26,13 +26,13 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldNode) +BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainNode) I_BaseType(osg::Group); - I_Constructor0(____HeightFieldNode, + I_Constructor0(____TerrainNode, "", ""); - I_ConstructorWithDefaults2(IN, const osgTerrain::HeightFieldNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, - ____HeightFieldNode__C5_HeightFieldNode_R1__C5_osg_CopyOp_R1, + I_ConstructorWithDefaults2(IN, const osgTerrain::TerrainNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____TerrainNode__C5_TerrainNode_R1__C5_osg_CopyOp_R1, "Copy constructor using CopyOp to manage deep vs shallow copy. ", ""); I_Method0(osg::Object *, cloneType, @@ -73,7 +73,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldNode) I_Method1(void, setHeightField, IN, osg::HeightField *, heightField, Properties::NON_VIRTUAL, __void__setHeightField__osg_HeightField_P1, - "Set the HeightField for this HeightFieldNode. ", + "Set the HeightField for this TerrainNode. ", "If a Renderer is attached then this will be notified. "); I_Method0(osg::HeightField *, getHeightField, Properties::NON_VIRTUAL, @@ -90,19 +90,19 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldNode) __void__heightFieldHasBeenModified, "Tell the Renderer that the height field has been modified, so that any cached data will need updating. ", ""); - I_Method1(void, setRenderer, IN, osgTerrain::HeightFieldRenderer *, renderer, + I_Method1(void, setRenderer, IN, osgTerrain::TerrainTechnique *, renderer, Properties::NON_VIRTUAL, - __void__setRenderer__osgTerrain_HeightFieldRenderer_P1, + __void__setRenderer__osgTerrain_TerrainTechnique_P1, "Set the Renderer. ", ""); - I_Method0(osgTerrain::HeightFieldRenderer *, getRenderer, + I_Method0(osgTerrain::TerrainTechnique *, getRenderer, Properties::NON_VIRTUAL, - __HeightFieldRenderer_P1__getRenderer, + __TerrainTechnique_P1__getRenderer, "Get the Renderer. ", ""); - I_Method0(const osgTerrain::HeightFieldRenderer *, getRenderer, + I_Method0(const osgTerrain::TerrainTechnique *, getRenderer, Properties::NON_VIRTUAL, - __C5_HeightFieldRenderer_P1__getRenderer, + __C5_TerrainTechnique_P1__getRenderer, "Get the const Renderer. ", ""); I_Method1(void, setBaseTextureImage, IN, osg::Image *, image, @@ -185,8 +185,8 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldNode) I_SimpleProperty(osg::Image *, NormalMapImage, __osg_Image_P1__getNormalMapImage, __void__setNormalMapImage__osg_Image_P1); - I_SimpleProperty(osgTerrain::HeightFieldRenderer *, Renderer, - __HeightFieldRenderer_P1__getRenderer, - __void__setRenderer__osgTerrain_HeightFieldRenderer_P1); + I_SimpleProperty(osgTerrain::TerrainTechnique *, Renderer, + __TerrainTechnique_P1__getRenderer, + __void__setRenderer__osgTerrain_TerrainTechnique_P1); END_REFLECTOR diff --git a/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp similarity index 67% rename from src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp rename to src/osgWrappers/osgTerrain/TerrainTechnique.cpp index 42a241b10..8893d0fc8 100644 --- a/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -24,23 +24,23 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::HeightFieldRenderer) +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique) I_BaseType(osg::Object); - I_Constructor0(____HeightFieldRenderer, + I_Constructor0(____TerrainTechnique, "", ""); - I_ConstructorWithDefaults2(IN, const osgTerrain::HeightFieldRenderer &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, - ____HeightFieldRenderer__C5_HeightFieldRenderer_R1__C5_osg_CopyOp_R1, + I_ConstructorWithDefaults2(IN, const osgTerrain::TerrainTechnique &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____TerrainTechnique__C5_TerrainTechnique_R1__C5_osg_CopyOp_R1, "Copy constructor using CopyOp to manage deep vs shallow copy. ", ""); - I_Method0(osgTerrain::HeightFieldNode *, getHeightFieldNode, + I_Method0(osgTerrain::TerrainNode *, getTerrainNode, Properties::NON_VIRTUAL, - __HeightFieldNode_P1__getHeightFieldNode, + __TerrainNode_P1__getTerrainNode, "", ""); - I_Method0(const osgTerrain::HeightFieldNode *, getHeightFieldNode, + I_Method0(const osgTerrain::TerrainNode *, getTerrainNode, Properties::NON_VIRTUAL, - __C5_HeightFieldNode_P1__getHeightFieldNode, + __C5_TerrainNode_P1__getTerrainNode, "", ""); I_Method0(void, initialize, @@ -63,8 +63,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::HeightFieldRenderer) __void__cull__osgUtil_CullVisitor_P1, "", ""); - I_SimpleProperty(osgTerrain::HeightFieldNode *, HeightFieldNode, - __HeightFieldNode_P1__getHeightFieldNode, + I_SimpleProperty(osgTerrain::TerrainNode *, TerrainNode, + __TerrainNode_P1__getTerrainNode, 0); END_REFLECTOR