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

Moved osgVolume::ImageUtils to osg::ImageUtils, updated wrappers, and started moving osgvolume example across to create osgVolume subgraphs

Browse Source
This commit is contained in:
Robert Osfield
2009-01-09 15:19:25 +00:00
parent 9b4c6e25ea
commit 458993fa88
13 changed files with 155 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgWrappers/osgVolume/Locator.cpp
View File

@@ -30,6 +30,11 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Locator)
I_Constructor0(____Locator,
"",
"");
I_Constructor1(IN, const osg::Matrixd &, transform,
Properties::NON_EXPLICIT,
____Locator__C5_osg_Matrixd_R1,
"",
"");
I_ConstructorWithDefaults2(IN, const osgVolume::Locator &, locator, , 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. ",

55
src/osgWrappers/osgVolume/VolumeTile.cpp
View File

@@ -12,10 +12,10 @@
#include <osg/BoundingSphere>
#include <osg/CopyOp>
#include <osg/Image>
#include <osg/Matrix>
#include <osg/NodeVisitor>
#include <osg/Object>
#include <osgVolume/Layer>
#include <osgVolume/Locator>
#include <osgVolume/Volume>
#include <osgVolume/VolumeTechnique>
#include <osgVolume/VolumeTile>
@@ -123,34 +123,44 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::VolumeTile)
__C5_TileID_R1__getTileID,
"Get the TileID (layer, x,y,z) of the VolumeTile. ",
"");
I_Method1(void, setLocator, IN, osg::RefMatrix *, locator,
I_Method1(void, setLocator, IN, osgVolume::Locator *, locator,
Properties::NON_VIRTUAL,
__void__setLocator__osg_RefMatrix_P1,
__void__setLocator__Locator_P1,
"",
"");
I_Method0(osg::RefMatrix *, getLocator,
I_Method0(osgVolume::Locator *, getLocator,
Properties::NON_VIRTUAL,
__osg_RefMatrix_P1__getLocator,
__Locator_P1__getLocator,
"",
"");
I_Method0(const osg::RefMatrix *, getLocator,
I_Method0(const osgVolume::Locator *, getLocator,
Properties::NON_VIRTUAL,
__C5_osg_RefMatrix_P1__getLocator,
__C5_Locator_P1__getLocator,
"",
"");
I_Method2(void, setImage, IN, unsigned int, i, IN, osg::Image *, image,
I_Method2(void, setLayer, IN, unsigned int, i, IN, osgVolume::Layer *, layer,
Properties::NON_VIRTUAL,
__void__setImage__unsigned_int__osg_Image_P1,
__void__setLayer__unsigned_int__Layer_P1,
"",
"");
I_Method1(osg::Image *, getImage, IN, unsigned int, i,
I_Method1(osgVolume::Layer *, getLayer, IN, unsigned int, i,
Properties::NON_VIRTUAL,
__osg_Image_P1__getImage__unsigned_int,
__Layer_P1__getLayer__unsigned_int,
"",
"");
I_Method1(const osg::Image *, getImage, IN, unsigned int, i,
I_Method1(const osgVolume::Layer *, getImage, IN, unsigned int, i,
Properties::NON_VIRTUAL,
__C5_osg_Image_P1__getImage__unsigned_int,
__C5_Layer_P1__getImage__unsigned_int,
"",
"");
I_Method1(void, addLayer, IN, osgVolume::Layer *, layer,
Properties::NON_VIRTUAL,
__void__addLayer__Layer_P1,
"",
"");
I_Method0(unsigned int, getNumLayers,
Properties::NON_VIRTUAL,
__unsigned_int__getNumLayers,
"",
"");
I_Method1(void, setVolumeTechnique, IN, osgVolume::VolumeTechnique *, VolumeTechnique,
@@ -186,13 +196,16 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::VolumeTile)
I_SimpleProperty(bool, Dirty,
__bool__getDirty,
__void__setDirty__bool);
I_IndexedProperty(osg::Image *, Image,
__osg_Image_P1__getImage__unsigned_int,
__void__setImage__unsigned_int__osg_Image_P1,
0);
I_SimpleProperty(osg::RefMatrix *, Locator,
__osg_RefMatrix_P1__getLocator,
__void__setLocator__osg_RefMatrix_P1);
I_ArrayProperty(osgVolume::Layer *, Layer,
__Layer_P1__getLayer__unsigned_int,
__void__setLayer__unsigned_int__Layer_P1,
__unsigned_int__getNumLayers,
__void__addLayer__Layer_P1,
0,
0);
I_SimpleProperty(osgVolume::Locator *, Locator,
__Locator_P1__getLocator,
__void__setLocator__Locator_P1);
I_SimpleProperty(const osgVolume::TileID &, TileID,
__C5_TileID_R1__getTileID,
__void__setTileID__C5_TileID_R1);