From 5c9bd792a392677a0fecd8f574478406ff5a62b7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 15 Jul 2005 21:47:11 +0000 Subject: [PATCH] Updated wrappers --- VisualStudio/VisualStudio.dsw | 191 ++++++++++++++ VisualStudio/osgWrappers/osg/wrapper_osg.dsp | 87 +++++-- include/osg/Array | 30 +-- src/osgWrappers/osg/Array.cpp | 240 +++++++++++++++--- src/osgWrappers/osg/CameraNode.cpp | 144 +++++++++++ src/osgWrappers/osg/Drawable.cpp | 7 +- src/osgWrappers/osg/FrameBufferObject.cpp | 118 +++++++++ src/osgWrappers/osg/GNUmakefile | 33 ++- src/osgWrappers/osg/Geometry.cpp | 16 +- src/osgWrappers/osg/NodeVisitor.cpp | 2 + src/osgWrappers/osg/Program.cpp | 1 + src/osgWrappers/osg/Sequence.cpp | 1 + src/osgWrappers/osg/Shape.cpp | 2 + src/osgWrappers/osg/TexGenNode.cpp | 8 + src/osgWrappers/osg/Vec2b.cpp | 37 +++ src/osgWrappers/osg/Vec2s.cpp | 30 +++ src/osgWrappers/osg/Vec3b.cpp | 39 +++ src/osgWrappers/osg/Vec3s.cpp | 30 +++ src/osgWrappers/osg/Vec4b.cpp | 41 +++ src/osgWrappers/osg/Vec4s.cpp | 30 +++ .../osg/{UByte4.cpp => Vec4ub.cpp} | 8 +- src/osgWrappers/osgDB/GNUmakefile | 2 +- src/osgWrappers/osgFX/GNUmakefile | 2 +- src/osgWrappers/osgGA/GNUmakefile | 6 +- src/osgWrappers/osgParticle/GNUmakefile | 5 +- src/osgWrappers/osgProducer/GNUmakefile | 3 +- src/osgWrappers/osgSim/BlinkSequence.cpp | 1 + src/osgWrappers/osgSim/GNUmakefile | 5 +- src/osgWrappers/osgTerrain/DataSet.cpp | 5 + src/osgWrappers/osgTerrain/GNUmakefile | 3 +- src/osgWrappers/osgText/GNUmakefile | 6 +- src/osgWrappers/osgText/Text.cpp | 117 +-------- src/osgWrappers/osgUtil/CullVisitor.cpp | 2 + src/osgWrappers/osgUtil/GNUmakefile | 3 +- src/osgWrappers/osgUtil/RenderStage.cpp | 3 + .../osgUtil/RenderToTextureStage.cpp | 5 + 36 files changed, 1037 insertions(+), 226 deletions(-) create mode 100644 src/osgWrappers/osg/CameraNode.cpp create mode 100644 src/osgWrappers/osg/FrameBufferObject.cpp create mode 100644 src/osgWrappers/osg/Vec2b.cpp create mode 100644 src/osgWrappers/osg/Vec2s.cpp create mode 100644 src/osgWrappers/osg/Vec3b.cpp create mode 100644 src/osgWrappers/osg/Vec3s.cpp create mode 100644 src/osgWrappers/osg/Vec4b.cpp create mode 100644 src/osgWrappers/osg/Vec4s.cpp rename src/osgWrappers/osg/{UByte4.cpp => Vec4ub.cpp} (80%) diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw index 8ce4d8400..bd1af2f54 100644 --- a/VisualStudio/VisualStudio.dsw +++ b/VisualStudio/VisualStudio.dsw @@ -3015,6 +3015,197 @@ Package=<4> ############################################################################### +Project: "osgWrapper osgDB"=.\osgWrappers\osgDB\wrapper_osgDB.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgDB + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} + +############################################################################### + +Project: "osgWrapper osgFX"=.\osgWrappers\osgFX\wrapper_osgFX.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgFX + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} +############################################################################### + +Project: "osgWrapper osgGA"=.\osgWrappers\osgGA\wrapper_osgGA.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgGA + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} + +############################################################################### + +Project: "osgWrapper osgParticle"=.\osgWrappers\osgParticle\wrapper_osgParticle.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgParticle + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} + +############################################################################### + +Project: "osgWrapper osgProducer"=.\osgWrappers\osgProducer\wrapper_osgProducer.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgProducer + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgGA + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} + +############################################################################### + +Project: "osgWrapper osgSim"=.\osgWrappers\osgSim\wrapper_osgSim.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgSim + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} + +############################################################################### + +Project: "osgWrapper osgTerrain"=.\osgWrappers\osgTerrain\wrapper_osgTerrain.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgTerrain + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} + +############################################################################### + +Project: "osgWrapper osgText"=.\osgWrappers\osgText\wrapper_osgText.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgText + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} + +############################################################################### + +Project: "osgWrapper osgUtil"=.\osgWrappers\osgUtil\wrapper_osgUtil.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core osg + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgUtil + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core osgIntrospection + End Project Dependency +}}} + +############################################################################### + Global: Package=<5> diff --git a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp index bcb73f50c..8d044ccb3 100644 --- a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp +++ b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgwrapper_osg.dll" /libpath:"../../../lib" /libpath:"../../../../OpenThreads/lib/win32" /libpath:"../../../../Producer/lib" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgwrapper_osg.dll" /libpath:"../../../lib" /libpath:"../../../../OpenThreads/lib/win32" /libpath:"../../../../Producer/lib" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "osgWrapper osg - Win32 Debug" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgwrapper_osgd.dll" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../../OpenThreads/lib/win32" /libpath:"../../../../Producer/lib" /libpath:"../../../../3rdParty/lib" +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"../../../bin/osgwrapper_osgd.dll" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../../OpenThreads/lib/win32" /libpath:"../../../../Producer/lib" /libpath:"../../../../3rdParty/lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib !ENDIF @@ -94,6 +94,7 @@ LINK32=link.exe # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\AlphaFunc.cpp # End Source File @@ -146,6 +147,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\BoundingSphere.cpp SOURCE=..\..\..\src\osgWrappers\osg\BufferObject.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\CameraNode.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\ClearNode.cpp # End Source File @@ -194,10 +199,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\CopyOp.cpp SOURCE=..\..\..\src\osgWrappers\osg\CullFace.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\CullingSet.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\CullSettings.cpp # End Source File @@ -206,6 +207,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\CullSettings.cpp SOURCE=..\..\..\src\osgWrappers\osg\CullStack.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\CullingSet.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Depth.cpp # End Source File @@ -214,12 +219,16 @@ SOURCE=..\..\..\src\osgWrappers\osg\Depth.cpp SOURCE=..\..\..\src\osgWrappers\osg\DisplaySettings.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\DrawPixels.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Drawable.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\DrawPixels.cpp +SOURCE=..\..\..\src\osgWrappers\osg\Endian.cpp # End Source File # Begin Source File @@ -230,6 +239,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\Fog.cpp SOURCE=..\..\..\src\osgWrappers\osg\FragmentProgram.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\FrameBufferObject.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\FrameStamp.cpp # End Source File @@ -238,6 +251,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\FrameStamp.cpp SOURCE=..\..\..\src\osgWrappers\osg\FrontFace.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\GL2Extensions.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Geode.cpp # End Source File @@ -258,6 +275,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\Image.cpp SOURCE=..\..\..\src\osgWrappers\osg\ImageStream.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\LOD.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Light.cpp # End Source File @@ -282,10 +303,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\LineStipple.cpp SOURCE=..\..\..\src\osgWrappers\osg\LineWidth.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\LOD.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\LogicOp.cpp # End Source File @@ -298,6 +315,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\Material.cpp SOURCE=..\..\..\src\osgWrappers\osg\Matrix.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\MatrixTransform.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Matrixd.cpp # End Source File @@ -306,10 +327,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\Matrixd.cpp SOURCE=..\..\..\src\osgWrappers\osg\Matrixf.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\MatrixTransform.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Multisample.cpp # End Source File @@ -326,6 +343,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\NodeCallback.cpp SOURCE=..\..\..\src\osgWrappers\osg\NodeVisitor.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\Notify.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Object.cpp # End Source File @@ -391,11 +412,11 @@ SOURCE=..\..\..\src\osgWrappers\osg\Quat.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Referenced.cpp +SOURCE=..\..\..\src\osgWrappers\osg\RefNodePath.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\RefNodePath.cpp +SOURCE=..\..\..\src\osgWrappers\osg\Referenced.cpp # End Source File # Begin Source File @@ -498,10 +519,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\Timer.cpp SOURCE=..\..\..\src\osgWrappers\osg\Transform.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\UByte4.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Uniform.cpp # End Source File @@ -510,6 +527,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\Uniform.cpp SOURCE=..\..\..\src\osgWrappers\osg\Vec2.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\Vec2b.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Vec2d.cpp # End Source File @@ -518,10 +539,18 @@ SOURCE=..\..\..\src\osgWrappers\osg\Vec2d.cpp SOURCE=..\..\..\src\osgWrappers\osg\Vec2f.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\Vec2s.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Vec3.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\Vec3b.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Vec3d.cpp # End Source File @@ -530,10 +559,18 @@ SOURCE=..\..\..\src\osgWrappers\osg\Vec3d.cpp SOURCE=..\..\..\src\osgWrappers\osg\Vec3f.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\Vec3s.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Vec4.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\Vec4b.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Vec4d.cpp # End Source File @@ -542,6 +579,14 @@ SOURCE=..\..\..\src\osgWrappers\osg\Vec4d.cpp SOURCE=..\..\..\src\osgWrappers\osg\Vec4f.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\Vec4s.cpp +# End Source File + +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\Vec4ub.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\VertexProgram.cpp # End Source File diff --git a/include/osg/Array b/include/osg/Array index 55d18b4b6..1e52c891b 100644 --- a/include/osg/Array +++ b/include/osg/Array @@ -273,10 +273,6 @@ typedef TemplateArray typedef TemplateArray Vec4ubArray; -#ifdef USE_DEPRECATED_API -typedef Vec4ubArray UByte4Array; -#endif - typedef TemplateArray Vec2sArray; typedef TemplateArray Vec3sArray; typedef TemplateArray Vec4sArray; @@ -304,15 +300,15 @@ class ArrayVisitor virtual void apply(Vec3Array&) {} virtual void apply(Vec4Array&) {} - virtual void apply(Vec2sArray&) {} - virtual void apply(Vec3sArray&) {} - virtual void apply(Vec4sArray&) {} + virtual void apply(Vec4ubArray&) {} virtual void apply(Vec2bArray&) {} virtual void apply(Vec3bArray&) {} virtual void apply(Vec4bArray&) {} - virtual void apply(Vec4ubArray&) {} + virtual void apply(Vec2sArray&) {} + virtual void apply(Vec3sArray&) {} + virtual void apply(Vec4sArray&) {} }; class ConstArrayVisitor @@ -358,19 +354,20 @@ class ValueVisitor virtual void apply(GLuint&) {} virtual void apply(GLfloat&) {} - virtual void apply(Vec4ub&) {} virtual void apply(Vec2&) {} virtual void apply(Vec3&) {} virtual void apply(Vec4&) {} + + virtual void apply(Vec4ub&) {} + + virtual void apply(Vec2b&) {} + virtual void apply(Vec3b&) {} + virtual void apply(Vec4b&) {} virtual void apply(Vec2s&) {} virtual void apply(Vec3s&) {} virtual void apply(Vec4s&) {} - - virtual void apply(Vec2b&) {} - virtual void apply(Vec3b&) {} - virtual void apply(Vec4b&) {} }; class ConstValueVisitor @@ -391,13 +388,14 @@ class ConstValueVisitor virtual void apply(const Vec2&) {} virtual void apply(const Vec3&) {} virtual void apply(const Vec4&) {} + + virtual void apply(const Vec2b&) {} + virtual void apply(const Vec3b&) {} + virtual void apply(const Vec4b&) {} virtual void apply(const Vec2s&) {} virtual void apply(const Vec3s&) {} virtual void apply(const Vec4s&) {} - virtual void apply(const Vec2b&) {} - virtual void apply(const Vec3b&) {} - virtual void apply(const Vec4b&) {} }; template diff --git a/src/osgWrappers/osg/Array.cpp b/src/osgWrappers/osg/Array.cpp index 2b0674e13..ce2a2d02a 100644 --- a/src/osgWrappers/osg/Array.cpp +++ b/src/osgWrappers/osg/Array.cpp @@ -12,10 +12,16 @@ #include #include #include -#include #include +#include +#include #include +#include +#include #include +#include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -33,11 +39,17 @@ BEGIN_ENUM_REFLECTOR(osg::Array::Type) I_EnumLabel(osg::Array::UByteArrayType); I_EnumLabel(osg::Array::UShortArrayType); I_EnumLabel(osg::Array::UIntArrayType); - I_EnumLabel(osg::Array::UByte4ArrayType); + I_EnumLabel(osg::Array::Vec4ubArrayType); I_EnumLabel(osg::Array::FloatArrayType); I_EnumLabel(osg::Array::Vec2ArrayType); I_EnumLabel(osg::Array::Vec3ArrayType); I_EnumLabel(osg::Array::Vec4ArrayType); + I_EnumLabel(osg::Array::Vec2sArrayType); + I_EnumLabel(osg::Array::Vec3sArrayType); + I_EnumLabel(osg::Array::Vec4sArrayType); + I_EnumLabel(osg::Array::Vec2bArrayType); + I_EnumLabel(osg::Array::Vec3bArrayType); + I_EnumLabel(osg::Array::Vec4bArrayType); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Array) @@ -78,11 +90,17 @@ BEGIN_VALUE_REFLECTOR(osg::ArrayVisitor) I_Method1(void, apply, IN, osg::UByteArray &, x); I_Method1(void, apply, IN, osg::UShortArray &, x); I_Method1(void, apply, IN, osg::UIntArray &, x); - I_Method1(void, apply, IN, osg::UByte4Array &, x); I_Method1(void, apply, IN, osg::FloatArray &, x); I_Method1(void, apply, IN, osg::Vec2Array &, x); I_Method1(void, apply, IN, osg::Vec3Array &, x); I_Method1(void, apply, IN, osg::Vec4Array &, x); + I_Method1(void, apply, IN, osg::Vec4ubArray &, x); + I_Method1(void, apply, IN, osg::Vec2bArray &, x); + I_Method1(void, apply, IN, osg::Vec3bArray &, x); + I_Method1(void, apply, IN, osg::Vec4bArray &, x); + I_Method1(void, apply, IN, osg::Vec2sArray &, x); + I_Method1(void, apply, IN, osg::Vec3sArray &, x); + I_Method1(void, apply, IN, osg::Vec4sArray &, x); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor) @@ -94,11 +112,17 @@ BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor) I_Method1(void, apply, IN, const osg::UByteArray &, x); I_Method1(void, apply, IN, const osg::UShortArray &, x); I_Method1(void, apply, IN, const osg::UIntArray &, x); - I_Method1(void, apply, IN, const osg::UByte4Array &, x); I_Method1(void, apply, IN, const osg::FloatArray &, x); I_Method1(void, apply, IN, const osg::Vec2Array &, x); I_Method1(void, apply, IN, const osg::Vec3Array &, x); I_Method1(void, apply, IN, const osg::Vec4Array &, x); + I_Method1(void, apply, IN, const osg::Vec4ubArray &, x); + I_Method1(void, apply, IN, const osg::Vec2bArray &, x); + I_Method1(void, apply, IN, const osg::Vec3bArray &, x); + I_Method1(void, apply, IN, const osg::Vec4bArray &, x); + I_Method1(void, apply, IN, const osg::Vec2sArray &, x); + I_Method1(void, apply, IN, const osg::Vec3sArray &, x); + I_Method1(void, apply, IN, const osg::Vec4sArray &, x); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ConstValueVisitor) @@ -110,10 +134,16 @@ BEGIN_VALUE_REFLECTOR(osg::ConstValueVisitor) I_Method1(void, apply, IN, const GLubyte &, x); I_Method1(void, apply, IN, const GLuint &, x); I_Method1(void, apply, IN, const GLfloat &, x); - I_Method1(void, apply, IN, const osg::UByte4 &, x); + I_Method1(void, apply, IN, const osg::Vec4ub &, x); I_Method1(void, apply, IN, const osg::Vec2 &, x); I_Method1(void, apply, IN, const osg::Vec3 &, x); I_Method1(void, apply, IN, const osg::Vec4 &, x); + I_Method1(void, apply, IN, const osg::Vec2b &, x); + I_Method1(void, apply, IN, const osg::Vec3b &, x); + I_Method1(void, apply, IN, const osg::Vec4b &, x); + I_Method1(void, apply, IN, const osg::Vec2s &, x); + I_Method1(void, apply, IN, const osg::Vec3s &, x); + I_Method1(void, apply, IN, const osg::Vec4s &, x); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::IndexArray) @@ -133,10 +163,16 @@ BEGIN_VALUE_REFLECTOR(osg::ValueVisitor) I_Method1(void, apply, IN, GLubyte &, x); I_Method1(void, apply, IN, GLuint &, x); I_Method1(void, apply, IN, GLfloat &, x); - I_Method1(void, apply, IN, osg::UByte4 &, x); I_Method1(void, apply, IN, osg::Vec2 &, x); I_Method1(void, apply, IN, osg::Vec3 &, x); I_Method1(void, apply, IN, osg::Vec4 &, x); + I_Method1(void, apply, IN, osg::Vec4ub &, x); + I_Method1(void, apply, IN, osg::Vec2b &, x); + I_Method1(void, apply, IN, osg::Vec3b &, x); + I_Method1(void, apply, IN, osg::Vec4b &, x); + I_Method1(void, apply, IN, osg::Vec2s &, x); + I_Method1(void, apply, IN, osg::Vec3s &, x); + I_Method1(void, apply, IN, osg::Vec4s &, x); END_REFLECTOR TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >, osg::ByteArray); @@ -153,14 +189,26 @@ TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntArrayType TYPE_NAME_ALIAS(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >, osg::FloatArray); -TYPE_NAME_ALIAS(osg::TemplateArray< osg::UByte4 COMMA osg::Array::UByte4ArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >, osg::UByte4Array); - TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >, osg::Vec2Array); TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT >, osg::Vec3Array); TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >, osg::Vec4Array); +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >, osg::Vec4ubArray); + +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >, osg::Vec2sArray); + +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >, osg::Vec3sArray); + +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >, osg::Vec4sArray); + +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE >, osg::Vec2bArray); + +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE >, osg::Vec3bArray); + +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >, osg::Vec4bArray); + BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >) I_BaseType(osg::Array); I_BaseType(std::vector); @@ -182,27 +230,6 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArray I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::UByte4 COMMA osg::Array::UByte4ArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >) - I_BaseType(osg::Array); - I_BaseType(std::vector); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::UByte4 COMMA osg::Array::UByte4ArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Constructor1(IN, unsigned int, no); - I_Constructor2(IN, unsigned int, no, IN, osg::UByte4 *, ptr); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(void, accept, IN, osg::ArrayVisitor &, av); - I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - I_Method0(const GLvoid *, getDataPointer); - I_Method0(unsigned int, getTotalDataSize); - I_Method0(unsigned int, getNumElements); - I_ReadOnlyProperty(const GLvoid *, DataPointer); - I_ReadOnlyProperty(unsigned int, TotalDataSize); -END_REFLECTOR - BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >) I_BaseType(osg::Array); I_BaseType(std::vector); @@ -224,6 +251,48 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2Arra I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE >) + I_BaseType(osg::Array); + I_BaseType(std::vector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec2b *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >) + I_BaseType(osg::Array); + I_BaseType(std::vector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec2s *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT >) I_BaseType(osg::Array); I_BaseType(std::vector); @@ -245,6 +314,48 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3Arra I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE >) + I_BaseType(osg::Array); + I_BaseType(std::vector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec3b *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >) + I_BaseType(osg::Array); + I_BaseType(std::vector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec3s *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >) I_BaseType(osg::Array); I_BaseType(std::vector); @@ -266,6 +377,69 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4Arra I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >) + I_BaseType(osg::Array); + I_BaseType(std::vector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec4b *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >) + I_BaseType(osg::Array); + I_BaseType(std::vector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec4s *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >) + I_BaseType(osg::Array); + I_BaseType(std::vector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec4ub *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >) I_BaseType(osg::IndexArray); I_BaseType(std::vector); @@ -399,10 +573,16 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLushort COMMA osg::Array::USho END_REFLECTOR - STD_VECTOR_REFLECTOR(std::vector); STD_VECTOR_REFLECTOR(std::vector); STD_VECTOR_REFLECTOR(std::vector); STD_VECTOR_REFLECTOR(std::vector); + STD_VECTOR_REFLECTOR(std::vector); + STD_VECTOR_REFLECTOR(std::vector); + STD_VECTOR_REFLECTOR(std::vector); + STD_VECTOR_REFLECTOR(std::vector); + STD_VECTOR_REFLECTOR(std::vector); + STD_VECTOR_REFLECTOR(std::vector); + STD_VECTOR_REFLECTOR(std::vector); STD_VECTOR_REFLECTOR(std::vector); STD_VECTOR_REFLECTOR(std::vector); STD_VECTOR_REFLECTOR(std::vector); diff --git a/src/osgWrappers/osg/CameraNode.cpp b/src/osgWrappers/osg/CameraNode.cpp new file mode 100644 index 000000000..72bc54e07 --- /dev/null +++ b/src/osgWrappers/osg/CameraNode.cpp @@ -0,0 +1,144 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include +#include +#include +#include +#include +#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 + +TYPE_NAME_ALIAS(std::vector< GLenum >, osg::CameraNode::DrawBufferList); + +TYPE_NAME_ALIAS(std::map< osg::CameraNode::BufferComponent COMMA osg::CameraNode::Attachment >, osg::CameraNode::BufferAttachmentMap); + +BEGIN_ENUM_REFLECTOR(osg::CameraNode::TransformOrder) + I_EnumLabel(osg::CameraNode::PRE_MULTIPLE); + I_EnumLabel(osg::CameraNode::POST_MULTIPLE); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::CameraNode::RenderOrder) + I_EnumLabel(osg::CameraNode::PRE_RENDER); + I_EnumLabel(osg::CameraNode::NESTED_RENDER); + I_EnumLabel(osg::CameraNode::POST_RENDER); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::CameraNode::RenderTargetImplementation) + I_EnumLabel(osg::CameraNode::FRAME_BUFFER_OBJECT); + I_EnumLabel(osg::CameraNode::PIXEL_BUFFER); + I_EnumLabel(osg::CameraNode::FRAME_BUFFER); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::CameraNode::BufferComponent) + I_EnumLabel(osg::CameraNode::COLOR_BUFFER); + I_EnumLabel(osg::CameraNode::DEPTH_BUFFER); + I_EnumLabel(osg::CameraNode::STENCIL_BUFFER); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::CameraNode) + I_BaseType(osg::Transform); + I_BaseType(osg::CullSettings); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::CameraNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method1(void, setViewport, IN, osg::Viewport *, viewport); + I_Method4(void, setViewport, IN, int, x, IN, int, y, IN, int, width, IN, int, height); + I_Method0(const osg::Viewport *, getViewport); + I_Method0(osg::Viewport *, getViewport); + I_Method4(void, getViewport, IN, int &, x, IN, int &, y, IN, int &, width, IN, int &, height); + I_Method1(void, setTransformOrder, IN, osg::CameraNode::TransformOrder, order); + I_Method0(osg::CameraNode::TransformOrder, getTransformOrder); + I_Method1(void, setProjectionMatrix, IN, const osg::Matrixf &, matrix); + I_Method1(void, setProjectionMatrix, IN, const osg::Matrixd &, matrix); + I_Method6(void, setProjectionMatrixAsOrtho, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); + I_Method4(void, setProjectionMatrixAsOrtho2D, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top); + I_Method6(void, setProjectionMatrixAsFrustum, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); + I_Method4(void, setProjectionMatrixAsPerspective, IN, double, fovy, IN, double, aspectRatio, IN, double, zNear, IN, double, zFar); + I_Method0(osg::Matrixd &, getProjectionMatrix); + I_Method0(const osg::Matrixd &, getProjectionMatrix); + I_Method6(bool, getProjectionMatrixAsOrtho, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); + I_Method6(bool, getProjectionMatrixAsFrustum, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); + I_Method4(bool, getProjectionMatrixAsPerspective, IN, double &, fovy, IN, double &, aspectRatio, IN, double &, zNear, IN, double &, zFar); + I_Method1(void, setViewMatrix, IN, const osg::Matrixf &, matrix); + I_Method1(void, setViewMatrix, IN, const osg::Matrixd &, matrix); + I_Method3(void, setViewMatrixAsLookAt, IN, const osg::Vec3 &, eye, IN, const osg::Vec3 &, center, IN, const osg::Vec3 &, up); + I_Method0(osg::Matrixd &, getViewMatrix); + I_Method0(const osg::Matrixd &, getViewMatrix); + I_MethodWithDefaults4(void, getViewMatrixAsLookAt, IN, osg::Vec3 &, eye, , IN, osg::Vec3 &, center, , IN, osg::Vec3 &, up, , IN, float, lookDistance, 1.0f); + I_Method0(osg::Matrixd, getInverseViewMatrix); + I_Method1(void, setClearColor, IN, const osg::Vec4 &, color); + I_Method0(const osg::Vec4 &, getClearColor); + I_Method1(void, setClearMask, IN, GLbitfield, mask); + I_Method0(GLbitfield, getClearMask); + I_Method1(void, setRenderOrder, IN, osg::CameraNode::RenderOrder, order); + I_Method0(osg::CameraNode::RenderOrder, getRenderOrder); + I_Method1(void, setRenderTargetImplmentation, IN, osg::CameraNode::RenderTargetImplementation, impl); + I_Method0(osg::CameraNode::RenderTargetImplementation, getRenderTargetImplmentation); + I_Method2(void, setDrawBuffer, IN, unsigned int, pos, IN, GLenum, buffer); + I_Method1(GLenum, getDrawBuffer, IN, unsigned int, pos); + I_Method0(osg::CameraNode::DrawBufferList &, getDrawBufferList); + I_Method0(const osg::CameraNode::DrawBufferList &, getDrawBufferList); + I_Method1(void, setReadBuffer, IN, GLenum, buffer); + I_Method0(GLenum, getReadBuffer); + I_Method2(void, attach, IN, osg::CameraNode::BufferComponent, buffer, IN, GLenum, internalFormat); + I_MethodWithDefaults4(void, attach, IN, osg::CameraNode::BufferComponent, buffer, , IN, osg::Texture *, texture, , IN, unsigned int, level, 0, IN, unsigned int, face, 0); + I_Method2(void, attach, IN, osg::CameraNode::BufferComponent, buffer, IN, osg::Image *, image); + I_Method1(void, detach, IN, osg::CameraNode::BufferComponent, buffer); + I_Method0(osg::CameraNode::BufferAttachmentMap &, getBufferAttachmentMap); + I_Method0(const osg::CameraNode::BufferAttachmentMap &, getBufferAttachmentMap); + I_Method1(void, setRenderingCache, IN, osg::Object *, rc); + I_Method0(osg::Object *, getRenderingCache); + I_Method0(const osg::Object *, getRenderingCache); + I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); + I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); + I_ReadOnlyProperty(osg::CameraNode::BufferAttachmentMap &, BufferAttachmentMap); + I_Property(const osg::Vec4 &, ClearColor); + I_Property(GLbitfield, ClearMask); + I_IndexedProperty1(GLenum, DrawBuffer, unsigned int, pos); + I_ReadOnlyProperty(osg::CameraNode::DrawBufferList &, DrawBufferList); + I_ReadOnlyProperty(osg::Matrixd, InverseViewMatrix); + I_Property(const osg::Matrixd &, ProjectionMatrix); + I_Property(GLenum, ReadBuffer); + I_Property(osg::CameraNode::RenderOrder, RenderOrder); + I_Property(osg::CameraNode::RenderTargetImplementation, RenderTargetImplmentation); + I_Property(osg::Object *, RenderingCache); + I_Property(osg::CameraNode::TransformOrder, TransformOrder); + I_Property(const osg::Matrixd &, ViewMatrix); + I_Property(osg::Viewport *, Viewport); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::CameraNode::Attachment) + I_Constructor0(); +END_REFLECTOR + +STD_MAP_REFLECTOR(std::map< osg::CameraNode::BufferComponent COMMA osg::CameraNode::Attachment >); + +STD_VECTOR_REFLECTOR(std::vector< GLenum >); + diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index b0d72bf29..038498d85 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -20,10 +20,10 @@ #include #include #include -#include #include #include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -149,7 +149,7 @@ BEGIN_VALUE_REFLECTOR(osg::Drawable::AttributeFunctor) I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec2 *, x); I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec3 *, x); I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec4 *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::UByte4 *, x); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec4ub *, x); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) @@ -176,7 +176,7 @@ BEGIN_VALUE_REFLECTOR(osg::Drawable::ConstAttributeFunctor) I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec2 *, x); I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec3 *, x); I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec4 *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::UByte4 *, x); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec4ub *, x); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Drawable::CullCallback) @@ -270,6 +270,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions) I_Method2(void, glBeginQuery, IN, GLenum, target, IN, GLuint, id); I_Method1(void, glEndQuery, IN, GLenum, target); I_Method1(GLboolean, glIsQuery, IN, GLuint, id); + I_Method2(void, glDeleteQueries, IN, GLsizei, n, IN, const GLuint *, ids); I_Method3(void, glGetQueryObjectiv, IN, GLuint, id, IN, GLenum, pname, IN, GLint *, params); I_Method3(void, glGetQueryObjectuiv, IN, GLuint, id, IN, GLenum, pname, IN, GLuint *, params); I_WriteOnlyProperty(bool, ARBOcclusionQuerySupported); diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp new file mode 100644 index 000000000..9f3b661ad --- /dev/null +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -0,0 +1,118 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include +#include +#include +#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 + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindRenderbufferEXT); + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenRenderbuffersEXT); + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageEXT); + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindFramebufferEXT); + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenFramebuffersEXT); + +TYPE_NAME_ALIAS(GLenum , osg::FBOExtensions::TglCheckFramebufferStatusEXT); + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture1DEXT); + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture2DEXT); + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture3DEXT); + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferRenderbufferEXT); + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT); + +BEGIN_VALUE_REFLECTOR(osg::FBOExtensions) + I_Method0(bool, isSupported); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) + I_Constructor0(); + I_Constructor1(IN, const osg::FrameBufferAttachment &, copy); + I_Constructor1(IN, osg::RenderBuffer *, target); + I_ConstructorWithDefaults2(IN, osg::Texture1D *, target, , IN, int, level, 0); + I_ConstructorWithDefaults2(IN, osg::Texture2D *, target, , IN, int, level, 0); + I_ConstructorWithDefaults3(IN, osg::Texture3D *, target, , IN, int, zoffset, , IN, int, level, 0); + I_ConstructorWithDefaults3(IN, osg::TextureCubeMap *, target, , IN, int, face, , IN, int, level, 0); + I_Constructor1(IN, osg::TextureRectangle *, target); + I_Method3(void, attach, IN, osg::State &, state, IN, GLenum, attachment_point, IN, const osg::FBOExtensions *, ext); + I_Method1(int, compare, IN, const osg::FrameBufferAttachment &, fa); +END_REFLECTOR + +TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap); + +BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::FrameBufferObject &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method0(osg::StateAttribute::Type, getType); + I_Method0(const osg::FrameBufferObject::AttachmentMap &, getAttachmentMap); + I_Method1(bool, hasAttachment, IN, GLenum, attachment_point); + I_Method1(const osg::FrameBufferAttachment &, getAttachment, IN, GLenum, attachment_point); + I_Method2(void, setAttachment, IN, GLenum, attachment_point, IN, const osg::FrameBufferAttachment &, attachment); + I_Method1(int, compare, IN, const osg::StateAttribute &, sa); + I_Method1(void, apply, IN, osg::State &, state); + I_IndexedProperty1(const osg::FrameBufferAttachment &, Attachment, GLenum, attachment_point); + I_ReadOnlyProperty(const osg::FrameBufferObject::AttachmentMap &, AttachmentMap); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer) + I_BaseType(osg::Object); + I_Constructor0(); + I_Constructor3(IN, int, width, IN, int, height, IN, GLenum, internalFormat); + I_ConstructorWithDefaults2(IN, const osg::RenderBuffer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method0(int, getWidth); + I_Method0(int, getHeight); + I_Method1(void, setWidth, IN, int, w); + I_Method1(void, setHeight, IN, int, h); + I_Method2(void, setSize, IN, int, w, IN, int, h); + I_Method0(GLenum, getInternalFormat); + I_Method1(void, setInternalFormat, IN, GLenum, format); + I_Method2(GLuint, getObjectID, IN, unsigned int, contextID, IN, const osg::FBOExtensions *, ext); + I_Method1(int, compare, IN, const osg::RenderBuffer &, rb); + I_Property(int, Height); + I_Property(GLenum, InternalFormat); + I_Property(int, Width); +END_REFLECTOR + +STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::FrameBufferAttachment >); + diff --git a/src/osgWrappers/osg/GNUmakefile b/src/osgWrappers/osg/GNUmakefile index d9186f5e3..05f4ecc79 100644 --- a/src/osgWrappers/osg/GNUmakefile +++ b/src/osgWrappers/osg/GNUmakefile @@ -15,6 +15,7 @@ CXXFILES =\ BoundingBox.cpp\ BoundingSphere.cpp\ BufferObject.cpp\ + CameraNode.cpp\ ClearNode.cpp\ ClipNode.cpp\ ClipPlane.cpp\ @@ -27,39 +28,43 @@ CXXFILES =\ CoordinateSystemNode.cpp\ CopyOp.cpp\ CullFace.cpp\ - CullingSet.cpp\ CullSettings.cpp\ CullStack.cpp\ + CullingSet.cpp\ Depth.cpp\ DisplaySettings.cpp\ - Drawable.cpp\ DrawPixels.cpp\ + Drawable.cpp\ + Endian.cpp\ Fog.cpp\ FragmentProgram.cpp\ + FrameBufferObject.cpp\ FrameStamp.cpp\ FrontFace.cpp\ + GL2Extensions.cpp\ Geode.cpp\ Geometry.cpp\ Group.cpp\ Image.cpp\ ImageStream.cpp\ + LOD.cpp\ Light.cpp\ LightModel.cpp\ LightSource.cpp\ LineSegment.cpp\ LineStipple.cpp\ LineWidth.cpp\ - LOD.cpp\ LogicOp.cpp\ Material.cpp\ Matrix.cpp\ + MatrixTransform.cpp\ Matrixd.cpp\ Matrixf.cpp\ - MatrixTransform.cpp\ Multisample.cpp\ - NodeCallback.cpp\ Node.cpp\ + NodeCallback.cpp\ NodeVisitor.cpp\ + Notify.cpp\ Object.cpp\ OccluderNode.cpp\ PagedLOD.cpp\ @@ -76,48 +81,54 @@ CXXFILES =\ Projection.cpp\ ProxyNode.cpp\ Quat.cpp\ - Referenced.cpp\ RefNodePath.cpp\ + Referenced.cpp\ Sequence.cpp\ ShadeModel.cpp\ Shader.cpp\ ShadowVolumeOccluder.cpp\ Shape.cpp\ ShapeDrawable.cpp\ - StateAttribute.cpp\ State.cpp\ + StateAttribute.cpp\ StateSet.cpp\ Stencil.cpp\ Switch.cpp\ - TexEnvCombine.cpp\ TexEnv.cpp\ + TexEnvCombine.cpp\ TexEnvFilter.cpp\ TexGen.cpp\ TexGenNode.cpp\ TexMat.cpp\ + Texture.cpp\ Texture1D.cpp\ Texture2D.cpp\ Texture3D.cpp\ - Texture.cpp\ TextureCubeMap.cpp\ TextureRectangle.cpp\ Timer.cpp\ Transform.cpp\ - UByte4.cpp\ Uniform.cpp\ Vec2.cpp\ + Vec2b.cpp\ Vec2d.cpp\ Vec2f.cpp\ + Vec2s.cpp\ Vec3.cpp\ + Vec3b.cpp\ Vec3d.cpp\ Vec3f.cpp\ + Vec3s.cpp\ Vec4.cpp\ + Vec4b.cpp\ Vec4d.cpp\ Vec4f.cpp\ + Vec4s.cpp\ + Vec4ub.cpp\ VertexProgram.cpp\ Viewport.cpp\ -LIBS += -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losg -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index 3e8e74b00..e47ab15b4 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -60,15 +60,15 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry) I_Method0(const osg::Geometry::ArrayData &, getVertexData); I_Method1(void, setNormalBinding, IN, osg::Geometry::AttributeBinding, ab); I_Method0(osg::Geometry::AttributeBinding, getNormalBinding); - I_Method1(void, setNormalArray, IN, osg::Vec3Array *, array); - I_Method0(osg::Vec3Array *, getNormalArray); - I_Method0(const osg::Vec3Array *, getNormalArray); + I_Method1(void, setNormalArray, IN, osg::Array *, array); + I_Method0(osg::Array *, getNormalArray); + I_Method0(const osg::Array *, getNormalArray); I_Method1(void, setNormalIndices, IN, osg::IndexArray *, array); I_Method0(osg::IndexArray *, getNormalIndices); I_Method0(const osg::IndexArray *, getNormalIndices); - I_Method1(void, setNormalData, IN, const osg::Geometry::Vec3ArrayData &, arrayData); - I_Method0(osg::Geometry::Vec3ArrayData &, getNormalData); - I_Method0(const osg::Geometry::Vec3ArrayData &, getNormalData); + I_Method1(void, setNormalData, IN, const osg::Geometry::ArrayData &, arrayData); + I_Method0(osg::Geometry::ArrayData &, getNormalData); + I_Method0(const osg::Geometry::ArrayData &, getNormalData); I_Method1(void, setColorBinding, IN, osg::Geometry::AttributeBinding, ab); I_Method0(osg::Geometry::AttributeBinding, getColorBinding); I_Method1(void, setColorArray, IN, osg::Array *, array); @@ -175,9 +175,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry) I_Property(osg::IndexArray *, FogCoordIndices); I_ReadOnlyProperty(unsigned int, GLObjectSizeHint); I_Property(osg::Geometry *, InternalOptimizedGeometry); - I_Property(osg::Vec3Array *, NormalArray); + I_Property(osg::Array *, NormalArray); I_Property(osg::Geometry::AttributeBinding, NormalBinding); - I_Property(const osg::Geometry::Vec3ArrayData &, NormalData); + I_Property(const osg::Geometry::ArrayData &, NormalData); I_Property(osg::IndexArray *, NormalIndices); I_ArrayProperty_GSA(osg::PrimitiveSet *, PrimitiveSet, PrimitiveSets, unsigned int, bool); I_Property(const osg::Geometry::PrimitiveSetList &, PrimitiveSetList); diff --git a/src/osgWrappers/osg/NodeVisitor.cpp b/src/osgWrappers/osg/NodeVisitor.cpp index 6269f5100..0a1c92c70 100644 --- a/src/osgWrappers/osg/NodeVisitor.cpp +++ b/src/osgWrappers/osg/NodeVisitor.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -100,6 +101,7 @@ BEGIN_OBJECT_REFLECTOR(osg::NodeVisitor) I_Method1(void, apply, IN, osg::TexGenNode &, node); I_Method1(void, apply, IN, osg::LightSource &, node); I_Method1(void, apply, IN, osg::Transform &, node); + I_Method1(void, apply, IN, osg::CameraNode &, node); I_Method1(void, apply, IN, osg::MatrixTransform &, node); I_Method1(void, apply, IN, osg::PositionAttitudeTransform &, node); I_Method1(void, apply, IN, osg::Switch &, node); diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp index 99a7b6001..10d05248e 100644 --- a/src/osgWrappers/osg/Program.cpp +++ b/src/osgWrappers/osg/Program.cpp @@ -68,6 +68,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram) I_Method0(GLuint, getHandle); I_Method0(void, requestLink); I_Method0(void, linkProgram); + I_Method0(void, validateProgram); I_Method0(bool, needsLink); I_Method0(bool, isLinked); I_Method1(bool, getInfoLog, IN, std::string &, infoLog); diff --git a/src/osgWrappers/osg/Sequence.cpp b/src/osgWrappers/osg/Sequence.cpp index 1290f6d77..b05c99d86 100644 --- a/src/osgWrappers/osg/Sequence.cpp +++ b/src/osgWrappers/osg/Sequence.cpp @@ -49,6 +49,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Sequence) I_Method0(int, getValue); I_Method2(void, setTime, IN, int, frame, IN, float, t); I_Method1(float, getTime, IN, int, frame); + I_Method0(unsigned int, getNumFrames); I_Method3(void, setInterval, IN, osg::Sequence::LoopMode, mode, IN, int, begin, IN, int, end); I_Method3(void, getInterval, IN, osg::Sequence::LoopMode &, mode, IN, int &, begin, IN, int &, end); I_MethodWithDefaults2(void, setDuration, IN, float, speed, , IN, int, nreps, -1); diff --git a/src/osgWrappers/osg/Shape.cpp b/src/osgWrappers/osg/Shape.cpp index 933603be6..a1facaf69 100644 --- a/src/osgWrappers/osg/Shape.cpp +++ b/src/osgWrappers/osg/Shape.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -237,6 +238,7 @@ BEGIN_OBJECT_REFLECTOR(osg::HeightField) I_Method0(const osg::HeightField::HeightList &, getHeightList); I_Method2(osg::Vec3, getVertex, IN, unsigned int, c, IN, unsigned int, r); I_Method2(osg::Vec3, getNormal, IN, unsigned int, c, IN, unsigned int, r); + I_Method2(osg::Vec2, getHeightDelta, IN, unsigned int, c, IN, unsigned int, r); I_Property(unsigned int, BorderWidth); I_IndexedProperty2(float, Height, unsigned int, c, unsigned int, r); I_ReadOnlyProperty(osg::HeightField::HeightList &, HeightList); diff --git a/src/osgWrappers/osg/TexGenNode.cpp b/src/osgWrappers/osg/TexGenNode.cpp index c9cea3a21..9819af889 100644 --- a/src/osgWrappers/osg/TexGenNode.cpp +++ b/src/osgWrappers/osg/TexGenNode.cpp @@ -23,6 +23,11 @@ #undef OUT #endif +BEGIN_ENUM_REFLECTOR(osg::TexGenNode::ReferenceFrame) + I_EnumLabel(osg::TexGenNode::RELATIVE_RF); + I_EnumLabel(osg::TexGenNode::ABSOLUTE_RF); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::TexGenNode) I_BaseType(osg::Group); I_Constructor0(); @@ -34,11 +39,14 @@ BEGIN_OBJECT_REFLECTOR(osg::TexGenNode) I_Method0(const char *, className); I_Method0(const char *, libraryName); I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method1(void, setReferenceFrame, IN, osg::TexGenNode::ReferenceFrame, rf); + I_Method0(osg::TexGenNode::ReferenceFrame, getReferenceFrame); I_Method1(void, setTextureUnit, IN, unsigned int, textureUnit); I_Method0(unsigned int, getTextureUnit); I_Method1(void, setTexGen, IN, osg::TexGen *, texgen); I_Method0(osg::TexGen *, getTexGen); I_Method0(const osg::TexGen *, getTexGen); + I_Property(osg::TexGenNode::ReferenceFrame, ReferenceFrame); I_Property(osg::TexGen *, TexGen); I_Property(unsigned int, TextureUnit); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec2b.cpp b/src/osgWrappers/osg/Vec2b.cpp new file mode 100644 index 000000000..4ce890ae5 --- /dev/null +++ b/src/osgWrappers/osg/Vec2b.cpp @@ -0,0 +1,37 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +#include + +BEGIN_VALUE_REFLECTOR(osg::Vec2b) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor2(IN, char, r, IN, char, g); + I_Method0(char *, ptr); + I_Method0(const char *, ptr); + I_Method2(void, set, IN, char, r, IN, char, g); + I_Method0(char &, r); + I_Method0(char &, g); + I_Method0(char, r); + I_Method0(char, g); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/Vec2s.cpp b/src/osgWrappers/osg/Vec2s.cpp new file mode 100644 index 000000000..3ccad7085 --- /dev/null +++ b/src/osgWrappers/osg/Vec2s.cpp @@ -0,0 +1,30 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +TYPE_NAME_ALIAS(short, osg::Vec2s::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec2s) + I_Constructor0(); + I_Constructor2(IN, osg::Vec2s::value_type, xx, IN, osg::Vec2s::value_type, yy); + I_Method0(osg::Vec2s::value_type *, ptr); + I_Method0(const osg::Vec2s::value_type *, ptr); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/Vec3b.cpp b/src/osgWrappers/osg/Vec3b.cpp new file mode 100644 index 000000000..ce0cb8898 --- /dev/null +++ b/src/osgWrappers/osg/Vec3b.cpp @@ -0,0 +1,39 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +#include + +BEGIN_VALUE_REFLECTOR(osg::Vec3b) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor3(IN, char, r, IN, char, g, IN, char, b); + I_Method0(char *, ptr); + I_Method0(const char *, ptr); + I_Method3(void, set, IN, char, r, IN, char, g, IN, char, b); + I_Method0(char &, r); + I_Method0(char &, g); + I_Method0(char &, b); + I_Method0(char, r); + I_Method0(char, g); + I_Method0(char, b); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/Vec3s.cpp b/src/osgWrappers/osg/Vec3s.cpp new file mode 100644 index 000000000..47dee7e40 --- /dev/null +++ b/src/osgWrappers/osg/Vec3s.cpp @@ -0,0 +1,30 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +TYPE_NAME_ALIAS(short, osg::Vec3s::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec3s) + I_Constructor0(); + I_Constructor3(IN, osg::Vec3s::value_type, xx, IN, osg::Vec3s::value_type, yy, IN, osg::Vec3s::value_type, zz); + I_Method0(osg::Vec3s::value_type *, ptr); + I_Method0(const osg::Vec3s::value_type *, ptr); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/Vec4b.cpp b/src/osgWrappers/osg/Vec4b.cpp new file mode 100644 index 000000000..76d76d23f --- /dev/null +++ b/src/osgWrappers/osg/Vec4b.cpp @@ -0,0 +1,41 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +#include + +BEGIN_VALUE_REFLECTOR(osg::Vec4b) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor4(IN, char, r, IN, char, g, IN, char, b, IN, char, a); + I_Method0(char *, ptr); + I_Method0(const char *, ptr); + I_Method4(void, set, IN, char, r, IN, char, g, IN, char, b, IN, char, a); + I_Method0(char &, r); + I_Method0(char &, g); + I_Method0(char &, b); + I_Method0(char &, a); + I_Method0(char, r); + I_Method0(char, g); + I_Method0(char, b); + I_Method0(char, a); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/Vec4s.cpp b/src/osgWrappers/osg/Vec4s.cpp new file mode 100644 index 000000000..fb2719447 --- /dev/null +++ b/src/osgWrappers/osg/Vec4s.cpp @@ -0,0 +1,30 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include + +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +TYPE_NAME_ALIAS(short, osg::Vec4s::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec4s) + I_Constructor0(); + I_Constructor4(IN, osg::Vec4s::value_type, xx, IN, osg::Vec4s::value_type, yy, IN, osg::Vec4s::value_type, zz, IN, osg::Vec4s::value_type, ww); + I_Method0(osg::Vec4s::value_type *, ptr); + I_Method0(const osg::Vec4s::value_type *, ptr); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/UByte4.cpp b/src/osgWrappers/osg/Vec4ub.cpp similarity index 80% rename from src/osgWrappers/osg/UByte4.cpp rename to src/osgWrappers/osg/Vec4ub.cpp index d1ab5399b..835573f36 100644 --- a/src/osgWrappers/osg/UByte4.cpp +++ b/src/osgWrappers/osg/Vec4ub.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -19,7 +19,11 @@ #undef OUT #endif -BEGIN_VALUE_REFLECTOR(osg::UByte4) +#include + +BEGIN_VALUE_REFLECTOR(osg::Vec4ub) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined I_Constructor0(); I_Constructor4(IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a); I_Method0(unsigned char *, ptr); diff --git a/src/osgWrappers/osgDB/GNUmakefile b/src/osgWrappers/osgDB/GNUmakefile index 5f7337f14..705c3f4db 100644 --- a/src/osgWrappers/osgDB/GNUmakefile +++ b/src/osgWrappers/osgDB/GNUmakefile @@ -19,7 +19,7 @@ CXXFILES =\ Registry.cpp\ SharedStateManager.cpp\ -LIBS += -losgDB -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgDB -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osgFX/GNUmakefile b/src/osgWrappers/osgFX/GNUmakefile index 7b9bba345..b1d263777 100644 --- a/src/osgWrappers/osgFX/GNUmakefile +++ b/src/osgWrappers/osgFX/GNUmakefile @@ -13,7 +13,7 @@ CXXFILES =\ Technique.cpp\ Validator.cpp\ -LIBS += -losgFX -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgFX -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osgGA/GNUmakefile b/src/osgWrappers/osgGA/GNUmakefile index 802ad342e..94469dc08 100644 --- a/src/osgWrappers/osgGA/GNUmakefile +++ b/src/osgWrappers/osgGA/GNUmakefile @@ -2,7 +2,7 @@ TOPDIR = ../../.. include $(TOPDIR)/Make/makedefs CXXFILES =\ -AnimationPathManipulator.cpp\ + AnimationPathManipulator.cpp\ DriveManipulator.cpp\ EventVisitor.cpp\ FlightManipulator.cpp\ @@ -18,8 +18,8 @@ AnimationPathManipulator.cpp\ TerrainManipulator.cpp\ TrackballManipulator.cpp\ UFOManipulator.cpp\ - -LIBS += -losgGA -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) + +LIBS += -losgGA -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osgParticle/GNUmakefile b/src/osgWrappers/osgParticle/GNUmakefile index 4e2d85cb7..f43914969 100644 --- a/src/osgWrappers/osgParticle/GNUmakefile +++ b/src/osgWrappers/osgParticle/GNUmakefile @@ -29,15 +29,14 @@ CXXFILES =\ Program.cpp\ RadialShooter.cpp\ RandomRateCounter.cpp\ - range.cpp\ SectorPlacer.cpp\ SegmentPlacer.cpp\ Shooter.cpp\ SmokeEffect.cpp\ VariableRateCounter.cpp\ - + range.cpp\ -LIBS += -losgParticle -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgParticle -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osgProducer/GNUmakefile b/src/osgWrappers/osgProducer/GNUmakefile index 044d0b90c..f813b8a11 100644 --- a/src/osgWrappers/osgProducer/GNUmakefile +++ b/src/osgWrappers/osgProducer/GNUmakefile @@ -9,8 +9,7 @@ CXXFILES =\ Viewer.cpp\ ViewerEventHandler.cpp\ - -LIBS += -losgProducer -losgGA -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osgSim/BlinkSequence.cpp b/src/osgWrappers/osgSim/BlinkSequence.cpp index 00aa02278..8b8bfb58c 100644 --- a/src/osgWrappers/osgSim/BlinkSequence.cpp +++ b/src/osgWrappers/osgSim/BlinkSequence.cpp @@ -34,6 +34,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::BlinkSequence) I_Method2(void, addPulse, IN, double, length, IN, const osg::Vec4 &, color); I_Method0(int, getNumPulses); I_Method3(void, getPulse, IN, unsigned int, i, IN, double &, length, IN, osg::Vec4 &, color); + I_Method3(void, setPulse, IN, unsigned int, i, IN, double, length, IN, const osg::Vec4 &, color); I_Method0(double, getPulsePeriod); I_Method1(void, setSequenceGroup, IN, osgSim::SequenceGroup *, sg); I_Method0(osgSim::SequenceGroup *, getSequenceGroup); diff --git a/src/osgWrappers/osgSim/GNUmakefile b/src/osgWrappers/osgSim/GNUmakefile index d55adc8a5..339dd0b1f 100644 --- a/src/osgWrappers/osgSim/GNUmakefile +++ b/src/osgWrappers/osgSim/GNUmakefile @@ -2,7 +2,7 @@ TOPDIR = ../../.. include $(TOPDIR)/Make/makedefs CXXFILES =\ -BlinkSequence.cpp\ + BlinkSequence.cpp\ ColorRange.cpp\ DOFTransform.cpp\ GeographicLocation.cpp\ @@ -19,8 +19,7 @@ BlinkSequence.cpp\ SphereSegment.cpp\ VisibilityGroup.cpp\ - -LIBS += -losgSim -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgSim -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osgTerrain/DataSet.cpp b/src/osgWrappers/osgTerrain/DataSet.cpp index 1491bd121..55ed56796 100644 --- a/src/osgWrappers/osgTerrain/DataSet.cpp +++ b/src/osgWrappers/osgTerrain/DataSet.cpp @@ -250,6 +250,8 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationData) I_Constructor1(IN, osgTerrain::DataSet *, dataSet); END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::Vec2 >, osgTerrain::DataSet::DestinationTile::HeightDeltaList); + BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::DestinationTile::Position) I_EnumLabel(osgTerrain::DataSet::DestinationTile::LEFT); I_EnumLabel(osgTerrain::DataSet::DestinationTile::LEFT_BELOW); @@ -277,6 +279,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationTile) I_Method0(void, allocate); I_Method1(void, addRequiredResolutions, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); I_Method1(void, readFrom, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); + I_Method0(void, allocateEdgeNormals); I_Method1(void, equalizeCorner, IN, osgTerrain::DataSet::DestinationTile::Position, position); I_Method1(void, equalizeEdge, IN, osgTerrain::DataSet::DestinationTile::Position, position); I_Method0(void, equalizeBoundaries); @@ -480,6 +483,8 @@ STD_MAP_REFLECTOR(std::map< unsigned int COMMA osgTerrain::DataSet::Level >); STD_MAP_REFLECTOR(std::map< unsigned int COMMA osgTerrain::DataSet::Row >); +STD_VECTOR_REFLECTOR(std::vector< osg::Vec2 >); + STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Image > >); STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgTerrain::DataSet::CompositeDestination > >); diff --git a/src/osgWrappers/osgTerrain/GNUmakefile b/src/osgWrappers/osgTerrain/GNUmakefile index fac291bf1..ab968201d 100644 --- a/src/osgWrappers/osgTerrain/GNUmakefile +++ b/src/osgWrappers/osgTerrain/GNUmakefile @@ -6,8 +6,7 @@ CXXFILES =\ HeightFieldNode.cpp\ HeightFieldRenderer.cpp\ - -LIBS += -losgTerrain -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgTerrain -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osgText/GNUmakefile b/src/osgWrappers/osgText/GNUmakefile index 4450bcf68..4de877ac6 100644 --- a/src/osgWrappers/osgText/GNUmakefile +++ b/src/osgWrappers/osgText/GNUmakefile @@ -6,8 +6,10 @@ CXXFILES =\ Font.cpp\ String.cpp\ Text.cpp\ - -LIBS += -losgText -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) + Text.cpp\ + Text.cpp\ + +LIBS += -losgText -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index 9b2325a06..b8fa1e031 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -9,19 +9,7 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -77,85 +65,6 @@ BEGIN_ENUM_REFLECTOR(osgText::Text::DrawModeMask) I_EnumLabel(osgText::Text::ALIGNMENT); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgText::Text) - I_BaseType(osg::Drawable); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osgText::Text &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_MethodWithDefaults1(void, setFont, IN, osgText::Font *, font, 0); - I_Method1(void, setFont, IN, const std::string &, fontfile); - I_Method0(const osgText::Font *, getFont); - I_Method2(void, setFontResolution, IN, unsigned int, width, IN, unsigned int, height); - I_Method0(unsigned int, getFontWidth); - I_Method0(unsigned int, getFontHeight); - I_Method1(void, setText, IN, const osgText::String &, text); - I_Method1(void, setText, IN, const std::string &, text); - I_Method2(void, setText, IN, const std::string &, text, IN, osgText::String::Encoding, encoding); - I_Method1(void, setText, IN, const wchar_t *, text); - I_Method0(osgText::String &, getText); - I_Method0(const osgText::String &, getText); - I_Method0(void, update); - I_MethodWithDefaults2(void, setCharacterSize, IN, float, height, , IN, float, aspectRatio, 1.0f); - I_Method0(float, getCharacterHeight); - I_Method0(float, getCharacterAspectRatio); - I_Method1(void, setCharacterSizeMode, IN, osgText::Text::CharacterSizeMode, mode); - I_Method0(osgText::Text::CharacterSizeMode, getCharacterSizeMode); - I_Method1(void, setMaximumWidth, IN, float, maximumWidth); - I_Method0(float, getMaximumWidth); - I_Method1(void, setMaximumHeight, IN, float, maximumHeight); - I_Method0(float, getMaximumHeight); - I_Method1(void, setPosition, IN, const osg::Vec3 &, pos); - I_Method0(const osg::Vec3 &, getPosition); - I_Method1(void, setAlignment, IN, osgText::Text::AlignmentType, alignment); - I_Method0(osgText::Text::AlignmentType, getAlignment); - I_Method1(void, setAxisAlignment, IN, osgText::Text::AxisAlignment, axis); - I_Method1(void, setRotation, IN, const osg::Quat &, quat); - I_Method0(const osg::Quat &, getRotation); - I_Method1(void, setAutoRotateToScreen, IN, bool, autoRotateToScreen); - I_Method0(bool, getAutoRotateToScreen); - I_Method1(void, setLayout, IN, osgText::Text::Layout, layout); - I_Method0(osgText::Text::Layout, getLayout); - I_Method1(void, setColor, IN, const osg::Vec4 &, color); - I_Method0(const osg::Vec4 &, getColor); - I_Method1(void, setDrawMode, IN, unsigned int, mode); - I_Method0(unsigned int, getDrawMode); - I_Method1(void, setKerningType, IN, osgText::KerningType, kerningType); - I_Method0(osgText::KerningType, getKerningType); - I_Method1(void, drawImplementation, IN, osg::State &, state); - I_Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); - I_Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); - I_Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); - I_Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); - I_Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - I_Method1(const osgText::Text::GlyphQuads *, getGlyphQuads, IN, osg::StateSet *, stateSet); - I_Method0(const osgText::Text::TextureGlyphQuadMap &, getTextureGlyphQuadMap); - I_Method0(osg::BoundingBox, computeBound); - I_Property(osgText::Text::AlignmentType, Alignment); - I_Property(bool, AutoRotateToScreen); - I_WriteOnlyProperty(osgText::Text::AxisAlignment, AxisAlignment); - I_ReadOnlyProperty(float, CharacterAspectRatio); - I_ReadOnlyProperty(float, CharacterHeight); - I_Property(osgText::Text::CharacterSizeMode, CharacterSizeMode); - I_Property(const osg::Vec4 &, Color); - I_Property(unsigned int, DrawMode); - I_WriteOnlyProperty(osgText::Font *, Font); - I_ReadOnlyProperty(unsigned int, FontHeight); - I_ReadOnlyProperty(unsigned int, FontWidth); - I_Property(osgText::KerningType, KerningType); - I_Property(osgText::Text::Layout, Layout); - I_Property(float, MaximumHeight); - I_Property(float, MaximumWidth); - I_Property(const osg::Vec3 &, Position); - I_Property(const osg::Quat &, Rotation); - I_Property(const osgText::String &, Text); - I_ReadOnlyProperty(const osgText::Text::TextureGlyphQuadMap &, TextureGlyphQuadMap); -END_REFLECTOR - TYPE_NAME_ALIAS(std::vector< osgText::Font::Glyph * >, osgText::Text::GlyphQuads::Glyphs); TYPE_NAME_ALIAS(std::vector< unsigned int >, osgText::Text::GlyphQuads::LineNumbers); @@ -166,27 +75,3 @@ TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgText::Text::GlyphQuads::Coords3); TYPE_NAME_ALIAS(std::vector< osg::Vec2 >, osgText::Text::GlyphQuads::TexCoords); -BEGIN_VALUE_REFLECTOR(osgText::Text::GlyphQuads) - I_Constructor0(); - I_Method0(osgText::Text::GlyphQuads::Glyphs, getGlyphs); - I_Method0(const osgText::Text::GlyphQuads::Glyphs, getGlyphs); - I_Method0(osgText::Text::GlyphQuads::Coords2 &, getCoords); - I_Method0(const osgText::Text::GlyphQuads::Coords2 &, getCoords); - I_Method1(osgText::Text::GlyphQuads::Coords3 &, getTransformedCoords, IN, unsigned int, contexID); - I_Method1(const osgText::Text::GlyphQuads::Coords3 &, getTransformedCoords, IN, unsigned int, contexID); - I_Method0(osgText::Text::GlyphQuads::TexCoords &, getTexCoords); - I_Method0(const osgText::Text::GlyphQuads::TexCoords &, getTexCoords); - I_Method0(osgText::Text::GlyphQuads::LineNumbers &, getLineNumbers); - I_Method0(const osgText::Text::GlyphQuads::LineNumbers &, getLineNumbers); - I_ReadOnlyProperty(osgText::Text::GlyphQuads::Coords2 &, Coords); - I_ReadOnlyProperty(osgText::Text::GlyphQuads::Glyphs, Glyphs); - I_ReadOnlyProperty(osgText::Text::GlyphQuads::LineNumbers &, LineNumbers); - I_ReadOnlyProperty(osgText::Text::GlyphQuads::TexCoords &, TexCoords); -END_REFLECTOR - -STD_MAP_REFLECTOR(std::map< osg::ref_ptr< osg::StateSet > COMMA osgText::Text::GlyphQuads >); - -STD_VECTOR_REFLECTOR(std::vector< osg::Vec2 >); - -STD_VECTOR_REFLECTOR(std::vector< osgText::Font::Glyph * >); - diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index d752dadc8..d505aa034 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -68,6 +69,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor) I_Method1(void, apply, IN, osg::Switch &, node); I_Method1(void, apply, IN, osg::LOD &, node); I_Method1(void, apply, IN, osg::ClearNode &, node); + I_Method1(void, apply, IN, osg::CameraNode &, node); I_Method1(void, apply, IN, osg::OccluderNode &, node); I_Method1(void, setClearNode, IN, const osg::ClearNode *, earthSky); I_Method0(const osg::ClearNode *, getClearNode); diff --git a/src/osgWrappers/osgUtil/GNUmakefile b/src/osgWrappers/osgUtil/GNUmakefile index 41ccf8cbd..9125d1c2d 100644 --- a/src/osgWrappers/osgUtil/GNUmakefile +++ b/src/osgWrappers/osgUtil/GNUmakefile @@ -29,8 +29,7 @@ CXXFILES =\ TriStripVisitor.cpp\ UpdateVisitor.cpp\ - -LIBS += -losgUtil -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgUtil -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) OPTF = -O diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index 769de6362..df8d8473e 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -63,8 +63,11 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) I_Method3(void, addPositionedTextureAttribute, IN, unsigned int, textureUnit, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); I_Method2(void, drawPreRenderStages, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); I_Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Method2(void, drawPostRenderStages, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); I_Method2(void, drawImplementation, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); I_Method1(void, addToDependencyList, IN, osgUtil::RenderStage *, rs); + I_Method1(void, addPreRenderStage, IN, osgUtil::RenderStage *, rs); + I_Method1(void, addPostRenderStage, IN, osgUtil::RenderStage *, rs); I_Method1(bool, getStats, IN, osgUtil::Statistics *, primStats); I_Property(const osg::Vec4 &, ClearAccum); I_Property(const osg::Vec4 &, ClearColor); diff --git a/src/osgWrappers/osgUtil/RenderToTextureStage.cpp b/src/osgWrappers/osgUtil/RenderToTextureStage.cpp index b3825c631..8d871267f 100644 --- a/src/osgWrappers/osgUtil/RenderToTextureStage.cpp +++ b/src/osgWrappers/osgUtil/RenderToTextureStage.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -42,7 +43,11 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderToTextureStage) I_Method0(GLenum, getImageReadPixelFormat); I_Method1(void, setImageReadPixelDataType, IN, GLenum, type); I_Method0(GLenum, getImageReadPixelDataType); + I_Method1(void, setFrameBufferObject, IN, osg::FrameBufferObject *, fbo); + I_Method0(osg::FrameBufferObject *, getFrameBufferObject); + I_Method0(const osg::FrameBufferObject *, getFrameBufferObject); I_Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Property(osg::FrameBufferObject *, FrameBufferObject); I_Property(osg::Image *, Image); I_Property(GLenum, ImageReadPixelDataType); I_Property(GLenum, ImageReadPixelFormat);