From d2533dfcc0e1722f7bd8a2aebbf8e0b453990bac Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 1 Sep 2006 13:34:05 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/AlphaFunc.cpp | 1 + src/osgWrappers/osg/AnimationPath.cpp | 10 +++ src/osgWrappers/osg/ApplicationUsage.cpp | 2 + src/osgWrappers/osg/ArgumentParser.cpp | 4 ++ src/osgWrappers/osg/Array.cpp | 1 + src/osgWrappers/osg/AutoTransform.cpp | 1 + src/osgWrappers/osg/Billboard.cpp | 1 + src/osgWrappers/osg/BlendColor.cpp | 3 + src/osgWrappers/osg/BlendEquation.cpp | 3 + src/osgWrappers/osg/BlendFunc.cpp | 3 + src/osgWrappers/osg/BoundingBox.cpp | 3 + src/osgWrappers/osg/BoundingSphere.cpp | 3 + src/osgWrappers/osg/BufferObject.cpp | 7 +++ src/osgWrappers/osg/CameraNode.cpp | 7 +++ src/osgWrappers/osg/CameraView.cpp | 1 + src/osgWrappers/osg/ClampColor.cpp | 3 + src/osgWrappers/osg/ClearNode.cpp | 1 + src/osgWrappers/osg/ClipNode.cpp | 1 + src/osgWrappers/osg/ClipPlane.cpp | 1 + .../osg/ClusterCullingCallback.cpp | 1 + .../osg/CollectOccludersVisitor.cpp | 1 + src/osgWrappers/osg/ColorMask.cpp | 1 + src/osgWrappers/osg/ColorMatrix.cpp | 1 + src/osgWrappers/osg/ConvexPlanarOccluder.cpp | 1 + src/osgWrappers/osg/ConvexPlanarPolygon.cpp | 1 + src/osgWrappers/osg/CoordinateSystemNode.cpp | 1 + src/osgWrappers/osg/CopyOp.cpp | 1 + src/osgWrappers/osg/CullFace.cpp | 1 + src/osgWrappers/osg/CullSettings.cpp | 1 + src/osgWrappers/osg/CullStack.cpp | 1 + src/osgWrappers/osg/CullingSet.cpp | 3 + src/osgWrappers/osg/Depth.cpp | 1 + src/osgWrappers/osg/DisplaySettings.cpp | 2 + src/osgWrappers/osg/DrawPixels.cpp | 1 + src/osgWrappers/osg/Drawable.cpp | 11 ++++ src/osgWrappers/osg/Endian.cpp | 1 + src/osgWrappers/osg/Fog.cpp | 1 + src/osgWrappers/osg/FragmentProgram.cpp | 5 ++ src/osgWrappers/osg/FrameBufferObject.cpp | 19 ++++++ src/osgWrappers/osg/FrameStamp.cpp | 1 + src/osgWrappers/osg/FrontFace.cpp | 1 + src/osgWrappers/osg/GL2Extensions.cpp | 3 + src/osgWrappers/osg/Geode.cpp | 1 + src/osgWrappers/osg/Geometry.cpp | 11 ++++ src/osgWrappers/osg/GraphicsContext.cpp | 31 +++++++++ src/osgWrappers/osg/GraphicsThread.cpp | 4 ++ src/osgWrappers/osg/Group.cpp | 1 + src/osgWrappers/osg/Image.cpp | 6 ++ src/osgWrappers/osg/ImageStream.cpp | 1 + src/osgWrappers/osg/LOD.cpp | 1 + src/osgWrappers/osg/Light.cpp | 1 + src/osgWrappers/osg/LightModel.cpp | 1 + src/osgWrappers/osg/LightSource.cpp | 1 + src/osgWrappers/osg/LineSegment.cpp | 1 + src/osgWrappers/osg/LineStipple.cpp | 1 + src/osgWrappers/osg/LineWidth.cpp | 1 + src/osgWrappers/osg/LogicOp.cpp | 1 + src/osgWrappers/osg/Material.cpp | 1 + src/osgWrappers/osg/Matrix.cpp | 1 + src/osgWrappers/osg/MatrixTransform.cpp | 1 + src/osgWrappers/osg/Matrixd.cpp | 28 +++++++++ src/osgWrappers/osg/Matrixf.cpp | 28 +++++++++ src/osgWrappers/osg/Multisample.cpp | 3 + src/osgWrappers/osg/Node.cpp | 1 + src/osgWrappers/osg/NodeCallback.cpp | 2 + src/osgWrappers/osg/NodeTrackerCallback.cpp | 1 + src/osgWrappers/osg/NodeVisitor.cpp | 1 + src/osgWrappers/osg/Notify.cpp | 1 + src/osgWrappers/osg/Object.cpp | 1 + src/osgWrappers/osg/OccluderNode.cpp | 1 + src/osgWrappers/osg/PagedLOD.cpp | 5 ++ src/osgWrappers/osg/Plane.cpp | 1 + src/osgWrappers/osg/Point.cpp | 3 + src/osgWrappers/osg/PointSprite.cpp | 2 + src/osgWrappers/osg/PolygonMode.cpp | 1 + src/osgWrappers/osg/PolygonOffset.cpp | 7 +++ src/osgWrappers/osg/PolygonStipple.cpp | 1 + src/osgWrappers/osg/Polytope.cpp | 4 ++ .../osg/PositionAttitudeTransform.cpp | 1 + src/osgWrappers/osg/PrimitiveSet.cpp | 1 + src/osgWrappers/osg/Program.cpp | 6 ++ src/osgWrappers/osg/Projection.cpp | 1 + src/osgWrappers/osg/ProxyNode.cpp | 1 + src/osgWrappers/osg/Quat.cpp | 1 + src/osgWrappers/osg/Referenced.cpp | 5 ++ src/osgWrappers/osg/Scissor.cpp | 1 + src/osgWrappers/osg/Sequence.cpp | 1 + src/osgWrappers/osg/ShadeModel.cpp | 1 + src/osgWrappers/osg/Shader.cpp | 5 ++ src/osgWrappers/osg/ShadowVolumeOccluder.cpp | 1 + src/osgWrappers/osg/Shape.cpp | 1 + src/osgWrappers/osg/ShapeDrawable.cpp | 1 + src/osgWrappers/osg/State.cpp | 1 + src/osgWrappers/osg/StateAttribute.cpp | 1 + src/osgWrappers/osg/StateSet.cpp | 1 + src/osgWrappers/osg/Stencil.cpp | 1 + src/osgWrappers/osg/Switch.cpp | 1 + src/osgWrappers/osg/TexEnv.cpp | 1 + src/osgWrappers/osg/TexEnvCombine.cpp | 1 + src/osgWrappers/osg/TexEnvFilter.cpp | 1 + src/osgWrappers/osg/TexGen.cpp | 1 + src/osgWrappers/osg/TexGenNode.cpp | 1 + src/osgWrappers/osg/TexMat.cpp | 1 + src/osgWrappers/osg/Texture.cpp | 21 +++++++ src/osgWrappers/osg/Texture1D.cpp | 1 + src/osgWrappers/osg/Texture2D.cpp | 1 + src/osgWrappers/osg/Texture3D.cpp | 3 + src/osgWrappers/osg/TextureCubeMap.cpp | 3 + src/osgWrappers/osg/TextureRectangle.cpp | 1 + src/osgWrappers/osg/Timer.cpp | 2 + src/osgWrappers/osg/Transform.cpp | 1 + src/osgWrappers/osg/Uniform.cpp | 6 ++ src/osgWrappers/osg/Vec2.cpp | 1 + src/osgWrappers/osg/Vec2b.cpp | 1 + src/osgWrappers/osg/Vec2d.cpp | 1 + src/osgWrappers/osg/Vec2f.cpp | 1 + src/osgWrappers/osg/Vec2s.cpp | 1 + src/osgWrappers/osg/Vec3.cpp | 1 + src/osgWrappers/osg/Vec3b.cpp | 1 + src/osgWrappers/osg/Vec3d.cpp | 1 + src/osgWrappers/osg/Vec3f.cpp | 1 + src/osgWrappers/osg/Vec3s.cpp | 1 + src/osgWrappers/osg/Vec4.cpp | 1 + src/osgWrappers/osg/Vec4b.cpp | 1 + src/osgWrappers/osg/Vec4d.cpp | 1 + src/osgWrappers/osg/Vec4f.cpp | 1 + src/osgWrappers/osg/Vec4s.cpp | 1 + src/osgWrappers/osg/Vec4ub.cpp | 1 + src/osgWrappers/osg/VertexProgram.cpp | 5 ++ src/osgWrappers/osg/Viewport.cpp | 1 + src/osgWrappers/osg/observer_ptr.cpp | 1 + src/osgWrappers/osgDB/Archive.cpp | 1 + src/osgWrappers/osgDB/DatabasePager.cpp | 1 + src/osgWrappers/osgDB/DotOsgWrapper.cpp | 1 + src/osgWrappers/osgDB/DynamicLibrary.cpp | 2 + src/osgWrappers/osgDB/Field.cpp | 2 + src/osgWrappers/osgDB/FieldReader.cpp | 1 + src/osgWrappers/osgDB/FieldReaderIterator.cpp | 1 + src/osgWrappers/osgDB/FileUtils.cpp | 1 + src/osgWrappers/osgDB/ImageOptions.cpp | 23 +++++++ src/osgWrappers/osgDB/Input.cpp | 1 + src/osgWrappers/osgDB/Output.cpp | 1 + src/osgWrappers/osgDB/ParameterOutput.cpp | 1 + src/osgWrappers/osgDB/ReaderWriter.cpp | 1 + src/osgWrappers/osgDB/ReentrantMutex.cpp | 1 + src/osgWrappers/osgDB/Registry.cpp | 3 + src/osgWrappers/osgDB/SharedStateManager.cpp | 1 + src/osgWrappers/osgFX/AnisotropicLighting.cpp | 1 + src/osgWrappers/osgFX/BumpMapping.cpp | 1 + src/osgWrappers/osgFX/Cartoon.cpp | 1 + src/osgWrappers/osgFX/Effect.cpp | 1 + src/osgWrappers/osgFX/MultiTextureControl.cpp | 1 + src/osgWrappers/osgFX/Registry.cpp | 2 + src/osgWrappers/osgFX/Scribe.cpp | 1 + src/osgWrappers/osgFX/SpecularHighlights.cpp | 1 + src/osgWrappers/osgFX/Technique.cpp | 1 + src/osgWrappers/osgFX/Validator.cpp | 1 + .../osgGA/AnimationPathManipulator.cpp | 1 + src/osgWrappers/osgGA/DriveManipulator.cpp | 1 + src/osgWrappers/osgGA/EventQueue.cpp | 1 + src/osgWrappers/osgGA/EventVisitor.cpp | 1 + src/osgWrappers/osgGA/FlightManipulator.cpp | 1 + src/osgWrappers/osgGA/GUIActionAdapter.cpp | 1 + src/osgWrappers/osgGA/GUIEventAdapter.cpp | 1 + src/osgWrappers/osgGA/GUIEventHandler.cpp | 1 + .../osgGA/GUIEventHandlerVisitor.cpp | 1 + .../osgGA/KeySwitchMatrixManipulator.cpp | 1 + src/osgWrappers/osgGA/MatrixManipulator.cpp | 1 + .../osgGA/NodeTrackerManipulator.cpp | 1 + src/osgWrappers/osgGA/SetSceneViewVisitor.cpp | 1 + src/osgWrappers/osgGA/StateSetManipulator.cpp | 1 + src/osgWrappers/osgGA/TerrainManipulator.cpp | 1 + .../osgGA/TrackballManipulator.cpp | 1 + src/osgWrappers/osgGA/UFOManipulator.cpp | 1 + src/osgWrappers/osgParticle/AccelOperator.cpp | 1 + .../osgParticle/AngularAccelOperator.cpp | 1 + src/osgWrappers/osgParticle/BoxPlacer.cpp | 1 + .../osgParticle/CenteredPlacer.cpp | 1 + .../osgParticle/ConnectedParticleSystem.cpp | 1 + .../osgParticle/ConstantRateCounter.cpp | 1 + src/osgWrappers/osgParticle/Counter.cpp | 1 + src/osgWrappers/osgParticle/Emitter.cpp | 1 + .../osgParticle/ExplosionDebrisEffect.cpp | 1 + .../osgParticle/ExplosionEffect.cpp | 1 + src/osgWrappers/osgParticle/FireEffect.cpp | 1 + .../osgParticle/FluidFrictionOperator.cpp | 1 + src/osgWrappers/osgParticle/FluidProgram.cpp | 1 + src/osgWrappers/osgParticle/ForceOperator.cpp | 1 + src/osgWrappers/osgParticle/Interpolator.cpp | 1 + .../osgParticle/LinearInterpolator.cpp | 1 + .../osgParticle/ModularEmitter.cpp | 1 + .../osgParticle/ModularProgram.cpp | 1 + .../osgParticle/MultiSegmentPlacer.cpp | 1 + src/osgWrappers/osgParticle/Operator.cpp | 1 + src/osgWrappers/osgParticle/Particle.cpp | 1 + .../osgParticle/ParticleEffect.cpp | 1 + .../osgParticle/ParticleProcessor.cpp | 1 + .../osgParticle/ParticleSystem.cpp | 1 + .../osgParticle/ParticleSystemUpdater.cpp | 1 + src/osgWrappers/osgParticle/Placer.cpp | 1 + src/osgWrappers/osgParticle/PointPlacer.cpp | 1 + .../osgParticle/PrecipitationEffect.cpp | 7 +++ src/osgWrappers/osgParticle/Program.cpp | 1 + src/osgWrappers/osgParticle/RadialShooter.cpp | 1 + .../osgParticle/RandomRateCounter.cpp | 1 + src/osgWrappers/osgParticle/SectorPlacer.cpp | 1 + src/osgWrappers/osgParticle/SegmentPlacer.cpp | 1 + src/osgWrappers/osgParticle/Shooter.cpp | 1 + src/osgWrappers/osgParticle/SmokeEffect.cpp | 1 + .../osgParticle/SmokeTrailEffect.cpp | 1 + .../osgParticle/VariableRateCounter.cpp | 1 + src/osgWrappers/osgParticle/range.cpp | 9 +++ src/osgWrappers/osgProducer/Export.cpp | 1 + .../GraphicsContextImplementation.cpp | 1 + .../osgProducer/KeyboardMouseCallback.cpp | 1 + .../osgProducer/OsgCameraGroup.cpp | 1 + .../osgProducer/OsgSceneHandler.cpp | 1 + src/osgWrappers/osgProducer/Viewer.cpp | 2 + .../osgProducer/ViewerEventHandler.cpp | 1 + src/osgWrappers/osgSim/BlinkSequence.cpp | 2 + src/osgWrappers/osgSim/ColorRange.cpp | 1 + src/osgWrappers/osgSim/DOFTransform.cpp | 1 + src/osgWrappers/osgSim/GeographicLocation.cpp | 1 + src/osgWrappers/osgSim/Impostor.cpp | 1 + src/osgWrappers/osgSim/ImpostorSprite.cpp | 2 + .../osgSim/InsertImpostorsVisitor.cpp | 1 + src/osgWrappers/osgSim/LightPoint.cpp | 9 +++ src/osgWrappers/osgSim/LightPointNode.cpp | 1 + src/osgWrappers/osgSim/LightPointSystem.cpp | 1 + src/osgWrappers/osgSim/MultiSwitch.cpp | 1 + .../osgSim/OpenFlightOptimizer.cpp | 1 + src/osgWrappers/osgSim/OverlayNode.cpp | 1 + src/osgWrappers/osgSim/ScalarBar.cpp | 5 ++ src/osgWrappers/osgSim/ScalarsToColors.cpp | 1 + src/osgWrappers/osgSim/Sector.cpp | 1 + src/osgWrappers/osgSim/SphereSegment.cpp | 1 + src/osgWrappers/osgSim/VisibilityGroup.cpp | 1 + src/osgWrappers/osgTerrain/DataSet.cpp | 63 +++++++++++++++++++ .../osgTerrain/HeightFieldNode.cpp | 1 + .../osgTerrain/HeightFieldRenderer.cpp | 1 + src/osgWrappers/osgText/Export.cpp | 1 + src/osgWrappers/osgText/Font.cpp | 2 + src/osgWrappers/osgText/String.cpp | 2 +- src/osgWrappers/osgText/Text.cpp | 7 +++ src/osgWrappers/osgUtil/CubeMapGenerator.cpp | 1 + src/osgWrappers/osgUtil/CullVisitor.cpp | 1 + .../osgUtil/DelaunayTriangulator.cpp | 1 + .../osgUtil/DisplayRequirementsVisitor.cpp | 1 + src/osgWrappers/osgUtil/GLObjectsVisitor.cpp | 1 + .../osgUtil/HalfWayMapGenerator.cpp | 1 + .../osgUtil/HighlightMapGenerator.cpp | 1 + src/osgWrappers/osgUtil/IntersectVisitor.cpp | 13 ++++ src/osgWrappers/osgUtil/Optimizer.cpp | 24 +++++++ .../osgUtil/PositionalStateContainer.cpp | 3 + .../osgUtil/ReflectionMapGenerator.cpp | 1 + src/osgWrappers/osgUtil/RenderBin.cpp | 7 +++ src/osgWrappers/osgUtil/RenderLeaf.cpp | 8 +++ src/osgWrappers/osgUtil/RenderStage.cpp | 1 + src/osgWrappers/osgUtil/SceneView.cpp | 1 + src/osgWrappers/osgUtil/Simplifier.cpp | 1 + src/osgWrappers/osgUtil/SmoothingVisitor.cpp | 3 + src/osgWrappers/osgUtil/StateGraph.cpp | 11 ++++ src/osgWrappers/osgUtil/Statistics.cpp | 30 +++++++++ .../osgUtil/TangentSpaceGenerator.cpp | 1 + src/osgWrappers/osgUtil/Tesselator.cpp | 3 + .../osgUtil/TransformAttributeFunctor.cpp | 3 + src/osgWrappers/osgUtil/TransformCallback.cpp | 1 + src/osgWrappers/osgUtil/TriStripVisitor.cpp | 1 + src/osgWrappers/osgUtil/UpdateVisitor.cpp | 1 + 269 files changed, 731 insertions(+), 1 deletion(-) diff --git a/src/osgWrappers/osg/AlphaFunc.cpp b/src/osgWrappers/osg/AlphaFunc.cpp index 7145be201..ed2982fb5 100644 --- a/src/osgWrappers/osg/AlphaFunc.cpp +++ b/src/osgWrappers/osg/AlphaFunc.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/AnimationPath.cpp b/src/osgWrappers/osg/AnimationPath.cpp index 61a3fc1ba..938e159f7 100644 --- a/src/osgWrappers/osg/AnimationPath.cpp +++ b/src/osgWrappers/osg/AnimationPath.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -124,6 +125,15 @@ BEGIN_OBJECT_REFLECTOR(osg::AnimationPathCallback) I_Property(double, TimeMultiplier); I_Property(double, TimeOffset); I_Property(bool, UseInverseMatrix); + I_PublicMemberProperty(osg::ref_ptr< osg::AnimationPath >, _animationPath); + I_PublicMemberProperty(osg::Vec3d, _pivotPoint); + I_PublicMemberProperty(bool, _useInverseMatrix); + I_PublicMemberProperty(double, _timeOffset); + I_PublicMemberProperty(double, _timeMultiplier); + I_PublicMemberProperty(double, _firstTime); + I_PublicMemberProperty(double, _latestTime); + I_PublicMemberProperty(bool, _pause); + I_PublicMemberProperty(double, _pauseTime); END_REFLECTOR STD_MAP_REFLECTOR(std::map< double COMMA osg::AnimationPath::ControlPoint >); diff --git a/src/osgWrappers/osg/ApplicationUsage.cpp b/src/osgWrappers/osg/ApplicationUsage.cpp index 2a96ab08d..b26883f09 100644 --- a/src/osgWrappers/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/osg/ApplicationUsage.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -54,6 +55,7 @@ BEGIN_VALUE_REFLECTOR(osg::ApplicationUsage) I_MethodWithDefaults5(void, write, IN, std::ostream &, output, , IN, const osg::ApplicationUsage::UsageMap &, um, , IN, unsigned int, widthOfOutput, 80, IN, bool, showDefaults, false, IN, const osg::ApplicationUsage::UsageMap &, ud, osg::ApplicationUsage::UsageMap()); I_MethodWithDefaults4(void, write, IN, std::ostream &, output, , IN, unsigned int, type, osg::ApplicationUsage::COMMAND_LINE_OPTION, IN, unsigned int, widthOfOutput, 80, IN, bool, showDefaults, false); I_Method1(void, writeEnvironmentSettings, IN, std::ostream &, output); + I_StaticMethod0(osg::ApplicationUsage *, instance); I_Property(const std::string &, ApplicationName); I_Property(const osg::ApplicationUsage::UsageMap &, CommandLineOptions); I_Property(const osg::ApplicationUsage::UsageMap &, CommandLineOptionsDefaults); diff --git a/src/osgWrappers/osg/ArgumentParser.cpp b/src/osgWrappers/osg/ArgumentParser.cpp index 6634146d8..84b215ea7 100644 --- a/src/osgWrappers/osg/ArgumentParser.cpp +++ b/src/osgWrappers/osg/ArgumentParser.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -66,6 +67,9 @@ BEGIN_VALUE_REFLECTOR(osg::ArgumentParser) I_Method0(osg::ArgumentParser::ErrorMessageMap &, getErrorMessageMap); I_Method0(const osg::ArgumentParser::ErrorMessageMap &, getErrorMessageMap); I_MethodWithDefaults2(void, writeErrorMessages, IN, std::ostream &, output, , IN, osg::ArgumentParser::ErrorSeverity, sevrity, osg::ArgumentParser::BENIGN); + I_StaticMethod1(bool, isOption, IN, const char *, str); + I_StaticMethod1(bool, isString, IN, const char *, str); + I_StaticMethod1(bool, isNumber, IN, const char *, str); I_ReadOnlyProperty(std::string, ApplicationName); I_Property(osg::ApplicationUsage *, ApplicationUsage); I_ReadOnlyProperty(osg::ArgumentParser::ErrorMessageMap &, ErrorMessageMap); diff --git a/src/osgWrappers/osg/Array.cpp b/src/osgWrappers/osg/Array.cpp index 161643a8d..992b892aa 100644 --- a/src/osgWrappers/osg/Array.cpp +++ b/src/osgWrappers/osg/Array.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/AutoTransform.cpp b/src/osgWrappers/osg/AutoTransform.cpp index af3b324e4..6dc98047c 100644 --- a/src/osgWrappers/osg/AutoTransform.cpp +++ b/src/osgWrappers/osg/AutoTransform.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Billboard.cpp b/src/osgWrappers/osg/Billboard.cpp index 260026d3b..60df635b9 100644 --- a/src/osgWrappers/osg/Billboard.cpp +++ b/src/osgWrappers/osg/Billboard.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/BlendColor.cpp b/src/osgWrappers/osg/BlendColor.cpp index 83104b8dc..99f1448d9 100644 --- a/src/osgWrappers/osg/BlendColor.cpp +++ b/src/osgWrappers/osg/BlendColor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -40,6 +41,8 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor) I_Method1(void, setConstantColor, IN, const osg::Vec4 &, color); I_Method0(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_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/BlendEquation.cpp b/src/osgWrappers/osg/BlendEquation.cpp index 184f3cf35..cb23273e3 100644 --- a/src/osgWrappers/osg/BlendEquation.cpp +++ b/src/osgWrappers/osg/BlendEquation.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -50,6 +51,8 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) I_Method1(void, setEquation, IN, osg::BlendEquation::Equation, equation); I_Method0(osg::BlendEquation::Equation, getEquation); I_Method1(void, apply, IN, osg::State &, state); + I_StaticMethod2(osg::BlendEquation::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::BlendEquation::Extensions *, extensions); I_Property(osg::BlendEquation::Equation, Equation); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/BlendFunc.cpp b/src/osgWrappers/osg/BlendFunc.cpp index 5d443f548..0d1e14835 100644 --- a/src/osgWrappers/osg/BlendFunc.cpp +++ b/src/osgWrappers/osg/BlendFunc.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -70,6 +71,8 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendFunc) I_Method1(void, setDestinationAlpha, IN, GLenum, destination); I_Method0(GLenum, getDestinationAlpha); I_Method1(void, apply, IN, osg::State &, state); + I_StaticMethod2(osg::BlendFunc::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::BlendFunc::Extensions *, extensions); I_Property(GLenum, Destination); I_Property(GLenum, DestinationAlpha); I_Property(GLenum, DestinationRGB); diff --git a/src/osgWrappers/osg/BoundingBox.cpp b/src/osgWrappers/osg/BoundingBox.cpp index b006235c8..cae1291b5 100644 --- a/src/osgWrappers/osg/BoundingBox.cpp +++ b/src/osgWrappers/osg/BoundingBox.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -52,5 +53,7 @@ BEGIN_VALUE_REFLECTOR(osg::BoundingBox) I_Method1(osg::BoundingBox, intersect, IN, const osg::BoundingBox &, bb); I_Method1(bool, intersects, IN, const osg::BoundingBox &, bb); I_Method1(bool, contains, IN, const osg::Vec3 &, v); + I_PublicMemberProperty(osg::Vec3, _min); + I_PublicMemberProperty(osg::Vec3, _max); END_REFLECTOR diff --git a/src/osgWrappers/osg/BoundingSphere.cpp b/src/osgWrappers/osg/BoundingSphere.cpp index 9082cb237..eecad2c10 100644 --- a/src/osgWrappers/osg/BoundingSphere.cpp +++ b/src/osgWrappers/osg/BoundingSphere.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -42,5 +43,7 @@ BEGIN_VALUE_REFLECTOR(osg::BoundingSphere) I_Method1(void, expandRadiusBy, IN, const osg::BoundingBox &, bb); I_Method1(bool, contains, IN, const osg::Vec3 &, v); I_Method1(bool, intersects, IN, const osg::BoundingSphere &, bs); + I_PublicMemberProperty(osg::Vec3, _center); + I_PublicMemberProperty(float, _radius); END_REFLECTOR diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index c40765f22..b1375ae7e 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -39,11 +40,17 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BufferObject) I_Method1(void, compileBuffer, IN, osg::State &, state); I_Method1(void, releaseBuffer, IN, osg::State *, state); I_Method3(void, flushDeletedBufferObjects, IN, unsigned int, contextID, IN, double, x, IN, double &, availableTime); + I_StaticMethod2(void, deleteBufferObject, IN, unsigned int, contextID, IN, GLuint, globj); + I_StaticMethod2(osg::BufferObject::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::BufferObject::Extensions *, extensions); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::BufferObject::BufferEntry) I_Constructor0(); I_Constructor1(IN, const osg::BufferObject::BufferEntry &, be); + I_PublicMemberProperty(osg::buffered_value< unsigned int >, modifiedCount); + I_PublicMemberProperty(unsigned int, dataSize); + I_PublicMemberProperty(unsigned int, offset); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions) diff --git a/src/osgWrappers/osg/CameraNode.cpp b/src/osgWrappers/osg/CameraNode.cpp index b620d8609..bbfce8ffc 100644 --- a/src/osgWrappers/osg/CameraNode.cpp +++ b/src/osgWrappers/osg/CameraNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -166,6 +167,12 @@ BEGIN_VALUE_REFLECTOR(osg::CameraNode::Attachment) I_Method0(int, width); I_Method0(int, height); I_Method0(int, depth); + I_PublicMemberProperty(GLenum, _internalFormat); + I_PublicMemberProperty(osg::ref_ptr< osg::Image >, _image); + I_PublicMemberProperty(osg::ref_ptr< osg::Texture >, _texture); + I_PublicMemberProperty(unsigned int, _level); + I_PublicMemberProperty(unsigned int, _face); + I_PublicMemberProperty(bool, _mipMapGeneration); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::CameraNode::DrawCallback) diff --git a/src/osgWrappers/osg/CameraView.cpp b/src/osgWrappers/osg/CameraView.cpp index 61113b821..870229216 100644 --- a/src/osgWrappers/osg/CameraView.cpp +++ b/src/osgWrappers/osg/CameraView.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ClampColor.cpp b/src/osgWrappers/osg/ClampColor.cpp index c2e1950bd..a96336fb5 100644 --- a/src/osgWrappers/osg/ClampColor.cpp +++ b/src/osgWrappers/osg/ClampColor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -52,6 +53,8 @@ BEGIN_OBJECT_REFLECTOR(osg::ClampColor) I_Method1(void, setMode, IN, osg::ClampColor::Mode, mode); I_Method0(osg::ClampColor::Mode, getMode); I_Method1(void, apply, IN, osg::State &, state); + I_StaticMethod2(osg::ClampColor::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::ClampColor::Extensions *, extensions); I_Property(osg::ClampColor::Mode, Mode); I_Property(osg::ClampColor::Target, Target); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); diff --git a/src/osgWrappers/osg/ClearNode.cpp b/src/osgWrappers/osg/ClearNode.cpp index 5c63c0eec..2f9735ee7 100644 --- a/src/osgWrappers/osg/ClearNode.cpp +++ b/src/osgWrappers/osg/ClearNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ClipNode.cpp b/src/osgWrappers/osg/ClipNode.cpp index a9edd87c5..d2730c2d5 100644 --- a/src/osgWrappers/osg/ClipNode.cpp +++ b/src/osgWrappers/osg/ClipNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ClipPlane.cpp b/src/osgWrappers/osg/ClipPlane.cpp index 12cbb976c..e4d8866b1 100644 --- a/src/osgWrappers/osg/ClipPlane.cpp +++ b/src/osgWrappers/osg/ClipPlane.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ClusterCullingCallback.cpp b/src/osgWrappers/osg/ClusterCullingCallback.cpp index 6916da599..e46023a20 100644 --- a/src/osgWrappers/osg/ClusterCullingCallback.cpp +++ b/src/osgWrappers/osg/ClusterCullingCallback.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/CollectOccludersVisitor.cpp b/src/osgWrappers/osg/CollectOccludersVisitor.cpp index 4c348bac1..5ffd47e37 100644 --- a/src/osgWrappers/osg/CollectOccludersVisitor.cpp +++ b/src/osgWrappers/osg/CollectOccludersVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ColorMask.cpp b/src/osgWrappers/osg/ColorMask.cpp index 796b35f89..8a07bed4b 100644 --- a/src/osgWrappers/osg/ColorMask.cpp +++ b/src/osgWrappers/osg/ColorMask.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ColorMatrix.cpp b/src/osgWrappers/osg/ColorMatrix.cpp index 869afa79d..4d4c9cf92 100644 --- a/src/osgWrappers/osg/ColorMatrix.cpp +++ b/src/osgWrappers/osg/ColorMatrix.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp index c012eb02f..348b7ee82 100644 --- a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp +++ b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ConvexPlanarPolygon.cpp b/src/osgWrappers/osg/ConvexPlanarPolygon.cpp index 6819cb110..98dd33c5e 100644 --- a/src/osgWrappers/osg/ConvexPlanarPolygon.cpp +++ b/src/osgWrappers/osg/ConvexPlanarPolygon.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index 5f3ad359b..2b830ae43 100644 --- a/src/osgWrappers/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/osg/CoordinateSystemNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/CopyOp.cpp b/src/osgWrappers/osg/CopyOp.cpp index 58a4c0164..7870edb82 100644 --- a/src/osgWrappers/osg/CopyOp.cpp +++ b/src/osgWrappers/osg/CopyOp.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/CullFace.cpp b/src/osgWrappers/osg/CullFace.cpp index 03b48af48..6835519f2 100644 --- a/src/osgWrappers/osg/CullFace.cpp +++ b/src/osgWrappers/osg/CullFace.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/CullSettings.cpp b/src/osgWrappers/osg/CullSettings.cpp index a403c25e4..af92abf14 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/CullStack.cpp b/src/osgWrappers/osg/CullStack.cpp index 598b6be9c..7d6d6f35e 100644 --- a/src/osgWrappers/osg/CullStack.cpp +++ b/src/osgWrappers/osg/CullStack.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/CullingSet.cpp b/src/osgWrappers/osg/CullingSet.cpp index ecb18d1fe..9c78f6184 100644 --- a/src/osgWrappers/osg/CullingSet.cpp +++ b/src/osgWrappers/osg/CullingSet.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -19,6 +20,7 @@ #include #include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -81,6 +83,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CullingSet) I_Method0(void, popCurrentMask); I_Method1(void, disableAndPushOccludersCurrentMask, IN, osg::NodePath &, nodePath); I_Method1(void, popOccludersCurrentMask, IN, osg::NodePath &, nodePath); + I_StaticMethod3(osg::Vec4, computePixelSizeVector, IN, const osg::Viewport &, W, IN, const osg::Matrix &, P, IN, const osg::Matrix &, M); I_WriteOnlyProperty(const osg::CullingSet &, ); I_Property(osg::CullingSet::Mask, CullingMask); I_Property(osg::Polytope &, Frustum); diff --git a/src/osgWrappers/osg/Depth.cpp b/src/osgWrappers/osg/Depth.cpp index 031368db4..2db186b1d 100644 --- a/src/osgWrappers/osg/Depth.cpp +++ b/src/osgWrappers/osg/Depth.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/DisplaySettings.cpp b/src/osgWrappers/osg/DisplaySettings.cpp index 462d9a434..ab247c493 100644 --- a/src/osgWrappers/osg/DisplaySettings.cpp +++ b/src/osgWrappers/osg/DisplaySettings.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -105,6 +106,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) I_Method1(void, setNumMultiSamples, IN, unsigned int, samples); I_Method0(unsigned int, getNumMultiSamples); I_Method0(bool, getMultiSamples); + I_StaticMethod0(osg::DisplaySettings *, instance); I_ReadOnlyProperty(bool, AccumBuffer); I_ReadOnlyProperty(bool, AlphaBuffer); I_Property(bool, DepthBuffer); diff --git a/src/osgWrappers/osg/DrawPixels.cpp b/src/osgWrappers/osg/DrawPixels.cpp index 8ef20bc0f..cddec8b04 100644 --- a/src/osgWrappers/osg/DrawPixels.cpp +++ b/src/osgWrappers/osg/DrawPixels.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index eac971ba1..71c62ab9a 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -121,6 +122,16 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) I_Method1(void, accept, IN, osg::PrimitiveFunctor &, x); I_Method1(bool, supports, IN, const osg::PrimitiveIndexFunctor &, x); I_Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, x); + I_StaticMethodWithDefaults2(GLuint, generateDisplayList, IN, unsigned int, contextID, , IN, unsigned int, sizeHint, 0); + I_StaticMethod1(void, setMinimumNumberOfDisplayListsToRetainInCache, IN, unsigned int, minimum); + I_StaticMethod0(unsigned int, getMinimumNumberOfDisplayListsToRetainInCache); + I_StaticMethodWithDefaults3(void, deleteDisplayList, IN, unsigned int, contextID, , IN, GLuint, globj, , IN, unsigned int, sizeHint, 0); + I_StaticMethod1(void, flushAllDeletedDisplayLists, IN, unsigned int, contextID); + I_StaticMethod2(void, flushDeletedDisplayLists, IN, unsigned int, contextID, IN, double &, availableTime); + I_StaticMethod2(void, deleteVertexBufferObject, IN, unsigned int, contextID, IN, GLuint, globj); + I_StaticMethod3(void, flushDeletedVertexBufferObjects, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime); + I_StaticMethod2(osg::Drawable::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::Drawable::Extensions *, extensions); I_ReadOnlyProperty(const osg::BoundingBox &, Bound); I_Property(osg::Drawable::ComputeBoundingBoxCallback *, ComputeBoundingBoxCallback); I_Property(osg::Drawable::CullCallback *, CullCallback); diff --git a/src/osgWrappers/osg/Endian.cpp b/src/osgWrappers/osg/Endian.cpp index 5fc7ef596..4b5b7bf82 100644 --- a/src/osgWrappers/osg/Endian.cpp +++ b/src/osgWrappers/osg/Endian.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Fog.cpp b/src/osgWrappers/osg/Fog.cpp index 11feef7fc..08059ff1a 100644 --- a/src/osgWrappers/osg/Fog.cpp +++ b/src/osgWrappers/osg/Fog.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/FragmentProgram.cpp b/src/osgWrappers/osg/FragmentProgram.cpp index 8f0a46bd5..bb3fe1ad6 100644 --- a/src/osgWrappers/osg/FragmentProgram.cpp +++ b/src/osgWrappers/osg/FragmentProgram.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -57,6 +58,10 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram) I_Method1(void, apply, IN, osg::State &, state); I_Method1(void, compileGLObjects, IN, osg::State &, state); I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); + I_StaticMethod2(void, deleteFragmentProgramObject, IN, unsigned int, contextID, IN, GLuint, handle); + I_StaticMethod3(void, flushDeletedFragmentProgramObjects, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime); + I_StaticMethod2(osg::FragmentProgram::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::FragmentProgram::Extensions *, extensions); I_Property(const std::string &, FragmentProgram); I_Property(const osg::FragmentProgram::LocalParamList &, LocalParameters); I_Property(const osg::FragmentProgram::MatrixList &, Matrices); diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp index e8910deaa..790dd0102 100644 --- a/src/osgWrappers/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -58,6 +59,20 @@ TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT); BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions) I_BaseType(osg::Referenced); I_Method0(bool, isSupported); + I_StaticMethod2(osg::FBOExtensions *, instance, IN, unsigned, contextID, IN, bool, createIfNotInitalized); + I_PublicMemberProperty(osg::FBOExtensions::TglBindRenderbufferEXT *, glBindRenderbufferEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglGenRenderbuffersEXT *, glGenRenderbuffersEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglDeleteRenderbuffersEXT *, glDeleteRenderbuffersEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglRenderbufferStorageEXT *, glRenderbufferStorageEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglBindFramebufferEXT *, glBindFramebufferEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglDeleteFramebuffersEXT *, glDeleteFramebuffersEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglGenFramebuffersEXT *, glGenFramebuffersEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglCheckFramebufferStatusEXT *, glCheckFramebufferStatusEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferTexture1DEXT *, glFramebufferTexture1DEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferTexture2DEXT *, glFramebufferTexture2DEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferTexture3DEXT *, glFramebufferTexture3DEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferRenderbufferEXT *, glFramebufferRenderbufferEXT); + I_PublicMemberProperty(osg::FBOExtensions::TglGenerateMipmapEXT *, glGenerateMipmapEXT); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) @@ -93,6 +108,8 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) 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_StaticMethod2(void, deleteFrameBufferObject, IN, unsigned int, contextID, IN, GLuint, program); + I_StaticMethod3(void, flushDeletedFrameBufferObjects, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime); I_IndexedProperty1(const osg::FrameBufferAttachment &, Attachment, GLenum, attachment_point); I_ReadOnlyProperty(const osg::FrameBufferObject::AttachmentMap &, AttachmentMap); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); @@ -117,6 +134,8 @@ BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer) 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_StaticMethod2(void, deleteRenderBuffer, IN, unsigned int, contextID, IN, GLuint, rb); + I_StaticMethod3(void, flushDeletedRenderBuffers, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime); I_Property(int, Height); I_Property(GLenum, InternalFormat); I_Property(int, Width); diff --git a/src/osgWrappers/osg/FrameStamp.cpp b/src/osgWrappers/osg/FrameStamp.cpp index 0c599db98..ff9bf741d 100644 --- a/src/osgWrappers/osg/FrameStamp.cpp +++ b/src/osgWrappers/osg/FrameStamp.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/FrontFace.cpp b/src/osgWrappers/osg/FrontFace.cpp index 256f925ba..cf0326b56 100644 --- a/src/osgWrappers/osg/FrontFace.cpp +++ b/src/osgWrappers/osg/FrontFace.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/GL2Extensions.cpp b/src/osgWrappers/osg/GL2Extensions.cpp index 914794f53..5d2349acf 100644 --- a/src/osgWrappers/osg/GL2Extensions.cpp +++ b/src/osgWrappers/osg/GL2Extensions.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -133,6 +134,8 @@ BEGIN_OBJECT_REFLECTOR(osg::GL2Extensions) I_Method2(bool, getProgramInfoLog, IN, GLuint, program, IN, std::string &, result); I_Method2(bool, getShaderInfoLog, IN, GLuint, shader, IN, std::string &, result); I_Method2(bool, getAttribLocation, IN, const char *, attribName, IN, GLuint &, slot); + I_StaticMethod2(osg::GL2Extensions *, Get, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, Set, IN, unsigned int, contextID, IN, osg::GL2Extensions *, extensions); I_ReadOnlyProperty(GLuint, CurrentProgram); I_WriteOnlyProperty(bool, FragmentShaderSupported); I_ReadOnlyProperty(float, GlVersion); diff --git a/src/osgWrappers/osg/Geode.cpp b/src/osgWrappers/osg/Geode.cpp index 7c999471d..1d90809c8 100644 --- a/src/osgWrappers/osg/Geode.cpp +++ b/src/osgWrappers/osg/Geode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index 4d941e6c6..aa7f8ace0 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -206,6 +207,11 @@ BEGIN_VALUE_REFLECTOR(osg::Geometry::ArrayData) I_ConstructorWithDefaults3(IN, osg::Array *, a, , IN, osg::Geometry::AttributeBinding, b, , IN, GLboolean, n, GL_FALSE); I_ConstructorWithDefaults4(IN, osg::Array *, a, , IN, osg::IndexArray *, i, , IN, osg::Geometry::AttributeBinding, b, , IN, GLboolean, n, GL_FALSE); I_Method0(bool, empty); + I_PublicMemberProperty(osg::ref_ptr< osg::Array >, array); + I_PublicMemberProperty(osg::ref_ptr< osg::IndexArray >, indices); + I_PublicMemberProperty(osg::Geometry::AttributeBinding, binding); + I_PublicMemberProperty(GLboolean, normalize); + I_PublicMemberProperty(unsigned long, offset); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::Geometry::Vec3ArrayData) @@ -214,6 +220,11 @@ BEGIN_VALUE_REFLECTOR(osg::Geometry::Vec3ArrayData) I_ConstructorWithDefaults3(IN, osg::Vec3Array *, a, , IN, osg::Geometry::AttributeBinding, b, , IN, GLboolean, n, GL_FALSE); I_ConstructorWithDefaults4(IN, osg::Vec3Array *, a, , IN, osg::IndexArray *, i, , IN, osg::Geometry::AttributeBinding, b, , IN, GLboolean, n, GL_FALSE); I_Method0(bool, empty); + I_PublicMemberProperty(osg::ref_ptr< osg::Vec3Array >, array); + I_PublicMemberProperty(osg::ref_ptr< osg::IndexArray >, indices); + I_PublicMemberProperty(osg::Geometry::AttributeBinding, binding); + I_PublicMemberProperty(GLboolean, normalize); + I_PublicMemberProperty(unsigned long, offset); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PrimitiveSet >) diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index ffee7b1bb..aa5508699 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -47,6 +48,12 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext) I_Method1(void, makeContextCurrentImplementation, IN, osg::GraphicsContext *, readContext); I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, buffer); I_Method0(void, swapBuffersImplementation); + I_StaticMethod1(void, setCreateGraphicsContextCallback, IN, osg::GraphicsContext::CreateGraphicContextCallback *, callback); + I_StaticMethod0(osg::GraphicsContext::CreateGraphicContextCallback *, getCreateGraphicsContextCallback); + I_StaticMethod1(osg::GraphicsContext *, createGraphicsContext, IN, osg::GraphicsContext::Traits *, traits); + I_StaticMethod0(unsigned int, createNewContextID); + I_StaticMethod1(void, incrementContextIDUsageCount, IN, unsigned int, contextID); + I_StaticMethod1(void, decrementContextIDUsageCount, IN, unsigned int, contextID); I_Property(osg::GraphicsThread *, GraphicsThread); I_Property(osg::State *, State); I_ReadOnlyProperty(const osg::GraphicsContext::Traits *, Traits); @@ -61,5 +68,29 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext::Traits) I_BaseType(osg::Referenced); I_Constructor0(); + I_PublicMemberProperty(std::string, _hostName); + I_PublicMemberProperty(unsigned int, _displayNum); + I_PublicMemberProperty(unsigned int, _screenNum); + I_PublicMemberProperty(unsigned int, _x); + I_PublicMemberProperty(unsigned int, _y); + I_PublicMemberProperty(unsigned int, _width); + I_PublicMemberProperty(unsigned int, _height); + I_PublicMemberProperty(std::string, _windowName); + I_PublicMemberProperty(bool, _windowDecoration); + I_PublicMemberProperty(bool, _supportsResize); + I_PublicMemberProperty(unsigned int, _red); + I_PublicMemberProperty(unsigned int, _blue); + I_PublicMemberProperty(unsigned int, _green); + I_PublicMemberProperty(unsigned int, _alpha); + I_PublicMemberProperty(unsigned int, _depth); + I_PublicMemberProperty(unsigned int, _stencil); + I_PublicMemberProperty(bool, _pbuffer); + I_PublicMemberProperty(bool, _quadBufferStereo); + I_PublicMemberProperty(bool, _doubleBuffer); + I_PublicMemberProperty(GLenum, _target); + I_PublicMemberProperty(unsigned int, _level); + I_PublicMemberProperty(unsigned int, _face); + I_PublicMemberProperty(unsigned int, _mipMapGeneration); + I_PublicMemberProperty(osg::GraphicsContext *, _sharedContext); END_REFLECTOR diff --git a/src/osgWrappers/osg/GraphicsThread.cpp b/src/osgWrappers/osg/GraphicsThread.cpp index e5077bcbe..4b6db1837 100644 --- a/src/osgWrappers/osg/GraphicsThread.cpp +++ b/src/osgWrappers/osg/GraphicsThread.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -30,6 +31,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BarrierOperation) I_BaseType(osg::GraphicsThread::Operation); I_ConstructorWithDefaults2(IN, int, numThreads, , IN, osg::BarrierOperation::PreBlockOp, op, osg::BarrierOperation::NO_OPERATION); I_Method0(void, release); + I_PublicMemberProperty(osg::BarrierOperation::PreBlockOp, _preBlockOp); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Block) @@ -68,6 +70,8 @@ BEGIN_OBJECT_REFLECTOR(osg::GraphicsThread::Operation) I_Method0(void, release); I_Property(bool, Keep); I_Property(const std::string &, Name); + I_PublicMemberProperty(std::string, _name); + I_PublicMemberProperty(bool, _keep); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation) diff --git a/src/osgWrappers/osg/Group.cpp b/src/osgWrappers/osg/Group.cpp index 3636fe84d..0ab20c4c6 100644 --- a/src/osgWrappers/osg/Group.cpp +++ b/src/osgWrappers/osg/Group.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index 2537c0e85..a0e9524a5 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -89,6 +90,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) I_Method1(void, setPixelBufferObject, IN, osg::PixelBufferObject *, buffer); I_Method0(osg::PixelBufferObject *, getPixelBufferObject); I_Method0(const osg::PixelBufferObject *, getPixelBufferObject); + I_StaticMethod1(bool, isPackedType, IN, GLenum, type); + I_StaticMethod1(unsigned int, computeNumComponents, IN, GLenum, pixelFormat); + I_StaticMethod2(unsigned int, computePixelSizeInBits, IN, GLenum, pixelFormat, IN, GLenum, type); + I_StaticMethod4(unsigned int, computeRowWidthInBytes, IN, int, width, IN, GLenum, pixelFormat, IN, GLenum, type, IN, int, packing); + I_StaticMethodWithDefaults2(int, computeNearestPowerOfTwo, IN, int, s, , IN, float, bias, 0.5f); I_Property(osg::Image::AllocationMode, AllocationMode); I_Property(GLenum, DataType); I_Property(const std::string &, FileName); diff --git a/src/osgWrappers/osg/ImageStream.cpp b/src/osgWrappers/osg/ImageStream.cpp index 6567558f8..a390d3549 100644 --- a/src/osgWrappers/osg/ImageStream.cpp +++ b/src/osgWrappers/osg/ImageStream.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/LOD.cpp b/src/osgWrappers/osg/LOD.cpp index 7804e08b8..74f9d8b8c 100644 --- a/src/osgWrappers/osg/LOD.cpp +++ b/src/osgWrappers/osg/LOD.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Light.cpp b/src/osgWrappers/osg/Light.cpp index 5852f27b1..c1192a27b 100644 --- a/src/osgWrappers/osg/Light.cpp +++ b/src/osgWrappers/osg/Light.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/LightModel.cpp b/src/osgWrappers/osg/LightModel.cpp index fdf6a0840..b63488bda 100644 --- a/src/osgWrappers/osg/LightModel.cpp +++ b/src/osgWrappers/osg/LightModel.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/LightSource.cpp b/src/osgWrappers/osg/LightSource.cpp index 85e1b273a..bf7024268 100644 --- a/src/osgWrappers/osg/LightSource.cpp +++ b/src/osgWrappers/osg/LightSource.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/LineSegment.cpp b/src/osgWrappers/osg/LineSegment.cpp index 8189f765e..15bd511b4 100644 --- a/src/osgWrappers/osg/LineSegment.cpp +++ b/src/osgWrappers/osg/LineSegment.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/LineStipple.cpp b/src/osgWrappers/osg/LineStipple.cpp index a959bb216..02317d8a7 100644 --- a/src/osgWrappers/osg/LineStipple.cpp +++ b/src/osgWrappers/osg/LineStipple.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/LineWidth.cpp b/src/osgWrappers/osg/LineWidth.cpp index f839c30ca..ea713da9e 100644 --- a/src/osgWrappers/osg/LineWidth.cpp +++ b/src/osgWrappers/osg/LineWidth.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/LogicOp.cpp b/src/osgWrappers/osg/LogicOp.cpp index a76e1fd0a..38b4d2771 100644 --- a/src/osgWrappers/osg/LogicOp.cpp +++ b/src/osgWrappers/osg/LogicOp.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Material.cpp b/src/osgWrappers/osg/Material.cpp index 1115351b3..f37a562f4 100644 --- a/src/osgWrappers/osg/Material.cpp +++ b/src/osgWrappers/osg/Material.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Matrix.cpp b/src/osgWrappers/osg/Matrix.cpp index 165fd93d7..2c7d5a8fc 100644 --- a/src/osgWrappers/osg/Matrix.cpp +++ b/src/osgWrappers/osg/Matrix.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/MatrixTransform.cpp b/src/osgWrappers/osg/MatrixTransform.cpp index 3eb67f6e1..c05c2a1ad 100644 --- a/src/osgWrappers/osg/MatrixTransform.cpp +++ b/src/osgWrappers/osg/MatrixTransform.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Matrixd.cpp b/src/osgWrappers/osg/Matrixd.cpp index 24a606a97..9103c1378 100644 --- a/src/osgWrappers/osg/Matrixd.cpp +++ b/src/osgWrappers/osg/Matrixd.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -96,6 +97,33 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixd) I_Method2(void, mult, IN, const osg::Matrixd &, x, IN, const osg::Matrixd &, x); I_Method1(void, preMult, IN, const osg::Matrixd &, x); I_Method1(void, postMult, IN, const osg::Matrixd &, x); + I_StaticMethod0(osg::Matrixd, identity); + I_StaticMethod1(osg::Matrixd, scale, IN, const osg::Vec3f &, sv); + I_StaticMethod1(osg::Matrixd, scale, IN, const osg::Vec3d &, sv); + I_StaticMethod3(osg::Matrixd, scale, IN, osg::Matrixd::value_type, sx, IN, osg::Matrixd::value_type, sy, IN, osg::Matrixd::value_type, sz); + I_StaticMethod1(osg::Matrixd, translate, IN, const osg::Vec3f &, dv); + I_StaticMethod1(osg::Matrixd, translate, IN, const osg::Vec3d &, dv); + I_StaticMethod3(osg::Matrixd, translate, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, y, IN, osg::Matrixd::value_type, z); + I_StaticMethod2(osg::Matrixd, rotate, IN, const osg::Vec3f &, from, IN, const osg::Vec3f &, to); + I_StaticMethod2(osg::Matrixd, rotate, IN, const osg::Vec3d &, from, IN, const osg::Vec3d &, to); + I_StaticMethod4(osg::Matrixd, rotate, IN, osg::Matrixd::value_type, angle, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, y, IN, osg::Matrixd::value_type, z); + I_StaticMethod2(osg::Matrixd, rotate, IN, osg::Matrixd::value_type, angle, IN, const osg::Vec3f &, axis); + I_StaticMethod2(osg::Matrixd, rotate, IN, osg::Matrixd::value_type, angle, IN, const osg::Vec3d &, axis); + I_StaticMethod6(osg::Matrixd, rotate, IN, osg::Matrixd::value_type, angle1, IN, const osg::Vec3f &, axis1, IN, osg::Matrixd::value_type, angle2, IN, const osg::Vec3f &, axis2, IN, osg::Matrixd::value_type, angle3, IN, const osg::Vec3f &, axis3); + I_StaticMethod6(osg::Matrixd, rotate, IN, osg::Matrixd::value_type, angle1, IN, const osg::Vec3d &, axis1, IN, osg::Matrixd::value_type, angle2, IN, const osg::Vec3d &, axis2, IN, osg::Matrixd::value_type, angle3, IN, const osg::Vec3d &, axis3); + I_StaticMethod1(osg::Matrixd, rotate, IN, const osg::Quat &, quat); + I_StaticMethod1(osg::Matrixd, inverse, IN, const osg::Matrixd &, matrix); + I_StaticMethod1(osg::Matrixd, orthoNormal, IN, const osg::Matrixd &, matrix); + I_StaticMethod6(osg::Matrixd, ortho, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); + I_StaticMethod4(osg::Matrixd, ortho2D, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top); + I_StaticMethod6(osg::Matrixd, frustum, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); + I_StaticMethod4(osg::Matrixd, perspective, IN, double, fovy, IN, double, aspectRatio, IN, double, zNear, IN, double, zFar); + I_StaticMethod3(osg::Matrixd, lookAt, IN, const osg::Vec3f &, eye, IN, const osg::Vec3f &, center, IN, const osg::Vec3f &, up); + I_StaticMethod3(osg::Matrixd, lookAt, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, center, IN, const osg::Vec3d &, up); + I_StaticMethod2(osg::Vec3f, transform3x3, IN, const osg::Vec3f &, v, IN, const osg::Matrixd &, m); + I_StaticMethod2(osg::Vec3d, transform3x3, IN, const osg::Vec3d &, v, IN, const osg::Matrixd &, m); + I_StaticMethod2(osg::Vec3f, transform3x3, IN, const osg::Matrixd &, m, IN, const osg::Vec3f &, v); + I_StaticMethod2(osg::Vec3d, transform3x3, IN, const osg::Matrixd &, m, IN, const osg::Vec3d &, v); I_WriteOnlyProperty(float const *const, ); I_ReadOnlyProperty(osg::Quat, Rotate); I_ReadOnlyProperty(osg::Vec3d, Scale); diff --git a/src/osgWrappers/osg/Matrixf.cpp b/src/osgWrappers/osg/Matrixf.cpp index d4f70c7d3..9f864e892 100644 --- a/src/osgWrappers/osg/Matrixf.cpp +++ b/src/osgWrappers/osg/Matrixf.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -96,6 +97,33 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixf) I_Method2(void, mult, IN, const osg::Matrixf &, x, IN, const osg::Matrixf &, x); I_Method1(void, preMult, IN, const osg::Matrixf &, x); I_Method1(void, postMult, IN, const osg::Matrixf &, x); + I_StaticMethod0(osg::Matrixf, identity); + I_StaticMethod1(osg::Matrixf, scale, IN, const osg::Vec3f &, sv); + I_StaticMethod1(osg::Matrixf, scale, IN, const osg::Vec3d &, sv); + I_StaticMethod3(osg::Matrixf, scale, IN, osg::Matrixf::value_type, sx, IN, osg::Matrixf::value_type, sy, IN, osg::Matrixf::value_type, sz); + I_StaticMethod1(osg::Matrixf, translate, IN, const osg::Vec3f &, dv); + I_StaticMethod1(osg::Matrixf, translate, IN, const osg::Vec3d &, dv); + I_StaticMethod3(osg::Matrixf, translate, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, y, IN, osg::Matrixf::value_type, z); + I_StaticMethod2(osg::Matrixf, rotate, IN, const osg::Vec3f &, from, IN, const osg::Vec3f &, to); + I_StaticMethod2(osg::Matrixf, rotate, IN, const osg::Vec3d &, from, IN, const osg::Vec3d &, to); + I_StaticMethod4(osg::Matrixf, rotate, IN, osg::Matrixf::value_type, angle, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, y, IN, osg::Matrixf::value_type, z); + I_StaticMethod2(osg::Matrixf, rotate, IN, osg::Matrixf::value_type, angle, IN, const osg::Vec3f &, axis); + I_StaticMethod2(osg::Matrixf, rotate, IN, osg::Matrixf::value_type, angle, IN, const osg::Vec3d &, axis); + I_StaticMethod6(osg::Matrixf, rotate, IN, osg::Matrixf::value_type, angle1, IN, const osg::Vec3f &, axis1, IN, osg::Matrixf::value_type, angle2, IN, const osg::Vec3f &, axis2, IN, osg::Matrixf::value_type, angle3, IN, const osg::Vec3f &, axis3); + I_StaticMethod6(osg::Matrixf, rotate, IN, osg::Matrixf::value_type, angle1, IN, const osg::Vec3d &, axis1, IN, osg::Matrixf::value_type, angle2, IN, const osg::Vec3d &, axis2, IN, osg::Matrixf::value_type, angle3, IN, const osg::Vec3d &, axis3); + I_StaticMethod1(osg::Matrixf, rotate, IN, const osg::Quat &, quat); + I_StaticMethod1(osg::Matrixf, inverse, IN, const osg::Matrixf &, matrix); + I_StaticMethod1(osg::Matrixf, orthoNormal, IN, const osg::Matrixf &, matrix); + I_StaticMethod6(osg::Matrixf, ortho, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); + I_StaticMethod4(osg::Matrixf, ortho2D, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top); + I_StaticMethod6(osg::Matrixf, frustum, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); + I_StaticMethod4(osg::Matrixf, perspective, IN, double, fovy, IN, double, aspectRatio, IN, double, zNear, IN, double, zFar); + I_StaticMethod3(osg::Matrixf, lookAt, IN, const osg::Vec3f &, eye, IN, const osg::Vec3f &, center, IN, const osg::Vec3f &, up); + I_StaticMethod3(osg::Matrixf, lookAt, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, center, IN, const osg::Vec3d &, up); + I_StaticMethod2(osg::Vec3f, transform3x3, IN, const osg::Vec3f &, v, IN, const osg::Matrixf &, m); + I_StaticMethod2(osg::Vec3d, transform3x3, IN, const osg::Vec3d &, v, IN, const osg::Matrixf &, m); + I_StaticMethod2(osg::Vec3f, transform3x3, IN, const osg::Matrixf &, m, IN, const osg::Vec3f &, v); + I_StaticMethod2(osg::Vec3d, transform3x3, IN, const osg::Matrixf &, m, IN, const osg::Vec3d &, v); I_WriteOnlyProperty(float const *const, ); I_ReadOnlyProperty(osg::Quat, Rotate); I_ReadOnlyProperty(osg::Vec3d, Scale); diff --git a/src/osgWrappers/osg/Multisample.cpp b/src/osgWrappers/osg/Multisample.cpp index fa62c6d22..096f3c437 100644 --- a/src/osgWrappers/osg/Multisample.cpp +++ b/src/osgWrappers/osg/Multisample.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -48,6 +49,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Multisample) I_Method1(void, setHint, IN, osg::Multisample::Mode, mode); I_Method0(osg::Multisample::Mode, getHint); I_Method1(void, apply, IN, osg::State &, state); + I_StaticMethod2(osg::Multisample::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::Multisample::Extensions *, extensions); I_Property(float, Coverage); I_Property(osg::Multisample::Mode, Hint); I_Property(bool, Invert); diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index 6f857026e..d7be7de76 100644 --- a/src/osgWrappers/osg/Node.cpp +++ b/src/osgWrappers/osg/Node.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/NodeCallback.cpp b/src/osgWrappers/osg/NodeCallback.cpp index 37533a1d2..18a4ad7cf 100644 --- a/src/osgWrappers/osg/NodeCallback.cpp +++ b/src/osgWrappers/osg/NodeCallback.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -39,5 +40,6 @@ BEGIN_OBJECT_REFLECTOR(osg::NodeCallback) I_Method1(void, addNestedCallback, IN, osg::NodeCallback *, nc); I_Method1(void, removeNestedCallback, IN, osg::NodeCallback *, nc); I_Property(osg::NodeCallback *, NestedCallback); + I_PublicMemberProperty(osg::ref_ptr< osg::NodeCallback >, _nestedCallback); END_REFLECTOR diff --git a/src/osgWrappers/osg/NodeTrackerCallback.cpp b/src/osgWrappers/osg/NodeTrackerCallback.cpp index 8eb40a892..e448962e3 100644 --- a/src/osgWrappers/osg/NodeTrackerCallback.cpp +++ b/src/osgWrappers/osg/NodeTrackerCallback.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/NodeVisitor.cpp b/src/osgWrappers/osg/NodeVisitor.cpp index 1f465066a..f466eb522 100644 --- a/src/osgWrappers/osg/NodeVisitor.cpp +++ b/src/osgWrappers/osg/NodeVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Notify.cpp b/src/osgWrappers/osg/Notify.cpp index 7a7e672d4..8e4616bce 100644 --- a/src/osgWrappers/osg/Notify.cpp +++ b/src/osgWrappers/osg/Notify.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Object.cpp b/src/osgWrappers/osg/Object.cpp index 312af8131..c6bbfc69f 100644 --- a/src/osgWrappers/osg/Object.cpp +++ b/src/osgWrappers/osg/Object.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/OccluderNode.cpp b/src/osgWrappers/osg/OccluderNode.cpp index 1a94626cc..a81c56d0c 100644 --- a/src/osgWrappers/osg/OccluderNode.cpp +++ b/src/osgWrappers/osg/OccluderNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/PagedLOD.cpp b/src/osgWrappers/osg/PagedLOD.cpp index 6fab73cb8..f6d49376d 100644 --- a/src/osgWrappers/osg/PagedLOD.cpp +++ b/src/osgWrappers/osg/PagedLOD.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -72,6 +73,10 @@ END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::PagedLOD::PerRangeData) I_Constructor0(); I_Constructor1(IN, const osg::PagedLOD::PerRangeData &, prd); + I_PublicMemberProperty(std::string, _filename); + I_PublicMemberProperty(float, _priorityOffset); + I_PublicMemberProperty(float, _priorityScale); + I_PublicMemberProperty(double, _timeStamp); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::PagedLOD::PerRangeData >); diff --git a/src/osgWrappers/osg/Plane.cpp b/src/osgWrappers/osg/Plane.cpp index 9b971a98e..65f276adf 100644 --- a/src/osgWrappers/osg/Plane.cpp +++ b/src/osgWrappers/osg/Plane.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Point.cpp b/src/osgWrappers/osg/Point.cpp index c85e5835c..15f1e88b1 100644 --- a/src/osgWrappers/osg/Point.cpp +++ b/src/osgWrappers/osg/Point.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -47,6 +48,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Point) I_Method1(void, setMaxSize, IN, float, maxSize); I_Method0(float, getMaxSize); I_Method1(void, apply, IN, osg::State &, state); + I_StaticMethod2(osg::Point::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::Point::Extensions *, extensions); I_Property(const osg::Vec3 &, DistanceAttenuation); I_Property(float, FadeThresholdSize); I_Property(float, MaxSize); diff --git a/src/osgWrappers/osg/PointSprite.cpp b/src/osgWrappers/osg/PointSprite.cpp index 5e726947a..0b1f971e2 100644 --- a/src/osgWrappers/osg/PointSprite.cpp +++ b/src/osgWrappers/osg/PointSprite.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -38,6 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PointSprite) I_Method1(bool, checkValidityOfAssociatedModes, IN, osg::State &, x); I_Method0(bool, isTextureAttribute); I_Method1(void, apply, IN, osg::State &, state); + I_StaticMethod1(bool, isPointSpriteSupported, IN, unsigned int, context); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/PolygonMode.cpp b/src/osgWrappers/osg/PolygonMode.cpp index c7589bdba..95aab630a 100644 --- a/src/osgWrappers/osg/PolygonMode.cpp +++ b/src/osgWrappers/osg/PolygonMode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/PolygonOffset.cpp b/src/osgWrappers/osg/PolygonOffset.cpp index 4be4caec1..8d820d41c 100644 --- a/src/osgWrappers/osg/PolygonOffset.cpp +++ b/src/osgWrappers/osg/PolygonOffset.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -41,6 +42,12 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset) I_Method1(void, setUnits, IN, float, units); I_Method0(float, getUnits); I_Method1(void, apply, IN, osg::State &, state); + I_StaticMethod1(void, setFactorMultiplier, IN, float, multiplier); + I_StaticMethod0(float, getFactorMultiplier); + I_StaticMethod1(void, setUnitsMultiplier, IN, float, multiplier); + I_StaticMethod0(float, getUnitsMultiplier); + I_StaticMethod0(bool, areFactorAndUnitsMultipliersSet); + I_StaticMethod0(void, setFactorAndUnitsMultipliersUsingBestGuessForDriver); I_Property(float, Factor); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); I_Property(float, Units); diff --git a/src/osgWrappers/osg/PolygonStipple.cpp b/src/osgWrappers/osg/PolygonStipple.cpp index ad8a16bd9..ee6e5449d 100644 --- a/src/osgWrappers/osg/PolygonStipple.cpp +++ b/src/osgWrappers/osg/PolygonStipple.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Polytope.cpp b/src/osgWrappers/osg/Polytope.cpp index 414b8092d..959865702 100644 --- a/src/osgWrappers/osg/Polytope.cpp +++ b/src/osgWrappers/osg/Polytope.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -85,6 +86,9 @@ BEGIN_VALUE_REFLECTOR(osg::fast_back_stack< osg::Polytope::ClippingMask >) I_Method0(void, push_back); I_Method1(void, push_back, IN, const osg::Polytope::ClippingMask &, value); I_Method0(void, pop_back); + I_PublicMemberProperty(osg::Polytope::ClippingMask, _value); + I_PublicMemberProperty(std::vector< osg::Polytope::ClippingMask >, _stack); + I_PublicMemberProperty(unsigned int, _size); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::Plane >); diff --git a/src/osgWrappers/osg/PositionAttitudeTransform.cpp b/src/osgWrappers/osg/PositionAttitudeTransform.cpp index d16a80500..0060ccf76 100644 --- a/src/osgWrappers/osg/PositionAttitudeTransform.cpp +++ b/src/osgWrappers/osg/PositionAttitudeTransform.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp index 3c7b09ffb..9cdf26394 100644 --- a/src/osgWrappers/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/osg/PrimitiveSet.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp index ea8d49594..56fbc07f3 100644 --- a/src/osgWrappers/osg/Program.cpp +++ b/src/osgWrappers/osg/Program.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -57,6 +58,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Program) I_Method1(const osg::Program::ActiveVarInfoMap &, getActiveUniforms, IN, unsigned int, contextID); I_Method1(const osg::Program::ActiveVarInfoMap &, getActiveAttribs, IN, unsigned int, contextID); I_Method1(osg::Program::PerContextProgram *, getPCP, IN, unsigned int, contextID); + I_StaticMethod2(void, deleteGlProgram, IN, unsigned int, contextID, IN, GLuint, program); + I_StaticMethod3(void, flushDeletedGlPrograms, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime); I_ReadOnlyProperty(const osg::Program::AttribBindingList &, AttribBindingList); I_ArrayProperty_GA(osg::Shader *, Shader, Shaders, unsigned int, bool); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); @@ -65,6 +68,9 @@ END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::Program::ActiveVarInfo) I_Constructor0(); I_Constructor3(IN, GLint, loc, IN, GLenum, type, IN, GLint, size); + I_PublicMemberProperty(GLint, _location); + I_PublicMemberProperty(GLenum, _type); + I_PublicMemberProperty(GLint, _size); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram) diff --git a/src/osgWrappers/osg/Projection.cpp b/src/osgWrappers/osg/Projection.cpp index 9002a6bf3..52e94e6eb 100644 --- a/src/osgWrappers/osg/Projection.cpp +++ b/src/osgWrappers/osg/Projection.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index ab15d8f09..b7e8ba585 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Quat.cpp b/src/osgWrappers/osg/Quat.cpp index f6311fd83..22858ed3c 100644 --- a/src/osgWrappers/osg/Quat.cpp +++ b/src/osgWrappers/osg/Quat.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Referenced.cpp b/src/osgWrappers/osg/Referenced.cpp index 74f46551d..3d82d8b8a 100644 --- a/src/osgWrappers/osg/Referenced.cpp +++ b/src/osgWrappers/osg/Referenced.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -39,6 +40,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Referenced) I_Method0(int, referenceCount); I_Method1(void, addObserver, IN, osg::Observer *, observer); I_Method1(void, removeObserver, IN, osg::Observer *, observer); + I_StaticMethod1(void, setThreadSafeReferenceCounting, IN, bool, enableThreadSafeReferenceCounting); + I_StaticMethod0(bool, getThreadSafeReferenceCounting); + I_StaticMethod1(void, setDeleteHandler, IN, osg::DeleteHandler *, handler); + I_StaticMethod0(osg::DeleteHandler *, getDeleteHandler); I_Property(bool, ThreadSafeRefUnref); END_REFLECTOR diff --git a/src/osgWrappers/osg/Scissor.cpp b/src/osgWrappers/osg/Scissor.cpp index 2241f24ad..53a842d73 100644 --- a/src/osgWrappers/osg/Scissor.cpp +++ b/src/osgWrappers/osg/Scissor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Sequence.cpp b/src/osgWrappers/osg/Sequence.cpp index b05c99d86..835b84c0b 100644 --- a/src/osgWrappers/osg/Sequence.cpp +++ b/src/osgWrappers/osg/Sequence.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ShadeModel.cpp b/src/osgWrappers/osg/ShadeModel.cpp index a112b67c7..a8f2e60ec 100644 --- a/src/osgWrappers/osg/ShadeModel.cpp +++ b/src/osgWrappers/osg/ShadeModel.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Shader.cpp b/src/osgWrappers/osg/Shader.cpp index bff83ff0c..540266c7e 100644 --- a/src/osgWrappers/osg/Shader.cpp +++ b/src/osgWrappers/osg/Shader.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -50,6 +51,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader) I_Method1(void, compileShader, IN, unsigned int, contextID); I_Method2(void, attachShader, IN, unsigned int, contextID, IN, GLuint, program); I_Method2(bool, getGlShaderInfoLog, IN, unsigned int, contextID, IN, std::string &, log); + I_StaticMethod2(osg::Shader *, readShaderFile, IN, osg::Shader::Type, type, IN, const std::string &, fileName); + I_StaticMethod2(void, deleteGlShader, IN, unsigned int, contextID, IN, GLuint, shader); + I_StaticMethod3(void, flushDeletedGlShaders, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime); + I_StaticMethod1(osg::Shader::Type, getTypeId, IN, const std::string &, tname); I_Property(const std::string &, ShaderSource); I_PropertyWithReturnType(osg::Shader::Type, Type, bool); I_ReadOnlyProperty(const char *, Typename); diff --git a/src/osgWrappers/osg/ShadowVolumeOccluder.cpp b/src/osgWrappers/osg/ShadowVolumeOccluder.cpp index 879ae6314..91fd0210b 100644 --- a/src/osgWrappers/osg/ShadowVolumeOccluder.cpp +++ b/src/osgWrappers/osg/ShadowVolumeOccluder.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Shape.cpp b/src/osgWrappers/osg/Shape.cpp index d06548c74..bcce80596 100644 --- a/src/osgWrappers/osg/Shape.cpp +++ b/src/osgWrappers/osg/Shape.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/ShapeDrawable.cpp b/src/osgWrappers/osg/ShapeDrawable.cpp index f744c57aa..5571622f9 100644 --- a/src/osgWrappers/osg/ShapeDrawable.cpp +++ b/src/osgWrappers/osg/ShapeDrawable.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index a5a73d6bb..f4eb6db69 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/StateAttribute.cpp b/src/osgWrappers/osg/StateAttribute.cpp index bc5b5b82d..d484515f8 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index 97231a8d6..c875ec23f 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Stencil.cpp b/src/osgWrappers/osg/Stencil.cpp index 804c267da..dc0fea3bb 100644 --- a/src/osgWrappers/osg/Stencil.cpp +++ b/src/osgWrappers/osg/Stencil.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Switch.cpp b/src/osgWrappers/osg/Switch.cpp index 81a4288e6..983e5e49a 100644 --- a/src/osgWrappers/osg/Switch.cpp +++ b/src/osgWrappers/osg/Switch.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/TexEnv.cpp b/src/osgWrappers/osg/TexEnv.cpp index d50089ba7..a5394cd6f 100644 --- a/src/osgWrappers/osg/TexEnv.cpp +++ b/src/osgWrappers/osg/TexEnv.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/TexEnvCombine.cpp b/src/osgWrappers/osg/TexEnvCombine.cpp index 159a01989..c1cc19d67 100644 --- a/src/osgWrappers/osg/TexEnvCombine.cpp +++ b/src/osgWrappers/osg/TexEnvCombine.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/TexEnvFilter.cpp b/src/osgWrappers/osg/TexEnvFilter.cpp index d5c5aeaba..0ba4cad21 100644 --- a/src/osgWrappers/osg/TexEnvFilter.cpp +++ b/src/osgWrappers/osg/TexEnvFilter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/TexGen.cpp b/src/osgWrappers/osg/TexGen.cpp index 9f9be45c8..477a06191 100644 --- a/src/osgWrappers/osg/TexGen.cpp +++ b/src/osgWrappers/osg/TexGen.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/TexGenNode.cpp b/src/osgWrappers/osg/TexGenNode.cpp index 9819af889..b9a9e557c 100644 --- a/src/osgWrappers/osg/TexGenNode.cpp +++ b/src/osgWrappers/osg/TexGenNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/TexMat.cpp b/src/osgWrappers/osg/TexMat.cpp index 67ac6c5f6..bc617f74d 100644 --- a/src/osgWrappers/osg/TexMat.cpp +++ b/src/osgWrappers/osg/TexMat.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 6a9a283ac..ace9c6e54 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -146,6 +147,16 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) I_Method6(void, applyTexImage2D_load, IN, osg::State &, state, IN, GLenum, target, IN, const osg::Image *, image, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, numMipmapLevels); I_Method7(void, applyTexImage2D_subload, IN, osg::State &, state, IN, GLenum, target, IN, const osg::Image *, image, IN, GLsizei, width, IN, GLsizei, height, IN, GLint, inInternalFormat, IN, GLsizei, numMipmapLevels); I_Method1(void, takeTextureObjects, IN, osg::Texture::TextureObjectListMap &, toblm); + I_StaticMethod2(osg::Texture::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::Texture::Extensions *, extensions); + I_StaticMethod1(bool, isCompressedInternalFormat, IN, GLint, internalFormat); + I_StaticMethod6(void, getCompressedSize, IN, GLenum, internalFormat, IN, GLint, width, IN, GLint, height, IN, GLint, depth, IN, GLint &, blockSize, IN, GLint &, size); + I_StaticMethod2(osg::Texture::TextureObject *, generateTextureObject, IN, unsigned int, contextID, IN, GLenum, target); + I_StaticMethod8(osg::Texture::TextureObject *, generateTextureObject, IN, unsigned int, contextID, IN, GLenum, target, IN, GLint, numMipmapLevels, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border); + I_StaticMethod1(void, setMinimumNumberOfTextureObjectsToRetainInCache, IN, unsigned int, minimum); + I_StaticMethod0(unsigned int, getMinimumNumberOfTextureObjectsToRetainInCache); + I_StaticMethod1(void, flushAllDeletedTextureObjects, IN, unsigned int, contextID); + I_StaticMethod3(void, flushDeletedTextureObjects, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime); I_Property(const osg::Vec4 &, BorderColor); I_Property(GLint, BorderWidth); I_Property(bool, ClientStorageHint); @@ -240,6 +251,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture::TextureObject) I_Method0(bool, isAllocated); I_Method0(bool, isReusable); I_WriteOnlyProperty(bool, Allocated); + I_PublicMemberProperty(GLuint, _id); + I_PublicMemberProperty(GLenum, _target); + I_PublicMemberProperty(GLint, _numMipmapLevels); + I_PublicMemberProperty(GLenum, _internalFormat); + I_PublicMemberProperty(GLsizei, _width); + I_PublicMemberProperty(GLsizei, _height); + I_PublicMemberProperty(GLsizei, _depth); + I_PublicMemberProperty(GLint, _border); + I_PublicMemberProperty(bool, _allocated); + I_PublicMemberProperty(double, _timeStamp); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::buffered_object< osg::Texture::TextureObjectList >) diff --git a/src/osgWrappers/osg/Texture1D.cpp b/src/osgWrappers/osg/Texture1D.cpp index ef4a6536f..4a07901e7 100644 --- a/src/osgWrappers/osg/Texture1D.cpp +++ b/src/osgWrappers/osg/Texture1D.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Texture2D.cpp b/src/osgWrappers/osg/Texture2D.cpp index 0714e4fb7..83d146f06 100644 --- a/src/osgWrappers/osg/Texture2D.cpp +++ b/src/osgWrappers/osg/Texture2D.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index 778fb3f5f..cd622d58c 100644 --- a/src/osgWrappers/osg/Texture3D.cpp +++ b/src/osgWrappers/osg/Texture3D.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -59,6 +60,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D) I_Method0(unsigned int, getNumMipmapLevels); I_Method8(void, copyTexSubImage3D, IN, osg::State &, state, IN, int, xoffset, IN, int, yoffset, IN, int, zoffset, IN, int, x, IN, int, y, IN, int, width, IN, int, height); I_Method1(void, apply, IN, osg::State &, state); + I_StaticMethod2(osg::Texture3D::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::Texture3D::Extensions *, extensions); I_Property(osg::Image *, Image); I_WriteOnlyProperty(unsigned int, NumMipmapLevels); I_Property(osg::Texture3D::SubloadCallback *, SubloadCallback); diff --git a/src/osgWrappers/osg/TextureCubeMap.cpp b/src/osgWrappers/osg/TextureCubeMap.cpp index 085ff233b..032076b72 100644 --- a/src/osgWrappers/osg/TextureCubeMap.cpp +++ b/src/osgWrappers/osg/TextureCubeMap.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -63,6 +64,8 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) I_Method0(unsigned int, getNumMipmapLevels); I_Method8(void, copyTexSubImageCubeMap, IN, osg::State &, state, IN, int, face, IN, int, xoffset, IN, int, yoffset, IN, int, x, IN, int, y, IN, int, width, IN, int, height); I_Method1(void, apply, IN, osg::State &, state); + I_StaticMethod2(osg::TextureCubeMap::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::TextureCubeMap::Extensions *, extensions); I_ArrayProperty_G(osg::Image *, Image, Images, unsigned int, void); I_WriteOnlyProperty(unsigned int, NumMipmapLevels); I_Property(osg::TextureCubeMap::SubloadCallback *, SubloadCallback); diff --git a/src/osgWrappers/osg/TextureRectangle.cpp b/src/osgWrappers/osg/TextureRectangle.cpp index 3b7b3c6be..4e1fac4e7 100644 --- a/src/osgWrappers/osg/TextureRectangle.cpp +++ b/src/osgWrappers/osg/TextureRectangle.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Timer.cpp b/src/osgWrappers/osg/Timer.cpp index 772e018ae..b647537c9 100644 --- a/src/osgWrappers/osg/Timer.cpp +++ b/src/osgWrappers/osg/Timer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -27,6 +28,7 @@ BEGIN_VALUE_REFLECTOR(osg::Timer) I_Method2(double, delta_u, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); I_Method2(double, delta_n, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); I_Method0(double, getSecondsPerTick); + I_StaticMethod0(const osg::Timer *, instance); I_ReadOnlyProperty(double, SecondsPerTick); END_REFLECTOR diff --git a/src/osgWrappers/osg/Transform.cpp b/src/osgWrappers/osg/Transform.cpp index 2920fab93..e2270074f 100644 --- a/src/osgWrappers/osg/Transform.cpp +++ b/src/osgWrappers/osg/Transform.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp index 5e32fce09..28ce55e8c 100644 --- a/src/osgWrappers/osg/Uniform.cpp +++ b/src/osgWrappers/osg/Uniform.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -203,6 +204,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform) I_Method1(void, setModifiedCount, IN, unsigned int, mc); I_Method0(unsigned int, getModifiedCount); I_Method2(void, apply, IN, const osg::GL2Extensions *, ext, IN, GLint, location); + I_StaticMethod1(const char *, getTypename, IN, osg::Uniform::Type, t); + I_StaticMethod1(int, getTypeNumComponents, IN, osg::Uniform::Type, t); + I_StaticMethod1(osg::Uniform::Type, getTypeId, IN, const std::string &, tname); + I_StaticMethod1(osg::Uniform::Type, getGlApiType, IN, osg::Uniform::Type, t); + I_StaticMethod1(GLenum, getInternalArrayType, IN, osg::Uniform::Type, t); I_WriteOnlyPropertyWithReturnType(bool, , bool); I_WriteOnlyPropertyWithReturnType(osg::FloatArray *, Array, bool); I_ArrayProperty_Custom(bool, Element, Elements, unsigned int, bool); diff --git a/src/osgWrappers/osg/Vec2.cpp b/src/osgWrappers/osg/Vec2.cpp index 440550ea4..2b959106d 100644 --- a/src/osgWrappers/osg/Vec2.cpp +++ b/src/osgWrappers/osg/Vec2.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec2b.cpp b/src/osgWrappers/osg/Vec2b.cpp index e399a18fc..97b54fe76 100644 --- a/src/osgWrappers/osg/Vec2b.cpp +++ b/src/osgWrappers/osg/Vec2b.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec2d.cpp b/src/osgWrappers/osg/Vec2d.cpp index 43789573c..baacdd1c9 100644 --- a/src/osgWrappers/osg/Vec2d.cpp +++ b/src/osgWrappers/osg/Vec2d.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec2f.cpp b/src/osgWrappers/osg/Vec2f.cpp index 962e96805..5aec715fe 100644 --- a/src/osgWrappers/osg/Vec2f.cpp +++ b/src/osgWrappers/osg/Vec2f.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec2s.cpp b/src/osgWrappers/osg/Vec2s.cpp index 4d580fc36..117399c37 100644 --- a/src/osgWrappers/osg/Vec2s.cpp +++ b/src/osgWrappers/osg/Vec2s.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec3.cpp b/src/osgWrappers/osg/Vec3.cpp index 7beeea20e..d76b9a823 100644 --- a/src/osgWrappers/osg/Vec3.cpp +++ b/src/osgWrappers/osg/Vec3.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec3b.cpp b/src/osgWrappers/osg/Vec3b.cpp index 24a255531..58f4c744c 100644 --- a/src/osgWrappers/osg/Vec3b.cpp +++ b/src/osgWrappers/osg/Vec3b.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec3d.cpp b/src/osgWrappers/osg/Vec3d.cpp index 33143b26a..b01b2b6d4 100644 --- a/src/osgWrappers/osg/Vec3d.cpp +++ b/src/osgWrappers/osg/Vec3d.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec3f.cpp b/src/osgWrappers/osg/Vec3f.cpp index d33495644..39d80946e 100644 --- a/src/osgWrappers/osg/Vec3f.cpp +++ b/src/osgWrappers/osg/Vec3f.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec3s.cpp b/src/osgWrappers/osg/Vec3s.cpp index b2de84adb..11f3bd0fe 100644 --- a/src/osgWrappers/osg/Vec3s.cpp +++ b/src/osgWrappers/osg/Vec3s.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec4.cpp b/src/osgWrappers/osg/Vec4.cpp index 6663b4b71..54f8a96fc 100644 --- a/src/osgWrappers/osg/Vec4.cpp +++ b/src/osgWrappers/osg/Vec4.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec4b.cpp b/src/osgWrappers/osg/Vec4b.cpp index b0ee6e017..5c22b9fca 100644 --- a/src/osgWrappers/osg/Vec4b.cpp +++ b/src/osgWrappers/osg/Vec4b.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec4d.cpp b/src/osgWrappers/osg/Vec4d.cpp index 616ace86d..6dcdbda25 100644 --- a/src/osgWrappers/osg/Vec4d.cpp +++ b/src/osgWrappers/osg/Vec4d.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec4f.cpp b/src/osgWrappers/osg/Vec4f.cpp index e2b601437..9f3285110 100644 --- a/src/osgWrappers/osg/Vec4f.cpp +++ b/src/osgWrappers/osg/Vec4f.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec4s.cpp b/src/osgWrappers/osg/Vec4s.cpp index 73368e2b5..2a9da4f05 100644 --- a/src/osgWrappers/osg/Vec4s.cpp +++ b/src/osgWrappers/osg/Vec4s.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/Vec4ub.cpp b/src/osgWrappers/osg/Vec4ub.cpp index 8241a2bf0..cc7a84a27 100644 --- a/src/osgWrappers/osg/Vec4ub.cpp +++ b/src/osgWrappers/osg/Vec4ub.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/VertexProgram.cpp b/src/osgWrappers/osg/VertexProgram.cpp index 2760265f4..04e3cf2e2 100644 --- a/src/osgWrappers/osg/VertexProgram.cpp +++ b/src/osgWrappers/osg/VertexProgram.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -57,6 +58,10 @@ BEGIN_OBJECT_REFLECTOR(osg::VertexProgram) I_Method1(void, apply, IN, osg::State &, state); I_Method1(void, compileGLObjects, IN, osg::State &, state); I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); + I_StaticMethod2(void, deleteVertexProgramObject, IN, unsigned int, contextID, IN, GLuint, handle); + I_StaticMethod3(void, flushDeletedVertexProgramObjects, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime); + I_StaticMethod2(osg::VertexProgram::Extensions *, getExtensions, IN, unsigned int, contextID, IN, bool, createIfNotInitalized); + I_StaticMethod2(void, setExtensions, IN, unsigned int, contextID, IN, osg::VertexProgram::Extensions *, extensions); I_Property(const osg::VertexProgram::LocalParamList &, LocalParameters); I_Property(const osg::VertexProgram::MatrixList &, Matrices); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); diff --git a/src/osgWrappers/osg/Viewport.cpp b/src/osgWrappers/osg/Viewport.cpp index b479176fe..aaed162a3 100644 --- a/src/osgWrappers/osg/Viewport.cpp +++ b/src/osgWrappers/osg/Viewport.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osg/observer_ptr.cpp b/src/osgWrappers/osg/observer_ptr.cpp index 62d1080b9..b1e17d81b 100644 --- a/src/osgWrappers/osg/observer_ptr.cpp +++ b/src/osgWrappers/osg/observer_ptr.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/Archive.cpp b/src/osgWrappers/osgDB/Archive.cpp index c013c63eb..5fcd5f073 100644 --- a/src/osgWrappers/osgDB/Archive.cpp +++ b/src/osgWrappers/osgDB/Archive.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index 9df3a4800..1b0f9b67f 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/DotOsgWrapper.cpp b/src/osgWrappers/osgDB/DotOsgWrapper.cpp index aaf9234ca..0a34f3bee 100644 --- a/src/osgWrappers/osgDB/DotOsgWrapper.cpp +++ b/src/osgWrappers/osgDB/DotOsgWrapper.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/DynamicLibrary.cpp b/src/osgWrappers/osgDB/DynamicLibrary.cpp index 7897d1a30..97e8b3010 100644 --- a/src/osgWrappers/osgDB/DynamicLibrary.cpp +++ b/src/osgWrappers/osgDB/DynamicLibrary.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -29,6 +30,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DynamicLibrary) I_Method0(const std::string &, getFullName); I_Method0(osgDB::DynamicLibrary::HANDLE, getHandle); I_Method1(osgDB::DynamicLibrary::PROC_ADDRESS, getProcAddress, IN, const std::string &, procName); + I_StaticMethod1(osgDB::DynamicLibrary *, loadLibrary, IN, const std::string &, libraryName); I_ReadOnlyProperty(const std::string &, FullName); I_ReadOnlyProperty(osgDB::DynamicLibrary::HANDLE, Handle); I_ReadOnlyProperty(const std::string &, Name); diff --git a/src/osgWrappers/osgDB/Field.cpp b/src/osgWrappers/osgDB/Field.cpp index ff79b8975..488b43016 100644 --- a/src/osgWrappers/osgDB/Field.cpp +++ b/src/osgWrappers/osgDB/Field.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -63,6 +64,7 @@ BEGIN_VALUE_REFLECTOR(osgDB::Field) I_Method1(bool, matchFloat, IN, float, f); I_Method1(bool, getFloat, IN, float &, f); I_Method1(bool, getFloat, IN, double &, f); + I_StaticMethodWithDefaults2(osgDB::Field::FieldType, calculateFieldType, IN, const char *, str, , IN, bool, withinQuotes, false); I_ReadOnlyProperty(osgDB::Field::FieldType, FieldType); I_ReadOnlyProperty(int, NoCharacters); I_Property(int, NoNestedBrackets); diff --git a/src/osgWrappers/osgDB/FieldReader.cpp b/src/osgWrappers/osgDB/FieldReader.cpp index 0f4f97d30..00097e2a5 100644 --- a/src/osgWrappers/osgDB/FieldReader.cpp +++ b/src/osgWrappers/osgDB/FieldReader.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/FieldReaderIterator.cpp b/src/osgWrappers/osgDB/FieldReaderIterator.cpp index 1536df238..3f849329d 100644 --- a/src/osgWrappers/osgDB/FieldReaderIterator.cpp +++ b/src/osgWrappers/osgDB/FieldReaderIterator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/FileUtils.cpp b/src/osgWrappers/osgDB/FileUtils.cpp index a6fc93e81..3b5427093 100644 --- a/src/osgWrappers/osgDB/FileUtils.cpp +++ b/src/osgWrappers/osgDB/FileUtils.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/ImageOptions.cpp b/src/osgWrappers/osgDB/ImageOptions.cpp index a632576a7..c020e012f 100644 --- a/src/osgWrappers/osgDB/ImageOptions.cpp +++ b/src/osgWrappers/osgDB/ImageOptions.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -44,21 +45,43 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ImageOptions) I_Method0(const char *, libraryName); I_Method0(const char *, className); I_Method0(void, init); + I_PublicMemberProperty(osgDB::ImageOptions::ImageSamplingMode, _sourceImageSamplingMode); + I_PublicMemberProperty(osgDB::ImageOptions::ImageWindowMode, _sourceImageWindowMode); + I_PublicMemberProperty(osgDB::ImageOptions::RatioWindow, _sourceRatioWindow); + I_PublicMemberProperty(osgDB::ImageOptions::PixelWindow, _sourcePixelWindow); + I_PublicMemberProperty(osg::ref_ptr< osg::Image >, _destinationImage); + I_PublicMemberProperty(osgDB::ImageOptions::ImageWindowMode, _destinationImageWindowMode); + I_PublicMemberProperty(osgDB::ImageOptions::RatioWindow, _destinationRatioWindow); + I_PublicMemberProperty(osgDB::ImageOptions::PixelWindow, _destinationPixelWindow); + I_PublicMemberProperty(GLenum, _destinationDataType); + I_PublicMemberProperty(GLenum, _destinationPixelFormat); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgDB::ImageOptions::PixelWindow) I_Constructor0(); I_Method4(void, set, IN, unsigned int, x, IN, unsigned int, y, IN, unsigned int, w, IN, unsigned int, h); + I_PublicMemberProperty(unsigned int, windowX); + I_PublicMemberProperty(unsigned int, windowY); + I_PublicMemberProperty(unsigned int, windowWidth); + I_PublicMemberProperty(unsigned int, windowHeight); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgDB::ImageOptions::RatioWindow) I_Constructor0(); I_Method4(void, set, IN, double, x, IN, double, y, IN, double, w, IN, double, h); + I_PublicMemberProperty(double, windowX); + I_PublicMemberProperty(double, windowY); + I_PublicMemberProperty(double, windowWidth); + I_PublicMemberProperty(double, windowHeight); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgDB::ImageOptions::TexCoordRange) I_BaseType(osg::Referenced); I_Constructor0(); I_Method4(void, set, IN, double, x, IN, double, y, IN, double, w, IN, double, h); + I_PublicMemberProperty(double, _x); + I_PublicMemberProperty(double, _y); + I_PublicMemberProperty(double, _w); + I_PublicMemberProperty(double, _h); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/Input.cpp b/src/osgWrappers/osgDB/Input.cpp index 4a2f25c5c..48c0c7681 100644 --- a/src/osgWrappers/osgDB/Input.cpp +++ b/src/osgWrappers/osgDB/Input.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/Output.cpp b/src/osgWrappers/osgDB/Output.cpp index 72380bbbc..cee0c2dca 100644 --- a/src/osgWrappers/osgDB/Output.cpp +++ b/src/osgWrappers/osgDB/Output.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/ParameterOutput.cpp b/src/osgWrappers/osgDB/ParameterOutput.cpp index cd02ef23f..74c8f107a 100644 --- a/src/osgWrappers/osgDB/ParameterOutput.cpp +++ b/src/osgWrappers/osgDB/ParameterOutput.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index 848c0130b..6d66d2f63 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/ReentrantMutex.cpp b/src/osgWrappers/osgDB/ReentrantMutex.cpp index 65cc1d54d..27cda2cea 100644 --- a/src/osgWrappers/osgDB/ReentrantMutex.cpp +++ b/src/osgWrappers/osgDB/ReentrantMutex.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index ddcb7c472..82b0a6ae5 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -126,6 +127,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) I_Method1(void, setSharedStateManager, IN, osgDB::SharedStateManager *, SharedStateManager); I_Method0(osgDB::SharedStateManager *, getOrCreateSharedStateManager); I_Method0(osgDB::SharedStateManager *, getSharedStateManager); + I_StaticMethodWithDefaults1(osgDB::Registry *, instance, IN, bool, erase, false); I_Property(bool, CreateNodeFromImage); I_Property(const osgDB::FilePathList &, DataFilePathList); I_Property(osgDB::DatabasePager *, DatabasePager); @@ -151,6 +153,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Registry::ReadFunctor) I_Method1(osgDB::ReaderWriter::ReadResult, doRead, IN, osgDB::ReaderWriter &, rw); I_Method1(bool, isValid, IN, osgDB::ReaderWriter::ReadResult &, readResult); I_Method1(bool, isValid, IN, osg::Object *, object); + I_PublicMemberProperty(std::string, _filename); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgDB::Registry::WriteFileCallback) diff --git a/src/osgWrappers/osgDB/SharedStateManager.cpp b/src/osgWrappers/osgDB/SharedStateManager.cpp index 305c5b64c..66e410fa4 100644 --- a/src/osgWrappers/osgDB/SharedStateManager.cpp +++ b/src/osgWrappers/osgDB/SharedStateManager.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/AnisotropicLighting.cpp b/src/osgWrappers/osgFX/AnisotropicLighting.cpp index 58363bfd3..50dedbf4b 100644 --- a/src/osgWrappers/osgFX/AnisotropicLighting.cpp +++ b/src/osgWrappers/osgFX/AnisotropicLighting.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/BumpMapping.cpp b/src/osgWrappers/osgFX/BumpMapping.cpp index d3f32d4fa..b56f5930c 100644 --- a/src/osgWrappers/osgFX/BumpMapping.cpp +++ b/src/osgWrappers/osgFX/BumpMapping.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/Cartoon.cpp b/src/osgWrappers/osgFX/Cartoon.cpp index 1dcb2fd4e..e10533506 100644 --- a/src/osgWrappers/osgFX/Cartoon.cpp +++ b/src/osgWrappers/osgFX/Cartoon.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/Effect.cpp b/src/osgWrappers/osgFX/Effect.cpp index 209a9be9d..88f9edd25 100644 --- a/src/osgWrappers/osgFX/Effect.cpp +++ b/src/osgWrappers/osgFX/Effect.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/MultiTextureControl.cpp b/src/osgWrappers/osgFX/MultiTextureControl.cpp index f4894337d..06e9c7e56 100644 --- a/src/osgWrappers/osgFX/MultiTextureControl.cpp +++ b/src/osgWrappers/osgFX/MultiTextureControl.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/Registry.cpp b/src/osgWrappers/osgFX/Registry.cpp index 1a21e3720..068cce8ac 100644 --- a/src/osgWrappers/osgFX/Registry.cpp +++ b/src/osgWrappers/osgFX/Registry.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -26,6 +27,7 @@ BEGIN_OBJECT_REFLECTOR(osgFX::Registry) I_BaseType(osg::Referenced); I_Method1(void, registerEffect, IN, const osgFX::Effect *, effect); I_Method0(const osgFX::Registry::EffectMap &, getEffectMap); + I_StaticMethod0(osgFX::Registry *, instance); I_ReadOnlyProperty(const osgFX::Registry::EffectMap &, EffectMap); END_REFLECTOR diff --git a/src/osgWrappers/osgFX/Scribe.cpp b/src/osgWrappers/osgFX/Scribe.cpp index 549d93118..a785ca4fd 100644 --- a/src/osgWrappers/osgFX/Scribe.cpp +++ b/src/osgWrappers/osgFX/Scribe.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/SpecularHighlights.cpp b/src/osgWrappers/osgFX/SpecularHighlights.cpp index 42e3d2661..23ac35791 100644 --- a/src/osgWrappers/osgFX/SpecularHighlights.cpp +++ b/src/osgWrappers/osgFX/SpecularHighlights.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/Technique.cpp b/src/osgWrappers/osgFX/Technique.cpp index 12fe6c6a9..f59ab39a8 100644 --- a/src/osgWrappers/osgFX/Technique.cpp +++ b/src/osgWrappers/osgFX/Technique.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/Validator.cpp b/src/osgWrappers/osgFX/Validator.cpp index d284d5029..e0d8f0e54 100644 --- a/src/osgWrappers/osgFX/Validator.cpp +++ b/src/osgWrappers/osgFX/Validator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp index 3462d3ced..f6ae3bd31 100644 --- a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/DriveManipulator.cpp b/src/osgWrappers/osgGA/DriveManipulator.cpp index 39bc87088..c7016c2e3 100644 --- a/src/osgWrappers/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/osgGA/DriveManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/EventQueue.cpp b/src/osgWrappers/osgGA/EventQueue.cpp index 6773898d2..40999168a 100644 --- a/src/osgWrappers/osgGA/EventQueue.cpp +++ b/src/osgWrappers/osgGA/EventQueue.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/EventVisitor.cpp b/src/osgWrappers/osgGA/EventVisitor.cpp index be58942e6..109f3dfb3 100644 --- a/src/osgWrappers/osgGA/EventVisitor.cpp +++ b/src/osgWrappers/osgGA/EventVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/FlightManipulator.cpp b/src/osgWrappers/osgGA/FlightManipulator.cpp index c3e95f5a7..3e63cae51 100644 --- a/src/osgWrappers/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/osgGA/FlightManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/GUIActionAdapter.cpp b/src/osgWrappers/osgGA/GUIActionAdapter.cpp index 1f6c9cdfe..6b3124308 100644 --- a/src/osgWrappers/osgGA/GUIActionAdapter.cpp +++ b/src/osgWrappers/osgGA/GUIActionAdapter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/GUIEventAdapter.cpp b/src/osgWrappers/osgGA/GUIEventAdapter.cpp index c52c8cb42..471fe574b 100644 --- a/src/osgWrappers/osgGA/GUIEventAdapter.cpp +++ b/src/osgWrappers/osgGA/GUIEventAdapter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/GUIEventHandler.cpp b/src/osgWrappers/osgGA/GUIEventHandler.cpp index d6cf5df6b..78d8a1eb9 100644 --- a/src/osgWrappers/osgGA/GUIEventHandler.cpp +++ b/src/osgWrappers/osgGA/GUIEventHandler.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/GUIEventHandlerVisitor.cpp b/src/osgWrappers/osgGA/GUIEventHandlerVisitor.cpp index da2bfe3db..5057f4e61 100644 --- a/src/osgWrappers/osgGA/GUIEventHandlerVisitor.cpp +++ b/src/osgWrappers/osgGA/GUIEventHandlerVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp index e2f4fbcbb..fdb4e50c1 100644 --- a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/MatrixManipulator.cpp b/src/osgWrappers/osgGA/MatrixManipulator.cpp index a1ba12777..fb45c780d 100644 --- a/src/osgWrappers/osgGA/MatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/MatrixManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index 655761b45..b62f899e5 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/SetSceneViewVisitor.cpp b/src/osgWrappers/osgGA/SetSceneViewVisitor.cpp index 6db4cbcc2..ff07a3de7 100644 --- a/src/osgWrappers/osgGA/SetSceneViewVisitor.cpp +++ b/src/osgWrappers/osgGA/SetSceneViewVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/StateSetManipulator.cpp b/src/osgWrappers/osgGA/StateSetManipulator.cpp index a85a04191..f487a1e9a 100644 --- a/src/osgWrappers/osgGA/StateSetManipulator.cpp +++ b/src/osgWrappers/osgGA/StateSetManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/TerrainManipulator.cpp b/src/osgWrappers/osgGA/TerrainManipulator.cpp index 874e73f34..5d605ce5c 100644 --- a/src/osgWrappers/osgGA/TerrainManipulator.cpp +++ b/src/osgWrappers/osgGA/TerrainManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/TrackballManipulator.cpp b/src/osgWrappers/osgGA/TrackballManipulator.cpp index 62774283b..b9694c35a 100644 --- a/src/osgWrappers/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/osgGA/TrackballManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgGA/UFOManipulator.cpp b/src/osgWrappers/osgGA/UFOManipulator.cpp index ffa244754..afa7f00c5 100644 --- a/src/osgWrappers/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/osgGA/UFOManipulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/AccelOperator.cpp b/src/osgWrappers/osgParticle/AccelOperator.cpp index 13988a4e5..6c6ce4293 100644 --- a/src/osgWrappers/osgParticle/AccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AccelOperator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp index e1008d1cd..a81a52b5b 100644 --- a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/BoxPlacer.cpp b/src/osgWrappers/osgParticle/BoxPlacer.cpp index 95655019e..7e06d376b 100644 --- a/src/osgWrappers/osgParticle/BoxPlacer.cpp +++ b/src/osgWrappers/osgParticle/BoxPlacer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/CenteredPlacer.cpp b/src/osgWrappers/osgParticle/CenteredPlacer.cpp index fec95e267..76c7da8f6 100644 --- a/src/osgWrappers/osgParticle/CenteredPlacer.cpp +++ b/src/osgWrappers/osgParticle/CenteredPlacer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp index 26eeace51..22f05d943 100644 --- a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp index 19d5453ce..7ac37d2af 100644 --- a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp +++ b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Counter.cpp b/src/osgWrappers/osgParticle/Counter.cpp index 17cf63d5a..94334fce2 100644 --- a/src/osgWrappers/osgParticle/Counter.cpp +++ b/src/osgWrappers/osgParticle/Counter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Emitter.cpp b/src/osgWrappers/osgParticle/Emitter.cpp index 4c547afbe..49f0027f4 100644 --- a/src/osgWrappers/osgParticle/Emitter.cpp +++ b/src/osgWrappers/osgParticle/Emitter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp b/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp index 9e5344ed9..ae8e02a43 100644 --- a/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp +++ b/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ExplosionEffect.cpp b/src/osgWrappers/osgParticle/ExplosionEffect.cpp index bdc6d320e..cde7d8d30 100644 --- a/src/osgWrappers/osgParticle/ExplosionEffect.cpp +++ b/src/osgWrappers/osgParticle/ExplosionEffect.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/FireEffect.cpp b/src/osgWrappers/osgParticle/FireEffect.cpp index e810ca3ca..c587bfe4c 100644 --- a/src/osgWrappers/osgParticle/FireEffect.cpp +++ b/src/osgWrappers/osgParticle/FireEffect.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp b/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp index 2432953c0..3f14b9060 100644 --- a/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp +++ b/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/FluidProgram.cpp b/src/osgWrappers/osgParticle/FluidProgram.cpp index d1b5ff57c..91d6edc7f 100644 --- a/src/osgWrappers/osgParticle/FluidProgram.cpp +++ b/src/osgWrappers/osgParticle/FluidProgram.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ForceOperator.cpp b/src/osgWrappers/osgParticle/ForceOperator.cpp index 71c72e5b8..5f6b1196d 100644 --- a/src/osgWrappers/osgParticle/ForceOperator.cpp +++ b/src/osgWrappers/osgParticle/ForceOperator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Interpolator.cpp b/src/osgWrappers/osgParticle/Interpolator.cpp index b74acc4fb..ab9fa488d 100644 --- a/src/osgWrappers/osgParticle/Interpolator.cpp +++ b/src/osgWrappers/osgParticle/Interpolator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/LinearInterpolator.cpp b/src/osgWrappers/osgParticle/LinearInterpolator.cpp index b504bbfaa..da3ba4795 100644 --- a/src/osgWrappers/osgParticle/LinearInterpolator.cpp +++ b/src/osgWrappers/osgParticle/LinearInterpolator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ModularEmitter.cpp b/src/osgWrappers/osgParticle/ModularEmitter.cpp index 0b352d4d0..e69c0cc4c 100644 --- a/src/osgWrappers/osgParticle/ModularEmitter.cpp +++ b/src/osgWrappers/osgParticle/ModularEmitter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ModularProgram.cpp b/src/osgWrappers/osgParticle/ModularProgram.cpp index 1a31b58b4..26898d95b 100644 --- a/src/osgWrappers/osgParticle/ModularProgram.cpp +++ b/src/osgWrappers/osgParticle/ModularProgram.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp index 8309197de..e50b820d7 100644 --- a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Operator.cpp b/src/osgWrappers/osgParticle/Operator.cpp index 4fdf9fba5..8bf3bf571 100644 --- a/src/osgWrappers/osgParticle/Operator.cpp +++ b/src/osgWrappers/osgParticle/Operator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Particle.cpp b/src/osgWrappers/osgParticle/Particle.cpp index 95f4af02a..99c025c4c 100644 --- a/src/osgWrappers/osgParticle/Particle.cpp +++ b/src/osgWrappers/osgParticle/Particle.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ParticleEffect.cpp b/src/osgWrappers/osgParticle/ParticleEffect.cpp index 950ca0ab6..fa240a0ba 100644 --- a/src/osgWrappers/osgParticle/ParticleEffect.cpp +++ b/src/osgWrappers/osgParticle/ParticleEffect.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ParticleProcessor.cpp b/src/osgWrappers/osgParticle/ParticleProcessor.cpp index bcdd0f3b0..e7c8a755f 100644 --- a/src/osgWrappers/osgParticle/ParticleProcessor.cpp +++ b/src/osgWrappers/osgParticle/ParticleProcessor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ParticleSystem.cpp b/src/osgWrappers/osgParticle/ParticleSystem.cpp index 7206c8e47..847db3faa 100644 --- a/src/osgWrappers/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp index e18957a30..ca1553649 100644 --- a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Placer.cpp b/src/osgWrappers/osgParticle/Placer.cpp index 7c60f3857..ed5c298ff 100644 --- a/src/osgWrappers/osgParticle/Placer.cpp +++ b/src/osgWrappers/osgParticle/Placer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/PointPlacer.cpp b/src/osgWrappers/osgParticle/PointPlacer.cpp index 8812bb124..1822b6fe8 100644 --- a/src/osgWrappers/osgParticle/PointPlacer.cpp +++ b/src/osgWrappers/osgParticle/PointPlacer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp index ec57c02a4..da738ce09 100644 --- a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp +++ b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -126,10 +127,16 @@ END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable::Cell) I_Constructor3(IN, int, in_i, IN, int, in_j, IN, int, in_k); + I_PublicMemberProperty(int, i); + I_PublicMemberProperty(int, j); + I_PublicMemberProperty(int, k); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable::DepthMatrixStartTime) I_Constructor0(); + I_PublicMemberProperty(float, depth); + I_PublicMemberProperty(float, startTime); + I_PublicMemberProperty(osg::Matrix, modelview); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable::LessFunctor) diff --git a/src/osgWrappers/osgParticle/Program.cpp b/src/osgWrappers/osgParticle/Program.cpp index 4457ab0a1..145fc4e02 100644 --- a/src/osgWrappers/osgParticle/Program.cpp +++ b/src/osgWrappers/osgParticle/Program.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/RadialShooter.cpp b/src/osgWrappers/osgParticle/RadialShooter.cpp index 98eb2a8d8..2c5bdd8e1 100644 --- a/src/osgWrappers/osgParticle/RadialShooter.cpp +++ b/src/osgWrappers/osgParticle/RadialShooter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/RandomRateCounter.cpp b/src/osgWrappers/osgParticle/RandomRateCounter.cpp index a1484ba67..41a66227f 100644 --- a/src/osgWrappers/osgParticle/RandomRateCounter.cpp +++ b/src/osgWrappers/osgParticle/RandomRateCounter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/SectorPlacer.cpp b/src/osgWrappers/osgParticle/SectorPlacer.cpp index 5914e208c..b57abd9c3 100644 --- a/src/osgWrappers/osgParticle/SectorPlacer.cpp +++ b/src/osgWrappers/osgParticle/SectorPlacer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/SegmentPlacer.cpp b/src/osgWrappers/osgParticle/SegmentPlacer.cpp index ec96fe3a6..c3ea7e685 100644 --- a/src/osgWrappers/osgParticle/SegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/SegmentPlacer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Shooter.cpp b/src/osgWrappers/osgParticle/Shooter.cpp index 542bb89a6..79cfeba24 100644 --- a/src/osgWrappers/osgParticle/Shooter.cpp +++ b/src/osgWrappers/osgParticle/Shooter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/SmokeEffect.cpp b/src/osgWrappers/osgParticle/SmokeEffect.cpp index f525b4c42..5288e54e6 100644 --- a/src/osgWrappers/osgParticle/SmokeEffect.cpp +++ b/src/osgWrappers/osgParticle/SmokeEffect.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp b/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp index 15f927451..d366ee661 100644 --- a/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp +++ b/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/VariableRateCounter.cpp b/src/osgWrappers/osgParticle/VariableRateCounter.cpp index a7d09e49e..b8a053c07 100644 --- a/src/osgWrappers/osgParticle/VariableRateCounter.cpp +++ b/src/osgWrappers/osgParticle/VariableRateCounter.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/range.cpp b/src/osgWrappers/osgParticle/range.cpp index 5b41c4936..58f8b6d98 100644 --- a/src/osgWrappers/osgParticle/range.cpp +++ b/src/osgWrappers/osgParticle/range.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -39,6 +40,8 @@ BEGIN_VALUE_REFLECTOR(osgParticle::range< float >) I_Method0(float, mid); I_ReadOnlyProperty(float, _random); I_ReadOnlyProperty(float, _random_sqrtf); + I_PublicMemberProperty(float, minimum); + I_PublicMemberProperty(float, maximum); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec2 >) @@ -50,6 +53,8 @@ BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec2 >) I_Method0(osg::Vec2, mid); I_ReadOnlyProperty(osg::Vec2, _random); I_ReadOnlyProperty(osg::Vec2, _random_sqrtf); + I_PublicMemberProperty(osg::Vec2, minimum); + I_PublicMemberProperty(osg::Vec2, maximum); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec3 >) @@ -61,6 +66,8 @@ BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec3 >) I_Method0(osg::Vec3, mid); I_ReadOnlyProperty(osg::Vec3, _random); I_ReadOnlyProperty(osg::Vec3, _random_sqrtf); + I_PublicMemberProperty(osg::Vec3, minimum); + I_PublicMemberProperty(osg::Vec3, maximum); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec4 >) @@ -72,5 +79,7 @@ BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec4 >) I_Method0(osg::Vec4, mid); I_ReadOnlyProperty(osg::Vec4, _random); I_ReadOnlyProperty(osg::Vec4, _random_sqrtf); + I_PublicMemberProperty(osg::Vec4, minimum); + I_PublicMemberProperty(osg::Vec4, maximum); END_REFLECTOR diff --git a/src/osgWrappers/osgProducer/Export.cpp b/src/osgWrappers/osgProducer/Export.cpp index a6014b47d..18d1ed5dc 100644 --- a/src/osgWrappers/osgProducer/Export.cpp +++ b/src/osgWrappers/osgProducer/Export.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp b/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp index 246185066..29c015cbf 100644 --- a/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp +++ b/src/osgWrappers/osgProducer/GraphicsContextImplementation.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp b/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp index 8e9a26d59..eef59bf17 100644 --- a/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp +++ b/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp index 52933c5b8..d651a2fb5 100644 --- a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp +++ b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp b/src/osgWrappers/osgProducer/OsgSceneHandler.cpp index 74ae9672b..8098e95ee 100644 --- a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp +++ b/src/osgWrappers/osgProducer/OsgSceneHandler.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgProducer/Viewer.cpp b/src/osgWrappers/osgProducer/Viewer.cpp index d36694195..d3f43b8e5 100644 --- a/src/osgWrappers/osgProducer/Viewer.cpp +++ b/src/osgWrappers/osgProducer/Viewer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -124,6 +125,7 @@ BEGIN_OBJECT_REFLECTOR(osgProducer::Viewer) I_Method0(osg::Quat, getOrientation); I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); I_Method0(void, updatedSceneData); + I_StaticMethod0(const char *, getDefaultImageFileName); I_Property(osg::AnimationPath *, AnimationPath); I_ReadOnlyProperty(osg::NodePath, CoordinateSystemNodePath); I_Property(bool, Done); diff --git a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp b/src/osgWrappers/osgProducer/ViewerEventHandler.cpp index 775601689..6f9bac0a2 100644 --- a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp +++ b/src/osgWrappers/osgProducer/ViewerEventHandler.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/BlinkSequence.cpp b/src/osgWrappers/osgSim/BlinkSequence.cpp index 8b8bfb58c..eded4c7c3 100644 --- a/src/osgWrappers/osgSim/BlinkSequence.cpp +++ b/src/osgWrappers/osgSim/BlinkSequence.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -58,5 +59,6 @@ BEGIN_OBJECT_REFLECTOR(osgSim::SequenceGroup) I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); I_Method0(const char *, libraryName); I_Method0(const char *, className); + I_PublicMemberProperty(double, _baseTime); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/ColorRange.cpp b/src/osgWrappers/osgSim/ColorRange.cpp index 5d6a43e34..01a929fb0 100644 --- a/src/osgWrappers/osgSim/ColorRange.cpp +++ b/src/osgWrappers/osgSim/ColorRange.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/DOFTransform.cpp b/src/osgWrappers/osgSim/DOFTransform.cpp index 0f433ef91..95f953a09 100644 --- a/src/osgWrappers/osgSim/DOFTransform.cpp +++ b/src/osgWrappers/osgSim/DOFTransform.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/GeographicLocation.cpp b/src/osgWrappers/osgSim/GeographicLocation.cpp index 7bbf687b4..fa363ed6c 100644 --- a/src/osgWrappers/osgSim/GeographicLocation.cpp +++ b/src/osgWrappers/osgSim/GeographicLocation.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/Impostor.cpp b/src/osgWrappers/osgSim/Impostor.cpp index 0185f0a51..5cdb0a0ae 100644 --- a/src/osgWrappers/osgSim/Impostor.cpp +++ b/src/osgWrappers/osgSim/Impostor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/ImpostorSprite.cpp b/src/osgWrappers/osgSim/ImpostorSprite.cpp index e47e6c332..6bfde56e3 100644 --- a/src/osgWrappers/osgSim/ImpostorSprite.cpp +++ b/src/osgWrappers/osgSim/ImpostorSprite.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -78,6 +79,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ImpostorSprite) I_Property(const osg::Vec3 &, StoredLocalEyePoint); I_ReadOnlyProperty(osg::Vec2 *, TexCoords); I_ReadOnlyProperty(osg::Texture2D *, Texture); + I_PublicMemberProperty(osg::Vec4, _color); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgSim::ImpostorSpriteManager) diff --git a/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp b/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp index 6b47dd9fa..d20eba9d7 100644 --- a/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp +++ b/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/LightPoint.cpp b/src/osgWrappers/osgSim/LightPoint.cpp index fb5d4961e..c470f3e21 100644 --- a/src/osgWrappers/osgSim/LightPoint.cpp +++ b/src/osgWrappers/osgSim/LightPoint.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -33,5 +34,13 @@ BEGIN_VALUE_REFLECTOR(osgSim::LightPoint) I_Constructor2(IN, const osg::Vec3 &, position, IN, const osg::Vec4 &, color); I_ConstructorWithDefaults8(IN, bool, on, , IN, const osg::Vec3 &, position, , IN, const osg::Vec4 &, color, , IN, float, intensity, 1.0f, IN, float, radius, 1.0f, IN, osgSim::Sector *, sector, 0, IN, osgSim::BlinkSequence *, blinkSequence, 0, IN, osgSim::LightPoint::BlendingMode, blendingMode, osgSim::LightPoint::BLENDED); I_Constructor1(IN, const osgSim::LightPoint &, lp); + I_PublicMemberProperty(bool, _on); + I_PublicMemberProperty(osg::Vec3, _position); + I_PublicMemberProperty(osg::Vec4, _color); + I_PublicMemberProperty(float, _intensity); + I_PublicMemberProperty(float, _radius); + I_PublicMemberProperty(osg::ref_ptr< osgSim::Sector >, _sector); + I_PublicMemberProperty(osg::ref_ptr< osgSim::BlinkSequence >, _blinkSequence); + I_PublicMemberProperty(osgSim::LightPoint::BlendingMode, _blendingMode); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/LightPointNode.cpp b/src/osgWrappers/osgSim/LightPointNode.cpp index 1e9e8feef..1676ad076 100644 --- a/src/osgWrappers/osgSim/LightPointNode.cpp +++ b/src/osgWrappers/osgSim/LightPointNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/LightPointSystem.cpp b/src/osgWrappers/osgSim/LightPointSystem.cpp index f559042cf..6662714f5 100644 --- a/src/osgWrappers/osgSim/LightPointSystem.cpp +++ b/src/osgWrappers/osgSim/LightPointSystem.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/MultiSwitch.cpp b/src/osgWrappers/osgSim/MultiSwitch.cpp index a540c4067..d330817dc 100644 --- a/src/osgWrappers/osgSim/MultiSwitch.cpp +++ b/src/osgWrappers/osgSim/MultiSwitch.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp index e5778fa50..f0883825d 100644 --- a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp +++ b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/OverlayNode.cpp b/src/osgWrappers/osgSim/OverlayNode.cpp index e1677ae5e..ae2f69e16 100644 --- a/src/osgWrappers/osgSim/OverlayNode.cpp +++ b/src/osgWrappers/osgSim/OverlayNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/ScalarBar.cpp b/src/osgWrappers/osgSim/ScalarBar.cpp index f83b2aca5..898a52ed7 100644 --- a/src/osgWrappers/osgSim/ScalarBar.cpp +++ b/src/osgWrappers/osgSim/ScalarBar.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -81,5 +82,9 @@ END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgSim::ScalarBar::TextProperties) I_Constructor0(); + I_PublicMemberProperty(std::string, _fontFile); + I_PublicMemberProperty(std::pair< int COMMA int >, _fontResolution); + I_PublicMemberProperty(float, _characterSize); + I_PublicMemberProperty(osg::Vec4, _color); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/ScalarsToColors.cpp b/src/osgWrappers/osgSim/ScalarsToColors.cpp index 2a3735a3d..7b86791c1 100644 --- a/src/osgWrappers/osgSim/ScalarsToColors.cpp +++ b/src/osgWrappers/osgSim/ScalarsToColors.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/Sector.cpp b/src/osgWrappers/osgSim/Sector.cpp index 160c93d0b..477d73fe8 100644 --- a/src/osgWrappers/osgSim/Sector.cpp +++ b/src/osgWrappers/osgSim/Sector.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/SphereSegment.cpp b/src/osgWrappers/osgSim/SphereSegment.cpp index b718d9713..d9fc190fd 100644 --- a/src/osgWrappers/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/osgSim/SphereSegment.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgSim/VisibilityGroup.cpp b/src/osgWrappers/osgSim/VisibilityGroup.cpp index 7728e478a..145bb2a0d 100644 --- a/src/osgWrappers/osgSim/VisibilityGroup.cpp +++ b/src/osgWrappers/osgSim/VisibilityGroup.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgTerrain/DataSet.cpp b/src/osgWrappers/osgTerrain/DataSet.cpp index 5aaaf04b0..8ea34f384 100644 --- a/src/osgWrappers/osgTerrain/DataSet.cpp +++ b/src/osgWrappers/osgTerrain/DataSet.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -29,6 +30,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgTerrain::DataSet::CompositeDestination * >, osgTerrain::DataSet::Row); TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgTerrain::DataSet::Row >, osgTerrain::DataSet::Level); @@ -152,6 +155,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet) I_Method2(void, _writeImageFile, IN, const osg::Image &, image, IN, const std::string &, filename); I_Method1(void, setState, IN, osg::State *, state); I_Method0(osg::State *, getState); + I_StaticMethod1(std::string, coordinateSystemStringToWTK, IN, const std::string &, coordinateSystem); + I_StaticMethod1(void, setNotifyOffset, IN, int, level); + I_StaticMethod0(int, getNotifyOffset); I_Property(osgDB::Archive *, Archive); I_Property(const std::string &, ArchiveName); I_Property(const std::string &, CommentString); @@ -211,6 +217,17 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::CompositeDestination) I_Method0(bool, getSubTilesGenerated); I_ReadOnlyProperty(std::string, SubTileName); I_Property(bool, SubTilesGenerated); + I_PublicMemberProperty(osgTerrain::DataSet *, _dataSet); + I_PublicMemberProperty(osgTerrain::DataSet::CompositeDestination *, _parent); + I_PublicMemberProperty(std::string, _name); + I_PublicMemberProperty(unsigned int, _level); + I_PublicMemberProperty(unsigned int, _tileX); + I_PublicMemberProperty(unsigned int, _tileY); + I_PublicMemberProperty(osgTerrain::DataSet::CompositeType, _type); + I_PublicMemberProperty(osgTerrain::DataSet::CompositeDestination::TileList, _tiles); + I_PublicMemberProperty(osgTerrain::DataSet::CompositeDestination::ChildList, _children); + I_PublicMemberProperty(float, _maxVisibleDistance); + I_PublicMemberProperty(bool, _subTileGenerated); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgTerrain::DataSet::Source > >, osgTerrain::DataSet::CompositeSource::SourceList); @@ -230,6 +247,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::CompositeSource) I_Method0(void, setSortValueFromSourceDataResolution); I_Method0(void, sort); I_Property(osgTerrain::DataSet::CompositeType, Type); + I_PublicMemberProperty(osgTerrain::DataSet::CompositeType, _type); + I_PublicMemberProperty(osgTerrain::DataSet::CompositeSource::SourceList, _sourceList); + I_PublicMemberProperty(osgTerrain::DataSet::CompositeSource::ChildList, _children); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::CompositeSource::DefaultSourceAdvancer) @@ -253,6 +273,7 @@ END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::CompositeSource::LODSourceAdvancer) I_ConstructorWithDefaults1(IN, float, targetResolution, 0.0f); I_Method2(bool, advanceToNextSource, IN, const osgTerrain::DataSet::CompositeSource &, composite, IN, int &, index); + I_PublicMemberProperty(float, _targetResolution); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Image > >, osgTerrain::DataSet::DestinationData::ImageList); @@ -262,6 +283,12 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Node > >, osgTerrain::DataSet::D BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationData) I_BaseType(osg::Referenced); I_Constructor1(IN, osgTerrain::DataSet *, dataSet); + I_PublicMemberProperty(osgTerrain::DataSet *, _dataSet); + I_PublicMemberProperty(float, _minDistance); + I_PublicMemberProperty(float, _maxDistance); + I_PublicMemberProperty(osg::ref_ptr< osg::Image >, _image); + I_PublicMemberProperty(osg::ref_ptr< osg::HeightField >, _heightField); + I_PublicMemberProperty(osgTerrain::DataSet::DestinationData::ModelList, _models); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::Vec2 >, osgTerrain::DataSet::DestinationTile::HeightDeltaList); @@ -307,10 +334,30 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationTile) I_Method0(void, unrefData); I_Method1(osgTerrain::DataSet::DestinationTile::ImageData &, getImageData, IN, unsigned int, layer); I_Property(bool, TileComplete); + I_PublicMemberProperty(osgTerrain::DataSet *, _dataSet); + I_PublicMemberProperty(std::string, _name); + I_PublicMemberProperty(unsigned int, _level); + I_PublicMemberProperty(unsigned int, _tileX); + I_PublicMemberProperty(unsigned int, _tileY); + I_PublicMemberProperty(GLenum, _pixelFormat); + I_PublicMemberProperty(std::vector< osgTerrain::DataSet::DestinationTile::ImageData >, _imagery); + I_PublicMemberProperty(osg::ref_ptr< osgTerrain::DataSet::DestinationData >, _terrain); + I_PublicMemberProperty(osg::ref_ptr< osgTerrain::DataSet::DestinationData >, _models); + I_PublicMemberProperty(unsigned int, _maxSourceLevel); + I_PublicMemberProperty(unsigned int, _imagery_maxNumColumns); + I_PublicMemberProperty(unsigned int, _imagery_maxNumRows); + I_PublicMemberProperty(unsigned int, _terrain_maxNumColumns); + I_PublicMemberProperty(unsigned int, _terrain_maxNumRows); + I_PublicMemberProperty(float, _terrain_maxSourceResolutionX); + I_PublicMemberProperty(float, _terrain_maxSourceResolutionY); + I_PublicMemberProperty(bool, _complete); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::DestinationTile::ImageData) I_Constructor0(); + I_PublicMemberProperty(float, _imagery_maxSourceResolutionX); + I_PublicMemberProperty(float, _imagery_maxSourceResolutionY); + I_PublicMemberProperty(osg::ref_ptr< osgTerrain::DataSet::DestinationData >, _imagery); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osgTerrain::DataSet::Source::ResolutionPair >, osgTerrain::DataSet::Source::ResolutionList); @@ -394,6 +441,8 @@ END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::Source::ResolutionPair) I_Constructor0(); I_Constructor2(IN, double, x, IN, double, y); + I_PublicMemberProperty(double, _resX); + I_PublicMemberProperty(double, _resY); END_REFLECTOR TYPE_NAME_ALIAS(std::map< const osg::CoordinateSystemNode * COMMA osgTerrain::DataSet::SpatialProperties >, osgTerrain::DataSet::SourceData::SpatialPropertiesMap); @@ -410,6 +459,12 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::SourceData) I_Method1(void, readHeightField, IN, osgTerrain::DataSet::DestinationData &, destination); I_Method1(void, readModels, IN, osgTerrain::DataSet::DestinationData &, destination); I_Method3(float, getInterpolatedValue, IN, GDALRasterBand *, band, IN, double, x, IN, double, y); + I_StaticMethod1(osgTerrain::DataSet::SourceData *, readData, IN, osgTerrain::DataSet::Source *, source); + I_PublicMemberProperty(osgTerrain::DataSet::Source *, _source); + I_PublicMemberProperty(bool, _hasGCPs); + I_PublicMemberProperty(osg::ref_ptr< osg::Node >, _model); + I_PublicMemberProperty(GDALDataset *, _gdalDataset); + I_PublicMemberProperty(osgTerrain::DataSet::SourceData::SpatialPropertiesMap, _spatialPropertiesMap); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::SpatialProperties) @@ -418,6 +473,12 @@ BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::SpatialProperties) I_Constructor2(IN, osg::CoordinateSystemNode *, cs, IN, const osgTerrain::GeospatialExtents &, extents); I_Method1(osgTerrain::DataSet::SpatialProperties &, assignSpatialProperties, IN, const osgTerrain::DataSet::SpatialProperties &, sp); I_Method0(void, computeExtents); + I_PublicMemberProperty(osg::ref_ptr< osg::CoordinateSystemNode >, _cs); + I_PublicMemberProperty(osg::Matrixd, _geoTransform); + I_PublicMemberProperty(osgTerrain::GeospatialExtents, _extents); + I_PublicMemberProperty(unsigned int, _numValuesX); + I_PublicMemberProperty(unsigned int, _numValuesY); + I_PublicMemberProperty(unsigned int, _numValuesZ); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::GeospatialExtents) @@ -440,6 +501,8 @@ BEGIN_VALUE_REFLECTOR(osgTerrain::GeospatialExtents) I_Method1(void, expandBy, IN, const osg::BoundingSphere &, sh); I_Method1(void, expandBy, IN, const osg::Vec3 &, v); I_Method1(void, expandBy, IN, const osgTerrain::GeospatialExtents &, e); + I_PublicMemberProperty(osg::Vec2d, _min); + I_PublicMemberProperty(osg::Vec2d, _max); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Image >) diff --git a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp b/src/osgWrappers/osgTerrain/HeightFieldNode.cpp index 341770a8f..3d536d750 100644 --- a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp +++ b/src/osgWrappers/osgTerrain/HeightFieldNode.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp b/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp index 1008201a1..c760a71ef 100644 --- a/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp +++ b/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgText/Export.cpp b/src/osgWrappers/osgText/Export.cpp index 40d804cd4..bbac5114c 100644 --- a/src/osgWrappers/osgText/Export.cpp +++ b/src/osgWrappers/osgText/Export.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgText/Font.cpp b/src/osgWrappers/osgText/Font.cpp index 7d134a81f..4458906c7 100644 --- a/src/osgWrappers/osgText/Font.cpp +++ b/src/osgWrappers/osgText/Font.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -88,6 +89,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font::FontImplementation) I_ReadOnlyProperty(std::string, FileName); I_WriteOnlyProperty(unsigned int, FontHeight); I_WriteOnlyProperty(unsigned int, FontWidth); + I_PublicMemberProperty(osgText::Font *, _facade); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgText::Font::Glyph) diff --git a/src/osgWrappers/osgText/String.cpp b/src/osgWrappers/osgText/String.cpp index 1f57c307b..bb877e2a8 100644 --- a/src/osgWrappers/osgText/String.cpp +++ b/src/osgWrappers/osgText/String.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -35,7 +36,6 @@ BEGIN_ENUM_REFLECTOR(osgText::String::Encoding) END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgText::String) - I_BaseType(osg::Referenced); I_BaseType(osgText::VectorUInt); I_Constructor0(); I_Constructor1(IN, const osgText::String &, str); diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index 443c315d5..02918790f 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -242,6 +243,12 @@ BEGIN_VALUE_REFLECTOR(osgText::Text::GlyphQuads) I_ReadOnlyProperty(osgText::Text::GlyphQuads::Glyphs, Glyphs); I_ReadOnlyProperty(osgText::Text::GlyphQuads::LineNumbers &, LineNumbers); I_ReadOnlyProperty(osgText::Text::GlyphQuads::TexCoords &, TexCoords); + I_PublicMemberProperty(osgText::Text::GlyphQuads::Glyphs, _glyphs); + I_PublicMemberProperty(osgText::Text::GlyphQuads::Coords2, _coords); + I_PublicMemberProperty(osg::buffered_object< osgText::Text::GlyphQuads::Coords3 >, _transformedCoords); + I_PublicMemberProperty(osgText::Text::GlyphQuads::TexCoords, _texcoords); + I_PublicMemberProperty(osgText::Text::GlyphQuads::LineNumbers, _lineNumbers); + I_PublicMemberProperty(osgText::Text::GlyphQuads::ColorCoords, _colorCoords); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgText::Font::GlyphTexture >) diff --git a/src/osgWrappers/osgUtil/CubeMapGenerator.cpp b/src/osgWrappers/osgUtil/CubeMapGenerator.cpp index 1727c9eb5..10123bfce 100644 --- a/src/osgWrappers/osgUtil/CubeMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/CubeMapGenerator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index d7ae64bbd..98b3d88a3 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp index 761ea8f9f..417acbf54 100644 --- a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp b/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp index 83b5743f8..c031358e4 100644 --- a/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp +++ b/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index 69f0a697d..df010eb96 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp index 6029a8570..f03c5e221 100644 --- a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp index 03dd9ec38..247e04a51 100644 --- a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/IntersectVisitor.cpp b/src/osgWrappers/osgUtil/IntersectVisitor.cpp index d6ae4fe29..6a24307c4 100644 --- a/src/osgWrappers/osgUtil/IntersectVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -70,6 +71,18 @@ BEGIN_VALUE_REFLECTOR(osgUtil::Hit) I_ReadOnlyProperty(const osgUtil::Hit::VecIndexList &, VecIndexList); I_ReadOnlyProperty(const osg::Vec3, WorldIntersectNormal); I_ReadOnlyProperty(const osg::Vec3, WorldIntersectPoint); + I_PublicMemberProperty(float, _ratio); + I_PublicMemberProperty(osg::ref_ptr< osg::LineSegment >, _originalLineSegment); + I_PublicMemberProperty(osg::ref_ptr< osg::LineSegment >, _localLineSegment); + I_PublicMemberProperty(osg::NodePath, _nodePath); + I_PublicMemberProperty(osg::ref_ptr< osg::Geode >, _geode); + I_PublicMemberProperty(osg::ref_ptr< osg::Drawable >, _drawable); + I_PublicMemberProperty(osg::ref_ptr< osg::RefMatrix >, _matrix); + I_PublicMemberProperty(osg::ref_ptr< osg::RefMatrix >, _inverse); + I_PublicMemberProperty(osgUtil::Hit::VecIndexList, _vecIndexList); + I_PublicMemberProperty(int, _primitiveIndex); + I_PublicMemberProperty(osg::Vec3, _intersectPoint); + I_PublicMemberProperty(osg::Vec3, _intersectNormal); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osgUtil::Hit >, osgUtil::IntersectVisitor::HitList); diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp index c1fb0cf86..f974cd306 100644 --- a/src/osgWrappers/osgUtil/Optimizer.cpp +++ b/src/osgWrappers/osgUtil/Optimizer.cpp @@ -7,11 +7,13 @@ #include #include +#include #include #include #include #include +#include #include #include #include @@ -19,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -100,6 +103,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineLODsVisitor) I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); I_Method1(void, apply, IN, osg::LOD &, lod); I_Method0(void, combineLODs); + I_PublicMemberProperty(osgUtil::Optimizer::CombineLODsVisitor::GroupList, _groupList); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineStaticTransformsVisitor) @@ -116,6 +120,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CopySharedSubgraphsVisitor) I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); I_Method1(void, apply, IN, osg::Node &, node); I_Method0(void, copySharedNodes); + I_PublicMemberProperty(osgUtil::Optimizer::CopySharedSubgraphsVisitor::SharedNodeList, _sharedNodeList); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::NodePath >, osgUtil::Optimizer::FlattenBillboardVisitor::NodePathList); @@ -128,6 +133,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenBillboardVisitor) I_Method0(void, reset); I_Method1(void, apply, IN, osg::Billboard &, billboard); I_Method0(void, process); + I_PublicMemberProperty(osgUtil::Optimizer::FlattenBillboardVisitor::BillboardNodePathMap, _billboards); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenStaticTransformsVisitor) @@ -165,6 +171,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeometryVisitor) I_Method1(void, apply, IN, osg::Geode &, geode); I_Method1(void, apply, IN, osg::Billboard &, x); I_Method1(bool, mergeGeode, IN, osg::Geode &, geode); + I_StaticMethod1(bool, geometryContainsSharedArrays, IN, osg::Geometry &, geom); + I_StaticMethod2(bool, mergeGeometry, IN, osg::Geometry &, lhs, IN, osg::Geometry &, rhs); + I_StaticMethod2(bool, mergePrimitive, IN, osg::DrawArrays &, lhs, IN, osg::DrawArrays &, rhs); + I_StaticMethod2(bool, mergePrimitive, IN, osg::DrawArrayLengths &, lhs, IN, osg::DrawArrayLengths &, rhs); + I_StaticMethod2(bool, mergePrimitive, IN, osg::DrawElementsUByte &, lhs, IN, osg::DrawElementsUByte &, rhs); + I_StaticMethod2(bool, mergePrimitive, IN, osg::DrawElementsUShort &, lhs, IN, osg::DrawElementsUShort &, rhs); + I_StaticMethod2(bool, mergePrimitive, IN, osg::DrawElementsUInt &, lhs, IN, osg::DrawElementsUInt &, rhs); I_Property(unsigned int, TargetMaximumNumberOfVertices); END_REFLECTOR @@ -176,6 +189,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveEmptyNodesVisitor) I_Method1(void, apply, IN, osg::Geode &, geode); I_Method1(void, apply, IN, osg::Group &, group); I_Method0(void, removeEmptyNodes); + I_PublicMemberProperty(osgUtil::Optimizer::RemoveEmptyNodesVisitor::NodeList, _redundantNodeList); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor::NodeList); @@ -185,6 +199,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor) I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); I_Method1(void, apply, IN, osg::ProxyNode &, group); I_Method0(void, removeRedundantNodes); + I_PublicMemberProperty(osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor::NodeList, _redundantNodeList); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveRedundantNodesVisitor::NodeList); @@ -195,6 +210,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveRedundantNodesVisitor) I_Method1(void, apply, IN, osg::Group &, group); I_Method1(void, apply, IN, osg::Transform &, transform); I_Method0(void, removeRedundantNodes); + I_PublicMemberProperty(osgUtil::Optimizer::RemoveRedundantNodesVisitor::NodeList, _redundantNodeList); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::SpatializeGroupsVisitor::GroupsToDivideList); @@ -205,6 +221,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::SpatializeGroupsVisitor) I_Method1(void, apply, IN, osg::Group &, group); I_MethodWithDefaults1(bool, divide, IN, unsigned int, maxNumTreesPerCell, 8); I_Method2(bool, divide, IN, osg::Group *, group, IN, unsigned int, maxNumTreesPerCell); + I_PublicMemberProperty(osgUtil::Optimizer::SpatializeGroupsVisitor::GroupsToDivideList, _groupsToDivideList); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::StateVisitor) @@ -222,6 +239,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TesselateVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); I_Method1(void, apply, IN, osg::Geode &, geode); + I_PublicMemberProperty(osgUtil::Optimizer::TesselateVisitor::GroupList, _groupList); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::TextureAtlasBuilder) @@ -271,6 +289,12 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureVisitor) I_Method1(void, apply, IN, osg::Node &, node); I_Method1(void, apply, IN, osg::StateSet &, stateset); I_Method1(void, apply, IN, osg::Texture &, texture); + I_PublicMemberProperty(bool, _changeAutoUnRef); + I_PublicMemberProperty(bool, _valueAutoUnRef); + I_PublicMemberProperty(bool, _changeClientImageStorage); + I_PublicMemberProperty(bool, _valueClientImageStorage); + I_PublicMemberProperty(bool, _changeAnisotropy); + I_PublicMemberProperty(float, _valueAnisotropy); END_REFLECTOR STD_MAP_REFLECTOR(std::map< osg::Billboard * COMMA osgUtil::Optimizer::FlattenBillboardVisitor::NodePathList >); diff --git a/src/osgWrappers/osgUtil/PositionalStateContainer.cpp b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp index 04dd937ab..de255c281 100644 --- a/src/osgWrappers/osgUtil/PositionalStateContainer.cpp +++ b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -43,6 +44,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::PositionalStateContainer) 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_MethodWithDefaults3(void, draw, IN, osg::State &, state, , IN, osgUtil::RenderLeaf *&, previous, , IN, const osg::Matrix *, postMultMatrix, 0); + I_PublicMemberProperty(osgUtil::PositionalStateContainer::AttrMatrixList, _attrList); + I_PublicMemberProperty(osgUtil::PositionalStateContainer::TexUnitAttrMatrixListMap, _texAttrListMap); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::RefMatrix >) diff --git a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp index b7386860e..946a0e990 100644 --- a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/RenderBin.cpp b/src/osgWrappers/osgUtil/RenderBin.cpp index e830f315a..69f062ce0 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -89,6 +90,12 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) I_Method0(const osgUtil::RenderBin::DrawCallback *, getDrawCallback); I_Method1(bool, getStats, IN, osgUtil::Statistics &, primStats); I_Method0(void, copyLeavesFromStateGraphListToRenderLeafList); + I_StaticMethod1(osgUtil::RenderBin *, createRenderBin, IN, const std::string &, binName); + I_StaticMethod1(osgUtil::RenderBin *, getRenderBinPrototype, IN, const std::string &, binName); + I_StaticMethod2(void, addRenderBinPrototype, IN, const std::string &, binName, IN, osgUtil::RenderBin *, proto); + I_StaticMethod1(void, removeRenderBinPrototype, IN, osgUtil::RenderBin *, proto); + I_StaticMethod1(void, setDefaultRenderBinSortMode, IN, osgUtil::RenderBin::SortMode, mode); + I_StaticMethod0(osgUtil::RenderBin::SortMode, getDefaultRenderBinSortMode); I_ReadOnlyProperty(int, BinNum); I_Property(osgUtil::RenderBin::DrawCallback *, DrawCallback); I_ReadOnlyProperty(osgUtil::RenderBin *, Parent); diff --git a/src/osgWrappers/osgUtil/RenderLeaf.cpp b/src/osgWrappers/osgUtil/RenderLeaf.cpp index 574257921..166f27c48 100644 --- a/src/osgWrappers/osgUtil/RenderLeaf.cpp +++ b/src/osgWrappers/osgUtil/RenderLeaf.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -22,11 +23,18 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::RenderLeaf) I_BaseType(osg::Referenced); 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_PublicMemberProperty(osgUtil::StateGraph *, _parent); + I_PublicMemberProperty(osg::Drawable *, _drawable); + I_PublicMemberProperty(osg::ref_ptr< osg::RefMatrix >, _projection); + I_PublicMemberProperty(osg::ref_ptr< osg::RefMatrix >, _modelview); + I_PublicMemberProperty(float, _depth); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index 34c9a8d60..b13dd8837 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index 26dc32202..cf26de812 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/Simplifier.cpp b/src/osgWrappers/osgUtil/Simplifier.cpp index 97648d8e9..13540ac13 100644 --- a/src/osgWrappers/osgUtil/Simplifier.cpp +++ b/src/osgWrappers/osgUtil/Simplifier.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/SmoothingVisitor.cpp b/src/osgWrappers/osgUtil/SmoothingVisitor.cpp index a1bc1d08f..1f66bdced 100644 --- a/src/osgWrappers/osgUtil/SmoothingVisitor.cpp +++ b/src/osgWrappers/osgUtil/SmoothingVisitor.cpp @@ -7,9 +7,11 @@ #include #include +#include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -24,5 +26,6 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SmoothingVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(); I_Method1(void, apply, IN, osg::Geode &, geode); + I_StaticMethod1(void, smooth, IN, osg::Geometry &, geoset); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/StateGraph.cpp b/src/osgWrappers/osgUtil/StateGraph.cpp index da3debdd8..52a433286 100644 --- a/src/osgWrappers/osgUtil/StateGraph.cpp +++ b/src/osgWrappers/osgUtil/StateGraph.cpp @@ -7,9 +7,11 @@ #include #include +#include #include #include +#include #include #include #include @@ -48,9 +50,18 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::StateGraph) I_Method0(void, prune); I_Method1(osgUtil::StateGraph *, find_or_insert, IN, const osg::StateSet *, stateset); I_Method1(void, addLeaf, IN, osgUtil::RenderLeaf *, leaf); + I_StaticMethod3(void, moveStateGraph, IN, osg::State &, state, IN, osgUtil::StateGraph *, sg_curr, IN, osgUtil::StateGraph *, sg_new); + I_StaticMethod2(void, moveToRootStateGraph, IN, osg::State &, state, IN, osgUtil::StateGraph *, sg_curr); I_ReadOnlyProperty(float, AverageDistance); I_ReadOnlyProperty(float, MinimumDistance); I_Property(osg::Referenced *, UserData); + I_PublicMemberProperty(osgUtil::StateGraph *, _parent); + I_PublicMemberProperty(int, _depth); + I_PublicMemberProperty(osgUtil::StateGraph::ChildList, _children); + I_PublicMemberProperty(osgUtil::StateGraph::LeafList, _leaves); + I_PublicMemberProperty(float, _averageDistance); + I_PublicMemberProperty(float, _minimumDistance); + I_PublicMemberProperty(osg::ref_ptr< osg::Referenced >, _userData); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderLeaf >) diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index a0e0e3bca..dd38d5fe4 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -82,6 +83,17 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics) I_ReadOnlyProperty(int, Bins); I_WriteOnlyProperty(int, Depth); I_WriteOnlyProperty(osgUtil::Statistics::StatsType, Type); + I_PublicMemberProperty(int, numDrawables); + I_PublicMemberProperty(int, nummat); + I_PublicMemberProperty(int, nbins); + I_PublicMemberProperty(int, nlights); + I_PublicMemberProperty(int, depth); + I_PublicMemberProperty(int, _binNo); + I_PublicMemberProperty(osgUtil::Statistics::StatsType, stattype); + I_PublicMemberProperty(int, nimpostor); + I_PublicMemberProperty(unsigned int, _vertexCount); + I_PublicMemberProperty(osgUtil::Statistics::PrimitiveValueMap, _primitiveCount); + I_PublicMemberProperty(GLenum, _currentPrimitiveFunctorMode); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::StatsVisitor::NodeSet); @@ -103,6 +115,24 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::StatsVisitor) I_Method1(void, apply, IN, osg::Drawable &, drawable); I_Method0(void, totalUpStats); I_Method1(void, print, IN, std::ostream &, out); + I_PublicMemberProperty(unsigned int, _numInstancedGroup); + I_PublicMemberProperty(unsigned int, _numInstancedSwitch); + I_PublicMemberProperty(unsigned int, _numInstancedLOD); + I_PublicMemberProperty(unsigned int, _numInstancedTransform); + I_PublicMemberProperty(unsigned int, _numInstancedGeode); + I_PublicMemberProperty(unsigned int, _numInstancedDrawable); + I_PublicMemberProperty(unsigned int, _numInstancedGeometry); + I_PublicMemberProperty(unsigned int, _numInstancedStateSet); + I_PublicMemberProperty(osgUtil::StatsVisitor::NodeSet, _groupSet); + I_PublicMemberProperty(osgUtil::StatsVisitor::NodeSet, _transformSet); + I_PublicMemberProperty(osgUtil::StatsVisitor::NodeSet, _lodSet); + I_PublicMemberProperty(osgUtil::StatsVisitor::NodeSet, _switchSet); + I_PublicMemberProperty(osgUtil::StatsVisitor::NodeSet, _geodeSet); + I_PublicMemberProperty(osgUtil::StatsVisitor::DrawableSet, _drawableSet); + I_PublicMemberProperty(osgUtil::StatsVisitor::DrawableSet, _geometrySet); + I_PublicMemberProperty(osgUtil::StatsVisitor::StateSetSet, _statesetSet); + I_PublicMemberProperty(osgUtil::Statistics, _uniqueStats); + I_PublicMemberProperty(osgUtil::Statistics, _instancedStats); END_REFLECTOR STD_MAP_REFLECTOR(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >); diff --git a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp index b05bf4891..817a033cd 100644 --- a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp +++ b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/Tesselator.cpp b/src/osgWrappers/osgUtil/Tesselator.cpp index 73315c900..7213bb1f3 100644 --- a/src/osgWrappers/osgUtil/Tesselator.cpp +++ b/src/osgWrappers/osgUtil/Tesselator.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -71,6 +72,8 @@ TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tesselator::Prim::VecList); BEGIN_OBJECT_REFLECTOR(osgUtil::Tesselator::Prim) I_BaseType(osg::Referenced); I_Constructor1(IN, GLenum, mode); + I_PublicMemberProperty(GLenum, _mode); + I_PublicMemberProperty(osgUtil::Tesselator::Prim::VecList, _vertices); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::Tesselator::Prim >) diff --git a/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp b/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp index 992e8db10..b793de3ab 100644 --- a/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp +++ b/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -26,5 +27,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::TransformAttributeFunctor) I_BaseType(osg::Drawable::AttributeFunctor); I_Constructor1(IN, const osg::Matrix &, m); I_Method3(void, apply, IN, osg::Drawable::AttributeType, type, IN, unsigned int, count, IN, osg::Vec3 *, begin); + I_PublicMemberProperty(osg::Matrix, _m); + I_PublicMemberProperty(osg::Matrix, _im); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/TransformCallback.cpp b/src/osgWrappers/osgUtil/TransformCallback.cpp index 2a88eba78..6d8e3161e 100644 --- a/src/osgWrappers/osgUtil/TransformCallback.cpp +++ b/src/osgWrappers/osgUtil/TransformCallback.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/TriStripVisitor.cpp b/src/osgWrappers/osgUtil/TriStripVisitor.cpp index 6dbc7196f..f2486049f 100644 --- a/src/osgWrappers/osgUtil/TriStripVisitor.cpp +++ b/src/osgWrappers/osgUtil/TriStripVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/src/osgWrappers/osgUtil/UpdateVisitor.cpp b/src/osgWrappers/osgUtil/UpdateVisitor.cpp index 32718323e..7c0e1a329 100644 --- a/src/osgWrappers/osgUtil/UpdateVisitor.cpp +++ b/src/osgWrappers/osgUtil/UpdateVisitor.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include