From f494bc5b8ac46142263e5a508e18267408eeb698 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 11 Sep 2008 16:01:17 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/Image.cpp | 20 +++ src/osgWrappers/osgTerrain/Layer.cpp | 56 ++++++++- src/osgWrappers/osgTerrain/TerrainTile.cpp | 139 +++++++++++++++++++++ 3 files changed, 211 insertions(+), 4 deletions(-) diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index e4ae38d52..f3231ab12 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -29,6 +29,13 @@ TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::Image::MipmapDataType) +BEGIN_ENUM_REFLECTOR(osg::Image::WriteHint) + I_DeclaringFile("osg/Image"); + I_EnumLabel(osg::Image::NO_PREFERENCE); + I_EnumLabel(osg::Image::STORE_INLINE); + I_EnumLabel(osg::Image::EXTERNAL_FILE); +END_REFLECTOR + BEGIN_ENUM_REFLECTOR(osg::Image::AllocationMode) I_DeclaringFile("osg/Image"); I_EnumLabel(osg::Image::NO_DELETE); @@ -92,6 +99,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) __C5_std_string_R1__getFileName, "", ""); + I_Method1(void, setWriteHint, IN, osg::Image::WriteHint, writeHint, + Properties::NON_VIRTUAL, + __void__setWriteHint__WriteHint, + "", + ""); + I_Method0(osg::Image::WriteHint, getWriteHint, + Properties::NON_VIRTUAL, + __WriteHint__getWriteHint, + "", + ""); I_Method1(void, setAllocationMode, IN, osg::Image::AllocationMode, mode, Properties::NON_VIRTUAL, __void__setAllocationMode__AllocationMode, @@ -442,6 +459,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) I_SimpleProperty(unsigned int, TotalSizeInBytesIncludingMipmaps, __unsigned_int__getTotalSizeInBytesIncludingMipmaps, 0); + I_SimpleProperty(osg::Image::WriteHint, WriteHint, + __WriteHint__getWriteHint, + __void__setWriteHint__WriteHint); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< unsigned int >) diff --git a/src/osgWrappers/osgTerrain/Layer.cpp b/src/osgWrappers/osgTerrain/Layer.cpp index b8942427a..e8a18d5dd 100644 --- a/src/osgWrappers/osgTerrain/Layer.cpp +++ b/src/osgWrappers/osgTerrain/Layer.cpp @@ -71,6 +71,16 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::CompositeLayer) __void__clear, "", ""); + I_Method1(void, setSetName, IN, const std::string &, setname, + Properties::NON_VIRTUAL, + __void__setSetName__C5_std_string_R1, + "", + ""); + I_Method0(const std::string &, getSetName, + Properties::NON_VIRTUAL, + __C5_std_string_R1__getSetName, + "", + ""); I_Method2(void, setSetName, IN, unsigned int, i, IN, const std::string &, setname, Properties::NON_VIRTUAL, __void__setSetName__unsigned_int__C5_std_string_R1, @@ -156,10 +166,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::CompositeLayer) __void__addLayer__Layer_P1, 0, __void__removeLayer__unsigned_int); - I_IndexedProperty(const std::string &, SetName, - __C5_std_string_R1__getSetName__unsigned_int, - __void__setSetName__unsigned_int__C5_std_string_R1, - 0); + I_SimpleProperty(const std::string &, SetName, + __C5_std_string_R1__getSetName, + __void__setSetName__C5_std_string_R1); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgTerrain::ContourLayer) @@ -572,6 +581,16 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); + I_Method1(void, setSetName, IN, const std::string &, setname, + Properties::NON_VIRTUAL, + __void__setSetName__C5_std_string_R1, + "", + ""); + I_Method0(const std::string &, getSetName, + Properties::NON_VIRTUAL, + __C5_std_string_R1__getSetName, + "", + ""); I_Method1(void, setFileName, IN, const std::string &, filename, Properties::VIRTUAL, __void__setFileName__C5_std_string_R1, @@ -779,6 +798,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer) I_SimpleProperty(unsigned, ModifiedCount, 0, __void__setModifiedCount__unsigned); + I_SimpleProperty(const std::string &, SetName, + __C5_std_string_R1__getSetName, + __void__setSetName__C5_std_string_R1); I_SimpleProperty(osgTerrain::ValidDataOperator *, ValidDataOperator, __ValidDataOperator_P1__getValidDataOperator, __void__setValidDataOperator__ValidDataOperator_P1); @@ -819,6 +841,16 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ProxyLayer) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); + I_Method0(osg::Image *, getImage, + Properties::VIRTUAL, + __osg_Image_P1__getImage, + "Return image associated with layer if supported. ", + ""); + I_Method0(const osg::Image *, getImage, + Properties::VIRTUAL, + __C5_osg_Image_P1__getImage, + "Return const image associated with layer if supported. ", + ""); I_Method1(void, setImplementation, IN, osgTerrain::Layer *, layer, Properties::NON_VIRTUAL, __void__setImplementation__Layer_P1, @@ -902,6 +934,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ProxyLayer) I_SimpleProperty(const std::string &, FileName, __C5_std_string_R1__getFileName, __void__setFileName__C5_std_string_R1); + I_SimpleProperty(osg::Image *, Image, + __osg_Image_P1__getImage, + 0); I_SimpleProperty(osgTerrain::Layer *, Implementation, __Layer_P1__getImplementation, __void__setImplementation__Layer_P1); @@ -960,8 +995,21 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::SwitchLayer) __int__getActiveLayer, "", ""); + I_Method0(osg::Image *, getImage, + Properties::VIRTUAL, + __osg_Image_P1__getImage, + "Return image associated with layer if supported. ", + ""); + I_Method0(const osg::Image *, getImage, + Properties::VIRTUAL, + __C5_osg_Image_P1__getImage, + "Return const image associated with layer if supported. ", + ""); I_SimpleProperty(int, ActiveLayer, __int__getActiveLayer, __void__setActiveLayer__int); + I_SimpleProperty(osg::Image *, Image, + __osg_Image_P1__getImage, + 0); END_REFLECTOR diff --git a/src/osgWrappers/osgTerrain/TerrainTile.cpp b/src/osgWrappers/osgTerrain/TerrainTile.cpp index 35679c9b6..309822079 100644 --- a/src/osgWrappers/osgTerrain/TerrainTile.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTile.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -203,6 +204,14 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTile) __osg_BoundingSphere__computeBound, "Compute the bounding volume of the terrain by computing the union of the bounding volumes of all layers. ", ""); + I_StaticMethod1(void, setTileLoadedCallback, IN, osgTerrain::TerrainTile::TileLoadedCallback *, lc, + __void__setTileLoadedCallback__TileLoadedCallback_P1_S, + "", + ""); + I_StaticMethod0(osg::ref_ptr< osgTerrain::TerrainTile::TileLoadedCallback > &, getTileLoadedCallback, + __osg_ref_ptrT1_TileLoadedCallback__R1__getTileLoadedCallback_S, + "", + ""); I_ArrayProperty(osgTerrain::Layer *, ColorLayer, __Layer_P1__getColorLayer__unsigned_int, __void__setColorLayer__unsigned_int__Layer_P1, @@ -236,6 +245,24 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTile) __void__setTreatBoundariesToValidDataAsDefaultValue__bool); END_REFLECTOR +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::TerrainTile::TileLoadedCallback) + I_DeclaringFile("osgTerrain/TerrainTile"); + I_BaseType(osg::Referenced); + I_Constructor0(____TileLoadedCallback, + "", + ""); + I_Method0(bool, deferExternalLayerLoading, + Properties::PURE_VIRTUAL, + __bool__deferExternalLayerLoading, + "", + ""); + I_Method2(void, loaded, IN, osgTerrain::TerrainTile *, tile, IN, const osgDB::ReaderWriter::Options *, options, + Properties::PURE_VIRTUAL, + __void__loaded__osgTerrain_TerrainTile_P1__C5_osgDB_ReaderWriter_Options_P1, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgTerrain::TileID) I_DeclaringFile("osgTerrain/TerrainTile"); I_Constructor0(____TileID, @@ -255,3 +282,115 @@ BEGIN_VALUE_REFLECTOR(osgTerrain::TileID) I_PublicMemberProperty(int, y); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgTerrain::WhiteListTileLoadedCallback) + I_DeclaringFile("osgTerrain/TerrainTile"); + I_BaseType(osgTerrain::TerrainTile::TileLoadedCallback); + I_Constructor0(____WhiteListTileLoadedCallback, + "", + ""); + I_Method1(void, allow, IN, const std::string &, setname, + Properties::NON_VIRTUAL, + __void__allow__C5_std_string_R1, + "", + ""); + I_Method1(void, setMinimumNumOfLayers, IN, unsigned int, numLayers, + Properties::NON_VIRTUAL, + __void__setMinimumNumOfLayers__unsigned_int, + "", + ""); + I_Method0(unsigned int, getMinimumNumOfLayers, + Properties::NON_VIRTUAL, + __unsigned_int__getMinimumNumOfLayers, + "", + ""); + I_Method1(void, setReplaceSwitchLayer, IN, bool, replaceSwitchLayer, + Properties::NON_VIRTUAL, + __void__setReplaceSwitchLayer__bool, + "", + ""); + I_Method0(bool, getReplaceSwitchLayer, + Properties::NON_VIRTUAL, + __bool__getReplaceSwitchLayer, + "", + ""); + I_Method1(void, setAllowAll, IN, bool, allowAll, + Properties::NON_VIRTUAL, + __void__setAllowAll__bool, + "", + ""); + I_Method0(bool, getAllowAll, + Properties::NON_VIRTUAL, + __bool__getAllowAll, + "", + ""); + I_Method1(bool, layerAcceptable, IN, const std::string &, setname, + Properties::NON_VIRTUAL, + __bool__layerAcceptable__C5_std_string_R1, + "", + ""); + I_Method2(bool, readImageLayer, IN, osgTerrain::ImageLayer *, imageLayer, IN, const osgDB::ReaderWriter::Options *, options, + Properties::NON_VIRTUAL, + __bool__readImageLayer__osgTerrain_ImageLayer_P1__C5_osgDB_ReaderWriter_Options_P1, + "", + ""); + I_Method0(bool, deferExternalLayerLoading, + Properties::VIRTUAL, + __bool__deferExternalLayerLoading, + "", + ""); + I_Method2(void, loaded, IN, osgTerrain::TerrainTile *, tile, IN, const osgDB::ReaderWriter::Options *, options, + Properties::VIRTUAL, + __void__loaded__osgTerrain_TerrainTile_P1__C5_osgDB_ReaderWriter_Options_P1, + "", + ""); + I_SimpleProperty(bool, AllowAll, + __bool__getAllowAll, + __void__setAllowAll__bool); + I_SimpleProperty(unsigned int, MinimumNumOfLayers, + __unsigned_int__getMinimumNumOfLayers, + __void__setMinimumNumOfLayers__unsigned_int); + I_SimpleProperty(bool, ReplaceSwitchLayer, + __bool__getReplaceSwitchLayer, + __void__setReplaceSwitchLayer__bool); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::TerrainTile::TileLoadedCallback >) + I_DeclaringFile("osg/ref_ptr"); + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osgTerrain::TerrainTile::TileLoadedCallback *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osgTerrain::TerrainTile::TileLoadedCallback > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osgTerrain::TerrainTile::TileLoadedCallback *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osgTerrain::TerrainTile::TileLoadedCallback *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osgTerrain::TerrainTile::TileLoadedCallback > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osgTerrain::TerrainTile::TileLoadedCallback *, , + __T_P1__get, + 0); +END_REFLECTOR +