UPdated wrappers

2010-04-20 11:34:19 +00:00
parent 31e8e37dbd
commit 5a50387eb9
6 changed files with 99 additions and 16 deletions
--- a/src/osgWrappers/introspection/osgShadow/ParallelSplitShadowMap.cpp
+++ b/src/osgWrappers/introspection/osgShadow/ParallelSplitShadowMap.cpp
@@ -110,31 +110,61 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ParallelSplitShadowMap)
 	          __void__setTextureResolution__unsigned_int,
 	          "Set the texture resolution. ",
 	          "");
+	I_Method0(unsigned int, getTextureResolution,
+	          Properties::NON_VIRTUAL,
+	          __unsigned_int__getTextureResolution,
+	          "Get the texture resolution. ",
+	          "");
 	I_Method1(void, setMaxFarDistance, IN, double, farDist,
 	          Properties::NON_VIRTUAL,
 	          __void__setMaxFarDistance__double,
 	          "Set the max far distance. ",
 	          "");
+	I_Method0(double, getMaxFarDistance,
+	          Properties::NON_VIRTUAL,
+	          __double__getMaxFarDistance,
+	          "Get the max far distance. ",
+	          "");
 	I_Method1(void, setMoveVCamBehindRCamFactor, IN, double, distFactor,
 	          Properties::NON_VIRTUAL,
 	          __void__setMoveVCamBehindRCamFactor__double,
 	          "Set the factor for moving the virtual camera behind the real camera. ",
 	          "");
+	I_Method0(double, getMoveVCamBehindRCamFactor,
+	          Properties::NON_VIRTUAL,
+	          __double__getMoveVCamBehindRCamFactor,
+	          "Get the factor for moving the virtual camera behind the real camera. ",
+	          "");
 	I_Method1(void, setMinNearDistanceForSplits, IN, double, nd,
 	          Properties::NON_VIRTUAL,
 	          __void__setMinNearDistanceForSplits__double,
 	          "Set min near distance for splits. ",
 	          "");
+	I_Method0(double, getMinNearDistanceForSplits,
+	          Properties::NON_VIRTUAL,
+	          __double__getMinNearDistanceForSplits,
+	          "Get min near distance for splits. ",
+	          "");
 	I_Method1(void, setUserLight, IN, osg::Light *, light,
 	          Properties::NON_VIRTUAL,
 	          __void__setUserLight__osg_Light_P1,
 	          "set a user defined light for shadow simulation (sun light, . ",
 	          ".. ) when this light get passed to pssm, the scene's light are no longer collected and simulated. just this user passed light, it needs to be a directional light. ");
+	I_Method0(const osg::Light *, getUserLight,
+	          Properties::NON_VIRTUAL,
+	          __C5_osg_Light_P1__getUserLight,
+	          "get the user defined light for shadow simulation ",
+	          "");
 	I_Method1(void, setAmbientBias, IN, const osg::Vec2 &, ambientBias,
 	          Properties::NON_VIRTUAL,
 	          __void__setAmbientBias__C5_osg_Vec2_R1,
 	          "Set the values for the ambient bias the shader will use. ",
 	          "");
+	I_Method0(const osg::Vec2 &, getAmbientBias,
+	          Properties::NON_VIRTUAL,
+	          __C5_osg_Vec2_R1__getAmbientBias,
+	          "Get the values for the ambient bias the shader will use. ",
+	          "");
 	I_Method1(void, setFragmentShaderGenerator, IN, osgShadow::ParallelSplitShadowMap::FragmentShaderGenerator *, fsw,
 	          Properties::NON_VIRTUAL,
 	          __void__setFragmentShaderGenerator__FragmentShaderGenerator_P1,
@@ -150,29 +180,34 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ParallelSplitShadowMap)
 	                      __void__setSplitCalculationMode__SplitCalcMode,
 	                      "set split calculation mode ",
 	                      "");
+	I_Method0(osgShadow::ParallelSplitShadowMap::SplitCalcMode, getSplitCalculationMode,
+	          Properties::NON_VIRTUAL,
+	          __SplitCalcMode__getSplitCalculationMode,
+	          "get split calculation mode ",
+	          "");
 	I_SimpleProperty(const osg::Vec2 &, AmbientBias, 
-	                 0, 
+	                 __C5_osg_Vec2_R1__getAmbientBias, 
 	                 __void__setAmbientBias__C5_osg_Vec2_R1);
 	I_SimpleProperty(osgShadow::ParallelSplitShadowMap::FragmentShaderGenerator *, FragmentShaderGenerator, 
 	                 0, 
 	                 __void__setFragmentShaderGenerator__FragmentShaderGenerator_P1);
 	I_SimpleProperty(double, MaxFarDistance, 
-	                 0, 
+	                 __double__getMaxFarDistance, 
 	                 __void__setMaxFarDistance__double);
 	I_SimpleProperty(double, MinNearDistanceForSplits, 
-	                 0, 
+	                 __double__getMinNearDistanceForSplits, 
 	                 __void__setMinNearDistanceForSplits__double);
 	I_SimpleProperty(double, MoveVCamBehindRCamFactor, 
-	                 0, 
+	                 __double__getMoveVCamBehindRCamFactor, 
 	                 __void__setMoveVCamBehindRCamFactor__double);
 	I_SimpleProperty(const osg::Vec2f &, PolygonOffset, 
 	                 __C5_osg_Vec2f_R1__getPolygonOffset, 
 	                 __void__setPolygonOffset__C5_osg_Vec2f_R1);
 	I_SimpleProperty(osgShadow::ParallelSplitShadowMap::SplitCalcMode, SplitCalculationMode, 
-	                 0, 
+	                 __SplitCalcMode__getSplitCalculationMode, 
 	                 __void__setSplitCalculationMode__SplitCalcMode);
 	I_SimpleProperty(unsigned int, TextureResolution, 
-	                 0, 
+	                 __unsigned_int__getTextureResolution, 
 	                 __void__setTextureResolution__unsigned_int);
 	I_SimpleProperty(osg::Light *, UserLight, 
 	                 0, 
--- a/src/osgWrappers/introspection/osgShadow/SoftShadowMap.cpp
+++ b/src/osgWrappers/introspection/osgShadow/SoftShadowMap.cpp
@@ -57,9 +57,9 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::SoftShadowMap)
 	          __C5_char_P1__className,
 	          "return the name of the object's class type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, setSoftnessWidth, IN, const float, softnessWidth,
+	I_Method1(void, setSoftnessWidth, IN, float, softnessWidth,
 	          Properties::NON_VIRTUAL,
-	          __void__setSoftnessWidth__C5_float,
+	          __void__setSoftnessWidth__float,
 	          "Set the values for width of the soft penumbra the shader will use. ",
 	          "Zero is for hard shadow (no penumbra). 0.01 is already very soft penumbra. Default is 0.005. ");
 	I_Method0(float, getSoftnessWidth,
@@ -67,9 +67,9 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::SoftShadowMap)
 	          __float__getSoftnessWidth,
 	          "Get the value used for width of the soft penumbra in the shader. ",
 	          "");
-	I_Method1(void, setJitteringScale, IN, const float, jitteringScale,
+	I_Method1(void, setJitteringScale, IN, float, jitteringScale,
 	          Properties::NON_VIRTUAL,
-	          __void__setJitteringScale__C5_float,
+	          __void__setJitteringScale__float,
 	          "Set the values for jittering scale the shader will use. ",
 	          "Zero is no jittering (i.e. see the banding in penumbra) High values (>64) cause 'pixelization' of the penumbra. Usually but not necessarily power of two number. Default is 32. ");
 	I_Method0(float, getJitteringScale,
@@ -123,9 +123,9 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::SoftShadowMap)
 	                 __void__setJitterTextureUnit__unsigned_int);
 	I_SimpleProperty(float, JitteringScale, 
 	                 __float__getJitteringScale, 
-	                 0);
+	                 __void__setJitteringScale__float);
 	I_SimpleProperty(float, SoftnessWidth, 
 	                 __float__getSoftnessWidth, 
-	                 0);
+	                 __void__setSoftnessWidth__float);
 END_REFLECTOR

--- a/src/osgWrappers/introspection/osgShadow/StandardShadowMap.cpp
+++ b/src/osgWrappers/introspection/osgShadow/StandardShadowMap.cpp
@@ -109,9 +109,9 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::StandardShadowMap)
 	          __void__setTextureSize__C5_osg_Vec2s_R1,
 	          "",
 	          "");
-	I_Method0(osg::Vec2s, getTextureSize,
+	I_Method0(const osg::Vec2s &, getTextureSize,
 	          Properties::NON_VIRTUAL,
-	          __osg_Vec2s__getTextureSize,
+	          __C5_osg_Vec2s_R1__getTextureSize,
 	          "",
 	          "");
 	I_Method1(void, setLight, IN, osg::Light *, light,
@@ -124,6 +124,11 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::StandardShadowMap)
 	          __osg_Light_P1__getLight,
 	          "",
 	          "");
+	I_Method0(const osg::Light *, getLight,
+	          Properties::NON_VIRTUAL,
+	          __C5_osg_Light_P1__getLight,
+	          "",
+	          "");
 	I_Method0(osg::Shader *, getShadowVertexShader,
 	          Properties::NON_VIRTUAL,
 	          __osg_Shader_P1__getShadowVertexShader,
@@ -203,8 +208,8 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::StandardShadowMap)
 	I_SimpleProperty(osg::Shader *, ShadowVertexShader, 
 	                 __osg_Shader_P1__getShadowVertexShader, 
 	                 __void__setShadowVertexShader__osg_Shader_P1);
-	I_SimpleProperty(osg::Vec2s, TextureSize, 
-	                 __osg_Vec2s__getTextureSize, 
+	I_SimpleProperty(const osg::Vec2s &, TextureSize, 
+	                 __C5_osg_Vec2s_R1__getTextureSize, 
 	                 __void__setTextureSize__C5_osg_Vec2s_R1);
 END_REFLECTOR

--- a/src/osgWrappers/introspection/osgUtil/RenderStage.cpp
+++ b/src/osgWrappers/introspection/osgUtil/RenderStage.cpp
@@ -132,6 +132,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
 	          __osg_Viewport_P1__getViewport,
 	          "Get the viewport. ",
 	          "");
+	I_Method1(void, setInitialViewMatrix, IN, const osg::RefMatrix *, matrix,
+	          Properties::NON_VIRTUAL,
+	          __void__setInitialViewMatrix__C5_osg_RefMatrix_P1,
+	          "Set the initial view matrix. ",
+	          "");
+	I_Method0(const osg::RefMatrix *, getInitialViewMatrix,
+	          Properties::NON_VIRTUAL,
+	          __C5_osg_RefMatrix_P1__getInitialViewMatrix,
+	          "Get the initial view matrix. ",
+	          "");
 	I_Method1(void, setClearMask, IN, GLbitfield, mask,
 	          Properties::NON_VIRTUAL,
 	          __void__setClearMask__GLbitfield,
@@ -491,6 +501,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
 	I_SimpleProperty(const osg::Matrix &, InheritedPositionalStateContainerMatrix, 
 	                 __C5_osg_Matrix_R1__getInheritedPositionalStateContainerMatrix, 
 	                 __void__setInheritedPositionalStateContainerMatrix__C5_osg_Matrix_R1);
+	I_SimpleProperty(const osg::RefMatrix *, InitialViewMatrix, 
+	                 __C5_osg_RefMatrix_P1__getInitialViewMatrix, 
+	                 __void__setInitialViewMatrix__C5_osg_RefMatrix_P1);
 	I_SimpleProperty(osg::FrameBufferObject *, MultisampleResolveFramebufferObject, 
 	                 __osg_FrameBufferObject_P1__getMultisampleResolveFramebufferObject, 
 	                 __void__setMultisampleResolveFramebufferObject__osg_FrameBufferObject_P1);
--- a/src/osgWrappers/introspection/osgUtil/Statistics.cpp
+++ b/src/osgWrappers/introspection/osgUtil/Statistics.cpp
@@ -202,6 +202,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics)
 	          __void__setBinNo__int,
 	          "",
 	          "");
+	I_Method1(void, addStateGraphs, IN, int, n,
+	          Properties::NON_VIRTUAL,
+	          __void__addStateGraphs__int,
+	          "",
+	          "");
+	I_Method1(void, addOrderedLeaves, IN, int, n,
+	          Properties::NON_VIRTUAL,
+	          __void__addOrderedLeaves__int,
+	          "",
+	          "");
 	I_Method1(void, add, IN, const osgUtil::Statistics &, stats,
 	          Properties::NON_VIRTUAL,
 	          __void__add__C5_Statistics_R1,
@@ -245,11 +255,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics)
 	I_PublicMemberProperty(int, numDrawables);
 	I_PublicMemberProperty(int, nummat);
 	I_PublicMemberProperty(int, nbins);
+	I_PublicMemberProperty(int, numStateGraphs);
 	I_PublicMemberProperty(int, nlights);
 	I_PublicMemberProperty(int, depth);
 	I_PublicMemberProperty(int, _binNo);
 	I_PublicMemberProperty(osgUtil::Statistics::StatsType, stattype);
 	I_PublicMemberProperty(int, nimpostor);
+	I_PublicMemberProperty(int, numOrderedLeaves);
 	I_PublicMemberProperty(unsigned int, _vertexCount);
 	I_PublicMemberProperty(osgUtil::Statistics::PrimitiveValueMap, _primitiveCount);
 	I_PublicMemberProperty(GLenum, _currentPrimitiveFunctorMode);
--- a/src/osgWrappers/introspection/osgViewer/Renderer.cpp
+++ b/src/osgWrappers/introspection/osgViewer/Renderer.cpp
@@ -92,6 +92,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Renderer)
 	          __osgUtil_SceneView_P1__getSceneView__unsigned_int,
 	          "",
 	          "");
+	I_Method1(const osgUtil::SceneView *, getSceneView, IN, unsigned int, i,
+	          Properties::NON_VIRTUAL,
+	          __C5_osgUtil_SceneView_P1__getSceneView__unsigned_int,
+	          "",
+	          "");
 	I_Method1(void, setDone, IN, bool, done,
 	          Properties::NON_VIRTUAL,
 	          __void__setDone__bool,
@@ -187,6 +192,16 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Renderer)
 	          __double__getConservativeTimeRatio,
 	          "",
 	          "");
+	I_Method1(void, setCameraRequiresSetUp, IN, bool, flag,
+	          Properties::NON_VIRTUAL,
+	          __void__setCameraRequiresSetUp__bool,
+	          "Force update of state associated with cameras. ",
+	          "");
+	I_Method0(bool, getCameraRequiresSetUp,
+	          Properties::NON_VIRTUAL,
+	          __bool__getCameraRequiresSetUp,
+	          "",
+	          "");
 	I_ProtectedMethod1(void, updateSceneView, IN, osgUtil::SceneView *, sceneView,
 	                   Properties::VIRTUAL,
 	                   Properties::NON_CONST,
@@ -199,6 +214,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Renderer)
 	                   __void__flushAndCompile__double__osgUtil_SceneView_P1__osgDB_DatabasePager_P1__osg_GraphicsThread_P1,
 	                   "",
 	                   "");
+	I_SimpleProperty(bool, CameraRequiresSetUp, 
+	                 __bool__getCameraRequiresSetUp, 
+	                 __void__setCameraRequiresSetUp__bool);
 	I_SimpleProperty(bool, CompileOnNextDraw, 
 	                 __bool__getCompileOnNextDraw, 
 	                 __void__setCompileOnNextDraw__bool);