From 1efa9a01d7863661309b4e9f593a8230ce19ca67 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 18 Jul 2006 20:51:28 +0000 Subject: [PATCH] Updated wrappers --- VisualStudio/osgWrappers/osg/wrapper_osg.dsp | 128 ----- src/osgWrappers/osg/AlphaFunc.cpp | 41 +- src/osgWrappers/osg/AnimationPath.cpp | 97 +--- src/osgWrappers/osg/ApplicationUsage.cpp | 43 +- src/osgWrappers/osg/ArgumentParser.cpp | 67 +-- src/osgWrappers/osg/Array.cpp | 428 ++++++++++----- src/osgWrappers/osg/AutoTransform.cpp | 48 +- src/osgWrappers/osg/Billboard.cpp | 44 +- src/osgWrappers/osg/BlendEquation.cpp | 48 +- src/osgWrappers/osg/BlendFunc.cpp | 71 +-- src/osgWrappers/osg/BoundingSphere.cpp | 25 +- src/osgWrappers/osg/BufferObject.cpp | 63 +-- src/osgWrappers/osg/CameraNode.cpp | 145 +---- src/osgWrappers/osg/CameraView.cpp | 37 +- src/osgWrappers/osg/ClampColor.cpp | 45 +- src/osgWrappers/osg/ClipNode.cpp | 44 +- .../osg/CollectOccludersVisitor.cpp | 38 +- src/osgWrappers/osg/ConvexPlanarOccluder.cpp | 23 +- src/osgWrappers/osg/ConvexPlanarPolygon.cpp | 10 +- src/osgWrappers/osg/CoordinateSystemNode.cpp | 54 -- src/osgWrappers/osg/CopyOp.cpp | 30 +- src/osgWrappers/osg/CullFace.cpp | 25 +- src/osgWrappers/osg/CullSettings.cpp | 98 ++-- src/osgWrappers/osg/CullStack.cpp | 12 +- src/osgWrappers/osg/CullingSet.cpp | 72 +-- src/osgWrappers/osg/Depth.cpp | 40 +- src/osgWrappers/osg/DisplaySettings.cpp | 112 +--- src/osgWrappers/osg/DrawPixels.cpp | 34 +- src/osgWrappers/osg/Drawable.cpp | 268 +--------- src/osgWrappers/osg/Fog.cpp | 52 +- src/osgWrappers/osg/FragmentProgram.cpp | 67 +-- src/osgWrappers/osg/FrameBufferObject.cpp | 101 +--- src/osgWrappers/osg/FrameStamp.cpp | 17 +- src/osgWrappers/osg/FrontFace.cpp | 27 +- src/osgWrappers/osg/GL2Extensions.cpp | 128 +---- src/osgWrappers/osg/GNUmakefile | 32 -- src/osgWrappers/osg/Geode.cpp | 48 +- src/osgWrappers/osg/Geometry.cpp | 204 +------ src/osgWrappers/osg/GraphicsContext.cpp | 62 +-- src/osgWrappers/osg/GraphicsThread.cpp | 110 ++-- src/osgWrappers/osg/Group.cpp | 44 +- src/osgWrappers/osg/Image.cpp | 86 +-- src/osgWrappers/osg/ImageStream.cpp | 45 +- src/osgWrappers/osg/LOD.cpp | 60 +-- src/osgWrappers/osg/Light.cpp | 60 +-- src/osgWrappers/osg/LightModel.cpp | 39 +- src/osgWrappers/osg/LightSource.cpp | 37 +- src/osgWrappers/osg/LineSegment.cpp | 26 +- src/osgWrappers/osg/LineStipple.cpp | 28 +- src/osgWrappers/osg/LineWidth.cpp | 26 +- src/osgWrappers/osg/LogicOp.cpp | 45 +- src/osgWrappers/osg/Material.cpp | 68 +-- src/osgWrappers/osg/MatrixTransform.cpp | 30 +- src/osgWrappers/osg/Matrixd.cpp | 96 +--- src/osgWrappers/osg/Matrixf.cpp | 96 +--- src/osgWrappers/osg/Multisample.cpp | 59 +-- src/osgWrappers/osg/Node.cpp | 112 +--- src/osgWrappers/osg/NodeCallback.cpp | 24 +- src/osgWrappers/osg/NodeTrackerCallback.cpp | 29 +- src/osgWrappers/osg/NodeVisitor.cpp | 130 +---- src/osgWrappers/osg/Object.cpp | 34 +- src/osgWrappers/osg/OccluderNode.cpp | 24 +- src/osgWrappers/osg/PagedLOD.cpp | 57 +- src/osgWrappers/osg/Plane.cpp | 40 +- src/osgWrappers/osg/Point.cpp | 56 +- src/osgWrappers/osg/PolygonMode.cpp | 33 +- src/osgWrappers/osg/Polytope.cpp | 62 +-- src/osgWrappers/osg/PrimitiveSet.cpp | 242 +-------- src/osgWrappers/osg/Program.cpp | 66 +-- src/osgWrappers/osg/ProxyNode.cpp | 44 +- src/osgWrappers/osg/Quat.cpp | 54 +- src/osgWrappers/osg/Scissor.cpp | 33 +- src/osgWrappers/osg/Sequence.cpp | 44 +- src/osgWrappers/osg/ShadeModel.cpp | 29 +- src/osgWrappers/osg/Shader.cpp | 32 +- src/osgWrappers/osg/ShadowVolumeOccluder.cpp | 34 +- src/osgWrappers/osg/Shape.cpp | 318 +---------- src/osgWrappers/osg/ShapeDrawable.cpp | 76 +-- src/osgWrappers/osg/State.cpp | 137 +---- src/osgWrappers/osg/StateAttribute.cpp | 122 +++-- src/osgWrappers/osg/StateSet.cpp | 179 +------ src/osgWrappers/osg/Stencil.cpp | 65 +-- src/osgWrappers/osg/Switch.cpp | 44 +- src/osgWrappers/osg/Texture3D.cpp | 149 ++++-- src/osgWrappers/osg/TextureCubeMap.cpp | 141 ++++- src/osgWrappers/osg/TextureRectangle.cpp | 60 +-- src/osgWrappers/osg/Timer.cpp | 26 +- src/osgWrappers/osg/Transform.cpp | 73 ++- src/osgWrappers/osg/Uniform.cpp | 498 +++++++++++++++++- src/osgWrappers/osg/Vec2b.cpp | 50 ++ src/osgWrappers/osg/Vec2d.cpp | 52 ++ src/osgWrappers/osg/Vec2f.cpp | 49 ++ src/osgWrappers/osg/Vec2s.cpp | 48 ++ src/osgWrappers/osg/Vec3b.cpp | 62 +++ src/osgWrappers/osg/Vec4d.cpp | 101 +++- src/osgWrappers/osg/Vec4ub.cpp | 46 ++ src/osgWrappers/osg/VertexProgram.cpp | 85 ++- src/osgWrappers/osg/observer_ptr.cpp | 5 +- src/osgWrappers/osgDB/Archive.cpp | 2 +- src/osgWrappers/osgDB/DatabasePager.cpp | 30 +- src/osgWrappers/osgDB/FieldReaderIterator.cpp | 6 +- src/osgWrappers/osgDB/ImageOptions.cpp | 2 +- src/osgWrappers/osgDB/Input.cpp | 4 +- src/osgWrappers/osgDB/ReaderWriter.cpp | 4 +- src/osgWrappers/osgDB/Registry.cpp | 8 +- src/osgWrappers/osgFX/AnisotropicLighting.cpp | 2 +- src/osgWrappers/osgFX/BumpMapping.cpp | 4 +- src/osgWrappers/osgFX/Cartoon.cpp | 4 +- src/osgWrappers/osgFX/Effect.cpp | 2 +- src/osgWrappers/osgFX/MultiTextureControl.cpp | 2 +- src/osgWrappers/osgFX/Scribe.cpp | 4 +- src/osgWrappers/osgFX/SpecularHighlights.cpp | 4 +- src/osgWrappers/osgFX/Technique.cpp | 2 +- src/osgWrappers/osgFX/Validator.cpp | 5 +- .../osgGA/AnimationPathManipulator.cpp | 4 +- src/osgWrappers/osgGA/DriveManipulator.cpp | 2 +- src/osgWrappers/osgGA/EventQueue.cpp | 9 +- src/osgWrappers/osgGA/EventVisitor.cpp | 4 +- src/osgWrappers/osgGA/FlightManipulator.cpp | 2 +- src/osgWrappers/osgGA/GUIEventHandler.cpp | 13 +- .../osgGA/KeySwitchMatrixManipulator.cpp | 11 +- src/osgWrappers/osgGA/MatrixManipulator.cpp | 2 +- .../osgGA/NodeTrackerManipulator.cpp | 8 +- src/osgWrappers/osgGA/StateSetManipulator.cpp | 2 +- src/osgWrappers/osgGA/TerrainManipulator.cpp | 2 +- .../osgGA/TrackballManipulator.cpp | 6 +- src/osgWrappers/osgGA/UFOManipulator.cpp | 4 +- src/osgWrappers/osgParticle/AccelOperator.cpp | 4 +- .../osgParticle/AngularAccelOperator.cpp | 4 +- src/osgWrappers/osgParticle/BoxPlacer.cpp | 4 +- .../osgParticle/CenteredPlacer.cpp | 4 +- .../osgParticle/ConnectedParticleSystem.cpp | 4 +- .../osgParticle/ConstantRateCounter.cpp | 2 +- src/osgWrappers/osgParticle/Counter.cpp | 2 +- src/osgWrappers/osgParticle/Emitter.cpp | 2 +- .../osgParticle/ExplosionDebrisEffect.cpp | 4 +- .../osgParticle/ExplosionEffect.cpp | 4 +- src/osgWrappers/osgParticle/FireEffect.cpp | 4 +- .../osgParticle/FluidFrictionOperator.cpp | 4 +- src/osgWrappers/osgParticle/FluidProgram.cpp | 4 +- src/osgWrappers/osgParticle/ForceOperator.cpp | 4 +- src/osgWrappers/osgParticle/Interpolator.cpp | 8 +- .../osgParticle/LinearInterpolator.cpp | 2 +- .../osgParticle/ModularEmitter.cpp | 2 +- .../osgParticle/ModularProgram.cpp | 2 +- .../osgParticle/MultiSegmentPlacer.cpp | 4 +- src/osgWrappers/osgParticle/Operator.cpp | 2 +- src/osgWrappers/osgParticle/Particle.cpp | 4 +- .../osgParticle/ParticleEffect.cpp | 4 +- .../osgParticle/ParticleProcessor.cpp | 4 +- .../osgParticle/ParticleSystem.cpp | 8 +- .../osgParticle/ParticleSystemUpdater.cpp | 2 +- src/osgWrappers/osgParticle/Placer.cpp | 4 +- src/osgWrappers/osgParticle/PointPlacer.cpp | 4 +- .../osgParticle/PrecipitationEffect.cpp | 10 +- src/osgWrappers/osgParticle/Program.cpp | 2 +- src/osgWrappers/osgParticle/RadialShooter.cpp | 4 +- .../osgParticle/RandomRateCounter.cpp | 2 +- src/osgWrappers/osgParticle/SectorPlacer.cpp | 4 +- src/osgWrappers/osgParticle/SegmentPlacer.cpp | 4 +- src/osgWrappers/osgParticle/Shooter.cpp | 2 +- src/osgWrappers/osgParticle/SmokeEffect.cpp | 4 +- .../osgParticle/SmokeTrailEffect.cpp | 4 +- .../osgParticle/VariableRateCounter.cpp | 2 +- src/osgWrappers/osgParticle/range.cpp | 6 +- .../osgProducer/OsgCameraGroup.cpp | 15 +- .../osgProducer/OsgSceneHandler.cpp | 2 +- src/osgWrappers/osgProducer/Viewer.cpp | 8 +- .../osgProducer/ViewerEventHandler.cpp | 2 +- src/osgWrappers/osgSim/BlinkSequence.cpp | 4 +- src/osgWrappers/osgSim/ColorRange.cpp | 2 +- src/osgWrappers/osgSim/DOFTransform.cpp | 4 +- src/osgWrappers/osgSim/Impostor.cpp | 11 +- src/osgWrappers/osgSim/ImpostorSprite.cpp | 18 +- src/osgWrappers/osgSim/LightPoint.cpp | 4 +- src/osgWrappers/osgSim/LightPointNode.cpp | 2 +- src/osgWrappers/osgSim/LightPointSystem.cpp | 2 +- src/osgWrappers/osgSim/MultiSwitch.cpp | 4 +- src/osgWrappers/osgSim/OverlayNode.cpp | 6 +- src/osgWrappers/osgSim/ScalarBar.cpp | 4 +- src/osgWrappers/osgSim/ScalarsToColors.cpp | 2 +- src/osgWrappers/osgSim/Sector.cpp | 4 +- src/osgWrappers/osgSim/SphereSegment.cpp | 15 +- src/osgWrappers/osgSim/VisibilityGroup.cpp | 2 +- src/osgWrappers/osgTerrain/DataSet.cpp | 43 +- .../osgTerrain/HeightFieldNode.cpp | 4 +- .../osgTerrain/HeightFieldRenderer.cpp | 2 +- src/osgWrappers/osgText/Font.cpp | 11 +- src/osgWrappers/osgText/Text.cpp | 18 +- src/osgWrappers/osgUtil/CubeMapGenerator.cpp | 2 +- src/osgWrappers/osgUtil/CullVisitor.cpp | 22 +- .../osgUtil/DelaunayTriangulator.cpp | 13 +- .../osgUtil/DisplayRequirementsVisitor.cpp | 2 +- src/osgWrappers/osgUtil/GLObjectsVisitor.cpp | 4 +- .../osgUtil/HalfWayMapGenerator.cpp | 4 +- .../osgUtil/HighlightMapGenerator.cpp | 6 +- src/osgWrappers/osgUtil/IntersectVisitor.cpp | 12 +- src/osgWrappers/osgUtil/Optimizer.cpp | 10 +- .../osgUtil/PositionalStateContainer.cpp | 13 +- .../osgUtil/ReflectionMapGenerator.cpp | 2 +- src/osgWrappers/osgUtil/RenderBin.cpp | 11 +- src/osgWrappers/osgUtil/RenderLeaf.cpp | 4 +- src/osgWrappers/osgUtil/RenderStage.cpp | 16 +- src/osgWrappers/osgUtil/SceneView.cpp | 14 +- src/osgWrappers/osgUtil/StateGraph.cpp | 16 +- src/osgWrappers/osgUtil/Statistics.cpp | 8 +- .../osgUtil/TangentSpaceGenerator.cpp | 3 +- src/osgWrappers/osgUtil/Tesselator.cpp | 9 +- .../osgUtil/TransformAttributeFunctor.cpp | 2 +- src/osgWrappers/osgUtil/TransformCallback.cpp | 2 +- src/osgWrappers/osgUtil/UpdateVisitor.cpp | 4 +- 211 files changed, 2739 insertions(+), 5375 deletions(-) diff --git a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp index f71b30c97..21a77132e 100644 --- a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp +++ b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp @@ -123,10 +123,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\AutoTransform.cpp SOURCE=..\..\..\src\osgWrappers\osg\Billboard.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\BlendColor.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\BlendEquation.cpp # End Source File @@ -135,10 +131,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\BlendEquation.cpp SOURCE=..\..\..\src\osgWrappers\osg\BlendFunc.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\BoundingBox.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\BoundingSphere.cpp # End Source File @@ -159,34 +151,14 @@ SOURCE=..\..\..\src\osgWrappers\osg\CameraView.cpp SOURCE=..\..\..\src\osgWrappers\osg\ClampColor.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\ClearNode.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\ClipNode.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\ClipPlane.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\ClusterCullingCallback.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\CollectOccludersVisitor.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\ColorMask.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\ColorMatrix.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\ConvexPlanarOccluder.cpp # End Source File @@ -387,30 +359,14 @@ SOURCE=..\..\..\src\osgWrappers\osg\Plane.cpp SOURCE=..\..\..\src\osgWrappers\osg\Point.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\PointSprite.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\PolygonMode.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\PolygonOffset.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\PolygonStipple.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Polytope.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\PositionAttitudeTransform.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\PrimitiveSet.cpp # End Source File @@ -419,10 +375,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\PrimitiveSet.cpp SOURCE=..\..\..\src\osgWrappers\osg\Program.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Projection.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\ProxyNode.cpp # End Source File @@ -431,10 +383,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\ProxyNode.cpp SOURCE=..\..\..\src\osgWrappers\osg\Quat.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Referenced.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Scissor.cpp # End Source File @@ -483,42 +431,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\Stencil.cpp SOURCE=..\..\..\src\osgWrappers\osg\Switch.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\TexEnv.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\TexEnvCombine.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\TexEnvFilter.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\TexGen.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\TexGenNode.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\TexMat.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Texture.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Texture1D.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Texture2D.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Texture3D.cpp # End Source File @@ -543,10 +455,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\Transform.cpp SOURCE=..\..\..\src\osgWrappers\osg\Uniform.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Vec2.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Vec2b.cpp # End Source File @@ -563,46 +471,14 @@ SOURCE=..\..\..\src\osgWrappers\osg\Vec2f.cpp SOURCE=..\..\..\src\osgWrappers\osg\Vec2s.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Vec3.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Vec3b.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Vec3d.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Vec3f.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Vec3s.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Vec4.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Vec4b.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Vec4d.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Vec4f.cpp -# End Source File - -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Vec4s.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\Vec4ub.cpp # End Source File @@ -611,10 +487,6 @@ SOURCE=..\..\..\src\osgWrappers\osg\Vec4ub.cpp SOURCE=..\..\..\src\osgWrappers\osg\VertexProgram.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osg\Viewport.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osg\observer_ptr.cpp # End Source File diff --git a/src/osgWrappers/osg/AlphaFunc.cpp b/src/osgWrappers/osg/AlphaFunc.cpp index 7145be201..d9f5764cb 100644 --- a/src/osgWrappers/osg/AlphaFunc.cpp +++ b/src/osgWrappers/osg/AlphaFunc.cpp @@ -10,10 +10,6 @@ #include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,38 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::AlphaFunc::ComparisonFunction) - I_EnumLabel(osg::AlphaFunc::NEVER); - I_EnumLabel(osg::AlphaFunc::LESS); - I_EnumLabel(osg::AlphaFunc::EQUAL); - I_EnumLabel(osg::AlphaFunc::LEQUAL); - I_EnumLabel(osg::AlphaFunc::GREATER); - I_EnumLabel(osg::AlphaFunc::NOTEQUAL); - I_EnumLabel(osg::AlphaFunc::GEQUAL); - I_EnumLabel(osg::AlphaFunc::ALWAYS); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::AlphaFunc) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::AlphaFunc) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::AlphaFunc) I_Constructor0(); - I_Constructor2(IN, osg::AlphaFunc::ComparisonFunction, func, IN, float, ref); - I_ConstructorWithDefaults2(IN, const osg::AlphaFunc &, af, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method2(void, setFunction, IN, osg::AlphaFunc::ComparisonFunction, func, IN, float, ref); - I_Method1(void, setFunction, IN, osg::AlphaFunc::ComparisonFunction, func); - I_Method0(osg::AlphaFunc::ComparisonFunction, getFunction); - I_Method1(void, setReferenceValue, IN, float, value); - I_Method0(float, getReferenceValue); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(osg::AlphaFunc::ComparisonFunction, Function); - I_Property(float, ReferenceValue); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/AnimationPath.cpp b/src/osgWrappers/osg/AnimationPath.cpp index 61a3fc1ba..dec674a44 100644 --- a/src/osgWrappers/osg/AnimationPath.cpp +++ b/src/osgWrappers/osg/AnimationPath.cpp @@ -10,14 +10,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -35,95 +27,20 @@ BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode) I_EnumLabel(osg::AnimationPath::NO_LOOPING); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::AnimationPath) - I_VirtualBaseType(osg::Object); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::AnimationPath &, ap, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method2(bool, getMatrix, IN, double, time, IN, osg::Matrixf &, matrix); - I_Method2(bool, getMatrix, IN, double, time, IN, osg::Matrixd &, matrix); - I_Method2(bool, getInverse, IN, double, time, IN, osg::Matrixf &, matrix); - I_Method2(bool, getInverse, IN, double, time, IN, osg::Matrixd &, matrix); - I_Method2(bool, getInterpolatedControlPoint, IN, double, time, IN, osg::AnimationPath::ControlPoint &, controlPoint); - I_Method2(void, insert, IN, double, time, IN, const osg::AnimationPath::ControlPoint &, controlPoint); - I_Method0(double, getFirstTime); - I_Method0(double, getLastTime); - I_Method0(double, getPeriod); - I_Method1(void, setLoopMode, IN, osg::AnimationPath::LoopMode, lm); - I_Method0(osg::AnimationPath::LoopMode, getLoopMode); - I_Method1(void, setTimeControlPointMap, IN, osg::AnimationPath::TimeControlPointMap &, tcpm); - I_Method0(osg::AnimationPath::TimeControlPointMap &, getTimeControlPointMap); - I_Method0(const osg::AnimationPath::TimeControlPointMap &, getTimeControlPointMap); - I_Method0(bool, empty); - I_Method1(void, read, IN, std::istream &, in); - I_Method1(void, write, IN, std::ostream &, out); - I_ReadOnlyProperty(double, FirstTime); - I_ReadOnlyProperty(double, LastTime); - I_Property(osg::AnimationPath::LoopMode, LoopMode); - I_ReadOnlyProperty(double, Period); - I_Property(osg::AnimationPath::TimeControlPointMap &, TimeControlPointMap); +TYPE_NAME_ALIAS(std::map< double COMMA osg::AnimationPath::ControlPoint >, osg::AnimationPath::TimeControlPointMap); + +BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode) + I_EnumLabel(osg::AnimationPath::SWING); + I_EnumLabel(osg::AnimationPath::LOOP); + I_EnumLabel(osg::AnimationPath::NO_LOOPING); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::AnimationPath::ControlPoint) I_Constructor0(); - I_Constructor1(IN, const osg::Vec3d &, position); - I_Constructor2(IN, const osg::Vec3d &, position, IN, const osg::Quat &, rotation); - I_Constructor3(IN, const osg::Vec3d &, position, IN, const osg::Quat &, rotation, IN, const osg::Vec3d &, scale); - I_Method1(void, setPosition, IN, const osg::Vec3d &, position); - I_Method0(const osg::Vec3d &, getPosition); - I_Method1(void, setRotation, IN, const osg::Quat &, rotation); - I_Method0(const osg::Quat &, getRotation); - I_Method1(void, setScale, IN, const osg::Vec3d &, scale); - I_Method0(const osg::Vec3d &, getScale); - I_Method3(void, interpolate, IN, float, ratio, IN, const osg::AnimationPath::ControlPoint &, first, IN, const osg::AnimationPath::ControlPoint &, second); - I_Method3(void, interpolate, IN, double, ratio, IN, const osg::AnimationPath::ControlPoint &, first, IN, const osg::AnimationPath::ControlPoint &, second); - I_Method1(void, getMatrix, IN, osg::Matrixf &, matrix); - I_Method1(void, getMatrix, IN, osg::Matrixd &, matrix); - I_Method1(void, getInverse, IN, osg::Matrixf &, matrix); - I_Method1(void, getInverse, IN, osg::Matrixd &, matrix); - I_Property(const osg::Vec3d &, Position); - I_Property(const osg::Quat &, Rotation); - I_Property(const osg::Vec3d &, Scale); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::AnimationPathCallback) - I_BaseType(osg::NodeCallback); +BEGIN_VALUE_REFLECTOR(osg::AnimationPath::ControlPoint) I_Constructor0(); - I_Constructor2(IN, const osg::AnimationPathCallback &, apc, IN, const osg::CopyOp &, copyop); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_ConstructorWithDefaults3(IN, osg::AnimationPath *, ap, , IN, double, timeOffset, 0.0, IN, double, timeMultiplier, 1.0); - I_Constructor3(IN, const osg::Vec3d &, pivot, IN, const osg::Vec3d &, axis, IN, float, angularVelocity); - I_Method1(void, setAnimationPath, IN, osg::AnimationPath *, path); - I_Method0(osg::AnimationPath *, getAnimationPath); - I_Method0(const osg::AnimationPath *, getAnimationPath); - I_Method1(void, setPivotPoint, IN, const osg::Vec3d &, pivot); - I_Method0(const osg::Vec3d &, getPivotPoint); - I_Method1(void, setUseInverseMatrix, IN, bool, useInverseMatrix); - I_Method0(bool, getUseInverseMatrix); - I_Method1(void, setTimeOffset, IN, double, offset); - I_Method0(double, getTimeOffset); - I_Method1(void, setTimeMultiplier, IN, double, multiplier); - I_Method0(double, getTimeMultiplier); - I_Method0(void, reset); - I_Method1(void, setPause, IN, bool, pause); - I_Method0(bool, getPause); - I_Method0(double, getAnimationTime); - I_Method1(void, update, IN, osg::Node &, node); - I_Property(osg::AnimationPath *, AnimationPath); - I_ReadOnlyProperty(double, AnimationTime); - I_Property(bool, Pause); - I_Property(const osg::Vec3d &, PivotPoint); - I_Property(double, TimeMultiplier); - I_Property(double, TimeOffset); - I_Property(bool, UseInverseMatrix); 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..49edd8d76 100644 --- a/src/osgWrappers/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/osg/ApplicationUsage.cpp @@ -27,45 +27,12 @@ BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type) I_EnumLabel(osg::ApplicationUsage::KEYBOARD_MOUSE_BINDING); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ApplicationUsage) - I_Constructor0(); - I_Constructor1(IN, const std::string &, commandLineUsage); - I_Method1(void, setApplicationName, IN, const std::string &, name); - I_Method0(const std::string &, getApplicationName); - I_Method1(void, setDescription, IN, const std::string &, desc); - I_Method0(const std::string &, getDescription); - I_Method3(void, addUsageExplanation, IN, osg::ApplicationUsage::Type, type, IN, const std::string &, option, IN, const std::string &, explanation); - I_Method1(void, setCommandLineUsage, IN, const std::string &, explanation); - I_Method0(const std::string &, getCommandLineUsage); - I_MethodWithDefaults3(void, addCommandLineOption, IN, const std::string &, option, , IN, const std::string &, explanation, , IN, const std::string &, defaultValue, ""); - I_Method1(void, setCommandLineOptions, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - I_Method0(const osg::ApplicationUsage::UsageMap &, getCommandLineOptions); - I_Method1(void, setCommandLineOptionsDefaults, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - I_Method0(const osg::ApplicationUsage::UsageMap &, getCommandLineOptionsDefaults); - I_MethodWithDefaults3(void, addEnvironmentalVariable, IN, const std::string &, option, , IN, const std::string &, explanation, , IN, const std::string &, defaultValue, ""); - I_Method1(void, setEnvironmentalVariables, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - I_Method0(const osg::ApplicationUsage::UsageMap &, getEnvironmentalVariables); - I_Method1(void, setEnvironmentalVariablesDefaults, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - I_Method0(const osg::ApplicationUsage::UsageMap &, getEnvironmentalVariablesDefaults); - I_Method2(void, addKeyboardMouseBinding, IN, const std::string &, option, IN, const std::string &, explanation); - I_Method1(void, setKeyboardMouseBindings, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - I_Method0(const osg::ApplicationUsage::UsageMap &, getKeyboardMouseBindings); - I_MethodWithDefaults5(void, getFormattedString, IN, std::string &, str, , 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_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_Property(const std::string &, ApplicationName); - I_Property(const osg::ApplicationUsage::UsageMap &, CommandLineOptions); - I_Property(const osg::ApplicationUsage::UsageMap &, CommandLineOptionsDefaults); - I_Property(const std::string &, CommandLineUsage); - I_Property(const std::string &, Description); - I_Property(const osg::ApplicationUsage::UsageMap &, EnvironmentalVariables); - I_Property(const osg::ApplicationUsage::UsageMap &, EnvironmentalVariablesDefaults); - I_Property(const osg::ApplicationUsage::UsageMap &, KeyboardMouseBindings); -END_REFLECTOR +TYPE_NAME_ALIAS(std::map< std::string COMMA std::string >, osg::ApplicationUsage::UsageMap); -BEGIN_VALUE_REFLECTOR(osg::ApplicationUsageProxy) - I_Constructor3(IN, osg::ApplicationUsage::Type, type, IN, const std::string &, option, IN, const std::string &, explanation); +BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type) + I_EnumLabel(osg::ApplicationUsage::COMMAND_LINE_OPTION); + I_EnumLabel(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE); + I_EnumLabel(osg::ApplicationUsage::KEYBOARD_MOUSE_BINDING); END_REFLECTOR STD_MAP_REFLECTOR(std::map< std::string COMMA std::string >); diff --git a/src/osgWrappers/osg/ArgumentParser.cpp b/src/osgWrappers/osg/ArgumentParser.cpp index 6634146d8..19d257313 100644 --- a/src/osgWrappers/osg/ArgumentParser.cpp +++ b/src/osgWrappers/osg/ArgumentParser.cpp @@ -9,7 +9,6 @@ #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -20,55 +19,12 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ArgumentParser::ErrorSeverity >, osg::ArgumentParser::ErrorMessageMap); - -BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::ErrorSeverity) - I_EnumLabel(osg::ArgumentParser::BENIGN); - I_EnumLabel(osg::ArgumentParser::CRITICAL); +BEGIN_VALUE_REFLECTOR(osg::ArgumentParser) + I_Constructor0(); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ArgumentParser) - I_Constructor2(IN, int *, argc, IN, char **, argv); - I_Method1(void, setApplicationUsage, IN, osg::ApplicationUsage *, usage); - I_Method0(osg::ApplicationUsage *, getApplicationUsage); - I_Method0(const osg::ApplicationUsage *, getApplicationUsage); - I_Method0(int &, argc); - I_Method0(char **, argv); - I_Method0(std::string, getApplicationName); - I_Method1(int, find, IN, const std::string &, str); - I_Method1(bool, isOption, IN, int, pos); - I_Method1(bool, isString, IN, int, pos); - I_Method1(bool, isNumber, IN, int, pos); - I_Method0(bool, containsOptions); - I_MethodWithDefaults2(void, remove, IN, int, pos, , IN, int, num, 1); - I_Method2(bool, match, IN, int, pos, IN, const std::string &, str); - I_Method1(bool, read, IN, const std::string &, str); - I_Method2(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1); - I_Method3(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2); - I_Method4(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3); - I_Method5(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4); - I_Method6(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4, IN, osg::ArgumentParser::Parameter, value5); - I_Method7(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4, IN, osg::ArgumentParser::Parameter, value5, IN, osg::ArgumentParser::Parameter, value6); - I_Method8(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4, IN, osg::ArgumentParser::Parameter, value5, IN, osg::ArgumentParser::Parameter, value6, IN, osg::ArgumentParser::Parameter, value7); - I_Method9(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4, IN, osg::ArgumentParser::Parameter, value5, IN, osg::ArgumentParser::Parameter, value6, IN, osg::ArgumentParser::Parameter, value7, IN, osg::ArgumentParser::Parameter, value8); - I_Method2(bool, read, IN, int, pos, IN, const std::string &, str); - I_Method3(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1); - I_Method4(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2); - I_Method5(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3); - I_Method6(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4); - I_Method7(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4, IN, osg::ArgumentParser::Parameter, value5); - I_Method8(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4, IN, osg::ArgumentParser::Parameter, value5, IN, osg::ArgumentParser::Parameter, value6); - I_Method9(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4, IN, osg::ArgumentParser::Parameter, value5, IN, osg::ArgumentParser::Parameter, value6, IN, osg::ArgumentParser::Parameter, value7); - I_Method10(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3, IN, osg::ArgumentParser::Parameter, value4, IN, osg::ArgumentParser::Parameter, value5, IN, osg::ArgumentParser::Parameter, value6, IN, osg::ArgumentParser::Parameter, value7, IN, osg::ArgumentParser::Parameter, value8); - I_MethodWithDefaults1(bool, errors, IN, osg::ArgumentParser::ErrorSeverity, severity, osg::ArgumentParser::BENIGN); - I_MethodWithDefaults2(void, reportError, IN, const std::string &, message, , IN, osg::ArgumentParser::ErrorSeverity, severity, osg::ArgumentParser::CRITICAL); - I_MethodWithDefaults1(void, reportRemainingOptionsAsUnrecognized, IN, osg::ArgumentParser::ErrorSeverity, severity, osg::ArgumentParser::BENIGN); - 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_ReadOnlyProperty(std::string, ApplicationName); - I_Property(osg::ApplicationUsage *, ApplicationUsage); - I_ReadOnlyProperty(osg::ArgumentParser::ErrorMessageMap &, ErrorMessageMap); + I_Constructor0(); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::Parameter::ParameterType) @@ -79,16 +35,11 @@ BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::Parameter::ParameterType) I_EnumLabel(osg::ArgumentParser::Parameter::STRING_PARAMETER); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ArgumentParser::Parameter) - I_Constructor1(IN, float &, value); - I_Constructor1(IN, double &, value); - I_Constructor1(IN, int &, value); - I_Constructor1(IN, unsigned int &, value); - I_Constructor1(IN, std::string &, value); - I_Constructor1(IN, const osg::ArgumentParser::Parameter &, param); - I_Method1(bool, valid, IN, const char *, str); - I_Method1(bool, assign, IN, const char *, str); +BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::Parameter::ParameterType) + I_EnumLabel(osg::ArgumentParser::Parameter::FLOAT_PARAMETER); + I_EnumLabel(osg::ArgumentParser::Parameter::DOUBLE_PARAMETER); + I_EnumLabel(osg::ArgumentParser::Parameter::INT_PARAMETER); + I_EnumLabel(osg::ArgumentParser::Parameter::UNSIGNED_INT_PARAMETER); + I_EnumLabel(osg::ArgumentParser::Parameter::STRING_PARAMETER); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< std::string COMMA osg::ArgumentParser::ErrorSeverity >); - diff --git a/src/osgWrappers/osg/Array.cpp b/src/osgWrappers/osg/Array.cpp index 161643a8d..35f6af6d0 100644 --- a/src/osgWrappers/osg/Array.cpp +++ b/src/osgWrappers/osg/Array.cpp @@ -10,18 +10,19 @@ #include #include -#include #include -#include #include #include -#include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -52,128 +53,41 @@ BEGIN_ENUM_REFLECTOR(osg::Array::Type) I_EnumLabel(osg::Array::Vec4bArrayType); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Array) - I_BaseType(osg::Object); - I_ConstructorWithDefaults3(IN, osg::Array::Type, arrayType, osg::Array::ArrayType, IN, GLint, dataSize, 0, IN, GLenum, dataType, 0); - I_ConstructorWithDefaults2(IN, const osg::Array &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ArrayVisitor &, x); - I_Method1(void, accept, IN, osg::ConstArrayVisitor &, x); - I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, x); - I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, x); - I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - I_Method0(osg::Array::Type, getType); - I_Method0(GLint, getDataSize); - I_Method0(GLenum, getDataType); - I_Method0(const GLvoid *, getDataPointer); - I_Method0(unsigned int, getTotalDataSize); - I_Method0(unsigned int, getNumElements); - I_Method0(void, trim); - I_Method0(void, dirty); - I_Method1(void, setModifiedCount, IN, unsigned int, value); - I_Method0(unsigned int, getModifiedCount); - I_ReadOnlyProperty(const GLvoid *, DataPointer); - I_ReadOnlyProperty(GLint, DataSize); - I_ReadOnlyProperty(GLenum, DataType); - I_Property(unsigned int, ModifiedCount); - I_ReadOnlyProperty(unsigned int, TotalDataSize); - I_ReadOnlyProperty(osg::Array::Type, Type); +BEGIN_ENUM_REFLECTOR(osg::Array::Type) + I_EnumLabel(osg::Array::ArrayType); + I_EnumLabel(osg::Array::ByteArrayType); + I_EnumLabel(osg::Array::ShortArrayType); + I_EnumLabel(osg::Array::IntArrayType); + I_EnumLabel(osg::Array::UByteArrayType); + I_EnumLabel(osg::Array::UShortArrayType); + I_EnumLabel(osg::Array::UIntArrayType); + I_EnumLabel(osg::Array::Vec4ubArrayType); + I_EnumLabel(osg::Array::FloatArrayType); + I_EnumLabel(osg::Array::Vec2ArrayType); + I_EnumLabel(osg::Array::Vec3ArrayType); + I_EnumLabel(osg::Array::Vec4ArrayType); + I_EnumLabel(osg::Array::Vec2sArrayType); + I_EnumLabel(osg::Array::Vec3sArrayType); + I_EnumLabel(osg::Array::Vec4sArrayType); + I_EnumLabel(osg::Array::Vec2bArrayType); + I_EnumLabel(osg::Array::Vec3bArrayType); + I_EnumLabel(osg::Array::Vec4bArrayType); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ArrayVisitor) + I_Constructor0(); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ArrayVisitor) I_Constructor0(); - I_Method1(void, apply, IN, osg::Array &, x); - I_Method1(void, apply, IN, osg::ByteArray &, x); - I_Method1(void, apply, IN, osg::ShortArray &, x); - I_Method1(void, apply, IN, osg::IntArray &, x); - I_Method1(void, apply, IN, osg::UByteArray &, x); - I_Method1(void, apply, IN, osg::UShortArray &, x); - I_Method1(void, apply, IN, osg::UIntArray &, x); - I_Method1(void, apply, IN, osg::FloatArray &, x); - I_Method1(void, apply, IN, osg::Vec2Array &, x); - I_Method1(void, apply, IN, osg::Vec3Array &, x); - I_Method1(void, apply, IN, osg::Vec4Array &, x); - I_Method1(void, apply, IN, osg::Vec4ubArray &, x); - I_Method1(void, apply, IN, osg::Vec2bArray &, x); - I_Method1(void, apply, IN, osg::Vec3bArray &, x); - I_Method1(void, apply, IN, osg::Vec4bArray &, x); - I_Method1(void, apply, IN, osg::Vec2sArray &, x); - I_Method1(void, apply, IN, osg::Vec3sArray &, x); - I_Method1(void, apply, IN, osg::Vec4sArray &, x); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor) I_Constructor0(); - I_Method1(void, apply, IN, const osg::Array &, x); - I_Method1(void, apply, IN, const osg::ByteArray &, x); - I_Method1(void, apply, IN, const osg::ShortArray &, x); - I_Method1(void, apply, IN, const osg::IntArray &, x); - I_Method1(void, apply, IN, const osg::UByteArray &, x); - I_Method1(void, apply, IN, const osg::UShortArray &, x); - I_Method1(void, apply, IN, const osg::UIntArray &, x); - I_Method1(void, apply, IN, const osg::FloatArray &, x); - I_Method1(void, apply, IN, const osg::Vec2Array &, x); - I_Method1(void, apply, IN, const osg::Vec3Array &, x); - I_Method1(void, apply, IN, const osg::Vec4Array &, x); - I_Method1(void, apply, IN, const osg::Vec4ubArray &, x); - I_Method1(void, apply, IN, const osg::Vec2bArray &, x); - I_Method1(void, apply, IN, const osg::Vec3bArray &, x); - I_Method1(void, apply, IN, const osg::Vec4bArray &, x); - I_Method1(void, apply, IN, const osg::Vec2sArray &, x); - I_Method1(void, apply, IN, const osg::Vec3sArray &, x); - I_Method1(void, apply, IN, const osg::Vec4sArray &, x); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ConstValueVisitor) +BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor) I_Constructor0(); - I_Method1(void, apply, IN, const GLbyte &, x); - I_Method1(void, apply, IN, const GLshort &, x); - I_Method1(void, apply, IN, const GLint &, x); - I_Method1(void, apply, IN, const GLushort &, x); - I_Method1(void, apply, IN, const GLubyte &, x); - I_Method1(void, apply, IN, const GLuint &, x); - I_Method1(void, apply, IN, const GLfloat &, x); - I_Method1(void, apply, IN, const osg::Vec4ub &, x); - I_Method1(void, apply, IN, const osg::Vec2 &, x); - I_Method1(void, apply, IN, const osg::Vec3 &, x); - I_Method1(void, apply, IN, const osg::Vec4 &, x); - I_Method1(void, apply, IN, const osg::Vec2b &, x); - I_Method1(void, apply, IN, const osg::Vec3b &, x); - I_Method1(void, apply, IN, const osg::Vec4b &, x); - I_Method1(void, apply, IN, const osg::Vec2s &, x); - I_Method1(void, apply, IN, const osg::Vec3s &, x); - I_Method1(void, apply, IN, const osg::Vec4s &, x); -END_REFLECTOR - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::IndexArray) - I_BaseType(osg::Array); - I_ConstructorWithDefaults3(IN, osg::Array::Type, arrayType, osg::Array::ArrayType, IN, GLint, dataSize, 0, IN, GLenum, dataType, 0); - I_ConstructorWithDefaults2(IN, const osg::Array &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method1(unsigned int, index, IN, unsigned int, pos); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ValueVisitor) - I_Constructor0(); - I_Method1(void, apply, IN, GLbyte &, x); - I_Method1(void, apply, IN, GLshort &, x); - I_Method1(void, apply, IN, GLint &, x); - I_Method1(void, apply, IN, GLushort &, x); - I_Method1(void, apply, IN, GLubyte &, x); - I_Method1(void, apply, IN, GLuint &, x); - I_Method1(void, apply, IN, GLfloat &, x); - I_Method1(void, apply, IN, osg::Vec2 &, x); - I_Method1(void, apply, IN, osg::Vec3 &, x); - I_Method1(void, apply, IN, osg::Vec4 &, x); - I_Method1(void, apply, IN, osg::Vec4ub &, x); - I_Method1(void, apply, IN, osg::Vec2b &, x); - I_Method1(void, apply, IN, osg::Vec3b &, x); - I_Method1(void, apply, IN, osg::Vec4b &, x); - I_Method1(void, apply, IN, osg::Vec2s &, x); - I_Method1(void, apply, IN, osg::Vec3s &, x); - I_Method1(void, apply, IN, osg::Vec4s &, x); END_REFLECTOR TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >, osg::ByteArray); @@ -211,6 +125,7 @@ TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >, osg::Vec4bArray); BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -228,11 +143,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArray I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, GLfloat *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -250,11 +181,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2Arra I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec2 *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -272,11 +219,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bAr I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec2b *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -294,11 +257,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sAr I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec2s *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -316,11 +295,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3Arra I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec3 *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -338,11 +333,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bAr I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec3b *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -360,11 +371,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sAr I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec3s *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -382,11 +409,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4Arra I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec4 *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -404,11 +447,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bAr I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec4b *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -426,11 +485,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sAr I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec4s *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >) + I_BaseType(osg::Array); I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(); @@ -448,11 +523,27 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ub I_Method0(const GLvoid *, getDataPointer); I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec4ub *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >) + I_BaseType(osg::IndexArray); I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(); @@ -471,11 +562,28 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteAr I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); I_Method1(unsigned int, index, IN, unsigned int, pos); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, GLbyte *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_Method1(unsigned int, index, IN, unsigned int, pos); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLint COMMA osg::Array::IntArrayType COMMA 1 COMMA GL_INT >) + I_BaseType(osg::IndexArray); I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(); @@ -494,11 +602,28 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLint COMMA osg::Array::IntArra I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); I_Method1(unsigned int, index, IN, unsigned int, pos); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateIndexArray< GLint COMMA osg::Array::IntArrayType COMMA 1 COMMA GL_INT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, GLint *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_Method1(unsigned int, index, IN, unsigned int, pos); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLshort COMMA osg::Array::ShortArrayType COMMA 1 COMMA GL_SHORT >) + I_BaseType(osg::IndexArray); I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(); @@ -517,11 +642,28 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLshort COMMA osg::Array::Short I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); I_Method1(unsigned int, index, IN, unsigned int, pos); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateIndexArray< GLshort COMMA osg::Array::ShortArrayType COMMA 1 COMMA GL_SHORT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, GLshort *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_Method1(unsigned int, index, IN, unsigned int, pos); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLubyte COMMA osg::Array::UByteArrayType COMMA 1 COMMA GL_UNSIGNED_BYTE >) + I_BaseType(osg::IndexArray); I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(); @@ -540,11 +682,28 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLubyte COMMA osg::Array::UByte I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); I_Method1(unsigned int, index, IN, unsigned int, pos); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateIndexArray< GLubyte COMMA osg::Array::UByteArrayType COMMA 1 COMMA GL_UNSIGNED_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, GLubyte *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_Method1(unsigned int, index, IN, unsigned int, pos); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntArrayType COMMA 1 COMMA GL_UNSIGNED_INT >) + I_BaseType(osg::IndexArray); I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(); @@ -563,11 +722,28 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntAr I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); I_Method1(unsigned int, index, IN, unsigned int, pos); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntArrayType COMMA 1 COMMA GL_UNSIGNED_INT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, GLuint *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_Method1(unsigned int, index, IN, unsigned int, pos); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLushort COMMA osg::Array::UShortArrayType COMMA 1 COMMA GL_UNSIGNED_SHORT >) + I_BaseType(osg::IndexArray); I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(); @@ -586,6 +762,22 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLushort COMMA osg::Array::USho I_Method0(unsigned int, getTotalDataSize); I_Method0(unsigned int, getNumElements); I_Method1(unsigned int, index, IN, unsigned int, pos); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateIndexArray< GLushort COMMA osg::Array::UShortArrayType COMMA 1 COMMA GL_UNSIGNED_SHORT > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, GLushort *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(void, trim); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_Method1(unsigned int, index, IN, unsigned int, pos); I_ReadOnlyProperty(const GLvoid *, DataPointer); I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR diff --git a/src/osgWrappers/osg/AutoTransform.cpp b/src/osgWrappers/osg/AutoTransform.cpp index af3b324e4..fe2ce85f7 100644 --- a/src/osgWrappers/osg/AutoTransform.cpp +++ b/src/osgWrappers/osg/AutoTransform.cpp @@ -10,13 +10,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -32,42 +25,9 @@ BEGIN_ENUM_REFLECTOR(osg::AutoTransform::AutoRotateMode) I_EnumLabel(osg::AutoTransform::ROTATE_TO_CAMERA); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::AutoTransform) - I_BaseType(osg::Transform); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::AutoTransform &, pat, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method0(osg::AutoTransform *, asAutoTransform); - I_Method0(const osg::AutoTransform *, asAutoTransform); - I_Method1(void, setPosition, IN, const osg::Vec3 &, pos); - I_Method0(const osg::Vec3 &, getPosition); - I_Method1(void, setRotation, IN, const osg::Quat &, quat); - I_Method0(const osg::Quat &, getRotation); - I_Method1(void, setScale, IN, float, scale); - I_Method1(void, setScale, IN, const osg::Vec3 &, scale); - I_Method0(const osg::Vec3 &, getScale); - I_Method1(void, setPivotPoint, IN, const osg::Vec3 &, pivot); - I_Method0(const osg::Vec3 &, getPivotPoint); - I_Method1(void, setAutoUpdateEyeMovementTolerance, IN, float, tolerance); - I_Method0(float, getAutoUpdateEyeMovementTolerance); - I_Method1(void, setAutoRotateMode, IN, osg::AutoTransform::AutoRotateMode, mode); - I_Method0(osg::AutoTransform::AutoRotateMode, getAutoRotateMode); - I_Method1(void, setAutoScaleToScreen, IN, bool, autoScaleToScreen); - I_Method0(bool, getAutoScaleToScreen); - I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - I_Method0(osg::BoundingSphere, computeBound); - I_Property(osg::AutoTransform::AutoRotateMode, AutoRotateMode); - I_Property(bool, AutoScaleToScreen); - I_Property(float, AutoUpdateEyeMovementTolerance); - I_Property(const osg::Vec3 &, PivotPoint); - I_Property(const osg::Vec3 &, Position); - I_Property(const osg::Quat &, Rotation); - I_Property(const osg::Vec3 &, Scale); +BEGIN_ENUM_REFLECTOR(osg::AutoTransform::AutoRotateMode) + I_EnumLabel(osg::AutoTransform::NO_ROTATION); + I_EnumLabel(osg::AutoTransform::ROTATE_TO_SCREEN); + I_EnumLabel(osg::AutoTransform::ROTATE_TO_CAMERA); END_REFLECTOR diff --git a/src/osgWrappers/osg/Billboard.cpp b/src/osgWrappers/osg/Billboard.cpp index 260026d3b..2e0816a4a 100644 --- a/src/osgWrappers/osg/Billboard.cpp +++ b/src/osgWrappers/osg/Billboard.cpp @@ -10,13 +10,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -34,37 +27,12 @@ BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode) I_EnumLabel(osg::Billboard::AXIAL_ROT); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Billboard) - I_BaseType(osg::Geode); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Billboard &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, setMode, IN, osg::Billboard::Mode, mode); - I_Method0(osg::Billboard::Mode, getMode); - I_Method1(void, setAxis, IN, const osg::Vec3 &, axis); - I_Method0(const osg::Vec3 &, getAxis); - I_Method1(void, setNormal, IN, const osg::Vec3 &, normal); - I_Method0(const osg::Vec3 &, getNormal); - I_Method2(void, setPosition, IN, unsigned int, i, IN, const osg::Vec3 &, pos); - I_Method1(const osg::Vec3 &, getPosition, IN, unsigned int, i); - I_Method1(void, setPositionList, IN, osg::Billboard::PositionList &, pl); - I_Method0(osg::Billboard::PositionList &, getPositionList); - I_Method0(const osg::Billboard::PositionList &, getPositionList); - I_Method1(bool, addDrawable, IN, osg::Drawable *, gset); - I_Method2(bool, addDrawable, IN, osg::Drawable *, gset, IN, const osg::Vec3 &, pos); - I_Method1(bool, removeDrawable, IN, osg::Drawable *, gset); - I_Method3(bool, computeMatrix, IN, osg::Matrix &, modelview, IN, const osg::Vec3 &, eye_local, IN, const osg::Vec3 &, pos_local); - I_Method0(osg::BoundingSphere, computeBound); - I_Property(const osg::Vec3 &, Axis); - I_Property(osg::Billboard::Mode, Mode); - I_Property(const osg::Vec3 &, Normal); - I_IndexedProperty1(const osg::Vec3 &, Position, unsigned int, i); - I_Property(osg::Billboard::PositionList &, PositionList); +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Billboard::PositionList); + +BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode) + I_EnumLabel(osg::Billboard::POINT_ROT_EYE); + I_EnumLabel(osg::Billboard::POINT_ROT_WORLD); + I_EnumLabel(osg::Billboard::AXIAL_ROT); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::Vec3 >); diff --git a/src/osgWrappers/osg/BlendEquation.cpp b/src/osgWrappers/osg/BlendEquation.cpp index 184f3cf35..89ce64f41 100644 --- a/src/osgWrappers/osg/BlendEquation.cpp +++ b/src/osgWrappers/osg/BlendEquation.cpp @@ -10,10 +10,6 @@ #include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -34,40 +30,14 @@ BEGIN_ENUM_REFLECTOR(osg::BlendEquation::Equation) I_EnumLabel(osg::BlendEquation::FUNC_REVERSE_SUBTRACT); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) - I_BaseType(osg::StateAttribute); - I_Constructor0(); - I_Constructor1(IN, osg::BlendEquation::Equation, equation); - I_ConstructorWithDefaults2(IN, const osg::BlendEquation &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(void, setEquation, IN, osg::BlendEquation::Equation, equation); - I_Method0(osg::BlendEquation::Equation, getEquation); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(osg::BlendEquation::Equation, Equation); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::BlendEquation::Extensions) - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID); - I_Constructor1(IN, const osg::BlendEquation::Extensions &, rhs); - I_Method1(void, lowestCommonDenominator, IN, const osg::BlendEquation::Extensions &, rhs); - I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); - I_Method1(void, setBlendEquationSupported, IN, bool, flag); - I_Method0(bool, isBlendEquationSupported); - I_Method0(bool, isSGIXMinMaxSupported); - I_Method0(bool, isLogicOpSupported); - I_Method1(void, setBlendEquationProc, IN, void *, ptr); - I_Method1(void, glBlendEquation, IN, GLenum, mode); - I_WriteOnlyProperty(void *, BlendEquationProc); - I_WriteOnlyProperty(bool, BlendEquationSupported); - I_WriteOnlyProperty(unsigned int, upGLExtenions); +BEGIN_ENUM_REFLECTOR(osg::BlendEquation::Equation) + I_EnumLabel(osg::BlendEquation::RGBA_MIN); + I_EnumLabel(osg::BlendEquation::RGBA_MAX); + I_EnumLabel(osg::BlendEquation::ALPHA_MIN); + I_EnumLabel(osg::BlendEquation::ALPHA_MAX); + I_EnumLabel(osg::BlendEquation::LOGIC_OP); + I_EnumLabel(osg::BlendEquation::FUNC_ADD); + I_EnumLabel(osg::BlendEquation::FUNC_SUBTRACT); + I_EnumLabel(osg::BlendEquation::FUNC_REVERSE_SUBTRACT); END_REFLECTOR diff --git a/src/osgWrappers/osg/BlendFunc.cpp b/src/osgWrappers/osg/BlendFunc.cpp index 5d443f548..39d1259de 100644 --- a/src/osgWrappers/osg/BlendFunc.cpp +++ b/src/osgWrappers/osg/BlendFunc.cpp @@ -10,10 +10,6 @@ #include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -41,56 +37,21 @@ BEGIN_ENUM_REFLECTOR(osg::BlendFunc::BlendFuncMode) I_EnumLabel(osg::BlendFunc::ZERO); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::BlendFunc) - I_BaseType(osg::StateAttribute); - I_Constructor0(); - I_Constructor2(IN, GLenum, source, IN, GLenum, destination); - I_Constructor4(IN, GLenum, source, IN, GLenum, destination, IN, GLenum, source_alpha, IN, GLenum, destination_alpha); - I_ConstructorWithDefaults2(IN, const osg::BlendFunc &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method2(void, setFunction, IN, GLenum, source, IN, GLenum, destination); - I_Method4(void, setFunction, IN, GLenum, source_rgb, IN, GLenum, destination_rgb, IN, GLenum, source_alpha, IN, GLenum, destination_alpha); - I_Method1(void, setSource, IN, GLenum, source); - I_Method0(GLenum, getSource); - I_Method1(void, setSourceRGB, IN, GLenum, source); - I_Method0(GLenum, getSourceRGB); - I_Method1(void, setSourceAlpha, IN, GLenum, source); - I_Method0(GLenum, getSourceAlpha); - I_Method1(void, setDestination, IN, GLenum, destination); - I_Method0(GLenum, getDestination); - I_Method1(void, setDestinationRGB, IN, GLenum, destination); - I_Method0(GLenum, getDestinationRGB); - I_Method1(void, setDestinationAlpha, IN, GLenum, destination); - I_Method0(GLenum, getDestinationAlpha); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(GLenum, Destination); - I_Property(GLenum, DestinationAlpha); - I_Property(GLenum, DestinationRGB); - I_Property(GLenum, Source); - I_Property(GLenum, SourceAlpha); - I_Property(GLenum, SourceRGB); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::BlendFunc::Extensions) - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID); - I_Constructor1(IN, const osg::BlendFunc::Extensions &, rhs); - I_Method1(void, lowestCommonDenominator, IN, const osg::BlendFunc::Extensions &, rhs); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID); - I_Method1(void, setBlendFuncSeparateSupported, IN, bool, flag); - I_Method0(bool, isBlendFuncSeparateSupported); - I_Method1(void, setBlendFuncSeparateProc, IN, void *, ptr); - I_Method4(void, glBlendFuncSeparate, IN, GLenum, sfactorRGB, IN, GLenum, dfactorRGB, IN, GLenum, sfactorAlpha, IN, GLenum, dfactorAlpha); - I_WriteOnlyProperty(void *, BlendFuncSeparateProc); - I_WriteOnlyProperty(bool, BlendFuncSeparateSupported); - I_WriteOnlyProperty(unsigned int, upGLExtensions); +BEGIN_ENUM_REFLECTOR(osg::BlendFunc::BlendFuncMode) + I_EnumLabel(osg::BlendFunc::DST_ALPHA); + I_EnumLabel(osg::BlendFunc::DST_COLOR); + I_EnumLabel(osg::BlendFunc::ONE); + I_EnumLabel(osg::BlendFunc::ONE_MINUS_DST_ALPHA); + I_EnumLabel(osg::BlendFunc::ONE_MINUS_DST_COLOR); + I_EnumLabel(osg::BlendFunc::ONE_MINUS_SRC_ALPHA); + I_EnumLabel(osg::BlendFunc::ONE_MINUS_SRC_COLOR); + I_EnumLabel(osg::BlendFunc::SRC_ALPHA); + I_EnumLabel(osg::BlendFunc::SRC_ALPHA_SATURATE); + I_EnumLabel(osg::BlendFunc::SRC_COLOR); + I_EnumLabel(osg::BlendFunc::CONSTANT_COLOR); + I_EnumLabel(osg::BlendFunc::ONE_MINUS_CONSTANT_COLOR); + I_EnumLabel(osg::BlendFunc::CONSTANT_ALPHA); + I_EnumLabel(osg::BlendFunc::ONE_MINUS_CONSTANT_ALPHA); + I_EnumLabel(osg::BlendFunc::ZERO); END_REFLECTOR diff --git a/src/osgWrappers/osg/BoundingSphere.cpp b/src/osgWrappers/osg/BoundingSphere.cpp index 9082cb237..0fadf99b4 100644 --- a/src/osgWrappers/osg/BoundingSphere.cpp +++ b/src/osgWrappers/osg/BoundingSphere.cpp @@ -9,9 +9,7 @@ #include #include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,24 +21,9 @@ BEGIN_VALUE_REFLECTOR(osg::BoundingSphere) I_Constructor0(); - I_Constructor2(IN, const osg::Vec3 &, center, IN, float, radius); - I_Constructor1(IN, const osg::BoundingSphere &, bs); - I_Constructor1(IN, const osg::BoundingBox &, bb); - I_Method0(void, init); - I_Method0(bool, valid); - I_Method2(void, set, IN, const osg::Vec3 &, center, IN, float, radius); - I_Method0(osg::Vec3 &, center); - I_Method0(const osg::Vec3 &, center); - I_Method0(float &, radius); - I_Method0(float, radius); - I_Method0(float, radius2); - I_Method1(void, expandBy, IN, const osg::Vec3 &, v); - I_Method1(void, expandRadiusBy, IN, const osg::Vec3 &, v); - I_Method1(void, expandBy, IN, const osg::BoundingSphere &, sh); - I_Method1(void, expandRadiusBy, IN, const osg::BoundingSphere &, sh); - I_Method1(void, expandBy, IN, const osg::BoundingBox &, bb); - 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); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::BoundingSphere) + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index 2a57d51e2..b85960e89 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -10,10 +10,6 @@ #include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,68 +19,25 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BufferObject) - I_BaseType(osg::Object); +BEGIN_VALUE_REFLECTOR(osg::BufferObject) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::BufferObject) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::BufferObject &, bo, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(bool, isBufferObjectSupported, IN, unsigned int, contextID); - I_Method1(GLuint &, buffer, IN, unsigned int, contextID); - I_Method1(void, bindBuffer, IN, unsigned int, contextID); - I_Method1(void, unbindBuffer, IN, unsigned int, contextID); - I_Method1(bool, needsCompile, IN, unsigned int, contextID); - 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); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::BufferObject::BufferEntry) I_Constructor0(); - I_Constructor1(IN, const osg::BufferObject::BufferEntry &, be); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions) - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID); - I_Constructor1(IN, const osg::BufferObject::Extensions &, rhs); - I_Method1(void, lowestCommonDenominator, IN, const osg::BufferObject::Extensions &, rhs); - I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); - I_Method0(bool, isBufferObjectSupported); - I_Method2(void, glGenBuffers, IN, GLsizei, n, IN, GLuint *, buffers); - I_Method2(void, glBindBuffer, IN, GLenum, target, IN, GLuint, buffer); - I_Method4(void, glBufferData, IN, GLenum, target, IN, GLsizeiptrARB, size, IN, const GLvoid *, data, IN, GLenum, usage); - I_Method4(void, glBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, const GLvoid *, data); - I_Method2(void, glDeleteBuffers, IN, GLsizei, n, IN, const GLuint *, buffers); - I_Method1(GLboolean, glIsBuffer, IN, GLuint, buffer); - I_Method4(void, glGetBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, GLvoid *, data); - I_Method2(GLvoid *, glMapBuffer, IN, GLenum, target, IN, GLenum, access); - I_Method1(GLboolean, glUnmapBuffer, IN, GLenum, target); - I_Method3(void, glGetBufferParameteriv, IN, GLenum, target, IN, GLenum, pname, IN, GLint *, params); - I_Method3(void, glGetBufferPointerv, IN, GLenum, target, IN, GLenum, pname, IN, GLvoid **, params); - I_WriteOnlyProperty(unsigned int, upGLExtenions); +BEGIN_VALUE_REFLECTOR(osg::BufferObject::BufferEntry) + I_Constructor0(); END_REFLECTOR TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >, osg::PixelBufferObject::BufferEntryImagePair); -BEGIN_OBJECT_REFLECTOR(osg::PixelBufferObject) - I_BaseType(osg::BufferObject); - I_ConstructorWithDefaults1(IN, osg::Image *, image, 0); - I_ConstructorWithDefaults2(IN, const osg::PixelBufferObject &, pbo, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, setImage, IN, osg::Image *, image); - I_Method0(osg::Image *, getImage); - I_Method0(const osg::Image *, getImage); - I_Method0(unsigned int, offset); - I_Method1(bool, needsCompile, IN, unsigned int, contextID); - I_Method1(void, compileBuffer, IN, osg::State &, state); - I_Property(osg::Image *, Image); -END_REFLECTOR +TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >, osg::PixelBufferObject::BufferEntryImagePair); STD_PAIR_REFLECTOR(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >); diff --git a/src/osgWrappers/osg/CameraNode.cpp b/src/osgWrappers/osg/CameraNode.cpp index 7b1f21bfd..129d53e9b 100644 --- a/src/osgWrappers/osg/CameraNode.cpp +++ b/src/osgWrappers/osg/CameraNode.cpp @@ -10,20 +10,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -68,112 +54,39 @@ BEGIN_ENUM_REFLECTOR(osg::CameraNode::BufferComponent) I_EnumLabel(osg::CameraNode::COLOR_BUFFER7); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::CameraNode) - I_BaseType(osg::Transform); - I_BaseType(osg::CullSettings); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::CameraNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, setClearColor, IN, const osg::Vec4 &, color); - I_Method0(const osg::Vec4 &, getClearColor); - I_Method1(void, setClearMask, IN, GLbitfield, mask); - I_Method0(GLbitfield, getClearMask); - I_Method1(void, setColorMask, IN, osg::ColorMask *, colorMask); - I_Method4(void, setColorMask, IN, bool, red, IN, bool, green, IN, bool, blue, IN, bool, alpha); - I_Method0(const osg::ColorMask *, getColorMask); - I_Method0(osg::ColorMask *, getColorMask); - I_Method1(void, setViewport, IN, osg::Viewport *, viewport); - I_Method4(void, setViewport, IN, int, x, IN, int, y, IN, int, width, IN, int, height); - I_Method0(const osg::Viewport *, getViewport); - I_Method0(osg::Viewport *, getViewport); - I_Method1(void, setTransformOrder, IN, osg::CameraNode::TransformOrder, order); - I_Method0(osg::CameraNode::TransformOrder, getTransformOrder); - I_Method1(void, setProjectionMatrix, IN, const osg::Matrixf &, matrix); - I_Method1(void, setProjectionMatrix, IN, const osg::Matrixd &, matrix); - I_Method6(void, setProjectionMatrixAsOrtho, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - I_Method4(void, setProjectionMatrixAsOrtho2D, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top); - I_Method6(void, setProjectionMatrixAsFrustum, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - I_Method4(void, setProjectionMatrixAsPerspective, IN, double, fovy, IN, double, aspectRatio, IN, double, zNear, IN, double, zFar); - I_Method0(osg::Matrixd &, getProjectionMatrix); - I_Method0(const osg::Matrixd &, getProjectionMatrix); - I_Method6(bool, getProjectionMatrixAsOrtho, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - I_Method6(bool, getProjectionMatrixAsFrustum, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - I_Method4(bool, getProjectionMatrixAsPerspective, IN, double &, fovy, IN, double &, aspectRatio, IN, double &, zNear, IN, double &, zFar); - I_Method1(void, setViewMatrix, IN, const osg::Matrixf &, matrix); - I_Method1(void, setViewMatrix, IN, const osg::Matrixd &, matrix); - I_Method3(void, setViewMatrixAsLookAt, IN, const osg::Vec3 &, eye, IN, const osg::Vec3 &, center, IN, const osg::Vec3 &, up); - I_Method0(osg::Matrixd &, getViewMatrix); - I_Method0(const osg::Matrixd &, getViewMatrix); - I_MethodWithDefaults4(void, getViewMatrixAsLookAt, IN, osg::Vec3 &, eye, , IN, osg::Vec3 &, center, , IN, osg::Vec3 &, up, , IN, float, lookDistance, 1.0f); - I_Method0(osg::Matrixd, getInverseViewMatrix); - I_Method1(void, setRenderOrder, IN, osg::CameraNode::RenderOrder, order); - I_Method0(osg::CameraNode::RenderOrder, getRenderOrder); - I_Method0(bool, isRenderToTextureCamera); - I_Method1(void, setRenderTargetImplementation, IN, osg::CameraNode::RenderTargetImplementation, impl); - I_Method2(void, setRenderTargetImplementation, IN, osg::CameraNode::RenderTargetImplementation, impl, IN, osg::CameraNode::RenderTargetImplementation, fallback); - I_Method0(osg::CameraNode::RenderTargetImplementation, getRenderTargetImplementation); - I_Method0(osg::CameraNode::RenderTargetImplementation, getRenderTargetFallback); - I_Method1(void, setDrawBuffer, IN, GLenum, buffer); - I_Method0(GLenum, getDrawBuffer); - I_Method1(void, setReadBuffer, IN, GLenum, buffer); - I_Method0(GLenum, getReadBuffer); - I_Method2(void, attach, IN, osg::CameraNode::BufferComponent, buffer, IN, GLenum, internalFormat); - I_MethodWithDefaults5(void, attach, IN, osg::CameraNode::BufferComponent, buffer, , IN, osg::Texture *, texture, , IN, unsigned int, level, 0, IN, unsigned int, face, 0, IN, bool, mipMapGeneration, false); - I_Method2(void, attach, IN, osg::CameraNode::BufferComponent, buffer, IN, osg::Image *, image); - I_Method1(void, detach, IN, osg::CameraNode::BufferComponent, buffer); - I_Method0(osg::CameraNode::BufferAttachmentMap &, getBufferAttachmentMap); - I_Method0(const osg::CameraNode::BufferAttachmentMap &, getBufferAttachmentMap); - I_Method1(void, setGraphicsContext, IN, osg::GraphicsContext *, context); - I_Method0(osg::GraphicsContext *, getGraphicsContext); - I_Method0(const osg::GraphicsContext *, getGraphicsContext); - I_Method2(void, setRenderingCache, IN, unsigned int, contextID, IN, osg::Object *, rc); - I_Method1(osg::Object *, getRenderingCache, IN, unsigned int, contextID); - I_Method1(const osg::Object *, getRenderingCache, IN, unsigned int, contextID); - I_Method1(void, setPostDrawCallback, IN, osg::CameraNode::DrawCallback *, cb); - I_Method0(osg::CameraNode::DrawCallback *, getPostDrawCallback); - I_Method0(const osg::CameraNode::DrawCallback *, getPostDrawCallback); - I_Method0(OpenThreads::Mutex *, getDataChangeMutex); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); - I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); - I_ReadOnlyProperty(osg::CameraNode::BufferAttachmentMap &, BufferAttachmentMap); - I_Property(const osg::Vec4 &, ClearColor); - I_Property(GLbitfield, ClearMask); - I_Property(osg::ColorMask *, ColorMask); - I_ReadOnlyProperty(OpenThreads::Mutex *, DataChangeMutex); - I_Property(GLenum, DrawBuffer); - I_Property(osg::GraphicsContext *, GraphicsContext); - I_ReadOnlyProperty(osg::Matrixd, InverseViewMatrix); - I_Property(osg::CameraNode::DrawCallback *, PostDrawCallback); - I_Property(const osg::Matrixd &, ProjectionMatrix); - I_Property(GLenum, ReadBuffer); - I_Property(osg::CameraNode::RenderOrder, RenderOrder); - I_ReadOnlyProperty(osg::CameraNode::RenderTargetImplementation, RenderTargetFallback); - I_Property(osg::CameraNode::RenderTargetImplementation, RenderTargetImplementation); - I_IndexedProperty1(osg::Object *, RenderingCache, unsigned int, contextID); - I_Property(osg::CameraNode::TransformOrder, TransformOrder); - I_Property(const osg::Matrixd &, ViewMatrix); - I_Property(osg::Viewport *, Viewport); +TYPE_NAME_ALIAS(std::map< osg::CameraNode::BufferComponent COMMA osg::CameraNode::Attachment >, osg::CameraNode::BufferAttachmentMap); + +BEGIN_ENUM_REFLECTOR(osg::CameraNode::TransformOrder) + I_EnumLabel(osg::CameraNode::PRE_MULTIPLY); + I_EnumLabel(osg::CameraNode::POST_MULTIPLY); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::CameraNode::Attachment) - I_Constructor0(); +BEGIN_ENUM_REFLECTOR(osg::CameraNode::RenderOrder) + I_EnumLabel(osg::CameraNode::PRE_RENDER); + I_EnumLabel(osg::CameraNode::NESTED_RENDER); + I_EnumLabel(osg::CameraNode::POST_RENDER); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::CameraNode::DrawCallback) - I_BaseType(osg::Object); - I_Constructor0(); - I_Constructor2(IN, const osg::CameraNode::DrawCallback &, x, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); +BEGIN_ENUM_REFLECTOR(osg::CameraNode::RenderTargetImplementation) + I_EnumLabel(osg::CameraNode::FRAME_BUFFER_OBJECT); + I_EnumLabel(osg::CameraNode::PIXEL_BUFFER_RTT); + I_EnumLabel(osg::CameraNode::PIXEL_BUFFER); + I_EnumLabel(osg::CameraNode::FRAME_BUFFER); + I_EnumLabel(osg::CameraNode::SEPERATE_WINDOW); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::CameraNode::BufferComponent) + I_EnumLabel(osg::CameraNode::DEPTH_BUFFER); + I_EnumLabel(osg::CameraNode::STENCIL_BUFFER); + I_EnumLabel(osg::CameraNode::COLOR_BUFFER); + I_EnumLabel(osg::CameraNode::COLOR_BUFFER0); + I_EnumLabel(osg::CameraNode::COLOR_BUFFER1); + I_EnumLabel(osg::CameraNode::COLOR_BUFFER2); + I_EnumLabel(osg::CameraNode::COLOR_BUFFER3); + I_EnumLabel(osg::CameraNode::COLOR_BUFFER4); + I_EnumLabel(osg::CameraNode::COLOR_BUFFER5); + I_EnumLabel(osg::CameraNode::COLOR_BUFFER6); + I_EnumLabel(osg::CameraNode::COLOR_BUFFER7); END_REFLECTOR STD_MAP_REFLECTOR(std::map< osg::CameraNode::BufferComponent COMMA osg::CameraNode::Attachment >); diff --git a/src/osgWrappers/osg/CameraView.cpp b/src/osgWrappers/osg/CameraView.cpp index 61113b821..50a2d6f26 100644 --- a/src/osgWrappers/osg/CameraView.cpp +++ b/src/osgWrappers/osg/CameraView.cpp @@ -10,12 +10,6 @@ #include #include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -31,32 +25,9 @@ BEGIN_ENUM_REFLECTOR(osg::CameraView::FieldOfViewMode) I_EnumLabel(osg::CameraView::VERTICAL); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::CameraView) - I_BaseType(osg::Transform); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::CameraView &, pat, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, setPosition, IN, const osg::Vec3d &, pos); - I_Method0(const osg::Vec3d &, getPosition); - I_Method1(void, setAttitude, IN, const osg::Quat &, quat); - I_Method0(const osg::Quat &, getAttitude); - I_Method1(void, setFieldOfView, IN, double, fieldOfView); - I_Method0(double, getFieldOfView); - I_Method1(void, setFieldOfViewMode, IN, osg::CameraView::FieldOfViewMode, mode); - I_Method0(osg::CameraView::FieldOfViewMode, getFieldOfViewMode); - I_Method1(void, setFocalLength, IN, double, focalLength); - I_Method0(double, getFocalLength); - I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - I_Property(const osg::Quat &, Attitude); - I_Property(double, FieldOfView); - I_Property(osg::CameraView::FieldOfViewMode, FieldOfViewMode); - I_Property(double, FocalLength); - I_Property(const osg::Vec3d &, Position); +BEGIN_ENUM_REFLECTOR(osg::CameraView::FieldOfViewMode) + I_EnumLabel(osg::CameraView::UNCONSTRAINED); + I_EnumLabel(osg::CameraView::HORIZONTAL); + I_EnumLabel(osg::CameraView::VERTICAL); END_REFLECTOR diff --git a/src/osgWrappers/osg/ClampColor.cpp b/src/osgWrappers/osg/ClampColor.cpp index c2e1950bd..d7e87e118 100644 --- a/src/osgWrappers/osg/ClampColor.cpp +++ b/src/osgWrappers/osg/ClampColor.cpp @@ -10,10 +10,6 @@ #include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -35,40 +31,15 @@ BEGIN_ENUM_REFLECTOR(osg::ClampColor::Mode) I_EnumLabel(osg::ClampColor::TRUE); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::ClampColor) - I_BaseType(osg::StateAttribute); - I_Constructor0(); - I_Constructor2(IN, osg::ClampColor::Target, target, IN, osg::ClampColor::Mode, mode); - I_ConstructorWithDefaults2(IN, const osg::ClampColor &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(void, setTarget, IN, osg::ClampColor::Target, target); - I_Method0(osg::ClampColor::Target, getTarget); - I_Method1(void, setMode, IN, osg::ClampColor::Mode, mode); - I_Method0(osg::ClampColor::Mode, getMode); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(osg::ClampColor::Mode, Mode); - I_Property(osg::ClampColor::Target, Target); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); +BEGIN_ENUM_REFLECTOR(osg::ClampColor::Target) + I_EnumLabel(osg::ClampColor::CLAMP_VERTEX_COLOR); + I_EnumLabel(osg::ClampColor::CLAMP_FRAGMENT_COLOR); + I_EnumLabel(osg::ClampColor::CLAMP_READ_COLOR); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::ClampColor::Extensions) - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID); - I_Constructor1(IN, const osg::ClampColor::Extensions &, rhs); - I_Method1(void, lowestCommonDenominator, IN, const osg::ClampColor::Extensions &, rhs); - I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); - I_Method1(void, setClampColorSupported, IN, bool, flag); - I_Method0(bool, isClampColorSupported); - I_Method1(void, setClampColorProc, IN, void *, ptr); - I_Method2(void, glClampColor, IN, GLenum, target, IN, GLenum, mode); - I_WriteOnlyProperty(void *, ClampColorProc); - I_WriteOnlyProperty(bool, ClampColorSupported); - I_WriteOnlyProperty(unsigned int, upGLExtenions); +BEGIN_ENUM_REFLECTOR(osg::ClampColor::Mode) + I_EnumLabel(osg::ClampColor::FIXED_ONLY); + I_EnumLabel(osg::ClampColor::FALSE); + I_EnumLabel(osg::ClampColor::TRUE); END_REFLECTOR diff --git a/src/osgWrappers/osg/ClipNode.cpp b/src/osgWrappers/osg/ClipNode.cpp index a9edd87c5..a541b897a 100644 --- a/src/osgWrappers/osg/ClipNode.cpp +++ b/src/osgWrappers/osg/ClipNode.cpp @@ -9,15 +9,8 @@ #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -29,35 +22,16 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::ClipPlane > >, osg::ClipNode::ClipPlaneList); -BEGIN_OBJECT_REFLECTOR(osg::ClipNode) - I_BaseType(osg::Group); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::ClipNode &, es, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_MethodWithDefaults2(void, createClipBox, IN, const osg::BoundingBox &, bb, , IN, unsigned int, clipPlaneNumberBase, 0); - I_Method1(bool, addClipPlane, IN, osg::ClipPlane *, clipplane); - I_Method1(bool, removeClipPlane, IN, osg::ClipPlane *, clipplane); - I_Method1(bool, removeClipPlane, IN, unsigned int, pos); - I_Method0(unsigned int, getNumClipPlanes); - I_Method1(osg::ClipPlane *, getClipPlane, IN, unsigned int, pos); - I_Method1(const osg::ClipPlane *, getClipPlane, IN, unsigned int, pos); - I_Method1(void, getClipPlaneList, IN, const osg::ClipNode::ClipPlaneList &, cpl); - I_Method0(osg::ClipNode::ClipPlaneList &, getClipPlaneList); - I_Method0(const osg::ClipNode::ClipPlaneList &, getClipPlaneList); - I_Method2(void, setStateSetModes, IN, osg::StateSet &, x, IN, osg::StateAttribute::GLModeValue, x); - I_MethodWithDefaults1(void, setLocalStateSetModes, IN, osg::StateAttribute::GLModeValue, x, osg::StateAttribute::ON); - I_Method0(osg::BoundingSphere, computeBound); - I_ArrayProperty_GA(osg::ClipPlane *, ClipPlane, ClipPlanes, unsigned int, bool); - I_ReadOnlyProperty(osg::ClipNode::ClipPlaneList &, ClipPlaneList); - I_WriteOnlyProperty(osg::StateAttribute::GLModeValue, LocalStateSetModes); -END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::ClipPlane > >, osg::ClipNode::ClipPlaneList); BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::ClipPlane >) + I_Constructor0(); + I_Constructor1(IN, osg::ClipPlane *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::ClipPlane > &, rp); + I_Method0(osg::ClipPlane *, get); + I_Method0(bool, valid); + I_Method0(osg::ClipPlane *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::ClipPlane > &, rp); I_Constructor0(); I_Constructor1(IN, osg::ClipPlane *, ptr); I_Constructor1(IN, const osg::ref_ptr< osg::ClipPlane > &, rp); diff --git a/src/osgWrappers/osg/CollectOccludersVisitor.cpp b/src/osgWrappers/osg/CollectOccludersVisitor.cpp index 4c348bac1..b75f0b53f 100644 --- a/src/osgWrappers/osg/CollectOccludersVisitor.cpp +++ b/src/osgWrappers/osg/CollectOccludersVisitor.cpp @@ -10,13 +10,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -28,36 +21,7 @@ TYPE_NAME_ALIAS(std::set< osg::ShadowVolumeOccluder >, osg::CollectOccludersVisitor::ShadowVolumeOccluderSet); -BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor) - I_BaseType(osg::NodeVisitor); - I_BaseType(osg::CullStack); - I_Constructor0(); - I_Method0(osg::CollectOccludersVisitor *, cloneType); - I_Method0(void, reset); - I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale); - I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale); - I_Method1(void, apply, IN, osg::Node &, x); - I_Method1(void, apply, IN, osg::Transform &, node); - I_Method1(void, apply, IN, osg::Projection &, node); - I_Method1(void, apply, IN, osg::Switch &, node); - I_Method1(void, apply, IN, osg::LOD &, node); - I_Method1(void, apply, IN, osg::OccluderNode &, node); - I_Method1(void, setMinimumShadowOccluderVolume, IN, float, vol); - I_Method0(float, getMinimumShadowOccluderVolume); - I_Method1(void, setMaximumNumberOfActiveOccluders, IN, unsigned int, num); - I_Method0(unsigned int, getMaximumNumberOfActiveOccluders); - I_Method1(void, setCreateDrawablesOnOccludeNodes, IN, bool, flag); - I_Method0(bool, getCreateDrawablesOnOccludeNodes); - I_Method1(void, setCollectedOcculderSet, IN, const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, svol); - I_Method0(osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, getCollectedOccluderSet); - I_Method0(const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, getCollectedOccluderSet); - I_Method0(void, removeOccludedOccluders); - I_ReadOnlyProperty(osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, CollectedOccluderSet); - I_WriteOnlyProperty(const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, CollectedOcculderSet); - I_Property(bool, CreateDrawablesOnOccludeNodes); - I_Property(unsigned int, MaximumNumberOfActiveOccluders); - I_Property(float, MinimumShadowOccluderVolume); -END_REFLECTOR +TYPE_NAME_ALIAS(std::set< osg::ShadowVolumeOccluder >, osg::CollectOccludersVisitor::ShadowVolumeOccluderSet); STD_SET_REFLECTOR(std::set< osg::ShadowVolumeOccluder >); diff --git a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp index c012eb02f..091641694 100644 --- a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp +++ b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp @@ -10,9 +10,6 @@ #include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -24,25 +21,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ConvexPlanarPolygon >, osg::ConvexPlanarOccluder::HoleList); -BEGIN_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder) - I_BaseType(osg::Object); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::ConvexPlanarOccluder &, cpo, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, setOccluder, IN, const osg::ConvexPlanarPolygon &, cpp); - I_Method0(osg::ConvexPlanarPolygon &, getOccluder); - I_Method0(const osg::ConvexPlanarPolygon &, getOccluder); - I_Method1(void, addHole, IN, const osg::ConvexPlanarPolygon &, cpp); - I_Method1(void, setHoleList, IN, const osg::ConvexPlanarOccluder::HoleList &, holeList); - I_Method0(osg::ConvexPlanarOccluder::HoleList &, getHoleList); - I_Method0(const osg::ConvexPlanarOccluder::HoleList &, getHoleList); - I_Property(const osg::ConvexPlanarOccluder::HoleList &, HoleList); - I_Property(const osg::ConvexPlanarPolygon &, Occluder); -END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::ConvexPlanarPolygon >, osg::ConvexPlanarOccluder::HoleList); STD_VECTOR_REFLECTOR(std::vector< osg::ConvexPlanarPolygon >); diff --git a/src/osgWrappers/osg/ConvexPlanarPolygon.cpp b/src/osgWrappers/osg/ConvexPlanarPolygon.cpp index 6819cb110..06efdeac6 100644 --- a/src/osgWrappers/osg/ConvexPlanarPolygon.cpp +++ b/src/osgWrappers/osg/ConvexPlanarPolygon.cpp @@ -10,7 +10,6 @@ #include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -22,12 +21,5 @@ TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::ConvexPlanarPolygon::VertexList); -BEGIN_VALUE_REFLECTOR(osg::ConvexPlanarPolygon) - I_Constructor0(); - I_Method1(void, add, IN, const osg::Vec3 &, v); - I_Method1(void, setVertexList, IN, const osg::ConvexPlanarPolygon::VertexList &, vertexList); - I_Method0(osg::ConvexPlanarPolygon::VertexList &, getVertexList); - I_Method0(const osg::ConvexPlanarPolygon::VertexList &, getVertexList); - I_Property(const osg::ConvexPlanarPolygon::VertexList &, VertexList); -END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::ConvexPlanarPolygon::VertexList); diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index 5f3ad359b..db5ea01dd 100644 --- a/src/osgWrappers/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/osg/CoordinateSystemNode.cpp @@ -10,11 +10,6 @@ #include #include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -24,54 +19,5 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::CoordinateSystemNode) - I_BaseType(osg::Group); - I_Constructor0(); - I_Constructor2(IN, const std::string &, format, IN, const std::string &, cs); - I_ConstructorWithDefaults2(IN, const osg::CoordinateSystemNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, set, IN, const osg::CoordinateSystemNode &, csn); - I_Method1(void, setFormat, IN, const std::string &, format); - I_Method0(const std::string &, getFormat); - I_Method1(void, setCoordinateSystem, IN, const std::string &, cs); - I_Method0(const std::string &, getCoordinateSystem); - I_Method1(void, setEllipsoidModel, IN, osg::EllipsoidModel *, ellipsode); - I_Method0(osg::EllipsoidModel *, getEllipsoidModel); - I_Method0(const osg::EllipsoidModel *, getEllipsoidModel); - I_Method1(osg::CoordinateFrame, computeLocalCoordinateFrame, IN, const osg::Vec3d &, position); - I_Method1(osg::Vec3d, computeLocalUpVector, IN, const osg::Vec3d &, position); - I_WriteOnlyProperty(const osg::CoordinateSystemNode &, ); - I_Property(const std::string &, CoordinateSystem); - I_Property(osg::EllipsoidModel *, EllipsoidModel); - I_Property(const std::string &, Format); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::EllipsoidModel) - I_BaseType(osg::Object); - I_ConstructorWithDefaults2(IN, double, radiusEquator, osg::WGS_84_RADIUS_EQUATOR, IN, double, radiusPolar, osg::WGS_84_RADIUS_POLAR); - I_ConstructorWithDefaults2(IN, const osg::EllipsoidModel &, et, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, setRadiusEquator, IN, double, radius); - I_Method0(double, getRadiusEquator); - I_Method1(void, setRadiusPolar, IN, double, radius); - I_Method0(double, getRadiusPolar); - I_Method6(void, convertLatLongHeightToXYZ, IN, double, latitude, IN, double, longitude, IN, double, height, IN, double &, X, IN, double &, Y, IN, double &, Z); - I_Method6(void, convertXYZToLatLongHeight, IN, double, X, IN, double, Y, IN, double, Z, IN, double &, latitude, IN, double &, longitude, IN, double &, height); - I_Method4(void, computeLocalToWorldTransformFromLatLongHeight, IN, double, latitude, IN, double, longitude, IN, double, height, IN, osg::Matrixd &, localToWorld); - I_Method4(void, computeLocalToWorldTransformFromXYZ, IN, double, X, IN, double, Y, IN, double, Z, IN, osg::Matrixd &, localToWorld); - I_Method3(osg::Vec3d, computeLocalUpVector, IN, double, X, IN, double, Y, IN, double, Z); - I_Property(double, RadiusEquator); - I_Property(double, RadiusPolar); -END_REFLECTOR - TYPE_NAME_ALIAS(osg::Matrixd, osg::CoordinateFrame); diff --git a/src/osgWrappers/osg/CopyOp.cpp b/src/osgWrappers/osg/CopyOp.cpp index 58a4c0164..fa8d50d42 100644 --- a/src/osgWrappers/osg/CopyOp.cpp +++ b/src/osgWrappers/osg/CopyOp.cpp @@ -9,19 +9,7 @@ #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -49,7 +37,21 @@ BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) I_EnumLabel(osg::CopyOp::DEEP_COPY_ALL); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::CopyOp) - I_ConstructorWithDefaults1(IN, osg::CopyOp::CopyFlags, flags, osg::CopyOp::SHALLOW_COPY); +TYPE_NAME_ALIAS(unsigned int, osg::CopyOp::CopyFlags); + +BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) + I_EnumLabel(osg::CopyOp::SHALLOW_COPY); + I_EnumLabel(osg::CopyOp::DEEP_COPY_OBJECTS); + I_EnumLabel(osg::CopyOp::DEEP_COPY_NODES); + I_EnumLabel(osg::CopyOp::DEEP_COPY_DRAWABLES); + I_EnumLabel(osg::CopyOp::DEEP_COPY_STATESETS); + I_EnumLabel(osg::CopyOp::DEEP_COPY_STATEATTRIBUTES); + I_EnumLabel(osg::CopyOp::DEEP_COPY_TEXTURES); + I_EnumLabel(osg::CopyOp::DEEP_COPY_IMAGES); + I_EnumLabel(osg::CopyOp::DEEP_COPY_ARRAYS); + I_EnumLabel(osg::CopyOp::DEEP_COPY_PRIMITIVES); + I_EnumLabel(osg::CopyOp::DEEP_COPY_SHAPES); + I_EnumLabel(osg::CopyOp::DEEP_COPY_UNIFORMS); + I_EnumLabel(osg::CopyOp::DEEP_COPY_ALL); END_REFLECTOR diff --git a/src/osgWrappers/osg/CullFace.cpp b/src/osgWrappers/osg/CullFace.cpp index 03b48af48..12c8598a3 100644 --- a/src/osgWrappers/osg/CullFace.cpp +++ b/src/osgWrappers/osg/CullFace.cpp @@ -9,11 +9,7 @@ #include #include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -29,22 +25,9 @@ BEGIN_ENUM_REFLECTOR(osg::CullFace::Mode) I_EnumLabel(osg::CullFace::FRONT_AND_BACK); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::CullFace) - I_BaseType(osg::StateAttribute); - I_ConstructorWithDefaults1(IN, osg::CullFace::Mode, mode, osg::CullFace::BACK); - I_ConstructorWithDefaults2(IN, const osg::CullFace &, cf, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(void, setMode, IN, osg::CullFace::Mode, mode); - I_Method0(osg::CullFace::Mode, getMode); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(osg::CullFace::Mode, Mode); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); +BEGIN_ENUM_REFLECTOR(osg::CullFace::Mode) + I_EnumLabel(osg::CullFace::FRONT); + I_EnumLabel(osg::CullFace::BACK); + I_EnumLabel(osg::CullFace::FRONT_AND_BACK); END_REFLECTOR diff --git a/src/osgWrappers/osg/CullSettings.cpp b/src/osgWrappers/osg/CullSettings.cpp index a403c25e4..c51df3ad8 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -9,11 +9,7 @@ #include #include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -62,66 +58,42 @@ BEGIN_ENUM_REFLECTOR(osg::CullSettings::CullingModeValues) I_EnumLabel(osg::CullSettings::ENABLE_ALL_CULLING); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::CullSettings) - I_Constructor0(); - I_Constructor1(IN, osg::ArgumentParser &, arguments); - I_Constructor1(IN, const osg::CullSettings &, cs); - I_Method0(void, setDefaults); - I_Method1(void, setInheritanceMask, IN, unsigned int, mask); - I_Method0(unsigned int, getInheritanceMask); - I_Method1(void, setCullSettings, IN, const osg::CullSettings &, settings); - I_Method1(void, inheritCullSettings, IN, const osg::CullSettings &, settings); - I_Method2(void, inheritCullSettings, IN, const osg::CullSettings &, settings, IN, unsigned int, inheritanceMask); - I_Method0(void, readEnvironmentalVariables); - I_Method1(void, readCommandLine, IN, osg::ArgumentParser &, arguments); - I_Method1(void, setImpostorsActive, IN, bool, active); - I_Method0(bool, getImpostorsActive); - I_Method1(void, setImpostorPixelErrorThreshold, IN, float, numPixels); - I_Method0(float, getImpostorPixelErrorThreshold); - I_Method1(void, setDepthSortImpostorSprites, IN, bool, doDepthSort); - I_Method0(bool, getDepthSortImpostorSprites); - I_Method1(void, setNumberOfFrameToKeepImpostorSprites, IN, int, numFrames); - I_Method0(int, getNumberOfFrameToKeepImpostorSprites); - I_Method1(void, setComputeNearFarMode, IN, osg::CullSettings::ComputeNearFarMode, cnfm); - I_Method0(osg::CullSettings::ComputeNearFarMode, getComputeNearFarMode); - I_Method1(void, setNearFarRatio, IN, double, ratio); - I_Method0(double, getNearFarRatio); - I_Method1(void, setCullingMode, IN, osg::CullSettings::CullingMode, mode); - I_Method0(osg::CullSettings::CullingMode, getCullingMode); - I_Method1(void, setCullMask, IN, osg::Node::NodeMask, nm); - I_Method0(osg::Node::NodeMask, getCullMask); - I_Method1(void, setCullMaskLeft, IN, osg::Node::NodeMask, nm); - I_Method0(osg::Node::NodeMask, getCullMaskLeft); - I_Method1(void, setCullMaskRight, IN, osg::Node::NodeMask, nm); - I_Method0(osg::Node::NodeMask, getCullMaskRight); - I_Method1(void, setLODScale, IN, float, bias); - I_Method0(float, getLODScale); - I_Method1(void, setSmallFeatureCullingPixelSize, IN, float, value); - I_Method0(float, getSmallFeatureCullingPixelSize); - I_Method1(void, setClampProjectionMatrixCallback, IN, osg::CullSettings::ClampProjectionMatrixCallback *, cpmc); - I_Method0(osg::CullSettings::ClampProjectionMatrixCallback *, getClampProjectionMatrixCallback); - I_Method0(const osg::CullSettings::ClampProjectionMatrixCallback *, getClampProjectionMatrixCallback); - I_Property(osg::CullSettings::ClampProjectionMatrixCallback *, ClampProjectionMatrixCallback); - I_Property(osg::CullSettings::ComputeNearFarMode, ComputeNearFarMode); - I_Property(osg::Node::NodeMask, CullMask); - I_Property(osg::Node::NodeMask, CullMaskLeft); - I_Property(osg::Node::NodeMask, CullMaskRight); - I_WriteOnlyProperty(const osg::CullSettings &, CullSettings); - I_Property(osg::CullSettings::CullingMode, CullingMode); - I_Property(bool, DepthSortImpostorSprites); - I_Property(float, ImpostorPixelErrorThreshold); - I_Property(bool, ImpostorsActive); - I_Property(unsigned int, InheritanceMask); - I_Property(float, LODScale); - I_Property(double, NearFarRatio); - I_Property(int, NumberOfFrameToKeepImpostorSprites); - I_Property(float, SmallFeatureCullingPixelSize); +TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode); + +BEGIN_ENUM_REFLECTOR(osg::CullSettings::VariablesMask) + I_EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_MODE); + I_EnumLabel(osg::CullSettings::CULLING_MODE); + I_EnumLabel(osg::CullSettings::LOD_SCALE); + I_EnumLabel(osg::CullSettings::SMALL_FEATURE_CULLING_PIXEL_SIZE); + I_EnumLabel(osg::CullSettings::CLAMP_PROJECTION_MATRIX_CALLBACK); + I_EnumLabel(osg::CullSettings::NEAR_FAR_RATIO); + I_EnumLabel(osg::CullSettings::IMPOSTOR_ACTIVE); + I_EnumLabel(osg::CullSettings::DEPTH_SORT_IMPOSTOR_SPRITES); + I_EnumLabel(osg::CullSettings::IMPOSTOR_PIXEL_ERROR_THRESHOLD); + I_EnumLabel(osg::CullSettings::NUM_FRAMES_TO_KEEP_IMPOSTORS_SPRITES); + I_EnumLabel(osg::CullSettings::CULL_MASK); + I_EnumLabel(osg::CullSettings::CULL_MASK_LEFT); + I_EnumLabel(osg::CullSettings::CULL_MASK_RIGHT); + I_EnumLabel(osg::CullSettings::NO_VARIABLES); + I_EnumLabel(osg::CullSettings::ALL_VARIABLES); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CullSettings::ClampProjectionMatrixCallback) - I_BaseType(osg::Referenced); - I_Constructor0(); - I_Method3(bool, clampProjectionMatrixImplementation, IN, osg::Matrixf &, projection, IN, double &, znear, IN, double &, zfar); - I_Method3(bool, clampProjectionMatrixImplementation, IN, osg::Matrixd &, projection, IN, double &, znear, IN, double &, zfar); +BEGIN_ENUM_REFLECTOR(osg::CullSettings::ComputeNearFarMode) + I_EnumLabel(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR); + I_EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES); + I_EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_USING_PRIMITIVES); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::CullSettings::CullingModeValues) + I_EnumLabel(osg::CullSettings::NO_CULLING); + I_EnumLabel(osg::CullSettings::VIEW_FRUSTUM_SIDES_CULLING); + I_EnumLabel(osg::CullSettings::NEAR_PLANE_CULLING); + I_EnumLabel(osg::CullSettings::FAR_PLANE_CULLING); + I_EnumLabel(osg::CullSettings::VIEW_FRUSTUM_CULLING); + I_EnumLabel(osg::CullSettings::SMALL_FEATURE_CULLING); + I_EnumLabel(osg::CullSettings::SHADOW_OCCLUSION_CULLING); + I_EnumLabel(osg::CullSettings::CLUSTER_CULLING); + I_EnumLabel(osg::CullSettings::DEFAULT_CULLING); + I_EnumLabel(osg::CullSettings::ENABLE_ALL_CULLING); END_REFLECTOR diff --git a/src/osgWrappers/osg/CullStack.cpp b/src/osgWrappers/osg/CullStack.cpp index 598b6be9c..3bc8de4d9 100644 --- a/src/osgWrappers/osg/CullStack.cpp +++ b/src/osgWrappers/osg/CullStack.cpp @@ -9,15 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -31,6 +23,10 @@ TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullStack::Occlud TYPE_NAME_ALIAS(std::vector< osg::CullingSet >, osg::CullStack::CullingStack); +TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullStack::OccluderList); + +TYPE_NAME_ALIAS(std::vector< osg::CullingSet >, osg::CullStack::CullingStack); + STD_VECTOR_REFLECTOR(std::vector< osg::CullingSet >); STD_VECTOR_REFLECTOR(std::vector< osg::ShadowVolumeOccluder >); diff --git a/src/osgWrappers/osg/CullingSet.cpp b/src/osgWrappers/osg/CullingSet.cpp index ecb18d1fe..f933aed45 100644 --- a/src/osgWrappers/osg/CullingSet.cpp +++ b/src/osgWrappers/osg/CullingSet.cpp @@ -9,16 +9,8 @@ #include #include -#include -#include #include -#include -#include -#include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -48,48 +40,34 @@ BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues) I_EnumLabel(osg::CullingSet::ENABLE_ALL_CULLING); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::CullingSet) - I_BaseType(osg::Referenced); - I_Constructor0(); - I_Constructor1(IN, const osg::CullingSet &, cs); - I_Constructor3(IN, const osg::CullingSet &, cs, IN, const osg::Matrix &, matrix, IN, const osg::Vec4 &, pixelSizeVector); - I_Method1(void, set, IN, const osg::CullingSet &, cs); - I_Method3(void, set, IN, const osg::CullingSet &, cs, IN, const osg::Matrix &, matrix, IN, const osg::Vec4 &, pixelSizeVector); - I_Method1(void, setCullingMask, IN, osg::CullingSet::Mask, mask); - I_Method0(osg::CullingSet::Mask, getCullingMask); - I_Method1(void, setFrustum, IN, osg::Polytope &, cv); - I_Method0(osg::Polytope &, getFrustum); - I_Method0(const osg::Polytope &, getFrustum); - I_Method2(void, addStateFrustum, IN, osg::StateSet *, stateset, IN, osg::Polytope &, polytope); - I_Method1(void, getStateFrustumList, IN, osg::CullingSet::StateFrustumList &, sfl); - I_Method0(osg::CullingSet::StateFrustumList &, getStateFrustumList); - I_Method1(void, addOccluder, IN, osg::ShadowVolumeOccluder &, cv); - I_Method1(void, setPixelSizeVector, IN, const osg::Vec4 &, v); - I_Method0(osg::Vec4 &, getPixelSizeVector); - I_Method0(const osg::Vec4 &, getPixelSizeVector); - I_Method1(void, setSmallFeatureCullingPixelSize, IN, float, value); - I_Method0(float &, getSmallFeatureCullingPixelSize); - I_Method0(float, getSmallFeatureCullingPixelSize); - I_Method2(float, pixelSize, IN, const osg::Vec3 &, v, IN, float, radius); - I_Method1(float, pixelSize, IN, const osg::BoundingSphere &, bs); - I_Method2(float, clampedPixelSize, IN, const osg::Vec3 &, v, IN, float, radius); - I_Method1(float, clampedPixelSize, IN, const osg::BoundingSphere &, bs); - I_Method1(bool, isCulled, IN, const std::vector< osg::Vec3 > &, vertices); - I_Method1(bool, isCulled, IN, const osg::BoundingBox &, bb); - I_Method1(bool, isCulled, IN, const osg::BoundingSphere &, bs); - I_Method0(void, pushCurrentMask); - I_Method0(void, popCurrentMask); - I_Method1(void, disableAndPushOccludersCurrentMask, IN, osg::NodePath &, nodePath); - I_Method1(void, popOccludersCurrentMask, IN, osg::NodePath &, nodePath); - I_WriteOnlyProperty(const osg::CullingSet &, ); - I_Property(osg::CullingSet::Mask, CullingMask); - I_Property(osg::Polytope &, Frustum); - I_Property(const osg::Vec4 &, PixelSizeVector); - I_Property(float, SmallFeatureCullingPixelSize); - I_ReadOnlyProperty(osg::CullingSet::StateFrustumList &, StateFrustumList); +TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateSet > COMMA osg::Polytope >, osg::CullingSet::StateFrustumPair); + +TYPE_NAME_ALIAS(std::vector< osg::CullingSet::StateFrustumPair >, osg::CullingSet::StateFrustumList); + +TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullingSet::OccluderList); + +TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask); + +BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues) + I_EnumLabel(osg::CullingSet::NO_CULLING); + I_EnumLabel(osg::CullingSet::VIEW_FRUSTUM_SIDES_CULLING); + I_EnumLabel(osg::CullingSet::NEAR_PLANE_CULLING); + I_EnumLabel(osg::CullingSet::FAR_PLANE_CULLING); + I_EnumLabel(osg::CullingSet::VIEW_FRUSTUM_CULLING); + I_EnumLabel(osg::CullingSet::SMALL_FEATURE_CULLING); + I_EnumLabel(osg::CullingSet::SHADOW_OCCLUSION_CULLING); + I_EnumLabel(osg::CullingSet::DEFAULT_CULLING); + I_EnumLabel(osg::CullingSet::ENABLE_ALL_CULLING); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::StateSet >) + I_Constructor0(); + I_Constructor1(IN, osg::StateSet *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::StateSet > &, rp); + I_Method0(osg::StateSet *, get); + I_Method0(bool, valid); + I_Method0(osg::StateSet *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::StateSet > &, rp); I_Constructor0(); I_Constructor1(IN, osg::StateSet *, ptr); I_Constructor1(IN, const osg::ref_ptr< osg::StateSet > &, rp); diff --git a/src/osgWrappers/osg/Depth.cpp b/src/osgWrappers/osg/Depth.cpp index 031368db4..4d925f721 100644 --- a/src/osgWrappers/osg/Depth.cpp +++ b/src/osgWrappers/osg/Depth.cpp @@ -9,11 +9,7 @@ #include #include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -34,32 +30,14 @@ BEGIN_ENUM_REFLECTOR(osg::Depth::Function) I_EnumLabel(osg::Depth::ALWAYS); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Depth) - I_BaseType(osg::StateAttribute); - I_ConstructorWithDefaults4(IN, osg::Depth::Function, func, osg::Depth::LESS, IN, double, zNear, 0.0, IN, double, zFar, 1.0, IN, bool, writeMask, true); - I_ConstructorWithDefaults2(IN, const osg::Depth &, dp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(void, setFunction, IN, osg::Depth::Function, func); - I_Method0(osg::Depth::Function, getFunction); - I_Method2(void, setRange, IN, double, zNear, IN, double, zFar); - I_Method1(void, setZNear, IN, double, zNear); - I_Method0(double, getZNear); - I_Method1(void, setZFar, IN, double, zFar); - I_Method0(double, getZFar); - I_Method1(void, setWriteMask, IN, bool, mask); - I_Method0(bool, getWriteMask); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(osg::Depth::Function, Function); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); - I_Property(bool, WriteMask); - I_Property(double, ZFar); - I_Property(double, ZNear); +BEGIN_ENUM_REFLECTOR(osg::Depth::Function) + I_EnumLabel(osg::Depth::NEVER); + I_EnumLabel(osg::Depth::LESS); + I_EnumLabel(osg::Depth::EQUAL); + I_EnumLabel(osg::Depth::LEQUAL); + I_EnumLabel(osg::Depth::GREATER); + I_EnumLabel(osg::Depth::NOTEQUAL); + I_EnumLabel(osg::Depth::GEQUAL); + I_EnumLabel(osg::Depth::ALWAYS); END_REFLECTOR diff --git a/src/osgWrappers/osg/DisplaySettings.cpp b/src/osgWrappers/osg/DisplaySettings.cpp index 462d9a434..4f0be5b37 100644 --- a/src/osgWrappers/osg/DisplaySettings.cpp +++ b/src/osgWrappers/osg/DisplaySettings.cpp @@ -9,7 +9,6 @@ #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -48,90 +47,31 @@ BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::SplitStereoVerticalEyeMapping) I_EnumLabel(osg::DisplaySettings::LEFT_EYE_BOTTOM_VIEWPORT); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) - I_BaseType(osg::Referenced); - I_Constructor0(); - I_Constructor1(IN, osg::ArgumentParser &, arguments); - I_Constructor1(IN, const osg::DisplaySettings &, vs); - I_Method1(void, setDisplaySettings, IN, const osg::DisplaySettings &, vs); - I_Method1(void, merge, IN, const osg::DisplaySettings &, vs); - I_Method0(void, setDefaults); - I_Method0(void, readEnvironmentalVariables); - I_Method1(void, readCommandLine, IN, osg::ArgumentParser &, arguments); - I_Method1(void, setDisplayType, IN, osg::DisplaySettings::DisplayType, type); - I_Method0(osg::DisplaySettings::DisplayType, getDisplayType); - I_Method1(void, setStereo, IN, bool, on); - I_Method0(bool, getStereo); - I_Method1(void, setStereoMode, IN, osg::DisplaySettings::StereoMode, mode); - I_Method0(osg::DisplaySettings::StereoMode, getStereoMode); - I_Method1(void, setEyeSeparation, IN, float, eyeSeparation); - I_Method0(float, getEyeSeparation); - I_Method1(void, setSplitStereoHorizontalEyeMapping, IN, osg::DisplaySettings::SplitStereoHorizontalEyeMapping, m); - I_Method0(osg::DisplaySettings::SplitStereoHorizontalEyeMapping, getSplitStereoHorizontalEyeMapping); - I_Method1(void, setSplitStereoHorizontalSeparation, IN, int, s); - I_Method0(int, getSplitStereoHorizontalSeparation); - I_Method1(void, setSplitStereoVerticalEyeMapping, IN, osg::DisplaySettings::SplitStereoVerticalEyeMapping, m); - I_Method0(osg::DisplaySettings::SplitStereoVerticalEyeMapping, getSplitStereoVerticalEyeMapping); - I_Method1(void, setSplitStereoVerticalSeparation, IN, int, s); - I_Method0(int, getSplitStereoVerticalSeparation); - I_Method1(void, setSplitStereoAutoAjustAspectRatio, IN, bool, flag); - I_Method0(bool, getSplitStereoAutoAjustAspectRatio); - I_Method1(void, setScreenWidth, IN, float, width); - I_Method0(float, getScreenWidth); - I_Method1(void, setScreenHeight, IN, float, height); - I_Method0(float, getScreenHeight); - I_Method1(void, setScreenDistance, IN, float, distance); - I_Method0(float, getScreenDistance); - I_Method1(void, setDoubleBuffer, IN, bool, flag); - I_Method0(bool, getDoubleBuffer); - I_Method1(void, setRGB, IN, bool, flag); - I_Method0(bool, getRGB); - I_Method1(void, setDepthBuffer, IN, bool, flag); - I_Method0(bool, getDepthBuffer); - I_Method1(void, setMinimumNumAlphaBits, IN, unsigned int, bits); - I_Method0(unsigned int, getMinimumNumAlphaBits); - I_Method0(bool, getAlphaBuffer); - I_Method1(void, setMinimumNumStencilBits, IN, unsigned int, bits); - I_Method0(unsigned int, getMinimumNumStencilBits); - I_Method0(bool, getStencilBuffer); - I_Method4(void, setMinimumNumAccumBits, IN, unsigned int, red, IN, unsigned int, green, IN, unsigned int, blue, IN, unsigned int, alpha); - I_Method0(unsigned int, getMinimumNumAccumRedBits); - I_Method0(unsigned int, getMinimumNumAccumGreenBits); - I_Method0(unsigned int, getMinimumNumAccumBlueBits); - I_Method0(unsigned int, getMinimumNumAccumAlphaBits); - I_Method0(bool, getAccumBuffer); - I_Method1(void, setMaxNumberOfGraphicsContexts, IN, unsigned int, num); - I_Method0(unsigned int, getMaxNumberOfGraphicsContexts); - I_Method1(void, setNumMultiSamples, IN, unsigned int, samples); - I_Method0(unsigned int, getNumMultiSamples); - I_Method0(bool, getMultiSamples); - I_ReadOnlyProperty(bool, AccumBuffer); - I_ReadOnlyProperty(bool, AlphaBuffer); - I_Property(bool, DepthBuffer); - I_WriteOnlyProperty(const osg::DisplaySettings &, DisplaySettings); - I_Property(osg::DisplaySettings::DisplayType, DisplayType); - I_Property(bool, DoubleBuffer); - I_Property(float, EyeSeparation); - I_Property(unsigned int, MaxNumberOfGraphicsContexts); - I_ReadOnlyProperty(unsigned int, MinimumNumAccumAlphaBits); - I_ReadOnlyProperty(unsigned int, MinimumNumAccumBlueBits); - I_ReadOnlyProperty(unsigned int, MinimumNumAccumGreenBits); - I_ReadOnlyProperty(unsigned int, MinimumNumAccumRedBits); - I_Property(unsigned int, MinimumNumAlphaBits); - I_Property(unsigned int, MinimumNumStencilBits); - I_ReadOnlyProperty(bool, MultiSamples); - I_WriteOnlyProperty(unsigned int, NumMultiSamples); - I_Property(bool, RGB); - I_Property(float, ScreenDistance); - I_Property(float, ScreenHeight); - I_Property(float, ScreenWidth); - I_Property(bool, SplitStereoAutoAjustAspectRatio); - I_Property(osg::DisplaySettings::SplitStereoHorizontalEyeMapping, SplitStereoHorizontalEyeMapping); - I_Property(int, SplitStereoHorizontalSeparation); - I_Property(osg::DisplaySettings::SplitStereoVerticalEyeMapping, SplitStereoVerticalEyeMapping); - I_Property(int, SplitStereoVerticalSeparation); - I_ReadOnlyProperty(bool, StencilBuffer); - I_Property(bool, Stereo); - I_Property(osg::DisplaySettings::StereoMode, StereoMode); +BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::DisplayType) + I_EnumLabel(osg::DisplaySettings::MONITOR); + I_EnumLabel(osg::DisplaySettings::POWERWALL); + I_EnumLabel(osg::DisplaySettings::REALITY_CENTER); + I_EnumLabel(osg::DisplaySettings::HEAD_MOUNTED_DISPLAY); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::StereoMode) + I_EnumLabel(osg::DisplaySettings::QUAD_BUFFER); + I_EnumLabel(osg::DisplaySettings::ANAGLYPHIC); + I_EnumLabel(osg::DisplaySettings::HORIZONTAL_SPLIT); + I_EnumLabel(osg::DisplaySettings::VERTICAL_SPLIT); + I_EnumLabel(osg::DisplaySettings::LEFT_EYE); + I_EnumLabel(osg::DisplaySettings::RIGHT_EYE); + I_EnumLabel(osg::DisplaySettings::HORIZONTAL_INTERLACE); + I_EnumLabel(osg::DisplaySettings::VERTICAL_INTERLACE); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::SplitStereoHorizontalEyeMapping) + I_EnumLabel(osg::DisplaySettings::LEFT_EYE_LEFT_VIEWPORT); + I_EnumLabel(osg::DisplaySettings::LEFT_EYE_RIGHT_VIEWPORT); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::SplitStereoVerticalEyeMapping) + I_EnumLabel(osg::DisplaySettings::LEFT_EYE_TOP_VIEWPORT); + I_EnumLabel(osg::DisplaySettings::LEFT_EYE_BOTTOM_VIEWPORT); END_REFLECTOR diff --git a/src/osgWrappers/osg/DrawPixels.cpp b/src/osgWrappers/osg/DrawPixels.cpp index 8ef20bc0f..2e8642919 100644 --- a/src/osgWrappers/osg/DrawPixels.cpp +++ b/src/osgWrappers/osg/DrawPixels.cpp @@ -9,13 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -25,29 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::DrawPixels) - I_BaseType(osg::Drawable); +BEGIN_VALUE_REFLECTOR(osg::DrawPixels) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::DrawPixels) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::DrawPixels &, drawimage, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, setPosition, IN, const osg::Vec3 &, position); - I_Method0(osg::Vec3 &, getPosition); - I_Method0(const osg::Vec3 &, getPosition); - I_Method1(void, setImage, IN, osg::Image *, image); - I_Method0(osg::Image *, getImage); - I_Method0(const osg::Image *, getImage); - I_Method1(void, setUseSubImage, IN, bool, useSubImage); - I_Method0(bool, getUseSubImage); - I_Method4(void, setSubImageDimensions, IN, unsigned int, offsetX, IN, unsigned int, offsetY, IN, unsigned int, width, IN, unsigned int, height); - I_Method4(void, getSubImageDimensions, IN, unsigned int &, offsetX, IN, unsigned int &, offsetY, IN, unsigned int &, width, IN, unsigned int &, height); - I_Method1(void, drawImplementation, IN, osg::State &, state); - I_Method0(osg::BoundingBox, computeBound); - I_Property(osg::Image *, Image); - I_Property(const osg::Vec3 &, Position); - I_Property(bool, UseSubImage); END_REFLECTOR diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index eac971ba1..df1d1c7d1 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -9,21 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -57,242 +43,36 @@ BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes) I_EnumLabel(osg::Drawable::TEXTURE_COORDS_7); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) - I_BaseType(osg::Object); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Drawable &, drawable, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::Geometry *, asGeometry); - I_Method0(const osg::Geometry *, asGeometry); - I_Method0(const osg::Drawable::ParentList &, getParents); - I_Method0(osg::Drawable::ParentList, getParents); - I_Method1(osg::Node *, getParent, IN, unsigned int, i); - I_Method1(const osg::Node *, getParent, IN, unsigned int, i); - I_Method0(unsigned int, getNumParents); - I_Method1(void, setStateSet, IN, osg::StateSet *, stateset); - I_Method0(osg::StateSet *, getStateSet); - I_Method0(const osg::StateSet *, getStateSet); - I_Method0(osg::StateSet *, getOrCreateStateSet); - I_Method1(void, setInitialBound, IN, const osg::BoundingBox &, bbox); - I_Method0(const osg::BoundingBox &, getInitialBound); - I_Method0(void, dirtyBound); - I_Method0(const osg::BoundingBox &, getBound); - I_Method0(osg::BoundingBox, computeBound); - I_Method1(void, setComputeBoundingBoxCallback, IN, osg::Drawable::ComputeBoundingBoxCallback *, callback); - I_Method0(osg::Drawable::ComputeBoundingBoxCallback *, getComputeBoundingBoxCallback); - I_Method0(const osg::Drawable::ComputeBoundingBoxCallback *, getComputeBoundingBoxCallback); - I_Method1(void, setShape, IN, osg::Shape *, shape); - I_Method0(osg::Shape *, getShape); - I_Method0(const osg::Shape *, getShape); - I_Method1(void, setSupportsDisplayList, IN, bool, flag); - I_Method0(bool, getSupportsDisplayList); - I_Method1(void, setUseDisplayList, IN, bool, flag); - I_Method0(bool, getUseDisplayList); - I_Method1(GLuint &, getDisplayList, IN, unsigned int, contextID); - I_Method1(void, setUseVertexBufferObjects, IN, bool, flag); - I_Method0(bool, getUseVertexBufferObjects); - I_Method0(void, dirtyDisplayList); - I_Method0(unsigned int, getGLObjectSizeHint); - I_Method1(void, draw, IN, osg::State &, state); - I_Method1(void, compileGLObjects, IN, osg::State &, state); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - I_Method1(void, setUpdateCallback, IN, osg::Drawable::UpdateCallback *, ac); - I_Method0(osg::Drawable::UpdateCallback *, getUpdateCallback); - I_Method0(const osg::Drawable::UpdateCallback *, getUpdateCallback); - I_Method0(bool, requiresUpdateTraversal); - I_Method1(void, setEventCallback, IN, osg::Drawable::EventCallback *, ac); - I_Method0(osg::Drawable::EventCallback *, getEventCallback); - I_Method0(const osg::Drawable::EventCallback *, getEventCallback); - I_Method0(bool, requiresEventTraversal); - I_Method1(void, setCullCallback, IN, osg::Drawable::CullCallback *, cc); - I_Method0(osg::Drawable::CullCallback *, getCullCallback); - I_Method0(const osg::Drawable::CullCallback *, getCullCallback); - I_Method1(void, setDrawCallback, IN, osg::Drawable::DrawCallback *, dc); - I_Method0(osg::Drawable::DrawCallback *, getDrawCallback); - I_Method0(const osg::Drawable::DrawCallback *, getDrawCallback); - I_Method1(void, drawImplementation, IN, osg::State &, state); - I_Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); - I_Method1(void, accept, IN, osg::Drawable::AttributeFunctor &, x); - I_Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); - I_Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, x); - I_Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); - 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_ReadOnlyProperty(const osg::BoundingBox &, Bound); - I_Property(osg::Drawable::ComputeBoundingBoxCallback *, ComputeBoundingBoxCallback); - I_Property(osg::Drawable::CullCallback *, CullCallback); - I_Property(osg::Drawable::DrawCallback *, DrawCallback); - I_Property(osg::Drawable::EventCallback *, EventCallback); - I_ReadOnlyProperty(unsigned int, GLObjectSizeHint); - I_Property(const osg::BoundingBox &, InitialBound); - I_ArrayProperty_G(osg::Node *, Parent, Parents, unsigned int, void); - I_ReadOnlyProperty(osg::Drawable::ParentList, Parents); - I_Property(osg::Shape *, Shape); - I_Property(osg::StateSet *, StateSet); - I_Property(bool, SupportsDisplayList); - I_Property(osg::Drawable::UpdateCallback *, UpdateCallback); - I_Property(bool, UseDisplayList); - I_Property(bool, UseVertexBufferObjects); +TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::Drawable::ParentList); + +TYPE_NAME_ALIAS(unsigned int, osg::Drawable::AttributeType); + +BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes) + I_EnumLabel(osg::Drawable::VERTICES); + I_EnumLabel(osg::Drawable::WEIGHTS); + I_EnumLabel(osg::Drawable::NORMALS); + I_EnumLabel(osg::Drawable::COLORS); + I_EnumLabel(osg::Drawable::SECONDARY_COLORS); + I_EnumLabel(osg::Drawable::FOG_COORDS); + I_EnumLabel(osg::Drawable::ATTRIBUTE_6); + I_EnumLabel(osg::Drawable::ATTRIBUTE_7); + I_EnumLabel(osg::Drawable::TEXTURE_COORDS); + I_EnumLabel(osg::Drawable::TEXTURE_COORDS_0); + I_EnumLabel(osg::Drawable::TEXTURE_COORDS_1); + I_EnumLabel(osg::Drawable::TEXTURE_COORDS_2); + I_EnumLabel(osg::Drawable::TEXTURE_COORDS_3); + I_EnumLabel(osg::Drawable::TEXTURE_COORDS_4); + I_EnumLabel(osg::Drawable::TEXTURE_COORDS_5); + I_EnumLabel(osg::Drawable::TEXTURE_COORDS_6); + I_EnumLabel(osg::Drawable::TEXTURE_COORDS_7); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::Drawable::AttributeFunctor) +BEGIN_VALUE_REFLECTOR(osg::Drawable::CullCallback) I_Constructor0(); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLbyte *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLshort *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLint *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLubyte *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLushort *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLuint *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, float *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec2 *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec3 *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec4 *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec4ub *, x); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) - I_BaseType(osg::Object); +BEGIN_VALUE_REFLECTOR(osg::Drawable::CullCallback) I_Constructor0(); - I_Constructor2(IN, const osg::Drawable::ComputeBoundingBoxCallback &, x, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(osg::BoundingBox, computeBound, IN, const osg::Drawable &, x); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::Drawable::ConstAttributeFunctor) - I_Constructor0(); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLbyte *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLshort *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLint *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLubyte *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLushort *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLuint *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const float *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec2 *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec3 *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec4 *, x); - I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec4ub *, x); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Drawable::CullCallback) - I_VirtualBaseType(osg::Object); - I_Constructor0(); - I_Constructor2(IN, const osg::Drawable::CullCallback &, x, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method3(bool, cull, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, x, IN, osg::State *, x); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Drawable::DrawCallback) - I_VirtualBaseType(osg::Object); - I_Constructor0(); - I_Constructor2(IN, const osg::Drawable::DrawCallback &, x, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method2(void, drawImplementation, IN, osg::State &, x, IN, const osg::Drawable *, x); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Drawable::EventCallback) - I_VirtualBaseType(osg::Object); - I_Constructor0(); - I_Constructor2(IN, const osg::Drawable::EventCallback &, x, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method2(void, event, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, x); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions) - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID); - I_Constructor1(IN, const osg::Drawable::Extensions &, rhs); - I_Method1(void, lowestCommonDenominator, IN, const osg::Drawable::Extensions &, rhs); - I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); - I_Method1(void, setVertexProgramSupported, IN, bool, flag); - I_Method0(bool, isVertexProgramSupported); - I_Method1(void, setSecondaryColorSupported, IN, bool, flag); - I_Method0(bool, isSecondaryColorSupported); - I_Method1(void, setFogCoordSupported, IN, bool, flag); - I_Method0(bool, isFogCoordSupported); - I_Method1(void, setMultiTexSupported, IN, bool, flag); - I_Method0(bool, isMultiTexSupported); - I_Method1(void, setOcclusionQuerySupported, IN, bool, flag); - I_Method0(bool, isOcclusionQuerySupported); - I_Method1(void, setARBOcclusionQuerySupported, IN, bool, flag); - I_Method0(bool, isARBOcclusionQuerySupported); - I_Method1(void, glSecondaryColor3ubv, IN, const GLubyte *, coord); - I_Method1(void, glSecondaryColor3fv, IN, const GLfloat *, coord); - I_Method1(void, glFogCoordfv, IN, const GLfloat *, coord); - I_Method2(void, glMultiTexCoord1f, IN, GLenum, target, IN, GLfloat, coord); - I_Method2(void, glMultiTexCoord2fv, IN, GLenum, target, IN, const GLfloat *, coord); - I_Method2(void, glMultiTexCoord3fv, IN, GLenum, target, IN, const GLfloat *, coord); - I_Method2(void, glMultiTexCoord4fv, IN, GLenum, target, IN, const GLfloat *, coord); - I_Method2(void, glVertexAttrib1s, IN, unsigned int, index, IN, GLshort, s); - I_Method2(void, glVertexAttrib1f, IN, unsigned int, index, IN, GLfloat, f); - I_Method2(void, glVertexAttrib2fv, IN, unsigned int, index, IN, const GLfloat *, v); - I_Method2(void, glVertexAttrib3fv, IN, unsigned int, index, IN, const GLfloat *, v); - I_Method2(void, glVertexAttrib4fv, IN, unsigned int, index, IN, const GLfloat *, v); - I_Method2(void, glVertexAttrib4ubv, IN, unsigned int, index, IN, const GLubyte *, v); - I_Method2(void, glVertexAttrib4Nubv, IN, unsigned int, index, IN, const GLubyte *, v); - I_Method2(void, glGenBuffers, IN, GLsizei, n, IN, GLuint *, buffers); - I_Method2(void, glBindBuffer, IN, GLenum, target, IN, GLuint, buffer); - I_Method4(void, glBufferData, IN, GLenum, target, IN, GLsizeiptrARB, size, IN, const GLvoid *, data, IN, GLenum, usage); - I_Method4(void, glBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, const GLvoid *, data); - I_Method2(void, glDeleteBuffers, IN, GLsizei, n, IN, const GLuint *, buffers); - I_Method1(GLboolean, glIsBuffer, IN, GLuint, buffer); - I_Method4(void, glGetBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, GLvoid *, data); - I_Method2(GLvoid *, glMapBuffer, IN, GLenum, target, IN, GLenum, access); - I_Method1(GLboolean, glUnmapBuffer, IN, GLenum, target); - I_Method3(void, glGetBufferParameteriv, IN, GLenum, target, IN, GLenum, pname, IN, GLint *, params); - I_Method3(void, glGetBufferPointerv, IN, GLenum, target, IN, GLenum, pname, IN, GLvoid **, params); - I_Method2(void, glGenOcclusionQueries, IN, GLsizei, n, IN, GLuint *, ids); - I_Method2(void, glDeleteOcclusionQueries, IN, GLsizei, n, IN, const GLuint *, ids); - I_Method1(GLboolean, glIsOcclusionQuery, IN, GLuint, id); - I_Method1(void, glBeginOcclusionQuery, IN, GLuint, id); - I_Method0(void, glEndOcclusionQuery); - I_Method3(void, glGetOcclusionQueryiv, IN, GLuint, id, IN, GLenum, pname, IN, GLint *, params); - I_Method3(void, glGetOcclusionQueryuiv, IN, GLuint, id, IN, GLenum, pname, IN, GLuint *, params); - I_Method3(void, glGetQueryiv, IN, GLenum, target, IN, GLenum, pname, IN, GLint *, params); - I_Method2(void, glGenQueries, IN, GLsizei, n, IN, GLuint *, ids); - I_Method2(void, glBeginQuery, IN, GLenum, target, IN, GLuint, id); - I_Method1(void, glEndQuery, IN, GLenum, target); - I_Method1(GLboolean, glIsQuery, IN, GLuint, id); - I_Method2(void, glDeleteQueries, IN, GLsizei, n, IN, const GLuint *, ids); - I_Method3(void, glGetQueryObjectiv, IN, GLuint, id, IN, GLenum, pname, IN, GLint *, params); - I_Method3(void, glGetQueryObjectuiv, IN, GLuint, id, IN, GLenum, pname, IN, GLuint *, params); - I_WriteOnlyProperty(bool, ARBOcclusionQuerySupported); - I_WriteOnlyProperty(bool, FogCoordSupported); - I_WriteOnlyProperty(bool, MultiTexSupported); - I_WriteOnlyProperty(bool, OcclusionQuerySupported); - I_WriteOnlyProperty(bool, SecondaryColorSupported); - I_WriteOnlyProperty(bool, VertexProgramSupported); - I_WriteOnlyProperty(unsigned int, upGLExtenions); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Drawable::UpdateCallback) - I_VirtualBaseType(osg::Object); - I_Constructor0(); - I_Constructor2(IN, const osg::Drawable::UpdateCallback &, x, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method2(void, update, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, x); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::Node * >); diff --git a/src/osgWrappers/osg/Fog.cpp b/src/osgWrappers/osg/Fog.cpp index 11feef7fc..72244a1d9 100644 --- a/src/osgWrappers/osg/Fog.cpp +++ b/src/osgWrappers/osg/Fog.cpp @@ -9,12 +9,7 @@ #include #include -#include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -24,48 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::Fog::Mode) - I_EnumLabel(osg::Fog::LINEAR); - I_EnumLabel(osg::Fog::EXP); - I_EnumLabel(osg::Fog::EXP2); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::Fog::FogCoordinateSource) - I_EnumLabel(osg::Fog::FOG_COORDINATE); - I_EnumLabel(osg::Fog::FRAGMENT_DEPTH); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Fog) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::Fog) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Fog) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Fog &, fog, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(void, setMode, IN, osg::Fog::Mode, mode); - I_Method0(osg::Fog::Mode, getMode); - I_Method1(void, setDensity, IN, float, density); - I_Method0(float, getDensity); - I_Method1(void, setStart, IN, float, start); - I_Method0(float, getStart); - I_Method1(void, setEnd, IN, float, end); - I_Method0(float, getEnd); - I_Method1(void, setColor, IN, const osg::Vec4 &, color); - I_Method0(const osg::Vec4 &, getColor); - I_Method1(void, setFogCoordinateSource, IN, GLint, source); - I_Method0(GLint, getFogCoordinateSource); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(const osg::Vec4 &, Color); - I_Property(float, Density); - I_Property(float, End); - I_Property(GLint, FogCoordinateSource); - I_Property(osg::Fog::Mode, Mode); - I_Property(float, Start); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/FragmentProgram.cpp b/src/osgWrappers/osg/FragmentProgram.cpp index 8f0a46bd5..7cdfd6ff2 100644 --- a/src/osgWrappers/osg/FragmentProgram.cpp +++ b/src/osgWrappers/osg/FragmentProgram.cpp @@ -9,13 +9,7 @@ #include #include -#include #include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -25,62 +19,19 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::FragmentProgram::LocalParamList); - -TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::FragmentProgram::MatrixList); - -BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::FragmentProgram) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::FragmentProgram &, vp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(GLuint &, getFragmentProgramID, IN, unsigned int, contextID); - I_Method1(void, setFragmentProgram, IN, const char *, program); - I_Method1(void, setFragmentProgram, IN, const std::string &, program); - I_Method0(const std::string &, getFragmentProgram); - I_Method2(void, setProgramLocalParameter, IN, const GLuint, index, IN, const osg::Vec4 &, p); - I_Method1(void, setLocalParameters, IN, const osg::FragmentProgram::LocalParamList &, lpl); - I_Method0(osg::FragmentProgram::LocalParamList &, getLocalParameters); - I_Method0(const osg::FragmentProgram::LocalParamList &, getLocalParameters); - I_Method2(void, setMatrix, IN, const GLenum, mode, IN, const osg::Matrix &, matrix); - I_Method1(void, setMatrices, IN, const osg::FragmentProgram::MatrixList &, matrices); - I_Method0(osg::FragmentProgram::MatrixList &, getMatrices); - I_Method0(const osg::FragmentProgram::MatrixList &, getMatrices); - I_Method0(void, dirtyFragmentProgramObject); - 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_Property(const std::string &, FragmentProgram); - I_Property(const osg::FragmentProgram::LocalParamList &, LocalParameters); - I_Property(const osg::FragmentProgram::MatrixList &, Matrices); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram::Extensions) - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID); - I_Constructor1(IN, const osg::FragmentProgram::Extensions &, rhs); - I_Method1(void, lowestCommonDenominator, IN, const osg::FragmentProgram::Extensions &, rhs); - I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); - I_Method1(void, setFragmentProgramSupported, IN, bool, flag); - I_Method0(bool, isFragmentProgramSupported); - I_Method2(void, glBindProgram, IN, GLenum, target, IN, GLuint, id); - I_Method2(void, glGenPrograms, IN, GLsizei, n, IN, GLuint *, programs); - I_Method2(void, glDeletePrograms, IN, GLsizei, n, IN, GLuint *, programs); - I_Method4(void, glProgramString, IN, GLenum, target, IN, GLenum, format, IN, GLsizei, len, IN, const void *, string); - I_Method3(void, glProgramLocalParameter4fv, IN, GLenum, target, IN, GLuint, index, IN, const GLfloat *, params); - I_WriteOnlyProperty(bool, FragmentProgramSupported); - I_WriteOnlyProperty(unsigned int, upGLExtenions); +BEGIN_VALUE_REFLECTOR(osg::FragmentProgram) + I_Constructor0(); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::Matrix >); +BEGIN_VALUE_REFLECTOR(osg::FragmentProgram::Extensions) + I_Constructor0(); +END_REFLECTOR -STD_MAP_REFLECTOR(std::map< GLuint COMMA osg::Vec4 >); +BEGIN_VALUE_REFLECTOR(osg::FragmentProgram::Extensions) + I_Constructor0(); +END_REFLECTOR diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp index e8910deaa..908441571 100644 --- a/src/osgWrappers/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -9,17 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -29,98 +19,27 @@ #undef OUT #endif -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindRenderbufferEXT); +BEGIN_VALUE_REFLECTOR(osg::FBOExtensions) + I_Constructor0(); +END_REFLECTOR -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglDeleteRenderbuffersEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenRenderbuffersEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindFramebufferEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglDeleteFramebuffersEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenFramebuffersEXT); - -TYPE_NAME_ALIAS(GLenum , osg::FBOExtensions::TglCheckFramebufferStatusEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture1DEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture2DEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture3DEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferRenderbufferEXT); - -TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT); - -BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions) - I_BaseType(osg::Referenced); - I_Method0(bool, isSupported); +BEGIN_VALUE_REFLECTOR(osg::FBOExtensions) + I_Constructor0(); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) I_Constructor0(); - I_Constructor1(IN, const osg::FrameBufferAttachment &, copy); - I_Constructor1(IN, osg::RenderBuffer *, target); - I_ConstructorWithDefaults2(IN, osg::Texture1D *, target, , IN, int, level, 0); - I_ConstructorWithDefaults2(IN, osg::Texture2D *, target, , IN, int, level, 0); - I_ConstructorWithDefaults3(IN, osg::Texture3D *, target, , IN, int, zoffset, , IN, int, level, 0); - I_ConstructorWithDefaults3(IN, osg::TextureCubeMap *, target, , IN, int, face, , IN, int, level, 0); - I_Constructor1(IN, osg::TextureRectangle *, target); - I_Constructor1(IN, osg::CameraNode::Attachment &, attachment); - I_Method2(void, createRequiredTexturesAndApplyGenerateMipMap, IN, osg::State &, state, IN, const osg::FBOExtensions *, ext); - I_Method3(void, attach, IN, osg::State &, state, IN, GLenum, attachment_point, IN, const osg::FBOExtensions *, ext); - I_Method1(int, compare, IN, const osg::FrameBufferAttachment &, fa); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap); - -BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::FrameBufferObject &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method0(const osg::FrameBufferObject::AttachmentMap &, getAttachmentMap); - I_Method1(bool, hasAttachment, IN, GLenum, attachment_point); - I_Method1(const osg::FrameBufferAttachment &, getAttachment, IN, GLenum, attachment_point); - I_Method2(void, setAttachment, IN, GLenum, attachment_point, IN, const osg::FrameBufferAttachment &, attachment); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(void, apply, IN, osg::State &, state); - I_IndexedProperty1(const osg::FrameBufferAttachment &, Attachment, GLenum, attachment_point); - I_ReadOnlyProperty(const osg::FrameBufferObject::AttachmentMap &, AttachmentMap); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer) - I_BaseType(osg::Object); +BEGIN_VALUE_REFLECTOR(osg::FrameBufferObject) I_Constructor0(); - I_Constructor3(IN, int, width, IN, int, height, IN, GLenum, internalFormat); - I_ConstructorWithDefaults2(IN, const osg::RenderBuffer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(int, getWidth); - I_Method0(int, getHeight); - I_Method1(void, setWidth, IN, int, w); - I_Method1(void, setHeight, IN, int, h); - I_Method2(void, setSize, IN, int, w, IN, int, h); - I_Method0(GLenum, getInternalFormat); - I_Method1(void, setInternalFormat, IN, GLenum, format); - I_Method2(GLuint, getObjectID, IN, unsigned int, contextID, IN, const osg::FBOExtensions *, ext); - I_Method1(int, compare, IN, const osg::RenderBuffer &, rb); - I_Property(int, Height); - I_Property(GLenum, InternalFormat); - I_Property(int, Width); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::FrameBufferAttachment >); +BEGIN_VALUE_REFLECTOR(osg::FrameBufferObject) + I_Constructor0(); +END_REFLECTOR diff --git a/src/osgWrappers/osg/FrameStamp.cpp b/src/osgWrappers/osg/FrameStamp.cpp index 0c599db98..ad8071d6d 100644 --- a/src/osgWrappers/osg/FrameStamp.cpp +++ b/src/osgWrappers/osg/FrameStamp.cpp @@ -19,18 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::FrameStamp) - I_BaseType(osg::Referenced); +BEGIN_VALUE_REFLECTOR(osg::FrameStamp) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::FrameStamp) I_Constructor0(); - I_Constructor1(IN, const osg::FrameStamp &, fs); - I_Method1(void, setFrameNumber, IN, int, fnum); - I_Method0(int, getFrameNumber); - I_Method1(void, setReferenceTime, IN, double, refTime); - I_Method0(double, getReferenceTime); - I_Method1(void, setCalendarTime, IN, const tm &, calendarTime); - I_Method1(void, getCalendarTime, IN, tm &, calendarTime); - I_WriteOnlyProperty(const tm &, CalendarTime); - I_Property(int, FrameNumber); - I_Property(double, ReferenceTime); END_REFLECTOR diff --git a/src/osgWrappers/osg/FrontFace.cpp b/src/osgWrappers/osg/FrontFace.cpp index 256f925ba..1cd4a6e0d 100644 --- a/src/osgWrappers/osg/FrontFace.cpp +++ b/src/osgWrappers/osg/FrontFace.cpp @@ -9,11 +9,7 @@ #include #include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,26 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::FrontFace::Mode) - I_EnumLabel(osg::FrontFace::CLOCKWISE); - I_EnumLabel(osg::FrontFace::COUNTER_CLOCKWISE); +BEGIN_VALUE_REFLECTOR(osg::FrontFace) + I_Constructor0(); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::FrontFace) - I_BaseType(osg::StateAttribute); - I_ConstructorWithDefaults1(IN, osg::FrontFace::Mode, face, osg::FrontFace::COUNTER_CLOCKWISE); - I_ConstructorWithDefaults2(IN, const osg::FrontFace &, ff, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(void, setMode, IN, osg::FrontFace::Mode, mode); - I_Method0(osg::FrontFace::Mode, getMode); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(osg::FrontFace::Mode, Mode); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); +BEGIN_VALUE_REFLECTOR(osg::FrontFace) + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osg/GL2Extensions.cpp b/src/osgWrappers/osg/GL2Extensions.cpp index 914794f53..c7f9127d6 100644 --- a/src/osgWrappers/osg/GL2Extensions.cpp +++ b/src/osgWrappers/osg/GL2Extensions.cpp @@ -19,127 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::GL2Extensions) - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID); - I_Constructor1(IN, const osg::GL2Extensions &, rhs); - I_Method1(void, lowestCommonDenominator, IN, const osg::GL2Extensions &, rhs); - I_Method1(void, setupGL2Extensions, IN, unsigned int, contextID); - I_Method0(bool, isGlslSupported); - I_Method0(float, getGlVersion); - I_Method0(float, getLanguageVersion); - I_Method1(void, setShaderObjectsSupported, IN, bool, flag); - I_Method0(bool, isShaderObjectsSupported); - I_Method1(void, setVertexShaderSupported, IN, bool, flag); - I_Method0(bool, isVertexShaderSupported); - I_Method1(void, setFragmentShaderSupported, IN, bool, flag); - I_Method0(bool, isFragmentShaderSupported); - I_Method1(void, setLanguage100Supported, IN, bool, flag); - I_Method0(bool, isLanguage100Supported); - I_Method2(void, glBlendEquationSeparate, IN, GLenum, modeRGB, IN, GLenum, modeAlpha); - I_Method2(void, glDrawBuffers, IN, GLsizei, n, IN, const GLenum *, bufs); - I_Method4(void, glStencilOpSeparate, IN, GLenum, face, IN, GLenum, sfail, IN, GLenum, dpfail, IN, GLenum, dppass); - I_Method4(void, glStencilFuncSeparate, IN, GLenum, frontfunc, IN, GLenum, backfunc, IN, GLint, ref, IN, GLuint, mask); - I_Method2(void, glStencilMaskSeparate, IN, GLenum, face, IN, GLuint, mask); - I_Method2(void, glAttachShader, IN, GLuint, program, IN, GLuint, shader); - I_Method3(void, glBindAttribLocation, IN, GLuint, program, IN, GLuint, index, IN, const GLchar *, name); - I_Method1(void, glCompileShader, IN, GLuint, shader); - I_Method0(GLuint, glCreateProgram); - I_Method1(GLuint, glCreateShader, IN, GLenum, type); - I_Method1(void, glDeleteProgram, IN, GLuint, program); - I_Method1(void, glDeleteShader, IN, GLuint, shader); - I_Method2(void, glDetachShader, IN, GLuint, program, IN, GLuint, shader); - I_Method1(void, glDisableVertexAttribArray, IN, GLuint, index); - I_Method1(void, glEnableVertexAttribArray, IN, GLuint, index); - I_Method7(void, glGetActiveAttrib, IN, GLuint, program, IN, GLuint, index, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLint *, size, IN, GLenum *, type, IN, GLchar *, name); - I_Method7(void, glGetActiveUniform, IN, GLuint, program, IN, GLuint, index, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLint *, size, IN, GLenum *, type, IN, GLchar *, name); - I_Method4(void, glGetAttachedShaders, IN, GLuint, program, IN, GLsizei, maxCount, IN, GLsizei *, count, IN, GLuint *, obj); - I_Method2(GLint, glGetAttribLocation, IN, GLuint, program, IN, const GLchar *, name); - I_Method3(void, glGetProgramiv, IN, GLuint, program, IN, GLenum, pname, IN, GLint *, params); - I_Method4(void, glGetProgramInfoLog, IN, GLuint, program, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLchar *, infoLog); - I_Method3(void, glGetShaderiv, IN, GLuint, shader, IN, GLenum, pname, IN, GLint *, params); - I_Method4(void, glGetShaderInfoLog, IN, GLuint, shader, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLchar *, infoLog); - I_Method4(void, glGetShaderSource, IN, GLuint, shader, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLchar *, source); - I_Method2(GLint, glGetUniformLocation, IN, GLuint, program, IN, const GLchar *, name); - I_Method3(void, glGetUniformfv, IN, GLuint, program, IN, GLint, location, IN, GLfloat *, params); - I_Method3(void, glGetUniformiv, IN, GLuint, program, IN, GLint, location, IN, GLint *, params); - I_Method3(void, glGetVertexAttribdv, IN, GLuint, index, IN, GLenum, pname, IN, GLdouble *, params); - I_Method3(void, glGetVertexAttribfv, IN, GLuint, index, IN, GLenum, pname, IN, GLfloat *, params); - I_Method3(void, glGetVertexAttribiv, IN, GLuint, index, IN, GLenum, pname, IN, GLint *, params); - I_Method3(void, glGetVertexAttribPointerv, IN, GLuint, index, IN, GLenum, pname, IN, GLvoid **, pointer); - I_Method1(GLboolean, glIsProgram, IN, GLuint, program); - I_Method1(GLboolean, glIsShader, IN, GLuint, shader); - I_Method1(void, glLinkProgram, IN, GLuint, program); - I_Method4(void, glShaderSource, IN, GLuint, shader, IN, GLsizei, count, IN, const GLchar **, string, IN, const GLint *, length); - I_Method1(void, glUseProgram, IN, GLuint, program); - I_Method2(void, glUniform1f, IN, GLint, location, IN, GLfloat, v0); - I_Method3(void, glUniform2f, IN, GLint, location, IN, GLfloat, v0, IN, GLfloat, v1); - I_Method4(void, glUniform3f, IN, GLint, location, IN, GLfloat, v0, IN, GLfloat, v1, IN, GLfloat, v2); - I_Method5(void, glUniform4f, IN, GLint, location, IN, GLfloat, v0, IN, GLfloat, v1, IN, GLfloat, v2, IN, GLfloat, v3); - I_Method2(void, glUniform1i, IN, GLint, location, IN, GLint, v0); - I_Method3(void, glUniform2i, IN, GLint, location, IN, GLint, v0, IN, GLint, v1); - I_Method4(void, glUniform3i, IN, GLint, location, IN, GLint, v0, IN, GLint, v1, IN, GLint, v2); - I_Method5(void, glUniform4i, IN, GLint, location, IN, GLint, v0, IN, GLint, v1, IN, GLint, v2, IN, GLint, v3); - I_Method3(void, glUniform1fv, IN, GLint, location, IN, GLsizei, count, IN, const GLfloat *, value); - I_Method3(void, glUniform2fv, IN, GLint, location, IN, GLsizei, count, IN, const GLfloat *, value); - I_Method3(void, glUniform3fv, IN, GLint, location, IN, GLsizei, count, IN, const GLfloat *, value); - I_Method3(void, glUniform4fv, IN, GLint, location, IN, GLsizei, count, IN, const GLfloat *, value); - I_Method3(void, glUniform1iv, IN, GLint, location, IN, GLsizei, count, IN, const GLint *, value); - I_Method3(void, glUniform2iv, IN, GLint, location, IN, GLsizei, count, IN, const GLint *, value); - I_Method3(void, glUniform3iv, IN, GLint, location, IN, GLsizei, count, IN, const GLint *, value); - I_Method3(void, glUniform4iv, IN, GLint, location, IN, GLsizei, count, IN, const GLint *, value); - I_Method4(void, glUniformMatrix2fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value); - I_Method4(void, glUniformMatrix3fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value); - I_Method4(void, glUniformMatrix4fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value); - I_Method1(void, glValidateProgram, IN, GLuint, program); - I_Method2(void, glVertexAttrib1d, IN, GLuint, index, IN, GLdouble, x); - I_Method2(void, glVertexAttrib1dv, IN, GLuint, index, IN, const GLdouble *, v); - I_Method2(void, glVertexAttrib1f, IN, GLuint, index, IN, GLfloat, x); - I_Method2(void, glVertexAttrib1fv, IN, GLuint, index, IN, const GLfloat *, v); - I_Method2(void, glVertexAttrib1s, IN, GLuint, index, IN, GLshort, x); - I_Method2(void, glVertexAttrib1sv, IN, GLuint, index, IN, const GLshort *, v); - I_Method3(void, glVertexAttrib2d, IN, GLuint, index, IN, GLdouble, x, IN, GLdouble, y); - I_Method2(void, glVertexAttrib2dv, IN, GLuint, index, IN, const GLdouble *, v); - I_Method3(void, glVertexAttrib2f, IN, GLuint, index, IN, GLfloat, x, IN, GLfloat, y); - I_Method2(void, glVertexAttrib2fv, IN, GLuint, index, IN, const GLfloat *, v); - I_Method3(void, glVertexAttrib2s, IN, GLuint, index, IN, GLshort, x, IN, GLshort, y); - I_Method2(void, glVertexAttrib2sv, IN, GLuint, index, IN, const GLshort *, v); - I_Method4(void, glVertexAttrib3d, IN, GLuint, index, IN, GLdouble, x, IN, GLdouble, y, IN, GLdouble, z); - I_Method2(void, glVertexAttrib3dv, IN, GLuint, index, IN, const GLdouble *, v); - I_Method4(void, glVertexAttrib3f, IN, GLuint, index, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z); - I_Method2(void, glVertexAttrib3fv, IN, GLuint, index, IN, const GLfloat *, v); - I_Method4(void, glVertexAttrib3s, IN, GLuint, index, IN, GLshort, x, IN, GLshort, y, IN, GLshort, z); - I_Method2(void, glVertexAttrib3sv, IN, GLuint, index, IN, const GLshort *, v); - I_Method2(void, glVertexAttrib4Nbv, IN, GLuint, index, IN, const GLbyte *, v); - I_Method2(void, glVertexAttrib4Niv, IN, GLuint, index, IN, const GLint *, v); - I_Method2(void, glVertexAttrib4Nsv, IN, GLuint, index, IN, const GLshort *, v); - I_Method5(void, glVertexAttrib4Nub, IN, GLuint, index, IN, GLubyte, x, IN, GLubyte, y, IN, GLubyte, z, IN, GLubyte, w); - I_Method2(void, glVertexAttrib4Nubv, IN, GLuint, index, IN, const GLubyte *, v); - I_Method2(void, glVertexAttrib4Nuiv, IN, GLuint, index, IN, const GLuint *, v); - I_Method2(void, glVertexAttrib4Nusv, IN, GLuint, index, IN, const GLushort *, v); - I_Method2(void, glVertexAttrib4bv, IN, GLuint, index, IN, const GLbyte *, v); - I_Method5(void, glVertexAttrib4d, IN, GLuint, index, IN, GLdouble, x, IN, GLdouble, y, IN, GLdouble, z, IN, GLdouble, w); - I_Method2(void, glVertexAttrib4dv, IN, GLuint, index, IN, const GLdouble *, v); - I_Method5(void, glVertexAttrib4f, IN, GLuint, index, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, IN, GLfloat, w); - I_Method2(void, glVertexAttrib4fv, IN, GLuint, index, IN, const GLfloat *, v); - I_Method2(void, glVertexAttrib4iv, IN, GLuint, index, IN, const GLint *, v); - I_Method5(void, glVertexAttrib4s, IN, GLuint, index, IN, GLshort, x, IN, GLshort, y, IN, GLshort, z, IN, GLshort, w); - I_Method2(void, glVertexAttrib4sv, IN, GLuint, index, IN, const GLshort *, v); - I_Method2(void, glVertexAttrib4ubv, IN, GLuint, index, IN, const GLubyte *, v); - I_Method2(void, glVertexAttrib4uiv, IN, GLuint, index, IN, const GLuint *, v); - I_Method2(void, glVertexAttrib4usv, IN, GLuint, index, IN, const GLushort *, v); - I_Method6(void, glVertexAttribPointer, IN, GLuint, index, IN, GLint, size, IN, GLenum, type, IN, GLboolean, normalized, IN, GLsizei, stride, IN, const GLvoid *, pointer); - I_Method0(GLuint, getCurrentProgram); - 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_ReadOnlyProperty(GLuint, CurrentProgram); - I_WriteOnlyProperty(bool, FragmentShaderSupported); - I_ReadOnlyProperty(float, GlVersion); - I_WriteOnlyProperty(bool, Language100Supported); - I_ReadOnlyProperty(float, LanguageVersion); - I_WriteOnlyProperty(bool, ShaderObjectsSupported); - I_WriteOnlyProperty(bool, VertexShaderSupported); - I_WriteOnlyProperty(unsigned int, upGL2Extensions); +BEGIN_VALUE_REFLECTOR(osg::GL2Extensions) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GL2Extensions) + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osg/GNUmakefile b/src/osgWrappers/osg/GNUmakefile index d404b00a1..4839572a2 100644 --- a/src/osgWrappers/osg/GNUmakefile +++ b/src/osgWrappers/osg/GNUmakefile @@ -9,22 +9,15 @@ CXXFILES =\ Array.cpp\ AutoTransform.cpp\ Billboard.cpp\ - BlendColor.cpp\ BlendEquation.cpp\ BlendFunc.cpp\ - BoundingBox.cpp\ BoundingSphere.cpp\ BufferObject.cpp\ CameraNode.cpp\ CameraView.cpp\ ClampColor.cpp\ - ClearNode.cpp\ ClipNode.cpp\ - ClipPlane.cpp\ - ClusterCullingCallback.cpp\ CollectOccludersVisitor.cpp\ - ColorMask.cpp\ - ColorMatrix.cpp\ ConvexPlanarOccluder.cpp\ ConvexPlanarPolygon.cpp\ CoordinateSystemNode.cpp\ @@ -75,18 +68,12 @@ CXXFILES =\ PagedLOD.cpp\ Plane.cpp\ Point.cpp\ - PointSprite.cpp\ PolygonMode.cpp\ - PolygonOffset.cpp\ - PolygonStipple.cpp\ Polytope.cpp\ - PositionAttitudeTransform.cpp\ PrimitiveSet.cpp\ Program.cpp\ - Projection.cpp\ ProxyNode.cpp\ Quat.cpp\ - Referenced.cpp\ Scissor.cpp\ Sequence.cpp\ ShadeModel.cpp\ @@ -99,39 +86,20 @@ CXXFILES =\ StateSet.cpp\ Stencil.cpp\ Switch.cpp\ - TexEnv.cpp\ - TexEnvCombine.cpp\ - TexEnvFilter.cpp\ - TexGen.cpp\ - TexGenNode.cpp\ - TexMat.cpp\ - Texture.cpp\ - Texture1D.cpp\ - Texture2D.cpp\ Texture3D.cpp\ TextureCubeMap.cpp\ TextureRectangle.cpp\ Timer.cpp\ Transform.cpp\ Uniform.cpp\ - Vec2.cpp\ Vec2b.cpp\ Vec2d.cpp\ Vec2f.cpp\ Vec2s.cpp\ - Vec3.cpp\ Vec3b.cpp\ - Vec3d.cpp\ - Vec3f.cpp\ - Vec3s.cpp\ - Vec4.cpp\ - Vec4b.cpp\ Vec4d.cpp\ - Vec4f.cpp\ - Vec4s.cpp\ Vec4ub.cpp\ VertexProgram.cpp\ - Viewport.cpp\ observer_ptr.cpp\ LIBS += -losg -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) diff --git a/src/osgWrappers/osg/Geode.cpp b/src/osgWrappers/osg/Geode.cpp index 7c999471d..ca44ce628 100644 --- a/src/osgWrappers/osg/Geode.cpp +++ b/src/osgWrappers/osg/Geode.cpp @@ -9,14 +9,7 @@ #include #include -#include -#include -#include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -26,48 +19,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Drawable > >, osg::Geode::DrawableList); - -BEGIN_OBJECT_REFLECTOR(osg::Geode) - I_BaseType(osg::Node); +BEGIN_VALUE_REFLECTOR(osg::Geode) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Geode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(bool, addDrawable, IN, osg::Drawable *, drawable); - I_Method1(bool, removeDrawable, IN, osg::Drawable *, drawable); - I_MethodWithDefaults2(bool, removeDrawables, IN, unsigned int, i, , IN, unsigned int, numDrawablesToRemove, 1); - I_Method2(bool, replaceDrawable, IN, osg::Drawable *, origDraw, IN, osg::Drawable *, newDraw); - I_Method2(bool, setDrawable, IN, unsigned int, i, IN, osg::Drawable *, drawable); - I_Method0(unsigned int, getNumDrawables); - I_Method1(osg::Drawable *, getDrawable, IN, unsigned int, i); - I_Method1(const osg::Drawable *, getDrawable, IN, unsigned int, i); - I_Method1(bool, containsDrawable, IN, const osg::Drawable *, gset); - I_Method1(unsigned int, getDrawableIndex, IN, const osg::Drawable *, drawable); - I_Method0(const osg::Geode::DrawableList &, getDrawableList); - I_Method1(void, compileDrawables, IN, osg::State &, state); - I_Method0(const osg::BoundingBox &, getBoundingBox); - I_Method0(osg::BoundingSphere, computeBound); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - I_ReadOnlyProperty(const osg::BoundingBox &, BoundingBox); - I_ArrayProperty_GSA(osg::Drawable *, Drawable, Drawables, unsigned int, bool); - I_ReadOnlyProperty(const osg::Geode::DrawableList &, DrawableList); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Drawable >) +BEGIN_VALUE_REFLECTOR(osg::Geode) I_Constructor0(); - I_Constructor1(IN, osg::Drawable *, ptr); - I_Constructor1(IN, const osg::ref_ptr< osg::Drawable > &, rp); - I_Method0(osg::Drawable *, get); - I_Method0(bool, valid); - I_Method0(osg::Drawable *, release); - I_Method1(void, swap, IN, osg::ref_ptr< osg::Drawable > &, rp); - I_ReadOnlyProperty(osg::Drawable *, ); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Drawable > >); - diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index 4d941e6c6..920c16111 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -9,13 +9,7 @@ #include #include -#include -#include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -25,209 +19,27 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Geometry::ArrayData >, osg::Geometry::ArrayList); - -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::PrimitiveSet > >, osg::Geometry::PrimitiveSetList); - -BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding) - I_EnumLabel(osg::Geometry::BIND_OFF); - I_EnumLabel(osg::Geometry::BIND_OVERALL); - I_EnumLabel(osg::Geometry::BIND_PER_PRIMITIVE_SET); - I_EnumLabel(osg::Geometry::BIND_PER_PRIMITIVE); - I_EnumLabel(osg::Geometry::BIND_PER_VERTEX); +BEGIN_VALUE_REFLECTOR(osg::Geometry) + I_Constructor0(); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Geometry) - I_BaseType(osg::Drawable); +BEGIN_VALUE_REFLECTOR(osg::Geometry) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Geometry::ArrayData) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Geometry &, geometry, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::Geometry *, asGeometry); - I_Method0(const osg::Geometry *, asGeometry); - I_Method0(bool, empty); - I_Method1(void, setVertexArray, IN, osg::Array *, array); - I_Method0(osg::Array *, getVertexArray); - I_Method0(const osg::Array *, getVertexArray); - I_Method1(void, setVertexIndices, IN, osg::IndexArray *, array); - I_Method0(osg::IndexArray *, getVertexIndices); - I_Method0(const osg::IndexArray *, getVertexIndices); - I_Method1(void, setVertexData, IN, const osg::Geometry::ArrayData &, arrayData); - I_Method0(osg::Geometry::ArrayData &, getVertexData); - I_Method0(const osg::Geometry::ArrayData &, getVertexData); - I_Method1(void, setNormalBinding, IN, osg::Geometry::AttributeBinding, ab); - I_Method0(osg::Geometry::AttributeBinding, getNormalBinding); - I_Method1(void, setNormalArray, IN, osg::Array *, array); - I_Method0(osg::Array *, getNormalArray); - I_Method0(const osg::Array *, getNormalArray); - I_Method1(void, setNormalIndices, IN, osg::IndexArray *, array); - I_Method0(osg::IndexArray *, getNormalIndices); - I_Method0(const osg::IndexArray *, getNormalIndices); - I_Method1(void, setNormalData, IN, const osg::Geometry::ArrayData &, arrayData); - I_Method0(osg::Geometry::ArrayData &, getNormalData); - I_Method0(const osg::Geometry::ArrayData &, getNormalData); - I_Method1(void, setColorBinding, IN, osg::Geometry::AttributeBinding, ab); - I_Method0(osg::Geometry::AttributeBinding, getColorBinding); - I_Method1(void, setColorArray, IN, osg::Array *, array); - I_Method0(osg::Array *, getColorArray); - I_Method0(const osg::Array *, getColorArray); - I_Method1(void, setColorIndices, IN, osg::IndexArray *, array); - I_Method0(osg::IndexArray *, getColorIndices); - I_Method0(const osg::IndexArray *, getColorIndices); - I_Method1(void, setColorData, IN, const osg::Geometry::ArrayData &, arrayData); - I_Method0(osg::Geometry::ArrayData &, getColorData); - I_Method0(const osg::Geometry::ArrayData &, getColorData); - I_Method1(void, setSecondaryColorBinding, IN, osg::Geometry::AttributeBinding, ab); - I_Method0(osg::Geometry::AttributeBinding, getSecondaryColorBinding); - I_Method1(void, setSecondaryColorArray, IN, osg::Array *, array); - I_Method0(osg::Array *, getSecondaryColorArray); - I_Method0(const osg::Array *, getSecondaryColorArray); - I_Method1(void, setSecondaryColorIndices, IN, osg::IndexArray *, array); - I_Method0(osg::IndexArray *, getSecondaryColorIndices); - I_Method0(const osg::IndexArray *, getSecondaryColorIndices); - I_Method1(void, setSecondaryColorData, IN, const osg::Geometry::ArrayData &, arrayData); - I_Method0(osg::Geometry::ArrayData &, getSecondaryColorData); - I_Method0(const osg::Geometry::ArrayData &, getSecondaryColorData); - I_Method1(void, setFogCoordBinding, IN, osg::Geometry::AttributeBinding, ab); - I_Method0(osg::Geometry::AttributeBinding, getFogCoordBinding); - I_Method1(void, setFogCoordArray, IN, osg::Array *, array); - I_Method0(osg::Array *, getFogCoordArray); - I_Method0(const osg::Array *, getFogCoordArray); - I_Method1(void, setFogCoordIndices, IN, osg::IndexArray *, array); - I_Method0(osg::IndexArray *, getFogCoordIndices); - I_Method0(const osg::IndexArray *, getFogCoordIndices); - I_Method1(void, setFogCoordData, IN, const osg::Geometry::ArrayData &, arrayData); - I_Method0(osg::Geometry::ArrayData &, getFogCoordData); - I_Method0(const osg::Geometry::ArrayData &, getFogCoordData); - I_Method2(void, setTexCoordArray, IN, unsigned int, unit, IN, osg::Array *, x); - I_Method1(osg::Array *, getTexCoordArray, IN, unsigned int, unit); - I_Method1(const osg::Array *, getTexCoordArray, IN, unsigned int, unit); - I_Method2(void, setTexCoordIndices, IN, unsigned int, unit, IN, osg::IndexArray *, x); - I_Method1(osg::IndexArray *, getTexCoordIndices, IN, unsigned int, unit); - I_Method1(const osg::IndexArray *, getTexCoordIndices, IN, unsigned int, unit); - I_Method2(void, setTexCoordData, IN, unsigned int, index, IN, const osg::Geometry::ArrayData &, arrayData); - I_Method1(osg::Geometry::ArrayData &, getTexCoordData, IN, unsigned int, index); - I_Method1(const osg::Geometry::ArrayData &, getTexCoordData, IN, unsigned int, index); - I_Method0(unsigned int, getNumTexCoordArrays); - I_Method0(osg::Geometry::ArrayList &, getTexCoordArrayList); - I_Method0(const osg::Geometry::ArrayList &, getTexCoordArrayList); - I_Method2(void, setVertexAttribArray, IN, unsigned int, index, IN, osg::Array *, array); - I_Method1(osg::Array *, getVertexAttribArray, IN, unsigned int, index); - I_Method1(const osg::Array *, getVertexAttribArray, IN, unsigned int, index); - I_Method2(void, setVertexAttribIndices, IN, unsigned int, index, IN, osg::IndexArray *, array); - I_Method1(osg::IndexArray *, getVertexAttribIndices, IN, unsigned int, index); - I_Method1(const osg::IndexArray *, getVertexAttribIndices, IN, unsigned int, index); - I_Method2(void, setVertexAttribBinding, IN, unsigned int, index, IN, osg::Geometry::AttributeBinding, ab); - I_Method1(osg::Geometry::AttributeBinding, getVertexAttribBinding, IN, unsigned int, index); - I_Method2(void, setVertexAttribNormalize, IN, unsigned int, index, IN, GLboolean, norm); - I_Method1(GLboolean, getVertexAttribNormalize, IN, unsigned int, index); - I_Method2(void, setVertexAttribData, IN, unsigned int, index, IN, const osg::Geometry::ArrayData &, arrayData); - I_Method1(osg::Geometry::ArrayData &, getVertexAttribData, IN, unsigned int, index); - I_Method1(const osg::Geometry::ArrayData &, getVertexAttribData, IN, unsigned int, index); - I_Method0(unsigned int, getNumVertexAttribArrays); - I_Method0(osg::Geometry::ArrayList &, getVertexAttribArrayList); - I_Method0(const osg::Geometry::ArrayList &, getVertexAttribArrayList); - I_Method1(void, setPrimitiveSetList, IN, const osg::Geometry::PrimitiveSetList &, primitives); - I_Method0(osg::Geometry::PrimitiveSetList &, getPrimitiveSetList); - I_Method0(const osg::Geometry::PrimitiveSetList &, getPrimitiveSetList); - I_Method0(unsigned int, getNumPrimitiveSets); - I_Method1(osg::PrimitiveSet *, getPrimitiveSet, IN, unsigned int, pos); - I_Method1(const osg::PrimitiveSet *, getPrimitiveSet, IN, unsigned int, pos); - I_Method1(bool, addPrimitiveSet, IN, osg::PrimitiveSet *, primitiveset); - I_Method2(bool, setPrimitiveSet, IN, unsigned int, i, IN, osg::PrimitiveSet *, primitiveset); - I_Method2(bool, insertPrimitiveSet, IN, unsigned int, i, IN, osg::PrimitiveSet *, primitiveset); - I_MethodWithDefaults2(bool, removePrimitiveSet, IN, unsigned int, i, , IN, unsigned int, numElementsToRemove, 1); - I_Method1(unsigned int, getPrimitiveSetIndex, IN, const osg::PrimitiveSet *, primitiveset); - I_Method1(void, setFastPathHint, IN, bool, on); - I_Method0(bool, getFastPathHint); - I_Method0(bool, areFastPathsUsed); - I_Method0(bool, computeFastPathsUsed); - I_Method0(bool, verifyBindings); - I_Method0(void, computeCorrectBindingsAndArraySizes); - I_Method0(bool, suitableForOptimization); - I_Method1(void, copyToAndOptimize, IN, osg::Geometry &, target); - I_Method0(void, computeInternalOptimizedGeometry); - I_Method0(void, removeInternalOptimizedGeometry); - I_Method1(void, setInternalOptimizedGeometry, IN, osg::Geometry *, geometry); - I_Method0(osg::Geometry *, getInternalOptimizedGeometry); - I_Method0(const osg::Geometry *, getInternalOptimizedGeometry); - I_Method0(unsigned int, getGLObjectSizeHint); - I_Method1(void, drawImplementation, IN, osg::State &, state); - I_Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); - I_Method1(void, accept, IN, osg::Drawable::AttributeFunctor &, af); - I_Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); - I_Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); - I_Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); - I_Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); - I_Method1(bool, supports, IN, const osg::PrimitiveIndexFunctor &, x); - I_Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, pf); - I_Property(osg::Array *, ColorArray); - I_Property(osg::Geometry::AttributeBinding, ColorBinding); - I_Property(const osg::Geometry::ArrayData &, ColorData); - I_Property(osg::IndexArray *, ColorIndices); - I_Property(bool, FastPathHint); - I_Property(osg::Array *, FogCoordArray); - I_Property(osg::Geometry::AttributeBinding, FogCoordBinding); - I_Property(const osg::Geometry::ArrayData &, FogCoordData); - I_Property(osg::IndexArray *, FogCoordIndices); - I_ReadOnlyProperty(unsigned int, GLObjectSizeHint); - I_Property(osg::Geometry *, InternalOptimizedGeometry); - I_Property(osg::Array *, NormalArray); - I_Property(osg::Geometry::AttributeBinding, NormalBinding); - I_Property(const osg::Geometry::ArrayData &, NormalData); - I_Property(osg::IndexArray *, NormalIndices); - I_ArrayProperty_GSA(osg::PrimitiveSet *, PrimitiveSet, PrimitiveSets, unsigned int, bool); - I_Property(const osg::Geometry::PrimitiveSetList &, PrimitiveSetList); - I_Property(osg::Array *, SecondaryColorArray); - I_Property(osg::Geometry::AttributeBinding, SecondaryColorBinding); - I_Property(const osg::Geometry::ArrayData &, SecondaryColorData); - I_Property(osg::IndexArray *, SecondaryColorIndices); - I_ArrayProperty_G(osg::Array *, TexCoordArray, TexCoordArrays, unsigned int, void); - I_ReadOnlyProperty(osg::Geometry::ArrayList &, TexCoordArrayList); - I_IndexedProperty1(const osg::Geometry::ArrayData &, TexCoordData, unsigned int, index); - I_IndexedProperty1(osg::IndexArray *, TexCoordIndices, unsigned int, unit); - I_Property(osg::Array *, VertexArray); - I_ArrayProperty_G(osg::Array *, VertexAttribArray, VertexAttribArrays, unsigned int, void); - I_ReadOnlyProperty(osg::Geometry::ArrayList &, VertexAttribArrayList); - I_IndexedProperty1(osg::Geometry::AttributeBinding, VertexAttribBinding, unsigned int, index); - I_IndexedProperty1(const osg::Geometry::ArrayData &, VertexAttribData, unsigned int, index); - I_IndexedProperty1(osg::IndexArray *, VertexAttribIndices, unsigned int, index); - I_IndexedProperty1(GLboolean, VertexAttribNormalize, unsigned int, index); - I_Property(const osg::Geometry::ArrayData &, VertexData); - I_Property(osg::IndexArray *, VertexIndices); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::Geometry::ArrayData) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Geometry::ArrayData &, data, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - 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); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::Geometry::Vec3ArrayData) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Geometry::Vec3ArrayData &, data, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - 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); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PrimitiveSet >) +BEGIN_VALUE_REFLECTOR(osg::Geometry::Vec3ArrayData) I_Constructor0(); - I_Constructor1(IN, osg::PrimitiveSet *, ptr); - I_Constructor1(IN, const osg::ref_ptr< osg::PrimitiveSet > &, rp); - I_Method0(osg::PrimitiveSet *, get); - I_Method0(bool, valid); - I_Method0(osg::PrimitiveSet *, release); - I_Method1(void, swap, IN, osg::ref_ptr< osg::PrimitiveSet > &, rp); - I_ReadOnlyProperty(osg::PrimitiveSet *, ); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::Geometry::ArrayData >); - -STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::PrimitiveSet > >); - diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index ffee7b1bb..5bac75f31 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -10,8 +10,6 @@ #include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -21,45 +19,27 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext) - I_BaseType(osg::Referenced); - I_Method0(const osg::GraphicsContext::Traits *, getTraits); - I_Method1(void, setState, IN, osg::State *, state); - I_Method0(osg::State *, getState); - I_Method0(const osg::State *, getState); - I_Method0(bool, realize); - I_MethodWithDefaults1(void, close, IN, bool, callCloseImplementation, true); - I_Method0(void, swapBuffers); - I_Method0(bool, isRealized); - I_Method0(void, makeCurrent); - I_Method1(void, makeContextCurrent, IN, osg::GraphicsContext *, readContext); - I_Method0(void, releaseContext); - I_Method0(bool, isCurrent); - I_Method1(void, bindPBufferToTexture, IN, GLenum, buffer); - I_Method0(void, createGraphicsThread); - I_Method1(void, setGraphicsThread, IN, osg::GraphicsThread *, gt); - I_Method0(osg::GraphicsThread *, getGraphicsThread); - I_Method0(const osg::GraphicsThread *, getGraphicsThread); - I_Method0(bool, realizeImplementation); - I_Method0(bool, isRealizedImplementation); - I_Method0(void, closeImplementation); - I_Method0(void, makeCurrentImplementation); - I_Method1(void, makeContextCurrentImplementation, IN, osg::GraphicsContext *, readContext); - I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, buffer); - I_Method0(void, swapBuffersImplementation); - I_Property(osg::GraphicsThread *, GraphicsThread); - I_Property(osg::State *, State); - I_ReadOnlyProperty(const osg::GraphicsContext::Traits *, Traits); -END_REFLECTOR - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext::CreateGraphicContextCallback) - I_BaseType(osg::Referenced); - I_Constructor0(); - I_Method1(osg::GraphicsContext *, createGraphicsContext, IN, osg::GraphicsContext::Traits *, traits); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext::Traits) - I_BaseType(osg::Referenced); +BEGIN_VALUE_REFLECTOR(osg::GraphicsContext) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GraphicsContext) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GraphicsContext::CreateGraphicContextCallback) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GraphicsContext::CreateGraphicContextCallback) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GraphicsContext::Traits) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GraphicsContext::Traits) I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osg/GraphicsThread.cpp b/src/osgWrappers/osg/GraphicsThread.cpp index e5077bcbe..f143d70b2 100644 --- a/src/osgWrappers/osg/GraphicsThread.cpp +++ b/src/osgWrappers/osg/GraphicsThread.cpp @@ -9,7 +9,6 @@ #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -20,76 +19,51 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::BarrierOperation::PreBlockOp) - I_EnumLabel(osg::BarrierOperation::NO_OPERATION); - I_EnumLabel(osg::BarrierOperation::GL_FLUSH); - I_EnumLabel(osg::BarrierOperation::GL_FINISH); -END_REFLECTOR - -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); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Block) - I_VirtualBaseType(osg::Referenced); - I_Constructor0(); - I_Method0(void, block); - I_Method0(void, release); - I_Method0(void, reset); - I_Method1(void, set, IN, bool, doRelease); - I_WriteOnlyProperty(bool, ); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::GraphicsThread) - I_BaseType(osg::Referenced); - I_Constructor0(); - I_MethodWithDefaults2(void, add, IN, osg::GraphicsThread::Operation *, operation, , IN, bool, waitForCompletion, false); - I_Method1(void, remove, IN, osg::GraphicsThread::Operation *, operation); - I_Method1(void, remove, IN, const std::string &, name); - I_Method0(void, removeAllOperations); - I_Method0(osg::ref_ptr< osg::GraphicsThread::Operation >, getCurrentOperation); - I_Method0(void, run); - I_Method1(void, setDone, IN, bool, done); - I_Method0(bool, getDone); - I_Method0(int, cancel); - I_ReadOnlyProperty(osg::ref_ptr< osg::GraphicsThread::Operation >, CurrentOperation); - I_Property(bool, Done); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::GraphicsThread::Operation) - I_VirtualBaseType(osg::Referenced); - I_Constructor2(IN, const std::string &, name, IN, bool, keep); - I_Method1(void, setName, IN, const std::string &, name); - I_Method0(const std::string &, getName); - I_Method1(void, setKeep, IN, bool, keep); - I_Method0(bool, getKeep); - I_Method0(void, release); - I_Property(bool, Keep); - I_Property(const std::string &, Name); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation) - I_BaseType(osg::GraphicsThread::Operation); - I_BaseType(osg::Block); - I_Constructor0(); - I_Method0(void, release); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::SwapBuffersOperation) - I_BaseType(osg::GraphicsThread::Operation); +BEGIN_VALUE_REFLECTOR(osg::BarrierOperation) I_Constructor0(); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::GraphicsThread::Operation >) +BEGIN_VALUE_REFLECTOR(osg::BarrierOperation) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Block) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Block) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GraphicsThread) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GraphicsThread) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GraphicsThread::Operation) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GraphicsThread::Operation) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::SwapBuffersOperation) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::SwapBuffersOperation) I_Constructor0(); - I_Constructor1(IN, osg::GraphicsThread::Operation *, ptr); - I_Constructor1(IN, const osg::ref_ptr< osg::GraphicsThread::Operation > &, rp); - I_Method0(osg::GraphicsThread::Operation *, get); - I_Method0(bool, valid); - I_Method0(osg::GraphicsThread::Operation *, release); - I_Method1(void, swap, IN, osg::ref_ptr< osg::GraphicsThread::Operation > &, rp); - I_ReadOnlyProperty(osg::GraphicsThread::Operation *, ); END_REFLECTOR diff --git a/src/osgWrappers/osg/Group.cpp b/src/osgWrappers/osg/Group.cpp index 3636fe84d..83f2de31f 100644 --- a/src/osgWrappers/osg/Group.cpp +++ b/src/osgWrappers/osg/Group.cpp @@ -9,13 +9,8 @@ #include #include -#include -#include #include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -25,39 +20,24 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::Group) - I_BaseType(osg::Node); +BEGIN_VALUE_REFLECTOR(osg::Group) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Group) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Group &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method0(osg::Group *, asGroup); - I_Method0(const osg::Group *, asGroup); - I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); - I_Method1(bool, addChild, IN, osg::Node *, child); - I_Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child); - I_Method1(bool, removeChild, IN, osg::Node *, child); - I_MethodWithDefaults2(bool, removeChild, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1); - I_Method2(bool, removeChildren, IN, unsigned int, pos, IN, unsigned int, numChildrenToRemove); - I_Method2(bool, replaceChild, IN, osg::Node *, origChild, IN, osg::Node *, newChild); - I_Method0(unsigned int, getNumChildren); - I_Method2(bool, setChild, IN, unsigned int, i, IN, osg::Node *, node); - I_Method1(osg::Node *, getChild, IN, unsigned int, i); - I_Method1(const osg::Node *, getChild, IN, unsigned int, i); - I_Method1(bool, containsNode, IN, const osg::Node *, node); - I_Method1(unsigned int, getChildIndex, IN, const osg::Node *, node); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - I_Method0(osg::BoundingSphere, computeBound); - I_ArrayProperty_GSA(osg::Node *, Child, Children, unsigned int, bool); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Node > >, osg::NodeList); BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Node >) + I_Constructor0(); + I_Constructor1(IN, osg::Node *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::Node > &, rp); + I_Method0(osg::Node *, get); + I_Method0(bool, valid); + I_Method0(osg::Node *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::Node > &, rp); I_Constructor0(); I_Constructor1(IN, osg::Node *, ptr); I_Constructor1(IN, const osg::ref_ptr< osg::Node > &, rp); diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index 247482948..56faed1c7 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -9,10 +9,7 @@ #include #include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -22,86 +19,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::Image::MipmapDataType); - -BEGIN_ENUM_REFLECTOR(osg::Image::AllocationMode) - I_EnumLabel(osg::Image::NO_DELETE); - I_EnumLabel(osg::Image::USE_NEW_DELETE); - I_EnumLabel(osg::Image::USE_MALLOC_FREE); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Image) - I_BaseType(osg::Object); +BEGIN_VALUE_REFLECTOR(osg::Image) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Image &, image, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(int, compare, IN, const osg::Image &, rhs); - I_Method1(void, setFileName, IN, const std::string &, fileName); - I_Method0(const std::string &, getFileName); - I_Method1(void, setAllocationMode, IN, osg::Image::AllocationMode, mode); - I_Method0(osg::Image::AllocationMode, getAllocationMode); - I_MethodWithDefaults6(void, allocateImage, IN, int, s, , IN, int, t, , IN, int, r, , IN, GLenum, pixelFormat, , IN, GLenum, type, , IN, int, packing, 1); - I_MethodWithDefaults9(void, setImage, IN, int, s, , IN, int, t, , IN, int, r, , IN, GLint, internalTextureformat, , IN, GLenum, pixelFormat, , IN, GLenum, type, , IN, unsigned char *, data, , IN, osg::Image::AllocationMode, mode, , IN, int, packing, 1); - I_Method6(void, readPixels, IN, int, x, IN, int, y, IN, int, width, IN, int, height, IN, GLenum, pixelFormat, IN, GLenum, type); - I_MethodWithDefaults3(void, readImageFromCurrentTexture, IN, unsigned int, contextID, , IN, bool, copyMipMapsIfAvailable, , IN, GLenum, type, GL_UNSIGNED_BYTE); - I_Method3(void, scaleImage, IN, int, s, IN, int, t, IN, int, r); - I_Method4(void, scaleImage, IN, int, s, IN, int, t, IN, int, r, IN, GLenum, newDataType); - I_Method4(void, copySubImage, IN, int, s_offset, IN, int, t_offset, IN, int, r_offset, IN, osg::Image *, source); - I_Method0(int, s); - I_Method0(int, t); - I_Method0(int, r); - I_Method1(void, setInternalTextureFormat, IN, GLint, internalFormat); - I_Method0(GLint, getInternalTextureFormat); - I_Method1(void, setPixelFormat, IN, GLenum, pixelFormat); - I_Method0(GLenum, getPixelFormat); - I_Method0(GLenum, getDataType); - I_Method0(unsigned int, getPacking); - I_Method0(unsigned int, getPixelSizeInBits); - I_Method0(unsigned int, getRowSizeInBytes); - I_Method0(unsigned int, getImageSizeInBytes); - I_Method0(unsigned int, getTotalSizeInBytes); - I_Method0(unsigned int, getTotalSizeInBytesIncludingMipmaps); - I_Method0(bool, valid); - I_Method0(unsigned char *, data); - I_Method0(const unsigned char *, data); - I_MethodWithDefaults3(unsigned char *, data, IN, int, column, , IN, int, row, 0, IN, int, image, 0); - I_MethodWithDefaults3(const unsigned char *, data, IN, int, column, , IN, int, row, 0, IN, int, image, 0); - I_Method0(void, flipHorizontal); - I_Method0(void, flipVertical); - I_Method1(void, ensureValidSizeForTexturing, IN, GLint, maxTextureSize); - I_Method0(void, dirty); - I_Method1(void, setModifiedCount, IN, unsigned int, value); - I_Method0(unsigned int, getModifiedCount); - I_Method0(bool, isMipmap); - I_Method0(unsigned int, getNumMipmapLevels); - I_Method1(void, setMipmapLevels, IN, const osg::Image::MipmapDataType &, mipmapDataVector); - I_Method0(const osg::Image::MipmapDataType &, getMipmapLevels); - I_Method1(unsigned int, getMipmapOffset, IN, unsigned int, mipmapLevel); - I_Method1(unsigned char *, getMipmapData, IN, unsigned int, mipmapLevel); - I_Method1(const unsigned char *, getMipmapData, IN, unsigned int, mipmapLevel); - I_Method0(bool, isImageTranslucent); - I_Method1(void, setPixelBufferObject, IN, osg::PixelBufferObject *, buffer); - I_Method0(osg::PixelBufferObject *, getPixelBufferObject); - I_Method0(const osg::PixelBufferObject *, getPixelBufferObject); - I_Property(osg::Image::AllocationMode, AllocationMode); - I_ReadOnlyProperty(GLenum, DataType); - I_Property(const std::string &, FileName); - I_ReadOnlyProperty(unsigned int, ImageSizeInBytes); - I_Property(GLint, InternalTextureFormat); - I_Property(const osg::Image::MipmapDataType &, MipmapLevels); - I_Property(unsigned int, ModifiedCount); - I_ReadOnlyProperty(unsigned int, Packing); - I_Property(osg::PixelBufferObject *, PixelBufferObject); - I_Property(GLenum, PixelFormat); - I_ReadOnlyProperty(unsigned int, PixelSizeInBits); - I_ReadOnlyProperty(unsigned int, RowSizeInBytes); - I_ReadOnlyProperty(unsigned int, TotalSizeInBytes); - I_ReadOnlyProperty(unsigned int, TotalSizeInBytesIncludingMipmaps); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< unsigned int >); +BEGIN_VALUE_REFLECTOR(osg::Image) + I_Constructor0(); +END_REFLECTOR diff --git a/src/osgWrappers/osg/ImageStream.cpp b/src/osgWrappers/osg/ImageStream.cpp index 6567558f8..4e9a7f33e 100644 --- a/src/osgWrappers/osg/ImageStream.cpp +++ b/src/osgWrappers/osg/ImageStream.cpp @@ -9,10 +9,7 @@ #include #include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -22,43 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::ImageStream::StreamStatus) - I_EnumLabel(osg::ImageStream::INVALID); - I_EnumLabel(osg::ImageStream::PLAYING); - I_EnumLabel(osg::ImageStream::PAUSED); - I_EnumLabel(osg::ImageStream::REWINDING); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::ImageStream::LoopingMode) - I_EnumLabel(osg::ImageStream::NO_LOOPING); - I_EnumLabel(osg::ImageStream::LOOPING); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::ImageStream) - I_BaseType(osg::Image); +BEGIN_VALUE_REFLECTOR(osg::ImageStream) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ImageStream) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::ImageStream &, image, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(int, compare, IN, const osg::Image &, rhs); - I_Method0(void, play); - I_Method0(void, pause); - I_Method0(void, rewind); - I_MethodWithDefaults1(void, quit, IN, bool, x, true); - I_Method0(osg::ImageStream::StreamStatus, getStatus); - I_Method1(void, setLoopingMode, IN, osg::ImageStream::LoopingMode, mode); - I_Method0(osg::ImageStream::LoopingMode, getLoopingMode); - I_Method1(void, setReferenceTime, IN, double, x); - I_Method0(double, getReferenceTime); - I_Method1(void, setTimeMultiplier, IN, double, x); - I_Method0(double, getTimeMultiplier); - I_Method0(void, update); - I_Property(osg::ImageStream::LoopingMode, LoopingMode); - I_Property(double, ReferenceTime); - I_ReadOnlyProperty(osg::ImageStream::StreamStatus, Status); - I_Property(double, TimeMultiplier); END_REFLECTOR diff --git a/src/osgWrappers/osg/LOD.cpp b/src/osgWrappers/osg/LOD.cpp index 7804e08b8..eb29672e4 100644 --- a/src/osgWrappers/osg/LOD.cpp +++ b/src/osgWrappers/osg/LOD.cpp @@ -9,13 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -25,57 +19,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::pair< float COMMA float >, osg::LOD::MinMaxPair); - -TYPE_NAME_ALIAS(std::vector< osg::LOD::MinMaxPair >, osg::LOD::RangeList); - -BEGIN_ENUM_REFLECTOR(osg::LOD::CenterMode) - I_EnumLabel(osg::LOD::USE_BOUNDING_SPHERE_CENTER); - I_EnumLabel(osg::LOD::USER_DEFINED_CENTER); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::LOD::RangeMode) - I_EnumLabel(osg::LOD::DISTANCE_FROM_EYE_POINT); - I_EnumLabel(osg::LOD::PIXEL_SIZE_ON_SCREEN); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::LOD) - I_BaseType(osg::Group); +BEGIN_VALUE_REFLECTOR(osg::LOD) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::LOD &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); - I_Method1(bool, addChild, IN, osg::Node *, child); - I_Method3(bool, addChild, IN, osg::Node *, child, IN, float, min, IN, float, max); - I_MethodWithDefaults2(bool, removeChildren, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1); - I_Method1(void, setCenterMode, IN, osg::LOD::CenterMode, mode); - I_Method0(osg::LOD::CenterMode, getCenterMode); - I_Method1(void, setCenter, IN, const osg::Vec3 &, center); - I_Method0(const osg::Vec3 &, getCenter); - I_Method1(void, setRadius, IN, float, radius); - I_Method0(float, getRadius); - I_Method1(void, setRangeMode, IN, osg::LOD::RangeMode, mode); - I_Method0(osg::LOD::RangeMode, getRangeMode); - I_Method3(void, setRange, IN, unsigned int, childNo, IN, float, min, IN, float, max); - I_Method1(float, getMinRange, IN, unsigned int, childNo); - I_Method1(float, getMaxRange, IN, unsigned int, childNo); - I_Method0(unsigned int, getNumRanges); - I_Method1(void, setRangeList, IN, const osg::LOD::RangeList &, rangeList); - I_Method0(const osg::LOD::RangeList &, getRangeList); - I_Method0(osg::BoundingSphere, computeBound); - I_Property(const osg::Vec3 &, Center); - I_Property(osg::LOD::CenterMode, CenterMode); - I_Property(float, Radius); - I_Property(const osg::LOD::RangeList &, RangeList); - I_Property(osg::LOD::RangeMode, RangeMode); END_REFLECTOR -STD_PAIR_REFLECTOR(std::pair< float COMMA float >); - -STD_VECTOR_REFLECTOR(std::vector< osg::LOD::MinMaxPair >); +BEGIN_VALUE_REFLECTOR(osg::LOD) + I_Constructor0(); +END_REFLECTOR diff --git a/src/osgWrappers/osg/Light.cpp b/src/osgWrappers/osg/Light.cpp index 5852f27b1..05b4e1997 100644 --- a/src/osgWrappers/osg/Light.cpp +++ b/src/osgWrappers/osg/Light.cpp @@ -9,13 +9,7 @@ #include #include -#include #include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -25,55 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::Light) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::Light) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Light) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Light &, light, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method0(unsigned int, getMember); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(void, setLightNum, IN, int, num); - I_Method0(int, getLightNum); - I_Method1(void, setAmbient, IN, const osg::Vec4 &, ambient); - I_Method0(const osg::Vec4 &, getAmbient); - I_Method1(void, setDiffuse, IN, const osg::Vec4 &, diffuse); - I_Method0(const osg::Vec4 &, getDiffuse); - I_Method1(void, setSpecular, IN, const osg::Vec4 &, specular); - I_Method0(const osg::Vec4 &, getSpecular); - I_Method1(void, setPosition, IN, const osg::Vec4 &, position); - I_Method0(const osg::Vec4 &, getPosition); - I_Method1(void, setDirection, IN, const osg::Vec3 &, direction); - I_Method0(const osg::Vec3 &, getDirection); - I_Method1(void, setConstantAttenuation, IN, float, constant_attenuation); - I_Method0(float, getConstantAttenuation); - I_Method1(void, setLinearAttenuation, IN, float, linear_attenuation); - I_Method0(float, getLinearAttenuation); - I_Method1(void, setQuadraticAttenuation, IN, float, quadratic_attenuation); - I_Method0(float, getQuadraticAttenuation); - I_Method1(void, setSpotExponent, IN, float, spot_exponent); - I_Method0(float, getSpotExponent); - I_Method1(void, setSpotCutoff, IN, float, spot_cutoff); - I_Method0(float, getSpotCutoff); - I_Method0(void, captureLightState); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(const osg::Vec4 &, Ambient); - I_Property(float, ConstantAttenuation); - I_Property(const osg::Vec4 &, Diffuse); - I_Property(const osg::Vec3 &, Direction); - I_Property(int, LightNum); - I_Property(float, LinearAttenuation); - I_ReadOnlyProperty(unsigned int, Member); - I_Property(const osg::Vec4 &, Position); - I_Property(float, QuadraticAttenuation); - I_Property(const osg::Vec4 &, Specular); - I_Property(float, SpotCutoff); - I_Property(float, SpotExponent); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/LightModel.cpp b/src/osgWrappers/osg/LightModel.cpp index fdf6a0840..4bf888fb5 100644 --- a/src/osgWrappers/osg/LightModel.cpp +++ b/src/osgWrappers/osg/LightModel.cpp @@ -9,12 +9,7 @@ #include #include -#include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -24,35 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::LightModel::ColorControl) - I_EnumLabel(osg::LightModel::SEPARATE_SPECULAR_COLOR); - I_EnumLabel(osg::LightModel::SINGLE_COLOR); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::LightModel) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::LightModel) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::LightModel) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::LightModel &, lw, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(void, setAmbientIntensity, IN, const osg::Vec4 &, ambient); - I_Method0(const osg::Vec4 &, getAmbientIntensity); - I_Method1(void, setColorControl, IN, osg::LightModel::ColorControl, cc); - I_Method0(osg::LightModel::ColorControl, getColorControl); - I_Method1(void, setLocalViewer, IN, bool, localViewer); - I_Method0(bool, getLocalViewer); - I_Method1(void, setTwoSided, IN, bool, twoSided); - I_Method0(bool, getTwoSided); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(const osg::Vec4 &, AmbientIntensity); - I_Property(osg::LightModel::ColorControl, ColorControl); - I_Property(bool, LocalViewer); - I_Property(bool, TwoSided); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/LightSource.cpp b/src/osgWrappers/osg/LightSource.cpp index 85e1b273a..8e7e17744 100644 --- a/src/osgWrappers/osg/LightSource.cpp +++ b/src/osgWrappers/osg/LightSource.cpp @@ -9,14 +9,7 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -26,31 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::LightSource::ReferenceFrame) - I_EnumLabel(osg::LightSource::RELATIVE_RF); - I_EnumLabel(osg::LightSource::ABSOLUTE_RF); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::LightSource) - I_BaseType(osg::Group); +BEGIN_VALUE_REFLECTOR(osg::LightSource) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::LightSource) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::LightSource &, ls, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, setReferenceFrame, IN, osg::LightSource::ReferenceFrame, rf); - I_Method0(osg::LightSource::ReferenceFrame, getReferenceFrame); - I_Method1(void, setLight, IN, osg::Light *, light); - I_Method0(osg::Light *, getLight); - I_Method0(const osg::Light *, getLight); - I_Method2(void, setStateSetModes, IN, osg::StateSet &, x, IN, osg::StateAttribute::GLModeValue, x); - I_MethodWithDefaults1(void, setLocalStateSetModes, IN, osg::StateAttribute::GLModeValue, value, osg::StateAttribute::ON); - I_Method0(osg::BoundingSphere, computeBound); - I_Property(osg::Light *, Light); - I_WriteOnlyProperty(osg::StateAttribute::GLModeValue, LocalStateSetModes); - I_Property(osg::LightSource::ReferenceFrame, ReferenceFrame); END_REFLECTOR diff --git a/src/osgWrappers/osg/LineSegment.cpp b/src/osgWrappers/osg/LineSegment.cpp index 8189f765e..b92756a95 100644 --- a/src/osgWrappers/osg/LineSegment.cpp +++ b/src/osgWrappers/osg/LineSegment.cpp @@ -9,11 +9,7 @@ #include #include -#include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,23 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::LineSegment) - I_BaseType(osg::Referenced); +BEGIN_VALUE_REFLECTOR(osg::LineSegment) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::LineSegment) I_Constructor0(); - I_Constructor1(IN, const osg::LineSegment &, seg); - I_Constructor2(IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e); - I_Method2(void, set, IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e); - I_Method0(osg::Vec3 &, start); - I_Method0(const osg::Vec3 &, start); - I_Method0(osg::Vec3 &, end); - I_Method0(const osg::Vec3 &, end); - I_Method0(bool, valid); - I_Method1(bool, intersect, IN, const osg::BoundingBox &, bb); - I_Method3(bool, intersect, IN, const osg::BoundingBox &, bb, IN, float &, r1, IN, float &, r2); - I_Method1(bool, intersect, IN, const osg::BoundingSphere &, bs); - I_Method3(bool, intersect, IN, const osg::BoundingSphere &, bs, IN, float &, r1, IN, float &, r2); - I_Method4(bool, intersect, IN, const osg::Vec3 &, v1, IN, const osg::Vec3 &, v2, IN, const osg::Vec3 &, v3, IN, float &, r); - I_Method2(void, mult, IN, const osg::LineSegment &, seg, IN, const osg::Matrix &, m); - I_Method2(void, mult, IN, const osg::Matrix &, m, IN, const osg::LineSegment &, seg); END_REFLECTOR diff --git a/src/osgWrappers/osg/LineStipple.cpp b/src/osgWrappers/osg/LineStipple.cpp index a959bb216..ed5d2650b 100644 --- a/src/osgWrappers/osg/LineStipple.cpp +++ b/src/osgWrappers/osg/LineStipple.cpp @@ -9,11 +9,7 @@ #include #include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,25 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::LineStipple) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::LineStipple) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::LineStipple) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::LineStipple &, lw, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(void, setFactor, IN, GLint, factor); - I_Method0(GLint, getFactor); - I_Method1(void, setPattern, IN, GLushort, pattern); - I_Method0(GLushort, getPattern); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(GLint, Factor); - I_Property(GLushort, Pattern); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/LineWidth.cpp b/src/osgWrappers/osg/LineWidth.cpp index f839c30ca..5ffb0030d 100644 --- a/src/osgWrappers/osg/LineWidth.cpp +++ b/src/osgWrappers/osg/LineWidth.cpp @@ -9,11 +9,7 @@ #include #include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,21 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::LineWidth) - I_BaseType(osg::StateAttribute); - I_ConstructorWithDefaults1(IN, float, width, 1.0f); - I_ConstructorWithDefaults2(IN, const osg::LineWidth &, lw, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(void, setWidth, IN, float, width); - I_Method0(float, getWidth); - I_Method1(void, apply, IN, osg::State &, state); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); - I_Property(float, Width); +BEGIN_VALUE_REFLECTOR(osg::LineWidth) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::LineWidth) + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osg/LogicOp.cpp b/src/osgWrappers/osg/LogicOp.cpp index a76e1fd0a..3e453ee45 100644 --- a/src/osgWrappers/osg/LogicOp.cpp +++ b/src/osgWrappers/osg/LogicOp.cpp @@ -9,11 +9,7 @@ #include #include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,42 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::LogicOp::Opcode) - I_EnumLabel(osg::LogicOp::CLEAR); - I_EnumLabel(osg::LogicOp::SET); - I_EnumLabel(osg::LogicOp::COPY); - I_EnumLabel(osg::LogicOp::COPY_INVERTED); - I_EnumLabel(osg::LogicOp::NOOP); - I_EnumLabel(osg::LogicOp::INVERT); - I_EnumLabel(osg::LogicOp::AND); - I_EnumLabel(osg::LogicOp::NAND); - I_EnumLabel(osg::LogicOp::OR); - I_EnumLabel(osg::LogicOp::NOR); - I_EnumLabel(osg::LogicOp::XOR); - I_EnumLabel(osg::LogicOp::EQUIV); - I_EnumLabel(osg::LogicOp::AND_REVERSE); - I_EnumLabel(osg::LogicOp::AND_INVERTED); - I_EnumLabel(osg::LogicOp::OR_REVERSE); - I_EnumLabel(osg::LogicOp::OR_INVERTED); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::LogicOp) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::LogicOp) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::LogicOp) I_Constructor0(); - I_Constructor1(IN, osg::LogicOp::Opcode, opcode); - I_ConstructorWithDefaults2(IN, const osg::LogicOp &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(void, setOpcode, IN, osg::LogicOp::Opcode, opcode); - I_Method0(osg::LogicOp::Opcode, getOpcode); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(osg::LogicOp::Opcode, Opcode); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/Material.cpp b/src/osgWrappers/osg/Material.cpp index 1115351b3..fba3db067 100644 --- a/src/osgWrappers/osg/Material.cpp +++ b/src/osgWrappers/osg/Material.cpp @@ -9,12 +9,7 @@ #include #include -#include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -24,64 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::Material::Face) - I_EnumLabel(osg::Material::FRONT); - I_EnumLabel(osg::Material::BACK); - I_EnumLabel(osg::Material::FRONT_AND_BACK); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::Material::ColorMode) - I_EnumLabel(osg::Material::AMBIENT); - I_EnumLabel(osg::Material::DIFFUSE); - I_EnumLabel(osg::Material::SPECULAR); - I_EnumLabel(osg::Material::EMISSION); - I_EnumLabel(osg::Material::AMBIENT_AND_DIFFUSE); - I_EnumLabel(osg::Material::OFF); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Material) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::Material) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Material) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Material &, mat, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(void, apply, IN, osg::State &, state); - I_Method1(void, setColorMode, IN, osg::Material::ColorMode, mode); - I_Method0(osg::Material::ColorMode, getColorMode); - I_Method2(void, setAmbient, IN, osg::Material::Face, face, IN, const osg::Vec4 &, ambient); - I_Method1(const osg::Vec4 &, getAmbient, IN, osg::Material::Face, face); - I_Method0(bool, getAmbientFrontAndBack); - I_Method2(void, setDiffuse, IN, osg::Material::Face, face, IN, const osg::Vec4 &, diffuse); - I_Method1(const osg::Vec4 &, getDiffuse, IN, osg::Material::Face, face); - I_Method0(bool, getDiffuseFrontAndBack); - I_Method2(void, setSpecular, IN, osg::Material::Face, face, IN, const osg::Vec4 &, specular); - I_Method1(const osg::Vec4 &, getSpecular, IN, osg::Material::Face, face); - I_Method0(bool, getSpecularFrontAndBack); - I_Method2(void, setEmission, IN, osg::Material::Face, face, IN, const osg::Vec4 &, emission); - I_Method1(const osg::Vec4 &, getEmission, IN, osg::Material::Face, face); - I_Method0(bool, getEmissionFrontAndBack); - I_Method2(void, setShininess, IN, osg::Material::Face, face, IN, float, shininess); - I_Method1(float, getShininess, IN, osg::Material::Face, face); - I_Method0(bool, getShininessFrontAndBack); - I_Method2(void, setTransparency, IN, osg::Material::Face, face, IN, float, trans); - I_Method2(void, setAlpha, IN, osg::Material::Face, face, IN, float, alpha); - I_IndexedProperty1(const osg::Vec4 &, Ambient, osg::Material::Face, face); - I_ReadOnlyProperty(bool, AmbientFrontAndBack); - I_Property(osg::Material::ColorMode, ColorMode); - I_IndexedProperty1(const osg::Vec4 &, Diffuse, osg::Material::Face, face); - I_ReadOnlyProperty(bool, DiffuseFrontAndBack); - I_IndexedProperty1(const osg::Vec4 &, Emission, osg::Material::Face, face); - I_ReadOnlyProperty(bool, EmissionFrontAndBack); - I_IndexedProperty1(float, Shininess, osg::Material::Face, face); - I_ReadOnlyProperty(bool, ShininessFrontAndBack); - I_IndexedProperty1(const osg::Vec4 &, Specular, osg::Material::Face, face); - I_ReadOnlyProperty(bool, SpecularFrontAndBack); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/MatrixTransform.cpp b/src/osgWrappers/osg/MatrixTransform.cpp index 3eb67f6e1..360d3377b 100644 --- a/src/osgWrappers/osg/MatrixTransform.cpp +++ b/src/osgWrappers/osg/MatrixTransform.cpp @@ -9,11 +9,7 @@ #include #include -#include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,27 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::MatrixTransform) - I_BaseType(osg::Transform); +BEGIN_VALUE_REFLECTOR(osg::MatrixTransform) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::MatrixTransform) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::MatrixTransform &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Constructor1(IN, const osg::Matrix &, matix); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method0(osg::MatrixTransform *, asMatrixTransform); - I_Method0(const osg::MatrixTransform *, asMatrixTransform); - I_Method1(void, setMatrix, IN, const osg::Matrix &, mat); - I_Method0(const osg::Matrix &, getMatrix); - I_Method1(void, preMult, IN, const osg::Matrix &, mat); - I_Method1(void, postMult, IN, const osg::Matrix &, mat); - I_Method0(const osg::Matrix &, getInverseMatrix); - I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); - I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); - I_ReadOnlyProperty(const osg::Matrix &, InverseMatrix); - I_Property(const osg::Matrix &, Matrix); END_REFLECTOR diff --git a/src/osgWrappers/osg/Matrixd.cpp b/src/osgWrappers/osg/Matrixd.cpp index 8194c1bf0..811b85d3a 100644 --- a/src/osgWrappers/osg/Matrixd.cpp +++ b/src/osgWrappers/osg/Matrixd.cpp @@ -9,15 +9,7 @@ #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -27,91 +19,19 @@ #undef OUT #endif -TYPE_NAME_ALIAS(double, osg::Matrixd::value_type); +BEGIN_VALUE_REFLECTOR(osg::Matrixd) + I_Constructor0(); +END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::Matrixd) I_Constructor0(); - I_Constructor1(IN, const osg::Matrixd &, mat); - I_Constructor1(IN, const osg::Matrixf &, mat); - I_Constructor1(IN, float const *const, ptr); - I_Constructor1(IN, double const *const, ptr); - I_Constructor1(IN, const osg::Quat &, quat); - I_Constructor16(IN, osg::Matrixd::value_type, a00, IN, osg::Matrixd::value_type, a01, IN, osg::Matrixd::value_type, a02, IN, osg::Matrixd::value_type, a03, IN, osg::Matrixd::value_type, a10, IN, osg::Matrixd::value_type, a11, IN, osg::Matrixd::value_type, a12, IN, osg::Matrixd::value_type, a13, IN, osg::Matrixd::value_type, a20, IN, osg::Matrixd::value_type, a21, IN, osg::Matrixd::value_type, a22, IN, osg::Matrixd::value_type, a23, IN, osg::Matrixd::value_type, a30, IN, osg::Matrixd::value_type, a31, IN, osg::Matrixd::value_type, a32, IN, osg::Matrixd::value_type, a33); - I_Method1(int, compare, IN, const osg::Matrixd &, m); - I_Method0(bool, valid); - I_Method0(bool, isNaN); - I_Method1(void, set, IN, const osg::Matrixd &, rhs); - I_Method1(void, set, IN, const osg::Matrixf &, rhs); - I_Method1(void, set, IN, float const *const, ptr); - I_Method1(void, set, IN, double const *const, ptr); - I_Method16(void, set, IN, osg::Matrixd::value_type, a00, IN, osg::Matrixd::value_type, a01, IN, osg::Matrixd::value_type, a02, IN, osg::Matrixd::value_type, a03, IN, osg::Matrixd::value_type, a10, IN, osg::Matrixd::value_type, a11, IN, osg::Matrixd::value_type, a12, IN, osg::Matrixd::value_type, a13, IN, osg::Matrixd::value_type, a20, IN, osg::Matrixd::value_type, a21, IN, osg::Matrixd::value_type, a22, IN, osg::Matrixd::value_type, a23, IN, osg::Matrixd::value_type, a30, IN, osg::Matrixd::value_type, a31, IN, osg::Matrixd::value_type, a32, IN, osg::Matrixd::value_type, a33); - I_Method1(void, set, IN, const osg::Quat &, q); - I_Method1(void, get, IN, osg::Quat &, q); - I_Method0(osg::Matrixd::value_type *, ptr); - I_Method0(const osg::Matrixd::value_type *, ptr); - I_Method0(void, makeIdentity); - I_Method1(void, makeScale, IN, const osg::Vec3f &, x); - I_Method1(void, makeScale, IN, const osg::Vec3d &, x); - I_Method3(void, makeScale, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, x); - I_Method1(void, makeTranslate, IN, const osg::Vec3f &, x); - I_Method1(void, makeTranslate, IN, const osg::Vec3d &, x); - I_Method3(void, makeTranslate, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, x); - I_Method2(void, makeRotate, IN, const osg::Vec3f &, from, IN, const osg::Vec3f &, to); - I_Method2(void, makeRotate, IN, const osg::Vec3d &, from, IN, const osg::Vec3d &, to); - I_Method2(void, makeRotate, IN, osg::Matrixd::value_type, angle, IN, const osg::Vec3f &, axis); - I_Method2(void, makeRotate, IN, osg::Matrixd::value_type, angle, IN, const osg::Vec3d &, axis); - I_Method4(void, makeRotate, 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_Method1(void, makeRotate, IN, const osg::Quat &, x); - I_Method6(void, makeRotate, 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_Method6(void, makeRotate, 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_Method6(void, makeOrtho, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - I_Method6(bool, getOrtho, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - I_Method4(void, makeOrtho2D, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top); - I_Method6(void, makeFrustum, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - I_Method6(bool, getFrustum, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - I_Method4(void, makePerspective, IN, double, fovy, IN, double, aspectRatio, IN, double, zNear, IN, double, zFar); - I_Method4(bool, getPerspective, IN, double &, fovy, IN, double &, aspectRatio, IN, double &, zNear, IN, double &, zFar); - I_Method3(void, makeLookAt, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, center, IN, const osg::Vec3d &, up); - I_MethodWithDefaults4(void, getLookAt, IN, osg::Vec3f &, eye, , IN, osg::Vec3f &, center, , IN, osg::Vec3f &, up, , IN, osg::Matrixd::value_type, lookDistance, 1.0f); - I_MethodWithDefaults4(void, getLookAt, IN, osg::Vec3d &, eye, , IN, osg::Vec3d &, center, , IN, osg::Vec3d &, up, , IN, osg::Matrixd::value_type, lookDistance, 1.0f); - I_Method1(bool, invert, IN, const osg::Matrixd &, rhs); - I_Method1(bool, invert_4x4_orig, IN, const osg::Matrixd &, x); - I_Method1(bool, invert_4x4_new, IN, const osg::Matrixd &, x); - I_Method1(void, orthoNormalize, IN, const osg::Matrixd &, rhs); - I_Method1(osg::Vec3f, preMult, IN, const osg::Vec3f &, v); - I_Method1(osg::Vec3d, preMult, IN, const osg::Vec3d &, v); - I_Method1(osg::Vec3f, postMult, IN, const osg::Vec3f &, v); - I_Method1(osg::Vec3d, postMult, IN, const osg::Vec3d &, v); - I_Method1(osg::Vec4f, preMult, IN, const osg::Vec4f &, v); - I_Method1(osg::Vec4d, preMult, IN, const osg::Vec4d &, v); - I_Method1(osg::Vec4f, postMult, IN, const osg::Vec4f &, v); - I_Method1(osg::Vec4d, postMult, IN, const osg::Vec4d &, v); - I_Method3(void, setTrans, IN, osg::Matrixd::value_type, tx, IN, osg::Matrixd::value_type, ty, IN, osg::Matrixd::value_type, tz); - I_Method1(void, setTrans, IN, const osg::Vec3f &, v); - I_Method1(void, setTrans, IN, const osg::Vec3d &, v); - I_Method0(osg::Vec3d, getTrans); - I_Method0(osg::Vec3d, getScale); - 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_WriteOnlyProperty(float const *const, ); - I_ReadOnlyProperty(osg::Vec3d, Scale); - I_ReadOnlyProperty(osg::Vec3d, Trans); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::RefMatrixd) - I_BaseType(osg::Object); - I_BaseType(osg::Matrixd); +BEGIN_VALUE_REFLECTOR(osg::RefMatrixd) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::RefMatrixd) I_Constructor0(); - I_Constructor1(IN, const osg::Matrixd &, other); - I_Constructor1(IN, const osg::Matrixf &, other); - I_Constructor1(IN, const osg::RefMatrixd &, other); - I_Constructor1(IN, osg::Matrixd::value_type const *const, def); - I_Constructor16(IN, osg::Matrixd::value_type, a00, IN, osg::Matrixd::value_type, a01, IN, osg::Matrixd::value_type, a02, IN, osg::Matrixd::value_type, a03, IN, osg::Matrixd::value_type, a10, IN, osg::Matrixd::value_type, a11, IN, osg::Matrixd::value_type, a12, IN, osg::Matrixd::value_type, a13, IN, osg::Matrixd::value_type, a20, IN, osg::Matrixd::value_type, a21, IN, osg::Matrixd::value_type, a22, IN, osg::Matrixd::value_type, a23, IN, osg::Matrixd::value_type, a30, IN, osg::Matrixd::value_type, a31, IN, osg::Matrixd::value_type, a32, IN, osg::Matrixd::value_type, a33); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); END_REFLECTOR diff --git a/src/osgWrappers/osg/Matrixf.cpp b/src/osgWrappers/osg/Matrixf.cpp index 936350aff..554bd504f 100644 --- a/src/osgWrappers/osg/Matrixf.cpp +++ b/src/osgWrappers/osg/Matrixf.cpp @@ -9,15 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -27,91 +19,19 @@ #undef OUT #endif -TYPE_NAME_ALIAS(float, osg::Matrixf::value_type); +BEGIN_VALUE_REFLECTOR(osg::Matrixf) + I_Constructor0(); +END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::Matrixf) I_Constructor0(); - I_Constructor1(IN, const osg::Matrixf &, mat); - I_Constructor1(IN, const osg::Matrixd &, mat); - I_Constructor1(IN, float const *const, ptr); - I_Constructor1(IN, double const *const, ptr); - I_Constructor1(IN, const osg::Quat &, quat); - I_Constructor16(IN, osg::Matrixf::value_type, a00, IN, osg::Matrixf::value_type, a01, IN, osg::Matrixf::value_type, a02, IN, osg::Matrixf::value_type, a03, IN, osg::Matrixf::value_type, a10, IN, osg::Matrixf::value_type, a11, IN, osg::Matrixf::value_type, a12, IN, osg::Matrixf::value_type, a13, IN, osg::Matrixf::value_type, a20, IN, osg::Matrixf::value_type, a21, IN, osg::Matrixf::value_type, a22, IN, osg::Matrixf::value_type, a23, IN, osg::Matrixf::value_type, a30, IN, osg::Matrixf::value_type, a31, IN, osg::Matrixf::value_type, a32, IN, osg::Matrixf::value_type, a33); - I_Method1(int, compare, IN, const osg::Matrixf &, m); - I_Method0(bool, valid); - I_Method0(bool, isNaN); - I_Method1(void, set, IN, const osg::Matrixf &, rhs); - I_Method1(void, set, IN, const osg::Matrixd &, rhs); - I_Method1(void, set, IN, float const *const, ptr); - I_Method1(void, set, IN, double const *const, ptr); - I_Method16(void, set, IN, osg::Matrixf::value_type, a00, IN, osg::Matrixf::value_type, a01, IN, osg::Matrixf::value_type, a02, IN, osg::Matrixf::value_type, a03, IN, osg::Matrixf::value_type, a10, IN, osg::Matrixf::value_type, a11, IN, osg::Matrixf::value_type, a12, IN, osg::Matrixf::value_type, a13, IN, osg::Matrixf::value_type, a20, IN, osg::Matrixf::value_type, a21, IN, osg::Matrixf::value_type, a22, IN, osg::Matrixf::value_type, a23, IN, osg::Matrixf::value_type, a30, IN, osg::Matrixf::value_type, a31, IN, osg::Matrixf::value_type, a32, IN, osg::Matrixf::value_type, a33); - I_Method1(void, set, IN, const osg::Quat &, q); - I_Method1(void, get, IN, osg::Quat &, q); - I_Method0(osg::Matrixf::value_type *, ptr); - I_Method0(const osg::Matrixf::value_type *, ptr); - I_Method0(void, makeIdentity); - I_Method1(void, makeScale, IN, const osg::Vec3f &, x); - I_Method1(void, makeScale, IN, const osg::Vec3d &, x); - I_Method3(void, makeScale, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, x); - I_Method1(void, makeTranslate, IN, const osg::Vec3f &, x); - I_Method1(void, makeTranslate, IN, const osg::Vec3d &, x); - I_Method3(void, makeTranslate, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, x); - I_Method2(void, makeRotate, IN, const osg::Vec3f &, from, IN, const osg::Vec3f &, to); - I_Method2(void, makeRotate, IN, const osg::Vec3d &, from, IN, const osg::Vec3d &, to); - I_Method2(void, makeRotate, IN, osg::Matrixf::value_type, angle, IN, const osg::Vec3f &, axis); - I_Method2(void, makeRotate, IN, osg::Matrixf::value_type, angle, IN, const osg::Vec3d &, axis); - I_Method4(void, makeRotate, 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_Method1(void, makeRotate, IN, const osg::Quat &, x); - I_Method6(void, makeRotate, 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_Method6(void, makeRotate, 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_Method6(void, makeOrtho, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - I_Method6(bool, getOrtho, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - I_Method4(void, makeOrtho2D, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top); - I_Method6(void, makeFrustum, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - I_Method6(bool, getFrustum, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - I_Method4(void, makePerspective, IN, double, fovy, IN, double, aspectRatio, IN, double, zNear, IN, double, zFar); - I_Method4(bool, getPerspective, IN, double &, fovy, IN, double &, aspectRatio, IN, double &, zNear, IN, double &, zFar); - I_Method3(void, makeLookAt, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, center, IN, const osg::Vec3d &, up); - I_MethodWithDefaults4(void, getLookAt, IN, osg::Vec3f &, eye, , IN, osg::Vec3f &, center, , IN, osg::Vec3f &, up, , IN, osg::Matrixf::value_type, lookDistance, 1.0f); - I_MethodWithDefaults4(void, getLookAt, IN, osg::Vec3d &, eye, , IN, osg::Vec3d &, center, , IN, osg::Vec3d &, up, , IN, osg::Matrixf::value_type, lookDistance, 1.0f); - I_Method1(bool, invert, IN, const osg::Matrixf &, rhs); - I_Method1(bool, invert_4x4_orig, IN, const osg::Matrixf &, x); - I_Method1(bool, invert_4x4_new, IN, const osg::Matrixf &, x); - I_Method1(void, orthoNormalize, IN, const osg::Matrixf &, rhs); - I_Method1(osg::Vec3f, preMult, IN, const osg::Vec3f &, v); - I_Method1(osg::Vec3d, preMult, IN, const osg::Vec3d &, v); - I_Method1(osg::Vec3f, postMult, IN, const osg::Vec3f &, v); - I_Method1(osg::Vec3d, postMult, IN, const osg::Vec3d &, v); - I_Method1(osg::Vec4f, preMult, IN, const osg::Vec4f &, v); - I_Method1(osg::Vec4d, preMult, IN, const osg::Vec4d &, v); - I_Method1(osg::Vec4f, postMult, IN, const osg::Vec4f &, v); - I_Method1(osg::Vec4d, postMult, IN, const osg::Vec4d &, v); - I_Method3(void, setTrans, IN, osg::Matrixf::value_type, tx, IN, osg::Matrixf::value_type, ty, IN, osg::Matrixf::value_type, tz); - I_Method1(void, setTrans, IN, const osg::Vec3f &, v); - I_Method1(void, setTrans, IN, const osg::Vec3d &, v); - I_Method0(osg::Vec3d, getTrans); - I_Method0(osg::Vec3d, getScale); - 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_WriteOnlyProperty(float const *const, ); - I_ReadOnlyProperty(osg::Vec3d, Scale); - I_ReadOnlyProperty(osg::Vec3d, Trans); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::RefMatrixf) - I_BaseType(osg::Object); - I_BaseType(osg::Matrixf); +BEGIN_VALUE_REFLECTOR(osg::RefMatrixf) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::RefMatrixf) I_Constructor0(); - I_Constructor1(IN, const osg::Matrixf &, other); - I_Constructor1(IN, const osg::Matrixd &, other); - I_Constructor1(IN, const osg::RefMatrixf &, other); - I_Constructor1(IN, osg::Matrixf::value_type const *const, def); - I_Constructor16(IN, osg::Matrixf::value_type, a00, IN, osg::Matrixf::value_type, a01, IN, osg::Matrixf::value_type, a02, IN, osg::Matrixf::value_type, a03, IN, osg::Matrixf::value_type, a10, IN, osg::Matrixf::value_type, a11, IN, osg::Matrixf::value_type, a12, IN, osg::Matrixf::value_type, a13, IN, osg::Matrixf::value_type, a20, IN, osg::Matrixf::value_type, a21, IN, osg::Matrixf::value_type, a22, IN, osg::Matrixf::value_type, a23, IN, osg::Matrixf::value_type, a30, IN, osg::Matrixf::value_type, a31, IN, osg::Matrixf::value_type, a32, IN, osg::Matrixf::value_type, a33); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); END_REFLECTOR diff --git a/src/osgWrappers/osg/Multisample.cpp b/src/osgWrappers/osg/Multisample.cpp index fa62c6d22..7a8dcd06f 100644 --- a/src/osgWrappers/osg/Multisample.cpp +++ b/src/osgWrappers/osg/Multisample.cpp @@ -9,11 +9,7 @@ #include #include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,52 +19,19 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::Multisample::Mode) - I_EnumLabel(osg::Multisample::FASTEST); - I_EnumLabel(osg::Multisample::NICEST); - I_EnumLabel(osg::Multisample::DONT_CARE); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Multisample) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::Multisample) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Multisample &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method2(void, setSampleCoverage, IN, float, coverage, IN, bool, invert); - I_Method1(void, setCoverage, IN, float, coverage); - I_Method0(float, getCoverage); - I_Method1(void, setInvert, IN, bool, invert); - I_Method0(bool, getInvert); - I_Method1(void, setHint, IN, osg::Multisample::Mode, mode); - I_Method0(osg::Multisample::Mode, getHint); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(float, Coverage); - I_Property(osg::Multisample::Mode, Hint); - I_Property(bool, Invert); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Multisample::Extensions) - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID); - I_Constructor1(IN, const osg::Multisample::Extensions &, rhs); - I_Method1(void, lowestCommonDenominator, IN, const osg::Multisample::Extensions &, rhs); - I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); - I_Method1(void, setMultisampleSupported, IN, bool, flag); - I_Method1(void, setMultisampleFilterHintSupported, IN, bool, flag); - I_Method0(bool, isMultisampleSupported); - I_Method0(bool, isMultisampleFilterHintSupported); - I_Method1(void, setSampleCoverageProc, IN, void *, ptr); - I_Method2(void, glSampleCoverage, IN, GLclampf, value, IN, GLboolean, invert); - I_WriteOnlyProperty(bool, MultisampleFilterHintSupported); - I_WriteOnlyProperty(bool, MultisampleSupported); - I_WriteOnlyProperty(void *, SampleCoverageProc); - I_WriteOnlyProperty(unsigned int, upGLExtenions); +BEGIN_VALUE_REFLECTOR(osg::Multisample) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Multisample::Extensions) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Multisample::Extensions) + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index 6f857026e..d3fdc7f5a 100644 --- a/src/osgWrappers/osg/Node.cpp +++ b/src/osgWrappers/osg/Node.cpp @@ -9,16 +9,7 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -28,99 +19,20 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Group * >, osg::Node::ParentList); - -TYPE_NAME_ALIAS(unsigned int, osg::Node::NodeMask); - -TYPE_NAME_ALIAS(std::vector< std::string >, osg::Node::DescriptionList); - -BEGIN_OBJECT_REFLECTOR(osg::Node) - I_BaseType(osg::Object); +BEGIN_VALUE_REFLECTOR(osg::Node) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Node &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::Group *, asGroup); - I_Method0(const osg::Group *, asGroup); - I_Method0(osg::Transform *, asTransform); - I_Method0(const osg::Transform *, asTransform); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, ascend, IN, osg::NodeVisitor &, nv); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x); - I_Method0(const osg::Node::ParentList &, getParents); - I_Method0(osg::Node::ParentList, getParents); - I_Method1(osg::Group *, getParent, IN, unsigned int, i); - I_Method1(const osg::Group *, getParent, IN, unsigned int, i); - I_Method0(unsigned int, getNumParents); - I_MethodWithDefaults1(osg::NodePathList, getParentalNodePaths, IN, osg::Node *, haltTraversalAtNode, 0); - I_MethodWithDefaults1(osg::MatrixList, getWorldMatrices, IN, osg::Node *, haltTraversalAtNode, 0); - I_Method1(void, setUpdateCallback, IN, osg::NodeCallback *, nc); - I_Method0(osg::NodeCallback *, getUpdateCallback); - I_Method0(const osg::NodeCallback *, getUpdateCallback); - I_Method0(unsigned int, getNumChildrenRequiringUpdateTraversal); - I_Method1(void, setEventCallback, IN, osg::NodeCallback *, nc); - I_Method0(osg::NodeCallback *, getEventCallback); - I_Method0(const osg::NodeCallback *, getEventCallback); - I_Method0(unsigned int, getNumChildrenRequiringEventTraversal); - I_Method1(void, setCullCallback, IN, osg::NodeCallback *, nc); - I_Method0(osg::NodeCallback *, getCullCallback); - I_Method0(const osg::NodeCallback *, getCullCallback); - I_Method1(void, setCullingActive, IN, bool, active); - I_Method0(bool, getCullingActive); - I_Method0(unsigned int, getNumChildrenWithCullingDisabled); - I_Method0(bool, isCullingActive); - I_Method0(unsigned int, getNumChildrenWithOccluderNodes); - I_Method0(bool, containsOccluderNodes); - I_Method1(void, setNodeMask, IN, osg::Node::NodeMask, nm); - I_Method0(osg::Node::NodeMask, getNodeMask); - I_Method1(void, setDescriptions, IN, const osg::Node::DescriptionList &, descriptions); - I_Method0(osg::Node::DescriptionList &, getDescriptions); - I_Method0(const osg::Node::DescriptionList &, getDescriptions); - I_Method1(const std::string &, getDescription, IN, unsigned int, i); - I_Method1(std::string &, getDescription, IN, unsigned int, i); - I_Method0(unsigned int, getNumDescriptions); - I_Method1(void, addDescription, IN, const std::string &, desc); - I_Method1(void, setStateSet, IN, osg::StateSet *, stateset); - I_Method0(osg::StateSet *, getOrCreateStateSet); - I_Method0(osg::StateSet *, getStateSet); - I_Method0(const osg::StateSet *, getStateSet); - I_Method1(void, setInitialBound, IN, const osg::BoundingSphere &, bsphere); - I_Method0(const osg::BoundingSphere &, getInitialBound); - I_Method0(void, dirtyBound); - I_Method0(const osg::BoundingSphere &, getBound); - I_Method0(osg::BoundingSphere, computeBound); - I_Method1(void, setComputeBoundingSphereCallback, IN, osg::Node::ComputeBoundingSphereCallback *, callback); - I_Method0(osg::Node::ComputeBoundingSphereCallback *, getComputeBoundingSphereCallback); - I_Method0(const osg::Node::ComputeBoundingSphereCallback *, getComputeBoundingSphereCallback); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - I_ReadOnlyProperty(const osg::BoundingSphere &, Bound); - I_Property(osg::Node::ComputeBoundingSphereCallback *, ComputeBoundingSphereCallback); - I_Property(osg::NodeCallback *, CullCallback); - I_Property(bool, CullingActive); - I_ArrayProperty_GA(const std::string &, Description, Descriptions, unsigned int, void); - I_Property(const osg::Node::DescriptionList &, Descriptions); - I_Property(osg::NodeCallback *, EventCallback); - I_Property(const osg::BoundingSphere &, InitialBound); - I_Property(osg::Node::NodeMask, NodeMask); - I_ArrayProperty_G(osg::Group *, Parent, Parents, unsigned int, void); - I_ReadOnlyProperty(osg::Node::ParentList, Parents); - I_Property(osg::StateSet *, StateSet); - I_Property(osg::NodeCallback *, UpdateCallback); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) - I_BaseType(osg::Object); +BEGIN_VALUE_REFLECTOR(osg::Node) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) I_Constructor0(); - I_Constructor2(IN, const osg::Node::ComputeBoundingSphereCallback &, x, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(osg::BoundingSphere, computeBound, IN, const osg::Node &, x); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::NodePath); @@ -129,11 +41,7 @@ TYPE_NAME_ALIAS(std::vector< osg::NodePath >, osg::NodePathList); TYPE_NAME_ALIAS(std::vector< osg::Matrix >, osg::MatrixList); -STD_VECTOR_REFLECTOR(std::vector< osg::Group * >); - STD_VECTOR_REFLECTOR(std::vector< osg::Matrix >); STD_VECTOR_REFLECTOR(std::vector< osg::NodePath >); -STD_VECTOR_REFLECTOR(std::vector< std::string >); - diff --git a/src/osgWrappers/osg/NodeCallback.cpp b/src/osgWrappers/osg/NodeCallback.cpp index 37533a1d2..8efddd6ce 100644 --- a/src/osgWrappers/osg/NodeCallback.cpp +++ b/src/osgWrappers/osg/NodeCallback.cpp @@ -9,11 +9,7 @@ #include #include -#include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,21 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::NodeCallback) - I_VirtualBaseType(osg::Object); +BEGIN_VALUE_REFLECTOR(osg::NodeCallback) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::NodeCallback) I_Constructor0(); - I_Constructor2(IN, const osg::NodeCallback &, nc, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method2(void, traverse, IN, osg::Node *, node, IN, osg::NodeVisitor *, nv); - I_Method1(void, setNestedCallback, IN, osg::NodeCallback *, nc); - I_Method0(osg::NodeCallback *, getNestedCallback); - I_Method0(const osg::NodeCallback *, getNestedCallback); - I_Method1(void, addNestedCallback, IN, osg::NodeCallback *, nc); - I_Method1(void, removeNestedCallback, IN, osg::NodeCallback *, nc); - I_Property(osg::NodeCallback *, NestedCallback); END_REFLECTOR diff --git a/src/osgWrappers/osg/NodeTrackerCallback.cpp b/src/osgWrappers/osg/NodeTrackerCallback.cpp index 8eb40a892..c79951ae8 100644 --- a/src/osgWrappers/osg/NodeTrackerCallback.cpp +++ b/src/osgWrappers/osg/NodeTrackerCallback.cpp @@ -9,9 +9,7 @@ #include #include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -21,34 +19,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osg::NodeTrackerCallback::ObserveredNodePath); - -BEGIN_OBJECT_REFLECTOR(osg::NodeTrackerCallback) - I_BaseType(osg::NodeCallback); +BEGIN_VALUE_REFLECTOR(osg::NodeTrackerCallback) I_Constructor0(); - I_Method1(void, setTrackNodePath, IN, const osg::NodePath &, nodePath); - I_Method1(void, setTrackNodePath, IN, const osg::NodeTrackerCallback::ObserveredNodePath &, nodePath); - I_Method0(osg::NodeTrackerCallback::ObserveredNodePath &, getTrackNodePath); - I_Method1(void, setTrackNode, IN, osg::Node *, node); - I_Method0(osg::Node *, getTrackNode); - I_Method0(const osg::Node *, getTrackNode); - I_Method1(void, update, IN, osg::Node &, node); - I_Method0(bool, validateNodePath); - I_Property(osg::Node *, TrackNode); - I_ReadOnlyProperty(osg::NodeTrackerCallback::ObserveredNodePath &, TrackNodePath); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::observer_ptr< osg::Node >) - I_BaseType(osg::Observer); +BEGIN_VALUE_REFLECTOR(osg::NodeTrackerCallback) I_Constructor0(); - I_Constructor1(IN, osg::Node *, t); - I_Constructor1(IN, const osg::observer_ptr< osg::Node > &, rp); - I_Method1(void, objectDeleted, IN, void *, ptr); - I_Method0(bool, valid); - I_Method0(osg::Node *, get); - I_Method0(const osg::Node *, get); - I_ReadOnlyProperty(osg::Node *, ); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::observer_ptr< osg::Node > >); - diff --git a/src/osgWrappers/osg/NodeVisitor.cpp b/src/osgWrappers/osg/NodeVisitor.cpp index 1f465066a..20c391308 100644 --- a/src/osgWrappers/osg/NodeVisitor.cpp +++ b/src/osgWrappers/osg/NodeVisitor.cpp @@ -9,31 +9,7 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -44,92 +20,26 @@ #endif BEGIN_VALUE_REFLECTOR(osg::NodeAcceptOp) - I_Constructor1(IN, osg::NodeVisitor &, nv); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::NodeVisitor::TraversalMode) - I_EnumLabel(osg::NodeVisitor::TRAVERSE_NONE); - I_EnumLabel(osg::NodeVisitor::TRAVERSE_PARENTS); - I_EnumLabel(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN); - I_EnumLabel(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::NodeVisitor::VisitorType) - I_EnumLabel(osg::NodeVisitor::NODE_VISITOR); - I_EnumLabel(osg::NodeVisitor::UPDATE_VISITOR); - I_EnumLabel(osg::NodeVisitor::EVENT_VISITOR); - I_EnumLabel(osg::NodeVisitor::COLLECT_OCCLUDER_VISITOR); - I_EnumLabel(osg::NodeVisitor::CULL_VISITOR); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::NodeVisitor) - I_VirtualBaseType(osg::Referenced); - I_ConstructorWithDefaults1(IN, osg::NodeVisitor::TraversalMode, tm, osg::NodeVisitor::TRAVERSE_NONE); - I_ConstructorWithDefaults2(IN, osg::NodeVisitor::VisitorType, type, , IN, osg::NodeVisitor::TraversalMode, tm, osg::NodeVisitor::TRAVERSE_NONE); - I_Method0(void, reset); - I_Method1(void, setVisitorType, IN, osg::NodeVisitor::VisitorType, type); - I_Method0(osg::NodeVisitor::VisitorType, getVisitorType); - I_Method1(void, setTraversalNumber, IN, int, fn); - I_Method0(int, getTraversalNumber); - I_Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs); - I_Method0(const osg::FrameStamp *, getFrameStamp); - I_Method1(void, setTraversalMask, IN, osg::Node::NodeMask, mask); - I_Method0(osg::Node::NodeMask, getTraversalMask); - I_Method1(void, setNodeMaskOverride, IN, osg::Node::NodeMask, mask); - I_Method0(osg::Node::NodeMask, getNodeMaskOverride); - I_Method1(bool, validNodeMask, IN, const osg::Node &, node); - I_Method1(void, setTraversalMode, IN, osg::NodeVisitor::TraversalMode, mode); - I_Method0(osg::NodeVisitor::TraversalMode, getTraversalMode); - I_Method1(void, setUserData, IN, osg::Referenced *, obj); - I_Method0(osg::Referenced *, getUserData); - I_Method0(const osg::Referenced *, getUserData); - I_Method1(void, traverse, IN, osg::Node &, node); - I_Method1(void, pushOntoNodePath, IN, osg::Node *, node); - I_Method0(void, popFromNodePath); - I_Method0(osg::NodePath &, getNodePath); - I_Method0(const osg::NodePath &, getNodePath); - I_Method0(osg::Vec3, getEyePoint); - I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, x, IN, bool, x); - I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, x, IN, bool, x); - I_Method1(void, apply, IN, osg::Node &, node); - I_Method1(void, apply, IN, osg::Geode &, node); - I_Method1(void, apply, IN, osg::Billboard &, node); - I_Method1(void, apply, IN, osg::Group &, node); - I_Method1(void, apply, IN, osg::ProxyNode &, node); - I_Method1(void, apply, IN, osg::Projection &, node); - I_Method1(void, apply, IN, osg::CoordinateSystemNode &, node); - I_Method1(void, apply, IN, osg::ClipNode &, node); - I_Method1(void, apply, IN, osg::TexGenNode &, node); - I_Method1(void, apply, IN, osg::LightSource &, node); - I_Method1(void, apply, IN, osg::Transform &, node); - I_Method1(void, apply, IN, osg::CameraNode &, node); - I_Method1(void, apply, IN, osg::CameraView &, node); - I_Method1(void, apply, IN, osg::MatrixTransform &, node); - I_Method1(void, apply, IN, osg::PositionAttitudeTransform &, node); - I_Method1(void, apply, IN, osg::Switch &, node); - I_Method1(void, apply, IN, osg::Sequence &, node); - I_Method1(void, apply, IN, osg::LOD &, node); - I_Method1(void, apply, IN, osg::PagedLOD &, node); - I_Method1(void, apply, IN, osg::ClearNode &, node); - I_Method1(void, apply, IN, osg::OccluderNode &, node); - I_Method1(void, setDatabaseRequestHandler, IN, osg::NodeVisitor::DatabaseRequestHandler *, handler); - I_Method0(osg::NodeVisitor::DatabaseRequestHandler *, getDatabaseRequestHandler); - I_Method0(const osg::NodeVisitor::DatabaseRequestHandler *, getDatabaseRequestHandler); - I_Property(osg::NodeVisitor::DatabaseRequestHandler *, DatabaseRequestHandler); - I_ReadOnlyProperty(osg::Vec3, EyePoint); - I_WriteOnlyProperty(osg::FrameStamp *, FrameStamp); - I_Property(osg::Node::NodeMask, NodeMaskOverride); - I_ReadOnlyProperty(osg::NodePath &, NodePath); - I_Property(osg::Node::NodeMask, TraversalMask); - I_Property(osg::NodeVisitor::TraversalMode, TraversalMode); - I_Property(int, TraversalNumber); - I_Property(osg::Referenced *, UserData); - I_Property(osg::NodeVisitor::VisitorType, VisitorType); -END_REFLECTOR - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NodeVisitor::DatabaseRequestHandler) - I_BaseType(osg::Referenced); I_Constructor0(); - I_Method4(void, requestNodeFile, IN, const std::string &, fileName, IN, osg::Group *, group, IN, float, priority, IN, const osg::FrameStamp *, framestamp); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::NodeAcceptOp) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::NodeVisitor) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::NodeVisitor) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::NodeVisitor::DatabaseRequestHandler) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::NodeVisitor::DatabaseRequestHandler) + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osg/Object.cpp b/src/osgWrappers/osg/Object.cpp index 312af8131..a8a3a105d 100644 --- a/src/osgWrappers/osg/Object.cpp +++ b/src/osgWrappers/osg/Object.cpp @@ -9,10 +9,7 @@ #include #include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -22,32 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::Object::DataVariance) - I_EnumLabel(osg::Object::DYNAMIC); - I_EnumLabel(osg::Object::STATIC); -END_REFLECTOR - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Object) - I_BaseType(osg::Referenced); +BEGIN_VALUE_REFLECTOR(osg::Object) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Object) I_Constructor0(); - I_Constructor1(IN, bool, threadSafeRefUnref); - I_ConstructorWithDefaults2(IN, const osg::Object &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, x); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, setName, IN, const std::string &, name); - I_Method1(void, setName, IN, const char *, name); - I_Method0(const std::string &, getName); - I_Method1(void, setDataVariance, IN, osg::Object::DataVariance, dv); - I_Method0(osg::Object::DataVariance, getDataVariance); - I_Method1(void, setUserData, IN, osg::Referenced *, obj); - I_Method0(osg::Referenced *, getUserData); - I_Method0(const osg::Referenced *, getUserData); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - I_Property(osg::Object::DataVariance, DataVariance); - I_Property(const std::string &, Name); - I_Property(osg::Referenced *, UserData); END_REFLECTOR diff --git a/src/osgWrappers/osg/OccluderNode.cpp b/src/osgWrappers/osg/OccluderNode.cpp index 1a94626cc..8e9473169 100644 --- a/src/osgWrappers/osg/OccluderNode.cpp +++ b/src/osgWrappers/osg/OccluderNode.cpp @@ -9,11 +9,6 @@ #include #include -#include -#include -#include -#include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -24,20 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::OccluderNode) - I_BaseType(osg::Group); +BEGIN_VALUE_REFLECTOR(osg::OccluderNode) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::OccluderNode) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::OccluderNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, setOccluder, IN, osg::ConvexPlanarOccluder *, occluder); - I_Method0(osg::ConvexPlanarOccluder *, getOccluder); - I_Method0(const osg::ConvexPlanarOccluder *, getOccluder); - I_Method0(osg::BoundingSphere, computeBound); - I_Property(osg::ConvexPlanarOccluder *, Occluder); END_REFLECTOR diff --git a/src/osgWrappers/osg/PagedLOD.cpp b/src/osgWrappers/osg/PagedLOD.cpp index 6fab73cb8..eab7d86d2 100644 --- a/src/osgWrappers/osg/PagedLOD.cpp +++ b/src/osgWrappers/osg/PagedLOD.cpp @@ -9,11 +9,6 @@ #include #include -#include -#include -#include -#include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -24,55 +19,19 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::PagedLOD::PerRangeData >, osg::PagedLOD::PerRangeDataList); - -BEGIN_OBJECT_REFLECTOR(osg::PagedLOD) - I_BaseType(osg::LOD); +BEGIN_VALUE_REFLECTOR(osg::PagedLOD) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::PagedLOD) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::PagedLOD &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); - I_Method1(bool, addChild, IN, osg::Node *, child); - I_Method3(bool, addChild, IN, osg::Node *, child, IN, float, min, IN, float, max); - I_MethodWithDefaults6(bool, addChild, IN, osg::Node *, child, , IN, float, min, , IN, float, max, , IN, const std::string &, filename, , IN, float, priorityOffset, 0.0f, IN, float, priorityScale, 1.0f); - I_MethodWithDefaults2(bool, removeChildren, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1); - I_Method1(void, setDatabasePath, IN, const std::string &, path); - I_Method0(const std::string &, getDatabasePath); - I_Method2(void, setFileName, IN, unsigned int, childNo, IN, const std::string &, filename); - I_Method1(const std::string &, getFileName, IN, unsigned int, childNo); - I_Method0(unsigned int, getNumFileNames); - I_Method2(void, setPriorityOffset, IN, unsigned int, childNo, IN, float, priorityOffset); - I_Method1(float, getPriorityOffset, IN, unsigned int, childNo); - I_Method0(unsigned int, getNumPriorityOffsets); - I_Method2(void, setPriorityScale, IN, unsigned int, childNo, IN, float, priorityScale); - I_Method1(float, getPriorityScale, IN, unsigned int, childNo); - I_Method0(unsigned int, getNumPriorityScales); - I_Method2(void, setTimeStamp, IN, unsigned int, childNo, IN, double, timeStamp); - I_Method1(double, getTimeStamp, IN, unsigned int, childNo); - I_Method0(unsigned int, getNumTimeStamps); - I_Method1(void, setFrameNumberOfLastTraversal, IN, int, frameNumber); - I_Method0(int, getFrameNumberOfLastTraversal); - I_Method1(void, setNumChildrenThatCannotBeExpired, IN, unsigned int, num); - I_Method0(unsigned int, getNumChildrenThatCannotBeExpired); - I_Method2(bool, removeExpiredChildren, IN, double, expiryTime, IN, osg::NodeList &, removedChildren); - I_Property(const std::string &, DatabasePath); - I_ArrayProperty_G(const std::string &, FileName, FileNames, unsigned int, void); - I_Property(int, FrameNumberOfLastTraversal); - I_WriteOnlyProperty(unsigned int, NumChildrenThatCannotBeExpired); - I_ArrayProperty_G(float, PriorityOffset, PriorityOffsets, unsigned int, void); - I_ArrayProperty_G(float, PriorityScale, PriorityScales, unsigned int, void); - I_ArrayProperty_G(double, TimeStamp, TimeStamps, unsigned int, void); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::PagedLOD::PerRangeData) I_Constructor0(); - I_Constructor1(IN, const osg::PagedLOD::PerRangeData &, prd); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< osg::PagedLOD::PerRangeData >); +BEGIN_VALUE_REFLECTOR(osg::PagedLOD::PerRangeData) + I_Constructor0(); +END_REFLECTOR diff --git a/src/osgWrappers/osg/Plane.cpp b/src/osgWrappers/osg/Plane.cpp index 9b971a98e..445419be1 100644 --- a/src/osgWrappers/osg/Plane.cpp +++ b/src/osgWrappers/osg/Plane.cpp @@ -9,12 +9,7 @@ #include #include -#include -#include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -30,34 +25,11 @@ BEGIN_VALUE_REFLECTOR(osg::Plane) I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined I_Constructor0(); - I_Constructor1(IN, const osg::Plane &, pl); - I_Constructor4(IN, float, a, IN, float, b, IN, float, c, IN, float, d); - I_Constructor1(IN, const osg::Vec4 &, vec); - I_Constructor2(IN, const osg::Vec3 &, norm, IN, float, d); - I_Constructor3(IN, const osg::Vec3 &, v1, IN, const osg::Vec3 &, v2, IN, const osg::Vec3 &, v3); - I_Constructor2(IN, const osg::Vec3 &, norm, IN, const osg::Vec3 &, point); - I_Method1(void, set, IN, const osg::Plane &, pl); - I_Method4(void, set, IN, float, a, IN, float, b, IN, float, c, IN, float, d); - I_Method1(void, set, IN, const osg::Vec4 &, vec); - I_Method2(void, set, IN, const osg::Vec3 &, norm, IN, float, d); - I_Method3(void, set, IN, const osg::Vec3 &, v1, IN, const osg::Vec3 &, v2, IN, const osg::Vec3 &, v3); - I_Method2(void, set, IN, const osg::Vec3 &, norm, IN, const osg::Vec3 &, point); - I_Method0(void, flip); - I_Method0(void, makeUnitLength); - I_Method0(void, calculateUpperLowerBBCorners); - I_Method0(bool, valid); - I_Method0(float *, ptr); - I_Method0(const float *, ptr); - I_Method0(osg::Vec4 &, asVec4); - I_Method0(const osg::Vec4 &, asVec4); - I_Method0(osg::Vec3, getNormal); - I_Method1(float, distance, IN, const osg::Vec3 &, v); - I_Method1(int, intersect, IN, const std::vector< osg::Vec3 > &, vertices); - I_Method1(int, intersect, IN, const osg::BoundingSphere &, bs); - I_Method1(int, intersect, IN, const osg::BoundingBox &, bb); - I_Method1(void, transform, IN, const osg::Matrix &, matrix); - I_Method1(void, transformProvidingInverse, IN, const osg::Matrix &, matrix); - I_WriteOnlyProperty(const osg::Vec4 &, ); - I_ReadOnlyProperty(osg::Vec3, Normal); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Plane) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osg/Point.cpp b/src/osgWrappers/osg/Point.cpp index c85e5835c..a52f2bca5 100644 --- a/src/osgWrappers/osg/Point.cpp +++ b/src/osgWrappers/osg/Point.cpp @@ -9,12 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -24,48 +19,19 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::Point) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::Point) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Point &, point, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(void, setSize, IN, float, size); - I_Method0(float, getSize); - I_Method1(void, setFadeThresholdSize, IN, float, fadeThresholdSize); - I_Method0(float, getFadeThresholdSize); - I_Method1(void, setDistanceAttenuation, IN, const osg::Vec3 &, distanceAttenuation); - I_Method0(const osg::Vec3 &, getDistanceAttenuation); - I_Method1(void, setMinSize, IN, float, minSize); - I_Method0(float, getMinSize); - I_Method1(void, setMaxSize, IN, float, maxSize); - I_Method0(float, getMaxSize); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(const osg::Vec3 &, DistanceAttenuation); - I_Property(float, FadeThresholdSize); - I_Property(float, MaxSize); - I_Property(float, MinSize); - I_Property(float, Size); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Point::Extensions) - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID); - I_Constructor1(IN, const osg::Point::Extensions &, rhs); - I_Method1(void, lowestCommonDenominator, IN, const osg::Point::Extensions &, rhs); - I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); - I_Method1(void, setPointParametersSupported, IN, bool, flag); - I_Method0(bool, isPointParametersSupported); - I_Method2(void, glPointParameterf, IN, GLenum, pname, IN, GLfloat, param); - I_Method2(void, glPointParameterfv, IN, GLenum, pname, IN, const GLfloat *, params); - I_WriteOnlyProperty(bool, PointParametersSupported); - I_WriteOnlyProperty(unsigned int, upGLExtenions); +BEGIN_VALUE_REFLECTOR(osg::Point) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Point::Extensions) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Point::Extensions) + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osg/PolygonMode.cpp b/src/osgWrappers/osg/PolygonMode.cpp index c7589bdba..411c17a7c 100644 --- a/src/osgWrappers/osg/PolygonMode.cpp +++ b/src/osgWrappers/osg/PolygonMode.cpp @@ -9,11 +9,7 @@ #include #include -#include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -35,24 +31,15 @@ BEGIN_ENUM_REFLECTOR(osg::PolygonMode::Face) I_EnumLabel(osg::PolygonMode::BACK); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::PolygonMode) - I_BaseType(osg::StateAttribute); - I_Constructor0(); - I_Constructor2(IN, osg::PolygonMode::Face, face, IN, osg::PolygonMode::Mode, mode); - I_ConstructorWithDefaults2(IN, const osg::PolygonMode &, pm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method2(void, setMode, IN, osg::PolygonMode::Face, face, IN, osg::PolygonMode::Mode, mode); - I_Method1(osg::PolygonMode::Mode, getMode, IN, osg::PolygonMode::Face, face); - I_Method0(bool, getFrontAndBack); - I_Method1(void, apply, IN, osg::State &, state); - I_ReadOnlyProperty(bool, FrontAndBack); - I_IndexedProperty1(osg::PolygonMode::Mode, Mode, osg::PolygonMode::Face, face); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); +BEGIN_ENUM_REFLECTOR(osg::PolygonMode::Mode) + I_EnumLabel(osg::PolygonMode::POINT); + I_EnumLabel(osg::PolygonMode::LINE); + I_EnumLabel(osg::PolygonMode::FILL); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::PolygonMode::Face) + I_EnumLabel(osg::PolygonMode::FRONT_AND_BACK); + I_EnumLabel(osg::PolygonMode::FRONT); + I_EnumLabel(osg::PolygonMode::BACK); END_REFLECTOR diff --git a/src/osgWrappers/osg/Polytope.cpp b/src/osgWrappers/osg/Polytope.cpp index 414b8092d..94fac859d 100644 --- a/src/osgWrappers/osg/Polytope.cpp +++ b/src/osgWrappers/osg/Polytope.cpp @@ -9,12 +9,7 @@ #include #include -#include -#include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -32,59 +27,16 @@ TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Polytope::VertexList); TYPE_NAME_ALIAS(osg::fast_back_stack< osg::Polytope::ClippingMask >, osg::Polytope::MaskStack); -BEGIN_VALUE_REFLECTOR(osg::Polytope) - I_Constructor0(); - I_Constructor1(IN, const osg::Polytope &, cv); - I_Constructor1(IN, const osg::Polytope::PlaneList &, pl); - I_Method0(void, clear); - I_MethodWithDefaults2(void, setToUnitFrustum, IN, bool, withNear, true, IN, bool, withFar, true); - I_Method2(void, setAndTransformProvidingInverse, IN, const osg::Polytope &, pt, IN, const osg::Matrix &, matrix); - I_Method1(void, set, IN, const osg::Polytope::PlaneList &, pl); - I_Method1(void, add, IN, const osg::Plane &, pl); - I_Method0(void, flip); - I_Method0(osg::Polytope::PlaneList &, getPlaneList); - I_Method0(const osg::Polytope::PlaneList &, getPlaneList); - I_Method1(void, setReferenceVertexList, IN, osg::Polytope::VertexList &, vertices); - I_Method0(osg::Polytope::VertexList &, getReferenceVertexList); - I_Method0(const osg::Polytope::VertexList &, getReferenceVertexList); - I_Method0(void, setupMask); - I_Method0(osg::Polytope::ClippingMask &, getCurrentMask); - I_Method0(osg::Polytope::ClippingMask, getCurrentMask); - I_Method1(void, setResultMask, IN, osg::Polytope::ClippingMask, mask); - I_Method0(osg::Polytope::ClippingMask, getResultMask); - I_Method0(osg::Polytope::MaskStack &, getMaskStack); - I_Method0(const osg::Polytope::MaskStack &, getMaskStack); - I_Method0(void, pushCurrentMask); - I_Method0(void, popCurrentMask); - I_Method1(bool, contains, IN, const osg::Vec3 &, v); - I_Method1(bool, contains, IN, const std::vector< osg::Vec3 > &, vertices); - I_Method1(bool, contains, IN, const osg::BoundingSphere &, bs); - I_Method1(bool, contains, IN, const osg::BoundingBox &, bb); - I_Method1(bool, containsAllOf, IN, const std::vector< osg::Vec3 > &, vertices); - I_Method1(bool, containsAllOf, IN, const osg::BoundingSphere &, bs); - I_Method1(bool, containsAllOf, IN, const osg::BoundingBox &, bb); - I_Method1(void, transform, IN, const osg::Matrix &, matrix); - I_Method1(void, transformProvidingInverse, IN, const osg::Matrix &, matrix); - I_WriteOnlyProperty(const osg::Polytope::PlaneList &, ); - I_ReadOnlyProperty(osg::Polytope::ClippingMask, CurrentMask); - I_ReadOnlyProperty(osg::Polytope::MaskStack &, MaskStack); - I_ReadOnlyProperty(osg::Polytope::PlaneList &, PlaneList); - I_Property(osg::Polytope::VertexList &, ReferenceVertexList); - I_Property(osg::Polytope::ClippingMask, ResultMask); -END_REFLECTOR +TYPE_NAME_ALIAS(unsigned int, osg::Polytope::ClippingMask); + +TYPE_NAME_ALIAS(std::vector< osg::Plane >, osg::Polytope::PlaneList); + +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Polytope::VertexList); + +TYPE_NAME_ALIAS(osg::fast_back_stack< osg::Polytope::ClippingMask >, osg::Polytope::MaskStack); BEGIN_VALUE_REFLECTOR(osg::fast_back_stack< osg::Polytope::ClippingMask >) I_Constructor0(); - I_Constructor1(IN, const osg::fast_back_stack< osg::Polytope::ClippingMask > &, fbs); - I_Constructor1(IN, const osg::Polytope::ClippingMask &, value); - I_Method0(void, clear); - I_Method0(bool, empty); - I_Method0(unsigned int, size); - I_Method0(osg::Polytope::ClippingMask &, back); - I_Method0(const osg::Polytope::ClippingMask &, back); - I_Method0(void, push_back); - I_Method1(void, push_back, IN, const osg::Polytope::ClippingMask &, value); - I_Method0(void, pop_back); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::Plane >); diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp index 3c7b09ffb..93740ed97 100644 --- a/src/osgWrappers/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/osg/PrimitiveSet.cpp @@ -9,13 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -27,171 +21,40 @@ TYPE_NAME_ALIAS(osg::VectorGLsizei, osg::DrawArrayLengths::vector_type); -BEGIN_OBJECT_REFLECTOR(osg::DrawArrayLengths) - I_BaseType(osg::PrimitiveSet); - I_BaseType(osg::VectorGLsizei); - I_ConstructorWithDefaults1(IN, GLenum, mode, 0); - I_ConstructorWithDefaults2(IN, const osg::DrawArrayLengths &, dal, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Constructor4(IN, GLenum, mode, IN, GLint, first, IN, unsigned int, no, IN, GLsizei *, ptr); - I_Constructor3(IN, GLenum, mode, IN, GLint, first, IN, unsigned int, no); - I_Constructor2(IN, GLenum, mode, IN, GLint, first); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, setFirst, IN, GLint, first); - I_Method0(GLint, getFirst); - I_Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - I_Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - I_Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - I_Method0(unsigned int, getNumIndices); - I_Method1(unsigned int, index, IN, unsigned int, pos); - I_Method1(void, offsetIndices, IN, int, offset); - I_Method0(unsigned int, getNumPrimitives); - I_Property(GLint, First); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::DrawArrays) - I_BaseType(osg::PrimitiveSet); - I_ConstructorWithDefaults1(IN, GLenum, mode, 0); - I_Constructor3(IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count); - I_ConstructorWithDefaults2(IN, const osg::DrawArrays &, da, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method3(void, set, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count); - I_Method1(void, setFirst, IN, GLint, first); - I_Method0(GLint, getFirst); - I_Method1(void, setCount, IN, GLsizei, count); - I_Method0(GLsizei, getCount); - I_Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - I_Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - I_Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - I_Method0(unsigned int, getNumIndices); - I_Method1(unsigned int, index, IN, unsigned int, pos); - I_Method1(void, offsetIndices, IN, int, offset); - I_Property(GLsizei, Count); - I_Property(GLint, First); -END_REFLECTOR +TYPE_NAME_ALIAS(osg::VectorGLsizei, osg::DrawArrayLengths::vector_type); TYPE_NAME_ALIAS(osg::VectorGLubyte, osg::DrawElementsUByte::vector_type); -BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUByte) - I_BaseType(osg::PrimitiveSet); - I_BaseType(osg::VectorGLubyte); - I_ConstructorWithDefaults1(IN, GLenum, mode, 0); - I_ConstructorWithDefaults2(IN, const osg::DrawElementsUByte &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Constructor3(IN, GLenum, mode, IN, unsigned int, no, IN, GLubyte *, ptr); - I_Constructor2(IN, GLenum, mode, IN, unsigned int, no); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(const GLvoid *, getDataPointer); - I_Method0(unsigned int, getTotalDataSize); - I_Method0(bool, supportsBufferObject); - I_Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - I_Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - I_Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - I_Method0(unsigned int, getNumIndices); - I_Method1(unsigned int, index, IN, unsigned int, pos); - I_Method1(void, offsetIndices, IN, int, offset); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - I_ReadOnlyProperty(const GLvoid *, DataPointer); - I_ReadOnlyProperty(unsigned int, TotalDataSize); -END_REFLECTOR +TYPE_NAME_ALIAS(osg::VectorGLubyte, osg::DrawElementsUByte::vector_type); TYPE_NAME_ALIAS(osg::VectorGLuint, osg::DrawElementsUInt::vector_type); -BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUInt) - I_BaseType(osg::PrimitiveSet); - I_BaseType(osg::VectorGLuint); - I_ConstructorWithDefaults1(IN, GLenum, mode, 0); - I_ConstructorWithDefaults2(IN, const osg::DrawElementsUInt &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Constructor3(IN, GLenum, mode, IN, unsigned int, no, IN, GLuint *, ptr); - I_Constructor2(IN, GLenum, mode, IN, unsigned int, no); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(const GLvoid *, getDataPointer); - I_Method0(unsigned int, getTotalDataSize); - I_Method0(bool, supportsBufferObject); - I_Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - I_Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - I_Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - I_Method0(unsigned int, getNumIndices); - I_Method1(unsigned int, index, IN, unsigned int, pos); - I_Method1(void, offsetIndices, IN, int, offset); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - I_ReadOnlyProperty(const GLvoid *, DataPointer); - I_ReadOnlyProperty(unsigned int, TotalDataSize); -END_REFLECTOR +TYPE_NAME_ALIAS(osg::VectorGLuint, osg::DrawElementsUInt::vector_type); TYPE_NAME_ALIAS(osg::VectorGLushort, osg::DrawElementsUShort::vector_type); -BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUShort) - I_BaseType(osg::PrimitiveSet); - I_BaseType(osg::VectorGLushort); - I_ConstructorWithDefaults1(IN, GLenum, mode, 0); - I_ConstructorWithDefaults2(IN, const osg::DrawElementsUShort &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Constructor3(IN, GLenum, mode, IN, unsigned int, no, IN, GLushort *, ptr); - I_Constructor2(IN, GLenum, mode, IN, unsigned int, no); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(const GLvoid *, getDataPointer); - I_Method0(unsigned int, getTotalDataSize); - I_Method0(bool, supportsBufferObject); - I_Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - I_Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - I_Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - I_Method0(unsigned int, getNumIndices); - I_Method1(unsigned int, index, IN, unsigned int, pos); - I_Method1(void, offsetIndices, IN, int, offset); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - I_ReadOnlyProperty(const GLvoid *, DataPointer); - I_ReadOnlyProperty(unsigned int, TotalDataSize); +TYPE_NAME_ALIAS(osg::VectorGLushort, osg::DrawElementsUShort::vector_type); + +BEGIN_ENUM_REFLECTOR(osg::PrimitiveSet::Type) + I_EnumLabel(osg::PrimitiveSet::PrimitiveType); + I_EnumLabel(osg::PrimitiveSet::DrawArraysPrimitiveType); + I_EnumLabel(osg::PrimitiveSet::DrawArrayLengthsPrimitiveType); + I_EnumLabel(osg::PrimitiveSet::DrawElementsUBytePrimitiveType); + I_EnumLabel(osg::PrimitiveSet::DrawElementsUShortPrimitiveType); + I_EnumLabel(osg::PrimitiveSet::DrawElementsUIntPrimitiveType); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveFunctor) - I_Constructor0(); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2 *, vertices); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3 *, vertices); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4 *, vertices); - I_Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count); - I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLubyte *, indices); - I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLushort *, indices); - I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLuint *, indices); - I_Method1(void, begin, IN, GLenum, mode); - I_Method1(void, vertex, IN, const osg::Vec2 &, vert); - I_Method1(void, vertex, IN, const osg::Vec3 &, vert); - I_Method1(void, vertex, IN, const osg::Vec4 &, vert); - I_Method2(void, vertex, IN, float, x, IN, float, y); - I_Method3(void, vertex, IN, float, x, IN, float, y, IN, float, z); - I_Method4(void, vertex, IN, float, x, IN, float, y, IN, float, z, IN, float, w); - I_Method0(void, end); -END_REFLECTOR - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveIndexFunctor) - I_Constructor0(); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2 *, vertices); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3 *, vertices); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4 *, vertices); - I_Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count); - I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLubyte *, indices); - I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLushort *, indices); - I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLuint *, indices); - I_Method1(void, begin, IN, GLenum, mode); - I_Method1(void, vertex, IN, unsigned int, pos); - I_Method0(void, end); +BEGIN_ENUM_REFLECTOR(osg::PrimitiveSet::Mode) + I_EnumLabel(osg::PrimitiveSet::POINTS); + I_EnumLabel(osg::PrimitiveSet::LINES); + I_EnumLabel(osg::PrimitiveSet::LINE_STRIP); + I_EnumLabel(osg::PrimitiveSet::LINE_LOOP); + I_EnumLabel(osg::PrimitiveSet::TRIANGLES); + I_EnumLabel(osg::PrimitiveSet::TRIANGLE_STRIP); + I_EnumLabel(osg::PrimitiveSet::TRIANGLE_FAN); + I_EnumLabel(osg::PrimitiveSet::QUADS); + I_EnumLabel(osg::PrimitiveSet::QUAD_STRIP); + I_EnumLabel(osg::PrimitiveSet::POLYGON); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::PrimitiveSet::Type) @@ -216,66 +79,13 @@ BEGIN_ENUM_REFLECTOR(osg::PrimitiveSet::Mode) I_EnumLabel(osg::PrimitiveSet::POLYGON); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveSet) - I_BaseType(osg::Object); - I_ConstructorWithDefaults2(IN, osg::PrimitiveSet::Type, primType, osg::PrimitiveSet::PrimitiveType, IN, GLenum, mode, 0); - I_ConstructorWithDefaults2(IN, const osg::PrimitiveSet &, prim, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::PrimitiveSet::Type, getType); - I_Method0(const GLvoid *, getDataPointer); - I_Method0(unsigned int, getTotalDataSize); - I_Method0(bool, supportsBufferObject); - I_Method1(void, setMode, IN, GLenum, mode); - I_Method0(GLenum, getMode); - I_Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - I_Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - I_Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - I_Method1(unsigned int, index, IN, unsigned int, pos); - I_Method0(unsigned int, getNumIndices); - I_Method1(void, offsetIndices, IN, int, offset); - I_Method0(unsigned int, getNumPrimitives); - I_Method0(void, dirty); - I_Method1(void, setModifiedCount, IN, unsigned int, value); - I_Method0(unsigned int, getModifiedCount); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - I_ReadOnlyProperty(const GLvoid *, DataPointer); - I_Property(GLenum, Mode); - I_Property(unsigned int, ModifiedCount); - I_ReadOnlyProperty(unsigned int, TotalDataSize); - I_ReadOnlyProperty(osg::PrimitiveSet::Type, Type); +BEGIN_OBJECT_REFLECTOR(osg::VectorGLsizei) + I_BaseType(std::vector); + I_Constructor0(); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::VectorGLsizei) I_BaseType(std::vector); I_Constructor0(); - I_Constructor1(IN, const osg::VectorGLsizei &, copy); - I_Constructor2(IN, GLsizei *, beg, IN, GLsizei *, end); - I_Constructor1(IN, unsigned int, n); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::VectorGLubyte) - I_BaseType(std::vector); - I_Constructor0(); - I_Constructor1(IN, const osg::VectorGLubyte &, copy); - I_Constructor2(IN, GLubyte *, beg, IN, GLubyte *, end); - I_Constructor1(IN, unsigned int, n); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::VectorGLuint) - I_BaseType(std::vector); - I_Constructor0(); - I_Constructor1(IN, const osg::VectorGLuint &, copy); - I_Constructor2(IN, GLuint *, beg, IN, GLuint *, end); - I_Constructor1(IN, unsigned int, n); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::VectorGLushort) - I_BaseType(std::vector); - I_Constructor0(); - I_Constructor1(IN, const osg::VectorGLushort &, copy); - I_Constructor2(IN, GLushort *, beg, IN, GLushort *, end); - I_Constructor1(IN, unsigned int, n); END_REFLECTOR diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp index ea8d49594..dae24d415 100644 --- a/src/osgWrappers/osg/Program.cpp +++ b/src/osgWrappers/osg/Program.cpp @@ -9,13 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -29,65 +23,9 @@ TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindi TYPE_NAME_ALIAS(std::map< std::string COMMA osg::Program::ActiveVarInfo >, osg::Program::ActiveVarInfoMap); -BEGIN_OBJECT_REFLECTOR(osg::Program) - I_BaseType(osg::StateAttribute); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Program &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - 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_Method0(void, dirtyProgram); - I_Method1(bool, addShader, IN, osg::Shader *, shader); - I_Method0(unsigned int, getNumShaders); - I_Method1(osg::Shader *, getShader, IN, unsigned int, i); - I_Method1(const osg::Shader *, getShader, IN, unsigned int, i); - I_Method1(bool, removeShader, IN, osg::Shader *, shader); - I_Method2(void, addBindAttribLocation, IN, const std::string &, name, IN, GLuint, index); - I_Method1(void, removeBindAttribLocation, IN, const std::string &, name); - I_Method0(const osg::Program::AttribBindingList &, getAttribBindingList); - I_Method0(bool, isFixedFunction); - I_Method2(bool, getGlProgramInfoLog, IN, unsigned int, contextID, IN, std::string &, log); - 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_ReadOnlyProperty(const osg::Program::AttribBindingList &, AttribBindingList); - I_ArrayProperty_GA(osg::Shader *, Shader, Shaders, unsigned int, bool); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); -END_REFLECTOR +TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindingList); -BEGIN_VALUE_REFLECTOR(osg::Program::ActiveVarInfo) - I_Constructor0(); - I_Constructor3(IN, GLint, loc, IN, GLenum, type, IN, GLint, size); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram) - I_BaseType(osg::Referenced); - I_Constructor2(IN, const osg::Program *, program, IN, unsigned int, contextID); - I_Method0(GLuint, getHandle); - I_Method0(void, requestLink); - I_Method0(void, linkProgram); - I_Method0(bool, validateProgram); - I_Method0(bool, needsLink); - I_Method0(bool, isLinked); - I_Method1(bool, getInfoLog, IN, std::string &, infoLog); - I_Method0(void, useProgram); - I_Method0(void, resetAppliedUniforms); - I_Method1(void, apply, IN, const osg::Uniform &, uniform); - I_Method0(const osg::Program::ActiveVarInfoMap &, getActiveUniforms); - I_Method0(const osg::Program::ActiveVarInfoMap &, getActiveAttribs); - I_Method1(GLint, getUniformLocation, IN, const std::string &, name); - I_Method1(GLint, getAttribLocation, IN, const std::string &, name); - I_ReadOnlyProperty(const osg::Program::ActiveVarInfoMap &, ActiveAttribs); - I_ReadOnlyProperty(const osg::Program::ActiveVarInfoMap &, ActiveUniforms); - I_ReadOnlyProperty(GLuint, Handle); -END_REFLECTOR +TYPE_NAME_ALIAS(std::map< std::string COMMA osg::Program::ActiveVarInfo >, osg::Program::ActiveVarInfoMap); STD_MAP_REFLECTOR(std::map< std::string COMMA GLuint >); diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index ab15d8f09..c862e7fad 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -9,13 +9,7 @@ #include #include -#include -#include -#include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -32,36 +26,12 @@ BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode) I_EnumLabel(osg::ProxyNode::USER_DEFINED_CENTER); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) - I_BaseType(osg::Group); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::ProxyNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); - I_Method1(bool, addChild, IN, osg::Node *, child); - I_Method2(bool, addChild, IN, osg::Node *, child, IN, const std::string &, filename); - I_Method2(bool, removeChildren, IN, unsigned int, pos, IN, unsigned int, numChildrenToRemove); - I_Method1(void, setDatabasePath, IN, const std::string &, path); - I_Method0(const std::string &, getDatabasePath); - I_Method2(void, setFileName, IN, unsigned int, childNo, IN, const std::string &, filename); - I_Method1(const std::string &, getFileName, IN, unsigned int, childNo); - I_Method0(unsigned int, getNumFileNames); - I_Method1(void, setCenterMode, IN, osg::ProxyNode::CenterMode, mode); - I_Method0(osg::ProxyNode::CenterMode, getCenterMode); - I_Method1(void, setCenter, IN, const osg::Vec3 &, center); - I_Method0(const osg::Vec3 &, getCenter); - I_Method1(void, setRadius, IN, float, radius); - I_Method0(float, getRadius); - I_Method0(osg::BoundingSphere, computeBound); - I_Property(const osg::Vec3 &, Center); - I_Property(osg::ProxyNode::CenterMode, CenterMode); - I_Property(const std::string &, DatabasePath); - I_ArrayProperty_G(const std::string &, FileName, FileNames, unsigned int, void); - I_Property(float, Radius); +TYPE_NAME_ALIAS(std::vector< std::string >, osg::ProxyNode::FileNameList); + +BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode) + I_EnumLabel(osg::ProxyNode::USE_BOUNDING_SPHERE_CENTER); + I_EnumLabel(osg::ProxyNode::USER_DEFINED_CENTER); END_REFLECTOR +STD_VECTOR_REFLECTOR(std::vector< std::string >); + diff --git a/src/osgWrappers/osg/Quat.cpp b/src/osgWrappers/osg/Quat.cpp index f6311fd83..26b25d142 100644 --- a/src/osgWrappers/osg/Quat.cpp +++ b/src/osgWrappers/osg/Quat.cpp @@ -9,13 +9,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -29,51 +23,5 @@ TYPE_NAME_ALIAS(double, osg::Quat::value_type); -BEGIN_VALUE_REFLECTOR(osg::Quat) - I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined - I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined - I_Constructor0(); - I_Constructor4(IN, osg::Quat::value_type, x, IN, osg::Quat::value_type, y, IN, osg::Quat::value_type, z, IN, osg::Quat::value_type, w); - I_Constructor1(IN, const osg::Vec4f &, v); - I_Constructor1(IN, const osg::Vec4d &, v); - I_Constructor2(IN, osg::Quat::value_type, angle, IN, const osg::Vec3f &, axis); - I_Constructor2(IN, osg::Quat::value_type, angle, IN, const osg::Vec3d &, axis); - I_Constructor6(IN, osg::Quat::value_type, angle1, IN, const osg::Vec3f &, axis1, IN, osg::Quat::value_type, angle2, IN, const osg::Vec3f &, axis2, IN, osg::Quat::value_type, angle3, IN, const osg::Vec3f &, axis3); - I_Constructor6(IN, osg::Quat::value_type, angle1, IN, const osg::Vec3d &, axis1, IN, osg::Quat::value_type, angle2, IN, const osg::Vec3d &, axis2, IN, osg::Quat::value_type, angle3, IN, const osg::Vec3d &, axis3); - I_Method0(osg::Vec4d, asVec4); - I_Method0(osg::Vec3d, asVec3); - I_Method4(void, set, IN, osg::Quat::value_type, x, IN, osg::Quat::value_type, y, IN, osg::Quat::value_type, z, IN, osg::Quat::value_type, w); - I_Method1(void, set, IN, const osg::Vec4f &, v); - I_Method1(void, set, IN, const osg::Vec4d &, v); - I_Method1(void, set, IN, const osg::Matrixf &, matrix); - I_Method1(void, set, IN, const osg::Matrixd &, matrix); - I_Method1(void, get, IN, osg::Matrixf &, matrix); - I_Method1(void, get, IN, osg::Matrixd &, matrix); - I_Method0(osg::Quat::value_type &, x); - I_Method0(osg::Quat::value_type &, y); - I_Method0(osg::Quat::value_type &, z); - I_Method0(osg::Quat::value_type &, w); - I_Method0(osg::Quat::value_type, x); - I_Method0(osg::Quat::value_type, y); - I_Method0(osg::Quat::value_type, z); - I_Method0(osg::Quat::value_type, w); - I_Method0(bool, zeroRotation); - I_Method0(osg::Quat::value_type, length); - I_Method0(osg::Quat::value_type, length2); - I_Method0(osg::Quat, conj); - I_Method0(const osg::Quat, inverse); - I_Method4(void, makeRotate, IN, osg::Quat::value_type, angle, IN, osg::Quat::value_type, x, IN, osg::Quat::value_type, y, IN, osg::Quat::value_type, z); - I_Method2(void, makeRotate, IN, osg::Quat::value_type, angle, IN, const osg::Vec3f &, vec); - I_Method2(void, makeRotate, IN, osg::Quat::value_type, angle, IN, const osg::Vec3d &, vec); - I_Method6(void, makeRotate, IN, osg::Quat::value_type, angle1, IN, const osg::Vec3f &, axis1, IN, osg::Quat::value_type, angle2, IN, const osg::Vec3f &, axis2, IN, osg::Quat::value_type, angle3, IN, const osg::Vec3f &, axis3); - I_Method6(void, makeRotate, IN, osg::Quat::value_type, angle1, IN, const osg::Vec3d &, axis1, IN, osg::Quat::value_type, angle2, IN, const osg::Vec3d &, axis2, IN, osg::Quat::value_type, angle3, IN, const osg::Vec3d &, axis3); - I_Method2(void, makeRotate, IN, const osg::Vec3f &, vec1, IN, const osg::Vec3f &, vec2); - I_Method2(void, makeRotate, IN, const osg::Vec3d &, vec1, IN, const osg::Vec3d &, vec2); - I_Method2(void, makeRotate_original, IN, const osg::Vec3d &, vec1, IN, const osg::Vec3d &, vec2); - I_Method4(void, getRotate, IN, osg::Quat::value_type &, angle, IN, osg::Quat::value_type &, x, IN, osg::Quat::value_type &, y, IN, osg::Quat::value_type &, z); - I_Method2(void, getRotate, IN, osg::Quat::value_type &, angle, IN, osg::Vec3f &, vec); - I_Method2(void, getRotate, IN, osg::Quat::value_type &, angle, IN, osg::Vec3d &, vec); - I_Method3(void, slerp, IN, osg::Quat::value_type, t, IN, const osg::Quat &, from, IN, const osg::Quat &, to); - I_WriteOnlyProperty(const osg::Vec4f &, ); -END_REFLECTOR +TYPE_NAME_ALIAS(double, osg::Quat::value_type); diff --git a/src/osgWrappers/osg/Scissor.cpp b/src/osgWrappers/osg/Scissor.cpp index 2241f24ad..9cc708c3a 100644 --- a/src/osgWrappers/osg/Scissor.cpp +++ b/src/osgWrappers/osg/Scissor.cpp @@ -9,11 +9,7 @@ #include #include -#include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,30 +19,11 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::Scissor) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::Scissor) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Scissor) I_Constructor0(); - I_Constructor4(IN, int, x, IN, int, y, IN, int, width, IN, int, height); - I_ConstructorWithDefaults2(IN, const osg::Scissor &, vp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method4(void, setScissor, IN, int, x, IN, int, y, IN, int, width, IN, int, height); - I_Method4(void, getScissor, IN, int &, x, IN, int &, y, IN, int &, width, IN, int &, height); - I_Method0(int &, x); - I_Method0(int, x); - I_Method0(int &, y); - I_Method0(int, y); - I_Method0(int &, width); - I_Method0(int, width); - I_Method0(int &, height); - I_Method0(int, height); - I_Method1(void, apply, IN, osg::State &, state); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/Sequence.cpp b/src/osgWrappers/osg/Sequence.cpp index b05c99d86..602b43faf 100644 --- a/src/osgWrappers/osg/Sequence.cpp +++ b/src/osgWrappers/osg/Sequence.cpp @@ -9,9 +9,6 @@ #include #include -#include -#include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -22,42 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::Sequence::LoopMode) - I_EnumLabel(osg::Sequence::LOOP); - I_EnumLabel(osg::Sequence::SWING); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::Sequence::SequenceMode) - I_EnumLabel(osg::Sequence::START); - I_EnumLabel(osg::Sequence::STOP); - I_EnumLabel(osg::Sequence::PAUSE); - I_EnumLabel(osg::Sequence::RESUME); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Sequence) - I_BaseType(osg::Group); +BEGIN_VALUE_REFLECTOR(osg::Sequence) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Sequence) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Sequence &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); - I_Method1(void, setValue, IN, int, value); - I_Method0(int, getValue); - I_Method2(void, setTime, IN, int, frame, IN, float, t); - I_Method1(float, getTime, IN, int, frame); - I_Method0(unsigned int, getNumFrames); - I_Method3(void, setInterval, IN, osg::Sequence::LoopMode, mode, IN, int, begin, IN, int, end); - I_Method3(void, getInterval, IN, osg::Sequence::LoopMode &, mode, IN, int &, begin, IN, int &, end); - I_MethodWithDefaults2(void, setDuration, IN, float, speed, , IN, int, nreps, -1); - I_Method2(void, getDuration, IN, float &, speed, IN, int &, nreps); - I_Method1(void, setMode, IN, osg::Sequence::SequenceMode, mode); - I_Method0(osg::Sequence::SequenceMode, getMode); - I_Property(osg::Sequence::SequenceMode, Mode); - I_IndexedProperty1(float, Time, int, frame); - I_Property(int, Value); END_REFLECTOR diff --git a/src/osgWrappers/osg/ShadeModel.cpp b/src/osgWrappers/osg/ShadeModel.cpp index a112b67c7..6e126d6c1 100644 --- a/src/osgWrappers/osg/ShadeModel.cpp +++ b/src/osgWrappers/osg/ShadeModel.cpp @@ -9,11 +9,7 @@ #include #include -#include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -23,26 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::ShadeModel::Mode) - I_EnumLabel(osg::ShadeModel::FLAT); - I_EnumLabel(osg::ShadeModel::SMOOTH); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::ShadeModel) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::ShadeModel) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ShadeModel) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::ShadeModel &, sm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(void, setMode, IN, osg::ShadeModel::Mode, mode); - I_Method0(osg::ShadeModel::Mode, getMode); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(osg::ShadeModel::Mode, Mode); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/Shader.cpp b/src/osgWrappers/osg/Shader.cpp index bff83ff0c..f47af629f 100644 --- a/src/osgWrappers/osg/Shader.cpp +++ b/src/osgWrappers/osg/Shader.cpp @@ -9,10 +9,7 @@ #include #include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -28,30 +25,9 @@ BEGIN_ENUM_REFLECTOR(osg::Shader::Type) I_EnumLabel(osg::Shader::UNDEFINED); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Shader) - I_BaseType(osg::Object); - I_ConstructorWithDefaults1(IN, osg::Shader::Type, type, osg::Shader::UNDEFINED); - I_Constructor2(IN, osg::Shader::Type, type, IN, const std::string &, source); - I_ConstructorWithDefaults2(IN, const osg::Shader &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(int, compare, IN, const osg::Shader &, rhs); - I_Method1(bool, setType, IN, osg::Shader::Type, t); - I_Method1(void, setShaderSource, IN, const std::string &, sourceText); - I_Method1(bool, loadShaderSourceFromFile, IN, const std::string &, fileName); - I_Method0(const std::string &, getShaderSource); - I_Method0(osg::Shader::Type, getType); - I_Method0(const char *, getTypename); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - I_Method0(void, dirtyShader); - 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_Property(const std::string &, ShaderSource); - I_PropertyWithReturnType(osg::Shader::Type, Type, bool); - I_ReadOnlyProperty(const char *, Typename); +BEGIN_ENUM_REFLECTOR(osg::Shader::Type) + I_EnumLabel(osg::Shader::VERTEX); + I_EnumLabel(osg::Shader::FRAGMENT); + I_EnumLabel(osg::Shader::UNDEFINED); END_REFLECTOR diff --git a/src/osgWrappers/osg/ShadowVolumeOccluder.cpp b/src/osgWrappers/osg/ShadowVolumeOccluder.cpp index 879ae6314..dfb318ca0 100644 --- a/src/osgWrappers/osg/ShadowVolumeOccluder.cpp +++ b/src/osgWrappers/osg/ShadowVolumeOccluder.cpp @@ -9,15 +9,7 @@ #include #include -#include -#include -#include -#include -#include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -29,31 +21,7 @@ TYPE_NAME_ALIAS(std::vector< osg::Polytope >, osg::ShadowVolumeOccluder::HoleList); -BEGIN_VALUE_REFLECTOR(osg::ShadowVolumeOccluder) - I_Constructor1(IN, const osg::ShadowVolumeOccluder &, svo); - I_Constructor0(); - I_MethodWithDefaults4(bool, computeOccluder, IN, const osg::NodePath &, nodePath, , IN, const osg::ConvexPlanarOccluder &, occluder, , IN, osg::CullStack &, cullStack, , IN, bool, createDrawables, false); - I_Method0(void, disableResultMasks); - I_Method0(void, pushCurrentMask); - I_Method0(void, popCurrentMask); - I_Method1(bool, matchProjectionMatrix, IN, const osg::Matrix &, matrix); - I_Method1(void, setNodePath, IN, osg::NodePath &, nodePath); - I_Method0(osg::NodePath &, getNodePath); - I_Method0(const osg::NodePath &, getNodePath); - I_Method0(float, getVolume); - I_Method0(osg::Polytope &, getOccluder); - I_Method0(const osg::Polytope &, getOccluder); - I_Method0(osg::ShadowVolumeOccluder::HoleList &, getHoleList); - I_Method0(const osg::ShadowVolumeOccluder::HoleList &, getHoleList); - I_Method1(bool, contains, IN, const std::vector< osg::Vec3 > &, vertices); - I_Method1(bool, contains, IN, const osg::BoundingSphere &, bound); - I_Method1(bool, contains, IN, const osg::BoundingBox &, bound); - I_Method1(void, transformProvidingInverse, IN, const osg::Matrix &, matrix); - I_ReadOnlyProperty(osg::ShadowVolumeOccluder::HoleList &, HoleList); - I_Property(osg::NodePath &, NodePath); - I_ReadOnlyProperty(osg::Polytope &, Occluder); - I_ReadOnlyProperty(float, Volume); -END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::Polytope >, osg::ShadowVolumeOccluder::HoleList); TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::ShadowVolumeOccluderList); diff --git a/src/osgWrappers/osg/Shape.cpp b/src/osgWrappers/osg/Shape.cpp index d06548c74..e3bda5a63 100644 --- a/src/osgWrappers/osg/Shape.cpp +++ b/src/osgWrappers/osg/Shape.cpp @@ -9,14 +9,8 @@ #include #include -#include -#include -#include -#include -#include #include -#include -#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -26,316 +20,24 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::Box) - I_BaseType(osg::Shape); - I_Constructor0(); - I_Constructor2(IN, const osg::Vec3 &, center, IN, float, width); - I_Constructor4(IN, const osg::Vec3 &, center, IN, float, lengthX, IN, float, lengthY, IN, float, lengthZ); - I_ConstructorWithDefaults2(IN, const osg::Box &, box, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - I_Method0(bool, valid); - I_Method2(void, set, IN, const osg::Vec3 &, center, IN, const osg::Vec3 &, halfLengths); - I_Method1(void, setCenter, IN, const osg::Vec3 &, center); - I_Method0(const osg::Vec3 &, getCenter); - I_Method1(void, setHalfLengths, IN, const osg::Vec3 &, halfLengths); - I_Method0(const osg::Vec3 &, getHalfLengths); - I_Method1(void, setRotation, IN, const osg::Quat &, quat); - I_Method0(const osg::Quat &, getRotation); - I_Method0(osg::Matrix, computeRotationMatrix); - I_Method0(bool, zeroRotation); - I_Property(const osg::Vec3 &, Center); - I_Property(const osg::Vec3 &, HalfLengths); - I_Property(const osg::Quat &, Rotation); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Capsule) - I_BaseType(osg::Shape); - I_Constructor0(); - I_Constructor3(IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - I_ConstructorWithDefaults2(IN, const osg::Capsule &, capsule, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - I_Method0(bool, valid); - I_Method3(void, set, IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - I_Method1(void, setCenter, IN, const osg::Vec3 &, center); - I_Method0(const osg::Vec3 &, getCenter); - I_Method1(void, setRadius, IN, float, radius); - I_Method0(float, getRadius); - I_Method1(void, setHeight, IN, float, height); - I_Method0(float, getHeight); - I_Method1(void, setRotation, IN, const osg::Quat &, quat); - I_Method0(const osg::Quat &, getRotation); - I_Method0(osg::Matrix, computeRotationMatrix); - I_Method0(bool, zeroRotation); - I_Property(const osg::Vec3 &, Center); - I_Property(float, Height); - I_Property(float, Radius); - I_Property(const osg::Quat &, Rotation); -END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Shape > >, osg::CompositeShape::ChildList); TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Shape > >, osg::CompositeShape::ChildList); -BEGIN_OBJECT_REFLECTOR(osg::CompositeShape) - I_BaseType(osg::Shape); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::CompositeShape &, cs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - I_Method1(void, setShape, IN, osg::Shape *, shape); - I_Method0(osg::Shape *, getShape); - I_Method0(const osg::Shape *, getShape); - I_Method0(unsigned int, getNumChildren); - I_Method1(osg::Shape *, getChild, IN, unsigned int, i); - I_Method1(const osg::Shape *, getChild, IN, unsigned int, i); - I_Method1(void, addChild, IN, osg::Shape *, shape); - I_Method1(void, removeChild, IN, unsigned int, i); - I_Method1(unsigned int, findChildNo, IN, osg::Shape *, shape); - I_ArrayProperty_GA(osg::Shape *, Child, Children, unsigned int, void); - I_Property(osg::Shape *, Shape); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Cone) - I_BaseType(osg::Shape); - I_Constructor0(); - I_Constructor3(IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - I_ConstructorWithDefaults2(IN, const osg::Cone &, cone, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - I_Method0(bool, valid); - I_Method3(void, set, IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - I_Method1(void, setCenter, IN, const osg::Vec3 &, center); - I_Method0(const osg::Vec3 &, getCenter); - I_Method1(void, setRadius, IN, float, radius); - I_Method0(float, getRadius); - I_Method1(void, setHeight, IN, float, height); - I_Method0(float, getHeight); - I_Method1(void, setRotation, IN, const osg::Quat &, quat); - I_Method0(const osg::Quat &, getRotation); - I_Method0(osg::Matrix, computeRotationMatrix); - I_Method0(bool, zeroRotation); - I_Method0(float, getBaseOffsetFactor); - I_Method0(float, getBaseOffset); - I_ReadOnlyProperty(float, BaseOffset); - I_ReadOnlyProperty(float, BaseOffsetFactor); - I_Property(const osg::Vec3 &, Center); - I_Property(float, Height); - I_Property(float, Radius); - I_Property(const osg::Quat &, Rotation); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ConstShapeVisitor) - I_Constructor0(); - I_Method1(void, apply, IN, const osg::Sphere &, x); - I_Method1(void, apply, IN, const osg::Box &, x); - I_Method1(void, apply, IN, const osg::Cone &, x); - I_Method1(void, apply, IN, const osg::Cylinder &, x); - I_Method1(void, apply, IN, const osg::Capsule &, x); - I_Method1(void, apply, IN, const osg::InfinitePlane &, x); - I_Method1(void, apply, IN, const osg::TriangleMesh &, x); - I_Method1(void, apply, IN, const osg::ConvexHull &, x); - I_Method1(void, apply, IN, const osg::HeightField &, x); - I_Method1(void, apply, IN, const osg::CompositeShape &, x); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::ConvexHull) - I_BaseType(osg::TriangleMesh); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::ConvexHull &, hull, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Cylinder) - I_BaseType(osg::Shape); - I_Constructor0(); - I_Constructor3(IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - I_ConstructorWithDefaults2(IN, const osg::Cylinder &, cylinder, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - I_Method0(bool, valid); - I_Method3(void, set, IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - I_Method1(void, setCenter, IN, const osg::Vec3 &, center); - I_Method0(const osg::Vec3 &, getCenter); - I_Method1(void, setRadius, IN, float, radius); - I_Method0(float, getRadius); - I_Method1(void, setHeight, IN, float, height); - I_Method0(float, getHeight); - I_Method1(void, setRotation, IN, const osg::Quat &, quat); - I_Method0(const osg::Quat &, getRotation); - I_Method0(osg::Matrix, computeRotationMatrix); - I_Method0(bool, zeroRotation); - I_Property(const osg::Vec3 &, Center); - I_Property(float, Height); - I_Property(float, Radius); - I_Property(const osg::Quat &, Rotation); -END_REFLECTOR - TYPE_NAME_ALIAS(std::vector< float >, osg::HeightField::HeightList); -BEGIN_OBJECT_REFLECTOR(osg::HeightField) - I_BaseType(osg::Shape); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::HeightField &, mesh, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - I_Method2(void, allocate, IN, unsigned int, numColumns, IN, unsigned int, numRows); - I_Method0(unsigned int, getNumColumns); - I_Method0(unsigned int, getNumRows); - I_Method1(void, setOrigin, IN, const osg::Vec3 &, origin); - I_Method0(const osg::Vec3 &, getOrigin); - I_Method1(void, setXInterval, IN, float, dx); - I_Method0(float, getXInterval); - I_Method1(void, setYInterval, IN, float, dy); - I_Method0(float, getYInterval); - I_Method1(void, setSkirtHeight, IN, float, skirtHeight); - I_Method0(float, getSkirtHeight); - I_Method1(void, setBorderWidth, IN, unsigned int, borderWidth); - I_Method0(unsigned int, getBorderWidth); - I_Method1(void, setRotation, IN, const osg::Quat &, quat); - I_Method0(const osg::Quat &, getRotation); - I_Method0(osg::Matrix, computeRotationMatrix); - I_Method0(bool, zeroRotation); - I_Method3(void, setHeight, IN, unsigned int, c, IN, unsigned int, r, IN, float, value); - I_Method2(float &, getHeight, IN, unsigned int, c, IN, unsigned int, r); - I_Method2(float, getHeight, IN, unsigned int, c, IN, unsigned int, r); - I_Method0(osg::HeightField::HeightList &, getHeightList); - I_Method0(const osg::HeightField::HeightList &, getHeightList); - I_Method2(osg::Vec3, getVertex, IN, unsigned int, c, IN, unsigned int, r); - I_Method2(osg::Vec3, getNormal, IN, unsigned int, c, IN, unsigned int, r); - I_Method2(osg::Vec2, getHeightDelta, IN, unsigned int, c, IN, unsigned int, r); - I_Property(unsigned int, BorderWidth); - I_IndexedProperty2(float, Height, unsigned int, c, unsigned int, r); - I_ReadOnlyProperty(osg::HeightField::HeightList &, HeightList); - I_Property(const osg::Vec3 &, Origin); - I_Property(const osg::Quat &, Rotation); - I_Property(float, SkirtHeight); - I_Property(float, XInterval); - I_Property(float, YInterval); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::InfinitePlane) - I_BaseType(osg::Shape); - I_BaseType(osg::Plane); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::InfinitePlane &, plane, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); -END_REFLECTOR - -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Shape) - I_BaseType(osg::Object); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Shape &, sa, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ShapeVisitor) - I_Constructor0(); - I_Method1(void, apply, IN, osg::Sphere &, x); - I_Method1(void, apply, IN, osg::Box &, x); - I_Method1(void, apply, IN, osg::Cone &, x); - I_Method1(void, apply, IN, osg::Cylinder &, x); - I_Method1(void, apply, IN, osg::Capsule &, x); - I_Method1(void, apply, IN, osg::InfinitePlane &, x); - I_Method1(void, apply, IN, osg::TriangleMesh &, x); - I_Method1(void, apply, IN, osg::ConvexHull &, x); - I_Method1(void, apply, IN, osg::HeightField &, x); - I_Method1(void, apply, IN, osg::CompositeShape &, x); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Sphere) - I_BaseType(osg::Shape); - I_Constructor0(); - I_Constructor2(IN, const osg::Vec3 &, center, IN, float, radius); - I_ConstructorWithDefaults2(IN, const osg::Sphere &, sphere, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - I_Method0(bool, valid); - I_Method2(void, set, IN, const osg::Vec3 &, center, IN, float, radius); - I_Method1(void, setCenter, IN, const osg::Vec3 &, center); - I_Method0(const osg::Vec3 &, getCenter); - I_Method1(void, setRadius, IN, float, radius); - I_Method0(float, getRadius); - I_Property(const osg::Vec3 &, Center); - I_Property(float, Radius); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::TriangleMesh) - I_BaseType(osg::Shape); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::TriangleMesh &, mesh, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, accept, IN, osg::ShapeVisitor &, sv); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - I_Method1(void, setVertices, IN, osg::Vec3Array *, vertices); - I_Method0(osg::Vec3Array *, getVertices); - I_Method0(const osg::Vec3Array *, getVertices); - I_Method1(void, setIndices, IN, osg::IndexArray *, indices); - I_Method0(osg::IndexArray *, getIndices); - I_Method0(const osg::IndexArray *, getIndices); - I_Property(osg::IndexArray *, Indices); - I_Property(osg::Vec3Array *, Vertices); -END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< float >, osg::HeightField::HeightList); TYPE_NAME_ALIAS(osg::HeightField, osg::Grid); BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Shape >) + I_Constructor0(); + I_Constructor1(IN, osg::Shape *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::Shape > &, rp); + I_Method0(osg::Shape *, get); + I_Method0(bool, valid); + I_Method0(osg::Shape *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::Shape > &, rp); I_Constructor0(); I_Constructor1(IN, osg::Shape *, ptr); I_Constructor1(IN, const osg::ref_ptr< osg::Shape > &, rp); diff --git a/src/osgWrappers/osg/ShapeDrawable.cpp b/src/osgWrappers/osg/ShapeDrawable.cpp index f744c57aa..e240a3012 100644 --- a/src/osgWrappers/osg/ShapeDrawable.cpp +++ b/src/osgWrappers/osg/ShapeDrawable.cpp @@ -9,15 +9,7 @@ #include #include -#include -#include -#include -#include -#include -#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -27,30 +19,9 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::ShapeDrawable) - I_BaseType(osg::Drawable); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, osg::Shape *, shape, , IN, osg::TessellationHints *, hints, 0); - I_ConstructorWithDefaults2(IN, const osg::ShapeDrawable &, pg, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, setColor, IN, const osg::Vec4 &, color); - I_Method0(const osg::Vec4 &, getColor); - I_Method1(void, setTessellationHints, IN, osg::TessellationHints *, hints); - I_Method0(osg::TessellationHints *, getTessellationHints); - I_Method0(const osg::TessellationHints *, getTessellationHints); - I_Method1(void, drawImplementation, IN, osg::State &, state); - I_Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); - I_Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); - I_Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); - I_Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); - I_Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); - I_Method0(osg::BoundingBox, computeBound); - I_Property(const osg::Vec4 &, Color); - I_Property(osg::TessellationHints *, TessellationHints); +BEGIN_ENUM_REFLECTOR(osg::TessellationHints::TessellationMode) + I_EnumLabel(osg::TessellationHints::USE_SHAPE_DEFAULTS); + I_EnumLabel(osg::TessellationHints::USE_TARGET_NUM_FACES); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::TessellationHints::TessellationMode) @@ -58,44 +29,3 @@ BEGIN_ENUM_REFLECTOR(osg::TessellationHints::TessellationMode) I_EnumLabel(osg::TessellationHints::USE_TARGET_NUM_FACES); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::TessellationHints) - I_BaseType(osg::Object); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::TessellationHints &, tess, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method1(void, setTessellationMode, IN, osg::TessellationHints::TessellationMode, mode); - I_Method0(osg::TessellationHints::TessellationMode, getTessellationMode); - I_Method1(void, setDetailRatio, IN, float, ratio); - I_Method0(float, getDetailRatio); - I_Method1(void, setTargetNumFaces, IN, unsigned int, target); - I_Method0(unsigned int, getTargetNumFaces); - I_Method1(void, setCreateFrontFace, IN, bool, on); - I_Method0(bool, getCreateFrontFace); - I_Method1(void, setCreateBackFace, IN, bool, on); - I_Method0(bool, getCreateBackFace); - I_Method1(void, setCreateNormals, IN, bool, on); - I_Method0(bool, getCreateNormals); - I_Method1(void, setCreateTextureCoords, IN, bool, on); - I_Method0(bool, getCreateTextureCoords); - I_Method1(void, setCreateTop, IN, bool, on); - I_Method0(bool, getCreateTop); - I_Method1(void, setCreateBody, IN, bool, on); - I_Method0(bool, getCreateBody); - I_Method1(void, setCreateBottom, IN, bool, on); - I_Method0(bool, getCreateBottom); - I_Property(bool, CreateBackFace); - I_Property(bool, CreateBody); - I_Property(bool, CreateBottom); - I_Property(bool, CreateFrontFace); - I_Property(bool, CreateNormals); - I_Property(bool, CreateTextureCoords); - I_Property(bool, CreateTop); - I_Property(float, DetailRatio); - I_Property(unsigned int, TargetNumFaces); - I_Property(osg::TessellationHints::TessellationMode, TessellationMode); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index a5a73d6bb..9ee1d871f 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -9,16 +9,7 @@ #include #include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -34,129 +25,9 @@ BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors) I_EnumLabel(osg::State::ONCE_PER_ATTRIBUTE); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::State) - I_BaseType(osg::Referenced); - I_Constructor0(); - I_Method1(void, setGraphicsContext, IN, osg::GraphicsContext *, context); - I_Method0(osg::GraphicsContext *, getGraphicsContext); - I_Method0(const osg::GraphicsContext *, getGraphicsContext); - I_Method1(void, setContextID, IN, unsigned int, contextID); - I_Method0(unsigned int, getContextID); - I_Method1(void, pushStateSet, IN, const osg::StateSet *, dstate); - I_Method0(void, popStateSet); - I_Method0(void, popAllStateSets); - I_Method1(void, captureCurrentState, IN, osg::StateSet &, stateset); - I_Method0(void, reset); - I_Method0(const osg::Viewport *, getCurrentViewport); - I_Method1(void, setInitialViewMatrix, IN, const osg::RefMatrix *, matrix); - I_Method0(const osg::Matrix &, getInitialViewMatrix); - I_Method0(const osg::Matrix &, getInitialInverseViewMatrix); - I_Method1(void, applyProjectionMatrix, IN, const osg::RefMatrix *, matrix); - I_Method0(const osg::Matrix &, getProjectionMatrix); - I_Method1(void, applyModelViewMatrix, IN, const osg::RefMatrix *, matrix); - I_Method0(const osg::Matrix &, getModelViewMatrix); - I_Method0(osg::Polytope, getViewFrustum); - I_Method1(void, apply, IN, const osg::StateSet *, dstate); - I_Method0(void, apply); - I_Method2(void, setModeValidity, IN, osg::StateAttribute::GLMode, mode, IN, bool, valid); - I_Method1(bool, getModeValidity, IN, osg::StateAttribute::GLMode, mode); - I_Method2(void, setGlobalDefaultModeValue, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); - I_Method1(bool, getGlobalDefaultModeValue, IN, osg::StateAttribute::GLMode, mode); - I_Method2(bool, applyMode, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); - I_Method3(void, setGlobalDefaultTextureModeValue, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); - I_Method2(bool, getGlobalDefaultTextureModeValue, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - I_Method3(bool, applyTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); - I_Method1(void, setGlobalDefaultAttribute, IN, const osg::StateAttribute *, attribute); - I_MethodWithDefaults2(const osg::StateAttribute *, getGlobalDefaultAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_Method1(bool, applyAttribute, IN, const osg::StateAttribute *, attribute); - I_Method2(void, setGlobalDefaultTextureAttribute, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute); - I_MethodWithDefaults3(const osg::StateAttribute *, getGlobalDefaultTextureAttribute, IN, unsigned int, unit, , IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_Method2(bool, applyTextureAttribute, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute); - I_Method2(void, haveAppliedMode, IN, osg::StateAttribute::GLMode, mode, IN, osg::StateAttribute::GLModeValue, value); - I_Method1(void, haveAppliedMode, IN, osg::StateAttribute::GLMode, mode); - I_Method1(void, haveAppliedAttribute, IN, const osg::StateAttribute *, attribute); - I_MethodWithDefaults2(void, haveAppliedAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_Method1(bool, getLastAppliedMode, IN, osg::StateAttribute::GLMode, mode); - I_MethodWithDefaults2(const osg::StateAttribute *, getLastAppliedAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_Method3(void, haveAppliedTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode, IN, osg::StateAttribute::GLModeValue, value); - I_Method2(void, haveAppliedTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - I_Method2(void, haveAppliedTextureAttribute, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute); - I_MethodWithDefaults3(void, haveAppliedTextureAttribute, IN, unsigned int, unit, , IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_Method2(bool, getLastAppliedTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - I_MethodWithDefaults3(const osg::StateAttribute *, getLastAppliedTextureAttribute, IN, unsigned int, unit, , IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_Method0(void, dirtyAllModes); - I_Method0(void, dirtyAllAttributes); - I_Method0(void, disableAllVertexArrays); - I_Method0(void, dirtyAllVertexArrays); - I_Method3(void, setInterleavedArrays, IN, GLenum, format, IN, GLsizei, stride, IN, const GLvoid *, pointer); - I_Method4(void, setVertexPointer, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - I_Method0(void, disableVertexPointer); - I_Method0(void, dirtyVertexPointer); - I_Method3(void, setNormalPointer, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - I_Method0(void, disableNormalPointer); - I_Method0(void, dirtyNormalPointer); - I_Method4(void, setColorPointer, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - I_Method0(void, disableColorPointer); - I_Method0(void, dirtyColorPointer); - I_Method0(bool, isSecondaryColorSupported); - I_Method4(void, setSecondaryColorPointer, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - I_Method0(void, disableSecondaryColorPointer); - I_Method0(void, dirtySecondaryColorPointer); - I_Method3(void, setIndexPointer, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - I_Method0(void, disableIndexPointer); - I_Method0(void, dirtyIndexPointer); - I_Method0(bool, isFogCoordSupported); - I_Method3(void, setFogCoordPointer, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - I_Method0(void, disableFogCoordPointer); - I_Method0(void, dirtyFogCoordPointer); - I_Method5(void, setTexCoordPointer, IN, unsigned int, unit, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - I_Method1(void, disableTexCoordPointer, IN, unsigned int, unit); - I_Method1(void, dirtyTexCoordPointer, IN, unsigned int, unit); - I_Method1(void, disableTexCoordPointersAboveAndIncluding, IN, unsigned int, unit); - I_Method1(void, dirtyTexCoordPointersAboveAndIncluding, IN, unsigned int, unit); - I_Method1(bool, setActiveTextureUnit, IN, unsigned int, unit); - I_Method0(unsigned int, getActiveTextureUnit); - I_Method1(bool, setClientActiveTextureUnit, IN, unsigned int, unit); - I_Method0(unsigned int, getClientActiveTextureUnit); - I_Method6(void, setVertexAttribPointer, IN, unsigned int, index, IN, GLint, size, IN, GLenum, type, IN, GLboolean, normalized, IN, GLsizei, stride, IN, const GLvoid *, ptr); - I_Method1(void, disableVertexAttribPointer, IN, unsigned int, index); - I_Method1(void, disableVertexAttribPointersAboveAndIncluding, IN, unsigned int, index); - I_Method1(void, dirtyVertexAttribPointersAboveAndIncluding, IN, unsigned int, index); - I_Method0(bool, isVertexBufferObjectSupported); - I_Method1(void, setLastAppliedProgramObject, IN, const osg::Program::PerContextProgram *, program); - I_Method0(const osg::Program::PerContextProgram *, getLastAppliedProgramObject); - I_Method1(GLint, getUniformLocation, IN, const std::string &, name); - I_Method1(GLint, getAttribLocation, IN, const std::string &, name); - I_Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs); - I_Method0(const osg::FrameStamp *, getFrameStamp); - I_Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, vs); - I_Method0(const osg::DisplaySettings *, getDisplaySettings); - I_Method1(void, setAbortRenderingPtr, IN, bool *, abortPtr); - I_Method0(bool, getAbortRendering); - I_Method1(void, setCheckForGLErrors, IN, osg::State::CheckForGLErrors, check); - I_Method0(osg::State::CheckForGLErrors, getCheckForGLErrors); - I_Method1(bool, checkGLErrors, IN, const char *, str); - I_Method1(bool, checkGLErrors, IN, osg::StateAttribute::GLMode, mode); - I_Method1(bool, checkGLErrors, IN, const osg::StateAttribute *, attribute); - I_ReadOnlyProperty(bool, AbortRendering); - I_WriteOnlyProperty(bool *, AbortRenderingPtr); - I_PropertyWithReturnType(unsigned int, ActiveTextureUnit, bool); - I_Property(osg::State::CheckForGLErrors, CheckForGLErrors); - I_PropertyWithReturnType(unsigned int, ClientActiveTextureUnit, bool); - I_Property(unsigned int, ContextID); - I_ReadOnlyProperty(const osg::Viewport *, CurrentViewport); - I_WriteOnlyProperty(osg::DisplaySettings *, DisplaySettings); - I_WriteOnlyProperty(osg::FrameStamp *, FrameStamp); - I_WriteOnlyProperty(const osg::StateAttribute *, GlobalDefaultAttribute); - I_IndexedProperty1(bool, GlobalDefaultModeValue, osg::StateAttribute::GLMode, mode); - I_IndexedProperty2(bool, GlobalDefaultTextureModeValue, unsigned int, unit, osg::StateAttribute::GLMode, mode); - I_Property(osg::GraphicsContext *, GraphicsContext); - I_ReadOnlyProperty(const osg::Matrix &, InitialInverseViewMatrix); - I_WriteOnlyProperty(const osg::RefMatrix *, InitialViewMatrix); - I_Property(const osg::Program::PerContextProgram *, LastAppliedProgramObject); - I_IndexedProperty1(bool, ModeValidity, osg::StateAttribute::GLMode, mode); - I_ReadOnlyProperty(const osg::Matrix &, ModelViewMatrix); - I_ReadOnlyProperty(const osg::Matrix &, ProjectionMatrix); - I_ReadOnlyProperty(osg::Polytope, ViewFrustum); +BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors) + I_EnumLabel(osg::State::NEVER_CHECK_GL_ERRORS); + I_EnumLabel(osg::State::ONCE_PER_FRAME); + I_EnumLabel(osg::State::ONCE_PER_ATTRIBUTE); END_REFLECTOR diff --git a/src/osgWrappers/osg/StateAttribute.cpp b/src/osgWrappers/osg/StateAttribute.cpp index bc5b5b82d..536ced8ff 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -9,12 +9,7 @@ #include #include -#include -#include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -92,59 +87,80 @@ BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Type) I_EnumLabel(osg::StateAttribute::OSGNVPARSE_PROGRAM_PARSER); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) - I_BaseType(osg::Object); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::StateAttribute &, sa, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method0(unsigned int, getMember); - I_Method0(osg::StateAttribute::TypeMemberPair, getTypeMemberPair); - I_Method0(bool, isTextureAttribute); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method0(const osg::StateAttribute::ParentList &, getParents); - I_Method1(osg::StateSet *, getParent, IN, unsigned int, i); - I_Method1(const osg::StateSet *, getParent, IN, unsigned int, i); - I_Method0(unsigned int, getNumParents); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x); - I_Method1(bool, checkValidityOfAssociatedModes, IN, osg::State &, x); - I_Method1(void, setUpdateCallback, IN, osg::StateAttribute::Callback *, uc); - I_Method0(osg::StateAttribute::Callback *, getUpdateCallback); - I_Method0(const osg::StateAttribute::Callback *, getUpdateCallback); - I_Method1(void, setEventCallback, IN, osg::StateAttribute::Callback *, ec); - I_Method0(osg::StateAttribute::Callback *, getEventCallback); - I_Method0(const osg::StateAttribute::Callback *, getEventCallback); - I_Method1(void, apply, IN, osg::State &, x); - I_Method1(void, compileGLObjects, IN, osg::State &, x); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - I_Property(osg::StateAttribute::Callback *, EventCallback); - I_ReadOnlyProperty(unsigned int, Member); - I_ArrayProperty_G(osg::StateSet *, Parent, Parents, unsigned int, void); - I_ReadOnlyProperty(const osg::StateAttribute::ParentList &, Parents); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); - I_ReadOnlyProperty(osg::StateAttribute::TypeMemberPair, TypeMemberPair); - I_Property(osg::StateAttribute::Callback *, UpdateCallback); +TYPE_NAME_ALIAS(GLenum, osg::StateAttribute::GLMode); + +TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::GLModeValue); + +TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::OverrideValue); + +TYPE_NAME_ALIAS(std::pair< osg::StateAttribute::Type COMMA unsigned int >, osg::StateAttribute::TypeMemberPair); + +TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList); + +BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Values) + I_EnumLabel(osg::StateAttribute::OFF); + I_EnumLabel(osg::StateAttribute::ON); + I_EnumLabel(osg::StateAttribute::OVERRIDE); + I_EnumLabel(osg::StateAttribute::PROTECTED); + I_EnumLabel(osg::StateAttribute::INHERIT); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::StateAttribute::Callback) - I_VirtualBaseType(osg::Object); - I_Constructor0(); - I_Constructor2(IN, const osg::StateAttribute::Callback &, x, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); +BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Type) + I_EnumLabel(osg::StateAttribute::TEXTURE); + I_EnumLabel(osg::StateAttribute::POLYGONMODE); + I_EnumLabel(osg::StateAttribute::POLYGONOFFSET); + I_EnumLabel(osg::StateAttribute::MATERIAL); + I_EnumLabel(osg::StateAttribute::ALPHAFUNC); + I_EnumLabel(osg::StateAttribute::ANTIALIAS); + I_EnumLabel(osg::StateAttribute::COLORTABLE); + I_EnumLabel(osg::StateAttribute::CULLFACE); + I_EnumLabel(osg::StateAttribute::FOG); + I_EnumLabel(osg::StateAttribute::FRONTFACE); + I_EnumLabel(osg::StateAttribute::LIGHT); + I_EnumLabel(osg::StateAttribute::POINT); + I_EnumLabel(osg::StateAttribute::LINEWIDTH); + I_EnumLabel(osg::StateAttribute::LINESTIPPLE); + I_EnumLabel(osg::StateAttribute::POLYGONSTIPPLE); + I_EnumLabel(osg::StateAttribute::SHADEMODEL); + I_EnumLabel(osg::StateAttribute::TEXENV); + I_EnumLabel(osg::StateAttribute::TEXENVFILTER); + I_EnumLabel(osg::StateAttribute::TEXGEN); + I_EnumLabel(osg::StateAttribute::TEXMAT); + I_EnumLabel(osg::StateAttribute::LIGHTMODEL); + I_EnumLabel(osg::StateAttribute::BLENDFUNC); + I_EnumLabel(osg::StateAttribute::BLENDEQUATION); + I_EnumLabel(osg::StateAttribute::LOGICOP); + I_EnumLabel(osg::StateAttribute::STENCIL); + I_EnumLabel(osg::StateAttribute::COLORMASK); + I_EnumLabel(osg::StateAttribute::DEPTH); + I_EnumLabel(osg::StateAttribute::VIEWPORT); + I_EnumLabel(osg::StateAttribute::SCISSOR); + I_EnumLabel(osg::StateAttribute::BLENDCOLOR); + I_EnumLabel(osg::StateAttribute::MULTISAMPLE); + I_EnumLabel(osg::StateAttribute::CLIPPLANE); + I_EnumLabel(osg::StateAttribute::COLORMATRIX); + I_EnumLabel(osg::StateAttribute::VERTEXPROGRAM); + I_EnumLabel(osg::StateAttribute::FRAGMENTPROGRAM); + I_EnumLabel(osg::StateAttribute::POINTSPRITE); + I_EnumLabel(osg::StateAttribute::PROGRAM); + I_EnumLabel(osg::StateAttribute::CLAMPCOLOR); + I_EnumLabel(osg::StateAttribute::VALIDATOR); + I_EnumLabel(osg::StateAttribute::VIEWMATRIXEXTRACTOR); + I_EnumLabel(osg::StateAttribute::OSGNV_PARAMETER_BLOCK); + I_EnumLabel(osg::StateAttribute::OSGNVEXT_TEXTURE_SHADER); + I_EnumLabel(osg::StateAttribute::OSGNVEXT_VERTEX_PROGRAM); + I_EnumLabel(osg::StateAttribute::OSGNVEXT_REGISTER_COMBINERS); + I_EnumLabel(osg::StateAttribute::OSGNVCG_PROGRAM); + I_EnumLabel(osg::StateAttribute::OSGNVSLANG_PROGRAM); + I_EnumLabel(osg::StateAttribute::OSGNVPARSE_PROGRAM_PARSER); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute::ModeUsage) +BEGIN_VALUE_REFLECTOR(osg::StateAttribute::ModeUsage) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::StateAttribute::ModeUsage) I_Constructor0(); - I_Method1(void, usesMode, IN, osg::StateAttribute::GLMode, mode); - I_Method1(void, usesTextureMode, IN, osg::StateAttribute::GLMode, mode); END_REFLECTOR STD_PAIR_REFLECTOR(std::pair< osg::StateAttribute::Type COMMA unsigned int >); diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index 97231a8d6..368337e9c 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -9,13 +9,7 @@ #include #include -#include -#include -#include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -25,184 +19,19 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< osg::Object * >, osg::StateSet::ParentList); - -TYPE_NAME_ALIAS(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateSet::ModeList); - -TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateAttribute > COMMA osg::StateAttribute::OverrideValue >, osg::StateSet::RefAttributePair); - -TYPE_NAME_ALIAS(std::map< osg::StateAttribute::TypeMemberPair COMMA osg::StateSet::RefAttributePair >, osg::StateSet::AttributeList); - -TYPE_NAME_ALIAS(std::vector< osg::StateSet::ModeList >, osg::StateSet::TextureModeList); - -TYPE_NAME_ALIAS(std::vector< osg::StateSet::AttributeList >, osg::StateSet::TextureAttributeList); - -TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::Uniform > COMMA osg::StateAttribute::OverrideValue >, osg::StateSet::RefUniformPair); - -TYPE_NAME_ALIAS(std::map< std::string COMMA osg::StateSet::RefUniformPair >, osg::StateSet::UniformList); - -BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderingHint) - I_EnumLabel(osg::StateSet::DEFAULT_BIN); - I_EnumLabel(osg::StateSet::OPAQUE_BIN); - I_EnumLabel(osg::StateSet::TRANSPARENT_BIN); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderBinMode) - I_EnumLabel(osg::StateSet::INHERIT_RENDERBIN_DETAILS); - I_EnumLabel(osg::StateSet::USE_RENDERBIN_DETAILS); - I_EnumLabel(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::StateSet) - I_BaseType(osg::Object); +BEGIN_VALUE_REFLECTOR(osg::StateSet) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::StateSet &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_MethodWithDefaults2(int, compare, IN, const osg::StateSet &, rhs, , IN, bool, compareAttributeContents, false); - I_Method0(const osg::StateSet::ParentList &, getParents); - I_Method0(osg::StateSet::ParentList, getParents); - I_Method1(osg::Object *, getParent, IN, unsigned int, i); - I_Method1(const osg::Object *, getParent, IN, unsigned int, i); - I_Method0(unsigned int, getNumParents); - I_Method0(void, setGlobalDefaults); - I_Method0(void, clear); - I_Method1(void, merge, IN, const osg::StateSet &, rhs); - I_Method2(void, setMode, IN, osg::StateAttribute::GLMode, mode, IN, osg::StateAttribute::GLModeValue, value); - I_Method1(void, removeMode, IN, osg::StateAttribute::GLMode, mode); - I_Method1(osg::StateAttribute::GLModeValue, getMode, IN, osg::StateAttribute::GLMode, mode); - I_Method1(void, setModeList, IN, osg::StateSet::ModeList &, ml); - I_Method0(osg::StateSet::ModeList &, getModeList); - I_Method0(const osg::StateSet::ModeList &, getModeList); - I_MethodWithDefaults2(void, setAttribute, IN, osg::StateAttribute *, attribute, , IN, osg::StateAttribute::OverrideValue, value, osg::StateAttribute::OFF); - I_MethodWithDefaults2(void, setAttributeAndModes, IN, osg::StateAttribute *, attribute, , IN, osg::StateAttribute::GLModeValue, value, osg::StateAttribute::ON); - I_MethodWithDefaults2(void, removeAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_Method1(void, removeAttribute, IN, osg::StateAttribute *, attribute); - I_MethodWithDefaults2(osg::StateAttribute *, getAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_MethodWithDefaults2(const osg::StateAttribute *, getAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_MethodWithDefaults2(const osg::StateSet::RefAttributePair *, getAttributePair, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - I_Method1(void, setAttributeList, IN, osg::StateSet::AttributeList &, al); - I_Method0(osg::StateSet::AttributeList &, getAttributeList); - I_Method0(const osg::StateSet::AttributeList &, getAttributeList); - I_Method3(void, setTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode, IN, osg::StateAttribute::GLModeValue, value); - I_Method2(void, removeTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - I_Method2(osg::StateAttribute::GLModeValue, getTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - I_Method1(void, setTextureModeList, IN, osg::StateSet::TextureModeList &, tml); - I_Method0(osg::StateSet::TextureModeList &, getTextureModeList); - I_Method0(const osg::StateSet::TextureModeList &, getTextureModeList); - I_MethodWithDefaults3(void, setTextureAttribute, IN, unsigned int, unit, , IN, osg::StateAttribute *, attribute, , IN, osg::StateAttribute::OverrideValue, value, osg::StateAttribute::OFF); - I_MethodWithDefaults3(void, setTextureAttributeAndModes, IN, unsigned int, unit, , IN, osg::StateAttribute *, attribute, , IN, osg::StateAttribute::GLModeValue, value, osg::StateAttribute::ON); - I_Method2(void, removeTextureAttribute, IN, unsigned int, unit, IN, osg::StateAttribute::Type, type); - I_Method2(void, removeTextureAttribute, IN, unsigned int, unit, IN, osg::StateAttribute *, attribute); - I_Method2(osg::StateAttribute *, getTextureAttribute, IN, unsigned int, unit, IN, osg::StateAttribute::Type, type); - I_Method2(const osg::StateAttribute *, getTextureAttribute, IN, unsigned int, unit, IN, osg::StateAttribute::Type, type); - I_Method2(const osg::StateSet::RefAttributePair *, getTextureAttributePair, IN, unsigned int, unit, IN, osg::StateAttribute::Type, type); - I_Method1(void, setTextureAttributeList, IN, osg::StateSet::TextureAttributeList &, tal); - I_Method0(osg::StateSet::TextureAttributeList &, getTextureAttributeList); - I_Method0(const osg::StateSet::TextureAttributeList &, getTextureAttributeList); - I_Method2(void, setAssociatedModes, IN, const osg::StateAttribute *, attribute, IN, osg::StateAttribute::GLModeValue, value); - I_Method3(void, setAssociatedTextureModes, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute, IN, osg::StateAttribute::GLModeValue, value); - I_MethodWithDefaults2(void, addUniform, IN, osg::Uniform *, uniform, , IN, osg::StateAttribute::OverrideValue, value, osg::StateAttribute::ON); - I_Method1(void, removeUniform, IN, const std::string &, name); - I_Method1(void, removeUniform, IN, osg::Uniform *, uniform); - I_Method1(osg::Uniform *, getUniform, IN, const std::string &, name); - I_MethodWithDefaults3(osg::Uniform *, getOrCreateUniform, IN, const std::string &, name, , IN, osg::Uniform::Type, type, , IN, unsigned int, numElements, 1); - I_Method1(const osg::Uniform *, getUniform, IN, const std::string &, name); - I_Method1(const osg::StateSet::RefUniformPair *, getUniformPair, IN, const std::string &, name); - I_Method1(void, setUniformList, IN, osg::StateSet::UniformList &, al); - I_Method0(osg::StateSet::UniformList &, getUniformList); - I_Method0(const osg::StateSet::UniformList &, getUniformList); - I_Method1(void, setRenderingHint, IN, int, hint); - I_Method0(int, getRenderingHint); - I_MethodWithDefaults3(void, setRenderBinDetails, IN, int, binNum, , IN, const std::string &, binName, , IN, osg::StateSet::RenderBinMode, mode, osg::StateSet::USE_RENDERBIN_DETAILS); - I_Method0(void, setRenderBinToInherit); - I_Method0(bool, useRenderBinDetails); - I_Method1(void, setRenderBinMode, IN, osg::StateSet::RenderBinMode, mode); - I_Method0(osg::StateSet::RenderBinMode, getRenderBinMode); - I_Method1(void, setBinNumber, IN, int, num); - I_Method0(int, getBinNumber); - I_Method1(void, setBinName, IN, const std::string &, name); - I_Method0(const std::string &, getBinName); - I_Method1(void, setUpdateCallback, IN, osg::StateSet::Callback *, ac); - I_Method0(osg::StateSet::Callback *, getUpdateCallback); - I_Method0(const osg::StateSet::Callback *, getUpdateCallback); - I_Method0(bool, requiresUpdateTraversal); - I_Method0(unsigned int, getNumChildrenRequiringUpdateTraversal); - I_Method1(void, runUpdateCallbacks, IN, osg::NodeVisitor *, nv); - I_Method1(void, setEventCallback, IN, osg::StateSet::Callback *, ac); - I_Method0(osg::StateSet::Callback *, getEventCallback); - I_Method0(const osg::StateSet::Callback *, getEventCallback); - I_Method0(bool, requiresEventTraversal); - I_Method0(unsigned int, getNumChildrenRequiringEventTraversal); - I_Method1(void, runEventCallbacks, IN, osg::NodeVisitor *, nv); - I_Method1(bool, checkValidityOfAssociatedModes, IN, osg::State &, state); - I_Method1(void, compileGLObjects, IN, osg::State &, state); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - I_Property(osg::StateSet::AttributeList &, AttributeList); - I_Property(const std::string &, BinName); - I_Property(int, BinNumber); - I_Property(osg::StateSet::Callback *, EventCallback); - - I_Property(osg::StateSet::ModeList &, ModeList); - I_ArrayProperty_G(osg::Object *, Parent, Parents, unsigned int, void); - I_ReadOnlyProperty(osg::StateSet::ParentList, Parents); - I_Property(osg::StateSet::RenderBinMode, RenderBinMode); - I_Property(int, RenderingHint); - I_Property(osg::StateSet::TextureAttributeList &, TextureAttributeList); - I_IndexedProperty2(osg::StateAttribute::GLModeValue, TextureMode, unsigned int, unit, osg::StateAttribute::GLMode, mode); - I_Property(osg::StateSet::TextureModeList &, TextureModeList); - I_Property(osg::StateSet::UniformList &, UniformList); - I_Property(osg::StateSet::Callback *, UpdateCallback); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::StateSet::Callback) - I_VirtualBaseType(osg::Object); +BEGIN_VALUE_REFLECTOR(osg::StateSet) I_Constructor0(); - I_Constructor2(IN, const osg::StateSet::Callback &, x, IN, const osg::CopyOp &, x); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::StateAttribute >) +BEGIN_VALUE_REFLECTOR(osg::StateSet::Callback) I_Constructor0(); - I_Constructor1(IN, osg::StateAttribute *, ptr); - I_Constructor1(IN, const osg::ref_ptr< osg::StateAttribute > &, rp); - I_Method0(osg::StateAttribute *, get); - I_Method0(bool, valid); - I_Method0(osg::StateAttribute *, release); - I_Method1(void, swap, IN, osg::ref_ptr< osg::StateAttribute > &, rp); - I_ReadOnlyProperty(osg::StateAttribute *, ); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Uniform >) +BEGIN_VALUE_REFLECTOR(osg::StateSet::Callback) I_Constructor0(); - I_Constructor1(IN, osg::Uniform *, ptr); - I_Constructor1(IN, const osg::ref_ptr< osg::Uniform > &, rp); - I_Method0(osg::Uniform *, get); - I_Method0(bool, valid); - I_Method0(osg::Uniform *, release); - I_Method1(void, swap, IN, osg::ref_ptr< osg::Uniform > &, rp); - I_ReadOnlyProperty(osg::Uniform *, ); END_REFLECTOR -STD_MAP_REFLECTOR_WITH_TYPES(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateAttribute::GLMode, osg::StateAttribute::Values); -STD_MAP_REFLECTOR(std::map< osg::StateAttribute::TypeMemberPair COMMA osg::StateSet::RefAttributePair >); - -STD_MAP_REFLECTOR(std::map< std::string COMMA osg::StateSet::RefUniformPair >); - -STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::StateAttribute > COMMA osg::StateAttribute::OverrideValue >); - -STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::Uniform > COMMA osg::StateAttribute::OverrideValue >); - -STD_VECTOR_REFLECTOR(std::vector< osg::Object * >); - -STD_VECTOR_REFLECTOR(std::vector< osg::StateSet::AttributeList >); - -STD_VECTOR_REFLECTOR(std::vector< osg::StateSet::ModeList >); - diff --git a/src/osgWrappers/osg/Stencil.cpp b/src/osgWrappers/osg/Stencil.cpp index 804c267da..fe88c43a8 100644 --- a/src/osgWrappers/osg/Stencil.cpp +++ b/src/osgWrappers/osg/Stencil.cpp @@ -9,10 +9,6 @@ #include #include -#include -#include -#include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -23,62 +19,11 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::Stencil::Function) - I_EnumLabel(osg::Stencil::NEVER); - I_EnumLabel(osg::Stencil::LESS); - I_EnumLabel(osg::Stencil::EQUAL); - I_EnumLabel(osg::Stencil::LEQUAL); - I_EnumLabel(osg::Stencil::GREATER); - I_EnumLabel(osg::Stencil::NOTEQUAL); - I_EnumLabel(osg::Stencil::GEQUAL); - I_EnumLabel(osg::Stencil::ALWAYS); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::Stencil::Operation) - I_EnumLabel(osg::Stencil::KEEP); - I_EnumLabel(osg::Stencil::ZERO); - I_EnumLabel(osg::Stencil::REPLACE); - I_EnumLabel(osg::Stencil::INCR); - I_EnumLabel(osg::Stencil::DECR); - I_EnumLabel(osg::Stencil::INVERT); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::Stencil) - I_BaseType(osg::StateAttribute); +BEGIN_VALUE_REFLECTOR(osg::Stencil) + I_Constructor0(); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Stencil) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Stencil &, stencil, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method3(void, setFunction, IN, osg::Stencil::Function, func, IN, int, ref, IN, unsigned int, mask); - I_Method1(void, setFunction, IN, osg::Stencil::Function, func); - I_Method0(osg::Stencil::Function, getFunction); - I_Method1(void, setFunctionRef, IN, int, ref); - I_Method0(int, getFunctionRef); - I_Method1(void, setFunctionMask, IN, unsigned int, mask); - I_Method0(unsigned int, getFunctionMask); - I_Method3(void, setOperation, IN, osg::Stencil::Operation, sfail, IN, osg::Stencil::Operation, zfail, IN, osg::Stencil::Operation, zpass); - I_Method1(void, setStencilFailOperation, IN, osg::Stencil::Operation, sfail); - I_Method0(osg::Stencil::Operation, getStencilFailOperation); - I_Method1(void, setStencilPassAndDepthFailOperation, IN, osg::Stencil::Operation, zfail); - I_Method0(osg::Stencil::Operation, getStencilPassAndDepthFailOperation); - I_Method1(void, setStencilPassAndDepthPassOperation, IN, osg::Stencil::Operation, zpass); - I_Method0(osg::Stencil::Operation, getStencilPassAndDepthPassOperation); - I_Method1(void, setWriteMask, IN, unsigned int, mask); - I_Method0(unsigned int, getWriteMask); - I_Method1(void, apply, IN, osg::State &, state); - I_Property(osg::Stencil::Function, Function); - I_Property(unsigned int, FunctionMask); - I_Property(int, FunctionRef); - I_Property(osg::Stencil::Operation, StencilFailOperation); - I_Property(osg::Stencil::Operation, StencilPassAndDepthFailOperation); - I_Property(osg::Stencil::Operation, StencilPassAndDepthPassOperation); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); - I_Property(unsigned int, WriteMask); END_REFLECTOR diff --git a/src/osgWrappers/osg/Switch.cpp b/src/osgWrappers/osg/Switch.cpp index 81a4288e6..b686598cb 100644 --- a/src/osgWrappers/osg/Switch.cpp +++ b/src/osgWrappers/osg/Switch.cpp @@ -9,11 +9,6 @@ #include #include -#include -#include -#include -#include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -24,42 +19,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::vector< bool >, osg::Switch::ValueList); - -BEGIN_OBJECT_REFLECTOR(osg::Switch) - I_BaseType(osg::Group); +BEGIN_VALUE_REFLECTOR(osg::Switch) I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Switch &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, className); - I_Method0(const char *, libraryName); - I_Method1(void, accept, IN, osg::NodeVisitor &, nv); - I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); - I_Method1(void, setNewChildDefaultValue, IN, bool, value); - I_Method0(bool, getNewChildDefaultValue); - I_Method1(bool, addChild, IN, osg::Node *, child); - I_Method2(bool, addChild, IN, osg::Node *, child, IN, bool, value); - I_Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child); - I_Method3(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child, IN, bool, value); - I_Method2(bool, removeChildren, IN, unsigned int, pos, IN, unsigned int, numChildrenToRemove); - I_Method2(void, setValue, IN, unsigned int, pos, IN, bool, value); - I_Method1(bool, getValue, IN, unsigned int, pos); - I_Method2(void, setChildValue, IN, const osg::Node *, child, IN, bool, value); - I_Method1(bool, getChildValue, IN, const osg::Node *, child); - I_Method0(bool, setAllChildrenOff); - I_Method0(bool, setAllChildrenOn); - I_Method1(bool, setSingleChildOn, IN, unsigned int, pos); - I_Method1(void, setValueList, IN, const osg::Switch::ValueList &, values); - I_Method0(const osg::Switch::ValueList &, getValueList); - I_Method0(osg::BoundingSphere, computeBound); - I_IndexedProperty1(bool, ChildValue, const osg::Node *, child); - I_Property(bool, NewChildDefaultValue); - I_WriteOnlyPropertyWithReturnType(unsigned int, SingleChildOn, bool); - I_IndexedProperty1(bool, Value, unsigned int, pos); - I_Property(const osg::Switch::ValueList &, ValueList); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< bool >); +BEGIN_VALUE_REFLECTOR(osg::Switch) + I_Constructor0(); +END_REFLECTOR diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index aa9133053..c12beae3b 100644 --- a/src/osgWrappers/osg/Texture3D.cpp +++ b/src/osgWrappers/osg/Texture3D.cpp @@ -9,12 +9,9 @@ #include #include -#include -#include -#include -#include -#include #include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -24,53 +21,96 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D) - I_BaseType(osg::Texture); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::Texture3D &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); - I_Method0(GLenum, getTextureTarget); - I_Method1(void, setImage, IN, osg::Image *, image); - I_Method0(osg::Image *, getImage); - I_Method0(const osg::Image *, getImage); - I_Method1(unsigned int &, getModifiedCount, IN, unsigned int, contextID); - I_Method2(void, setImage, IN, unsigned, int, IN, osg::Image *, image); - I_Method1(osg::Image *, getImage, IN, unsigned, int); - I_Method1(const osg::Image *, getImage, IN, unsigned, int); - I_Method0(unsigned int, getNumImages); - I_Method3(void, setTextureSize, IN, int, width, IN, int, height, IN, int, depth); - I_Method3(void, getTextureSize, IN, int &, width, IN, int &, height, IN, int &, depth); - I_Method1(void, setTextureWidth, IN, int, width); - I_Method0(int, getTextureWidth); - I_Method1(void, setTextureHeight, IN, int, height); - I_Method0(int, getTextureHeight); - I_Method1(void, setTextureDepth, IN, int, depth); - I_Method0(int, getTextureDepth); - I_Method1(void, setSubloadCallback, IN, osg::Texture3D::SubloadCallback *, cb); - I_Method0(osg::Texture3D::SubloadCallback *, getSubloadCallback); - I_Method0(const osg::Texture3D::SubloadCallback *, getSubloadCallback); - I_Method1(void, setNumMipmapLevels, IN, unsigned int, num); - 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_Property(osg::Image *, Image); - I_WriteOnlyProperty(unsigned int, NumMipmapLevels); - I_Property(osg::Texture3D::SubloadCallback *, SubloadCallback); - I_Property(int, TextureDepth); - I_Property(int, TextureHeight); - I_ReadOnlyProperty(GLenum, TextureTarget); - I_Property(int, TextureWidth); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); +BEGIN_OBJECT_REFLECTOR(osg::Texture3D::Extensions) + I_BaseType(osg::Referenced); + I_BaseType(osg::Referenced); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::Texture3D::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::Texture3D::Extensions &, rhs); + I_Method1(void, setupGLExtensions, IN, unsigned int, contextID); + I_Method1(void, setTexture3DSupported, IN, bool, flag); + I_Method0(bool, isTexture3DSupported); + I_Method1(void, setTexture3DFast, IN, bool, flag); + I_Method0(bool, isTexture3DFast); + I_Method1(void, setMaxTexture3DSize, IN, GLint, maxsize); + I_Method0(GLint, maxTexture3DSize); + I_Method1(void, setTexImage3DProc, IN, void *, ptr); + I_Method10(void, glTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels); + I_Method1(void, setTexSubImage3DProc, IN, void *, ptr); + I_Method11(void, glTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels); + I_Method1(void, setCopyTexSubImage3DProc, IN, void *, ptr); + I_Method9(void, glCopyTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLint, x, IN, GLint, y, IN, GLsizei, width, IN, GLsizei, height); + I_Method0(bool, isCompressedTexImage3DSupported); + I_Method1(void, setCompressedTexImage3DProc, IN, void *, ptr); + I_Method9(void, glCompressedTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalformat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLsizei, imageSize, IN, const GLvoid *, data); + I_Method0(bool, isCompressedTexSubImage3DSupported); + I_Method1(void, setCompressedTexSubImage3DProc, IN, void *, ptr); + I_Method11(void, glCompressedTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLsizei, imageSize, IN, const GLvoid *, data); + I_Method1(void, setBuild3DMipmapsProc, IN, void *, ptr); + I_Method8(void, gluBuild3DMipmaps, IN, GLenum, target, IN, GLint, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, data); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::Texture3D::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::Texture3D::Extensions &, rhs); + I_Method1(void, setupGLExtensions, IN, unsigned int, contextID); + I_Method1(void, setTexture3DSupported, IN, bool, flag); + I_Method0(bool, isTexture3DSupported); + I_Method1(void, setTexture3DFast, IN, bool, flag); + I_Method0(bool, isTexture3DFast); + I_Method1(void, setMaxTexture3DSize, IN, GLint, maxsize); + I_Method0(GLint, maxTexture3DSize); + I_Method1(void, setTexImage3DProc, IN, void *, ptr); + I_Method10(void, glTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels); + I_Method1(void, setTexSubImage3DProc, IN, void *, ptr); + I_Method11(void, glTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels); + I_Method1(void, setCopyTexSubImage3DProc, IN, void *, ptr); + I_Method9(void, glCopyTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLint, x, IN, GLint, y, IN, GLsizei, width, IN, GLsizei, height); + I_Method0(bool, isCompressedTexImage3DSupported); + I_Method1(void, setCompressedTexImage3DProc, IN, void *, ptr); + I_Method9(void, glCompressedTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalformat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLsizei, imageSize, IN, const GLvoid *, data); + I_Method0(bool, isCompressedTexSubImage3DSupported); + I_Method1(void, setCompressedTexSubImage3DProc, IN, void *, ptr); + I_Method11(void, glCompressedTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLsizei, imageSize, IN, const GLvoid *, data); + I_Method1(void, setBuild3DMipmapsProc, IN, void *, ptr); + I_Method8(void, gluBuild3DMipmaps, IN, GLenum, target, IN, GLint, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, data); + I_WriteOnlyProperty(void *, Build3DMipmapsProc); + I_WriteOnlyProperty(void *, CompressedTexImage3DProc); + I_WriteOnlyProperty(void *, CompressedTexSubImage3DProc); + I_WriteOnlyProperty(void *, CopyTexSubImage3DProc); + I_WriteOnlyProperty(GLint, MaxTexture3DSize); + I_WriteOnlyProperty(void *, TexImage3DProc); + I_WriteOnlyProperty(void *, TexSubImage3DProc); + I_WriteOnlyProperty(bool, Texture3DFast); + I_WriteOnlyProperty(bool, Texture3DSupported); + I_WriteOnlyProperty(unsigned int, upGLExtensions); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Texture3D::Extensions) I_BaseType(osg::Referenced); + I_BaseType(osg::Referenced); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::Texture3D::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::Texture3D::Extensions &, rhs); + I_Method1(void, setupGLExtensions, IN, unsigned int, contextID); + I_Method1(void, setTexture3DSupported, IN, bool, flag); + I_Method0(bool, isTexture3DSupported); + I_Method1(void, setTexture3DFast, IN, bool, flag); + I_Method0(bool, isTexture3DFast); + I_Method1(void, setMaxTexture3DSize, IN, GLint, maxsize); + I_Method0(GLint, maxTexture3DSize); + I_Method1(void, setTexImage3DProc, IN, void *, ptr); + I_Method10(void, glTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels); + I_Method1(void, setTexSubImage3DProc, IN, void *, ptr); + I_Method11(void, glTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels); + I_Method1(void, setCopyTexSubImage3DProc, IN, void *, ptr); + I_Method9(void, glCopyTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLint, x, IN, GLint, y, IN, GLsizei, width, IN, GLsizei, height); + I_Method0(bool, isCompressedTexImage3DSupported); + I_Method1(void, setCompressedTexImage3DProc, IN, void *, ptr); + I_Method9(void, glCompressedTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalformat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLsizei, imageSize, IN, const GLvoid *, data); + I_Method0(bool, isCompressedTexSubImage3DSupported); + I_Method1(void, setCompressedTexSubImage3DProc, IN, void *, ptr); + I_Method11(void, glCompressedTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLsizei, imageSize, IN, const GLvoid *, data); + I_Method1(void, setBuild3DMipmapsProc, IN, void *, ptr); + I_Method8(void, gluBuild3DMipmaps, IN, GLenum, target, IN, GLint, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, data); I_Constructor1(IN, unsigned int, contextID); I_Constructor1(IN, const osg::Texture3D::Extensions &, rhs); I_Method1(void, lowestCommonDenominator, IN, const osg::Texture3D::Extensions &, rhs); @@ -108,9 +148,22 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture3D::Extensions) END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D::SubloadCallback) + I_BaseType(osg::Referenced); I_BaseType(osg::Referenced); I_Constructor0(); I_Method2(void, load, IN, const osg::Texture3D &, texture, IN, osg::State &, state); I_Method2(void, subload, IN, const osg::Texture3D &, texture, IN, osg::State &, state); + I_Method2(void, load, IN, const osg::Texture3D &, texture, IN, osg::State &, state); + I_Method2(void, subload, IN, const osg::Texture3D &, texture, IN, osg::State &, state); +END_REFLECTOR + +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D::SubloadCallback) + I_BaseType(osg::Referenced); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method2(void, load, IN, const osg::Texture3D &, texture, IN, osg::State &, state); + I_Method2(void, subload, IN, const osg::Texture3D &, texture, IN, osg::State &, state); + I_Method2(void, load, IN, const osg::Texture3D &, texture, IN, osg::State &, state); + I_Method2(void, subload, IN, const osg::Texture3D &, texture, IN, osg::State &, state); END_REFLECTOR diff --git a/src/osgWrappers/osg/TextureCubeMap.cpp b/src/osgWrappers/osg/TextureCubeMap.cpp index 79497af3f..d84b27556 100644 --- a/src/osgWrappers/osg/TextureCubeMap.cpp +++ b/src/osgWrappers/osg/TextureCubeMap.cpp @@ -9,12 +9,13 @@ #include #include -#include #include #include -#include -#include #include +#include +#include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -34,6 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::TextureCubeMap::Face) END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) + I_BaseType(osg::Texture); I_BaseType(osg::Texture); I_Constructor0(); I_ConstructorWithDefaults2(IN, const osg::TextureCubeMap &, cm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); @@ -42,7 +44,34 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); I_Method0(const char *, libraryName); I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); + I_Method0(Type, getType); + I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); + I_Method0(GLenum, getTextureTarget); + I_Method2(void, setImage, IN, unsigned int, face, IN, osg::Image *, image); + I_Method1(osg::Image *, getImage, IN, unsigned int, face); + I_Method1(const osg::Image *, getImage, IN, unsigned int, face); + I_Method0(unsigned int, getNumImages); + I_Method2(unsigned int &, getModifiedCount, IN, unsigned int, face, IN, unsigned int, contextID); + I_Method2(void, setTextureSize, IN, int, width, IN, int, height); + I_Method1(void, setTextureWidth, IN, int, width); + I_Method0(int, getTextureWidth); + I_Method1(void, setTextureHeight, IN, int, height); + I_Method0(int, getTextureHeight); + I_Method1(void, setSubloadCallback, IN, osg::TextureCubeMap::SubloadCallback *, cb); + I_Method0(osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); + I_Method0(const osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); + I_Method1(void, setNumMipmapLevels, IN, unsigned int, num); + 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_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TextureCubeMap &, cm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method0(Type, getType); I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); I_Method0(GLenum, getTextureTarget); I_Method2(void, setImage, IN, unsigned int, face, IN, osg::Image *, image); @@ -68,11 +97,93 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) I_Property(int, TextureHeight); I_ReadOnlyProperty(GLenum, TextureTarget); I_Property(int, TextureWidth); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_ReadOnlyProperty(Type, Type); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::TextureCubeMap::Face) + I_EnumLabel(osg::TextureCubeMap::POSITIVE_X); + I_EnumLabel(osg::TextureCubeMap::NEGATIVE_X); + I_EnumLabel(osg::TextureCubeMap::POSITIVE_Y); + I_EnumLabel(osg::TextureCubeMap::NEGATIVE_Y); + I_EnumLabel(osg::TextureCubeMap::POSITIVE_Z); + I_EnumLabel(osg::TextureCubeMap::NEGATIVE_Z); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) + I_BaseType(osg::Texture); + I_BaseType(osg::Texture); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TextureCubeMap &, cm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method0(Type, getType); + I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); + I_Method0(GLenum, getTextureTarget); + I_Method2(void, setImage, IN, unsigned int, face, IN, osg::Image *, image); + I_Method1(osg::Image *, getImage, IN, unsigned int, face); + I_Method1(const osg::Image *, getImage, IN, unsigned int, face); + I_Method0(unsigned int, getNumImages); + I_Method2(unsigned int &, getModifiedCount, IN, unsigned int, face, IN, unsigned int, contextID); + I_Method2(void, setTextureSize, IN, int, width, IN, int, height); + I_Method1(void, setTextureWidth, IN, int, width); + I_Method0(int, getTextureWidth); + I_Method1(void, setTextureHeight, IN, int, height); + I_Method0(int, getTextureHeight); + I_Method1(void, setSubloadCallback, IN, osg::TextureCubeMap::SubloadCallback *, cb); + I_Method0(osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); + I_Method0(const osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); + I_Method1(void, setNumMipmapLevels, IN, unsigned int, num); + 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_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TextureCubeMap &, cm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method0(Type, getType); + I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); + I_Method0(GLenum, getTextureTarget); + I_Method2(void, setImage, IN, unsigned int, face, IN, osg::Image *, image); + I_Method1(osg::Image *, getImage, IN, unsigned int, face); + I_Method1(const osg::Image *, getImage, IN, unsigned int, face); + I_Method0(unsigned int, getNumImages); + I_Method2(unsigned int &, getModifiedCount, IN, unsigned int, face, IN, unsigned int, contextID); + I_Method2(void, setTextureSize, IN, int, width, IN, int, height); + I_Method1(void, setTextureWidth, IN, int, width); + I_Method0(int, getTextureWidth); + I_Method1(void, setTextureHeight, IN, int, height); + I_Method0(int, getTextureHeight); + I_Method1(void, setSubloadCallback, IN, osg::TextureCubeMap::SubloadCallback *, cb); + I_Method0(osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); + I_Method0(const osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); + I_Method1(void, setNumMipmapLevels, IN, unsigned int, num); + 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_ArrayProperty_G(osg::Image *, Image, Images, unsigned int, void); + I_WriteOnlyProperty(unsigned int, NumMipmapLevels); + I_Property(osg::TextureCubeMap::SubloadCallback *, SubloadCallback); + I_Property(int, TextureHeight); + I_ReadOnlyProperty(GLenum, TextureTarget); + I_Property(int, TextureWidth); + I_ReadOnlyProperty(Type, Type); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap::Extensions) I_BaseType(osg::Referenced); + I_BaseType(osg::Referenced); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::TextureCubeMap::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::TextureCubeMap::Extensions &, rhs); + I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); + I_Method1(void, setCubeMapSupported, IN, bool, flag); + I_Method0(bool, isCubeMapSupported); I_Constructor1(IN, unsigned int, contextID); I_Constructor1(IN, const osg::TextureCubeMap::Extensions &, rhs); I_Method1(void, lowestCommonDenominator, IN, const osg::TextureCubeMap::Extensions &, rhs); @@ -83,10 +194,22 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap::Extensions) I_WriteOnlyProperty(unsigned int, upGLExtenions); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureCubeMap::SubloadCallback) +BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap::Extensions) I_BaseType(osg::Referenced); - I_Constructor0(); - I_Method2(void, load, IN, const osg::TextureCubeMap &, texture, IN, osg::State &, state); - I_Method2(void, subload, IN, const osg::TextureCubeMap &, texture, IN, osg::State &, state); + I_BaseType(osg::Referenced); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::TextureCubeMap::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::TextureCubeMap::Extensions &, rhs); + I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); + I_Method1(void, setCubeMapSupported, IN, bool, flag); + I_Method0(bool, isCubeMapSupported); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::TextureCubeMap::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::TextureCubeMap::Extensions &, rhs); + I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); + I_Method1(void, setCubeMapSupported, IN, bool, flag); + I_Method0(bool, isCubeMapSupported); + I_WriteOnlyProperty(bool, CubeMapSupported); + I_WriteOnlyProperty(unsigned int, upGLExtenions); END_REFLECTOR diff --git a/src/osgWrappers/osg/TextureRectangle.cpp b/src/osgWrappers/osg/TextureRectangle.cpp index 346890895..6e9da8860 100644 --- a/src/osgWrappers/osg/TextureRectangle.cpp +++ b/src/osgWrappers/osg/TextureRectangle.cpp @@ -9,12 +9,9 @@ #include #include -#include -#include -#include -#include -#include #include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -24,50 +21,23 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle) - I_BaseType(osg::Texture); - I_Constructor0(); - I_Constructor1(IN, osg::Image *, image); - I_ConstructorWithDefaults2(IN, const osg::TextureRectangle &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); - I_Method0(GLenum, getTextureTarget); - I_Method1(void, setImage, IN, osg::Image *, image); - I_Method0(osg::Image *, getImage); - I_Method0(const osg::Image *, getImage); - I_Method1(unsigned int &, getModifiedCount, IN, unsigned int, contextID); - I_Method2(void, setImage, IN, unsigned, int, IN, osg::Image *, image); - I_Method1(osg::Image *, getImage, IN, unsigned, int); - I_Method1(const osg::Image *, getImage, IN, unsigned, int); - I_Method0(unsigned int, getNumImages); - I_Method2(void, setTextureSize, IN, int, width, IN, int, height); - I_Method1(void, setTextureWidth, IN, int, width); - I_Method0(int, getTextureWidth); - I_Method1(void, setTextureHeight, IN, int, height); - I_Method0(int, getTextureHeight); - I_Method1(void, setSubloadCallback, IN, osg::TextureRectangle::SubloadCallback *, cb); - I_Method0(osg::TextureRectangle::SubloadCallback *, getSubloadCallback); - I_Method0(const osg::TextureRectangle::SubloadCallback *, getSubloadCallback); - I_Method5(void, copyTexImage2D, IN, osg::State &, state, IN, int, x, IN, int, y, IN, int, width, IN, int, height); - I_Method7(void, copyTexSubImage2D, IN, osg::State &, state, 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_Property(osg::Image *, Image); - I_Property(osg::TextureRectangle::SubloadCallback *, SubloadCallback); - I_Property(int, TextureHeight); - I_ReadOnlyProperty(GLenum, TextureTarget); - I_Property(int, TextureWidth); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); -END_REFLECTOR - BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle::SubloadCallback) + I_BaseType(osg::Referenced); I_BaseType(osg::Referenced); I_Constructor0(); I_Method2(void, load, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); I_Method2(void, subload, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); + I_Method2(void, load, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); + I_Method2(void, subload, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); +END_REFLECTOR + +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle::SubloadCallback) + I_BaseType(osg::Referenced); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method2(void, load, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); + I_Method2(void, subload, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); + I_Method2(void, load, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); + I_Method2(void, subload, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); END_REFLECTOR diff --git a/src/osgWrappers/osg/Timer.cpp b/src/osgWrappers/osg/Timer.cpp index 772e018ae..5029e11d7 100644 --- a/src/osgWrappers/osg/Timer.cpp +++ b/src/osgWrappers/osg/Timer.cpp @@ -10,6 +10,7 @@ #include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -20,6 +21,13 @@ #endif BEGIN_VALUE_REFLECTOR(osg::Timer) + I_Constructor0(); + I_Method0(osg::Timer_t, tick); + I_Method2(double, delta_s, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); + I_Method2(double, delta_m, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); + 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_Constructor0(); I_Method0(osg::Timer_t, tick); I_Method2(double, delta_s, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); @@ -30,5 +38,21 @@ BEGIN_VALUE_REFLECTOR(osg::Timer) I_ReadOnlyProperty(double, SecondsPerTick); END_REFLECTOR -TYPE_NAME_ALIAS(unsigned long long, osg::Timer_t); +BEGIN_VALUE_REFLECTOR(osg::Timer) + I_Constructor0(); + I_Method0(osg::Timer_t, tick); + I_Method2(double, delta_s, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); + I_Method2(double, delta_m, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); + 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_Constructor0(); + I_Method0(osg::Timer_t, tick); + I_Method2(double, delta_s, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); + I_Method2(double, delta_m, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); + 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_ReadOnlyProperty(double, SecondsPerTick); +END_REFLECTOR diff --git a/src/osgWrappers/osg/Transform.cpp b/src/osgWrappers/osg/Transform.cpp index 2920fab93..8f1a2da5a 100644 --- a/src/osgWrappers/osg/Transform.cpp +++ b/src/osgWrappers/osg/Transform.cpp @@ -10,13 +10,13 @@ #include #include -#include #include #include #include #include -#include #include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -33,6 +33,75 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Transform) I_BaseType(osg::Group); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::Transform &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(osg::Transform *, asTransform); + I_Method0(const osg::Transform *, asTransform); + I_Method0(osg::MatrixTransform *, asMatrixTransform); + I_Method0(const osg::MatrixTransform *, asMatrixTransform); + I_Method0(osg::PositionAttitudeTransform *, asPositionAttitudeTransform); + I_Method0(const osg::PositionAttitudeTransform *, asPositionAttitudeTransform); + I_Method1(void, setReferenceFrame, IN, osg::Transform::ReferenceFrame, rf); + I_Method0(osg::Transform::ReferenceFrame, getReferenceFrame); + I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); + I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); + I_Method0(osg::BoundingSphere, computeBound); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::Transform &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(osg::Transform *, asTransform); + I_Method0(const osg::Transform *, asTransform); + I_Method0(osg::MatrixTransform *, asMatrixTransform); + I_Method0(const osg::MatrixTransform *, asMatrixTransform); + I_Method0(osg::PositionAttitudeTransform *, asPositionAttitudeTransform); + I_Method0(const osg::PositionAttitudeTransform *, asPositionAttitudeTransform); + I_Method1(void, setReferenceFrame, IN, osg::Transform::ReferenceFrame, rf); + I_Method0(osg::Transform::ReferenceFrame, getReferenceFrame); + I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); + I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); + I_Method0(osg::BoundingSphere, computeBound); + I_Property(osg::Transform::ReferenceFrame, ReferenceFrame); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::Transform::ReferenceFrame) + I_EnumLabel(osg::Transform::RELATIVE_RF); + I_EnumLabel(osg::Transform::ABSOLUTE_RF); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::Transform) + I_BaseType(osg::Group); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::Transform &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(osg::Transform *, asTransform); + I_Method0(const osg::Transform *, asTransform); + I_Method0(osg::MatrixTransform *, asMatrixTransform); + I_Method0(const osg::MatrixTransform *, asMatrixTransform); + I_Method0(osg::PositionAttitudeTransform *, asPositionAttitudeTransform); + I_Method0(const osg::PositionAttitudeTransform *, asPositionAttitudeTransform); + I_Method1(void, setReferenceFrame, IN, osg::Transform::ReferenceFrame, rf); + I_Method0(osg::Transform::ReferenceFrame, getReferenceFrame); + I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); + I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); + I_Method0(osg::BoundingSphere, computeBound); I_Constructor0(); I_ConstructorWithDefaults2(IN, const osg::Transform &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); I_Method0(osg::Object *, cloneType); diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp index 5e32fce09..57410316e 100644 --- a/src/osgWrappers/osg/Uniform.cpp +++ b/src/osgWrappers/osg/Uniform.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include #include @@ -18,9 +17,10 @@ #include #include #include -#include -#include -#include +#include +#include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -31,6 +31,37 @@ #endif BEGIN_VALUE_REFLECTOR(osg::Matrix2) + I_Constructor0(); + I_Constructor1(IN, const osg::Matrix2 &, mat); + I_Constructor4(IN, float, a00, IN, float, a01, IN, float, a10, IN, float, a11); + I_Method1(void, set, IN, const osg::Matrix2 &, rhs); + I_Method1(void, set, IN, float const *const, ptr); + I_Method4(void, set, IN, float, a00, IN, float, a01, IN, float, a10, IN, float, a11); + I_Method0(float *, ptr); + I_Method0(const float *, ptr); + I_Method0(void, makeIdentity); + I_Constructor0(); + I_Constructor1(IN, const osg::Matrix2 &, mat); + I_Constructor4(IN, float, a00, IN, float, a01, IN, float, a10, IN, float, a11); + I_Method1(void, set, IN, const osg::Matrix2 &, rhs); + I_Method1(void, set, IN, float const *const, ptr); + I_Method4(void, set, IN, float, a00, IN, float, a01, IN, float, a10, IN, float, a11); + I_Method0(float *, ptr); + I_Method0(const float *, ptr); + I_Method0(void, makeIdentity); + I_WriteOnlyProperty(float const *const, ); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Matrix2) + I_Constructor0(); + I_Constructor1(IN, const osg::Matrix2 &, mat); + I_Constructor4(IN, float, a00, IN, float, a01, IN, float, a10, IN, float, a11); + I_Method1(void, set, IN, const osg::Matrix2 &, rhs); + I_Method1(void, set, IN, float const *const, ptr); + I_Method4(void, set, IN, float, a00, IN, float, a01, IN, float, a10, IN, float, a11); + I_Method0(float *, ptr); + I_Method0(const float *, ptr); + I_Method0(void, makeIdentity); I_Constructor0(); I_Constructor1(IN, const osg::Matrix2 &, mat); I_Constructor4(IN, float, a00, IN, float, a01, IN, float, a10, IN, float, a11); @@ -44,6 +75,37 @@ BEGIN_VALUE_REFLECTOR(osg::Matrix2) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::Matrix3) + I_Constructor0(); + I_Constructor1(IN, const osg::Matrix3 &, mat); + I_Constructor9(IN, float, a00, IN, float, a01, IN, float, a02, IN, float, a10, IN, float, a11, IN, float, a12, IN, float, a20, IN, float, a21, IN, float, a22); + I_Method1(void, set, IN, const osg::Matrix3 &, rhs); + I_Method1(void, set, IN, float const *const, ptr); + I_Method9(void, set, IN, float, a00, IN, float, a01, IN, float, a02, IN, float, a10, IN, float, a11, IN, float, a12, IN, float, a20, IN, float, a21, IN, float, a22); + I_Method0(float *, ptr); + I_Method0(const float *, ptr); + I_Method0(void, makeIdentity); + I_Constructor0(); + I_Constructor1(IN, const osg::Matrix3 &, mat); + I_Constructor9(IN, float, a00, IN, float, a01, IN, float, a02, IN, float, a10, IN, float, a11, IN, float, a12, IN, float, a20, IN, float, a21, IN, float, a22); + I_Method1(void, set, IN, const osg::Matrix3 &, rhs); + I_Method1(void, set, IN, float const *const, ptr); + I_Method9(void, set, IN, float, a00, IN, float, a01, IN, float, a02, IN, float, a10, IN, float, a11, IN, float, a12, IN, float, a20, IN, float, a21, IN, float, a22); + I_Method0(float *, ptr); + I_Method0(const float *, ptr); + I_Method0(void, makeIdentity); + I_WriteOnlyProperty(float const *const, ); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Matrix3) + I_Constructor0(); + I_Constructor1(IN, const osg::Matrix3 &, mat); + I_Constructor9(IN, float, a00, IN, float, a01, IN, float, a02, IN, float, a10, IN, float, a11, IN, float, a12, IN, float, a20, IN, float, a21, IN, float, a22); + I_Method1(void, set, IN, const osg::Matrix3 &, rhs); + I_Method1(void, set, IN, float const *const, ptr); + I_Method9(void, set, IN, float, a00, IN, float, a01, IN, float, a02, IN, float, a10, IN, float, a11, IN, float, a12, IN, float, a20, IN, float, a21, IN, float, a22); + I_Method0(float *, ptr); + I_Method0(const float *, ptr); + I_Method0(void, makeIdentity); I_Constructor0(); I_Constructor1(IN, const osg::Matrix3 &, mat); I_Constructor9(IN, float, a00, IN, float, a01, IN, float, a02, IN, float, a10, IN, float, a11, IN, float, a12, IN, float, a20, IN, float, a21, IN, float, a22); @@ -85,6 +147,407 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Uniform) I_BaseType(osg::Object); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults3(IN, osg::Uniform::Type, type, , IN, const std::string &, name, , IN, int, numElements, 1); + I_ConstructorWithDefaults2(IN, const osg::Uniform &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, setType, IN, osg::Uniform::Type, t); + I_Method0(const osg::Uniform::Type, getType); + I_Method1(void, setName, IN, const std::string &, name); + I_Method1(void, setNumElements, IN, unsigned int, numElements); + I_Method0(unsigned int, getNumElements); + I_Method0(unsigned int, getInternalArrayNumElements); + I_Constructor2(IN, const char *, name, IN, float, f); + I_Constructor2(IN, const char *, name, IN, int, i); + I_Constructor2(IN, const char *, name, IN, bool, b); + I_Constructor2(IN, const char *, name, IN, const osg::Vec2 &, v2); + I_Constructor2(IN, const char *, name, IN, const osg::Vec3 &, v3); + I_Constructor2(IN, const char *, name, IN, const osg::Vec4 &, v4); + I_Constructor2(IN, const char *, name, IN, const osg::Matrix2 &, m2); + I_Constructor2(IN, const char *, name, IN, const osg::Matrix3 &, m3); + I_Constructor2(IN, const char *, name, IN, const osg::Matrixf &, m4); + I_Constructor2(IN, const char *, name, IN, const osg::Matrixd &, m4); + I_Constructor3(IN, const char *, name, IN, int, i0, IN, int, i1); + I_Constructor4(IN, const char *, name, IN, int, i0, IN, int, i1, IN, int, i2); + I_Constructor5(IN, const char *, name, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); + I_Constructor3(IN, const char *, name, IN, bool, b0, IN, bool, b1); + I_Constructor4(IN, const char *, name, IN, bool, b0, IN, bool, b1, IN, bool, b2); + I_Constructor5(IN, const char *, name, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); + I_Method1(int, compare, IN, const osg::Uniform &, rhs); + I_Method1(int, compareData, IN, const osg::Uniform &, rhs); + I_Method1(void, copyData, IN, const osg::Uniform &, rhs); + I_Method0(const osg::Uniform::ParentList &, getParents); + I_Method0(osg::Uniform::ParentList, getParents); + I_Method1(osg::StateSet *, getParent, IN, unsigned int, i); + I_Method1(const osg::StateSet *, getParent, IN, unsigned int, i); + I_Method0(unsigned int, getNumParents); + I_Method1(bool, set, IN, float, f); + I_Method1(bool, set, IN, int, i); + I_Method1(bool, set, IN, bool, b); + I_Method1(bool, set, IN, const osg::Vec2 &, v2); + I_Method1(bool, set, IN, const osg::Vec3 &, v3); + I_Method1(bool, set, IN, const osg::Vec4 &, v4); + I_Method1(bool, set, IN, const osg::Matrix2 &, m2); + I_Method1(bool, set, IN, const osg::Matrix3 &, m3); + I_Method1(bool, set, IN, const osg::Matrixf &, m4); + I_Method1(bool, set, IN, const osg::Matrixd &, m4); + I_Method2(bool, set, IN, int, i0, IN, int, i1); + I_Method3(bool, set, IN, int, i0, IN, int, i1, IN, int, i2); + I_Method4(bool, set, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); + I_Method2(bool, set, IN, bool, b0, IN, bool, b1); + I_Method3(bool, set, IN, bool, b0, IN, bool, b1, IN, bool, b2); + I_Method4(bool, set, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); + I_Method1(bool, get, IN, float &, f); + I_Method1(bool, get, IN, int &, i); + I_Method1(bool, get, IN, bool &, b); + I_Method1(bool, get, IN, osg::Vec2 &, v2); + I_Method1(bool, get, IN, osg::Vec3 &, v3); + I_Method1(bool, get, IN, osg::Vec4 &, v4); + I_Method1(bool, get, IN, osg::Matrix2 &, m2); + I_Method1(bool, get, IN, osg::Matrix3 &, m3); + I_Method1(bool, get, IN, osg::Matrixf &, m4); + I_Method1(bool, get, IN, osg::Matrixd &, m4); + I_Method2(bool, get, IN, int &, i0, IN, int &, i1); + I_Method3(bool, get, IN, int &, i0, IN, int &, i1, IN, int &, i2); + I_Method4(bool, get, IN, int &, i0, IN, int &, i1, IN, int &, i2, IN, int &, i3); + I_Method2(bool, get, IN, bool &, b0, IN, bool &, b1); + I_Method3(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2); + I_Method4(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3); + I_Method2(bool, setElement, IN, unsigned int, index, IN, float, f); + I_Method2(bool, setElement, IN, unsigned int, index, IN, int, i); + I_Method2(bool, setElement, IN, unsigned int, index, IN, bool, b); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec2 &, v2); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec3 &, v3); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec4 &, v4); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrix2 &, m2); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrix3 &, m3); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrixf &, m4); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrixd &, m4); + I_Method3(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1); + I_Method4(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1, IN, int, i2); + I_Method5(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); + I_Method3(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1); + I_Method4(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1, IN, bool, b2); + I_Method5(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); + I_Method2(bool, getElement, IN, unsigned int, index, IN, float &, f); + I_Method2(bool, getElement, IN, unsigned int, index, IN, int &, i); + I_Method2(bool, getElement, IN, unsigned int, index, IN, bool &, b); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec2 &, v2); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec3 &, v3); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec4 &, v4); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrix2 &, m2); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrix3 &, m3); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrixf &, m4); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrixd &, m4); + I_Method3(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1); + I_Method4(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1, IN, int &, i2); + I_Method5(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1, IN, int &, i2, IN, int &, i3); + I_Method3(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1); + I_Method4(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2); + I_Method5(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3); + I_Method1(void, setUpdateCallback, IN, osg::Uniform::Callback *, uc); + I_Method0(osg::Uniform::Callback *, getUpdateCallback); + I_Method0(const osg::Uniform::Callback *, getUpdateCallback); + I_Method1(void, setEventCallback, IN, osg::Uniform::Callback *, ec); + I_Method0(osg::Uniform::Callback *, getEventCallback); + I_Method0(const osg::Uniform::Callback *, getEventCallback); + I_Method0(void, dirty); + I_Method1(bool, setArray, IN, osg::FloatArray *, array); + I_Method1(bool, setArray, IN, osg::IntArray *, array); + I_Method0(osg::FloatArray *, getFloatArray); + I_Method0(const osg::FloatArray *, getFloatArray); + I_Method0(osg::IntArray *, getIntArray); + I_Method0(const osg::IntArray *, getIntArray); + 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_Constructor0(); + I_ConstructorWithDefaults3(IN, osg::Uniform::Type, type, , IN, const std::string &, name, , IN, int, numElements, 1); + I_ConstructorWithDefaults2(IN, const osg::Uniform &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, setType, IN, osg::Uniform::Type, t); + I_Method0(const osg::Uniform::Type, getType); + I_Method1(void, setName, IN, const std::string &, name); + I_Method1(void, setNumElements, IN, unsigned int, numElements); + I_Method0(unsigned int, getNumElements); + I_Method0(unsigned int, getInternalArrayNumElements); + I_Constructor2(IN, const char *, name, IN, float, f); + I_Constructor2(IN, const char *, name, IN, int, i); + I_Constructor2(IN, const char *, name, IN, bool, b); + I_Constructor2(IN, const char *, name, IN, const osg::Vec2 &, v2); + I_Constructor2(IN, const char *, name, IN, const osg::Vec3 &, v3); + I_Constructor2(IN, const char *, name, IN, const osg::Vec4 &, v4); + I_Constructor2(IN, const char *, name, IN, const osg::Matrix2 &, m2); + I_Constructor2(IN, const char *, name, IN, const osg::Matrix3 &, m3); + I_Constructor2(IN, const char *, name, IN, const osg::Matrixf &, m4); + I_Constructor2(IN, const char *, name, IN, const osg::Matrixd &, m4); + I_Constructor3(IN, const char *, name, IN, int, i0, IN, int, i1); + I_Constructor4(IN, const char *, name, IN, int, i0, IN, int, i1, IN, int, i2); + I_Constructor5(IN, const char *, name, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); + I_Constructor3(IN, const char *, name, IN, bool, b0, IN, bool, b1); + I_Constructor4(IN, const char *, name, IN, bool, b0, IN, bool, b1, IN, bool, b2); + I_Constructor5(IN, const char *, name, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); + I_Method1(int, compare, IN, const osg::Uniform &, rhs); + I_Method1(int, compareData, IN, const osg::Uniform &, rhs); + I_Method1(void, copyData, IN, const osg::Uniform &, rhs); + I_Method0(const osg::Uniform::ParentList &, getParents); + I_Method0(osg::Uniform::ParentList, getParents); + I_Method1(osg::StateSet *, getParent, IN, unsigned int, i); + I_Method1(const osg::StateSet *, getParent, IN, unsigned int, i); + I_Method0(unsigned int, getNumParents); + I_Method1(bool, set, IN, float, f); + I_Method1(bool, set, IN, int, i); + I_Method1(bool, set, IN, bool, b); + I_Method1(bool, set, IN, const osg::Vec2 &, v2); + I_Method1(bool, set, IN, const osg::Vec3 &, v3); + I_Method1(bool, set, IN, const osg::Vec4 &, v4); + I_Method1(bool, set, IN, const osg::Matrix2 &, m2); + I_Method1(bool, set, IN, const osg::Matrix3 &, m3); + I_Method1(bool, set, IN, const osg::Matrixf &, m4); + I_Method1(bool, set, IN, const osg::Matrixd &, m4); + I_Method2(bool, set, IN, int, i0, IN, int, i1); + I_Method3(bool, set, IN, int, i0, IN, int, i1, IN, int, i2); + I_Method4(bool, set, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); + I_Method2(bool, set, IN, bool, b0, IN, bool, b1); + I_Method3(bool, set, IN, bool, b0, IN, bool, b1, IN, bool, b2); + I_Method4(bool, set, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); + I_Method1(bool, get, IN, float &, f); + I_Method1(bool, get, IN, int &, i); + I_Method1(bool, get, IN, bool &, b); + I_Method1(bool, get, IN, osg::Vec2 &, v2); + I_Method1(bool, get, IN, osg::Vec3 &, v3); + I_Method1(bool, get, IN, osg::Vec4 &, v4); + I_Method1(bool, get, IN, osg::Matrix2 &, m2); + I_Method1(bool, get, IN, osg::Matrix3 &, m3); + I_Method1(bool, get, IN, osg::Matrixf &, m4); + I_Method1(bool, get, IN, osg::Matrixd &, m4); + I_Method2(bool, get, IN, int &, i0, IN, int &, i1); + I_Method3(bool, get, IN, int &, i0, IN, int &, i1, IN, int &, i2); + I_Method4(bool, get, IN, int &, i0, IN, int &, i1, IN, int &, i2, IN, int &, i3); + I_Method2(bool, get, IN, bool &, b0, IN, bool &, b1); + I_Method3(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2); + I_Method4(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3); + I_Method2(bool, setElement, IN, unsigned int, index, IN, float, f); + I_Method2(bool, setElement, IN, unsigned int, index, IN, int, i); + I_Method2(bool, setElement, IN, unsigned int, index, IN, bool, b); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec2 &, v2); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec3 &, v3); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec4 &, v4); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrix2 &, m2); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrix3 &, m3); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrixf &, m4); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrixd &, m4); + I_Method3(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1); + I_Method4(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1, IN, int, i2); + I_Method5(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); + I_Method3(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1); + I_Method4(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1, IN, bool, b2); + I_Method5(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); + I_Method2(bool, getElement, IN, unsigned int, index, IN, float &, f); + I_Method2(bool, getElement, IN, unsigned int, index, IN, int &, i); + I_Method2(bool, getElement, IN, unsigned int, index, IN, bool &, b); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec2 &, v2); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec3 &, v3); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec4 &, v4); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrix2 &, m2); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrix3 &, m3); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrixf &, m4); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrixd &, m4); + I_Method3(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1); + I_Method4(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1, IN, int &, i2); + I_Method5(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1, IN, int &, i2, IN, int &, i3); + I_Method3(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1); + I_Method4(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2); + I_Method5(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3); + I_Method1(void, setUpdateCallback, IN, osg::Uniform::Callback *, uc); + I_Method0(osg::Uniform::Callback *, getUpdateCallback); + I_Method0(const osg::Uniform::Callback *, getUpdateCallback); + I_Method1(void, setEventCallback, IN, osg::Uniform::Callback *, ec); + I_Method0(osg::Uniform::Callback *, getEventCallback); + I_Method0(const osg::Uniform::Callback *, getEventCallback); + I_Method0(void, dirty); + I_Method1(bool, setArray, IN, osg::FloatArray *, array); + I_Method1(bool, setArray, IN, osg::IntArray *, array); + I_Method0(osg::FloatArray *, getFloatArray); + I_Method0(const osg::FloatArray *, getFloatArray); + I_Method0(osg::IntArray *, getIntArray); + I_Method0(const osg::IntArray *, getIntArray); + 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_WriteOnlyPropertyWithReturnType(bool, , bool); + I_WriteOnlyPropertyWithReturnType(osg::FloatArray *, Array, bool); + I_ArrayProperty_Custom(bool, Element, Elements, unsigned int, bool); + I_Property(osg::Uniform::Callback *, EventCallback); + I_ReadOnlyProperty(osg::FloatArray *, FloatArray); + I_ReadOnlyProperty(osg::IntArray *, IntArray); + I_ReadOnlyProperty(unsigned int, InternalArrayNumElements); + I_Property(unsigned int, ModifiedCount); + I_WriteOnlyProperty(const std::string &, Name); + I_WriteOnlyProperty(unsigned int, NumElements); + I_ArrayProperty_G(osg::StateSet *, Parent, Parents, unsigned int, void); + I_ReadOnlyProperty(osg::Uniform::ParentList, Parents); + I_WriteOnlyPropertyWithReturnType(osg::Uniform::Type, Type, bool); + I_Property(osg::Uniform::Callback *, UpdateCallback); +END_REFLECTOR + +TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::Uniform::ParentList); + +BEGIN_ENUM_REFLECTOR(osg::Uniform::Type) + I_EnumLabel(osg::Uniform::FLOAT); + I_EnumLabel(osg::Uniform::FLOAT_VEC2); + I_EnumLabel(osg::Uniform::FLOAT_VEC3); + I_EnumLabel(osg::Uniform::FLOAT_VEC4); + I_EnumLabel(osg::Uniform::INT); + I_EnumLabel(osg::Uniform::INT_VEC2); + I_EnumLabel(osg::Uniform::INT_VEC3); + I_EnumLabel(osg::Uniform::INT_VEC4); + I_EnumLabel(osg::Uniform::BOOL); + I_EnumLabel(osg::Uniform::BOOL_VEC2); + I_EnumLabel(osg::Uniform::BOOL_VEC3); + I_EnumLabel(osg::Uniform::BOOL_VEC4); + I_EnumLabel(osg::Uniform::FLOAT_MAT2); + I_EnumLabel(osg::Uniform::FLOAT_MAT3); + I_EnumLabel(osg::Uniform::FLOAT_MAT4); + I_EnumLabel(osg::Uniform::SAMPLER_1D); + I_EnumLabel(osg::Uniform::SAMPLER_2D); + I_EnumLabel(osg::Uniform::SAMPLER_3D); + I_EnumLabel(osg::Uniform::SAMPLER_CUBE); + I_EnumLabel(osg::Uniform::SAMPLER_1D_SHADOW); + I_EnumLabel(osg::Uniform::SAMPLER_2D_SHADOW); + I_EnumLabel(osg::Uniform::UNDEFINED); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::Uniform) + I_BaseType(osg::Object); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults3(IN, osg::Uniform::Type, type, , IN, const std::string &, name, , IN, int, numElements, 1); + I_ConstructorWithDefaults2(IN, const osg::Uniform &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, setType, IN, osg::Uniform::Type, t); + I_Method0(const osg::Uniform::Type, getType); + I_Method1(void, setName, IN, const std::string &, name); + I_Method1(void, setNumElements, IN, unsigned int, numElements); + I_Method0(unsigned int, getNumElements); + I_Method0(unsigned int, getInternalArrayNumElements); + I_Constructor2(IN, const char *, name, IN, float, f); + I_Constructor2(IN, const char *, name, IN, int, i); + I_Constructor2(IN, const char *, name, IN, bool, b); + I_Constructor2(IN, const char *, name, IN, const osg::Vec2 &, v2); + I_Constructor2(IN, const char *, name, IN, const osg::Vec3 &, v3); + I_Constructor2(IN, const char *, name, IN, const osg::Vec4 &, v4); + I_Constructor2(IN, const char *, name, IN, const osg::Matrix2 &, m2); + I_Constructor2(IN, const char *, name, IN, const osg::Matrix3 &, m3); + I_Constructor2(IN, const char *, name, IN, const osg::Matrixf &, m4); + I_Constructor2(IN, const char *, name, IN, const osg::Matrixd &, m4); + I_Constructor3(IN, const char *, name, IN, int, i0, IN, int, i1); + I_Constructor4(IN, const char *, name, IN, int, i0, IN, int, i1, IN, int, i2); + I_Constructor5(IN, const char *, name, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); + I_Constructor3(IN, const char *, name, IN, bool, b0, IN, bool, b1); + I_Constructor4(IN, const char *, name, IN, bool, b0, IN, bool, b1, IN, bool, b2); + I_Constructor5(IN, const char *, name, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); + I_Method1(int, compare, IN, const osg::Uniform &, rhs); + I_Method1(int, compareData, IN, const osg::Uniform &, rhs); + I_Method1(void, copyData, IN, const osg::Uniform &, rhs); + I_Method0(const osg::Uniform::ParentList &, getParents); + I_Method0(osg::Uniform::ParentList, getParents); + I_Method1(osg::StateSet *, getParent, IN, unsigned int, i); + I_Method1(const osg::StateSet *, getParent, IN, unsigned int, i); + I_Method0(unsigned int, getNumParents); + I_Method1(bool, set, IN, float, f); + I_Method1(bool, set, IN, int, i); + I_Method1(bool, set, IN, bool, b); + I_Method1(bool, set, IN, const osg::Vec2 &, v2); + I_Method1(bool, set, IN, const osg::Vec3 &, v3); + I_Method1(bool, set, IN, const osg::Vec4 &, v4); + I_Method1(bool, set, IN, const osg::Matrix2 &, m2); + I_Method1(bool, set, IN, const osg::Matrix3 &, m3); + I_Method1(bool, set, IN, const osg::Matrixf &, m4); + I_Method1(bool, set, IN, const osg::Matrixd &, m4); + I_Method2(bool, set, IN, int, i0, IN, int, i1); + I_Method3(bool, set, IN, int, i0, IN, int, i1, IN, int, i2); + I_Method4(bool, set, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); + I_Method2(bool, set, IN, bool, b0, IN, bool, b1); + I_Method3(bool, set, IN, bool, b0, IN, bool, b1, IN, bool, b2); + I_Method4(bool, set, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); + I_Method1(bool, get, IN, float &, f); + I_Method1(bool, get, IN, int &, i); + I_Method1(bool, get, IN, bool &, b); + I_Method1(bool, get, IN, osg::Vec2 &, v2); + I_Method1(bool, get, IN, osg::Vec3 &, v3); + I_Method1(bool, get, IN, osg::Vec4 &, v4); + I_Method1(bool, get, IN, osg::Matrix2 &, m2); + I_Method1(bool, get, IN, osg::Matrix3 &, m3); + I_Method1(bool, get, IN, osg::Matrixf &, m4); + I_Method1(bool, get, IN, osg::Matrixd &, m4); + I_Method2(bool, get, IN, int &, i0, IN, int &, i1); + I_Method3(bool, get, IN, int &, i0, IN, int &, i1, IN, int &, i2); + I_Method4(bool, get, IN, int &, i0, IN, int &, i1, IN, int &, i2, IN, int &, i3); + I_Method2(bool, get, IN, bool &, b0, IN, bool &, b1); + I_Method3(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2); + I_Method4(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3); + I_Method2(bool, setElement, IN, unsigned int, index, IN, float, f); + I_Method2(bool, setElement, IN, unsigned int, index, IN, int, i); + I_Method2(bool, setElement, IN, unsigned int, index, IN, bool, b); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec2 &, v2); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec3 &, v3); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Vec4 &, v4); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrix2 &, m2); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrix3 &, m3); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrixf &, m4); + I_Method2(bool, setElement, IN, unsigned int, index, IN, const osg::Matrixd &, m4); + I_Method3(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1); + I_Method4(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1, IN, int, i2); + I_Method5(bool, setElement, IN, unsigned int, index, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); + I_Method3(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1); + I_Method4(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1, IN, bool, b2); + I_Method5(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); + I_Method2(bool, getElement, IN, unsigned int, index, IN, float &, f); + I_Method2(bool, getElement, IN, unsigned int, index, IN, int &, i); + I_Method2(bool, getElement, IN, unsigned int, index, IN, bool &, b); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec2 &, v2); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec3 &, v3); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Vec4 &, v4); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrix2 &, m2); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrix3 &, m3); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrixf &, m4); + I_Method2(bool, getElement, IN, unsigned int, index, IN, osg::Matrixd &, m4); + I_Method3(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1); + I_Method4(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1, IN, int &, i2); + I_Method5(bool, getElement, IN, unsigned int, index, IN, int &, i0, IN, int &, i1, IN, int &, i2, IN, int &, i3); + I_Method3(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1); + I_Method4(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2); + I_Method5(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3); + I_Method1(void, setUpdateCallback, IN, osg::Uniform::Callback *, uc); + I_Method0(osg::Uniform::Callback *, getUpdateCallback); + I_Method0(const osg::Uniform::Callback *, getUpdateCallback); + I_Method1(void, setEventCallback, IN, osg::Uniform::Callback *, ec); + I_Method0(osg::Uniform::Callback *, getEventCallback); + I_Method0(const osg::Uniform::Callback *, getEventCallback); + I_Method0(void, dirty); + I_Method1(bool, setArray, IN, osg::FloatArray *, array); + I_Method1(bool, setArray, IN, osg::IntArray *, array); + I_Method0(osg::FloatArray *, getFloatArray); + I_Method0(const osg::FloatArray *, getFloatArray); + I_Method0(osg::IntArray *, getIntArray); + I_Method0(const osg::IntArray *, getIntArray); + 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_Constructor0(); I_ConstructorWithDefaults3(IN, osg::Uniform::Type, type, , IN, const std::string &, name, , IN, int, numElements, 1); I_ConstructorWithDefaults2(IN, const osg::Uniform &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); @@ -221,6 +684,33 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Uniform::Callback) I_VirtualBaseType(osg::Object); + I_VirtualBaseType(osg::Object); + I_Constructor0(); + I_Constructor2(IN, const osg::Uniform::Callback &, x, IN, const osg::CopyOp &, x); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Constructor0(); + I_Constructor2(IN, const osg::Uniform::Callback &, x, IN, const osg::CopyOp &, x); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::Uniform::Callback) + I_VirtualBaseType(osg::Object); + I_VirtualBaseType(osg::Object); + I_Constructor0(); + I_Constructor2(IN, const osg::Uniform::Callback &, x, IN, const osg::CopyOp &, x); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); I_Constructor0(); I_Constructor2(IN, const osg::Uniform::Callback &, x, IN, const osg::CopyOp &, x); I_Method0(osg::Object *, cloneType); diff --git a/src/osgWrappers/osg/Vec2b.cpp b/src/osgWrappers/osg/Vec2b.cpp index e399a18fc..43db4d933 100644 --- a/src/osgWrappers/osg/Vec2b.cpp +++ b/src/osgWrappers/osg/Vec2b.cpp @@ -40,6 +40,56 @@ BEGIN_VALUE_REFLECTOR(osg::Vec2b) I_Method0(osg::Vec2b::value_type &, g); I_Method0(osg::Vec2b::value_type, r); I_Method0(osg::Vec2b::value_type, g); + I_Constructor0(); + I_Constructor2(IN, char, r, IN, char, g); + I_Method0(osg::Vec2b::value_type *, ptr); + I_Method0(const osg::Vec2b::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2b::value_type, x, IN, osg::Vec2b::value_type, y); + I_Method1(void, set, IN, const osg::Vec2b &, rhs); + I_Method0(osg::Vec2b::value_type &, x); + I_Method0(osg::Vec2b::value_type &, y); + I_Method0(osg::Vec2b::value_type, x); + I_Method0(osg::Vec2b::value_type, y); + I_Method0(osg::Vec2b::value_type &, r); + I_Method0(osg::Vec2b::value_type &, g); + I_Method0(osg::Vec2b::value_type, r); + I_Method0(osg::Vec2b::value_type, g); + I_WriteOnlyProperty(const osg::Vec2b &, ); +END_REFLECTOR + +TYPE_NAME_ALIAS(char, osg::Vec2b::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec2b) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor2(IN, char, r, IN, char, g); + I_Method0(osg::Vec2b::value_type *, ptr); + I_Method0(const osg::Vec2b::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2b::value_type, x, IN, osg::Vec2b::value_type, y); + I_Method1(void, set, IN, const osg::Vec2b &, rhs); + I_Method0(osg::Vec2b::value_type &, x); + I_Method0(osg::Vec2b::value_type &, y); + I_Method0(osg::Vec2b::value_type, x); + I_Method0(osg::Vec2b::value_type, y); + I_Method0(osg::Vec2b::value_type &, r); + I_Method0(osg::Vec2b::value_type &, g); + I_Method0(osg::Vec2b::value_type, r); + I_Method0(osg::Vec2b::value_type, g); + I_Constructor0(); + I_Constructor2(IN, char, r, IN, char, g); + I_Method0(osg::Vec2b::value_type *, ptr); + I_Method0(const osg::Vec2b::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2b::value_type, x, IN, osg::Vec2b::value_type, y); + I_Method1(void, set, IN, const osg::Vec2b &, rhs); + I_Method0(osg::Vec2b::value_type &, x); + I_Method0(osg::Vec2b::value_type &, y); + I_Method0(osg::Vec2b::value_type, x); + I_Method0(osg::Vec2b::value_type, y); + I_Method0(osg::Vec2b::value_type &, r); + I_Method0(osg::Vec2b::value_type &, g); + I_Method0(osg::Vec2b::value_type, r); + I_Method0(osg::Vec2b::value_type, g); I_WriteOnlyProperty(const osg::Vec2b &, ); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec2d.cpp b/src/osgWrappers/osg/Vec2d.cpp index 43789573c..8a00a3ed3 100644 --- a/src/osgWrappers/osg/Vec2d.cpp +++ b/src/osgWrappers/osg/Vec2d.cpp @@ -42,5 +42,57 @@ BEGIN_VALUE_REFLECTOR(osg::Vec2d) I_Method0(osg::Vec2d::value_type, length); I_Method0(osg::Vec2d::value_type, length2); I_Method0(osg::Vec2d::value_type, normalize); + I_Constructor0(); + I_Constructor2(IN, osg::Vec2d::value_type, x, IN, osg::Vec2d::value_type, y); + I_Constructor1(IN, const osg::Vec2f &, vec); + I_Method0(osg::Vec2d::value_type *, ptr); + I_Method0(const osg::Vec2d::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2d::value_type, x, IN, osg::Vec2d::value_type, y); + I_Method0(osg::Vec2d::value_type &, x); + I_Method0(osg::Vec2d::value_type &, y); + I_Method0(osg::Vec2d::value_type, x); + I_Method0(osg::Vec2d::value_type, y); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec2d::value_type, length); + I_Method0(osg::Vec2d::value_type, length2); + I_Method0(osg::Vec2d::value_type, normalize); +END_REFLECTOR + +TYPE_NAME_ALIAS(double, osg::Vec2d::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec2d) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor2(IN, osg::Vec2d::value_type, x, IN, osg::Vec2d::value_type, y); + I_Constructor1(IN, const osg::Vec2f &, vec); + I_Method0(osg::Vec2d::value_type *, ptr); + I_Method0(const osg::Vec2d::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2d::value_type, x, IN, osg::Vec2d::value_type, y); + I_Method0(osg::Vec2d::value_type &, x); + I_Method0(osg::Vec2d::value_type &, y); + I_Method0(osg::Vec2d::value_type, x); + I_Method0(osg::Vec2d::value_type, y); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec2d::value_type, length); + I_Method0(osg::Vec2d::value_type, length2); + I_Method0(osg::Vec2d::value_type, normalize); + I_Constructor0(); + I_Constructor2(IN, osg::Vec2d::value_type, x, IN, osg::Vec2d::value_type, y); + I_Constructor1(IN, const osg::Vec2f &, vec); + I_Method0(osg::Vec2d::value_type *, ptr); + I_Method0(const osg::Vec2d::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2d::value_type, x, IN, osg::Vec2d::value_type, y); + I_Method0(osg::Vec2d::value_type &, x); + I_Method0(osg::Vec2d::value_type &, y); + I_Method0(osg::Vec2d::value_type, x); + I_Method0(osg::Vec2d::value_type, y); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec2d::value_type, length); + I_Method0(osg::Vec2d::value_type, length2); + I_Method0(osg::Vec2d::value_type, normalize); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec2f.cpp b/src/osgWrappers/osg/Vec2f.cpp index 962e96805..d6a5d9f6e 100644 --- a/src/osgWrappers/osg/Vec2f.cpp +++ b/src/osgWrappers/osg/Vec2f.cpp @@ -40,5 +40,54 @@ BEGIN_VALUE_REFLECTOR(osg::Vec2f) I_Method0(osg::Vec2f::value_type, length); I_Method0(osg::Vec2f::value_type, length2); I_Method0(osg::Vec2f::value_type, normalize); + I_Constructor0(); + I_Constructor2(IN, osg::Vec2f::value_type, x, IN, osg::Vec2f::value_type, y); + I_Method0(osg::Vec2f::value_type *, ptr); + I_Method0(const osg::Vec2f::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2f::value_type, x, IN, osg::Vec2f::value_type, y); + I_Method0(osg::Vec2f::value_type &, x); + I_Method0(osg::Vec2f::value_type &, y); + I_Method0(osg::Vec2f::value_type, x); + I_Method0(osg::Vec2f::value_type, y); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec2f::value_type, length); + I_Method0(osg::Vec2f::value_type, length2); + I_Method0(osg::Vec2f::value_type, normalize); +END_REFLECTOR + +TYPE_NAME_ALIAS(float, osg::Vec2f::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec2f) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor2(IN, osg::Vec2f::value_type, x, IN, osg::Vec2f::value_type, y); + I_Method0(osg::Vec2f::value_type *, ptr); + I_Method0(const osg::Vec2f::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2f::value_type, x, IN, osg::Vec2f::value_type, y); + I_Method0(osg::Vec2f::value_type &, x); + I_Method0(osg::Vec2f::value_type &, y); + I_Method0(osg::Vec2f::value_type, x); + I_Method0(osg::Vec2f::value_type, y); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec2f::value_type, length); + I_Method0(osg::Vec2f::value_type, length2); + I_Method0(osg::Vec2f::value_type, normalize); + I_Constructor0(); + I_Constructor2(IN, osg::Vec2f::value_type, x, IN, osg::Vec2f::value_type, y); + I_Method0(osg::Vec2f::value_type *, ptr); + I_Method0(const osg::Vec2f::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2f::value_type, x, IN, osg::Vec2f::value_type, y); + I_Method0(osg::Vec2f::value_type &, x); + I_Method0(osg::Vec2f::value_type &, y); + I_Method0(osg::Vec2f::value_type, x); + I_Method0(osg::Vec2f::value_type, y); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec2f::value_type, length); + I_Method0(osg::Vec2f::value_type, length2); + I_Method0(osg::Vec2f::value_type, normalize); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec2s.cpp b/src/osgWrappers/osg/Vec2s.cpp index 4d580fc36..a8abdd5d2 100644 --- a/src/osgWrappers/osg/Vec2s.cpp +++ b/src/osgWrappers/osg/Vec2s.cpp @@ -22,6 +22,54 @@ TYPE_NAME_ALIAS(short, osg::Vec2s::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec2s) + I_Constructor0(); + I_Constructor2(IN, osg::Vec2s::value_type, x, IN, osg::Vec2s::value_type, y); + I_Method0(osg::Vec2s::value_type *, ptr); + I_Method0(const osg::Vec2s::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2s::value_type, x, IN, osg::Vec2s::value_type, y); + I_Method1(void, set, IN, const osg::Vec2s &, rhs); + I_Method0(osg::Vec2s::value_type &, x); + I_Method0(osg::Vec2s::value_type &, y); + I_Method0(osg::Vec2s::value_type, x); + I_Method0(osg::Vec2s::value_type, y); + I_Method0(osg::Vec2s::value_type &, r); + I_Method0(osg::Vec2s::value_type &, g); + I_Method0(osg::Vec2s::value_type, r); + I_Method0(osg::Vec2s::value_type, g); + I_Constructor0(); + I_Constructor2(IN, osg::Vec2s::value_type, x, IN, osg::Vec2s::value_type, y); + I_Method0(osg::Vec2s::value_type *, ptr); + I_Method0(const osg::Vec2s::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2s::value_type, x, IN, osg::Vec2s::value_type, y); + I_Method1(void, set, IN, const osg::Vec2s &, rhs); + I_Method0(osg::Vec2s::value_type &, x); + I_Method0(osg::Vec2s::value_type &, y); + I_Method0(osg::Vec2s::value_type, x); + I_Method0(osg::Vec2s::value_type, y); + I_Method0(osg::Vec2s::value_type &, r); + I_Method0(osg::Vec2s::value_type &, g); + I_Method0(osg::Vec2s::value_type, r); + I_Method0(osg::Vec2s::value_type, g); + I_WriteOnlyProperty(const osg::Vec2s &, ); +END_REFLECTOR + +TYPE_NAME_ALIAS(short, osg::Vec2s::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec2s) + I_Constructor0(); + I_Constructor2(IN, osg::Vec2s::value_type, x, IN, osg::Vec2s::value_type, y); + I_Method0(osg::Vec2s::value_type *, ptr); + I_Method0(const osg::Vec2s::value_type *, ptr); + I_Method2(void, set, IN, osg::Vec2s::value_type, x, IN, osg::Vec2s::value_type, y); + I_Method1(void, set, IN, const osg::Vec2s &, rhs); + I_Method0(osg::Vec2s::value_type &, x); + I_Method0(osg::Vec2s::value_type &, y); + I_Method0(osg::Vec2s::value_type, x); + I_Method0(osg::Vec2s::value_type, y); + I_Method0(osg::Vec2s::value_type &, r); + I_Method0(osg::Vec2s::value_type &, g); + I_Method0(osg::Vec2s::value_type, r); + I_Method0(osg::Vec2s::value_type, g); I_Constructor0(); I_Constructor2(IN, osg::Vec2s::value_type, x, IN, osg::Vec2s::value_type, y); I_Method0(osg::Vec2s::value_type *, ptr); diff --git a/src/osgWrappers/osg/Vec3b.cpp b/src/osgWrappers/osg/Vec3b.cpp index 24a255531..e63bbe9cd 100644 --- a/src/osgWrappers/osg/Vec3b.cpp +++ b/src/osgWrappers/osg/Vec3b.cpp @@ -44,6 +44,68 @@ BEGIN_VALUE_REFLECTOR(osg::Vec3b) I_Method0(osg::Vec3b::value_type, r); I_Method0(osg::Vec3b::value_type, g); I_Method0(osg::Vec3b::value_type, b); + I_Constructor0(); + I_Constructor3(IN, osg::Vec3b::value_type, r, IN, osg::Vec3b::value_type, g, IN, osg::Vec3b::value_type, b); + I_Method0(osg::Vec3b::value_type *, ptr); + I_Method0(const osg::Vec3b::value_type *, ptr); + I_Method3(void, set, IN, osg::Vec3b::value_type, r, IN, osg::Vec3b::value_type, g, IN, osg::Vec3b::value_type, b); + I_Method1(void, set, IN, const osg::Vec3b &, rhs); + I_Method0(osg::Vec3b::value_type &, x); + I_Method0(osg::Vec3b::value_type &, y); + I_Method0(osg::Vec3b::value_type &, z); + I_Method0(osg::Vec3b::value_type, x); + I_Method0(osg::Vec3b::value_type, y); + I_Method0(osg::Vec3b::value_type, z); + I_Method0(osg::Vec3b::value_type &, r); + I_Method0(osg::Vec3b::value_type &, g); + I_Method0(osg::Vec3b::value_type &, b); + I_Method0(osg::Vec3b::value_type, r); + I_Method0(osg::Vec3b::value_type, g); + I_Method0(osg::Vec3b::value_type, b); + I_WriteOnlyProperty(const osg::Vec3b &, ); +END_REFLECTOR + +TYPE_NAME_ALIAS(char, osg::Vec3b::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec3b) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor3(IN, osg::Vec3b::value_type, r, IN, osg::Vec3b::value_type, g, IN, osg::Vec3b::value_type, b); + I_Method0(osg::Vec3b::value_type *, ptr); + I_Method0(const osg::Vec3b::value_type *, ptr); + I_Method3(void, set, IN, osg::Vec3b::value_type, r, IN, osg::Vec3b::value_type, g, IN, osg::Vec3b::value_type, b); + I_Method1(void, set, IN, const osg::Vec3b &, rhs); + I_Method0(osg::Vec3b::value_type &, x); + I_Method0(osg::Vec3b::value_type &, y); + I_Method0(osg::Vec3b::value_type &, z); + I_Method0(osg::Vec3b::value_type, x); + I_Method0(osg::Vec3b::value_type, y); + I_Method0(osg::Vec3b::value_type, z); + I_Method0(osg::Vec3b::value_type &, r); + I_Method0(osg::Vec3b::value_type &, g); + I_Method0(osg::Vec3b::value_type &, b); + I_Method0(osg::Vec3b::value_type, r); + I_Method0(osg::Vec3b::value_type, g); + I_Method0(osg::Vec3b::value_type, b); + I_Constructor0(); + I_Constructor3(IN, osg::Vec3b::value_type, r, IN, osg::Vec3b::value_type, g, IN, osg::Vec3b::value_type, b); + I_Method0(osg::Vec3b::value_type *, ptr); + I_Method0(const osg::Vec3b::value_type *, ptr); + I_Method3(void, set, IN, osg::Vec3b::value_type, r, IN, osg::Vec3b::value_type, g, IN, osg::Vec3b::value_type, b); + I_Method1(void, set, IN, const osg::Vec3b &, rhs); + I_Method0(osg::Vec3b::value_type &, x); + I_Method0(osg::Vec3b::value_type &, y); + I_Method0(osg::Vec3b::value_type &, z); + I_Method0(osg::Vec3b::value_type, x); + I_Method0(osg::Vec3b::value_type, y); + I_Method0(osg::Vec3b::value_type, z); + I_Method0(osg::Vec3b::value_type &, r); + I_Method0(osg::Vec3b::value_type &, g); + I_Method0(osg::Vec3b::value_type &, b); + I_Method0(osg::Vec3b::value_type, r); + I_Method0(osg::Vec3b::value_type, g); + I_Method0(osg::Vec3b::value_type, b); I_WriteOnlyProperty(const osg::Vec3b &, ); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec4d.cpp b/src/osgWrappers/osg/Vec4d.cpp index 616ace86d..d4ba11ebd 100644 --- a/src/osgWrappers/osg/Vec4d.cpp +++ b/src/osgWrappers/osg/Vec4d.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -58,5 +58,102 @@ BEGIN_VALUE_REFLECTOR(osg::Vec4d) I_Method0(osg::Vec4d::value_type, length); I_Method0(osg::Vec4d::value_type, length2); I_Method0(osg::Vec4d::value_type, normalize); + I_Constructor0(); + I_Constructor4(IN, osg::Vec4d::value_type, x, IN, osg::Vec4d::value_type, y, IN, osg::Vec4d::value_type, z, IN, osg::Vec4d::value_type, w); + I_Constructor2(IN, const osg::Vec3d &, v3, IN, osg::Vec4d::value_type, w); + I_Constructor1(IN, const osg::Vec4f &, vec); + I_Method0(osg::Vec4d::value_type *, ptr); + I_Method0(const osg::Vec4d::value_type *, ptr); + I_Method4(void, set, IN, osg::Vec4d::value_type, x, IN, osg::Vec4d::value_type, y, IN, osg::Vec4d::value_type, z, IN, osg::Vec4d::value_type, w); + I_Method0(osg::Vec4d::value_type &, x); + I_Method0(osg::Vec4d::value_type &, y); + I_Method0(osg::Vec4d::value_type &, z); + I_Method0(osg::Vec4d::value_type &, w); + I_Method0(osg::Vec4d::value_type, x); + I_Method0(osg::Vec4d::value_type, y); + I_Method0(osg::Vec4d::value_type, z); + I_Method0(osg::Vec4d::value_type, w); + I_Method0(osg::Vec4d::value_type &, r); + I_Method0(osg::Vec4d::value_type &, g); + I_Method0(osg::Vec4d::value_type &, b); + I_Method0(osg::Vec4d::value_type &, a); + I_Method0(osg::Vec4d::value_type, r); + I_Method0(osg::Vec4d::value_type, g); + I_Method0(osg::Vec4d::value_type, b); + I_Method0(osg::Vec4d::value_type, a); + I_Method0(unsigned int, asABGR); + I_Method0(unsigned int, asRGBA); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec4d::value_type, length); + I_Method0(osg::Vec4d::value_type, length2); + I_Method0(osg::Vec4d::value_type, normalize); +END_REFLECTOR + +TYPE_NAME_ALIAS(double, osg::Vec4d::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec4d) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor4(IN, osg::Vec4d::value_type, x, IN, osg::Vec4d::value_type, y, IN, osg::Vec4d::value_type, z, IN, osg::Vec4d::value_type, w); + I_Constructor2(IN, const osg::Vec3d &, v3, IN, osg::Vec4d::value_type, w); + I_Constructor1(IN, const osg::Vec4f &, vec); + I_Method0(osg::Vec4d::value_type *, ptr); + I_Method0(const osg::Vec4d::value_type *, ptr); + I_Method4(void, set, IN, osg::Vec4d::value_type, x, IN, osg::Vec4d::value_type, y, IN, osg::Vec4d::value_type, z, IN, osg::Vec4d::value_type, w); + I_Method0(osg::Vec4d::value_type &, x); + I_Method0(osg::Vec4d::value_type &, y); + I_Method0(osg::Vec4d::value_type &, z); + I_Method0(osg::Vec4d::value_type &, w); + I_Method0(osg::Vec4d::value_type, x); + I_Method0(osg::Vec4d::value_type, y); + I_Method0(osg::Vec4d::value_type, z); + I_Method0(osg::Vec4d::value_type, w); + I_Method0(osg::Vec4d::value_type &, r); + I_Method0(osg::Vec4d::value_type &, g); + I_Method0(osg::Vec4d::value_type &, b); + I_Method0(osg::Vec4d::value_type &, a); + I_Method0(osg::Vec4d::value_type, r); + I_Method0(osg::Vec4d::value_type, g); + I_Method0(osg::Vec4d::value_type, b); + I_Method0(osg::Vec4d::value_type, a); + I_Method0(unsigned int, asABGR); + I_Method0(unsigned int, asRGBA); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec4d::value_type, length); + I_Method0(osg::Vec4d::value_type, length2); + I_Method0(osg::Vec4d::value_type, normalize); + I_Constructor0(); + I_Constructor4(IN, osg::Vec4d::value_type, x, IN, osg::Vec4d::value_type, y, IN, osg::Vec4d::value_type, z, IN, osg::Vec4d::value_type, w); + I_Constructor2(IN, const osg::Vec3d &, v3, IN, osg::Vec4d::value_type, w); + I_Constructor1(IN, const osg::Vec4f &, vec); + I_Method0(osg::Vec4d::value_type *, ptr); + I_Method0(const osg::Vec4d::value_type *, ptr); + I_Method4(void, set, IN, osg::Vec4d::value_type, x, IN, osg::Vec4d::value_type, y, IN, osg::Vec4d::value_type, z, IN, osg::Vec4d::value_type, w); + I_Method0(osg::Vec4d::value_type &, x); + I_Method0(osg::Vec4d::value_type &, y); + I_Method0(osg::Vec4d::value_type &, z); + I_Method0(osg::Vec4d::value_type &, w); + I_Method0(osg::Vec4d::value_type, x); + I_Method0(osg::Vec4d::value_type, y); + I_Method0(osg::Vec4d::value_type, z); + I_Method0(osg::Vec4d::value_type, w); + I_Method0(osg::Vec4d::value_type &, r); + I_Method0(osg::Vec4d::value_type &, g); + I_Method0(osg::Vec4d::value_type &, b); + I_Method0(osg::Vec4d::value_type &, a); + I_Method0(osg::Vec4d::value_type, r); + I_Method0(osg::Vec4d::value_type, g); + I_Method0(osg::Vec4d::value_type, b); + I_Method0(osg::Vec4d::value_type, a); + I_Method0(unsigned int, asABGR); + I_Method0(unsigned int, asRGBA); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec4d::value_type, length); + I_Method0(osg::Vec4d::value_type, length2); + I_Method0(osg::Vec4d::value_type, normalize); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec4ub.cpp b/src/osgWrappers/osg/Vec4ub.cpp index 8241a2bf0..7e3892ad3 100644 --- a/src/osgWrappers/osg/Vec4ub.cpp +++ b/src/osgWrappers/osg/Vec4ub.cpp @@ -39,5 +39,51 @@ BEGIN_VALUE_REFLECTOR(osg::Vec4ub) I_Method0(unsigned char, g); I_Method0(unsigned char, b); I_Method0(unsigned char, a); + I_Constructor0(); + I_Constructor4(IN, osg::Vec4ub::value_type, x, IN, osg::Vec4ub::value_type, y, IN, osg::Vec4ub::value_type, z, IN, osg::Vec4ub::value_type, w); + I_Method0(unsigned char *, ptr); + I_Method0(const unsigned char *, ptr); + I_Method4(void, set, IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a); + I_Method0(unsigned char &, r); + I_Method0(unsigned char &, g); + I_Method0(unsigned char &, b); + I_Method0(unsigned char &, a); + I_Method0(unsigned char, r); + I_Method0(unsigned char, g); + I_Method0(unsigned char, b); + I_Method0(unsigned char, a); +END_REFLECTOR + +TYPE_NAME_ALIAS(unsigned char, osg::Vec4ub::value_type); + +BEGIN_VALUE_REFLECTOR(osg::Vec4ub) + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor4(IN, osg::Vec4ub::value_type, x, IN, osg::Vec4ub::value_type, y, IN, osg::Vec4ub::value_type, z, IN, osg::Vec4ub::value_type, w); + I_Method0(unsigned char *, ptr); + I_Method0(const unsigned char *, ptr); + I_Method4(void, set, IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a); + I_Method0(unsigned char &, r); + I_Method0(unsigned char &, g); + I_Method0(unsigned char &, b); + I_Method0(unsigned char &, a); + I_Method0(unsigned char, r); + I_Method0(unsigned char, g); + I_Method0(unsigned char, b); + I_Method0(unsigned char, a); + I_Constructor0(); + I_Constructor4(IN, osg::Vec4ub::value_type, x, IN, osg::Vec4ub::value_type, y, IN, osg::Vec4ub::value_type, z, IN, osg::Vec4ub::value_type, w); + I_Method0(unsigned char *, ptr); + I_Method0(const unsigned char *, ptr); + I_Method4(void, set, IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a); + I_Method0(unsigned char &, r); + I_Method0(unsigned char &, g); + I_Method0(unsigned char &, b); + I_Method0(unsigned char &, a); + I_Method0(unsigned char, r); + I_Method0(unsigned char, g); + I_Method0(unsigned char, b); + I_Method0(unsigned char, a); END_REFLECTOR diff --git a/src/osgWrappers/osg/VertexProgram.cpp b/src/osgWrappers/osg/VertexProgram.cpp index 2760265f4..36a300e67 100644 --- a/src/osgWrappers/osg/VertexProgram.cpp +++ b/src/osgWrappers/osg/VertexProgram.cpp @@ -9,12 +9,6 @@ #include #include -#include -#include -#include -#include -#include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -25,46 +19,49 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::VertexProgram::LocalParamList); - -TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::VertexProgram::MatrixList); - -BEGIN_OBJECT_REFLECTOR(osg::VertexProgram) - I_BaseType(osg::StateAttribute); - I_Constructor0(); - I_ConstructorWithDefaults2(IN, const osg::VertexProgram &, vp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - I_Method0(osg::Object *, cloneType); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - I_Method0(const char *, libraryName); - I_Method0(const char *, className); - I_Method0(osg::StateAttribute::Type, getType); - I_Method1(int, compare, IN, const osg::StateAttribute &, sa); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - I_Method1(GLuint &, getVertexProgramID, IN, unsigned int, contextID); - I_Method1(void, setVertexProgram, IN, const char *, program); - I_Method1(void, setVertexProgram, IN, const std::string &, program); - I_Method0(const std::string &, getVertexProgram); - I_Method2(void, setProgramLocalParameter, IN, const GLuint, index, IN, const osg::Vec4 &, p); - I_Method1(void, setLocalParameters, IN, const osg::VertexProgram::LocalParamList &, lpl); - I_Method0(osg::VertexProgram::LocalParamList &, getLocalParameters); - I_Method0(const osg::VertexProgram::LocalParamList &, getLocalParameters); - I_Method2(void, setMatrix, IN, const GLenum, mode, IN, const osg::Matrix &, matrix); - I_Method1(void, setMatrices, IN, const osg::VertexProgram::MatrixList &, matrices); - I_Method0(osg::VertexProgram::MatrixList &, getMatrices); - I_Method0(const osg::VertexProgram::MatrixList &, getMatrices); - I_Method0(void, dirtyVertexProgramObject); - 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_Property(const osg::VertexProgram::LocalParamList &, LocalParameters); - I_Property(const osg::VertexProgram::MatrixList &, Matrices); - I_ReadOnlyProperty(osg::StateAttribute::Type, Type); - I_Property(const std::string &, VertexProgram); -END_REFLECTOR - BEGIN_OBJECT_REFLECTOR(osg::VertexProgram::Extensions) I_BaseType(osg::Referenced); + I_BaseType(osg::Referenced); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::VertexProgram::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::VertexProgram::Extensions &, rhs); + I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); + I_Method1(void, setVertexProgramSupported, IN, bool, flag); + I_Method0(bool, isVertexProgramSupported); + I_Method2(void, glBindProgram, IN, GLenum, target, IN, GLuint, id); + I_Method2(void, glGenPrograms, IN, GLsizei, n, IN, GLuint *, programs); + I_Method2(void, glDeletePrograms, IN, GLsizei, n, IN, GLuint *, programs); + I_Method4(void, glProgramString, IN, GLenum, target, IN, GLenum, format, IN, GLsizei, len, IN, const void *, string); + I_Method3(void, glProgramLocalParameter4fv, IN, GLenum, target, IN, GLuint, index, IN, const GLfloat *, params); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::VertexProgram::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::VertexProgram::Extensions &, rhs); + I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); + I_Method1(void, setVertexProgramSupported, IN, bool, flag); + I_Method0(bool, isVertexProgramSupported); + I_Method2(void, glBindProgram, IN, GLenum, target, IN, GLuint, id); + I_Method2(void, glGenPrograms, IN, GLsizei, n, IN, GLuint *, programs); + I_Method2(void, glDeletePrograms, IN, GLsizei, n, IN, GLuint *, programs); + I_Method4(void, glProgramString, IN, GLenum, target, IN, GLenum, format, IN, GLsizei, len, IN, const void *, string); + I_Method3(void, glProgramLocalParameter4fv, IN, GLenum, target, IN, GLuint, index, IN, const GLfloat *, params); + I_WriteOnlyProperty(bool, VertexProgramSupported); + I_WriteOnlyProperty(unsigned int, upGLExtenions); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::VertexProgram::Extensions) + I_BaseType(osg::Referenced); + I_BaseType(osg::Referenced); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::VertexProgram::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::VertexProgram::Extensions &, rhs); + I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); + I_Method1(void, setVertexProgramSupported, IN, bool, flag); + I_Method0(bool, isVertexProgramSupported); + I_Method2(void, glBindProgram, IN, GLenum, target, IN, GLuint, id); + I_Method2(void, glGenPrograms, IN, GLsizei, n, IN, GLuint *, programs); + I_Method2(void, glDeletePrograms, IN, GLsizei, n, IN, GLuint *, programs); + I_Method4(void, glProgramString, IN, GLenum, target, IN, GLenum, format, IN, GLsizei, len, IN, const void *, string); + I_Method3(void, glProgramLocalParameter4fv, IN, GLenum, target, IN, GLuint, index, IN, const GLfloat *, params); I_Constructor1(IN, unsigned int, contextID); I_Constructor1(IN, const osg::VertexProgram::Extensions &, rhs); I_Method1(void, lowestCommonDenominator, IN, const osg::VertexProgram::Extensions &, rhs); diff --git a/src/osgWrappers/osg/observer_ptr.cpp b/src/osgWrappers/osg/observer_ptr.cpp index 62d1080b9..864892f9c 100644 --- a/src/osgWrappers/osg/observer_ptr.cpp +++ b/src/osgWrappers/osg/observer_ptr.cpp @@ -21,6 +21,9 @@ BEGIN_VALUE_REFLECTOR(osg::Observer) I_Constructor0(); - I_Method1(void, objectDeleted, IN, void *, x); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Observer) + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/Archive.cpp b/src/osgWrappers/osgDB/Archive.cpp index c013c63eb..5ed488b86 100644 --- a/src/osgWrappers/osgDB/Archive.cpp +++ b/src/osgWrappers/osgDB/Archive.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index 9df3a4800..889d7907a 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -14,7 +14,8 @@ #include #include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -112,7 +113,32 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) I_Property(bool, UseFrameBlock); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Drawable >) + I_Constructor0(); + I_Constructor1(IN, osg::Drawable *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::Drawable > &, rp); + I_Method0(osg::Drawable *, get); + I_Method0(bool, valid); + I_Method0(osg::Drawable *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::Drawable > &, rp); + I_Constructor0(); + I_Constructor1(IN, osg::Drawable *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::Drawable > &, rp); + I_Method0(osg::Drawable *, get); + I_Method0(bool, valid); + I_Method0(osg::Drawable *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::Drawable > &, rp); + I_ReadOnlyProperty(osg::Drawable *, ); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PagedLOD >) + I_Constructor0(); + I_Constructor1(IN, osg::PagedLOD *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::PagedLOD > &, rp); + I_Method0(osg::PagedLOD *, get); + I_Method0(bool, valid); + I_Method0(osg::PagedLOD *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::PagedLOD > &, rp); I_Constructor0(); I_Constructor1(IN, osg::PagedLOD *, ptr); I_Constructor1(IN, const osg::ref_ptr< osg::PagedLOD > &, rp); @@ -133,3 +159,5 @@ STD_SET_REFLECTOR(std::set< osg::ref_ptr< osg::StateSet > >); STD_SET_REFLECTOR(std::set< unsigned int >); +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Drawable > >); + diff --git a/src/osgWrappers/osgDB/FieldReaderIterator.cpp b/src/osgWrappers/osgDB/FieldReaderIterator.cpp index 1536df238..f4ac94ec4 100644 --- a/src/osgWrappers/osgDB/FieldReaderIterator.cpp +++ b/src/osgWrappers/osgDB/FieldReaderIterator.cpp @@ -11,10 +11,10 @@ #include #include -#include -#include #include -#include +#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgDB/ImageOptions.cpp b/src/osgWrappers/osgDB/ImageOptions.cpp index a632576a7..211e51d0b 100644 --- a/src/osgWrappers/osgDB/ImageOptions.cpp +++ b/src/osgWrappers/osgDB/ImageOptions.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgDB/Input.cpp b/src/osgWrappers/osgDB/Input.cpp index 4a2f25c5c..f74319a95 100644 --- a/src/osgWrappers/osgDB/Input.cpp +++ b/src/osgWrappers/osgDB/Input.cpp @@ -9,12 +9,12 @@ #include #include -#include #include #include #include -#include #include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index 848c0130b..0522bb7dd 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -9,11 +9,11 @@ #include #include -#include #include #include #include -#include +#include +#include #include #include diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index ddcb7c472..934bbb0f2 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -10,14 +10,14 @@ #include #include -#include #include #include #include -#include -#include -#include #include +#include +#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgFX/AnisotropicLighting.cpp b/src/osgWrappers/osgFX/AnisotropicLighting.cpp index 58363bfd3..07af2cb09 100644 --- a/src/osgWrappers/osgFX/AnisotropicLighting.cpp +++ b/src/osgWrappers/osgFX/AnisotropicLighting.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgFX/BumpMapping.cpp b/src/osgWrappers/osgFX/BumpMapping.cpp index d3f32d4fa..5bece3865 100644 --- a/src/osgWrappers/osgFX/BumpMapping.cpp +++ b/src/osgWrappers/osgFX/BumpMapping.cpp @@ -9,12 +9,12 @@ #include #include -#include #include #include #include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgFX/Cartoon.cpp b/src/osgWrappers/osgFX/Cartoon.cpp index 1dcb2fd4e..0df3b5073 100644 --- a/src/osgWrappers/osgFX/Cartoon.cpp +++ b/src/osgWrappers/osgFX/Cartoon.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgFX/Effect.cpp b/src/osgWrappers/osgFX/Effect.cpp index 209a9be9d..1fee6a444 100644 --- a/src/osgWrappers/osgFX/Effect.cpp +++ b/src/osgWrappers/osgFX/Effect.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/MultiTextureControl.cpp b/src/osgWrappers/osgFX/MultiTextureControl.cpp index f4894337d..2e2843f5f 100644 --- a/src/osgWrappers/osgFX/MultiTextureControl.cpp +++ b/src/osgWrappers/osgFX/MultiTextureControl.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgFX/Scribe.cpp b/src/osgWrappers/osgFX/Scribe.cpp index 549d93118..99904a487 100644 --- a/src/osgWrappers/osgFX/Scribe.cpp +++ b/src/osgWrappers/osgFX/Scribe.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgFX/SpecularHighlights.cpp b/src/osgWrappers/osgFX/SpecularHighlights.cpp index 42e3d2661..f30f2d610 100644 --- a/src/osgWrappers/osgFX/SpecularHighlights.cpp +++ b/src/osgWrappers/osgFX/SpecularHighlights.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgFX/Technique.cpp b/src/osgWrappers/osgFX/Technique.cpp index 12fe6c6a9..14b3487f3 100644 --- a/src/osgWrappers/osgFX/Technique.cpp +++ b/src/osgWrappers/osgFX/Technique.cpp @@ -10,8 +10,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/osgWrappers/osgFX/Validator.cpp b/src/osgWrappers/osgFX/Validator.cpp index d284d5029..98cb28a32 100644 --- a/src/osgWrappers/osgFX/Validator.cpp +++ b/src/osgWrappers/osgFX/Validator.cpp @@ -9,10 +9,11 @@ #include #include -#include #include -#include #include +#include +#include +#include #include #include diff --git a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp index 3462d3ced..45c206584 100644 --- a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp @@ -9,9 +9,9 @@ #include #include -#include -#include #include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgGA/DriveManipulator.cpp b/src/osgWrappers/osgGA/DriveManipulator.cpp index 39bc87088..db86dd293 100644 --- a/src/osgWrappers/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/osgGA/DriveManipulator.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/osgWrappers/osgGA/EventQueue.cpp b/src/osgWrappers/osgGA/EventQueue.cpp index f406b4a8b..cdd731370 100644 --- a/src/osgWrappers/osgGA/EventQueue.cpp +++ b/src/osgWrappers/osgGA/EventQueue.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include @@ -56,6 +56,13 @@ BEGIN_OBJECT_REFLECTOR(osgGA::EventQueue) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventAdapter >) + I_Constructor0(); + I_Constructor1(IN, osgGA::GUIEventAdapter *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventAdapter > &, rp); + I_Method0(osgGA::GUIEventAdapter *, get); + I_Method0(bool, valid); + I_Method0(osgGA::GUIEventAdapter *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgGA::GUIEventAdapter > &, rp); I_Constructor0(); I_Constructor1(IN, osgGA::GUIEventAdapter *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventAdapter > &, rp); diff --git a/src/osgWrappers/osgGA/EventVisitor.cpp b/src/osgWrappers/osgGA/EventVisitor.cpp index be58942e6..209d785c6 100644 --- a/src/osgWrappers/osgGA/EventVisitor.cpp +++ b/src/osgWrappers/osgGA/EventVisitor.cpp @@ -9,16 +9,16 @@ #include #include -#include #include #include #include #include #include #include -#include #include #include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgGA/FlightManipulator.cpp b/src/osgWrappers/osgGA/FlightManipulator.cpp index c3e95f5a7..debcc0e46 100644 --- a/src/osgWrappers/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/osgGA/FlightManipulator.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/osgWrappers/osgGA/GUIEventHandler.cpp b/src/osgWrappers/osgGA/GUIEventHandler.cpp index d6cf5df6b..50d2d7cbb 100644 --- a/src/osgWrappers/osgGA/GUIEventHandler.cpp +++ b/src/osgWrappers/osgGA/GUIEventHandler.cpp @@ -9,12 +9,12 @@ #include #include -#include -#include -#include #include #include #include +#include +#include +#include #include #include #include @@ -71,6 +71,13 @@ BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventHandler) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) + I_Constructor0(); + I_Constructor1(IN, osgGA::GUIEventHandler *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp); + I_Method0(osgGA::GUIEventHandler *, get); + I_Method0(bool, valid); + I_Method0(osgGA::GUIEventHandler *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgGA::GUIEventHandler > &, rp); I_Constructor0(); I_Constructor1(IN, osgGA::GUIEventHandler *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp); diff --git a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp index e2f4fbcbb..652c2b1da 100644 --- a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include #include @@ -80,6 +80,13 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::MatrixManipulator >) + I_Constructor0(); + I_Constructor1(IN, osgGA::MatrixManipulator *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgGA::MatrixManipulator > &, rp); + I_Method0(osgGA::MatrixManipulator *, get); + I_Method0(bool, valid); + I_Method0(osgGA::MatrixManipulator *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgGA::MatrixManipulator > &, rp); I_Constructor0(); I_Constructor1(IN, osgGA::MatrixManipulator *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgGA::MatrixManipulator > &, rp); diff --git a/src/osgWrappers/osgGA/MatrixManipulator.cpp b/src/osgWrappers/osgGA/MatrixManipulator.cpp index a1ba12777..229513182 100644 --- a/src/osgWrappers/osgGA/MatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/MatrixManipulator.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index 655761b45..7a12811d4 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include #include #include @@ -79,3 +79,9 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) I_Property(osgGA::NodeTrackerManipulator::TrackerMode, TrackerMode); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::observer_ptr< osg::Node >) + I_Constructor0(); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< osg::observer_ptr< osg::Node > >); + diff --git a/src/osgWrappers/osgGA/StateSetManipulator.cpp b/src/osgWrappers/osgGA/StateSetManipulator.cpp index a85a04191..07a41d024 100644 --- a/src/osgWrappers/osgGA/StateSetManipulator.cpp +++ b/src/osgWrappers/osgGA/StateSetManipulator.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/osgWrappers/osgGA/TerrainManipulator.cpp b/src/osgWrappers/osgGA/TerrainManipulator.cpp index 874e73f34..4e39af8d7 100644 --- a/src/osgWrappers/osgGA/TerrainManipulator.cpp +++ b/src/osgWrappers/osgGA/TerrainManipulator.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/osgWrappers/osgGA/TrackballManipulator.cpp b/src/osgWrappers/osgGA/TrackballManipulator.cpp index 62774283b..1a9ad8de1 100644 --- a/src/osgWrappers/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/osgGA/TrackballManipulator.cpp @@ -9,11 +9,11 @@ #include #include -#include #include #include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgGA/UFOManipulator.cpp b/src/osgWrappers/osgGA/UFOManipulator.cpp index ffa244754..9291bf0da 100644 --- a/src/osgWrappers/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/osgGA/UFOManipulator.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/AccelOperator.cpp b/src/osgWrappers/osgParticle/AccelOperator.cpp index 13988a4e5..a0b5fa971 100644 --- a/src/osgWrappers/osgParticle/AccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AccelOperator.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp index e1008d1cd..159365dfc 100644 --- a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/BoxPlacer.cpp b/src/osgWrappers/osgParticle/BoxPlacer.cpp index 95655019e..65784aa87 100644 --- a/src/osgWrappers/osgParticle/BoxPlacer.cpp +++ b/src/osgWrappers/osgParticle/BoxPlacer.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/CenteredPlacer.cpp b/src/osgWrappers/osgParticle/CenteredPlacer.cpp index fec95e267..0b3474d57 100644 --- a/src/osgWrappers/osgParticle/CenteredPlacer.cpp +++ b/src/osgWrappers/osgParticle/CenteredPlacer.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp index 26eeace51..4363fa29d 100644 --- a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp index 19d5453ce..b26ccd087 100644 --- a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp +++ b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgParticle/Counter.cpp b/src/osgWrappers/osgParticle/Counter.cpp index 17cf63d5a..01fa9b0da 100644 --- a/src/osgWrappers/osgParticle/Counter.cpp +++ b/src/osgWrappers/osgParticle/Counter.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgParticle/Emitter.cpp b/src/osgWrappers/osgParticle/Emitter.cpp index 4c547afbe..28b7a2a2f 100644 --- a/src/osgWrappers/osgParticle/Emitter.cpp +++ b/src/osgWrappers/osgParticle/Emitter.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp b/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp index 9e5344ed9..8e9678554 100644 --- a/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp +++ b/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/ExplosionEffect.cpp b/src/osgWrappers/osgParticle/ExplosionEffect.cpp index bdc6d320e..cf7c40f57 100644 --- a/src/osgWrappers/osgParticle/ExplosionEffect.cpp +++ b/src/osgWrappers/osgParticle/ExplosionEffect.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/FireEffect.cpp b/src/osgWrappers/osgParticle/FireEffect.cpp index e810ca3ca..3c93c0d47 100644 --- a/src/osgWrappers/osgParticle/FireEffect.cpp +++ b/src/osgWrappers/osgParticle/FireEffect.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp b/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp index 2432953c0..fb24c2c6c 100644 --- a/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp +++ b/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/FluidProgram.cpp b/src/osgWrappers/osgParticle/FluidProgram.cpp index d1b5ff57c..006a54bfd 100644 --- a/src/osgWrappers/osgParticle/FluidProgram.cpp +++ b/src/osgWrappers/osgParticle/FluidProgram.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgParticle/ForceOperator.cpp b/src/osgWrappers/osgParticle/ForceOperator.cpp index 71c72e5b8..d0f37afc4 100644 --- a/src/osgWrappers/osgParticle/ForceOperator.cpp +++ b/src/osgWrappers/osgParticle/ForceOperator.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/Interpolator.cpp b/src/osgWrappers/osgParticle/Interpolator.cpp index b74acc4fb..89aeecfba 100644 --- a/src/osgWrappers/osgParticle/Interpolator.cpp +++ b/src/osgWrappers/osgParticle/Interpolator.cpp @@ -9,11 +9,11 @@ #include #include -#include #include -#include -#include -#include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgParticle/LinearInterpolator.cpp b/src/osgWrappers/osgParticle/LinearInterpolator.cpp index b504bbfaa..fc985fb7b 100644 --- a/src/osgWrappers/osgParticle/LinearInterpolator.cpp +++ b/src/osgWrappers/osgParticle/LinearInterpolator.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgParticle/ModularEmitter.cpp b/src/osgWrappers/osgParticle/ModularEmitter.cpp index 0b352d4d0..64d173b4f 100644 --- a/src/osgWrappers/osgParticle/ModularEmitter.cpp +++ b/src/osgWrappers/osgParticle/ModularEmitter.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/ModularProgram.cpp b/src/osgWrappers/osgParticle/ModularProgram.cpp index 1a31b58b4..0edc2c943 100644 --- a/src/osgWrappers/osgParticle/ModularProgram.cpp +++ b/src/osgWrappers/osgParticle/ModularProgram.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp index 8309197de..02e3ef23e 100644 --- a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Operator.cpp b/src/osgWrappers/osgParticle/Operator.cpp index 4fdf9fba5..d9cc1ce18 100644 --- a/src/osgWrappers/osgParticle/Operator.cpp +++ b/src/osgWrappers/osgParticle/Operator.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/Particle.cpp b/src/osgWrappers/osgParticle/Particle.cpp index 95f4af02a..b8ab7b97b 100644 --- a/src/osgWrappers/osgParticle/Particle.cpp +++ b/src/osgWrappers/osgParticle/Particle.cpp @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/ParticleEffect.cpp b/src/osgWrappers/osgParticle/ParticleEffect.cpp index 950ca0ab6..b1c4619e4 100644 --- a/src/osgWrappers/osgParticle/ParticleEffect.cpp +++ b/src/osgWrappers/osgParticle/ParticleEffect.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/ParticleProcessor.cpp b/src/osgWrappers/osgParticle/ParticleProcessor.cpp index bcdd0f3b0..4c12eff1b 100644 --- a/src/osgWrappers/osgParticle/ParticleProcessor.cpp +++ b/src/osgWrappers/osgParticle/ParticleProcessor.cpp @@ -10,11 +10,11 @@ #include #include -#include #include #include #include -#include +#include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ParticleSystem.cpp b/src/osgWrappers/osgParticle/ParticleSystem.cpp index 7206c8e47..956cfe2e0 100644 --- a/src/osgWrappers/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp @@ -9,11 +9,11 @@ #include #include -#include -#include #include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp index e18957a30..795f74858 100644 --- a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp @@ -10,9 +10,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Placer.cpp b/src/osgWrappers/osgParticle/Placer.cpp index 7c60f3857..1d8a85f6a 100644 --- a/src/osgWrappers/osgParticle/Placer.cpp +++ b/src/osgWrappers/osgParticle/Placer.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include diff --git a/src/osgWrappers/osgParticle/PointPlacer.cpp b/src/osgWrappers/osgParticle/PointPlacer.cpp index 8812bb124..d9b673953 100644 --- a/src/osgWrappers/osgParticle/PointPlacer.cpp +++ b/src/osgWrappers/osgParticle/PointPlacer.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include diff --git a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp index ec57c02a4..f8bf89516 100644 --- a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp +++ b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp @@ -9,16 +9,16 @@ #include #include -#include #include #include #include #include -#include -#include #include -#include -#include +#include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgParticle/Program.cpp b/src/osgWrappers/osgParticle/Program.cpp index 4457ab0a1..c92422a87 100644 --- a/src/osgWrappers/osgParticle/Program.cpp +++ b/src/osgWrappers/osgParticle/Program.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgParticle/RadialShooter.cpp b/src/osgWrappers/osgParticle/RadialShooter.cpp index 98eb2a8d8..5715986f5 100644 --- a/src/osgWrappers/osgParticle/RadialShooter.cpp +++ b/src/osgWrappers/osgParticle/RadialShooter.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/RandomRateCounter.cpp b/src/osgWrappers/osgParticle/RandomRateCounter.cpp index a1484ba67..7fd8c66f0 100644 --- a/src/osgWrappers/osgParticle/RandomRateCounter.cpp +++ b/src/osgWrappers/osgParticle/RandomRateCounter.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgParticle/SectorPlacer.cpp b/src/osgWrappers/osgParticle/SectorPlacer.cpp index 5914e208c..e87f84cbd 100644 --- a/src/osgWrappers/osgParticle/SectorPlacer.cpp +++ b/src/osgWrappers/osgParticle/SectorPlacer.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/SegmentPlacer.cpp b/src/osgWrappers/osgParticle/SegmentPlacer.cpp index ec96fe3a6..ceb905b17 100644 --- a/src/osgWrappers/osgParticle/SegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/SegmentPlacer.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include #include diff --git a/src/osgWrappers/osgParticle/Shooter.cpp b/src/osgWrappers/osgParticle/Shooter.cpp index 542bb89a6..40ae10607 100644 --- a/src/osgWrappers/osgParticle/Shooter.cpp +++ b/src/osgWrappers/osgParticle/Shooter.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/SmokeEffect.cpp b/src/osgWrappers/osgParticle/SmokeEffect.cpp index f525b4c42..46b280538 100644 --- a/src/osgWrappers/osgParticle/SmokeEffect.cpp +++ b/src/osgWrappers/osgParticle/SmokeEffect.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp b/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp index 15f927451..b4b6854a7 100644 --- a/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp +++ b/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgParticle/VariableRateCounter.cpp b/src/osgWrappers/osgParticle/VariableRateCounter.cpp index a7d09e49e..e2ddfbca6 100644 --- a/src/osgWrappers/osgParticle/VariableRateCounter.cpp +++ b/src/osgWrappers/osgParticle/VariableRateCounter.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/osgWrappers/osgParticle/range.cpp b/src/osgWrappers/osgParticle/range.cpp index 5b41c4936..f839e1642 100644 --- a/src/osgWrappers/osgParticle/range.cpp +++ b/src/osgWrappers/osgParticle/range.cpp @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp index 209ee6f94..32aff834f 100644 --- a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp +++ b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp @@ -9,16 +9,16 @@ #include #include -#include #include -#include -#include #include #include #include #include #include -#include +#include +#include +#include +#include #include #include #include @@ -114,6 +114,13 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::OsgCameraGroup::RealizeCallback) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgProducer::GraphicsContextImplementation >) + I_Constructor0(); + I_Constructor1(IN, osgProducer::GraphicsContextImplementation *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgProducer::GraphicsContextImplementation > &, rp); + I_Method0(osgProducer::GraphicsContextImplementation *, get); + I_Method0(bool, valid); + I_Method0(osgProducer::GraphicsContextImplementation *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgProducer::GraphicsContextImplementation > &, rp); I_Constructor0(); I_Constructor1(IN, osgProducer::GraphicsContextImplementation *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgProducer::GraphicsContextImplementation > &, rp); diff --git a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp b/src/osgWrappers/osgProducer/OsgSceneHandler.cpp index 3954742dd..10a052d41 100644 --- a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp +++ b/src/osgWrappers/osgProducer/OsgSceneHandler.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/src/osgWrappers/osgProducer/Viewer.cpp b/src/osgWrappers/osgProducer/Viewer.cpp index d36694195..a3f9cbfe5 100644 --- a/src/osgWrappers/osgProducer/Viewer.cpp +++ b/src/osgWrappers/osgProducer/Viewer.cpp @@ -9,13 +9,13 @@ #include #include -#include -#include #include #include #include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp b/src/osgWrappers/osgProducer/ViewerEventHandler.cpp index 775601689..da0cf467e 100644 --- a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp +++ b/src/osgWrappers/osgProducer/ViewerEventHandler.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/osgWrappers/osgSim/BlinkSequence.cpp b/src/osgWrappers/osgSim/BlinkSequence.cpp index 8b8bfb58c..da3c180de 100644 --- a/src/osgWrappers/osgSim/BlinkSequence.cpp +++ b/src/osgWrappers/osgSim/BlinkSequence.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgSim/ColorRange.cpp b/src/osgWrappers/osgSim/ColorRange.cpp index 5d6a43e34..ecfe0bbce 100644 --- a/src/osgWrappers/osgSim/ColorRange.cpp +++ b/src/osgWrappers/osgSim/ColorRange.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgSim/DOFTransform.cpp b/src/osgWrappers/osgSim/DOFTransform.cpp index 0f433ef91..eb9d6402d 100644 --- a/src/osgWrappers/osgSim/DOFTransform.cpp +++ b/src/osgWrappers/osgSim/DOFTransform.cpp @@ -9,11 +9,11 @@ #include #include -#include #include #include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgSim/Impostor.cpp b/src/osgWrappers/osgSim/Impostor.cpp index 0185f0a51..c6ea6e0af 100644 --- a/src/osgWrappers/osgSim/Impostor.cpp +++ b/src/osgWrappers/osgSim/Impostor.cpp @@ -10,10 +10,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include @@ -51,6 +51,13 @@ BEGIN_OBJECT_REFLECTOR(osgSim::Impostor) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgSim::ImpostorSprite >) + I_Constructor0(); + I_Constructor1(IN, osgSim::ImpostorSprite *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgSim::ImpostorSprite > &, rp); + I_Method0(osgSim::ImpostorSprite *, get); + I_Method0(bool, valid); + I_Method0(osgSim::ImpostorSprite *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgSim::ImpostorSprite > &, rp); I_Constructor0(); I_Constructor1(IN, osgSim::ImpostorSprite *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgSim::ImpostorSprite > &, rp); diff --git a/src/osgWrappers/osgSim/ImpostorSprite.cpp b/src/osgWrappers/osgSim/ImpostorSprite.cpp index e47e6c332..f3a33b18d 100644 --- a/src/osgWrappers/osgSim/ImpostorSprite.cpp +++ b/src/osgWrappers/osgSim/ImpostorSprite.cpp @@ -9,18 +9,18 @@ #include #include -#include -#include -#include -#include #include #include -#include -#include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/osgWrappers/osgSim/LightPoint.cpp b/src/osgWrappers/osgSim/LightPoint.cpp index fb5d4961e..29debc529 100644 --- a/src/osgWrappers/osgSim/LightPoint.cpp +++ b/src/osgWrappers/osgSim/LightPoint.cpp @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgSim/LightPointNode.cpp b/src/osgWrappers/osgSim/LightPointNode.cpp index 1e9e8feef..29d4d0e34 100644 --- a/src/osgWrappers/osgSim/LightPointNode.cpp +++ b/src/osgWrappers/osgSim/LightPointNode.cpp @@ -10,9 +10,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/osgWrappers/osgSim/LightPointSystem.cpp b/src/osgWrappers/osgSim/LightPointSystem.cpp index f559042cf..9bfbacd85 100644 --- a/src/osgWrappers/osgSim/LightPointSystem.cpp +++ b/src/osgWrappers/osgSim/LightPointSystem.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgSim/MultiSwitch.cpp b/src/osgWrappers/osgSim/MultiSwitch.cpp index a540c4067..829a2b948 100644 --- a/src/osgWrappers/osgSim/MultiSwitch.cpp +++ b/src/osgWrappers/osgSim/MultiSwitch.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -66,5 +66,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::MultiSwitch) I_IndexedProperty1(const osgSim::MultiSwitch::ValueList &, ValueList, unsigned int, switchSet); END_REFLECTOR +STD_VECTOR_REFLECTOR(std::vector< bool >); + STD_VECTOR_REFLECTOR(std::vector< osgSim::MultiSwitch::ValueList >); diff --git a/src/osgWrappers/osgSim/OverlayNode.cpp b/src/osgWrappers/osgSim/OverlayNode.cpp index e1677ae5e..60fb34d93 100644 --- a/src/osgWrappers/osgSim/OverlayNode.cpp +++ b/src/osgWrappers/osgSim/OverlayNode.cpp @@ -9,12 +9,12 @@ #include #include -#include -#include #include #include #include -#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgSim/ScalarBar.cpp b/src/osgWrappers/osgSim/ScalarBar.cpp index f83b2aca5..cca1e6590 100644 --- a/src/osgWrappers/osgSim/ScalarBar.cpp +++ b/src/osgWrappers/osgSim/ScalarBar.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include -#include +#include +#include #include #include diff --git a/src/osgWrappers/osgSim/ScalarsToColors.cpp b/src/osgWrappers/osgSim/ScalarsToColors.cpp index 2a3735a3d..1e7b24df6 100644 --- a/src/osgWrappers/osgSim/ScalarsToColors.cpp +++ b/src/osgWrappers/osgSim/ScalarsToColors.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgSim/Sector.cpp b/src/osgWrappers/osgSim/Sector.cpp index 160c93d0b..a7016fe4d 100644 --- a/src/osgWrappers/osgSim/Sector.cpp +++ b/src/osgWrappers/osgSim/Sector.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgSim/SphereSegment.cpp b/src/osgWrappers/osgSim/SphereSegment.cpp index b718d9713..8210de2b0 100644 --- a/src/osgWrappers/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/osgSim/SphereSegment.cpp @@ -10,14 +10,14 @@ #include #include -#include -#include #include #include #include #include -#include -#include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -87,6 +87,13 @@ BEGIN_OBJECT_REFLECTOR(osgSim::SphereSegment) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Vec3Array >) + I_Constructor0(); + I_Constructor1(IN, osg::Vec3Array *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::Vec3Array > &, rp); + I_Method0(osg::Vec3Array *, get); + I_Method0(bool, valid); + I_Method0(osg::Vec3Array *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::Vec3Array > &, rp); I_Constructor0(); I_Constructor1(IN, osg::Vec3Array *, ptr); I_Constructor1(IN, const osg::ref_ptr< osg::Vec3Array > &, rp); diff --git a/src/osgWrappers/osgSim/VisibilityGroup.cpp b/src/osgWrappers/osgSim/VisibilityGroup.cpp index 7728e478a..df8c30c51 100644 --- a/src/osgWrappers/osgSim/VisibilityGroup.cpp +++ b/src/osgWrappers/osgSim/VisibilityGroup.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgTerrain/DataSet.cpp b/src/osgWrappers/osgTerrain/DataSet.cpp index e8e2dde0a..b18753fbc 100644 --- a/src/osgWrappers/osgTerrain/DataSet.cpp +++ b/src/osgWrappers/osgTerrain/DataSet.cpp @@ -10,14 +10,14 @@ #include #include -#include #include #include #include -#include #include -#include -#include +#include +#include +#include +#include #include #include @@ -442,6 +442,13 @@ BEGIN_VALUE_REFLECTOR(osgTerrain::GeospatialExtents) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Image >) + I_Constructor0(); + I_Constructor1(IN, osg::Image *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::Image > &, rp); + I_Method0(osg::Image *, get); + I_Method0(bool, valid); + I_Method0(osg::Image *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::Image > &, rp); I_Constructor0(); I_Constructor1(IN, osg::Image *, ptr); I_Constructor1(IN, const osg::ref_ptr< osg::Image > &, rp); @@ -453,6 +460,13 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Image >) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::CompositeDestination >) + I_Constructor0(); + I_Constructor1(IN, osgTerrain::DataSet::CompositeDestination *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::CompositeDestination > &, rp); + I_Method0(osgTerrain::DataSet::CompositeDestination *, get); + I_Method0(bool, valid); + I_Method0(osgTerrain::DataSet::CompositeDestination *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgTerrain::DataSet::CompositeDestination > &, rp); I_Constructor0(); I_Constructor1(IN, osgTerrain::DataSet::CompositeDestination *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::CompositeDestination > &, rp); @@ -464,6 +478,13 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::CompositeDestination >) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::CompositeSource >) + I_Constructor0(); + I_Constructor1(IN, osgTerrain::DataSet::CompositeSource *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::CompositeSource > &, rp); + I_Method0(osgTerrain::DataSet::CompositeSource *, get); + I_Method0(bool, valid); + I_Method0(osgTerrain::DataSet::CompositeSource *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgTerrain::DataSet::CompositeSource > &, rp); I_Constructor0(); I_Constructor1(IN, osgTerrain::DataSet::CompositeSource *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::CompositeSource > &, rp); @@ -475,6 +496,13 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::CompositeSource >) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::DestinationTile >) + I_Constructor0(); + I_Constructor1(IN, osgTerrain::DataSet::DestinationTile *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::DestinationTile > &, rp); + I_Method0(osgTerrain::DataSet::DestinationTile *, get); + I_Method0(bool, valid); + I_Method0(osgTerrain::DataSet::DestinationTile *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgTerrain::DataSet::DestinationTile > &, rp); I_Constructor0(); I_Constructor1(IN, osgTerrain::DataSet::DestinationTile *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::DestinationTile > &, rp); @@ -486,6 +514,13 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::DestinationTile >) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::Source >) + I_Constructor0(); + I_Constructor1(IN, osgTerrain::DataSet::Source *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::Source > &, rp); + I_Method0(osgTerrain::DataSet::Source *, get); + I_Method0(bool, valid); + I_Method0(osgTerrain::DataSet::Source *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgTerrain::DataSet::Source > &, rp); I_Constructor0(); I_Constructor1(IN, osgTerrain::DataSet::Source *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::Source > &, rp); diff --git a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp b/src/osgWrappers/osgTerrain/HeightFieldNode.cpp index 341770a8f..446d1b34c 100644 --- a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp +++ b/src/osgWrappers/osgTerrain/HeightFieldNode.cpp @@ -9,11 +9,11 @@ #include #include -#include #include #include #include -#include +#include +#include #include #include diff --git a/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp b/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp index 1008201a1..7ed9eda29 100644 --- a/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp +++ b/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/osgWrappers/osgText/Font.cpp b/src/osgWrappers/osgText/Font.cpp index 402196bfa..82d8f4dfa 100644 --- a/src/osgWrappers/osgText/Font.cpp +++ b/src/osgWrappers/osgText/Font.cpp @@ -9,13 +9,12 @@ #include #include -#include #include -#include -#include #include -#include -#include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -124,7 +123,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font::Glyph) I_Property(const osg::Vec2 &, VerticalBearing); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font::GlyphTexture) +BEGIN_OBJECT_REFLECTOR(osgText::Font::GlyphTexture) I_BaseType(osg::Texture2D); I_Constructor0(); I_Method0(const char *, className); diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index af1caf4d1..59173ab28 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -9,16 +9,16 @@ #include #include -#include -#include -#include #include -#include -#include -#include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -249,3 +249,5 @@ STD_MAP_REFLECTOR(std::map< osg::ref_ptr< osg::StateSet > COMMA osgText::Text:: STD_VECTOR_REFLECTOR(std::vector< osgText::Font::Glyph * >); +STD_VECTOR_REFLECTOR(std::vector< unsigned int >); + diff --git a/src/osgWrappers/osgUtil/CubeMapGenerator.cpp b/src/osgWrappers/osgUtil/CubeMapGenerator.cpp index 1727c9eb5..94a72ebf4 100644 --- a/src/osgWrappers/osgUtil/CubeMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/CubeMapGenerator.cpp @@ -9,9 +9,9 @@ #include #include -#include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index d7ae64bbd..30841416c 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -9,12 +9,6 @@ #include #include -#include -#include -#include -#include -#include -#include #include #include #include @@ -25,14 +19,20 @@ #include #include #include -#include -#include -#include #include #include -#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp index 761ea8f9f..ece6fce0e 100644 --- a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -64,6 +64,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayTriangulator) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::DelaunayConstraint >) + I_Constructor0(); + I_Constructor1(IN, osgUtil::DelaunayConstraint *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgUtil::DelaunayConstraint > &, rp); + I_Method0(osgUtil::DelaunayConstraint *, get); + I_Method0(bool, valid); + I_Method0(osgUtil::DelaunayConstraint *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgUtil::DelaunayConstraint > &, rp); I_Constructor0(); I_Constructor1(IN, osgUtil::DelaunayConstraint *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgUtil::DelaunayConstraint > &, rp); diff --git a/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp b/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp index 83b5743f8..bdc05e3e1 100644 --- a/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp +++ b/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index 69f0a697d..ec67a9545 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -9,11 +9,11 @@ #include #include -#include #include #include -#include #include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp index 6029a8570..9648521ef 100644 --- a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp index 03dd9ec38..6df50ad06 100644 --- a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/IntersectVisitor.cpp b/src/osgWrappers/osgUtil/IntersectVisitor.cpp index e245585e2..3694be455 100644 --- a/src/osgWrappers/osgUtil/IntersectVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectVisitor.cpp @@ -9,9 +9,6 @@ #include #include -#include -#include -#include #include #include #include @@ -19,11 +16,14 @@ #include #include #include -#include #include #include -#include -#include +#include +#include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp index d4433d53f..e8dd1e546 100644 --- a/src/osgWrappers/osgUtil/Optimizer.cpp +++ b/src/osgWrappers/osgUtil/Optimizer.cpp @@ -9,19 +9,19 @@ #include #include -#include -#include #include #include #include #include #include #include -#include -#include #include -#include #include +#include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/PositionalStateContainer.cpp b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp index 04dd937ab..9ad166328 100644 --- a/src/osgWrappers/osgUtil/PositionalStateContainer.cpp +++ b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp @@ -9,11 +9,11 @@ #include #include -#include #include #include -#include -#include +#include +#include +#include #include #include @@ -46,6 +46,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::PositionalStateContainer) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::RefMatrix >) + I_Constructor0(); + I_Constructor1(IN, osg::RefMatrix *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osg::RefMatrix > &, rp); + I_Method0(osg::RefMatrix *, get); + I_Method0(bool, valid); + I_Method0(osg::RefMatrix *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osg::RefMatrix > &, rp); I_Constructor0(); I_Constructor1(IN, osg::RefMatrix *, ptr); I_Constructor1(IN, const osg::ref_ptr< osg::RefMatrix > &, rp); diff --git a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp index b7386860e..aca22c64e 100644 --- a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/RenderBin.cpp b/src/osgWrappers/osgUtil/RenderBin.cpp index e830f315a..73f0774ae 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -9,10 +9,10 @@ #include #include -#include #include -#include #include +#include +#include #include #include #include @@ -114,6 +114,13 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::RenderBin::SortCallback) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderBin >) + I_Constructor0(); + I_Constructor1(IN, osgUtil::RenderBin *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgUtil::RenderBin > &, rp); + I_Method0(osgUtil::RenderBin *, get); + I_Method0(bool, valid); + I_Method0(osgUtil::RenderBin *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgUtil::RenderBin > &, rp); I_Constructor0(); I_Constructor1(IN, osgUtil::RenderBin *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgUtil::RenderBin > &, rp); diff --git a/src/osgWrappers/osgUtil/RenderLeaf.cpp b/src/osgWrappers/osgUtil/RenderLeaf.cpp index 574257921..24886cf7c 100644 --- a/src/osgWrappers/osgUtil/RenderLeaf.cpp +++ b/src/osgWrappers/osgUtil/RenderLeaf.cpp @@ -9,9 +9,9 @@ #include #include -#include #include -#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index 34c9a8d60..459671349 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -9,19 +9,19 @@ #include #include -#include -#include -#include #include #include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index 26dc32202..4147fc607 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -9,20 +9,20 @@ #include #include -#include -#include -#include #include #include #include #include #include #include -#include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/osgWrappers/osgUtil/StateGraph.cpp b/src/osgWrappers/osgUtil/StateGraph.cpp index da3debdd8..9c527b5a8 100644 --- a/src/osgWrappers/osgUtil/StateGraph.cpp +++ b/src/osgWrappers/osgUtil/StateGraph.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include #include @@ -54,6 +54,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::StateGraph) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderLeaf >) + I_Constructor0(); + I_Constructor1(IN, osgUtil::RenderLeaf *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgUtil::RenderLeaf > &, rp); + I_Method0(osgUtil::RenderLeaf *, get); + I_Method0(bool, valid); + I_Method0(osgUtil::RenderLeaf *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgUtil::RenderLeaf > &, rp); I_Constructor0(); I_Constructor1(IN, osgUtil::RenderLeaf *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgUtil::RenderLeaf > &, rp); @@ -65,6 +72,13 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderLeaf >) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::StateGraph >) + I_Constructor0(); + I_Constructor1(IN, osgUtil::StateGraph *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgUtil::StateGraph > &, rp); + I_Method0(osgUtil::StateGraph *, get); + I_Method0(bool, valid); + I_Method0(osgUtil::StateGraph *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgUtil::StateGraph > &, rp); I_Constructor0(); I_Constructor1(IN, osgUtil::StateGraph *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgUtil::StateGraph > &, rp); diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index 4a37a9932..76f9d51fd 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -9,15 +9,15 @@ #include #include -#include #include #include #include #include #include -#include -#include -#include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp index b05bf4891..ff191d8d1 100644 --- a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp +++ b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp @@ -10,8 +10,9 @@ #include #include -#include #include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/Tesselator.cpp b/src/osgWrappers/osgUtil/Tesselator.cpp index 73315c900..53e89ced5 100644 --- a/src/osgWrappers/osgUtil/Tesselator.cpp +++ b/src/osgWrappers/osgUtil/Tesselator.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -74,6 +74,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Tesselator::Prim) END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::Tesselator::Prim >) + I_Constructor0(); + I_Constructor1(IN, osgUtil::Tesselator::Prim *, ptr); + I_Constructor1(IN, const osg::ref_ptr< osgUtil::Tesselator::Prim > &, rp); + I_Method0(osgUtil::Tesselator::Prim *, get); + I_Method0(bool, valid); + I_Method0(osgUtil::Tesselator::Prim *, release); + I_Method1(void, swap, IN, osg::ref_ptr< osgUtil::Tesselator::Prim > &, rp); I_Constructor0(); I_Constructor1(IN, osgUtil::Tesselator::Prim *, ptr); I_Constructor1(IN, const osg::ref_ptr< osgUtil::Tesselator::Prim > &, rp); diff --git a/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp b/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp index 992e8db10..9d2d37795 100644 --- a/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp +++ b/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/TransformCallback.cpp b/src/osgWrappers/osgUtil/TransformCallback.cpp index 2a88eba78..560d4670c 100644 --- a/src/osgWrappers/osgUtil/TransformCallback.cpp +++ b/src/osgWrappers/osgUtil/TransformCallback.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include // Must undefine IN and OUT macros defined in Windows headers diff --git a/src/osgWrappers/osgUtil/UpdateVisitor.cpp b/src/osgWrappers/osgUtil/UpdateVisitor.cpp index 32718323e..23b62f544 100644 --- a/src/osgWrappers/osgUtil/UpdateVisitor.cpp +++ b/src/osgWrappers/osgUtil/UpdateVisitor.cpp @@ -9,16 +9,16 @@ #include #include -#include #include #include #include #include #include #include -#include #include #include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers