From c607a6dd7f0eb41e6ea711e315e3fe124a7388b1 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 7 Nov 2006 14:26:48 +0000 Subject: [PATCH] Updated wrappers --- .../osgShadow/wrapper_osgShadow.dsp | 4 ++++ src/osgWrappers/osg/Texture1D.cpp | 2 +- src/osgWrappers/osg/Texture2D.cpp | 2 +- src/osgWrappers/osg/Texture3D.cpp | 2 +- src/osgWrappers/osg/TextureRectangle.cpp | 2 +- .../osgParticle/ConnectedParticleSystem.cpp | 22 +++++++++++++++++++ src/osgWrappers/osgText/Font.cpp | 2 +- 7 files changed, 31 insertions(+), 5 deletions(-) diff --git a/VisualStudio/osgWrappers/osgShadow/wrapper_osgShadow.dsp b/VisualStudio/osgWrappers/osgShadow/wrapper_osgShadow.dsp index 54ce1cde9..f5de1885d 100644 --- a/VisualStudio/osgWrappers/osgShadow/wrapper_osgShadow.dsp +++ b/VisualStudio/osgWrappers/osgShadow/wrapper_osgShadow.dsp @@ -99,6 +99,10 @@ LINK32=link.exe SOURCE=..\..\..\src\osgWrappers\osgShadow\Export.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgShadow\OccluderGeometry.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgShadow\ParallelSplitShadowMap.cpp # End Source File diff --git a/src/osgWrappers/osg/Texture1D.cpp b/src/osgWrappers/osg/Texture1D.cpp index 8ab1fd3a4..7770ef21a 100644 --- a/src/osgWrappers/osg/Texture1D.cpp +++ b/src/osgWrappers/osg/Texture1D.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture1D) +BEGIN_OBJECT_REFLECTOR(osg::Texture1D) I_BaseType(osg::Texture); I_Constructor0(____Texture1D, "", diff --git a/src/osgWrappers/osg/Texture2D.cpp b/src/osgWrappers/osg/Texture2D.cpp index 0d6d83d13..a8f269259 100644 --- a/src/osgWrappers/osg/Texture2D.cpp +++ b/src/osgWrappers/osg/Texture2D.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture2D) +BEGIN_OBJECT_REFLECTOR(osg::Texture2D) I_BaseType(osg::Texture); I_Constructor0(____Texture2D, "", diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index 96bd8e4ad..d190fa979 100644 --- a/src/osgWrappers/osg/Texture3D.cpp +++ b/src/osgWrappers/osg/Texture3D.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D) +BEGIN_OBJECT_REFLECTOR(osg::Texture3D) I_BaseType(osg::Texture); I_Constructor0(____Texture3D, "", diff --git a/src/osgWrappers/osg/TextureRectangle.cpp b/src/osgWrappers/osg/TextureRectangle.cpp index 7b7e1e23f..8f6b14df2 100644 --- a/src/osgWrappers/osg/TextureRectangle.cpp +++ b/src/osgWrappers/osg/TextureRectangle.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle) +BEGIN_OBJECT_REFLECTOR(osg::TextureRectangle) I_BaseType(osg::Texture); I_Constructor0(____TextureRectangle, "", diff --git a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp index 1e38fab19..f13941c14 100644 --- a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp @@ -65,5 +65,27 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ConnectedParticleSystem) __void__drawImplementation__osg_State_R1, "Draw the connected particles as either a line or a quad strip, depending upon viewing distance. . ", ""); + I_Method0(const osgParticle::Particle *, getStartParticle, + __C5_osgParticle_Particle_P1__getStartParticle, + "Get the (const) particle from where the line or quadstrip starts to be drawn. ", + ""); + I_Method0(osgParticle::Particle *, getStartParticle, + __osgParticle_Particle_P1__getStartParticle, + "Get the particle from where the line or quadstrip starts to be drawn. ", + ""); + I_Method1(void, setMaxNumberOfParticlesToSkip, IN, unsigned int, maxNumberofParticlesToSkip, + __void__setMaxNumberOfParticlesToSkip__unsigned_int, + "Set the maximum numbers of particles to be skipped during the predraw filtering. ", + ""); + I_Method0(unsigned int, getMaxNumberOfParticlesToSkip, + __unsigned_int__getMaxNumberOfParticlesToSkip, + "Get the maximum numbers of particles to be skipped during the predraw filtering. ", + ""); + I_SimpleProperty(unsigned int, MaxNumberOfParticlesToSkip, + __unsigned_int__getMaxNumberOfParticlesToSkip, + __void__setMaxNumberOfParticlesToSkip__unsigned_int); + I_SimpleProperty(osgParticle::Particle *, StartParticle, + __osgParticle_Particle_P1__getStartParticle, + 0); END_REFLECTOR diff --git a/src/osgWrappers/osgText/Font.cpp b/src/osgWrappers/osgText/Font.cpp index 281cf933a..dcee56b06 100644 --- a/src/osgWrappers/osgText/Font.cpp +++ b/src/osgWrappers/osgText/Font.cpp @@ -363,7 +363,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font::Glyph) __void__setVerticalBearing__C5_osg_Vec2_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font::GlyphTexture) +BEGIN_OBJECT_REFLECTOR(osgText::Font::GlyphTexture) I_BaseType(osg::Texture2D); I_Constructor0(____GlyphTexture, "",