From 78444878c3b545cfdc7b7693817f0c204cffecc3 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 21 Sep 2006 15:09:10 +0000 Subject: [PATCH] Updated wrappers --- VisualStudio/osgWrappers/osg/wrapper_osg.dsp | 8 ++ .../osgWrappers/osgText/wrapper_osgText.dsp | 8 ++ src/osgWrappers/osg/BlendColor.cpp | 5 +- src/osgWrappers/osg/CameraNode.cpp | 5 ++ src/osgWrappers/osg/Drawable.cpp | 8 +- src/osgWrappers/osg/GNUmakefile | 2 + src/osgWrappers/osg/NodeVisitor.cpp | 2 + src/osgWrappers/osg/RenderInfo.cpp | 45 ++++++++++ src/osgWrappers/osg/View.cpp | 84 +++++++++++++++++++ .../osgParticle/PrecipitationEffect.cpp | 4 +- src/osgWrappers/osgText/FadeText.cpp | 28 +++++++ src/osgWrappers/osgText/GNUmakefile | 2 + src/osgWrappers/osgText/Text.cpp | 3 +- src/osgWrappers/osgUtil/CullVisitor.cpp | 5 ++ src/osgWrappers/osgUtil/RenderBin.cpp | 8 +- src/osgWrappers/osgUtil/RenderLeaf.cpp | 4 +- src/osgWrappers/osgUtil/RenderStage.cpp | 16 ++-- src/osgWrappers/osgUtil/SceneView.cpp | 10 +++ 18 files changed, 226 insertions(+), 21 deletions(-) create mode 100644 src/osgWrappers/osg/RenderInfo.cpp create mode 100644 src/osgWrappers/osg/View.cpp create mode 100644 src/osgWrappers/osgText/FadeText.cpp diff --git a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp index b9befe590..df946b9f6 100644 --- a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp +++ b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp @@ -435,6 +435,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\Quat.cpp SOURCE=..\..\..\src\osgWrappers\osg\Referenced.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\RenderInfo.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Scissor.cpp # End Source File @@ -611,6 +615,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\Vec4ub.cpp SOURCE=..\..\..\src\osgWrappers\osg\VertexProgram.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osg\View.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Viewport.cpp # End Source File diff --git a/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp b/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp index cb62f1369..bd12068eb 100644 --- a/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp +++ b/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp @@ -99,6 +99,14 @@ LINK32=link.exe SOURCE=..\..\..\src\osgWrappers\osgText\Export.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgText\FadeText.cpp +# End Source File + +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgText\FadeTextBKP.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgText\Font.cpp # End Source File diff --git a/src/osgWrappers/osg/BlendColor.cpp b/src/osgWrappers/osg/BlendColor.cpp index 99f1448d9..31d07b81a 100644 --- a/src/osgWrappers/osg/BlendColor.cpp +++ b/src/osgWrappers/osg/BlendColor.cpp @@ -39,11 +39,12 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor) I_Method1(int, compare, IN, const osg::StateAttribute &, sa); I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); I_Method1(void, setConstantColor, IN, const osg::Vec4 &, color); - I_Method0(osg::Vec4, getConstantColor); + I_Method0(osg::Vec4 &, getConstantColor); + I_Method0(const osg::Vec4 &, getConstantColor); I_Method1(void, apply, IN, osg::State &, state); I_StaticMethod2(osg::BlendColor::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::BlendColor::Extensions *, extensions); - I_ReadOnlyProperty(osg::Vec4, ConstantColor); + I_Property(const osg::Vec4 &, ConstantColor); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/CameraNode.cpp b/src/osgWrappers/osg/CameraNode.cpp index ad7d90688..2333328d0 100644 --- a/src/osgWrappers/osg/CameraNode.cpp +++ b/src/osgWrappers/osg/CameraNode.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -80,6 +81,9 @@ BEGIN_OBJECT_REFLECTOR(osg::CameraNode) I_Method0(const char *, className); I_Method0(const char *, libraryName); I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method1(void, setView, IN, osg::View *, view); + I_Method0(osg::View *, getView); + I_Method0(const osg::View *, getView); I_Method1(void, setClearColor, IN, const osg::Vec4 &, color); I_Method0(const osg::Vec4 &, getClearColor); I_Method1(void, setClearMask, IN, GLbitfield, mask); @@ -160,6 +164,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CameraNode) I_Property(osg::CameraNode::RenderTargetImplementation, RenderTargetImplementation); I_IndexedProperty1(osg::Object *, RenderingCache, unsigned int, contextID); I_Property(osg::CameraNode::TransformOrder, TransformOrder); + I_Property(osg::View *, View); I_Property(const osg::Matrixd &, ViewMatrix); I_Property(osg::Viewport *, Viewport); END_REFLECTOR diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index 71c62ab9a..01b8987f7 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -96,7 +97,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) I_Method0(bool, getUseVertexBufferObjects); I_Method0(void, dirtyDisplayList); I_Method0(unsigned int, getGLObjectSizeHint); - I_Method1(void, draw, IN, osg::State &, state); + I_Method1(void, draw, IN, osg::RenderInfo &, renderInfo); I_Method1(void, compileGLObjects, IN, osg::State &, state); I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); I_Method1(void, setUpdateCallback, IN, osg::Drawable::UpdateCallback *, ac); @@ -113,7 +114,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) I_Method1(void, setDrawCallback, IN, osg::Drawable::DrawCallback *, dc); I_Method0(osg::Drawable::DrawCallback *, getDrawCallback); I_Method0(const osg::Drawable::DrawCallback *, getDrawCallback); - I_Method1(void, drawImplementation, IN, osg::State &, state); + I_Method1(void, drawImplementation, IN, osg::State &, x); + I_Method1(void, drawImplementation, IN, osg::RenderInfo &, renderInfo); I_Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); I_Method1(void, accept, IN, osg::Drawable::AttributeFunctor &, x); I_Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); @@ -201,6 +203,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::CullCallback) I_Method0(const char *, libraryName); I_Method0(const char *, className); I_Method3(bool, cull, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, x, IN, osg::State *, x); + I_Method3(bool, cull, IN, osg::NodeVisitor *, nv, IN, osg::Drawable *, drawable, IN, osg::RenderInfo *, renderInfo); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Drawable::DrawCallback) @@ -213,6 +216,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::DrawCallback) I_Method0(const char *, libraryName); I_Method0(const char *, className); I_Method2(void, drawImplementation, IN, osg::State &, x, IN, const osg::Drawable *, x); + I_Method2(void, drawImplementation, IN, osg::RenderInfo &, renderInfo, IN, const osg::Drawable *, drawable); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Drawable::EventCallback) diff --git a/src/osgWrappers/osg/GNUmakefile b/src/osgWrappers/osg/GNUmakefile index d404b00a1..b60b92f1e 100644 --- a/src/osgWrappers/osg/GNUmakefile +++ b/src/osgWrappers/osg/GNUmakefile @@ -87,6 +87,7 @@ CXXFILES =\ ProxyNode.cpp\ Quat.cpp\ Referenced.cpp\ + RenderInfo.cpp\ Scissor.cpp\ Sequence.cpp\ ShadeModel.cpp\ @@ -131,6 +132,7 @@ CXXFILES =\ Vec4s.cpp\ Vec4ub.cpp\ VertexProgram.cpp\ + View.cpp\ Viewport.cpp\ observer_ptr.cpp\ diff --git a/src/osgWrappers/osg/NodeVisitor.cpp b/src/osgWrappers/osg/NodeVisitor.cpp index f466eb522..79e895b7d 100644 --- a/src/osgWrappers/osg/NodeVisitor.cpp +++ b/src/osgWrappers/osg/NodeVisitor.cpp @@ -35,6 +35,7 @@ #include #include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -103,6 +104,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::View &, node); I_Method1(void, apply, IN, osg::CameraNode &, node); I_Method1(void, apply, IN, osg::CameraView &, node); I_Method1(void, apply, IN, osg::MatrixTransform &, node); diff --git a/src/osgWrappers/osg/RenderInfo.cpp b/src/osgWrappers/osg/RenderInfo.cpp new file mode 100644 index 000000000..afdb1e835 --- /dev/null +++ b/src/osgWrappers/osg/RenderInfo.cpp @@ -0,0 +1,45 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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 + +BEGIN_VALUE_REFLECTOR(osg::RenderInfo) + I_Constructor0(); + I_Constructor1(IN, const osg::RenderInfo &, rhs); + I_Constructor2(IN, osg::State *, state, IN, osg::View *, view); + I_Method0(unsigned int, getContextID); + I_Method1(void, setState, IN, osg::State *, state); + I_Method0(osg::State *, getState); + I_Method0(const osg::State *, getState); + I_Method1(void, setView, IN, osg::View *, view); + I_Method0(osg::View *, getView); + I_Method0(const osg::View *, getView); + I_Method1(void, setUserData, IN, osg::Referenced *, userData); + I_Method0(osg::Referenced *, getUserData); + I_Method0(const osg::Referenced *, getUserData); + I_ReadOnlyProperty(unsigned int, ContextID); + I_Property(osg::State *, State); + I_Property(osg::Referenced *, UserData); + I_Property(osg::View *, View); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/View.cpp b/src/osgWrappers/osg/View.cpp new file mode 100644 index 000000000..1e4a1a0e9 --- /dev/null +++ b/src/osgWrappers/osg/View.cpp @@ -0,0 +1,84 @@ +// *************************************************************************** +// +// 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 + +BEGIN_OBJECT_REFLECTOR(osg::View) + I_BaseType(osg::Transform); + I_BaseType(osg::CullSettings); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::View &, 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, 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(bool, addCamera, IN, osg::CameraNode *, camera); + I_Method3(bool, addCamera, IN, osg::CameraNode *, camera, IN, const osg::Matrix &, projectionOffset, IN, const osg::Matrix &, viewOffse); + I_Method1(bool, removeCamera, IN, unsigned int, pos); + I_Method0(unsigned int, getNumCameras); + I_Method1(osg::CameraNode *, getCamera, IN, unsigned int, pos); + I_Method1(const osg::CameraNode *, getCamera, IN, unsigned int, pos); + I_Method1(osg::View::CameraData &, getCameraData, IN, unsigned int, pos); + I_Method1(const osg::View::CameraData &, getCameraData, IN, unsigned int, pos); + 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_ArrayProperty_GA(osg::CameraNode *, Camera, Cameras, unsigned int, bool); + I_ReadOnlyProperty(osg::Matrixd, InverseViewMatrix); + I_Property(const osg::Matrixd &, ProjectionMatrix); + I_Property(const osg::Matrixd &, ViewMatrix); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::View::CameraData) + I_Constructor0(); + I_Constructor3(IN, osg::CameraNode *, camera, IN, const osg::Matrixd &, projectionOffset, IN, const osg::Matrixd &, viewOffset); + I_Constructor1(IN, const osg::View::CameraData &, rhs); + I_PublicMemberProperty(osg::ref_ptr< osg::CameraNode >, _camera); + I_PublicMemberProperty(osg::Matrixd, _projectionOffset); + I_PublicMemberProperty(osg::Matrixd, _viewOffset); +END_REFLECTOR + diff --git a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp index da738ce09..8d24f27c7 100644 --- a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp +++ b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -113,7 +113,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable) I_Method0(GLenum, getDrawType); I_Method1(void, setNumberOfVertices, IN, unsigned int, numVertices); I_Method0(unsigned int, getNumberOfVertices); - I_Method1(void, drawImplementation, IN, osg::State &, state); + I_Method1(void, drawImplementation, IN, osg::RenderInfo &, renderInfo); I_Method0(osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap &, getCurrentCellMatrixMap); I_Method0(osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap &, getPreviousCellMatrixMap); I_Method0(void, newFrame); diff --git a/src/osgWrappers/osgText/FadeText.cpp b/src/osgWrappers/osgText/FadeText.cpp new file mode 100644 index 000000000..3e34e4545 --- /dev/null +++ b/src/osgWrappers/osgText/FadeText.cpp @@ -0,0 +1,28 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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::map< osg::View * COMMA osg::Vec4 >, osgText::FadeText::ViewBlendColourMap); + +TYPE_NAME_ALIAS(std::map< osg::View * COMMA osg::Vec4 >, osgText::FadeText::ViewBlendColourMap); + +STD_MAP_REFLECTOR(std::map< osg::View * COMMA osg::Vec4 >); + diff --git a/src/osgWrappers/osgText/GNUmakefile b/src/osgWrappers/osgText/GNUmakefile index 9e2a6ae89..264dc6e5b 100644 --- a/src/osgWrappers/osgText/GNUmakefile +++ b/src/osgWrappers/osgText/GNUmakefile @@ -3,6 +3,8 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ Export.cpp\ + FadeText.cpp\ + FadeTextBKP.cpp\ Font.cpp\ String.cpp\ Text.cpp\ diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index 02918790f..ca2d60a8f 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -172,7 +173,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text) I_Method1(void, setKerningType, IN, osgText::KerningType, kerningType); I_Method0(osgText::KerningType, getKerningType); I_Method0(unsigned int, getLineCount); - I_Method1(void, drawImplementation, IN, osg::State &, state); + I_Method1(void, drawImplementation, IN, osg::RenderInfo &, renderInfo); 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); diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index 98b3d88a3..3a6cf143e 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -101,12 +102,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor) I_Method1(void, setState, IN, osg::State *, state); I_Method0(osg::State *, getState); I_Method0(const osg::State *, getState); + I_Method1(void, setRenderInfo, IN, osg::RenderInfo &, renderInfo); + I_Method0(osg::RenderInfo &, getRenderInfo); + I_Method0(const osg::RenderInfo &, getRenderInfo); I_ReadOnlyProperty(osgUtil::CullVisitor::value_type, CalculatedFarPlane); I_ReadOnlyProperty(osgUtil::CullVisitor::value_type, CalculatedNearPlane); I_Property(const osg::ClearNode *, ClearNode); I_Property(osgUtil::RenderBin *, CurrentRenderBin); I_ReadOnlyProperty(osgUtil::StateGraph *, CurrentStateGraph); I_ReadOnlyProperty(osg::Vec3, EyePoint); + I_Property(osg::RenderInfo &, RenderInfo); I_Property(osgUtil::RenderStage *, RenderStage); I_ReadOnlyProperty(osgUtil::StateGraph *, RootStateGraph); I_Property(osg::State *, State); diff --git a/src/osgWrappers/osgUtil/RenderBin.cpp b/src/osgWrappers/osgUtil/RenderBin.cpp index 69f062ce0..4ce63565c 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include @@ -83,8 +83,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) I_Method1(void, setSortCallback, IN, osgUtil::RenderBin::SortCallback *, sortCallback); I_Method0(osgUtil::RenderBin::SortCallback *, getSortCallback); I_Method0(const osgUtil::RenderBin::SortCallback *, getSortCallback); - I_Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); - I_Method2(void, drawImplementation, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Method2(void, draw, IN, osg::RenderInfo &, renderInfo, IN, osgUtil::RenderLeaf *&, previous); + I_Method2(void, drawImplementation, IN, osg::RenderInfo &, renderInfo, IN, osgUtil::RenderLeaf *&, previous); I_Method1(void, setDrawCallback, IN, osgUtil::RenderBin::DrawCallback *, drawCallback); I_Method0(osgUtil::RenderBin::DrawCallback *, getDrawCallback); I_Method0(const osgUtil::RenderBin::DrawCallback *, getDrawCallback); @@ -111,7 +111,7 @@ END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::RenderBin::DrawCallback) I_BaseType(osg::Referenced); I_Constructor0(); - I_Method3(void, drawImplementation, IN, osgUtil::RenderBin *, bin, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Method3(void, drawImplementation, IN, osgUtil::RenderBin *, bin, IN, osg::RenderInfo &, renderInfo, IN, osgUtil::RenderLeaf *&, previous); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::RenderBin::SortCallback) diff --git a/src/osgWrappers/osgUtil/RenderLeaf.cpp b/src/osgWrappers/osgUtil/RenderLeaf.cpp index 166f27c48..d2a3a37f0 100644 --- a/src/osgWrappers/osgUtil/RenderLeaf.cpp +++ b/src/osgWrappers/osgUtil/RenderLeaf.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -30,7 +30,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderLeaf) I_ConstructorWithDefaults4(IN, osg::Drawable *, drawable, , IN, osg::RefMatrix *, projection, , IN, osg::RefMatrix *, modelview, , IN, float, depth, 0.0f); I_MethodWithDefaults4(void, set, IN, osg::Drawable *, drawable, , IN, osg::RefMatrix *, projection, , IN, osg::RefMatrix *, modelview, , IN, float, depth, 0.0f); I_Method0(void, reset); - I_Method2(void, render, IN, osg::State &, state, IN, osgUtil::RenderLeaf *, previous); + I_Method2(void, render, IN, osg::RenderInfo &, renderInfo, IN, osgUtil::RenderLeaf *, previous); I_PublicMemberProperty(osgUtil::StateGraph *, _parent); I_PublicMemberProperty(osg::Drawable *, _drawable); I_PublicMemberProperty(osg::ref_ptr< osg::RefMatrix >, _projection); diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index f4e4ee410..407321f3b 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -72,7 +72,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) I_Method0(const osg::CameraNode *, getCameraNode); I_Method1(void, setCameraRequiresSetUp, IN, bool, flag); I_Method0(bool, getCameraRequiresSetUp); - I_Method1(void, runCameraSetUp, IN, osg::State &, state); + I_Method1(void, runCameraSetUp, IN, osg::RenderInfo &, renderInfo); I_MethodWithDefaults3(void, setTexture, IN, osg::Texture *, texture, , IN, unsigned int, level, 0, IN, unsigned int, face, 0); I_Method0(osg::Texture *, getTexture); I_Method1(void, setImage, IN, osg::Image *, image); @@ -95,13 +95,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) I_Method0(osgUtil::PositionalStateContainer *, getPositionalStateContainer); I_Method2(void, addPositionedAttribute, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); I_Method3(void, addPositionedTextureAttribute, IN, unsigned int, textureUnit, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); - I_Method1(void, copyTexture, IN, osg::State &, state); + I_Method1(void, copyTexture, IN, osg::RenderInfo &, renderInfo); I_Method0(void, sort); - 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_Method3(void, drawInner, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous, IN, bool &, doCopyTexture); - 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_Method2(void, drawPreRenderStages, IN, osg::RenderInfo &, renderInfo, IN, osgUtil::RenderLeaf *&, previous); + I_Method2(void, draw, IN, osg::RenderInfo &, renderInfo, IN, osgUtil::RenderLeaf *&, previous); + I_Method3(void, drawInner, IN, osg::RenderInfo &, renderInfo, IN, osgUtil::RenderLeaf *&, previous, IN, bool &, doCopyTexture); + I_Method2(void, drawPostRenderStages, IN, osg::RenderInfo &, renderInfo, IN, osgUtil::RenderLeaf *&, previous); + I_Method2(void, drawImplementation, IN, osg::RenderInfo &, renderInfo, IN, osgUtil::RenderLeaf *&, previous); I_Method1(void, addToDependencyList, IN, osgUtil::RenderStage *, rs); I_MethodWithDefaults2(void, addPreRenderStage, IN, osgUtil::RenderStage *, rs, , IN, int, order, 0); I_MethodWithDefaults2(void, addPostRenderStage, IN, osgUtil::RenderStage *, rs, , IN, int, order, 0); diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index cf26de812..24b35bb92 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -19,10 +19,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -104,6 +106,12 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) I_Method1(void, setState, IN, osg::State *, state); I_Method0(osg::State *, getState); I_Method0(const osg::State *, getState); + I_Method1(void, setView, IN, osg::View *, view); + I_Method0(osg::View *, getView); + I_Method0(const osg::View *, getView); + I_Method1(void, setRenderInfo, IN, osg::RenderInfo &, renderInfo); + I_Method0(osg::RenderInfo &, getRenderInfo); + I_Method0(const osg::RenderInfo &, getRenderInfo); 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); @@ -210,6 +218,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) I_Property(bool, PrioritizeTextures); I_Property(const osg::Matrixd &, ProjectionMatrix); I_Property(bool, RedrawInterlacedStereoStencilMask); + I_Property(osg::RenderInfo &, RenderInfo); I_Property(osgUtil::RenderStage *, RenderStage); I_Property(osgUtil::RenderStage *, RenderStageLeft); I_Property(osgUtil::RenderStage *, RenderStageRight); @@ -219,6 +228,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) I_Property(osgUtil::StateGraph *, StateGraphLeft); I_Property(osgUtil::StateGraph *, StateGraphRight); I_Property(osg::NodeVisitor *, UpdateVisitor); + I_Property(osg::View *, View); I_Property(const osg::Matrixd &, ViewMatrix); I_Property(osg::Viewport *, Viewport); END_REFLECTOR