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

Renamed osgVolume::Brick to osgVolume::VolumeTile

Browse Source
This commit is contained in:
Robert Osfield
2008-12-20 20:55:21 +00:00
parent f0270f934e
commit adb7a49c10
12 changed files with 177 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/osgWrappers/osgVolume/Volume.cpp
View File

@@ -13,8 +13,8 @@
#include <osg/CopyOp>
#include <osg/NodeVisitor>
#include <osg/Object>
#include <osgVolume/Brick>
#include <osgVolume/Volume>
#include <osgVolume/VolumeTile>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
@@ -69,32 +69,32 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Volume)
__void__traverse__osg_NodeVisitor_R1,
"Traverse downwards : calls children's accept method with NodeVisitor. ",
"");
I_Method1(osgVolume::Brick *, getBrick, IN, const osgVolume::BrickID &, brickID,
I_Method1(osgVolume::VolumeTile *, getVolumeTile, IN, const osgVolume::TileID &, tileID,
Properties::NON_VIRTUAL,
__Brick_P1__getBrick__C5_BrickID_R1,
"Get the Brick for a given BrickID. ",
__VolumeTile_P1__getVolumeTile__C5_TileID_R1,
"Get the VolumeTile for a given VolumeTileID. ",
"");
I_Method1(const osgVolume::Brick *, getBrick, IN, const osgVolume::BrickID &, brickID,
I_Method1(const osgVolume::VolumeTile *, getVolumeTile, IN, const osgVolume::TileID &, tileID,
Properties::NON_VIRTUAL,
__C5_Brick_P1__getBrick__C5_BrickID_R1,
"Get the const Brick for a given BrickID. ",
__C5_VolumeTile_P1__getVolumeTile__C5_TileID_R1,
"Get the const VolumeTile for a given VolumeTileID. ",
"");
I_ProtectedMethod0(void, dirtyRegisteredBricks,
I_ProtectedMethod0(void, dirtyRegisteredVolumeTiles,
Properties::NON_VIRTUAL,
Properties::NON_CONST,
__void__dirtyRegisteredBricks,
__void__dirtyRegisteredVolumeTiles,
"",
"");
I_ProtectedMethod1(void, registerBrick, IN, osgVolume::Brick *, tile,
I_ProtectedMethod1(void, registerVolumeTile, IN, osgVolume::VolumeTile *, tile,
Properties::NON_VIRTUAL,
Properties::NON_CONST,
__void__registerBrick__Brick_P1,
__void__registerVolumeTile__VolumeTile_P1,
"",
"");
I_ProtectedMethod1(void, unregisterBrick, IN, osgVolume::Brick *, tile,
I_ProtectedMethod1(void, unregisterVolumeTile, IN, osgVolume::VolumeTile *, tile,
Properties::NON_VIRTUAL,
Properties::NON_CONST,
__void__unregisterBrick__Brick_P1,
__void__unregisterVolumeTile__VolumeTile_P1,
"",
"");
END_REFLECTOR

14
src/osgWrappers/osgVolume/VolumeTechnique.cpp
View File

@@ -15,8 +15,8 @@
#include <osg/Object>
#include <osgUtil/CullVisitor>
#include <osgUtil/UpdateVisitor>
#include <osgVolume/Brick>
#include <osgVolume/VolumeTechnique>
#include <osgVolume/VolumeTile>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
@@ -61,14 +61,14 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::VolumeTechnique)
__C5_char_P1__className,
"return the name of the object's class type. ",
"Must be defined by derived classes. ");
I_Method0(osgVolume::Brick *, getBrick,
I_Method0(osgVolume::VolumeTile *, getVolumeTile,
Properties::NON_VIRTUAL,
__Brick_P1__getBrick,
__VolumeTile_P1__getVolumeTile,
"",
"");
I_Method0(const osgVolume::Brick *, getBrick,
I_Method0(const osgVolume::VolumeTile *, getVolumeTile,
Properties::NON_VIRTUAL,
__C5_Brick_P1__getBrick,
__C5_VolumeTile_P1__getVolumeTile,
"",
"");
I_Method0(void, init,
@@ -102,8 +102,8 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::VolumeTechnique)
__void__setDirty__bool,
"",
"");
I_SimpleProperty(osgVolume::Brick *, Brick,
__Brick_P1__getBrick,
I_SimpleProperty(osgVolume::VolumeTile *, VolumeTile,
__VolumeTile_P1__getVolumeTile,
0);
END_REFLECTOR

74
src/osgWrappers/osgVolume/Brick.cpp → src/osgWrappers/osgVolume/VolumeTile.cpp
View File

@@ -16,9 +16,9 @@
#include <osg/Matrix>
#include <osg/NodeVisitor>
#include <osg/Object>
#include <osgVolume/Brick>
#include <osgVolume/Volume>
#include <osgVolume/VolumeTechnique>
#include <osgVolume/VolumeTile>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
@@ -28,14 +28,34 @@
#undef OUT
#endif
BEGIN_OBJECT_REFLECTOR(osgVolume::Brick)
I_DeclaringFile("osgVolume/Brick");
I_BaseType(osg::Group);
I_Constructor0(____Brick,
BEGIN_VALUE_REFLECTOR(osgVolume::TileID)
I_DeclaringFile("osgVolume/VolumeTile");
I_Constructor0(____TileID,
"",
"");
I_ConstructorWithDefaults2(IN, const osgVolume::Brick &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____Brick__C5_Brick_R1__C5_osg_CopyOp_R1,
I_Constructor4(IN, int, in_level, IN, int, in_x, IN, int, in_y, IN, int, in_z,
____TileID__int__int__int__int,
"",
"");
I_Method0(bool, valid,
Properties::NON_VIRTUAL,
__bool__valid,
"",
"");
I_PublicMemberProperty(int, level);
I_PublicMemberProperty(int, x);
I_PublicMemberProperty(int, y);
I_PublicMemberProperty(int, z);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgVolume::VolumeTile)
I_DeclaringFile("osgVolume/VolumeTile");
I_BaseType(osg::Group);
I_Constructor0(____VolumeTile,
"",
"");
I_ConstructorWithDefaults2(IN, const osgVolume::VolumeTile &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____VolumeTile__C5_VolumeTile_R1__C5_osg_CopyOp_R1,
"Copy constructor using CopyOp to manage deep vs shallow copy. ",
"");
I_Method0(osg::Object *, cloneType,
@@ -93,15 +113,15 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Brick)
__C5_Volume_P1__getVolume,
"Get the const Volume that this Volume tile is a member of. ",
"");
I_Method1(void, setBrickID, IN, const osgVolume::BrickID &, brickID,
I_Method1(void, setTileID, IN, const osgVolume::TileID &, tileID,
Properties::NON_VIRTUAL,
__void__setBrickID__C5_BrickID_R1,
"Set the BrickID (layer, x,y) of the Brick. ",
"The BrickID is used so it can be located by its neighbours via the enclosing Terrain node that manages a map of BrickID to TerraiTiles. ");
I_Method0(const osgVolume::BrickID &, getBrickID,
__void__setTileID__C5_TileID_R1,
"Set the TileID (layer, x,y,z) of the VolumeTile. ",
"The TileID is used so it can be located by its neighbours via the enclosing Volume node that manages a map of TileID to VolumeTiles. ");
I_Method0(const osgVolume::TileID &, getTileID,
Properties::NON_VIRTUAL,
__C5_BrickID_R1__getBrickID,
"Get the BrickID (layer, x,y) of the Brick. ",
__C5_TileID_R1__getTileID,
"Get the TileID (layer, x,y,z) of the VolumeTile. ",
"");
I_Method1(void, setLocator, IN, osg::RefMatrix *, locator,
Properties::NON_VIRTUAL,
@@ -163,9 +183,6 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Brick)
__osg_BoundingSphere__computeBound,
"Compute the bounding sphere around Node's geometry or children. ",
"This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound(). ");
I_SimpleProperty(const osgVolume::BrickID &, BrickID,
__C5_BrickID_R1__getBrickID,
__void__setBrickID__C5_BrickID_R1);
I_SimpleProperty(bool, Dirty,
__bool__getDirty,
__void__setDirty__bool);
@@ -175,6 +192,9 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Brick)
I_SimpleProperty(osg::RefMatrix *, Locator,
__osg_RefMatrix_P1__getLocator,
__void__setLocator__osg_RefMatrix_P1);
I_SimpleProperty(const osgVolume::TileID &, TileID,
__C5_TileID_R1__getTileID,
__void__setTileID__C5_TileID_R1);
I_SimpleProperty(osgVolume::Volume *, Volume,
__Volume_P1__getVolume,
__void__setVolume__Volume_P1);
@@ -183,23 +203,3 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Brick)
__void__setVolumeTechnique__VolumeTechnique_P1);
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osgVolume::BrickID)
I_DeclaringFile("osgVolume/Brick");
I_Constructor0(____BrickID,
"",
"");
I_Constructor3(IN, int, in_level, IN, int, in_x, IN, int, in_y,
____BrickID__int__int__int,
"",
"");
I_Method0(bool, valid,
Properties::NON_VIRTUAL,
__bool__valid,
"",
"");
I_PublicMemberProperty(int, level);
I_PublicMemberProperty(int, x);
I_PublicMemberProperty(int, y);
I_PublicMemberProperty(int, z);
END_REFLECTOR