From 74bce0e41004af3e7f31a2dc4285794d0893a856 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 16 May 2005 09:41:10 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/AlphaFunc.cpp | 66 +- src/osgWrappers/osg/AnimationPath.cpp | 174 ++--- src/osgWrappers/osg/ApplicationUsage.cpp | 82 ++- src/osgWrappers/osg/ArgumentParser.cpp | 120 +-- src/osgWrappers/osg/Array.cpp | 602 +++++++-------- src/osgWrappers/osg/AutoTransform.cpp | 84 ++- src/osgWrappers/osg/Billboard.cpp | 74 +- src/osgWrappers/osg/BlendColor.cpp | 64 +- src/osgWrappers/osg/BlendEquation.cpp | 82 ++- src/osgWrappers/osg/BlendFunc.cpp | 80 +- src/osgWrappers/osg/BoundingBox.cpp | 68 +- src/osgWrappers/osg/BoundingSphere.cpp | 48 +- src/osgWrappers/osg/BufferObject.cpp | 108 +-- src/osgWrappers/osg/ClearNode.cpp | 38 +- src/osgWrappers/osg/ClipNode.cpp | 76 +- src/osgWrappers/osg/ClipPlane.cpp | 60 +- .../osg/ClusterCullingCallback.cpp | 62 +- .../osg/CollectOccludersVisitor.cpp | 66 +- src/osgWrappers/osg/ColorMask.cpp | 60 +- src/osgWrappers/osg/ColorMatrix.cpp | 40 +- src/osgWrappers/osg/ConvexPlanarOccluder.cpp | 42 +- src/osgWrappers/osg/ConvexPlanarPolygon.cpp | 20 +- src/osgWrappers/osg/CoordinateSystemNode.cpp | 96 +-- src/osgWrappers/osg/CopyOp.cpp | 36 +- src/osgWrappers/osg/CullFace.cpp | 46 +- src/osgWrappers/osg/CullSettings.cpp | 178 ++--- src/osgWrappers/osg/CullStack.cpp | 8 + src/osgWrappers/osg/CullingSet.cpp | 92 +-- src/osgWrappers/osg/Depth.cpp | 76 +- src/osgWrappers/osg/DisplaySettings.cpp | 172 ++--- src/osgWrappers/osg/DrawPixels.cpp | 54 +- src/osgWrappers/osg/Drawable.cpp | 470 ++++++------ src/osgWrappers/osg/Fog.cpp | 80 +- src/osgWrappers/osg/FragmentProgram.cpp | 98 +-- src/osgWrappers/osg/FrameStamp.cpp | 34 +- src/osgWrappers/osg/FrontFace.cpp | 42 +- src/osgWrappers/osg/Geode.cpp | 78 +- src/osgWrappers/osg/Geometry.cpp | 376 +++++----- src/osgWrappers/osg/Group.cpp | 78 +- src/osgWrappers/osg/Image.cpp | 154 ++-- src/osgWrappers/osg/ImageStream.cpp | 70 +- src/osgWrappers/osg/LOD.cpp | 82 ++- src/osgWrappers/osg/Light.cpp | 106 +-- src/osgWrappers/osg/LightModel.cpp | 60 +- src/osgWrappers/osg/LightSource.cpp | 52 +- src/osgWrappers/osg/LineSegment.cpp | 42 +- src/osgWrappers/osg/LineStipple.cpp | 46 +- src/osgWrappers/osg/LineWidth.cpp | 38 +- src/osgWrappers/osg/LogicOp.cpp | 74 +- src/osgWrappers/osg/Material.cpp | 112 +-- src/osgWrappers/osg/Matrix.cpp | 8 + src/osgWrappers/osg/MatrixTransform.cpp | 50 +- src/osgWrappers/osg/Matrixd.cpp | 166 +++-- src/osgWrappers/osg/Matrixf.cpp | 166 +++-- src/osgWrappers/osg/Multisample.cpp | 88 ++- src/osgWrappers/osg/Node.cpp | 180 ++--- src/osgWrappers/osg/NodeCallback.cpp | 38 +- src/osgWrappers/osg/NodeVisitor.cpp | 156 ++-- src/osgWrappers/osg/Object.cpp | 44 +- src/osgWrappers/osg/OccluderNode.cpp | 36 +- src/osgWrappers/osg/PagedLOD.cpp | 92 +-- src/osgWrappers/osg/Plane.cpp | 70 +- src/osgWrappers/osg/Point.cpp | 86 ++- src/osgWrappers/osg/PointSprite.cpp | 36 +- src/osgWrappers/osg/PolygonMode.cpp | 54 +- src/osgWrappers/osg/PolygonOffset.cpp | 48 +- src/osgWrappers/osg/PolygonStipple.cpp | 40 +- src/osgWrappers/osg/Polytope.cpp | 106 +-- .../osg/PositionAttitudeTransform.cpp | 58 +- src/osgWrappers/osg/PrimitiveSet.cpp | 360 ++++----- src/osgWrappers/osg/Program.cpp | 112 +-- src/osgWrappers/osg/Projection.cpp | 38 +- src/osgWrappers/osg/ProxyNode.cpp | 72 +- src/osgWrappers/osg/Quat.cpp | 98 +-- src/osgWrappers/osg/RefNodePath.cpp | 16 +- src/osgWrappers/osg/Referenced.cpp | 34 +- src/osgWrappers/osg/Sequence.cpp | 66 +- src/osgWrappers/osg/ShadeModel.cpp | 42 +- src/osgWrappers/osg/Shader.cpp | 68 +- src/osgWrappers/osg/ShadowVolumeOccluder.cpp | 54 +- src/osgWrappers/osg/Shape.cpp | 552 +++++++------- src/osgWrappers/osg/ShapeDrawable.cpp | 134 ++-- src/osgWrappers/osg/State.cpp | 246 ++++--- src/osgWrappers/osg/StateAttribute.cpp | 200 ++--- src/osgWrappers/osg/StateSet.cpp | 276 +++---- src/osgWrappers/osg/Stencil.cpp | 108 +-- src/osgWrappers/osg/Switch.cpp | 72 +- src/osgWrappers/osg/TexEnv.cpp | 58 +- src/osgWrappers/osg/TexEnvCombine.cpp | 190 ++--- src/osgWrappers/osg/TexEnvFilter.cpp | 40 +- src/osgWrappers/osg/TexGen.cpp | 72 +- src/osgWrappers/osg/TexGenNode.cpp | 42 +- src/osgWrappers/osg/TexMat.cpp | 42 +- src/osgWrappers/osg/Texture.cpp | 354 ++++----- src/osgWrappers/osg/Texture1D.cpp | 84 ++- src/osgWrappers/osg/Texture2D.cpp | 94 +-- src/osgWrappers/osg/Texture3D.cpp | 150 ++-- src/osgWrappers/osg/TextureCubeMap.cpp | 102 +-- src/osgWrappers/osg/TextureRectangle.cpp | 78 +- src/osgWrappers/osg/Timer.cpp | 24 +- src/osgWrappers/osg/Transform.cpp | 54 +- src/osgWrappers/osg/UByte4.cpp | 34 +- src/osgWrappers/osg/Uniform.cpp | 232 +++--- src/osgWrappers/osg/Vec2.cpp | 8 + src/osgWrappers/osg/Vec2d.cpp | 42 +- src/osgWrappers/osg/Vec2f.cpp | 40 +- src/osgWrappers/osg/Vec3.cpp | 8 + src/osgWrappers/osg/Vec3d.cpp | 52 +- src/osgWrappers/osg/Vec3f.cpp | 50 +- src/osgWrappers/osg/Vec4.cpp | 8 + src/osgWrappers/osg/Vec4d.cpp | 72 +- src/osgWrappers/osg/Vec4f.cpp | 70 +- src/osgWrappers/osg/VertexProgram.cpp | 98 +-- src/osgWrappers/osg/Viewport.cpp | 52 +- src/osgWrappers/osgDB/Archive.cpp | 44 +- src/osgWrappers/osgDB/DatabasePager.cpp | 166 +++-- src/osgWrappers/osgDB/DotOsgWrapper.cpp | 48 +- src/osgWrappers/osgDB/DynamicLibrary.cpp | 24 +- src/osgWrappers/osgDB/Field.cpp | 100 +-- src/osgWrappers/osgDB/FieldReader.cpp | 26 +- src/osgWrappers/osgDB/FieldReaderIterator.cpp | 78 +- src/osgWrappers/osgDB/FileUtils.cpp | 19 + src/osgWrappers/osgDB/ImageOptions.cpp | 58 +- src/osgWrappers/osgDB/Input.cpp | 46 +- src/osgWrappers/osgDB/Output.cpp | 45 +- src/osgWrappers/osgDB/ParameterOutput.cpp | 18 +- src/osgWrappers/osgDB/ReaderWriter.cpp | 218 +++--- src/osgWrappers/osgDB/ReentrantMutex.cpp | 18 +- src/osgWrappers/osgDB/Registry.cpp | 224 +++--- src/osgWrappers/osgDB/SharedStateManager.cpp | 36 +- src/osgWrappers/osgFX/AnisotropicLighting.cpp | 46 +- src/osgWrappers/osgFX/BumpMapping.cpp | 74 +- src/osgWrappers/osgFX/Cartoon.cpp | 50 +- src/osgWrappers/osgFX/Effect.cpp | 54 +- src/osgWrappers/osgFX/MultiTextureControl.cpp | 34 +- src/osgWrappers/osgFX/Registry.cpp | 30 +- src/osgWrappers/osgFX/Scribe.cpp | 44 +- src/osgWrappers/osgFX/SpecularHighlights.cpp | 56 +- src/osgWrappers/osgFX/Technique.cpp | 30 +- src/osgWrappers/osgFX/Validator.cpp | 38 +- .../osgGA/AnimationPathManipulator.cpp | 60 +- src/osgWrappers/osgGA/DriveManipulator.cpp | 48 +- src/osgWrappers/osgGA/EventVisitor.cpp | 74 +- src/osgWrappers/osgGA/FlightManipulator.cpp | 54 +- src/osgWrappers/osgGA/GUIActionAdapter.cpp | 16 +- src/osgWrappers/osgGA/GUIEventAdapter.cpp | 380 +++++----- src/osgWrappers/osgGA/GUIEventHandler.cpp | 98 +-- .../osgGA/GUIEventHandlerVisitor.cpp | 24 +- .../osgGA/KeySwitchMatrixManipulator.cpp | 116 +-- src/osgWrappers/osgGA/MatrixManipulator.cpp | 100 +-- .../osgGA/NodeTrackerManipulator.cpp | 98 +-- src/osgWrappers/osgGA/SetSceneViewVisitor.cpp | 18 +- src/osgWrappers/osgGA/StateSetManipulator.cpp | 30 +- src/osgWrappers/osgGA/TerrainManipulator.cpp | 64 +- .../osgGA/TrackballManipulator.cpp | 68 +- src/osgWrappers/osgGA/UFOManipulator.cpp | 58 +- src/osgWrappers/osgParticle/AccelOperator.cpp | 38 +- .../osgParticle/AngularAccelOperator.cpp | 34 +- .../osgParticle/CenteredPlacer.cpp | 28 +- src/osgWrappers/osgParticle/Counter.cpp | 22 +- src/osgWrappers/osgParticle/Emitter.cpp | 34 +- .../osgParticle/ExplosionDebriEffect.cpp | 44 +- .../osgParticle/ExplosionEffect.cpp | 44 +- src/osgWrappers/osgParticle/FireEffect.cpp | 44 +- .../osgParticle/FluidFrictionOperator.cpp | 56 +- src/osgWrappers/osgParticle/FluidProgram.cpp | 58 +- src/osgWrappers/osgParticle/ForceOperator.cpp | 34 +- src/osgWrappers/osgParticle/Interpolator.cpp | 28 +- .../osgParticle/LinearInterpolator.cpp | 26 +- .../osgParticle/ModularEmitter.cpp | 50 +- .../osgParticle/ModularProgram.cpp | 36 +- .../osgParticle/MultiSegmentPlacer.cpp | 42 +- src/osgWrappers/osgParticle/Operator.cpp | 32 +- src/osgWrappers/osgParticle/Particle.cpp | 146 ++-- .../osgParticle/ParticleEffect.cpp | 110 +-- .../osgParticle/ParticleProcessor.cpp | 98 +-- .../osgParticle/ParticleSystem.cpp | 112 +-- .../osgParticle/ParticleSystemUpdater.cpp | 52 +- src/osgWrappers/osgParticle/Placer.cpp | 22 +- src/osgWrappers/osgParticle/PointPlacer.cpp | 26 +- src/osgWrappers/osgParticle/Program.cpp | 22 +- src/osgWrappers/osgParticle/RadialShooter.cpp | 58 +- .../osgParticle/RandomRateCounter.cpp | 26 +- src/osgWrappers/osgParticle/SectorPlacer.cpp | 42 +- src/osgWrappers/osgParticle/SegmentPlacer.cpp | 44 +- src/osgWrappers/osgParticle/Shooter.cpp | 22 +- src/osgWrappers/osgParticle/SmokeEffect.cpp | 44 +- .../osgParticle/VariableRateCounter.cpp | 28 +- src/osgWrappers/osgParticle/range.cpp | 64 +- src/osgWrappers/osgProducer/EventAdapter.cpp | 78 +- .../osgProducer/KeyboardMouseCallback.cpp | 88 ++- .../osgProducer/OsgCameraGroup.cpp | 140 ++-- .../osgProducer/OsgSceneHandler.cpp | 70 +- src/osgWrappers/osgProducer/Viewer.cpp | 223 +++--- .../osgProducer/ViewerEventHandler.cpp | 60 +- src/osgWrappers/osgSim/BlinkSequence.cpp | 74 +- src/osgWrappers/osgSim/ColorRange.cpp | 24 +- src/osgWrappers/osgSim/DOFTransform.cpp | 154 ++-- src/osgWrappers/osgSim/GeographicLocation.cpp | 34 +- src/osgWrappers/osgSim/Impostor.cpp | 66 +- src/osgWrappers/osgSim/ImpostorSprite.cpp | 110 +-- .../osgSim/InsertImpostorsVisitor.cpp | 36 +- src/osgWrappers/osgSim/LightPoint.cpp | 20 +- src/osgWrappers/osgSim/LightPointNode.cpp | 74 +- src/osgWrappers/osgSim/LightPointSystem.cpp | 42 +- src/osgWrappers/osgSim/MultiSwitch.cpp | 80 +- src/osgWrappers/osgSim/ScalarBar.cpp | 104 +-- src/osgWrappers/osgSim/ScalarsToColors.cpp | 24 +- src/osgWrappers/osgSim/Sector.cpp | 192 ++--- src/osgWrappers/osgSim/SphereSegment.cpp | 102 +-- src/osgWrappers/osgSim/VisibilityGroup.cpp | 48 +- src/osgWrappers/osgTerrain/DataSet.cpp | 684 +++++++++--------- .../osgTerrain/HeightFieldNode.cpp | 80 +- .../osgTerrain/HeightFieldRenderer.cpp | 28 +- src/osgWrappers/osgText/Export.cpp | 8 + src/osgWrappers/osgText/Font.cpp | 212 +++--- src/osgWrappers/osgText/String.cpp | 52 +- src/osgWrappers/osgText/Text.cpp | 248 ++++--- src/osgWrappers/osgUtil/CubeMapGenerator.cpp | 20 +- src/osgWrappers/osgUtil/CullVisitor.cpp | 130 ++-- .../osgUtil/DelaunayTriangulator.cpp | 40 +- .../osgUtil/DisplayRequirementsVisitor.cpp | 26 +- src/osgWrappers/osgUtil/GLObjectsVisitor.cpp | 50 +- .../osgUtil/HalfWayMapGenerator.cpp | 14 +- .../osgUtil/HighlightMapGenerator.cpp | 14 +- src/osgWrappers/osgUtil/IntersectVisitor.cpp | 122 ++-- src/osgWrappers/osgUtil/Optimizer.cpp | 260 +++---- .../osgUtil/ReflectionMapGenerator.cpp | 14 +- src/osgWrappers/osgUtil/RenderBin.cpp | 144 ++-- src/osgWrappers/osgUtil/RenderGraph.cpp | 88 ++- src/osgWrappers/osgUtil/RenderLeaf.cpp | 20 +- src/osgWrappers/osgUtil/RenderStage.cpp | 90 +-- .../osgUtil/RenderStageLighting.cpp | 60 +- .../osgUtil/RenderToTextureStage.cpp | 50 +- src/osgWrappers/osgUtil/SceneView.cpp | 344 ++++----- src/osgWrappers/osgUtil/Simplifier.cpp | 50 +- src/osgWrappers/osgUtil/SmoothingVisitor.cpp | 16 +- src/osgWrappers/osgUtil/Statistics.cpp | 94 +-- .../osgUtil/TangentSpaceGenerator.cpp | 44 +- src/osgWrappers/osgUtil/Tesselator.cpp | 94 +-- .../osgUtil/TransformAttributeFunctor.cpp | 16 +- src/osgWrappers/osgUtil/TransformCallback.cpp | 18 +- src/osgWrappers/osgUtil/TriStripVisitor.cpp | 42 +- src/osgWrappers/osgUtil/UpdateVisitor.cpp | 36 +- 244 files changed, 11323 insertions(+), 9410 deletions(-) diff --git a/src/osgWrappers/osg/AlphaFunc.cpp b/src/osgWrappers/osg/AlphaFunc.cpp index 70fc1a547..7145be201 100644 --- a/src/osgWrappers/osg/AlphaFunc.cpp +++ b/src/osgWrappers/osg/AlphaFunc.cpp @@ -15,38 +15,46 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::AlphaFunc::ComparisonFunction) - EnumLabel(osg::AlphaFunc::NEVER); - EnumLabel(osg::AlphaFunc::LESS); - EnumLabel(osg::AlphaFunc::EQUAL); - EnumLabel(osg::AlphaFunc::LEQUAL); - EnumLabel(osg::AlphaFunc::GREATER); - EnumLabel(osg::AlphaFunc::NOTEQUAL); - EnumLabel(osg::AlphaFunc::GEQUAL); - EnumLabel(osg::AlphaFunc::ALWAYS); + 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) - BaseType(osg::StateAttribute); - Constructor0(); - Constructor2(IN, osg::AlphaFunc::ComparisonFunction, func, IN, float, ref); - ConstructorWithDefaults2(IN, const osg::AlphaFunc &, af, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method2(void, setFunction, IN, osg::AlphaFunc::ComparisonFunction, func, IN, float, ref); - Method1(void, setFunction, IN, osg::AlphaFunc::ComparisonFunction, func); - Method0(osg::AlphaFunc::ComparisonFunction, getFunction); - Method1(void, setReferenceValue, IN, float, value); - Method0(float, getReferenceValue); - Method1(void, apply, IN, osg::State &, state); - Property(osg::AlphaFunc::ComparisonFunction, Function); - Property(float, ReferenceValue); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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 94e2853ff..adc7e1192 100644 --- a/src/osgWrappers/osg/AnimationPath.cpp +++ b/src/osgWrappers/osg/AnimationPath.cpp @@ -19,101 +19,109 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::map< double COMMA osg::AnimationPath::ControlPoint >, osg::AnimationPath::TimeControlPointMap); BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode) - EnumLabel(osg::AnimationPath::SWING); - EnumLabel(osg::AnimationPath::LOOP); - EnumLabel(osg::AnimationPath::NO_LOOPING); + I_EnumLabel(osg::AnimationPath::SWING); + I_EnumLabel(osg::AnimationPath::LOOP); + I_EnumLabel(osg::AnimationPath::NO_LOOPING); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::AnimationPath) - VirtualBaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::AnimationPath &, ap, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method2(bool, getMatrix, IN, double, time, IN, osg::Matrixf &, matrix); - Method2(bool, getMatrix, IN, double, time, IN, osg::Matrixd &, matrix); - Method2(bool, getInverse, IN, double, time, IN, osg::Matrixf &, matrix); - Method2(bool, getInverse, IN, double, time, IN, osg::Matrixd &, matrix); - Method2(bool, getInterpolatedControlPoint, IN, double, time, IN, osg::AnimationPath::ControlPoint &, controlPoint); - Method2(void, insert, IN, double, time, IN, const osg::AnimationPath::ControlPoint &, controlPoint); - Method0(double, getFirstTime); - Method0(double, getLastTime); - Method0(double, getPeriod); - Method1(void, setLoopMode, IN, osg::AnimationPath::LoopMode, lm); - Method0(osg::AnimationPath::LoopMode, getLoopMode); - Method1(void, setTimeControlPointMap, IN, osg::AnimationPath::TimeControlPointMap &, tcpm); - Method0(osg::AnimationPath::TimeControlPointMap &, getTimeControlPointMap); - Method0(const osg::AnimationPath::TimeControlPointMap &, getTimeControlPointMap); - Method0(bool, empty); - Method1(void, read, IN, std::istream &, in); - Method1(void, write, IN, std::ostream &, out); - ReadOnlyProperty(double, FirstTime); - ReadOnlyProperty(double, LastTime); - Property(osg::AnimationPath::LoopMode, LoopMode); - ReadOnlyProperty(double, Period); - Property(osg::AnimationPath::TimeControlPointMap &, TimeControlPointMap); + 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); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::AnimationPath::ControlPoint) - Constructor0(); - Constructor1(IN, const osg::Vec3d &, position); - Constructor2(IN, const osg::Vec3d &, position, IN, const osg::Quat &, rotation); - Constructor3(IN, const osg::Vec3d &, position, IN, const osg::Quat &, rotation, IN, const osg::Vec3d &, scale); - Method1(void, setPosition, IN, const osg::Vec3d &, position); - Method0(const osg::Vec3d &, getPosition); - Method1(void, setRotation, IN, const osg::Quat &, rotation); - Method0(const osg::Quat &, getRotation); - Method1(void, setScale, IN, const osg::Vec3d &, scale); - Method0(const osg::Vec3d &, getScale); - Method3(void, interpolate, IN, float, ratio, IN, const osg::AnimationPath::ControlPoint &, first, IN, const osg::AnimationPath::ControlPoint &, second); - Method1(void, getMatrix, IN, osg::Matrixf &, matrix); - Method1(void, getMatrix, IN, osg::Matrixd &, matrix); - Method1(void, getInverse, IN, osg::Matrixf &, matrix); - Method1(void, getInverse, IN, osg::Matrixd &, matrix); - Property(const osg::Vec3d &, Position); - Property(const osg::Quat &, Rotation); - Property(const osg::Vec3d &, Scale); + 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_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) - BaseType(osg::NodeCallback); - Constructor0(); - Constructor2(IN, const osg::AnimationPathCallback &, apc, IN, const osg::CopyOp &, copyop); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - ConstructorWithDefaults3(IN, osg::AnimationPath *, ap, , IN, double, timeOffset, 0.0, IN, double, timeMultiplier, 1.0); - Method1(void, setAnimationPath, IN, osg::AnimationPath *, path); - Method0(osg::AnimationPath *, getAnimationPath); - Method0(const osg::AnimationPath *, getAnimationPath); - Method1(void, setPivotPoint, IN, const osg::Vec3d &, pivot); - Method0(const osg::Vec3d &, getPivotPoint); - Method1(void, setUseInverseMatrix, IN, bool, useInverseMatrix); - Method0(bool, getUseInverseMatrix); - Method1(void, setTimeOffset, IN, double, offset); - Method0(double, getTimeOffset); - Method1(void, setTimeMultiplier, IN, double, multiplier); - Method0(double, getTimeMultiplier); - Method0(void, reset); - Method1(void, setPause, IN, bool, pause); - Method0(bool, getPause); - Method0(double, getAnimationTime); - Method1(void, update, IN, osg::Node &, node); - Property(osg::AnimationPath *, AnimationPath); - ReadOnlyProperty(double, AnimationTime); - Property(bool, Pause); - Property(const osg::Vec3d &, PivotPoint); - Property(double, TimeMultiplier); - Property(double, TimeOffset); - Property(bool, UseInverseMatrix); + I_BaseType(osg::NodeCallback); + 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_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 205c76405..1dc2f9319 100644 --- a/src/osgWrappers/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/osg/ApplicationUsage.cpp @@ -11,52 +11,60 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::map< std::string COMMA std::string >, osg::ApplicationUsage::UsageMap); BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type) - EnumLabel(osg::ApplicationUsage::COMMAND_LINE_OPTION); - EnumLabel(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE); - EnumLabel(osg::ApplicationUsage::KEYBOARD_MOUSE_BINDING); + I_EnumLabel(osg::ApplicationUsage::COMMAND_LINE_OPTION); + I_EnumLabel(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE); + I_EnumLabel(osg::ApplicationUsage::KEYBOARD_MOUSE_BINDING); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ApplicationUsage) - Constructor0(); - Constructor1(IN, const std::string &, commandLineUsage); - Method1(void, setApplicationName, IN, const std::string &, name); - Method0(const std::string &, getApplicationName); - Method1(void, setDescription, IN, const std::string &, desc); - Method0(const std::string &, getDescription); - Method3(void, addUsageExplanation, IN, osg::ApplicationUsage::Type, type, IN, const std::string &, option, IN, const std::string &, explanation); - Method1(void, setCommandLineUsage, IN, const std::string &, explanation); - Method0(const std::string &, getCommandLineUsage); - MethodWithDefaults3(void, addCommandLineOption, IN, const std::string &, option, , IN, const std::string &, explanation, , IN, const std::string &, defaultValue, ""); - Method1(void, setCommandLineOptions, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - Method0(const osg::ApplicationUsage::UsageMap &, getCommandLineOptions); - Method1(void, setCommandLineOptionsDefaults, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - Method0(const osg::ApplicationUsage::UsageMap &, getCommandLineOptionsDefaults); - MethodWithDefaults3(void, addEnvironmentalVariable, IN, const std::string &, option, , IN, const std::string &, explanation, , IN, const std::string &, defaultValue, ""); - Method1(void, setEnvironmentalVariables, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - Method0(const osg::ApplicationUsage::UsageMap &, getEnvironmentalVariables); - Method1(void, setEnvironmentalVariablesDefaults, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - Method0(const osg::ApplicationUsage::UsageMap &, getEnvironmentalVariablesDefaults); - Method2(void, addKeyboardMouseBinding, IN, const std::string &, option, IN, const std::string &, explanation); - Method1(void, setKeyboardMouseBindings, IN, const osg::ApplicationUsage::UsageMap &, usageMap); - Method0(const osg::ApplicationUsage::UsageMap &, getKeyboardMouseBindings); - 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()); - 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()); - 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); - Property(const std::string &, ApplicationName); - Property(const osg::ApplicationUsage::UsageMap &, CommandLineOptions); - Property(const osg::ApplicationUsage::UsageMap &, CommandLineOptionsDefaults); - Property(const std::string &, CommandLineUsage); - Property(const std::string &, Description); - Property(const osg::ApplicationUsage::UsageMap &, EnvironmentalVariables); - Property(const osg::ApplicationUsage::UsageMap &, EnvironmentalVariablesDefaults); - Property(const osg::ApplicationUsage::UsageMap &, KeyboardMouseBindings); + 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_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 BEGIN_VALUE_REFLECTOR(osg::ApplicationUsageProxy) - Constructor3(IN, osg::ApplicationUsage::Type, type, IN, const std::string &, option, IN, const std::string &, explanation); + I_Constructor3(IN, osg::ApplicationUsage::Type, type, IN, const std::string &, option, IN, const std::string &, explanation); 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 e2945a74a..6634146d8 100644 --- a/src/osgWrappers/osg/ArgumentParser.cpp +++ b/src/osgWrappers/osg/ArgumentParser.cpp @@ -12,74 +12,82 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ArgumentParser::ErrorSeverity >, osg::ArgumentParser::ErrorMessageMap); BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::ErrorSeverity) - EnumLabel(osg::ArgumentParser::BENIGN); - EnumLabel(osg::ArgumentParser::CRITICAL); + I_EnumLabel(osg::ArgumentParser::BENIGN); + I_EnumLabel(osg::ArgumentParser::CRITICAL); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ArgumentParser) - Constructor2(IN, int *, argc, IN, char **, argv); - Method1(void, setApplicationUsage, IN, osg::ApplicationUsage *, usage); - Method0(osg::ApplicationUsage *, getApplicationUsage); - Method0(const osg::ApplicationUsage *, getApplicationUsage); - Method0(int &, argc); - Method0(char **, argv); - Method0(std::string, getApplicationName); - Method1(int, find, IN, const std::string &, str); - Method1(bool, isOption, IN, int, pos); - Method1(bool, isString, IN, int, pos); - Method1(bool, isNumber, IN, int, pos); - Method0(bool, containsOptions); - MethodWithDefaults2(void, remove, IN, int, pos, , IN, int, num, 1); - Method2(bool, match, IN, int, pos, IN, const std::string &, str); - Method1(bool, read, IN, const std::string &, str); - Method2(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1); - Method3(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2); - Method4(bool, read, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2, IN, osg::ArgumentParser::Parameter, value3); - 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); - 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); - 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); - 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); - 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); - Method2(bool, read, IN, int, pos, IN, const std::string &, str); - Method3(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1); - Method4(bool, read, IN, int, pos, IN, const std::string &, str, IN, osg::ArgumentParser::Parameter, value1, IN, osg::ArgumentParser::Parameter, value2); - 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); - 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); - 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); - 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); - 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); - 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); - MethodWithDefaults1(bool, errors, IN, osg::ArgumentParser::ErrorSeverity, severity, osg::ArgumentParser::BENIGN); - MethodWithDefaults2(void, reportError, IN, const std::string &, message, , IN, osg::ArgumentParser::ErrorSeverity, severity, osg::ArgumentParser::CRITICAL); - MethodWithDefaults1(void, reportRemainingOptionsAsUnrecognized, IN, osg::ArgumentParser::ErrorSeverity, severity, osg::ArgumentParser::BENIGN); - Method0(osg::ArgumentParser::ErrorMessageMap &, getErrorMessageMap); - Method0(const osg::ArgumentParser::ErrorMessageMap &, getErrorMessageMap); - MethodWithDefaults2(void, writeErrorMessages, IN, std::ostream &, output, , IN, osg::ArgumentParser::ErrorSeverity, sevrity, osg::ArgumentParser::BENIGN); - ReadOnlyProperty(std::string, ApplicationName); - Property(osg::ApplicationUsage *, ApplicationUsage); - ReadOnlyProperty(osg::ArgumentParser::ErrorMessageMap &, ErrorMessageMap); + 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); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::Parameter::ParameterType) - EnumLabel(osg::ArgumentParser::Parameter::FLOAT_PARAMETER); - EnumLabel(osg::ArgumentParser::Parameter::DOUBLE_PARAMETER); - EnumLabel(osg::ArgumentParser::Parameter::INT_PARAMETER); - EnumLabel(osg::ArgumentParser::Parameter::UNSIGNED_INT_PARAMETER); - EnumLabel(osg::ArgumentParser::Parameter::STRING_PARAMETER); + 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 BEGIN_VALUE_REFLECTOR(osg::ArgumentParser::Parameter) - Constructor1(IN, float &, value); - Constructor1(IN, double &, value); - Constructor1(IN, int &, value); - Constructor1(IN, unsigned int &, value); - Constructor1(IN, std::string &, value); - Constructor1(IN, const osg::ArgumentParser::Parameter &, param); - Method1(bool, valid, IN, const char *, str); - Method1(bool, assign, IN, const char *, str); + 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); 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 dba9d9020..2b0674e13 100644 --- a/src/osgWrappers/osg/Array.cpp +++ b/src/osgWrappers/osg/Array.cpp @@ -17,118 +17,126 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Array::Type) - EnumLabel(osg::Array::ArrayType); - EnumLabel(osg::Array::ByteArrayType); - EnumLabel(osg::Array::ShortArrayType); - EnumLabel(osg::Array::IntArrayType); - EnumLabel(osg::Array::UByteArrayType); - EnumLabel(osg::Array::UShortArrayType); - EnumLabel(osg::Array::UIntArrayType); - EnumLabel(osg::Array::UByte4ArrayType); - EnumLabel(osg::Array::FloatArrayType); - EnumLabel(osg::Array::Vec2ArrayType); - EnumLabel(osg::Array::Vec3ArrayType); - EnumLabel(osg::Array::Vec4ArrayType); + 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::UByte4ArrayType); + I_EnumLabel(osg::Array::FloatArrayType); + I_EnumLabel(osg::Array::Vec2ArrayType); + I_EnumLabel(osg::Array::Vec3ArrayType); + I_EnumLabel(osg::Array::Vec4ArrayType); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Array) - BaseType(osg::Object); - ConstructorWithDefaults3(IN, osg::Array::Type, arrayType, osg::Array::ArrayType, IN, GLint, dataSize, 0, IN, GLenum, dataType, 0); - ConstructorWithDefaults2(IN, const osg::Array &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ArrayVisitor &, x); - Method1(void, accept, IN, osg::ConstArrayVisitor &, x); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, x); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, x); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(osg::Array::Type, getType); - Method0(GLint, getDataSize); - Method0(GLenum, getDataType); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - Method0(void, dirty); - Method1(void, setModifiedCount, IN, unsigned int, value); - Method0(unsigned int, getModifiedCount); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(GLint, DataSize); - ReadOnlyProperty(GLenum, DataType); - Property(unsigned int, ModifiedCount); - ReadOnlyProperty(unsigned int, TotalDataSize); - ReadOnlyProperty(osg::Array::Type, Type); + 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, 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); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ArrayVisitor) - Constructor0(); - Method1(void, apply, IN, osg::Array &, x); - Method1(void, apply, IN, osg::ByteArray &, x); - Method1(void, apply, IN, osg::ShortArray &, x); - Method1(void, apply, IN, osg::IntArray &, x); - Method1(void, apply, IN, osg::UByteArray &, x); - Method1(void, apply, IN, osg::UShortArray &, x); - Method1(void, apply, IN, osg::UIntArray &, x); - Method1(void, apply, IN, osg::UByte4Array &, x); - Method1(void, apply, IN, osg::FloatArray &, x); - Method1(void, apply, IN, osg::Vec2Array &, x); - Method1(void, apply, IN, osg::Vec3Array &, x); - Method1(void, apply, IN, osg::Vec4Array &, x); + 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::UByte4Array &, x); + I_Method1(void, apply, IN, osg::FloatArray &, x); + I_Method1(void, apply, IN, osg::Vec2Array &, x); + I_Method1(void, apply, IN, osg::Vec3Array &, x); + I_Method1(void, apply, IN, osg::Vec4Array &, x); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor) - Constructor0(); - Method1(void, apply, IN, const osg::Array &, x); - Method1(void, apply, IN, const osg::ByteArray &, x); - Method1(void, apply, IN, const osg::ShortArray &, x); - Method1(void, apply, IN, const osg::IntArray &, x); - Method1(void, apply, IN, const osg::UByteArray &, x); - Method1(void, apply, IN, const osg::UShortArray &, x); - Method1(void, apply, IN, const osg::UIntArray &, x); - Method1(void, apply, IN, const osg::UByte4Array &, x); - Method1(void, apply, IN, const osg::FloatArray &, x); - Method1(void, apply, IN, const osg::Vec2Array &, x); - Method1(void, apply, IN, const osg::Vec3Array &, x); - Method1(void, apply, IN, const osg::Vec4Array &, x); + 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::UByte4Array &, x); + I_Method1(void, apply, IN, const osg::FloatArray &, x); + I_Method1(void, apply, IN, const osg::Vec2Array &, x); + I_Method1(void, apply, IN, const osg::Vec3Array &, x); + I_Method1(void, apply, IN, const osg::Vec4Array &, x); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ConstValueVisitor) - Constructor0(); - Method1(void, apply, IN, const GLbyte &, x); - Method1(void, apply, IN, const GLshort &, x); - Method1(void, apply, IN, const GLint &, x); - Method1(void, apply, IN, const GLushort &, x); - Method1(void, apply, IN, const GLubyte &, x); - Method1(void, apply, IN, const GLuint &, x); - Method1(void, apply, IN, const GLfloat &, x); - Method1(void, apply, IN, const osg::UByte4 &, x); - Method1(void, apply, IN, const osg::Vec2 &, x); - Method1(void, apply, IN, const osg::Vec3 &, x); - Method1(void, apply, IN, const osg::Vec4 &, x); + 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::UByte4 &, 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); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::IndexArray) - BaseType(osg::Array); - ConstructorWithDefaults3(IN, osg::Array::Type, arrayType, osg::Array::ArrayType, IN, GLint, dataSize, 0, IN, GLenum, dataType, 0); - ConstructorWithDefaults2(IN, const osg::Array &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method1(unsigned int, index, IN, unsigned int, pos); + 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) - Constructor0(); - Method1(void, apply, IN, GLbyte &, x); - Method1(void, apply, IN, GLshort &, x); - Method1(void, apply, IN, GLint &, x); - Method1(void, apply, IN, GLushort &, x); - Method1(void, apply, IN, GLubyte &, x); - Method1(void, apply, IN, GLuint &, x); - Method1(void, apply, IN, GLfloat &, x); - Method1(void, apply, IN, osg::UByte4 &, x); - Method1(void, apply, IN, osg::Vec2 &, x); - Method1(void, apply, IN, osg::Vec3 &, x); - Method1(void, apply, IN, osg::Vec4 &, x); + 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::UByte4 &, x); + I_Method1(void, apply, IN, osg::Vec2 &, x); + I_Method1(void, apply, IN, osg::Vec3 &, x); + I_Method1(void, apply, IN, osg::Vec4 &, x); END_REFLECTOR TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >, osg::ByteArray); @@ -154,240 +162,240 @@ TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType C TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >, osg::Vec4Array); BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >) - BaseType(osg::Array); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, GLfloat *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::Array); + I_BaseType(std::vector); + 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(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::UByte4 COMMA osg::Array::UByte4ArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >) - BaseType(osg::Array); - BaseType(std::vector); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::UByte4 COMMA osg::Array::UByte4ArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, osg::UByte4 *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::Array); + I_BaseType(std::vector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::UByte4 COMMA osg::Array::UByte4ArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, unsigned int, no); + I_Constructor2(IN, unsigned int, no, IN, osg::UByte4 *, ptr); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); + I_Method0(const GLvoid *, getDataPointer); + I_Method0(unsigned int, getTotalDataSize); + I_Method0(unsigned int, getNumElements); + I_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >) - BaseType(osg::Array); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, osg::Vec2 *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::Array); + I_BaseType(std::vector); + 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(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 >) - BaseType(osg::Array); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, osg::Vec3 *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::Array); + I_BaseType(std::vector); + 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(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 >) - BaseType(osg::Array); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, osg::Vec4 *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::Array); + I_BaseType(std::vector); + 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(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 >) - BaseType(osg::IndexArray); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, GLbyte *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - Method1(unsigned int, index, IN, unsigned int, pos); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::IndexArray); + I_BaseType(std::vector); + 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(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 >) - BaseType(osg::IndexArray); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, GLint *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - Method1(unsigned int, index, IN, unsigned int, pos); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::IndexArray); + I_BaseType(std::vector); + 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(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 >) - BaseType(osg::IndexArray); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, GLshort *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - Method1(unsigned int, index, IN, unsigned int, pos); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::IndexArray); + I_BaseType(std::vector); + 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(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 >) - BaseType(osg::IndexArray); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, GLubyte *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - Method1(unsigned int, index, IN, unsigned int, pos); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::IndexArray); + I_BaseType(std::vector); + 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(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 >) - BaseType(osg::IndexArray); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, GLuint *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - Method1(unsigned int, index, IN, unsigned int, pos); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::IndexArray); + I_BaseType(std::vector); + 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(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 >) - BaseType(osg::IndexArray); - BaseType(std::vector); - Constructor0(); - 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); - Constructor1(IN, unsigned int, no); - Constructor2(IN, unsigned int, no, IN, GLushort *, ptr); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(void, accept, IN, osg::ArrayVisitor &, av); - Method1(void, accept, IN, osg::ConstArrayVisitor &, av); - Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv); - Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv); - Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(unsigned int, getNumElements); - Method1(unsigned int, index, IN, unsigned int, pos); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::IndexArray); + I_BaseType(std::vector); + 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(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 8c19e58bf..042bf3fad 100644 --- a/src/osgWrappers/osg/AutoTransform.cpp +++ b/src/osgWrappers/osg/AutoTransform.cpp @@ -17,47 +17,55 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::AutoTransform::AutoRotateMode) - EnumLabel(osg::AutoTransform::NO_ROTATION); - EnumLabel(osg::AutoTransform::ROTATE_TO_SCREEN); - EnumLabel(osg::AutoTransform::ROTATE_TO_CAMERA); + I_EnumLabel(osg::AutoTransform::NO_ROTATION); + I_EnumLabel(osg::AutoTransform::ROTATE_TO_SCREEN); + I_EnumLabel(osg::AutoTransform::ROTATE_TO_CAMERA); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::AutoTransform) - BaseType(osg::Transform); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::AutoTransform &, pat, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(osg::AutoTransform *, asAutoTransform); - Method0(const osg::AutoTransform *, asAutoTransform); - Method1(void, setPosition, IN, const osg::Vec3 &, pos); - Method0(const osg::Vec3 &, getPosition); - Method1(void, setRotation, IN, const osg::Quat &, quat); - Method0(const osg::Quat &, getRotation); - Method1(void, setScale, IN, float, scale); - Method1(void, setScale, IN, const osg::Vec3 &, scale); - Method0(const osg::Vec3 &, getScale); - Method1(void, setPivotPoint, IN, const osg::Vec3 &, pivot); - Method0(const osg::Vec3 &, getPivotPoint); - Method1(void, setAutoUpdateEyeMovementTolerance, IN, float, tolerance); - Method0(float, getAutoUpdateEyeMovementTolerance); - Method1(void, setAutoRotateMode, IN, osg::AutoTransform::AutoRotateMode, mode); - Method0(osg::AutoTransform::AutoRotateMode, getAutoRotateMode); - Method1(void, setAutoScaleToScreen, IN, bool, autoScaleToScreen); - Method0(bool, getAutoScaleToScreen); - Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - Property(osg::AutoTransform::AutoRotateMode, AutoRotateMode); - Property(bool, AutoScaleToScreen); - Property(float, AutoUpdateEyeMovementTolerance); - Property(const osg::Vec3 &, PivotPoint); - Property(const osg::Vec3 &, Position); - Property(const osg::Quat &, Rotation); - Property(const osg::Vec3 &, Scale); + 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_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); END_REFLECTOR diff --git a/src/osgWrappers/osg/Billboard.cpp b/src/osgWrappers/osg/Billboard.cpp index 0a2cf83ce..260026d3b 100644 --- a/src/osgWrappers/osg/Billboard.cpp +++ b/src/osgWrappers/osg/Billboard.cpp @@ -18,45 +18,53 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Billboard::PositionList); BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode) - EnumLabel(osg::Billboard::POINT_ROT_EYE); - EnumLabel(osg::Billboard::POINT_ROT_WORLD); - EnumLabel(osg::Billboard::AXIAL_ROT); + I_EnumLabel(osg::Billboard::POINT_ROT_EYE); + I_EnumLabel(osg::Billboard::POINT_ROT_WORLD); + I_EnumLabel(osg::Billboard::AXIAL_ROT); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Billboard) - BaseType(osg::Geode); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Billboard &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, setMode, IN, osg::Billboard::Mode, mode); - Method0(osg::Billboard::Mode, getMode); - Method1(void, setAxis, IN, const osg::Vec3 &, axis); - Method0(const osg::Vec3 &, getAxis); - Method1(void, setNormal, IN, const osg::Vec3 &, normal); - Method0(const osg::Vec3 &, getNormal); - Method2(void, setPosition, IN, unsigned int, i, IN, const osg::Vec3 &, pos); - Method1(const osg::Vec3 &, getPosition, IN, unsigned int, i); - Method1(void, setPositionList, IN, osg::Billboard::PositionList &, pl); - Method0(osg::Billboard::PositionList &, getPositionList); - Method0(const osg::Billboard::PositionList &, getPositionList); - Method1(bool, addDrawable, IN, osg::Drawable *, gset); - Method2(bool, addDrawable, IN, osg::Drawable *, gset, IN, const osg::Vec3 &, pos); - Method1(bool, removeDrawable, IN, osg::Drawable *, gset); - Method3(bool, computeMatrix, IN, osg::Matrix &, modelview, IN, const osg::Vec3 &, eye_local, IN, const osg::Vec3 &, pos_local); - Method0(osg::BoundingSphere, computeBound); - Property(const osg::Vec3 &, Axis); - Property(osg::Billboard::Mode, Mode); - Property(const osg::Vec3 &, Normal); - IndexedProperty1(const osg::Vec3 &, Position, unsigned int, i); - Property(osg::Billboard::PositionList &, PositionList); + 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); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::Vec3 >); diff --git a/src/osgWrappers/osg/BlendColor.cpp b/src/osgWrappers/osg/BlendColor.cpp index 9708484ea..59cfb673a 100644 --- a/src/osgWrappers/osg/BlendColor.cpp +++ b/src/osgWrappers/osg/BlendColor.cpp @@ -16,37 +16,45 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::BlendColor) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::BlendColor &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setConstantColor, IN, const osg::Vec4 &, color); - Method0(osg::Vec4, getConstantColor); - Method1(void, apply, IN, osg::State &, state); - ReadOnlyProperty(osg::Vec4, ConstantColor); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::BlendColor &, 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, setConstantColor, IN, const osg::Vec4 &, color); + I_Method0(osg::Vec4, getConstantColor); + I_Method1(void, apply, IN, osg::State &, state); + I_ReadOnlyProperty(osg::Vec4, ConstantColor); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::BlendColor::Extensions) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::BlendColor::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::BlendColor::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method1(void, setBlendColorSupported, IN, bool, flag); - Method0(bool, isBlendColorSupported); - Method1(void, setBlendColorProc, IN, void *, ptr); - Method4(void, glBlendColor, IN, GLclampf, red, IN, GLclampf, green, IN, GLclampf, blue, IN, GLclampf, alpha); - WriteOnlyProperty(void *, BlendColorProc); - WriteOnlyProperty(bool, BlendColorSupported); - WriteOnlyProperty(unsigned int, upGLExtenions); + I_BaseType(osg::Referenced); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::BlendColor::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::BlendColor::Extensions &, rhs); + I_Method1(void, setupGLExtenions, IN, unsigned int, contextID); + I_Method1(void, setBlendColorSupported, IN, bool, flag); + I_Method0(bool, isBlendColorSupported); + I_Method1(void, setBlendColorProc, IN, void *, ptr); + I_Method4(void, glBlendColor, IN, GLclampf, red, IN, GLclampf, green, IN, GLclampf, blue, IN, GLclampf, alpha); + I_WriteOnlyProperty(void *, BlendColorProc); + I_WriteOnlyProperty(bool, BlendColorSupported); + I_WriteOnlyProperty(unsigned int, upGLExtenions); END_REFLECTOR diff --git a/src/osgWrappers/osg/BlendEquation.cpp b/src/osgWrappers/osg/BlendEquation.cpp index 6d651495e..b4037960f 100644 --- a/src/osgWrappers/osg/BlendEquation.cpp +++ b/src/osgWrappers/osg/BlendEquation.cpp @@ -15,49 +15,57 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::BlendEquation::Equation) - EnumLabel(osg::BlendEquation::RGBA_MIN); - EnumLabel(osg::BlendEquation::RGBA_MAX); - EnumLabel(osg::BlendEquation::ALPHA_MIN); - EnumLabel(osg::BlendEquation::ALPHA_MAX); - EnumLabel(osg::BlendEquation::LOGIC_OP); - EnumLabel(osg::BlendEquation::FUNC_ADD); - EnumLabel(osg::BlendEquation::FUNC_SUBTRACT); - EnumLabel(osg::BlendEquation::FUNC_REVERSE_SUBTRACT); + 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 BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) - BaseType(osg::StateAttribute); - Constructor0(); - Constructor1(IN, osg::BlendEquation::Equation, equation); - ConstructorWithDefaults2(IN, const osg::BlendEquation &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setEquation, IN, osg::BlendEquation::Equation, equation); - Method0(osg::BlendEquation::Equation, getEquation); - Method1(void, apply, IN, osg::State &, state); - Property(osg::BlendEquation::Equation, Equation); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + 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) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::BlendEquation::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::BlendEquation::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method1(void, setBlendEquationSupported, IN, bool, flag); - Method0(bool, isBlendEquationSupported); - Method1(void, setBlendEquationProc, IN, void *, ptr); - Method1(void, glBlendEquation, IN, GLenum, mode); - WriteOnlyProperty(void *, BlendEquationProc); - WriteOnlyProperty(bool, BlendEquationSupported); - WriteOnlyProperty(unsigned int, upGLExtenions); + 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_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); END_REFLECTOR diff --git a/src/osgWrappers/osg/BlendFunc.cpp b/src/osgWrappers/osg/BlendFunc.cpp index 461c97375..fa53e16d7 100644 --- a/src/osgWrappers/osg/BlendFunc.cpp +++ b/src/osgWrappers/osg/BlendFunc.cpp @@ -15,45 +15,53 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::BlendFunc::BlendFuncMode) - EnumLabel(osg::BlendFunc::DST_ALPHA); - EnumLabel(osg::BlendFunc::DST_COLOR); - EnumLabel(osg::BlendFunc::ONE); - EnumLabel(osg::BlendFunc::ONE_MINUS_DST_ALPHA); - EnumLabel(osg::BlendFunc::ONE_MINUS_DST_COLOR); - EnumLabel(osg::BlendFunc::ONE_MINUS_SRC_ALPHA); - EnumLabel(osg::BlendFunc::ONE_MINUS_SRC_COLOR); - EnumLabel(osg::BlendFunc::SRC_ALPHA); - EnumLabel(osg::BlendFunc::SRC_ALPHA_SATURATE); - EnumLabel(osg::BlendFunc::SRC_COLOR); - EnumLabel(osg::BlendFunc::CONSTANT_COLOR); - EnumLabel(osg::BlendFunc::ONE_MINUS_CONSTANT_COLOR); - EnumLabel(osg::BlendFunc::CONSTANT_ALPHA); - EnumLabel(osg::BlendFunc::ONE_MINUS_CONSTANT_ALPHA); - EnumLabel(osg::BlendFunc::ZERO); + 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 BEGIN_OBJECT_REFLECTOR(osg::BlendFunc) - BaseType(osg::StateAttribute); - Constructor0(); - Constructor2(IN, GLenum, source, IN, GLenum, destination); - ConstructorWithDefaults2(IN, const osg::BlendFunc &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method2(void, setFunction, IN, GLenum, source, IN, GLenum, destination); - Method1(void, setSource, IN, GLenum, source); - Method0(GLenum, getSource); - Method1(void, setDestination, IN, GLenum, destination); - Method0(GLenum, getDestination); - Method1(void, apply, IN, osg::State &, state); - Property(GLenum, Destination); - Property(GLenum, Source); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_Constructor2(IN, GLenum, source, IN, GLenum, destination); + 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_Method1(void, setSource, IN, GLenum, source); + I_Method0(GLenum, getSource); + I_Method1(void, setDestination, IN, GLenum, destination); + I_Method0(GLenum, getDestination); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(GLenum, Destination); + I_Property(GLenum, Source); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/BoundingBox.cpp b/src/osgWrappers/osg/BoundingBox.cpp index d98c1d07b..b006235c8 100644 --- a/src/osgWrappers/osg/BoundingBox.cpp +++ b/src/osgWrappers/osg/BoundingBox.cpp @@ -13,36 +13,44 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osg::BoundingBox) - Constructor0(); - Constructor6(IN, float, xmin, IN, float, ymin, IN, float, zmin, IN, float, xmax, IN, float, ymax, IN, float, zmax); - Constructor2(IN, const osg::Vec3 &, min, IN, const osg::Vec3 &, max); - Method0(void, init); - Method0(bool, valid); - Method6(void, set, IN, float, xmin, IN, float, ymin, IN, float, zmin, IN, float, xmax, IN, float, ymax, IN, float, zmax); - Method2(void, set, IN, const osg::Vec3 &, min, IN, const osg::Vec3 &, max); - Method0(float &, xMin); - Method0(float, xMin); - Method0(float &, yMin); - Method0(float, yMin); - Method0(float &, zMin); - Method0(float, zMin); - Method0(float &, xMax); - Method0(float, xMax); - Method0(float &, yMax); - Method0(float, yMax); - Method0(float &, zMax); - Method0(float, zMax); - Method0(const osg::Vec3, center); - Method0(float, radius); - Method0(float, radius2); - Method1(const osg::Vec3, corner, IN, unsigned int, pos); - Method1(void, expandBy, IN, const osg::Vec3 &, v); - Method3(void, expandBy, IN, float, x, IN, float, y, IN, float, z); - Method1(void, expandBy, IN, const osg::BoundingBox &, bb); - Method1(void, expandBy, IN, const osg::BoundingSphere &, sh); - Method1(osg::BoundingBox, intersect, IN, const osg::BoundingBox &, bb); - Method1(bool, intersects, IN, const osg::BoundingBox &, bb); - Method1(bool, contains, IN, const osg::Vec3 &, v); + I_Constructor0(); + I_Constructor6(IN, float, xmin, IN, float, ymin, IN, float, zmin, IN, float, xmax, IN, float, ymax, IN, float, zmax); + I_Constructor2(IN, const osg::Vec3 &, min, IN, const osg::Vec3 &, max); + I_Method0(void, init); + I_Method0(bool, valid); + I_Method6(void, set, IN, float, xmin, IN, float, ymin, IN, float, zmin, IN, float, xmax, IN, float, ymax, IN, float, zmax); + I_Method2(void, set, IN, const osg::Vec3 &, min, IN, const osg::Vec3 &, max); + I_Method0(float &, xMin); + I_Method0(float, xMin); + I_Method0(float &, yMin); + I_Method0(float, yMin); + I_Method0(float &, zMin); + I_Method0(float, zMin); + I_Method0(float &, xMax); + I_Method0(float, xMax); + I_Method0(float &, yMax); + I_Method0(float, yMax); + I_Method0(float &, zMax); + I_Method0(float, zMax); + I_Method0(const osg::Vec3, center); + I_Method0(float, radius); + I_Method0(float, radius2); + I_Method1(const osg::Vec3, corner, IN, unsigned int, pos); + I_Method1(void, expandBy, IN, const osg::Vec3 &, v); + I_Method3(void, expandBy, IN, float, x, IN, float, y, IN, float, z); + I_Method1(void, expandBy, IN, const osg::BoundingBox &, bb); + I_Method1(void, expandBy, IN, const osg::BoundingSphere &, sh); + I_Method1(osg::BoundingBox, intersect, IN, const osg::BoundingBox &, bb); + I_Method1(bool, intersects, IN, const osg::BoundingBox &, bb); + I_Method1(bool, contains, IN, const osg::Vec3 &, v); END_REFLECTOR diff --git a/src/osgWrappers/osg/BoundingSphere.cpp b/src/osgWrappers/osg/BoundingSphere.cpp index d73601039..9082cb237 100644 --- a/src/osgWrappers/osg/BoundingSphere.cpp +++ b/src/osgWrappers/osg/BoundingSphere.cpp @@ -13,26 +13,34 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osg::BoundingSphere) - Constructor0(); - Constructor2(IN, const osg::Vec3 &, center, IN, float, radius); - Constructor1(IN, const osg::BoundingSphere &, bs); - Constructor1(IN, const osg::BoundingBox &, bb); - Method0(void, init); - Method0(bool, valid); - Method2(void, set, IN, const osg::Vec3 &, center, IN, float, radius); - Method0(osg::Vec3 &, center); - Method0(const osg::Vec3 &, center); - Method0(float &, radius); - Method0(float, radius); - Method0(float, radius2); - Method1(void, expandBy, IN, const osg::Vec3 &, v); - Method1(void, expandRadiusBy, IN, const osg::Vec3 &, v); - Method1(void, expandBy, IN, const osg::BoundingSphere &, sh); - Method1(void, expandRadiusBy, IN, const osg::BoundingSphere &, sh); - Method1(void, expandBy, IN, const osg::BoundingBox &, bb); - Method1(void, expandRadiusBy, IN, const osg::BoundingBox &, bb); - Method1(bool, contains, IN, const osg::Vec3 &, v); - Method1(bool, intersects, IN, const osg::BoundingSphere &, bs); + 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 diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index cc79a301d..2a57d51e2 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -15,67 +15,75 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BufferObject) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::BufferObject &, bo, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isBufferObjectSupported, IN, unsigned int, contextID); - Method1(GLuint &, buffer, IN, unsigned int, contextID); - Method1(void, bindBuffer, IN, unsigned int, contextID); - Method1(void, unbindBuffer, IN, unsigned int, contextID); - Method1(bool, needsCompile, IN, unsigned int, contextID); - Method1(void, compileBuffer, IN, osg::State &, state); - Method1(void, releaseBuffer, IN, osg::State *, state); - Method3(void, flushDeletedBufferObjects, IN, unsigned int, contextID, IN, double, x, IN, double &, availableTime); + I_BaseType(osg::Object); + 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) - Constructor0(); - Constructor1(IN, const osg::BufferObject::BufferEntry &, be); + I_Constructor0(); + I_Constructor1(IN, const osg::BufferObject::BufferEntry &, be); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::BufferObject::Extensions) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::BufferObject::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::BufferObject::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method0(bool, isBufferObjectSupported); - Method2(void, glGenBuffers, IN, GLsizei, n, IN, GLuint *, buffers); - Method2(void, glBindBuffer, IN, GLenum, target, IN, GLuint, buffer); - Method4(void, glBufferData, IN, GLenum, target, IN, GLsizeiptrARB, size, IN, const GLvoid *, data, IN, GLenum, usage); - Method4(void, glBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, const GLvoid *, data); - Method2(void, glDeleteBuffers, IN, GLsizei, n, IN, const GLuint *, buffers); - Method1(GLboolean, glIsBuffer, IN, GLuint, buffer); - Method4(void, glGetBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, GLvoid *, data); - Method2(GLvoid *, glMapBuffer, IN, GLenum, target, IN, GLenum, access); - Method1(GLboolean, glUnmapBuffer, IN, GLenum, target); - Method3(void, glGetBufferParameteriv, IN, GLenum, target, IN, GLenum, pname, IN, GLint *, params); - Method3(void, glGetBufferPointerv, IN, GLenum, target, IN, GLenum, pname, IN, GLvoid **, params); - WriteOnlyProperty(unsigned int, upGLExtenions); +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); END_REFLECTOR TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >, osg::PixelBufferObject::BufferEntryImagePair); BEGIN_OBJECT_REFLECTOR(osg::PixelBufferObject) - BaseType(osg::BufferObject); - ConstructorWithDefaults1(IN, osg::Image *, image, 0); - ConstructorWithDefaults2(IN, const osg::PixelBufferObject &, pbo, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setImage, IN, osg::Image *, image); - Method0(osg::Image *, getImage); - Method0(const osg::Image *, getImage); - Method0(unsigned int, offset); - Method1(bool, needsCompile, IN, unsigned int, contextID); - Method1(void, compileBuffer, IN, osg::State &, state); - Property(osg::Image *, Image); + 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 STD_PAIR_REFLECTOR(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >); diff --git a/src/osgWrappers/osg/ClearNode.cpp b/src/osgWrappers/osg/ClearNode.cpp index ad4ecfa1f..d47523c51 100644 --- a/src/osgWrappers/osg/ClearNode.cpp +++ b/src/osgWrappers/osg/ClearNode.cpp @@ -15,21 +15,29 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::ClearNode) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::ClearNode &, es, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, setRequiresClear, IN, bool, requiresClear); - Method0(bool, getRequiresClear); - Method1(void, setClearColor, IN, const osg::Vec4 &, color); - Method0(const osg::Vec4 &, getClearColor); - Property(const osg::Vec4 &, ClearColor); - Property(bool, RequiresClear); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::ClearNode &, 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_Method1(void, setRequiresClear, IN, bool, requiresClear); + I_Method0(bool, getRequiresClear); + I_Method1(void, setClearColor, IN, const osg::Vec4 &, color); + I_Method0(const osg::Vec4 &, getClearColor); + I_Property(const osg::Vec4 &, ClearColor); + I_Property(bool, RequiresClear); END_REFLECTOR diff --git a/src/osgWrappers/osg/ClipNode.cpp b/src/osgWrappers/osg/ClipNode.cpp index 8ec415528..6071366eb 100644 --- a/src/osgWrappers/osg/ClipNode.cpp +++ b/src/osgWrappers/osg/ClipNode.cpp @@ -19,46 +19,54 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::ClipPlane > >, osg::ClipNode::ClipPlaneList); BEGIN_OBJECT_REFLECTOR(osg::ClipNode) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::ClipNode &, es, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - MethodWithDefaults2(void, createClipBox, IN, const osg::BoundingBox &, bb, , IN, unsigned int, clipPlaneNumberBase, 0); - Method1(bool, addClipPlane, IN, osg::ClipPlane *, clipplane); - Method1(bool, removeClipPlane, IN, osg::ClipPlane *, clipplane); - Method1(bool, removeClipPlane, IN, unsigned int, pos); - Method0(unsigned int, getNumClipPlanes); - Method1(osg::ClipPlane *, getClipPlane, IN, unsigned int, pos); - Method1(const osg::ClipPlane *, getClipPlane, IN, unsigned int, pos); - Method1(void, getClipPlaneList, IN, const osg::ClipNode::ClipPlaneList &, cpl); - Method0(osg::ClipNode::ClipPlaneList &, getClipPlaneList); - Method0(const osg::ClipNode::ClipPlaneList &, getClipPlaneList); - Method2(void, setStateSetModes, IN, osg::StateSet &, x, IN, osg::StateAttribute::GLModeValue, x); - MethodWithDefaults1(void, setLocalStateSetModes, IN, osg::StateAttribute::GLModeValue, x, osg::StateAttribute::ON); - Method0(osg::BoundingSphere, computeBound); - ArrayProperty_GA(osg::ClipPlane *, ClipPlane, ClipPlanes, unsigned int, bool); - ReadOnlyProperty(osg::ClipNode::ClipPlaneList &, ClipPlaneList); - WriteOnlyProperty(osg::StateAttribute::GLModeValue, LocalStateSetModes); + 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 BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::ClipPlane >) - Constructor0(); - Constructor1(IN, osg::ClipPlane *, t); - Constructor1(IN, const osg::ref_ptr< osg::ClipPlane > &, rp); - Method0(bool, valid); - Method0(osg::ClipPlane *, get); - Method0(const osg::ClipPlane *, get); - Method0(osg::ClipPlane *, take); - Method0(osg::ClipPlane *, release); - ReadOnlyProperty(osg::ClipPlane *, ); + I_Constructor0(); + I_Constructor1(IN, osg::ClipPlane *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::ClipPlane > &, rp); + I_Method0(bool, valid); + I_Method0(osg::ClipPlane *, get); + I_Method0(const osg::ClipPlane *, get); + I_Method0(osg::ClipPlane *, take); + I_Method0(osg::ClipPlane *, release); + I_ReadOnlyProperty(osg::ClipPlane *, ); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::ClipPlane > >); diff --git a/src/osgWrappers/osg/ClipPlane.cpp b/src/osgWrappers/osg/ClipPlane.cpp index 4a892c955..12cbb976c 100644 --- a/src/osgWrappers/osg/ClipPlane.cpp +++ b/src/osgWrappers/osg/ClipPlane.cpp @@ -17,32 +17,40 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::ClipPlane) - BaseType(osg::StateAttribute); - Constructor0(); - Constructor2(IN, unsigned int, no, IN, const osg::Vec4d &, plane); - Constructor2(IN, unsigned int, no, IN, const osg::Plane &, plane); - Constructor5(IN, unsigned int, no, IN, double, a, IN, double, b, IN, double, c, IN, double, d); - ConstructorWithDefaults2(IN, const osg::ClipPlane &, cp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method0(unsigned int, getMember); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setClipPlane, IN, const osg::Plane &, plane); - Method4(void, setClipPlane, IN, double, a, IN, double, b, IN, double, c, IN, double, d); - Method1(void, setClipPlane, IN, const osg::Vec4d &, plane); - Method0(const osg::Vec4d &, getClipPlane); - Method1(void, setClipPlaneNum, IN, unsigned int, num); - Method0(unsigned int, getClipPlaneNum); - Method1(void, apply, IN, osg::State &, state); - Property(const osg::Vec4d &, ClipPlane); - Property(unsigned int, ClipPlaneNum); - ReadOnlyProperty(unsigned int, Member); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_Constructor2(IN, unsigned int, no, IN, const osg::Vec4d &, plane); + I_Constructor2(IN, unsigned int, no, IN, const osg::Plane &, plane); + I_Constructor5(IN, unsigned int, no, IN, double, a, IN, double, b, IN, double, c, IN, double, d); + I_ConstructorWithDefaults2(IN, const osg::ClipPlane &, cp, , 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, setClipPlane, IN, const osg::Plane &, plane); + I_Method4(void, setClipPlane, IN, double, a, IN, double, b, IN, double, c, IN, double, d); + I_Method1(void, setClipPlane, IN, const osg::Vec4d &, plane); + I_Method0(const osg::Vec4d &, getClipPlane); + I_Method1(void, setClipPlaneNum, IN, unsigned int, num); + I_Method0(unsigned int, getClipPlaneNum); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(const osg::Vec4d &, ClipPlane); + I_Property(unsigned int, ClipPlaneNum); + I_ReadOnlyProperty(unsigned int, Member); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/ClusterCullingCallback.cpp b/src/osgWrappers/osg/ClusterCullingCallback.cpp index ca1224c48..6916da599 100644 --- a/src/osgWrappers/osg/ClusterCullingCallback.cpp +++ b/src/osgWrappers/osg/ClusterCullingCallback.cpp @@ -19,33 +19,41 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::ClusterCullingCallback) - BaseType(osg::Drawable::CullCallback); - BaseType(osg::NodeCallback); - Constructor0(); - Constructor2(IN, const osg::ClusterCullingCallback &, ccc, IN, const osg::CopyOp &, copyop); - Constructor3(IN, const osg::Vec3 &, controlPoint, IN, const osg::Vec3 &, normal, IN, float, deviation); - Constructor1(IN, const osg::Drawable *, drawable); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, computeFrom, IN, const osg::Drawable *, drawable); - Method1(void, transform, IN, const osg::Matrixd &, matrix); - Method4(void, set, IN, const osg::Vec3 &, controlPoint, IN, const osg::Vec3 &, normal, IN, float, deviation, IN, float, radius); - Method1(void, setControlPoint, IN, const osg::Vec3 &, controlPoint); - Method0(const osg::Vec3 &, getControlPoint); - Method1(void, setNormal, IN, const osg::Vec3 &, normal); - Method0(const osg::Vec3 &, getNormal); - Method1(void, setRadius, IN, float, radius); - Method0(float, getRadius); - Method1(void, setDeviation, IN, float, deviation); - Method0(float, getDeviation); - Method3(bool, cull, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, x, IN, osg::State *, x); - Property(const osg::Vec3 &, ControlPoint); - Property(float, Deviation); - Property(const osg::Vec3 &, Normal); - Property(float, Radius); + I_BaseType(osg::Drawable::CullCallback); + I_BaseType(osg::NodeCallback); + I_Constructor0(); + I_Constructor2(IN, const osg::ClusterCullingCallback &, ccc, IN, const osg::CopyOp &, copyop); + I_Constructor3(IN, const osg::Vec3 &, controlPoint, IN, const osg::Vec3 &, normal, IN, float, deviation); + I_Constructor1(IN, const osg::Drawable *, drawable); + 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, computeFrom, IN, const osg::Drawable *, drawable); + I_Method1(void, transform, IN, const osg::Matrixd &, matrix); + I_Method4(void, set, IN, const osg::Vec3 &, controlPoint, IN, const osg::Vec3 &, normal, IN, float, deviation, IN, float, radius); + I_Method1(void, setControlPoint, IN, const osg::Vec3 &, controlPoint); + I_Method0(const osg::Vec3 &, getControlPoint); + I_Method1(void, setNormal, IN, const osg::Vec3 &, normal); + I_Method0(const osg::Vec3 &, getNormal); + I_Method1(void, setRadius, IN, float, radius); + I_Method0(float, getRadius); + I_Method1(void, setDeviation, IN, float, deviation); + I_Method0(float, getDeviation); + I_Method3(bool, cull, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, x, IN, osg::State *, x); + I_Property(const osg::Vec3 &, ControlPoint); + I_Property(float, Deviation); + I_Property(const osg::Vec3 &, Normal); + I_Property(float, Radius); END_REFLECTOR diff --git a/src/osgWrappers/osg/CollectOccludersVisitor.cpp b/src/osgWrappers/osg/CollectOccludersVisitor.cpp index 6cd643c9e..4c348bac1 100644 --- a/src/osgWrappers/osg/CollectOccludersVisitor.cpp +++ b/src/osgWrappers/osg/CollectOccludersVisitor.cpp @@ -18,37 +18,45 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::set< osg::ShadowVolumeOccluder >, osg::CollectOccludersVisitor::ShadowVolumeOccluderSet); -BEGIN_VALUE_REFLECTOR(osg::CollectOccludersVisitor) - BaseType(osg::NodeVisitor); - BaseType(osg::CullStack); - Constructor0(); - Method0(osg::CollectOccludersVisitor *, cloneType); - Method0(void, reset); - Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale); - Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale); - Method1(void, apply, IN, osg::Node &, x); - Method1(void, apply, IN, osg::Transform &, node); - Method1(void, apply, IN, osg::Projection &, node); - Method1(void, apply, IN, osg::Switch &, node); - Method1(void, apply, IN, osg::LOD &, node); - Method1(void, apply, IN, osg::OccluderNode &, node); - Method1(void, setMinimumShadowOccluderVolume, IN, float, vol); - Method0(float, getMinimumShadowOccluderVolume); - Method1(void, setMaximumNumberOfActiveOccluders, IN, unsigned int, num); - Method0(unsigned int, getMaximumNumberOfActiveOccluders); - Method1(void, setCreateDrawablesOnOccludeNodes, IN, bool, flag); - Method0(bool, getCreateDrawablesOnOccludeNodes); - Method1(void, setCollectedOcculderSet, IN, const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, svol); - Method0(osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, getCollectedOccluderSet); - Method0(const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, getCollectedOccluderSet); - Method0(void, removeOccludedOccluders); - ReadOnlyProperty(osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, CollectedOccluderSet); - WriteOnlyProperty(const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, CollectedOcculderSet); - Property(bool, CreateDrawablesOnOccludeNodes); - Property(unsigned int, MaximumNumberOfActiveOccluders); - Property(float, MinimumShadowOccluderVolume); +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 STD_SET_REFLECTOR(std::set< osg::ShadowVolumeOccluder >); diff --git a/src/osgWrappers/osg/ColorMask.cpp b/src/osgWrappers/osg/ColorMask.cpp index 8f84e8703..796b35f89 100644 --- a/src/osgWrappers/osg/ColorMask.cpp +++ b/src/osgWrappers/osg/ColorMask.cpp @@ -15,32 +15,40 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::ColorMask) - BaseType(osg::StateAttribute); - Constructor0(); - Constructor4(IN, bool, red, IN, bool, green, IN, bool, blue, IN, bool, alpha); - ConstructorWithDefaults2(IN, const osg::ColorMask &, cm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method4(void, setMask, IN, bool, red, IN, bool, green, IN, bool, blue, IN, bool, alpha); - Method1(void, setRedMask, IN, bool, mask); - Method0(bool, getRedMask); - Method1(void, setGreenMask, IN, bool, mask); - Method0(bool, getGreenMask); - Method1(void, setBlueMask, IN, bool, mask); - Method0(bool, getBlueMask); - Method1(void, setAlphaMask, IN, bool, mask); - Method0(bool, getAlphaMask); - Method1(void, apply, IN, osg::State &, state); - Property(bool, AlphaMask); - Property(bool, BlueMask); - Property(bool, GreenMask); - Property(bool, RedMask); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_Constructor4(IN, bool, red, IN, bool, green, IN, bool, blue, IN, bool, alpha); + I_ConstructorWithDefaults2(IN, const osg::ColorMask &, 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(osg::StateAttribute::Type, getType); + I_Method1(int, compare, IN, const osg::StateAttribute &, sa); + I_Method4(void, setMask, IN, bool, red, IN, bool, green, IN, bool, blue, IN, bool, alpha); + I_Method1(void, setRedMask, IN, bool, mask); + I_Method0(bool, getRedMask); + I_Method1(void, setGreenMask, IN, bool, mask); + I_Method0(bool, getGreenMask); + I_Method1(void, setBlueMask, IN, bool, mask); + I_Method0(bool, getBlueMask); + I_Method1(void, setAlphaMask, IN, bool, mask); + I_Method0(bool, getAlphaMask); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(bool, AlphaMask); + I_Property(bool, BlueMask); + I_Property(bool, GreenMask); + I_Property(bool, RedMask); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/ColorMatrix.cpp b/src/osgWrappers/osg/ColorMatrix.cpp index 44c46819c..869afa79d 100644 --- a/src/osgWrappers/osg/ColorMatrix.cpp +++ b/src/osgWrappers/osg/ColorMatrix.cpp @@ -16,22 +16,30 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::ColorMatrix) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::ColorMatrix &, cm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, setMatrix, IN, const osg::Matrix &, matrix); - Method0(osg::Matrix &, getMatrix); - Method0(const osg::Matrix &, getMatrix); - Method1(void, apply, IN, osg::State &, state); - Property(const osg::Matrix &, Matrix); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::ColorMatrix &, 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(osg::StateAttribute::Type, getType); + I_Method1(int, compare, IN, const osg::StateAttribute &, sa); + I_Method1(void, setMatrix, IN, const osg::Matrix &, matrix); + I_Method0(osg::Matrix &, getMatrix); + I_Method0(const osg::Matrix &, getMatrix); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(const osg::Matrix &, Matrix); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp index 5cf3834a9..c012eb02f 100644 --- a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp +++ b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp @@ -14,26 +14,34 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::ConvexPlanarPolygon >, osg::ConvexPlanarOccluder::HoleList); BEGIN_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::ConvexPlanarOccluder &, cpo, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setOccluder, IN, const osg::ConvexPlanarPolygon &, cpp); - Method0(osg::ConvexPlanarPolygon &, getOccluder); - Method0(const osg::ConvexPlanarPolygon &, getOccluder); - Method1(void, addHole, IN, const osg::ConvexPlanarPolygon &, cpp); - Method1(void, setHoleList, IN, const osg::ConvexPlanarOccluder::HoleList &, holeList); - Method0(osg::ConvexPlanarOccluder::HoleList &, getHoleList); - Method0(const osg::ConvexPlanarOccluder::HoleList &, getHoleList); - Property(const osg::ConvexPlanarOccluder::HoleList &, HoleList); - Property(const osg::ConvexPlanarPolygon &, Occluder); + 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 STD_VECTOR_REFLECTOR(std::vector< osg::ConvexPlanarPolygon >); diff --git a/src/osgWrappers/osg/ConvexPlanarPolygon.cpp b/src/osgWrappers/osg/ConvexPlanarPolygon.cpp index 6d628c941..6819cb110 100644 --- a/src/osgWrappers/osg/ConvexPlanarPolygon.cpp +++ b/src/osgWrappers/osg/ConvexPlanarPolygon.cpp @@ -12,14 +12,22 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::ConvexPlanarPolygon::VertexList); BEGIN_VALUE_REFLECTOR(osg::ConvexPlanarPolygon) - Constructor0(); - Method1(void, add, IN, const osg::Vec3 &, v); - Method1(void, setVertexList, IN, const osg::ConvexPlanarPolygon::VertexList &, vertexList); - Method0(osg::ConvexPlanarPolygon::VertexList &, getVertexList); - Method0(const osg::ConvexPlanarPolygon::VertexList &, getVertexList); - Property(const osg::ConvexPlanarPolygon::VertexList &, VertexList); + 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 diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index 71553e38e..5f3ad359b 100644 --- a/src/osgWrappers/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/osg/CoordinateSystemNode.cpp @@ -16,53 +16,61 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::CoordinateSystemNode) - BaseType(osg::Group); - Constructor0(); - Constructor2(IN, const std::string &, format, IN, const std::string &, cs); - ConstructorWithDefaults2(IN, const osg::CoordinateSystemNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, set, IN, const osg::CoordinateSystemNode &, csn); - Method1(void, setFormat, IN, const std::string &, format); - Method0(const std::string &, getFormat); - Method1(void, setCoordinateSystem, IN, const std::string &, cs); - Method0(const std::string &, getCoordinateSystem); - Method1(void, setEllipsoidModel, IN, osg::EllipsoidModel *, ellipsode); - Method0(osg::EllipsoidModel *, getEllipsoidModel); - Method0(const osg::EllipsoidModel *, getEllipsoidModel); - Method1(osg::CoordinateFrame, computeLocalCoordinateFrame, IN, const osg::Vec3d &, position); - Method1(osg::Vec3d, computeLocalUpVector, IN, const osg::Vec3d &, position); - WriteOnlyProperty(const osg::CoordinateSystemNode &, ); - Property(const std::string &, CoordinateSystem); - Property(osg::EllipsoidModel *, EllipsoidModel); - Property(const std::string &, Format); + 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_VALUE_REFLECTOR(osg::EllipsoidModel) - BaseType(osg::Object); - ConstructorWithDefaults2(IN, double, radiusEquator, osg::WGS_84_RADIUS_EQUATOR, IN, double, radiusPolar, osg::WGS_84_RADIUS_POLAR); - ConstructorWithDefaults2(IN, const osg::EllipsoidModel &, et, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setRadiusEquator, IN, double, radius); - Method0(double, getRadiusEquator); - Method1(void, setRadiusPolar, IN, double, radius); - Method0(double, getRadiusPolar); - Method6(void, convertLatLongHeightToXYZ, IN, double, latitude, IN, double, longitude, IN, double, height, IN, double &, X, IN, double &, Y, IN, double &, Z); - Method6(void, convertXYZToLatLongHeight, IN, double, X, IN, double, Y, IN, double, Z, IN, double &, latitude, IN, double &, longitude, IN, double &, height); - Method4(void, computeLocalToWorldTransformFromLatLongHeight, IN, double, latitude, IN, double, longitude, IN, double, height, IN, osg::Matrixd &, localToWorld); - Method4(void, computeLocalToWorldTransformFromXYZ, IN, double, X, IN, double, Y, IN, double, Z, IN, osg::Matrixd &, localToWorld); - Method3(osg::Vec3d, computeLocalUpVector, IN, double, X, IN, double, Y, IN, double, Z); - Property(double, RadiusEquator); - Property(double, RadiusPolar); +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 d0d6be236..58a4c0164 100644 --- a/src/osgWrappers/osg/CopyOp.cpp +++ b/src/osgWrappers/osg/CopyOp.cpp @@ -23,25 +23,33 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(unsigned int, osg::CopyOp::CopyFlags); BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) - EnumLabel(osg::CopyOp::SHALLOW_COPY); - EnumLabel(osg::CopyOp::DEEP_COPY_OBJECTS); - EnumLabel(osg::CopyOp::DEEP_COPY_NODES); - EnumLabel(osg::CopyOp::DEEP_COPY_DRAWABLES); - EnumLabel(osg::CopyOp::DEEP_COPY_STATESETS); - EnumLabel(osg::CopyOp::DEEP_COPY_STATEATTRIBUTES); - EnumLabel(osg::CopyOp::DEEP_COPY_TEXTURES); - EnumLabel(osg::CopyOp::DEEP_COPY_IMAGES); - EnumLabel(osg::CopyOp::DEEP_COPY_ARRAYS); - EnumLabel(osg::CopyOp::DEEP_COPY_PRIMITIVES); - EnumLabel(osg::CopyOp::DEEP_COPY_SHAPES); - EnumLabel(osg::CopyOp::DEEP_COPY_UNIFORMS); - EnumLabel(osg::CopyOp::DEEP_COPY_ALL); + 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 BEGIN_VALUE_REFLECTOR(osg::CopyOp) - ConstructorWithDefaults1(IN, osg::CopyOp::CopyFlags, flags, osg::CopyOp::SHALLOW_COPY); + I_ConstructorWithDefaults1(IN, osg::CopyOp::CopyFlags, flags, osg::CopyOp::SHALLOW_COPY); END_REFLECTOR diff --git a/src/osgWrappers/osg/CullFace.cpp b/src/osgWrappers/osg/CullFace.cpp index 73772eb43..03b48af48 100644 --- a/src/osgWrappers/osg/CullFace.cpp +++ b/src/osgWrappers/osg/CullFace.cpp @@ -15,28 +15,36 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::CullFace::Mode) - EnumLabel(osg::CullFace::FRONT); - EnumLabel(osg::CullFace::BACK); - EnumLabel(osg::CullFace::FRONT_AND_BACK); + I_EnumLabel(osg::CullFace::FRONT); + I_EnumLabel(osg::CullFace::BACK); + I_EnumLabel(osg::CullFace::FRONT_AND_BACK); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::CullFace) - BaseType(osg::StateAttribute); - ConstructorWithDefaults1(IN, osg::CullFace::Mode, mode, osg::CullFace::BACK); - ConstructorWithDefaults2(IN, const osg::CullFace &, cf, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setMode, IN, osg::CullFace::Mode, mode); - Method0(osg::CullFace::Mode, getMode); - Method1(void, apply, IN, osg::State &, state); - Property(osg::CullFace::Mode, Mode); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/CullSettings.cpp b/src/osgWrappers/osg/CullSettings.cpp index a640e6e4a..a403c25e4 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -15,105 +15,113 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode); BEGIN_ENUM_REFLECTOR(osg::CullSettings::VariablesMask) - EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_MODE); - EnumLabel(osg::CullSettings::CULLING_MODE); - EnumLabel(osg::CullSettings::LOD_SCALE); - EnumLabel(osg::CullSettings::SMALL_FEATURE_CULLING_PIXEL_SIZE); - EnumLabel(osg::CullSettings::CLAMP_PROJECTION_MATRIX_CALLBACK); - EnumLabel(osg::CullSettings::NEAR_FAR_RATIO); - EnumLabel(osg::CullSettings::IMPOSTOR_ACTIVE); - EnumLabel(osg::CullSettings::DEPTH_SORT_IMPOSTOR_SPRITES); - EnumLabel(osg::CullSettings::IMPOSTOR_PIXEL_ERROR_THRESHOLD); - EnumLabel(osg::CullSettings::NUM_FRAMES_TO_KEEP_IMPOSTORS_SPRITES); - EnumLabel(osg::CullSettings::CULL_MASK); - EnumLabel(osg::CullSettings::CULL_MASK_LEFT); - EnumLabel(osg::CullSettings::CULL_MASK_RIGHT); - EnumLabel(osg::CullSettings::NO_VARIABLES); - EnumLabel(osg::CullSettings::ALL_VARIABLES); + 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_ENUM_REFLECTOR(osg::CullSettings::ComputeNearFarMode) - EnumLabel(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR); - EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES); - EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_USING_PRIMITIVES); + 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) - EnumLabel(osg::CullSettings::NO_CULLING); - EnumLabel(osg::CullSettings::VIEW_FRUSTUM_SIDES_CULLING); - EnumLabel(osg::CullSettings::NEAR_PLANE_CULLING); - EnumLabel(osg::CullSettings::FAR_PLANE_CULLING); - EnumLabel(osg::CullSettings::VIEW_FRUSTUM_CULLING); - EnumLabel(osg::CullSettings::SMALL_FEATURE_CULLING); - EnumLabel(osg::CullSettings::SHADOW_OCCLUSION_CULLING); - EnumLabel(osg::CullSettings::CLUSTER_CULLING); - EnumLabel(osg::CullSettings::DEFAULT_CULLING); - EnumLabel(osg::CullSettings::ENABLE_ALL_CULLING); + 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 BEGIN_VALUE_REFLECTOR(osg::CullSettings) - Constructor0(); - Constructor1(IN, osg::ArgumentParser &, arguments); - Constructor1(IN, const osg::CullSettings &, cs); - Method0(void, setDefaults); - Method1(void, setInheritanceMask, IN, unsigned int, mask); - Method0(unsigned int, getInheritanceMask); - Method1(void, setCullSettings, IN, const osg::CullSettings &, settings); - Method1(void, inheritCullSettings, IN, const osg::CullSettings &, settings); - Method2(void, inheritCullSettings, IN, const osg::CullSettings &, settings, IN, unsigned int, inheritanceMask); - Method0(void, readEnvironmentalVariables); - Method1(void, readCommandLine, IN, osg::ArgumentParser &, arguments); - Method1(void, setImpostorsActive, IN, bool, active); - Method0(bool, getImpostorsActive); - Method1(void, setImpostorPixelErrorThreshold, IN, float, numPixels); - Method0(float, getImpostorPixelErrorThreshold); - Method1(void, setDepthSortImpostorSprites, IN, bool, doDepthSort); - Method0(bool, getDepthSortImpostorSprites); - Method1(void, setNumberOfFrameToKeepImpostorSprites, IN, int, numFrames); - Method0(int, getNumberOfFrameToKeepImpostorSprites); - Method1(void, setComputeNearFarMode, IN, osg::CullSettings::ComputeNearFarMode, cnfm); - Method0(osg::CullSettings::ComputeNearFarMode, getComputeNearFarMode); - Method1(void, setNearFarRatio, IN, double, ratio); - Method0(double, getNearFarRatio); - Method1(void, setCullingMode, IN, osg::CullSettings::CullingMode, mode); - Method0(osg::CullSettings::CullingMode, getCullingMode); - Method1(void, setCullMask, IN, osg::Node::NodeMask, nm); - Method0(osg::Node::NodeMask, getCullMask); - Method1(void, setCullMaskLeft, IN, osg::Node::NodeMask, nm); - Method0(osg::Node::NodeMask, getCullMaskLeft); - Method1(void, setCullMaskRight, IN, osg::Node::NodeMask, nm); - Method0(osg::Node::NodeMask, getCullMaskRight); - Method1(void, setLODScale, IN, float, bias); - Method0(float, getLODScale); - Method1(void, setSmallFeatureCullingPixelSize, IN, float, value); - Method0(float, getSmallFeatureCullingPixelSize); - Method1(void, setClampProjectionMatrixCallback, IN, osg::CullSettings::ClampProjectionMatrixCallback *, cpmc); - Method0(osg::CullSettings::ClampProjectionMatrixCallback *, getClampProjectionMatrixCallback); - Method0(const osg::CullSettings::ClampProjectionMatrixCallback *, getClampProjectionMatrixCallback); - Property(osg::CullSettings::ClampProjectionMatrixCallback *, ClampProjectionMatrixCallback); - Property(osg::CullSettings::ComputeNearFarMode, ComputeNearFarMode); - Property(osg::Node::NodeMask, CullMask); - Property(osg::Node::NodeMask, CullMaskLeft); - Property(osg::Node::NodeMask, CullMaskRight); - WriteOnlyProperty(const osg::CullSettings &, CullSettings); - Property(osg::CullSettings::CullingMode, CullingMode); - Property(bool, DepthSortImpostorSprites); - Property(float, ImpostorPixelErrorThreshold); - Property(bool, ImpostorsActive); - Property(unsigned int, InheritanceMask); - Property(float, LODScale); - Property(double, NearFarRatio); - Property(int, NumberOfFrameToKeepImpostorSprites); - Property(float, SmallFeatureCullingPixelSize); + 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); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CullSettings::ClampProjectionMatrixCallback) - BaseType(osg::Referenced); - Constructor0(); - Method3(bool, clampProjectionMatrixImplementation, IN, osg::Matrixf &, projection, IN, double &, znear, IN, double &, zfar); - Method3(bool, clampProjectionMatrixImplementation, IN, osg::Matrixd &, projection, IN, double &, znear, IN, double &, zfar); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/CullStack.cpp b/src/osgWrappers/osg/CullStack.cpp index 073c244d8..598b6be9c 100644 --- a/src/osgWrappers/osg/CullStack.cpp +++ b/src/osgWrappers/osg/CullStack.cpp @@ -19,6 +19,14 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullStack::OccluderList); TYPE_NAME_ALIAS(std::vector< osg::CullingSet >, osg::CullStack::CullingStack); diff --git a/src/osgWrappers/osg/CullingSet.cpp b/src/osgWrappers/osg/CullingSet.cpp index f49946c4b..a8d538332 100644 --- a/src/osgWrappers/osg/CullingSet.cpp +++ b/src/osgWrappers/osg/CullingSet.cpp @@ -19,54 +19,62 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullingSet::OccluderList); TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask); BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues) - EnumLabel(osg::CullingSet::NO_CULLING); - EnumLabel(osg::CullingSet::VIEW_FRUSTUM_SIDES_CULLING); - EnumLabel(osg::CullingSet::NEAR_PLANE_CULLING); - EnumLabel(osg::CullingSet::FAR_PLANE_CULLING); - EnumLabel(osg::CullingSet::VIEW_FRUSTUM_CULLING); - EnumLabel(osg::CullingSet::SMALL_FEATURE_CULLING); - EnumLabel(osg::CullingSet::SHADOW_OCCLUSION_CULLING); - EnumLabel(osg::CullingSet::DEFAULT_CULLING); - EnumLabel(osg::CullingSet::ENABLE_ALL_CULLING); + 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::CullingSet) - BaseType(osg::Referenced); - Constructor0(); - Constructor1(IN, const osg::CullingSet &, cs); - Constructor3(IN, const osg::CullingSet &, cs, IN, const osg::Matrix &, matrix, IN, const osg::Vec4 &, pixelSizeVector); - Method1(void, set, IN, const osg::CullingSet &, cs); - Method3(void, set, IN, const osg::CullingSet &, cs, IN, const osg::Matrix &, matrix, IN, const osg::Vec4 &, pixelSizeVector); - Method1(void, setCullingMask, IN, osg::CullingSet::Mask, mask); - Method0(osg::CullingSet::Mask, getCullingMask); - Method1(void, setFrustum, IN, osg::Polytope &, cv); - Method0(osg::Polytope &, getFrustum); - Method0(const osg::Polytope &, getFrustum); - Method1(void, addOccluder, IN, osg::ShadowVolumeOccluder &, cv); - Method1(void, setPixelSizeVector, IN, const osg::Vec4 &, v); - Method0(osg::Vec4 &, getPixelSizeVector); - Method0(const osg::Vec4 &, getPixelSizeVector); - Method1(void, setSmallFeatureCullingPixelSize, IN, float, value); - Method0(float &, getSmallFeatureCullingPixelSize); - Method0(float, getSmallFeatureCullingPixelSize); - Method2(float, pixelSize, IN, const osg::Vec3 &, v, IN, float, radius); - Method1(float, pixelSize, IN, const osg::BoundingSphere &, bs); - Method1(bool, isCulled, IN, const std::vector< osg::Vec3 > &, vertices); - Method1(bool, isCulled, IN, const osg::BoundingBox &, bb); - Method1(bool, isCulled, IN, const osg::BoundingSphere &, bs); - Method0(void, pushCurrentMask); - Method0(void, popCurrentMask); - Method1(void, disableAndPushOccludersCurrentMask, IN, osg::NodePath &, nodePath); - Method1(void, popOccludersCurrentMask, IN, osg::NodePath &, nodePath); - WriteOnlyProperty(const osg::CullingSet &, ); - Property(osg::CullingSet::Mask, CullingMask); - Property(osg::Polytope &, Frustum); - Property(const osg::Vec4 &, PixelSizeVector); - Property(float, SmallFeatureCullingPixelSize); +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_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_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); END_REFLECTOR diff --git a/src/osgWrappers/osg/Depth.cpp b/src/osgWrappers/osg/Depth.cpp index 95f83cf8f..031368db4 100644 --- a/src/osgWrappers/osg/Depth.cpp +++ b/src/osgWrappers/osg/Depth.cpp @@ -15,43 +15,51 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Depth::Function) - EnumLabel(osg::Depth::NEVER); - EnumLabel(osg::Depth::LESS); - EnumLabel(osg::Depth::EQUAL); - EnumLabel(osg::Depth::LEQUAL); - EnumLabel(osg::Depth::GREATER); - EnumLabel(osg::Depth::NOTEQUAL); - EnumLabel(osg::Depth::GEQUAL); - EnumLabel(osg::Depth::ALWAYS); + 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 BEGIN_OBJECT_REFLECTOR(osg::Depth) - BaseType(osg::StateAttribute); - ConstructorWithDefaults4(IN, osg::Depth::Function, func, osg::Depth::LESS, IN, double, zNear, 0.0, IN, double, zFar, 1.0, IN, bool, writeMask, true); - ConstructorWithDefaults2(IN, const osg::Depth &, dp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setFunction, IN, osg::Depth::Function, func); - Method0(osg::Depth::Function, getFunction); - Method2(void, setRange, IN, double, zNear, IN, double, zFar); - Method1(void, setZNear, IN, double, zNear); - Method0(double, getZNear); - Method1(void, setZFar, IN, double, zFar); - Method0(double, getZFar); - Method1(void, setWriteMask, IN, bool, mask); - Method0(bool, getWriteMask); - Method1(void, apply, IN, osg::State &, state); - Property(osg::Depth::Function, Function); - ReadOnlyProperty(osg::StateAttribute::Type, Type); - Property(bool, WriteMask); - Property(double, ZFar); - Property(double, ZNear); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/DisplaySettings.cpp b/src/osgWrappers/osg/DisplaySettings.cpp index aed92f7f4..fb9beb57d 100644 --- a/src/osgWrappers/osg/DisplaySettings.cpp +++ b/src/osgWrappers/osg/DisplaySettings.cpp @@ -12,100 +12,108 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::DisplayType) - EnumLabel(osg::DisplaySettings::MONITOR); - EnumLabel(osg::DisplaySettings::POWERWALL); - EnumLabel(osg::DisplaySettings::REALITY_CENTER); - EnumLabel(osg::DisplaySettings::HEAD_MOUNTED_DISPLAY); + 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) - EnumLabel(osg::DisplaySettings::QUAD_BUFFER); - EnumLabel(osg::DisplaySettings::ANAGLYPHIC); - EnumLabel(osg::DisplaySettings::HORIZONTAL_SPLIT); - EnumLabel(osg::DisplaySettings::VERTICAL_SPLIT); - EnumLabel(osg::DisplaySettings::LEFT_EYE); - EnumLabel(osg::DisplaySettings::RIGHT_EYE); + 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); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::SplitStereoHorizontalEyeMapping) - EnumLabel(osg::DisplaySettings::LEFT_EYE_LEFT_VIEWPORT); - EnumLabel(osg::DisplaySettings::LEFT_EYE_RIGHT_VIEWPORT); + I_EnumLabel(osg::DisplaySettings::LEFT_EYE_LEFT_VIEWPORT); + I_EnumLabel(osg::DisplaySettings::LEFT_EYE_RIGHT_VIEWPORT); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::SplitStereoVerticalEyeMapping) - EnumLabel(osg::DisplaySettings::LEFT_EYE_TOP_VIEWPORT); - EnumLabel(osg::DisplaySettings::LEFT_EYE_BOTTOM_VIEWPORT); + I_EnumLabel(osg::DisplaySettings::LEFT_EYE_TOP_VIEWPORT); + I_EnumLabel(osg::DisplaySettings::LEFT_EYE_BOTTOM_VIEWPORT); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) - BaseType(osg::Referenced); - Constructor0(); - Constructor1(IN, osg::ArgumentParser &, arguments); - Constructor1(IN, const osg::DisplaySettings &, vs); - Method1(void, setDisplaySettings, IN, const osg::DisplaySettings &, vs); - Method1(void, merge, IN, const osg::DisplaySettings &, vs); - Method0(void, setDefaults); - Method0(void, readEnvironmentalVariables); - Method1(void, readCommandLine, IN, osg::ArgumentParser &, arguments); - Method1(void, setDisplayType, IN, osg::DisplaySettings::DisplayType, type); - Method0(osg::DisplaySettings::DisplayType, getDisplayType); - Method1(void, setStereo, IN, bool, on); - Method0(bool, getStereo); - Method1(void, setStereoMode, IN, osg::DisplaySettings::StereoMode, mode); - Method0(osg::DisplaySettings::StereoMode, getStereoMode); - Method1(void, setEyeSeparation, IN, float, eyeSeparation); - Method0(float, getEyeSeparation); - Method1(void, setSplitStereoHorizontalEyeMapping, IN, osg::DisplaySettings::SplitStereoHorizontalEyeMapping, m); - Method0(osg::DisplaySettings::SplitStereoHorizontalEyeMapping, getSplitStereoHorizontalEyeMapping); - Method1(void, setSplitStereoHorizontalSeparation, IN, int, s); - Method0(int, getSplitStereoHorizontalSeparation); - Method1(void, setSplitStereoVerticalEyeMapping, IN, osg::DisplaySettings::SplitStereoVerticalEyeMapping, m); - Method0(osg::DisplaySettings::SplitStereoVerticalEyeMapping, getSplitStereoVerticalEyeMapping); - Method1(void, setSplitStereoVerticalSeparation, IN, int, s); - Method0(int, getSplitStereoVerticalSeparation); - Method1(void, setSplitStereoAutoAjustAspectRatio, IN, bool, flag); - Method0(bool, getSplitStereoAutoAjustAspectRatio); - Method1(void, setScreenWidth, IN, float, width); - Method0(float, getScreenWidth); - Method1(void, setScreenHeight, IN, float, height); - Method0(float, getScreenHeight); - Method1(void, setScreenDistance, IN, float, distance); - Method0(float, getScreenDistance); - Method1(void, setDoubleBuffer, IN, bool, flag); - Method0(bool, getDoubleBuffer); - Method1(void, setRGB, IN, bool, flag); - Method0(bool, getRGB); - Method1(void, setDepthBuffer, IN, bool, flag); - Method0(bool, getDepthBuffer); - Method1(void, setMinimumNumAlphaBits, IN, unsigned int, bits); - Method0(unsigned int, getMinimumNumAlphaBits); - Method0(bool, getAlphaBuffer); - Method1(void, setMinimumNumStencilBits, IN, unsigned int, bits); - Method0(unsigned int, getMinimumNumStencilBits); - Method0(bool, getStencilBuffer); - Method1(void, setMaxNumberOfGraphicsContexts, IN, unsigned int, num); - Method0(unsigned int, getMaxNumberOfGraphicsContexts); - ReadOnlyProperty(bool, AlphaBuffer); - Property(bool, DepthBuffer); - WriteOnlyProperty(const osg::DisplaySettings &, DisplaySettings); - Property(osg::DisplaySettings::DisplayType, DisplayType); - Property(bool, DoubleBuffer); - Property(float, EyeSeparation); - Property(unsigned int, MaxNumberOfGraphicsContexts); - Property(unsigned int, MinimumNumAlphaBits); - Property(unsigned int, MinimumNumStencilBits); - Property(bool, RGB); - Property(float, ScreenDistance); - Property(float, ScreenHeight); - Property(float, ScreenWidth); - Property(bool, SplitStereoAutoAjustAspectRatio); - Property(osg::DisplaySettings::SplitStereoHorizontalEyeMapping, SplitStereoHorizontalEyeMapping); - Property(int, SplitStereoHorizontalSeparation); - Property(osg::DisplaySettings::SplitStereoVerticalEyeMapping, SplitStereoVerticalEyeMapping); - Property(int, SplitStereoVerticalSeparation); - ReadOnlyProperty(bool, StencilBuffer); - Property(bool, Stereo); - Property(osg::DisplaySettings::StereoMode, StereoMode); + 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_Method1(void, setMaxNumberOfGraphicsContexts, IN, unsigned int, num); + I_Method0(unsigned int, getMaxNumberOfGraphicsContexts); + 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_Property(unsigned int, MinimumNumAlphaBits); + I_Property(unsigned int, MinimumNumStencilBits); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/DrawPixels.cpp b/src/osgWrappers/osg/DrawPixels.cpp index 6c4baad71..8ef20bc0f 100644 --- a/src/osgWrappers/osg/DrawPixels.cpp +++ b/src/osgWrappers/osg/DrawPixels.cpp @@ -17,29 +17,37 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::DrawPixels) - BaseType(osg::Drawable); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::DrawPixels &, drawimage, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setPosition, IN, const osg::Vec3 &, position); - Method0(osg::Vec3 &, getPosition); - Method0(const osg::Vec3 &, getPosition); - Method1(void, setImage, IN, osg::Image *, image); - Method0(osg::Image *, getImage); - Method0(const osg::Image *, getImage); - Method1(void, setUseSubImage, IN, bool, useSubImage); - Method0(bool, getUseSubImage); - Method4(void, setSubImageDimensions, IN, unsigned int, offsetX, IN, unsigned int, offsetY, IN, unsigned int, width, IN, unsigned int, height); - Method4(void, getSubImageDimensions, IN, unsigned int &, offsetX, IN, unsigned int &, offsetY, IN, unsigned int &, width, IN, unsigned int &, height); - Method1(void, drawImplementation, IN, osg::State &, state); - Method0(osg::BoundingBox, computeBound); - Property(osg::Image *, Image); - Property(const osg::Vec3 &, Position); - Property(bool, UseSubImage); + I_BaseType(osg::Drawable); + 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 3633db3dc..b0d72bf29 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -25,264 +25,272 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::Drawable::ParentList); TYPE_NAME_ALIAS(unsigned int, osg::Drawable::AttributeType); BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes) - EnumLabel(osg::Drawable::VERTICES); - EnumLabel(osg::Drawable::WEIGHTS); - EnumLabel(osg::Drawable::NORMALS); - EnumLabel(osg::Drawable::COLORS); - EnumLabel(osg::Drawable::SECONDARY_COLORS); - EnumLabel(osg::Drawable::FOG_COORDS); - EnumLabel(osg::Drawable::ATTIBUTE_6); - EnumLabel(osg::Drawable::ATTIBUTE_7); - EnumLabel(osg::Drawable::TEXTURE_COORDS); - EnumLabel(osg::Drawable::TEXTURE_COORDS_0); - EnumLabel(osg::Drawable::TEXTURE_COORDS_1); - EnumLabel(osg::Drawable::TEXTURE_COORDS_2); - EnumLabel(osg::Drawable::TEXTURE_COORDS_3); - EnumLabel(osg::Drawable::TEXTURE_COORDS_4); - EnumLabel(osg::Drawable::TEXTURE_COORDS_5); - EnumLabel(osg::Drawable::TEXTURE_COORDS_6); - EnumLabel(osg::Drawable::TEXTURE_COORDS_7); + 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::ATTIBUTE_6); + I_EnumLabel(osg::Drawable::ATTIBUTE_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_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Drawable &, drawable, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::Geometry *, asGeometry); - Method0(const osg::Geometry *, asGeometry); - Method0(const osg::Drawable::ParentList &, getParents); - Method0(osg::Drawable::ParentList, getParents); - Method1(osg::Node *, getParent, IN, unsigned int, i); - Method1(const osg::Node *, getParent, IN, unsigned int, i); - Method0(unsigned int, getNumParents); - Method1(void, setStateSet, IN, osg::StateSet *, stateset); - Method0(osg::StateSet *, getStateSet); - Method0(const osg::StateSet *, getStateSet); - Method0(osg::StateSet *, getOrCreateStateSet); - Method1(void, setInitialBound, IN, const osg::BoundingBox &, bbox); - Method0(const osg::BoundingBox &, getInitialBound); - Method0(void, dirtyBound); - Method0(const osg::BoundingBox &, getBound); - Method0(osg::BoundingBox, computeBound); - Method1(void, setComputeBoundingBoxCallback, IN, osg::Drawable::ComputeBoundingBoxCallback *, callback); - Method0(osg::Drawable::ComputeBoundingBoxCallback *, getComputeBoundingBoxCallback); - Method0(const osg::Drawable::ComputeBoundingBoxCallback *, getComputeBoundingBoxCallback); - Method1(void, setShape, IN, osg::Shape *, shape); - Method0(osg::Shape *, getShape); - Method0(const osg::Shape *, getShape); - Method1(void, setSupportsDisplayList, IN, bool, flag); - Method0(bool, getSupportsDisplayList); - Method1(void, setUseDisplayList, IN, bool, flag); - Method0(bool, getUseDisplayList); - Method1(void, setUseVertexBufferObjects, IN, bool, flag); - Method0(bool, getUseVertexBufferObjects); - Method0(void, dirtyDisplayList); - Method0(unsigned int, getGLObjectSizeHint); - Method1(void, draw, IN, osg::State &, state); - Method1(void, compileGLObjects, IN, osg::State &, state); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - Method1(void, setUpdateCallback, IN, osg::Drawable::UpdateCallback *, ac); - Method0(osg::Drawable::UpdateCallback *, getUpdateCallback); - Method0(const osg::Drawable::UpdateCallback *, getUpdateCallback); - Method0(bool, requiresUpdateTraversal); - Method1(void, setEventCallback, IN, osg::Drawable::EventCallback *, ac); - Method0(osg::Drawable::EventCallback *, getEventCallback); - Method0(const osg::Drawable::EventCallback *, getEventCallback); - Method0(bool, requiresEventTraversal); - Method1(void, setCullCallback, IN, osg::Drawable::CullCallback *, cc); - Method0(osg::Drawable::CullCallback *, getCullCallback); - Method0(const osg::Drawable::CullCallback *, getCullCallback); - Method1(void, setDrawCallback, IN, osg::Drawable::DrawCallback *, dc); - Method0(osg::Drawable::DrawCallback *, getDrawCallback); - Method0(const osg::Drawable::DrawCallback *, getDrawCallback); - Method1(void, drawImplementation, IN, osg::State &, state); - Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); - Method1(void, accept, IN, osg::Drawable::AttributeFunctor &, x); - Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); - Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, x); - Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); - Method1(void, accept, IN, osg::PrimitiveFunctor &, x); - Method1(bool, supports, IN, const osg::PrimitiveIndexFunctor &, x); - Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, x); - ReadOnlyProperty(const osg::BoundingBox &, Bound); - Property(osg::Drawable::ComputeBoundingBoxCallback *, ComputeBoundingBoxCallback); - Property(osg::Drawable::CullCallback *, CullCallback); - Property(osg::Drawable::DrawCallback *, DrawCallback); - Property(osg::Drawable::EventCallback *, EventCallback); - ReadOnlyProperty(unsigned int, GLObjectSizeHint); - Property(const osg::BoundingBox &, InitialBound); - ArrayProperty_G(osg::Node *, Parent, Parents, unsigned int, void); - ReadOnlyProperty(osg::Drawable::ParentList, Parents); - Property(osg::Shape *, Shape); - Property(osg::StateSet *, StateSet); - Property(bool, SupportsDisplayList); - Property(osg::Drawable::UpdateCallback *, UpdateCallback); - Property(bool, UseDisplayList); - Property(bool, UseVertexBufferObjects); + 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(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); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::Drawable::AttributeFunctor) - Constructor0(); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLbyte *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLshort *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLint *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLubyte *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLushort *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, GLuint *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, float *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec2 *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec3 *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec4 *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::UByte4 *, x); + 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::UByte4 *, x); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) - BaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::Drawable::ComputeBoundingBoxCallback &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(osg::BoundingBox, computeBound, IN, const osg::Drawable &, x); +BEGIN_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) + I_BaseType(osg::Object); + 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) - Constructor0(); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLbyte *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLshort *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLint *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLubyte *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLushort *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLuint *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const float *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec2 *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec3 *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::Vec4 *, x); - Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const osg::UByte4 *, x); + 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::UByte4 *, x); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::Drawable::CullCallback) - VirtualBaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::Drawable::CullCallback &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method3(bool, cull, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, x, IN, osg::State *, x); +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_VALUE_REFLECTOR(osg::Drawable::DrawCallback) - VirtualBaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::Drawable::DrawCallback &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method2(void, drawImplementation, IN, osg::State &, x, IN, const osg::Drawable *, x); +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_VALUE_REFLECTOR(osg::Drawable::EventCallback) - VirtualBaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::Drawable::EventCallback &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method2(void, event, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, x); +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) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::Drawable::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::Drawable::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method1(void, setVertexProgramSupported, IN, bool, flag); - Method0(bool, isVertexProgramSupported); - Method1(void, setSecondaryColorSupported, IN, bool, flag); - Method0(bool, isSecondaryColorSupported); - Method1(void, setFogCoordSupported, IN, bool, flag); - Method0(bool, isFogCoordSupported); - Method1(void, setMultiTexSupported, IN, bool, flag); - Method0(bool, isMultiTexSupported); - Method1(void, setOcclusionQuerySupported, IN, bool, flag); - Method0(bool, isOcclusionQuerySupported); - Method1(void, setARBOcclusionQuerySupported, IN, bool, flag); - Method0(bool, isARBOcclusionQuerySupported); - Method1(void, glSecondaryColor3ubv, IN, const GLubyte *, coord); - Method1(void, glSecondaryColor3fv, IN, const GLfloat *, coord); - Method1(void, glFogCoordfv, IN, const GLfloat *, coord); - Method2(void, glMultiTexCoord1f, IN, GLenum, target, IN, GLfloat, coord); - Method2(void, glMultiTexCoord2fv, IN, GLenum, target, IN, const GLfloat *, coord); - Method2(void, glMultiTexCoord3fv, IN, GLenum, target, IN, const GLfloat *, coord); - Method2(void, glMultiTexCoord4fv, IN, GLenum, target, IN, const GLfloat *, coord); - Method2(void, glVertexAttrib1s, IN, unsigned int, index, IN, GLshort, s); - Method2(void, glVertexAttrib1f, IN, unsigned int, index, IN, GLfloat, f); - Method2(void, glVertexAttrib2fv, IN, unsigned int, index, IN, const GLfloat *, v); - Method2(void, glVertexAttrib3fv, IN, unsigned int, index, IN, const GLfloat *, v); - Method2(void, glVertexAttrib4fv, IN, unsigned int, index, IN, const GLfloat *, v); - Method2(void, glVertexAttrib4ubv, IN, unsigned int, index, IN, const GLubyte *, v); - Method2(void, glVertexAttrib4Nubv, IN, unsigned int, index, IN, const GLubyte *, v); - Method2(void, glGenBuffers, IN, GLsizei, n, IN, GLuint *, buffers); - Method2(void, glBindBuffer, IN, GLenum, target, IN, GLuint, buffer); - Method4(void, glBufferData, IN, GLenum, target, IN, GLsizeiptrARB, size, IN, const GLvoid *, data, IN, GLenum, usage); - Method4(void, glBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, const GLvoid *, data); - Method2(void, glDeleteBuffers, IN, GLsizei, n, IN, const GLuint *, buffers); - Method1(GLboolean, glIsBuffer, IN, GLuint, buffer); - Method4(void, glGetBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, GLvoid *, data); - Method2(GLvoid *, glMapBuffer, IN, GLenum, target, IN, GLenum, access); - Method1(GLboolean, glUnmapBuffer, IN, GLenum, target); - Method3(void, glGetBufferParameteriv, IN, GLenum, target, IN, GLenum, pname, IN, GLint *, params); - Method3(void, glGetBufferPointerv, IN, GLenum, target, IN, GLenum, pname, IN, GLvoid **, params); - Method2(void, glGenOcclusionQueries, IN, GLsizei, n, IN, GLuint *, ids); - Method2(void, glDeleteOcclusionQueries, IN, GLsizei, n, IN, const GLuint *, ids); - Method1(GLboolean, glIsOcclusionQuery, IN, GLuint, id); - Method1(void, glBeginOcclusionQuery, IN, GLuint, id); - Method0(void, glEndOcclusionQuery); - Method3(void, glGetOcclusionQueryiv, IN, GLuint, id, IN, GLenum, pname, IN, GLint *, params); - Method3(void, glGetOcclusionQueryuiv, IN, GLuint, id, IN, GLenum, pname, IN, GLuint *, params); - Method3(void, glGetQueryiv, IN, GLenum, target, IN, GLenum, pname, IN, GLint *, params); - Method2(void, glGenQueries, IN, GLsizei, n, IN, GLuint *, ids); - Method2(void, glBeginQuery, IN, GLenum, target, IN, GLuint, id); - Method1(void, glEndQuery, IN, GLenum, target); - Method1(GLboolean, glIsQuery, IN, GLuint, id); - Method3(void, glGetQueryObjectiv, IN, GLuint, id, IN, GLenum, pname, IN, GLint *, params); - Method3(void, glGetQueryObjectuiv, IN, GLuint, id, IN, GLenum, pname, IN, GLuint *, params); - WriteOnlyProperty(bool, ARBOcclusionQuerySupported); - WriteOnlyProperty(bool, FogCoordSupported); - WriteOnlyProperty(bool, MultiTexSupported); - WriteOnlyProperty(bool, OcclusionQuerySupported); - WriteOnlyProperty(bool, SecondaryColorSupported); - WriteOnlyProperty(bool, VertexProgramSupported); - WriteOnlyProperty(unsigned int, upGLExtenions); + 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_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_VALUE_REFLECTOR(osg::Drawable::UpdateCallback) - VirtualBaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::Drawable::UpdateCallback &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method2(void, update, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, x); +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 f9ff36ad7..11feef7fc 100644 --- a/src/osgWrappers/osg/Fog.cpp +++ b/src/osgWrappers/osg/Fog.cpp @@ -16,48 +16,56 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Fog::Mode) - EnumLabel(osg::Fog::LINEAR); - EnumLabel(osg::Fog::EXP); - EnumLabel(osg::Fog::EXP2); + I_EnumLabel(osg::Fog::LINEAR); + I_EnumLabel(osg::Fog::EXP); + I_EnumLabel(osg::Fog::EXP2); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Fog::FogCoordinateSource) - EnumLabel(osg::Fog::FOG_COORDINATE); - EnumLabel(osg::Fog::FRAGMENT_DEPTH); + I_EnumLabel(osg::Fog::FOG_COORDINATE); + I_EnumLabel(osg::Fog::FRAGMENT_DEPTH); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Fog) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Fog &, fog, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setMode, IN, osg::Fog::Mode, mode); - Method0(osg::Fog::Mode, getMode); - Method1(void, setDensity, IN, float, density); - Method0(float, getDensity); - Method1(void, setStart, IN, float, start); - Method0(float, getStart); - Method1(void, setEnd, IN, float, end); - Method0(float, getEnd); - Method1(void, setColor, IN, const osg::Vec4 &, color); - Method0(const osg::Vec4 &, getColor); - Method1(void, setFogCoordinateSource, IN, GLint, source); - Method0(GLint, getFogCoordinateSource); - Method1(void, apply, IN, osg::State &, state); - Property(const osg::Vec4 &, Color); - Property(float, Density); - Property(float, End); - Property(GLint, FogCoordinateSource); - Property(osg::Fog::Mode, Mode); - Property(float, Start); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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 b46e0caae..8f0a46bd5 100644 --- a/src/osgWrappers/osg/FragmentProgram.cpp +++ b/src/osgWrappers/osg/FragmentProgram.cpp @@ -17,59 +17,67 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::FragmentProgram::LocalParamList); TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::FragmentProgram::MatrixList); BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::FragmentProgram &, vp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(GLuint &, getFragmentProgramID, IN, unsigned int, contextID); - Method1(void, setFragmentProgram, IN, const char *, program); - Method1(void, setFragmentProgram, IN, const std::string &, program); - Method0(const std::string &, getFragmentProgram); - Method2(void, setProgramLocalParameter, IN, const GLuint, index, IN, const osg::Vec4 &, p); - Method1(void, setLocalParameters, IN, const osg::FragmentProgram::LocalParamList &, lpl); - Method0(osg::FragmentProgram::LocalParamList &, getLocalParameters); - Method0(const osg::FragmentProgram::LocalParamList &, getLocalParameters); - Method2(void, setMatrix, IN, const GLenum, mode, IN, const osg::Matrix &, matrix); - Method1(void, setMatrices, IN, const osg::FragmentProgram::MatrixList &, matrices); - Method0(osg::FragmentProgram::MatrixList &, getMatrices); - Method0(const osg::FragmentProgram::MatrixList &, getMatrices); - Method0(void, dirtyFragmentProgramObject); - Method1(void, apply, IN, osg::State &, state); - Method1(void, compileGLObjects, IN, osg::State &, state); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - Property(const std::string &, FragmentProgram); - Property(const osg::FragmentProgram::LocalParamList &, LocalParameters); - Property(const osg::FragmentProgram::MatrixList &, Matrices); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::FragmentProgram::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::FragmentProgram::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method1(void, setFragmentProgramSupported, IN, bool, flag); - Method0(bool, isFragmentProgramSupported); - Method2(void, glBindProgram, IN, GLenum, target, IN, GLuint, id); - Method2(void, glGenPrograms, IN, GLsizei, n, IN, GLuint *, programs); - Method2(void, glDeletePrograms, IN, GLsizei, n, IN, GLuint *, programs); - Method4(void, glProgramString, IN, GLenum, target, IN, GLenum, format, IN, GLsizei, len, IN, const void *, string); - Method3(void, glProgramLocalParameter4fv, IN, GLenum, target, IN, GLuint, index, IN, const GLfloat *, params); - WriteOnlyProperty(bool, FragmentProgramSupported); - WriteOnlyProperty(unsigned int, upGLExtenions); + 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); END_REFLECTOR STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::Matrix >); diff --git a/src/osgWrappers/osg/FrameStamp.cpp b/src/osgWrappers/osg/FrameStamp.cpp index e5ba04bf4..0c599db98 100644 --- a/src/osgWrappers/osg/FrameStamp.cpp +++ b/src/osgWrappers/osg/FrameStamp.cpp @@ -11,18 +11,26 @@ #include -BEGIN_VALUE_REFLECTOR(osg::FrameStamp) - BaseType(osg::Referenced); - Constructor0(); - Constructor1(IN, const osg::FrameStamp &, fs); - Method1(void, setFrameNumber, IN, int, fnum); - Method0(int, getFrameNumber); - Method1(void, setReferenceTime, IN, double, refTime); - Method0(double, getReferenceTime); - Method1(void, setCalendarTime, IN, const tm &, calendarTime); - Method1(void, getCalendarTime, IN, tm &, calendarTime); - WriteOnlyProperty(const tm &, CalendarTime); - Property(int, FrameNumber); - Property(double, ReferenceTime); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osg::FrameStamp) + I_BaseType(osg::Referenced); + 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 74cea3f22..86a7f98d1 100644 --- a/src/osgWrappers/osg/FrontFace.cpp +++ b/src/osgWrappers/osg/FrontFace.cpp @@ -15,26 +15,34 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::FrontFace::Mode) - EnumLabel(osg::FrontFace::CLOCKWISE); - EnumLabel(osg::FrontFace::COUNTER_CLOCKWISE); + I_EnumLabel(osg::FrontFace::CLOCKWISE); + I_EnumLabel(osg::FrontFace::COUNTER_CLOCKWISE); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::FrontFace) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::FrontFace &, ff, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, setMode, IN, osg::FrontFace::Mode, mode); - Method0(osg::FrontFace::Mode, getMode); - Method1(void, apply, IN, osg::State &, state); - Property(osg::FrontFace::Mode, Mode); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/Geode.cpp b/src/osgWrappers/osg/Geode.cpp index 13ba73ffd..58ee79129 100644 --- a/src/osgWrappers/osg/Geode.cpp +++ b/src/osgWrappers/osg/Geode.cpp @@ -18,46 +18,56 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Drawable > >, osg::Geode::DrawableList); BEGIN_OBJECT_REFLECTOR(osg::Geode) - BaseType(osg::Node); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Geode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(bool, addDrawable, IN, osg::Drawable *, drawable); - Method1(bool, removeDrawable, IN, osg::Drawable *, drawable); - MethodWithDefaults2(bool, removeDrawable, IN, unsigned int, i, , IN, unsigned int, numDrawablesToRemove, 1); - Method2(bool, replaceDrawable, IN, osg::Drawable *, origDraw, IN, osg::Drawable *, newDraw); - Method2(bool, setDrawable, IN, unsigned int, i, IN, osg::Drawable *, drawable); - Method0(unsigned int, getNumDrawables); - Method1(osg::Drawable *, getDrawable, IN, unsigned int, i); - Method1(const osg::Drawable *, getDrawable, IN, unsigned int, i); - Method1(bool, containsDrawable, IN, const osg::Drawable *, gset); - Method1(unsigned int, getDrawableIndex, IN, const osg::Drawable *, drawable); - Method1(void, compileDrawables, IN, osg::State &, state); - Method0(const osg::BoundingBox &, getBoundingBox); - Method0(osg::BoundingSphere, computeBound); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - ReadOnlyProperty(const osg::BoundingBox &, BoundingBox); - ArrayProperty_GSA(osg::Drawable *, Drawable, Drawables, unsigned int, bool); + I_BaseType(osg::Node); + 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, removeDrawable, 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 >) - Constructor0(); - Constructor1(IN, osg::Drawable *, t); - Constructor1(IN, const osg::ref_ptr< osg::Drawable > &, rp); - Method0(bool, valid); - Method0(osg::Drawable *, get); - Method0(const osg::Drawable *, get); - Method0(osg::Drawable *, take); - Method0(osg::Drawable *, release); - ReadOnlyProperty(osg::Drawable *, ); + I_Constructor0(); + I_Constructor1(IN, osg::Drawable *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::Drawable > &, rp); + I_Method0(bool, valid); + I_Method0(osg::Drawable *, get); + I_Method0(const osg::Drawable *, get); + I_Method0(osg::Drawable *, take); + I_Method0(osg::Drawable *, release); + 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 db732fba6..3e8e74b00 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -17,207 +17,215 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< 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) - EnumLabel(osg::Geometry::BIND_OFF); - EnumLabel(osg::Geometry::BIND_OVERALL); - EnumLabel(osg::Geometry::BIND_PER_PRIMITIVE_SET); - EnumLabel(osg::Geometry::BIND_PER_PRIMITIVE); - EnumLabel(osg::Geometry::BIND_PER_VERTEX); + 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); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Geometry) - BaseType(osg::Drawable); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Geometry &, geometry, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::Geometry *, asGeometry); - Method0(const osg::Geometry *, asGeometry); - Method0(bool, empty); - Method1(void, setVertexArray, IN, osg::Array *, array); - Method0(osg::Array *, getVertexArray); - Method0(const osg::Array *, getVertexArray); - Method1(void, setVertexIndices, IN, osg::IndexArray *, array); - Method0(osg::IndexArray *, getVertexIndices); - Method0(const osg::IndexArray *, getVertexIndices); - Method1(void, setVertexData, IN, const osg::Geometry::ArrayData &, arrayData); - Method0(osg::Geometry::ArrayData &, getVertexData); - Method0(const osg::Geometry::ArrayData &, getVertexData); - Method1(void, setNormalBinding, IN, osg::Geometry::AttributeBinding, ab); - Method0(osg::Geometry::AttributeBinding, getNormalBinding); - Method1(void, setNormalArray, IN, osg::Vec3Array *, array); - Method0(osg::Vec3Array *, getNormalArray); - Method0(const osg::Vec3Array *, getNormalArray); - Method1(void, setNormalIndices, IN, osg::IndexArray *, array); - Method0(osg::IndexArray *, getNormalIndices); - Method0(const osg::IndexArray *, getNormalIndices); - Method1(void, setNormalData, IN, const osg::Geometry::Vec3ArrayData &, arrayData); - Method0(osg::Geometry::Vec3ArrayData &, getNormalData); - Method0(const osg::Geometry::Vec3ArrayData &, getNormalData); - Method1(void, setColorBinding, IN, osg::Geometry::AttributeBinding, ab); - Method0(osg::Geometry::AttributeBinding, getColorBinding); - Method1(void, setColorArray, IN, osg::Array *, array); - Method0(osg::Array *, getColorArray); - Method0(const osg::Array *, getColorArray); - Method1(void, setColorIndices, IN, osg::IndexArray *, array); - Method0(osg::IndexArray *, getColorIndices); - Method0(const osg::IndexArray *, getColorIndices); - Method1(void, setColorData, IN, const osg::Geometry::ArrayData &, arrayData); - Method0(osg::Geometry::ArrayData &, getColorData); - Method0(const osg::Geometry::ArrayData &, getColorData); - Method1(void, setSecondaryColorBinding, IN, osg::Geometry::AttributeBinding, ab); - Method0(osg::Geometry::AttributeBinding, getSecondaryColorBinding); - Method1(void, setSecondaryColorArray, IN, osg::Array *, array); - Method0(osg::Array *, getSecondaryColorArray); - Method0(const osg::Array *, getSecondaryColorArray); - Method1(void, setSecondaryColorIndices, IN, osg::IndexArray *, array); - Method0(osg::IndexArray *, getSecondaryColorIndices); - Method0(const osg::IndexArray *, getSecondaryColorIndices); - Method1(void, setSecondaryColorData, IN, const osg::Geometry::ArrayData &, arrayData); - Method0(osg::Geometry::ArrayData &, getSecondaryColorData); - Method0(const osg::Geometry::ArrayData &, getSecondaryColorData); - Method1(void, setFogCoordBinding, IN, osg::Geometry::AttributeBinding, ab); - Method0(osg::Geometry::AttributeBinding, getFogCoordBinding); - Method1(void, setFogCoordArray, IN, osg::Array *, array); - Method0(osg::Array *, getFogCoordArray); - Method0(const osg::Array *, getFogCoordArray); - Method1(void, setFogCoordIndices, IN, osg::IndexArray *, array); - Method0(osg::IndexArray *, getFogCoordIndices); - Method0(const osg::IndexArray *, getFogCoordIndices); - Method1(void, setFogCoordData, IN, const osg::Geometry::ArrayData &, arrayData); - Method0(osg::Geometry::ArrayData &, getFogCoordData); - Method0(const osg::Geometry::ArrayData &, getFogCoordData); - Method2(void, setTexCoordArray, IN, unsigned int, unit, IN, osg::Array *, x); - Method1(osg::Array *, getTexCoordArray, IN, unsigned int, unit); - Method1(const osg::Array *, getTexCoordArray, IN, unsigned int, unit); - Method2(void, setTexCoordIndices, IN, unsigned int, unit, IN, osg::IndexArray *, x); - Method1(osg::IndexArray *, getTexCoordIndices, IN, unsigned int, unit); - Method1(const osg::IndexArray *, getTexCoordIndices, IN, unsigned int, unit); - Method2(void, setTexCoordData, IN, unsigned int, index, IN, const osg::Geometry::ArrayData &, arrayData); - Method1(osg::Geometry::ArrayData &, getTexCoordData, IN, unsigned int, index); - Method1(const osg::Geometry::ArrayData &, getTexCoordData, IN, unsigned int, index); - Method0(unsigned int, getNumTexCoordArrays); - Method0(osg::Geometry::ArrayList &, getTexCoordArrayList); - Method0(const osg::Geometry::ArrayList &, getTexCoordArrayList); - Method2(void, setVertexAttribArray, IN, unsigned int, index, IN, osg::Array *, array); - Method1(osg::Array *, getVertexAttribArray, IN, unsigned int, index); - Method1(const osg::Array *, getVertexAttribArray, IN, unsigned int, index); - Method2(void, setVertexAttribIndices, IN, unsigned int, index, IN, osg::IndexArray *, array); - Method1(osg::IndexArray *, getVertexAttribIndices, IN, unsigned int, index); - Method1(const osg::IndexArray *, getVertexAttribIndices, IN, unsigned int, index); - Method2(void, setVertexAttribBinding, IN, unsigned int, index, IN, osg::Geometry::AttributeBinding, ab); - Method1(osg::Geometry::AttributeBinding, getVertexAttribBinding, IN, unsigned int, index); - Method2(void, setVertexAttribNormalize, IN, unsigned int, index, IN, GLboolean, norm); - Method1(GLboolean, getVertexAttribNormalize, IN, unsigned int, index); - Method2(void, setVertexAttribData, IN, unsigned int, index, IN, const osg::Geometry::ArrayData &, arrayData); - Method1(osg::Geometry::ArrayData &, getVertexAttribData, IN, unsigned int, index); - Method1(const osg::Geometry::ArrayData &, getVertexAttribData, IN, unsigned int, index); - Method0(unsigned int, getNumVertexAttribArrays); - Method0(osg::Geometry::ArrayList &, getVertexAttribArrayList); - Method0(const osg::Geometry::ArrayList &, getVertexAttribArrayList); - Method1(void, setPrimitiveSetList, IN, const osg::Geometry::PrimitiveSetList &, primitives); - Method0(osg::Geometry::PrimitiveSetList &, getPrimitiveSetList); - Method0(const osg::Geometry::PrimitiveSetList &, getPrimitiveSetList); - Method0(unsigned int, getNumPrimitiveSets); - Method1(osg::PrimitiveSet *, getPrimitiveSet, IN, unsigned int, pos); - Method1(const osg::PrimitiveSet *, getPrimitiveSet, IN, unsigned int, pos); - Method1(bool, addPrimitiveSet, IN, osg::PrimitiveSet *, primitiveset); - Method2(bool, setPrimitiveSet, IN, unsigned int, i, IN, osg::PrimitiveSet *, primitiveset); - Method2(bool, insertPrimitiveSet, IN, unsigned int, i, IN, osg::PrimitiveSet *, primitiveset); - MethodWithDefaults2(bool, removePrimitiveSet, IN, unsigned int, i, , IN, unsigned int, numElementsToRemove, 1); - Method1(unsigned int, getPrimitiveSetIndex, IN, const osg::PrimitiveSet *, primitiveset); - Method1(void, setFastPathHint, IN, bool, on); - Method0(bool, getFastPathHint); - Method0(bool, areFastPathsUsed); - Method0(bool, computeFastPathsUsed); - Method0(bool, verifyBindings); - Method0(void, computeCorrectBindingsAndArraySizes); - Method0(bool, suitableForOptimization); - Method1(void, copyToAndOptimize, IN, osg::Geometry &, target); - Method0(void, computeInternalOptimizedGeometry); - Method0(void, removeInternalOptimizedGeometry); - Method1(void, setInternalOptimizedGeometry, IN, osg::Geometry *, geometry); - Method0(osg::Geometry *, getInternalOptimizedGeometry); - Method0(const osg::Geometry *, getInternalOptimizedGeometry); - Method0(unsigned int, getGLObjectSizeHint); - Method1(void, drawImplementation, IN, osg::State &, state); - Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); - Method1(void, accept, IN, osg::Drawable::AttributeFunctor &, af); - Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); - Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); - Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); - Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); - Method1(bool, supports, IN, const osg::PrimitiveIndexFunctor &, x); - Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, pf); - Property(osg::Array *, ColorArray); - Property(osg::Geometry::AttributeBinding, ColorBinding); - Property(const osg::Geometry::ArrayData &, ColorData); - Property(osg::IndexArray *, ColorIndices); - Property(bool, FastPathHint); - Property(osg::Array *, FogCoordArray); - Property(osg::Geometry::AttributeBinding, FogCoordBinding); - Property(const osg::Geometry::ArrayData &, FogCoordData); - Property(osg::IndexArray *, FogCoordIndices); - ReadOnlyProperty(unsigned int, GLObjectSizeHint); - Property(osg::Geometry *, InternalOptimizedGeometry); - Property(osg::Vec3Array *, NormalArray); - Property(osg::Geometry::AttributeBinding, NormalBinding); - Property(const osg::Geometry::Vec3ArrayData &, NormalData); - Property(osg::IndexArray *, NormalIndices); - ArrayProperty_GSA(osg::PrimitiveSet *, PrimitiveSet, PrimitiveSets, unsigned int, bool); - Property(const osg::Geometry::PrimitiveSetList &, PrimitiveSetList); - Property(osg::Array *, SecondaryColorArray); - Property(osg::Geometry::AttributeBinding, SecondaryColorBinding); - Property(const osg::Geometry::ArrayData &, SecondaryColorData); - Property(osg::IndexArray *, SecondaryColorIndices); - ArrayProperty_G(osg::Array *, TexCoordArray, TexCoordArrays, unsigned int, void); - ReadOnlyProperty(osg::Geometry::ArrayList &, TexCoordArrayList); - IndexedProperty1(const osg::Geometry::ArrayData &, TexCoordData, unsigned int, index); - IndexedProperty1(osg::IndexArray *, TexCoordIndices, unsigned int, unit); - Property(osg::Array *, VertexArray); - ArrayProperty_G(osg::Array *, VertexAttribArray, VertexAttribArrays, unsigned int, void); - ReadOnlyProperty(osg::Geometry::ArrayList &, VertexAttribArrayList); - IndexedProperty1(osg::Geometry::AttributeBinding, VertexAttribBinding, unsigned int, index); - IndexedProperty1(const osg::Geometry::ArrayData &, VertexAttribData, unsigned int, index); - IndexedProperty1(osg::IndexArray *, VertexAttribIndices, unsigned int, index); - IndexedProperty1(GLboolean, VertexAttribNormalize, unsigned int, index); - Property(const osg::Geometry::ArrayData &, VertexData); - Property(osg::IndexArray *, VertexIndices); + I_BaseType(osg::Drawable); + 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::Vec3Array *, array); + I_Method0(osg::Vec3Array *, getNormalArray); + I_Method0(const osg::Vec3Array *, getNormalArray); + I_Method1(void, setNormalIndices, IN, osg::IndexArray *, array); + I_Method0(osg::IndexArray *, getNormalIndices); + I_Method0(const osg::IndexArray *, getNormalIndices); + I_Method1(void, setNormalData, IN, const osg::Geometry::Vec3ArrayData &, arrayData); + I_Method0(osg::Geometry::Vec3ArrayData &, getNormalData); + I_Method0(const osg::Geometry::Vec3ArrayData &, getNormalData); + I_Method1(void, 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::Vec3Array *, NormalArray); + I_Property(osg::Geometry::AttributeBinding, NormalBinding); + I_Property(const osg::Geometry::Vec3ArrayData &, 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) - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Geometry::ArrayData &, data, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - ConstructorWithDefaults3(IN, osg::Array *, a, , IN, osg::Geometry::AttributeBinding, b, , IN, GLboolean, n, GL_FALSE); - ConstructorWithDefaults4(IN, osg::Array *, a, , IN, osg::IndexArray *, i, , IN, osg::Geometry::AttributeBinding, b, , IN, GLboolean, n, GL_FALSE); - Method0(bool, empty); + 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) - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Geometry::Vec3ArrayData &, data, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - ConstructorWithDefaults3(IN, osg::Vec3Array *, a, , IN, osg::Geometry::AttributeBinding, b, , IN, GLboolean, n, GL_FALSE); - ConstructorWithDefaults4(IN, osg::Vec3Array *, a, , IN, osg::IndexArray *, i, , IN, osg::Geometry::AttributeBinding, b, , IN, GLboolean, n, GL_FALSE); - Method0(bool, empty); + 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 >) - Constructor0(); - Constructor1(IN, osg::PrimitiveSet *, t); - Constructor1(IN, const osg::ref_ptr< osg::PrimitiveSet > &, rp); - Method0(bool, valid); - Method0(osg::PrimitiveSet *, get); - Method0(const osg::PrimitiveSet *, get); - Method0(osg::PrimitiveSet *, take); - Method0(osg::PrimitiveSet *, release); - ReadOnlyProperty(osg::PrimitiveSet *, ); + I_Constructor0(); + I_Constructor1(IN, osg::PrimitiveSet *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::PrimitiveSet > &, rp); + I_Method0(bool, valid); + I_Method0(osg::PrimitiveSet *, get); + I_Method0(const osg::PrimitiveSet *, get); + I_Method0(osg::PrimitiveSet *, take); + I_Method0(osg::PrimitiveSet *, release); + I_ReadOnlyProperty(osg::PrimitiveSet *, ); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::Geometry::ArrayData >); diff --git a/src/osgWrappers/osg/Group.cpp b/src/osgWrappers/osg/Group.cpp index 628f503a6..118605573 100644 --- a/src/osgWrappers/osg/Group.cpp +++ b/src/osgWrappers/osg/Group.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -16,46 +17,55 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::Group) - BaseType(osg::Node); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Group &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(osg::Group *, asGroup); - Method0(const osg::Group *, asGroup); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(bool, addChild, IN, osg::Node *, child); - Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child); - Method1(bool, removeChild, IN, osg::Node *, child); - MethodWithDefaults2(bool, removeChild, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1); - Method2(bool, replaceChild, IN, osg::Node *, origChild, IN, osg::Node *, newChild); - Method0(unsigned int, getNumChildren); - Method2(bool, setChild, IN, unsigned int, i, IN, osg::Node *, node); - Method1(osg::Node *, getChild, IN, unsigned int, i); - Method1(const osg::Node *, getChild, IN, unsigned int, i); - Method1(bool, containsNode, IN, const osg::Node *, node); - Method1(unsigned int, getChildIndex, IN, const osg::Node *, node); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - ArrayProperty_GSA(osg::Node *, Child, Children, unsigned int, bool); + I_BaseType(osg::Node); + 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, 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 >) - Constructor0(); - Constructor1(IN, osg::Node *, t); - Constructor1(IN, const osg::ref_ptr< osg::Node > &, rp); - Method0(bool, valid); - Method0(osg::Node *, get); - Method0(const osg::Node *, get); - Method0(osg::Node *, take); - Method0(osg::Node *, release); - ReadOnlyProperty(osg::Node *, ); + I_Constructor0(); + I_Constructor1(IN, osg::Node *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::Node > &, rp); + I_Method0(bool, valid); + I_Method0(osg::Node *, get); + I_Method0(const osg::Node *, get); + I_Method0(osg::Node *, take); + I_Method0(osg::Node *, release); + I_ReadOnlyProperty(osg::Node *, ); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Node > >); diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index 4cebb33e4..145bfe534 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -14,85 +14,93 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::Image::MipmapDataType); BEGIN_ENUM_REFLECTOR(osg::Image::AllocationMode) - EnumLabel(osg::Image::NO_DELETE); - EnumLabel(osg::Image::USE_NEW_DELETE); - EnumLabel(osg::Image::USE_MALLOC_FREE); + 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) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Image &, image, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(int, compare, IN, const osg::Image &, rhs); - Method1(void, setFileName, IN, const std::string &, fileName); - Method0(const std::string &, getFileName); - Method1(void, setAllocationMode, IN, osg::Image::AllocationMode, mode); - Method0(osg::Image::AllocationMode, getAllocationMode); - MethodWithDefaults6(void, allocateImage, IN, int, s, , IN, int, t, , IN, int, r, , IN, GLenum, pixelFormat, , IN, GLenum, type, , IN, int, packing, 1); - 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); - Method6(void, readPixels, IN, int, x, IN, int, y, IN, int, width, IN, int, height, IN, GLenum, pixelFormat, IN, GLenum, type); - Method2(void, readImageFromCurrentTexture, IN, unsigned int, contextID, IN, bool, copyMipMapsIfAvailable); - Method3(void, scaleImage, IN, int, s, IN, int, t, IN, int, r); - Method4(void, scaleImage, IN, int, s, IN, int, t, IN, int, r, IN, GLenum, newDataType); - Method4(void, copySubImage, IN, int, s_offset, IN, int, t_offset, IN, int, r_offset, IN, osg::Image *, source); - Method0(int, s); - Method0(int, t); - Method0(int, r); - Method1(void, setInternalTextureFormat, IN, GLint, internalFormat); - Method0(GLint, getInternalTextureFormat); - Method1(void, setPixelFormat, IN, GLenum, pixelFormat); - Method0(GLenum, getPixelFormat); - Method0(GLenum, getDataType); - Method0(unsigned int, getPacking); - Method0(unsigned int, getPixelSizeInBits); - Method0(unsigned int, getRowSizeInBytes); - Method0(unsigned int, getImageSizeInBytes); - Method0(unsigned int, getTotalSizeInBytes); - Method0(unsigned int, getTotalSizeInBytesIncludingMipmaps); - Method0(bool, valid); - Method0(unsigned char *, data); - Method0(const unsigned char *, data); - MethodWithDefaults3(unsigned char *, data, IN, int, column, , IN, int, row, 0, IN, int, image, 0); - MethodWithDefaults3(const unsigned char *, data, IN, int, column, , IN, int, row, 0, IN, int, image, 0); - Method0(void, flipHorizontal); - Method0(void, flipVertical); - Method1(void, ensureValidSizeForTexturing, IN, GLint, maxTextureSize); - Method0(void, dirty); - Method1(void, setModifiedCount, IN, unsigned int, value); - Method0(unsigned int, getModifiedCount); - Method0(bool, isMipmap); - Method0(unsigned int, getNumMipmapLevels); - Method1(void, setMipmapLevels, IN, const osg::Image::MipmapDataType &, mipmapDataVector); - Method0(const osg::Image::MipmapDataType &, getMipmapLevels); - Method1(unsigned int, getMipmapOffset, IN, unsigned int, mipmapLevel); - Method1(unsigned char *, getMipmapData, IN, unsigned int, mipmapLevel); - Method1(const unsigned char *, getMipmapData, IN, unsigned int, mipmapLevel); - Method0(bool, isImageTranslucent); - Method1(void, setPixelBufferObject, IN, osg::PixelBufferObject *, buffer); - Method0(osg::PixelBufferObject *, getPixelBufferObject); - Method0(const osg::PixelBufferObject *, getPixelBufferObject); - Property(osg::Image::AllocationMode, AllocationMode); - ReadOnlyProperty(GLenum, DataType); - Property(const std::string &, FileName); - ReadOnlyProperty(unsigned int, ImageSizeInBytes); - Property(GLint, InternalTextureFormat); - Property(const osg::Image::MipmapDataType &, MipmapLevels); - Property(unsigned int, ModifiedCount); - ReadOnlyProperty(unsigned int, Packing); - Property(osg::PixelBufferObject *, PixelBufferObject); - Property(GLenum, PixelFormat); - ReadOnlyProperty(unsigned int, PixelSizeInBits); - ReadOnlyProperty(unsigned int, RowSizeInBytes); - ReadOnlyProperty(unsigned int, TotalSizeInBytes); - ReadOnlyProperty(unsigned int, TotalSizeInBytesIncludingMipmaps); + I_BaseType(osg::Object); + 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_Method2(void, readImageFromCurrentTexture, IN, unsigned int, contextID, IN, bool, copyMipMapsIfAvailable); + 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 >); diff --git a/src/osgWrappers/osg/ImageStream.cpp b/src/osgWrappers/osg/ImageStream.cpp index 61b978fde..6567558f8 100644 --- a/src/osgWrappers/osg/ImageStream.cpp +++ b/src/osgWrappers/osg/ImageStream.cpp @@ -14,43 +14,51 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::ImageStream::StreamStatus) - EnumLabel(osg::ImageStream::INVALID); - EnumLabel(osg::ImageStream::PLAYING); - EnumLabel(osg::ImageStream::PAUSED); - EnumLabel(osg::ImageStream::REWINDING); + 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) - EnumLabel(osg::ImageStream::NO_LOOPING); - EnumLabel(osg::ImageStream::LOOPING); + I_EnumLabel(osg::ImageStream::NO_LOOPING); + I_EnumLabel(osg::ImageStream::LOOPING); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::ImageStream) - BaseType(osg::Image); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::ImageStream &, image, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(int, compare, IN, const osg::Image &, rhs); - Method0(void, play); - Method0(void, pause); - Method0(void, rewind); - MethodWithDefaults1(void, quit, IN, bool, x, true); - Method0(osg::ImageStream::StreamStatus, getStatus); - Method1(void, setLoopingMode, IN, osg::ImageStream::LoopingMode, mode); - Method0(osg::ImageStream::LoopingMode, getLoopingMode); - Method1(void, setReferenceTime, IN, double, x); - Method0(double, getReferenceTime); - Method1(void, setTimeMultiplier, IN, double, x); - Method0(double, getTimeMultiplier); - Method0(void, update); - Property(osg::ImageStream::LoopingMode, LoopingMode); - Property(double, ReferenceTime); - ReadOnlyProperty(osg::ImageStream::StreamStatus, Status); - Property(double, TimeMultiplier); + I_BaseType(osg::Image); + 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 7fbe2a22d..1fdc94f4e 100644 --- a/src/osgWrappers/osg/LOD.cpp +++ b/src/osgWrappers/osg/LOD.cpp @@ -17,54 +17,62 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::pair< float COMMA float >, osg::LOD::MinMaxPair); TYPE_NAME_ALIAS(std::vector< osg::LOD::MinMaxPair >, osg::LOD::RangeList); BEGIN_ENUM_REFLECTOR(osg::LOD::CenterMode) - EnumLabel(osg::LOD::USE_BOUNDING_SPHERE_CENTER); - EnumLabel(osg::LOD::USER_DEFINED_CENTER); + I_EnumLabel(osg::LOD::USE_BOUNDING_SPHERE_CENTER); + I_EnumLabel(osg::LOD::USER_DEFINED_CENTER); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::LOD::RangeMode) - EnumLabel(osg::LOD::DISTANCE_FROM_EYE_POINT); - EnumLabel(osg::LOD::PIXEL_SIZE_ON_SCREEN); + I_EnumLabel(osg::LOD::DISTANCE_FROM_EYE_POINT); + I_EnumLabel(osg::LOD::PIXEL_SIZE_ON_SCREEN); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::LOD) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::LOD &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(bool, addChild, IN, osg::Node *, child); - Method3(bool, addChild, IN, osg::Node *, child, IN, float, min, IN, float, max); - Method1(bool, removeChild, IN, osg::Node *, child); - Method1(void, setCenterMode, IN, osg::LOD::CenterMode, mode); - Method0(osg::LOD::CenterMode, getCenterMode); - Method1(void, setCenter, IN, const osg::Vec3 &, center); - Method0(const osg::Vec3 &, getCenter); - Method1(void, setRadius, IN, float, radius); - Method0(float, getRadius); - Method1(void, setRangeMode, IN, osg::LOD::RangeMode, mode); - Method0(osg::LOD::RangeMode, getRangeMode); - Method3(void, setRange, IN, unsigned int, childNo, IN, float, min, IN, float, max); - Method1(float, getMinRange, IN, unsigned int, childNo); - Method1(float, getMaxRange, IN, unsigned int, childNo); - Method0(unsigned int, getNumRanges); - Method1(void, setRangeList, IN, const osg::LOD::RangeList &, rangeList); - Method0(const osg::LOD::RangeList &, getRangeList); - Method0(osg::BoundingSphere, computeBound); - Property(const osg::Vec3 &, Center); - Property(osg::LOD::CenterMode, CenterMode); - Property(float, Radius); - Property(const osg::LOD::RangeList &, RangeList); - Property(osg::LOD::RangeMode, RangeMode); + I_BaseType(osg::Group); + 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_Method1(bool, removeChild, IN, osg::Node *, child); + 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 >); diff --git a/src/osgWrappers/osg/Light.cpp b/src/osgWrappers/osg/Light.cpp index c8d6bccdf..5852f27b1 100644 --- a/src/osgWrappers/osg/Light.cpp +++ b/src/osgWrappers/osg/Light.cpp @@ -17,55 +17,63 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::Light) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Light &, light, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method0(unsigned int, getMember); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setLightNum, IN, int, num); - Method0(int, getLightNum); - Method1(void, setAmbient, IN, const osg::Vec4 &, ambient); - Method0(const osg::Vec4 &, getAmbient); - Method1(void, setDiffuse, IN, const osg::Vec4 &, diffuse); - Method0(const osg::Vec4 &, getDiffuse); - Method1(void, setSpecular, IN, const osg::Vec4 &, specular); - Method0(const osg::Vec4 &, getSpecular); - Method1(void, setPosition, IN, const osg::Vec4 &, position); - Method0(const osg::Vec4 &, getPosition); - Method1(void, setDirection, IN, const osg::Vec3 &, direction); - Method0(const osg::Vec3 &, getDirection); - Method1(void, setConstantAttenuation, IN, float, constant_attenuation); - Method0(float, getConstantAttenuation); - Method1(void, setLinearAttenuation, IN, float, linear_attenuation); - Method0(float, getLinearAttenuation); - Method1(void, setQuadraticAttenuation, IN, float, quadratic_attenuation); - Method0(float, getQuadraticAttenuation); - Method1(void, setSpotExponent, IN, float, spot_exponent); - Method0(float, getSpotExponent); - Method1(void, setSpotCutoff, IN, float, spot_cutoff); - Method0(float, getSpotCutoff); - Method0(void, captureLightState); - Method1(void, apply, IN, osg::State &, state); - Property(const osg::Vec4 &, Ambient); - Property(float, ConstantAttenuation); - Property(const osg::Vec4 &, Diffuse); - Property(const osg::Vec3 &, Direction); - Property(int, LightNum); - Property(float, LinearAttenuation); - ReadOnlyProperty(unsigned int, Member); - Property(const osg::Vec4 &, Position); - Property(float, QuadraticAttenuation); - Property(const osg::Vec4 &, Specular); - Property(float, SpotCutoff); - Property(float, SpotExponent); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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 9cd8e3639..fdf6a0840 100644 --- a/src/osgWrappers/osg/LightModel.cpp +++ b/src/osgWrappers/osg/LightModel.cpp @@ -16,35 +16,43 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::LightModel::ColorControl) - EnumLabel(osg::LightModel::SEPARATE_SPECULAR_COLOR); - EnumLabel(osg::LightModel::SINGLE_COLOR); + I_EnumLabel(osg::LightModel::SEPARATE_SPECULAR_COLOR); + I_EnumLabel(osg::LightModel::SINGLE_COLOR); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::LightModel) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::LightModel &, lw, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, setAmbientIntensity, IN, const osg::Vec4 &, ambient); - Method0(const osg::Vec4 &, getAmbientIntensity); - Method1(void, setColorControl, IN, osg::LightModel::ColorControl, cc); - Method0(osg::LightModel::ColorControl, getColorControl); - Method1(void, setLocalViewer, IN, bool, localViewer); - Method0(bool, getLocalViewer); - Method1(void, setTwoSided, IN, bool, twoSided); - Method0(bool, getTwoSided); - Method1(void, apply, IN, osg::State &, state); - Property(const osg::Vec4 &, AmbientIntensity); - Property(osg::LightModel::ColorControl, ColorControl); - Property(bool, LocalViewer); - Property(bool, TwoSided); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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 09874b852..85e1b273a 100644 --- a/src/osgWrappers/osg/LightSource.cpp +++ b/src/osgWrappers/osg/LightSource.cpp @@ -18,31 +18,39 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::LightSource::ReferenceFrame) - EnumLabel(osg::LightSource::RELATIVE_RF); - EnumLabel(osg::LightSource::ABSOLUTE_RF); + I_EnumLabel(osg::LightSource::RELATIVE_RF); + I_EnumLabel(osg::LightSource::ABSOLUTE_RF); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::LightSource) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::LightSource &, ls, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, setReferenceFrame, IN, osg::LightSource::ReferenceFrame, rf); - Method0(osg::LightSource::ReferenceFrame, getReferenceFrame); - Method1(void, setLight, IN, osg::Light *, light); - Method0(osg::Light *, getLight); - Method0(const osg::Light *, getLight); - Method2(void, setStateSetModes, IN, osg::StateSet &, x, IN, osg::StateAttribute::GLModeValue, x); - MethodWithDefaults1(void, setLocalStateSetModes, IN, osg::StateAttribute::GLModeValue, value, osg::StateAttribute::ON); - Method0(osg::BoundingSphere, computeBound); - Property(osg::Light *, Light); - WriteOnlyProperty(osg::StateAttribute::GLModeValue, LocalStateSetModes); - Property(osg::LightSource::ReferenceFrame, ReferenceFrame); + I_BaseType(osg::Group); + 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 8c34e512f..8189f765e 100644 --- a/src/osgWrappers/osg/LineSegment.cpp +++ b/src/osgWrappers/osg/LineSegment.cpp @@ -15,23 +15,31 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::LineSegment) - BaseType(osg::Referenced); - Constructor0(); - Constructor1(IN, const osg::LineSegment &, seg); - Constructor2(IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e); - Method2(void, set, IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e); - Method0(osg::Vec3 &, start); - Method0(const osg::Vec3 &, start); - Method0(osg::Vec3 &, end); - Method0(const osg::Vec3 &, end); - Method0(bool, valid); - Method1(bool, intersect, IN, const osg::BoundingBox &, bb); - Method3(bool, intersect, IN, const osg::BoundingBox &, bb, IN, float &, r1, IN, float &, r2); - Method1(bool, intersect, IN, const osg::BoundingSphere &, bs); - Method3(bool, intersect, IN, const osg::BoundingSphere &, bs, IN, float &, r1, IN, float &, r2); - Method4(bool, intersect, IN, const osg::Vec3 &, v1, IN, const osg::Vec3 &, v2, IN, const osg::Vec3 &, v3, IN, float &, r); - Method2(void, mult, IN, const osg::LineSegment &, seg, IN, const osg::Matrix &, m); - Method2(void, mult, IN, const osg::Matrix &, m, IN, const osg::LineSegment &, seg); + I_BaseType(osg::Referenced); + 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 c4b57e58a..a959bb216 100644 --- a/src/osgWrappers/osg/LineStipple.cpp +++ b/src/osgWrappers/osg/LineStipple.cpp @@ -15,25 +15,33 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::LineStipple) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::LineStipple &, lw, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setFactor, IN, GLint, factor); - Method0(GLint, getFactor); - Method1(void, setPattern, IN, GLushort, pattern); - Method0(GLushort, getPattern); - Method1(void, apply, IN, osg::State &, state); - Property(GLint, Factor); - Property(GLushort, Pattern); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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 cbe32b612..f839c30ca 100644 --- a/src/osgWrappers/osg/LineWidth.cpp +++ b/src/osgWrappers/osg/LineWidth.cpp @@ -15,21 +15,29 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::LineWidth) - BaseType(osg::StateAttribute); - ConstructorWithDefaults1(IN, float, width, 1.0f); - ConstructorWithDefaults2(IN, const osg::LineWidth &, lw, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, setWidth, IN, float, width); - Method0(float, getWidth); - Method1(void, apply, IN, osg::State &, state); - ReadOnlyProperty(osg::StateAttribute::Type, Type); - Property(float, Width); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/LogicOp.cpp b/src/osgWrappers/osg/LogicOp.cpp index 586273bf1..a76e1fd0a 100644 --- a/src/osgWrappers/osg/LogicOp.cpp +++ b/src/osgWrappers/osg/LogicOp.cpp @@ -15,42 +15,50 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::LogicOp::Opcode) - EnumLabel(osg::LogicOp::CLEAR); - EnumLabel(osg::LogicOp::SET); - EnumLabel(osg::LogicOp::COPY); - EnumLabel(osg::LogicOp::COPY_INVERTED); - EnumLabel(osg::LogicOp::NOOP); - EnumLabel(osg::LogicOp::INVERT); - EnumLabel(osg::LogicOp::AND); - EnumLabel(osg::LogicOp::NAND); - EnumLabel(osg::LogicOp::OR); - EnumLabel(osg::LogicOp::NOR); - EnumLabel(osg::LogicOp::XOR); - EnumLabel(osg::LogicOp::EQUIV); - EnumLabel(osg::LogicOp::AND_REVERSE); - EnumLabel(osg::LogicOp::AND_INVERTED); - EnumLabel(osg::LogicOp::OR_REVERSE); - EnumLabel(osg::LogicOp::OR_INVERTED); + 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) - BaseType(osg::StateAttribute); - Constructor0(); - Constructor1(IN, osg::LogicOp::Opcode, opcode); - ConstructorWithDefaults2(IN, const osg::LogicOp &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setOpcode, IN, osg::LogicOp::Opcode, opcode); - Method0(osg::LogicOp::Opcode, getOpcode); - Method1(void, apply, IN, osg::State &, state); - Property(osg::LogicOp::Opcode, Opcode); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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 0d6a91c32..1115351b3 100644 --- a/src/osgWrappers/osg/Material.cpp +++ b/src/osgWrappers/osg/Material.cpp @@ -16,64 +16,72 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Material::Face) - EnumLabel(osg::Material::FRONT); - EnumLabel(osg::Material::BACK); - EnumLabel(osg::Material::FRONT_AND_BACK); + 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) - EnumLabel(osg::Material::AMBIENT); - EnumLabel(osg::Material::DIFFUSE); - EnumLabel(osg::Material::SPECULAR); - EnumLabel(osg::Material::EMISSION); - EnumLabel(osg::Material::AMBIENT_AND_DIFFUSE); - EnumLabel(osg::Material::OFF); + 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) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Material &, mat, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, apply, IN, osg::State &, state); - Method1(void, setColorMode, IN, osg::Material::ColorMode, mode); - Method0(osg::Material::ColorMode, getColorMode); - Method2(void, setAmbient, IN, osg::Material::Face, face, IN, const osg::Vec4 &, ambient); - Method1(const osg::Vec4 &, getAmbient, IN, osg::Material::Face, face); - Method0(bool, getAmbientFrontAndBack); - Method2(void, setDiffuse, IN, osg::Material::Face, face, IN, const osg::Vec4 &, diffuse); - Method1(const osg::Vec4 &, getDiffuse, IN, osg::Material::Face, face); - Method0(bool, getDiffuseFrontAndBack); - Method2(void, setSpecular, IN, osg::Material::Face, face, IN, const osg::Vec4 &, specular); - Method1(const osg::Vec4 &, getSpecular, IN, osg::Material::Face, face); - Method0(bool, getSpecularFrontAndBack); - Method2(void, setEmission, IN, osg::Material::Face, face, IN, const osg::Vec4 &, emission); - Method1(const osg::Vec4 &, getEmission, IN, osg::Material::Face, face); - Method0(bool, getEmissionFrontAndBack); - Method2(void, setShininess, IN, osg::Material::Face, face, IN, float, shininess); - Method1(float, getShininess, IN, osg::Material::Face, face); - Method0(bool, getShininessFrontAndBack); - Method2(void, setTransparency, IN, osg::Material::Face, face, IN, float, trans); - Method2(void, setAlpha, IN, osg::Material::Face, face, IN, float, alpha); - IndexedProperty1(const osg::Vec4 &, Ambient, osg::Material::Face, face); - ReadOnlyProperty(bool, AmbientFrontAndBack); - Property(osg::Material::ColorMode, ColorMode); - IndexedProperty1(const osg::Vec4 &, Diffuse, osg::Material::Face, face); - ReadOnlyProperty(bool, DiffuseFrontAndBack); - IndexedProperty1(const osg::Vec4 &, Emission, osg::Material::Face, face); - ReadOnlyProperty(bool, EmissionFrontAndBack); - IndexedProperty1(float, Shininess, osg::Material::Face, face); - ReadOnlyProperty(bool, ShininessFrontAndBack); - IndexedProperty1(const osg::Vec4 &, Specular, osg::Material::Face, face); - ReadOnlyProperty(bool, SpecularFrontAndBack); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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/Matrix.cpp b/src/osgWrappers/osg/Matrix.cpp index 13d013609..165fd93d7 100644 --- a/src/osgWrappers/osg/Matrix.cpp +++ b/src/osgWrappers/osg/Matrix.cpp @@ -11,6 +11,14 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(osg::Matrixd, osg::Matrix); TYPE_NAME_ALIAS(osg::RefMatrixd, osg::RefMatrix); diff --git a/src/osgWrappers/osg/MatrixTransform.cpp b/src/osgWrappers/osg/MatrixTransform.cpp index 54ab2a62e..3eb67f6e1 100644 --- a/src/osgWrappers/osg/MatrixTransform.cpp +++ b/src/osgWrappers/osg/MatrixTransform.cpp @@ -15,27 +15,35 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::MatrixTransform) - BaseType(osg::Transform); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::MatrixTransform &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Constructor1(IN, const osg::Matrix &, matix); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(osg::MatrixTransform *, asMatrixTransform); - Method0(const osg::MatrixTransform *, asMatrixTransform); - Method1(void, setMatrix, IN, const osg::Matrix &, mat); - Method0(const osg::Matrix &, getMatrix); - Method1(void, preMult, IN, const osg::Matrix &, mat); - Method1(void, postMult, IN, const osg::Matrix &, mat); - Method0(const osg::Matrix &, getInverseMatrix); - Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); - Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); - ReadOnlyProperty(const osg::Matrix &, InverseMatrix); - Property(const osg::Matrix &, Matrix); + I_BaseType(osg::Transform); + 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 b02113e41..5eb557b76 100644 --- a/src/osgWrappers/osg/Matrixd.cpp +++ b/src/osgWrappers/osg/Matrixd.cpp @@ -19,90 +19,98 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(double, osg::Matrixd::value_type); BEGIN_VALUE_REFLECTOR(osg::Matrixd) - Constructor0(); - Constructor1(IN, const osg::Matrixd &, mat); - Constructor1(IN, const osg::Matrixf &, mat); - Constructor1(IN, float const *const, ptr); - Constructor1(IN, double const *const, ptr); - Constructor1(IN, const osg::Quat &, quat); - 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); - Method1(int, compare, IN, const osg::Matrixd &, m); - Method0(bool, valid); - Method0(bool, isNaN); - Method1(void, set, IN, const osg::Matrixd &, rhs); - Method1(void, set, IN, const osg::Matrixf &, rhs); - Method1(void, set, IN, float const *const, ptr); - Method1(void, set, IN, double const *const, ptr); - 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); - Method1(void, set, IN, const osg::Quat &, q); - Method1(void, get, IN, osg::Quat &, q); - Method0(osg::Matrixd::value_type *, ptr); - Method0(const osg::Matrixd::value_type *, ptr); - Method0(void, makeIdentity); - Method1(void, makeScale, IN, const osg::Vec3f &, x); - Method1(void, makeScale, IN, const osg::Vec3d &, x); - Method3(void, makeScale, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, x); - Method1(void, makeTranslate, IN, const osg::Vec3f &, x); - Method1(void, makeTranslate, IN, const osg::Vec3d &, x); - Method3(void, makeTranslate, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, x, IN, osg::Matrixd::value_type, x); - Method2(void, makeRotate, IN, const osg::Vec3f &, from, IN, const osg::Vec3f &, to); - Method2(void, makeRotate, IN, const osg::Vec3d &, from, IN, const osg::Vec3d &, to); - Method2(void, makeRotate, IN, osg::Matrixd::value_type, angle, IN, const osg::Vec3f &, axis); - Method2(void, makeRotate, IN, osg::Matrixd::value_type, angle, IN, const osg::Vec3d &, axis); - 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); - Method1(void, makeRotate, IN, const osg::Quat &, x); - 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); - 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); - Method6(void, makeOrtho, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - Method6(bool, getOrtho, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - Method4(void, makeOrtho2D, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top); - Method6(void, makeFrustum, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - Method6(bool, getFrustum, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - Method4(void, makePerspective, IN, double, fovy, IN, double, aspectRatio, IN, double, zNear, IN, double, zFar); - Method4(bool, getPerspective, IN, double &, fovy, IN, double &, aspectRatio, IN, double &, zNear, IN, double &, zFar); - Method3(void, makeLookAt, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, center, IN, const osg::Vec3d &, up); - MethodWithDefaults4(void, getLookAt, IN, osg::Vec3f &, eye, , IN, osg::Vec3f &, center, , IN, osg::Vec3f &, up, , IN, osg::Matrixd::value_type, lookDistance, 1.0f); - MethodWithDefaults4(void, getLookAt, IN, osg::Vec3d &, eye, , IN, osg::Vec3d &, center, , IN, osg::Vec3d &, up, , IN, osg::Matrixd::value_type, lookDistance, 1.0f); - Method1(bool, invert, IN, const osg::Matrixd &, rhs); - Method1(bool, invert_4x4_orig, IN, const osg::Matrixd &, x); - Method1(bool, invert_4x4_new, IN, const osg::Matrixd &, x); - Method1(osg::Vec3f, preMult, IN, const osg::Vec3f &, v); - Method1(osg::Vec3d, preMult, IN, const osg::Vec3d &, v); - Method1(osg::Vec3f, postMult, IN, const osg::Vec3f &, v); - Method1(osg::Vec3d, postMult, IN, const osg::Vec3d &, v); - Method1(osg::Vec4f, preMult, IN, const osg::Vec4f &, v); - Method1(osg::Vec4d, preMult, IN, const osg::Vec4d &, v); - Method1(osg::Vec4f, postMult, IN, const osg::Vec4f &, v); - Method1(osg::Vec4d, postMult, IN, const osg::Vec4d &, v); - Method3(void, setTrans, IN, osg::Matrixd::value_type, tx, IN, osg::Matrixd::value_type, ty, IN, osg::Matrixd::value_type, tz); - Method1(void, setTrans, IN, const osg::Vec3f &, v); - Method1(void, setTrans, IN, const osg::Vec3d &, v); - Method0(osg::Vec3d, getTrans); - Method0(osg::Vec3d, getScale); - Method2(void, mult, IN, const osg::Matrixd &, x, IN, const osg::Matrixd &, x); - Method1(void, preMult, IN, const osg::Matrixd &, x); - Method1(void, postMult, IN, const osg::Matrixd &, x); - WriteOnlyProperty(float const *const, ); - ReadOnlyProperty(osg::Vec3d, Scale); - ReadOnlyProperty(osg::Vec3d, Trans); + 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(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) - BaseType(osg::Object); - BaseType(osg::Matrixd); - Constructor0(); - Constructor1(IN, const osg::Matrixd &, other); - Constructor1(IN, const osg::Matrixf &, other); - Constructor1(IN, const osg::RefMatrixd &, other); - Constructor1(IN, osg::Matrixd::value_type const *const, def); - 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); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); + I_BaseType(osg::Object); + I_BaseType(osg::Matrixd); + 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 214cab6d7..c690c1ada 100644 --- a/src/osgWrappers/osg/Matrixf.cpp +++ b/src/osgWrappers/osg/Matrixf.cpp @@ -19,90 +19,98 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(float, osg::Matrixf::value_type); BEGIN_VALUE_REFLECTOR(osg::Matrixf) - Constructor0(); - Constructor1(IN, const osg::Matrixf &, mat); - Constructor1(IN, const osg::Matrixd &, mat); - Constructor1(IN, float const *const, ptr); - Constructor1(IN, double const *const, ptr); - Constructor1(IN, const osg::Quat &, quat); - 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); - Method1(int, compare, IN, const osg::Matrixf &, m); - Method0(bool, valid); - Method0(bool, isNaN); - Method1(void, set, IN, const osg::Matrixf &, rhs); - Method1(void, set, IN, const osg::Matrixd &, rhs); - Method1(void, set, IN, float const *const, ptr); - Method1(void, set, IN, double const *const, ptr); - 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); - Method1(void, set, IN, const osg::Quat &, q); - Method1(void, get, IN, osg::Quat &, q); - Method0(osg::Matrixf::value_type *, ptr); - Method0(const osg::Matrixf::value_type *, ptr); - Method0(void, makeIdentity); - Method1(void, makeScale, IN, const osg::Vec3f &, x); - Method1(void, makeScale, IN, const osg::Vec3d &, x); - Method3(void, makeScale, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, x); - Method1(void, makeTranslate, IN, const osg::Vec3f &, x); - Method1(void, makeTranslate, IN, const osg::Vec3d &, x); - Method3(void, makeTranslate, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, x, IN, osg::Matrixf::value_type, x); - Method2(void, makeRotate, IN, const osg::Vec3f &, from, IN, const osg::Vec3f &, to); - Method2(void, makeRotate, IN, const osg::Vec3d &, from, IN, const osg::Vec3d &, to); - Method2(void, makeRotate, IN, osg::Matrixf::value_type, angle, IN, const osg::Vec3f &, axis); - Method2(void, makeRotate, IN, osg::Matrixf::value_type, angle, IN, const osg::Vec3d &, axis); - 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); - Method1(void, makeRotate, IN, const osg::Quat &, x); - 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); - 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); - Method6(void, makeOrtho, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - Method6(bool, getOrtho, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - Method4(void, makeOrtho2D, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top); - Method6(void, makeFrustum, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - Method6(bool, getFrustum, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - Method4(void, makePerspective, IN, double, fovy, IN, double, aspectRatio, IN, double, zNear, IN, double, zFar); - Method4(bool, getPerspective, IN, double &, fovy, IN, double &, aspectRatio, IN, double &, zNear, IN, double &, zFar); - Method3(void, makeLookAt, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, center, IN, const osg::Vec3d &, up); - MethodWithDefaults4(void, getLookAt, IN, osg::Vec3f &, eye, , IN, osg::Vec3f &, center, , IN, osg::Vec3f &, up, , IN, osg::Matrixf::value_type, lookDistance, 1.0f); - MethodWithDefaults4(void, getLookAt, IN, osg::Vec3d &, eye, , IN, osg::Vec3d &, center, , IN, osg::Vec3d &, up, , IN, osg::Matrixf::value_type, lookDistance, 1.0f); - Method1(bool, invert, IN, const osg::Matrixf &, rhs); - Method1(bool, invert_4x4_orig, IN, const osg::Matrixf &, x); - Method1(bool, invert_4x4_new, IN, const osg::Matrixf &, x); - Method1(osg::Vec3f, preMult, IN, const osg::Vec3f &, v); - Method1(osg::Vec3d, preMult, IN, const osg::Vec3d &, v); - Method1(osg::Vec3f, postMult, IN, const osg::Vec3f &, v); - Method1(osg::Vec3d, postMult, IN, const osg::Vec3d &, v); - Method1(osg::Vec4f, preMult, IN, const osg::Vec4f &, v); - Method1(osg::Vec4d, preMult, IN, const osg::Vec4d &, v); - Method1(osg::Vec4f, postMult, IN, const osg::Vec4f &, v); - Method1(osg::Vec4d, postMult, IN, const osg::Vec4d &, v); - Method3(void, setTrans, IN, osg::Matrixf::value_type, tx, IN, osg::Matrixf::value_type, ty, IN, osg::Matrixf::value_type, tz); - Method1(void, setTrans, IN, const osg::Vec3f &, v); - Method1(void, setTrans, IN, const osg::Vec3d &, v); - Method0(osg::Vec3d, getTrans); - Method0(osg::Vec3d, getScale); - Method2(void, mult, IN, const osg::Matrixf &, x, IN, const osg::Matrixf &, x); - Method1(void, preMult, IN, const osg::Matrixf &, x); - Method1(void, postMult, IN, const osg::Matrixf &, x); - WriteOnlyProperty(float const *const, ); - ReadOnlyProperty(osg::Vec3d, Scale); - ReadOnlyProperty(osg::Vec3d, Trans); + 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(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) - BaseType(osg::Object); - BaseType(osg::Matrixf); - Constructor0(); - Constructor1(IN, const osg::Matrixf &, other); - Constructor1(IN, const osg::Matrixd &, other); - Constructor1(IN, const osg::RefMatrixf &, other); - Constructor1(IN, osg::Matrixf::value_type const *const, def); - 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); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); + I_BaseType(osg::Object); + I_BaseType(osg::Matrixf); + 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 6faa6b50d..fa62c6d22 100644 --- a/src/osgWrappers/osg/Multisample.cpp +++ b/src/osgWrappers/osg/Multisample.cpp @@ -15,52 +15,60 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Multisample::Mode) - EnumLabel(osg::Multisample::FASTEST); - EnumLabel(osg::Multisample::NICEST); - EnumLabel(osg::Multisample::DONT_CARE); + I_EnumLabel(osg::Multisample::FASTEST); + I_EnumLabel(osg::Multisample::NICEST); + I_EnumLabel(osg::Multisample::DONT_CARE); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Multisample) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Multisample &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method2(void, setSampleCoverage, IN, float, coverage, IN, bool, invert); - Method1(void, setCoverage, IN, float, coverage); - Method0(float, getCoverage); - Method1(void, setInvert, IN, bool, invert); - Method0(bool, getInvert); - Method1(void, setHint, IN, osg::Multisample::Mode, mode); - Method0(osg::Multisample::Mode, getHint); - Method1(void, apply, IN, osg::State &, state); - Property(float, Coverage); - Property(osg::Multisample::Mode, Hint); - Property(bool, Invert); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::Multisample::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::Multisample::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method1(void, setMultisampleSupported, IN, bool, flag); - Method1(void, setMultisampleFilterHintSupported, IN, bool, flag); - Method0(bool, isMultisampleSupported); - Method0(bool, isMultisampleFilterHintSupported); - Method1(void, setSampleCoverageProc, IN, void *, ptr); - Method2(void, glSampleCoverage, IN, GLclampf, value, IN, GLboolean, invert); - WriteOnlyProperty(bool, MultisampleFilterHintSupported); - WriteOnlyProperty(bool, MultisampleSupported); - WriteOnlyProperty(void *, SampleCoverageProc); - WriteOnlyProperty(unsigned int, upGLExtenions); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index 5abb599cb..f6baf61cb 100644 --- a/src/osgWrappers/osg/Node.cpp +++ b/src/osgWrappers/osg/Node.cpp @@ -20,6 +20,14 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::Group * >, osg::Node::ParentList); TYPE_NAME_ALIAS(unsigned int, osg::Node::NodeMask); @@ -27,94 +35,94 @@ TYPE_NAME_ALIAS(unsigned int, osg::Node::NodeMask); TYPE_NAME_ALIAS(std::vector< std::string >, osg::Node::DescriptionList); BEGIN_OBJECT_REFLECTOR(osg::Node) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Node &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::Group *, asGroup); - Method0(const osg::Group *, asGroup); - Method0(osg::Transform *, asTransform); - Method0(const osg::Transform *, asTransform); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, ascend, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, x); - Method1(void, setName, IN, const std::string &, name); - Method1(void, setName, IN, const char *, name); - Method0(const std::string &, getName); - Method0(const osg::Node::ParentList &, getParents); - Method0(osg::Node::ParentList, getParents); - Method1(osg::Group *, getParent, IN, unsigned int, i); - Method1(const osg::Group *, getParent, IN, unsigned int, i); - Method0(unsigned int, getNumParents); - Method1(void, setUpdateCallback, IN, osg::NodeCallback *, nc); - Method0(osg::NodeCallback *, getUpdateCallback); - Method0(const osg::NodeCallback *, getUpdateCallback); - Method0(unsigned int, getNumChildrenRequiringUpdateTraversal); - Method1(void, setEventCallback, IN, osg::NodeCallback *, nc); - Method0(osg::NodeCallback *, getEventCallback); - Method0(const osg::NodeCallback *, getEventCallback); - Method0(unsigned int, getNumChildrenRequiringEventTraversal); - Method1(void, setCullCallback, IN, osg::NodeCallback *, nc); - Method0(osg::NodeCallback *, getCullCallback); - Method0(const osg::NodeCallback *, getCullCallback); - Method1(void, setCullingActive, IN, bool, active); - Method0(bool, getCullingActive); - Method0(unsigned int, getNumChildrenWithCullingDisabled); - Method0(bool, isCullingActive); - Method0(unsigned int, getNumChildrenWithOccluderNodes); - Method0(bool, containsOccluderNodes); - Method1(void, setNodeMask, IN, osg::Node::NodeMask, nm); - Method0(osg::Node::NodeMask, getNodeMask); - Method1(void, setDescriptions, IN, const osg::Node::DescriptionList &, descriptions); - Method0(osg::Node::DescriptionList &, getDescriptions); - Method0(const osg::Node::DescriptionList &, getDescriptions); - Method1(const std::string &, getDescription, IN, unsigned int, i); - Method1(std::string &, getDescription, IN, unsigned int, i); - Method0(unsigned int, getNumDescriptions); - Method1(void, addDescription, IN, const std::string &, desc); - Method1(void, setStateSet, IN, osg::StateSet *, stateset); - Method0(osg::StateSet *, getOrCreateStateSet); - Method0(osg::StateSet *, getStateSet); - Method0(const osg::StateSet *, getStateSet); - Method1(void, setInitialBound, IN, const osg::BoundingSphere &, bsphere); - Method0(const osg::BoundingSphere &, getInitialBound); - Method0(void, dirtyBound); - Method0(const osg::BoundingSphere &, getBound); - Method0(osg::BoundingSphere, computeBound); - Method1(void, setComputeBoundingSphereCallback, IN, osg::Node::ComputeBoundingSphereCallback *, callback); - Method0(osg::Node::ComputeBoundingSphereCallback *, getComputeBoundingSphereCallback); - Method0(const osg::Node::ComputeBoundingSphereCallback *, getComputeBoundingSphereCallback); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - ReadOnlyProperty(const osg::BoundingSphere &, Bound); - Property(osg::Node::ComputeBoundingSphereCallback *, ComputeBoundingSphereCallback); - Property(osg::NodeCallback *, CullCallback); - Property(bool, CullingActive); - ArrayProperty_GA(const std::string &, Description, Descriptions, unsigned int, void); - Property(const osg::Node::DescriptionList &, Descriptions); - Property(osg::NodeCallback *, EventCallback); - Property(const osg::BoundingSphere &, InitialBound); - Property(const std::string &, Name); - Property(osg::Node::NodeMask, NodeMask); - ArrayProperty_G(osg::Group *, Parent, Parents, unsigned int, void); - ReadOnlyProperty(osg::Node::ParentList, Parents); - Property(osg::StateSet *, StateSet); - Property(osg::NodeCallback *, UpdateCallback); + I_BaseType(osg::Object); + 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_Method1(void, setName, IN, const std::string &, name); + I_Method1(void, setName, IN, const char *, name); + I_Method0(const std::string &, getName); + 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_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(const std::string &, Name); + 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_VALUE_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) - BaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::Node::ComputeBoundingSphereCallback &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(osg::BoundingSphere, computeBound, IN, const osg::Node &, x); +BEGIN_OBJECT_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) + I_BaseType(osg::Object); + 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); diff --git a/src/osgWrappers/osg/NodeCallback.cpp b/src/osgWrappers/osg/NodeCallback.cpp index 2332a9e09..37533a1d2 100644 --- a/src/osgWrappers/osg/NodeCallback.cpp +++ b/src/osgWrappers/osg/NodeCallback.cpp @@ -15,21 +15,29 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::NodeCallback) - VirtualBaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::NodeCallback &, nc, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method2(void, traverse, IN, osg::Node *, node, IN, osg::NodeVisitor *, nv); - Method1(void, setNestedCallback, IN, osg::NodeCallback *, nc); - Method0(osg::NodeCallback *, getNestedCallback); - Method0(const osg::NodeCallback *, getNestedCallback); - Method1(void, addNestedCallback, IN, osg::NodeCallback *, nc); - Method1(void, removeNestedCallback, IN, osg::NodeCallback *, nc); - Property(osg::NodeCallback *, NestedCallback); + I_VirtualBaseType(osg::Object); + 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/NodeVisitor.cpp b/src/osgWrappers/osg/NodeVisitor.cpp index 27b526c38..6269f5100 100644 --- a/src/osgWrappers/osg/NodeVisitor.cpp +++ b/src/osgWrappers/osg/NodeVisitor.cpp @@ -33,91 +33,99 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osg::NodeAcceptOp) - Constructor1(IN, osg::NodeVisitor &, nv); + I_Constructor1(IN, osg::NodeVisitor &, nv); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::NodeVisitor::TraversalMode) - EnumLabel(osg::NodeVisitor::TRAVERSE_NONE); - EnumLabel(osg::NodeVisitor::TRAVERSE_PARENTS); - EnumLabel(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN); - EnumLabel(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); + 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) - EnumLabel(osg::NodeVisitor::NODE_VISITOR); - EnumLabel(osg::NodeVisitor::UPDATE_VISITOR); - EnumLabel(osg::NodeVisitor::EVENT_VISITOR); - EnumLabel(osg::NodeVisitor::COLLECT_OCCLUDER_VISITOR); - EnumLabel(osg::NodeVisitor::CULL_VISITOR); + 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_VALUE_REFLECTOR(osg::NodeVisitor) - VirtualBaseType(osg::Referenced); - ConstructorWithDefaults1(IN, osg::NodeVisitor::TraversalMode, tm, osg::NodeVisitor::TRAVERSE_NONE); - ConstructorWithDefaults2(IN, osg::NodeVisitor::VisitorType, type, , IN, osg::NodeVisitor::TraversalMode, tm, osg::NodeVisitor::TRAVERSE_NONE); - Method0(void, reset); - Method1(void, setVisitorType, IN, osg::NodeVisitor::VisitorType, type); - Method0(osg::NodeVisitor::VisitorType, getVisitorType); - Method1(void, setTraversalNumber, IN, int, fn); - Method0(int, getTraversalNumber); - Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs); - Method0(const osg::FrameStamp *, getFrameStamp); - Method1(void, setTraversalMask, IN, osg::Node::NodeMask, mask); - Method0(osg::Node::NodeMask, getTraversalMask); - Method1(void, setNodeMaskOverride, IN, osg::Node::NodeMask, mask); - Method0(osg::Node::NodeMask, getNodeMaskOverride); - Method1(bool, validNodeMask, IN, const osg::Node &, node); - Method1(void, setTraversalMode, IN, osg::NodeVisitor::TraversalMode, mode); - Method0(osg::NodeVisitor::TraversalMode, getTraversalMode); - Method1(void, setUserData, IN, osg::Referenced *, obj); - Method0(osg::Referenced *, getUserData); - Method0(const osg::Referenced *, getUserData); - Method1(void, traverse, IN, osg::Node &, node); - Method1(void, pushOntoNodePath, IN, osg::Node *, node); - Method0(void, popFromNodePath); - Method0(osg::NodePath &, getNodePath); - Method0(const osg::NodePath &, getNodePath); - Method0(osg::Vec3, getEyePoint); - Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, x, IN, bool, x); - Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, x, IN, bool, x); - Method1(void, apply, IN, osg::Node &, node); - Method1(void, apply, IN, osg::Geode &, node); - Method1(void, apply, IN, osg::Billboard &, node); - Method1(void, apply, IN, osg::Group &, node); - Method1(void, apply, IN, osg::ProxyNode &, node); - Method1(void, apply, IN, osg::Projection &, node); - Method1(void, apply, IN, osg::CoordinateSystemNode &, node); - Method1(void, apply, IN, osg::ClipNode &, node); - Method1(void, apply, IN, osg::TexGenNode &, node); - Method1(void, apply, IN, osg::LightSource &, node); - Method1(void, apply, IN, osg::Transform &, node); - Method1(void, apply, IN, osg::MatrixTransform &, node); - Method1(void, apply, IN, osg::PositionAttitudeTransform &, node); - Method1(void, apply, IN, osg::Switch &, node); - Method1(void, apply, IN, osg::Sequence &, node); - Method1(void, apply, IN, osg::LOD &, node); - Method1(void, apply, IN, osg::PagedLOD &, node); - Method1(void, apply, IN, osg::ClearNode &, node); - Method1(void, apply, IN, osg::OccluderNode &, node); - Method1(void, setDatabaseRequestHandler, IN, osg::NodeVisitor::DatabaseRequestHandler *, handler); - Method0(osg::NodeVisitor::DatabaseRequestHandler *, getDatabaseRequestHandler); - Method0(const osg::NodeVisitor::DatabaseRequestHandler *, getDatabaseRequestHandler); - Property(osg::NodeVisitor::DatabaseRequestHandler *, DatabaseRequestHandler); - ReadOnlyProperty(osg::Vec3, EyePoint); - WriteOnlyProperty(osg::FrameStamp *, FrameStamp); - Property(osg::Node::NodeMask, NodeMaskOverride); - ReadOnlyProperty(osg::NodePath &, NodePath); - Property(osg::Node::NodeMask, TraversalMask); - Property(osg::NodeVisitor::TraversalMode, TraversalMode); - Property(int, TraversalNumber); - Property(osg::Referenced *, UserData); - Property(osg::NodeVisitor::VisitorType, VisitorType); +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::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) - BaseType(osg::Referenced); - Constructor0(); - Method4(void, requestNodeFile, IN, const std::string &, fileName, IN, osg::Group *, group, IN, float, priority, IN, const osg::FrameStamp *, framestamp); + 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 diff --git a/src/osgWrappers/osg/Object.cpp b/src/osgWrappers/osg/Object.cpp index c3991b0a3..4255ce993 100644 --- a/src/osgWrappers/osg/Object.cpp +++ b/src/osgWrappers/osg/Object.cpp @@ -14,27 +14,35 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Object::DataVariance) - EnumLabel(osg::Object::DYNAMIC); - EnumLabel(osg::Object::STATIC); + I_EnumLabel(osg::Object::DYNAMIC); + I_EnumLabel(osg::Object::STATIC); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Object) - BaseType(osg::Referenced); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Object &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - Method1(bool, isSameKindAs, IN, const osg::Object *, x); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setDataVariance, IN, osg::Object::DataVariance, dv); - Method0(osg::Object::DataVariance, getDataVariance); - Method1(void, setUserData, IN, osg::Referenced *, obj); - Method0(osg::Referenced *, getUserData); - Method0(const osg::Referenced *, getUserData); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - Property(osg::Object::DataVariance, DataVariance); - Property(osg::Referenced *, UserData); + I_BaseType(osg::Referenced); + I_Constructor0(); + 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, 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(osg::Referenced *, UserData); END_REFLECTOR diff --git a/src/osgWrappers/osg/OccluderNode.cpp b/src/osgWrappers/osg/OccluderNode.cpp index 21a0f4c9a..1a94626cc 100644 --- a/src/osgWrappers/osg/OccluderNode.cpp +++ b/src/osgWrappers/osg/OccluderNode.cpp @@ -16,20 +16,28 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::OccluderNode) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::OccluderNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, setOccluder, IN, osg::ConvexPlanarOccluder *, occluder); - Method0(osg::ConvexPlanarOccluder *, getOccluder); - Method0(const osg::ConvexPlanarOccluder *, getOccluder); - Method0(osg::BoundingSphere, computeBound); - Property(osg::ConvexPlanarOccluder *, Occluder); + I_BaseType(osg::Group); + 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 70c685618..591fb7269 100644 --- a/src/osgWrappers/osg/PagedLOD.cpp +++ b/src/osgWrappers/osg/PagedLOD.cpp @@ -16,54 +16,62 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::PagedLOD::PerRangeData >, osg::PagedLOD::PerRangeDataList); BEGIN_OBJECT_REFLECTOR(osg::PagedLOD) - BaseType(osg::LOD); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::PagedLOD &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(bool, addChild, IN, osg::Node *, child); - Method3(bool, addChild, IN, osg::Node *, child, IN, float, min, IN, float, max); - 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); - Method1(bool, removeChild, IN, osg::Node *, child); - Method1(void, setDatabasePath, IN, const std::string &, path); - Method0(const std::string &, getDatabasePath); - Method2(void, setFileName, IN, unsigned int, childNo, IN, const std::string &, filename); - Method1(const std::string &, getFileName, IN, unsigned int, childNo); - Method0(unsigned int, getNumFileNames); - Method2(void, setPriorityOffset, IN, unsigned int, childNo, IN, float, priorityOffset); - Method1(float, getPriorityOffset, IN, unsigned int, childNo); - Method0(unsigned int, getNumPriorityOffsets); - Method2(void, setPriorityScale, IN, unsigned int, childNo, IN, float, priorityScale); - Method1(float, getPriorityScale, IN, unsigned int, childNo); - Method0(unsigned int, getNumPriorityScales); - Method2(void, setTimeStamp, IN, unsigned int, childNo, IN, double, timeStamp); - Method1(double, getTimeStamp, IN, unsigned int, childNo); - Method0(unsigned int, getNumTimeStamps); - Method1(void, setFrameNumberOfLastTraversal, IN, int, frameNumber); - Method0(int, getFrameNumberOfLastTraversal); - Method1(void, setNumChildrenThatCannotBeExpired, IN, unsigned int, num); - Method0(unsigned int, getNumChildrenThatCannotBeExpired); - Method2(bool, removeExpiredChildren, IN, double, expiryTime, IN, osg::NodeList &, removedChildren); - Property(const std::string &, DatabasePath); - ArrayProperty_G(const std::string &, FileName, FileNames, unsigned int, void); - Property(int, FrameNumberOfLastTraversal); - WriteOnlyProperty(unsigned int, NumChildrenThatCannotBeExpired); - ArrayProperty_G(float, PriorityOffset, PriorityOffsets, unsigned int, void); - ArrayProperty_G(float, PriorityScale, PriorityScales, unsigned int, void); - ArrayProperty_G(double, TimeStamp, TimeStamps, unsigned int, void); + I_BaseType(osg::LOD); + 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_Method1(bool, removeChild, IN, osg::Node *, child); + 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) - Constructor0(); - Constructor1(IN, const osg::PagedLOD::PerRangeData &, prd); + I_Constructor0(); + I_Constructor1(IN, const osg::PagedLOD::PerRangeData &, prd); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::PagedLOD::PerRangeData >); diff --git a/src/osgWrappers/osg/Plane.cpp b/src/osgWrappers/osg/Plane.cpp index 8e2bae6df..92ff3f0c9 100644 --- a/src/osgWrappers/osg/Plane.cpp +++ b/src/osgWrappers/osg/Plane.cpp @@ -16,39 +16,47 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + #include BEGIN_VALUE_REFLECTOR(osg::Plane) - ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined - Comparator(osgIntrospection::PartialOrderComparator); // user-defined - Constructor0(); - Constructor1(IN, const osg::Plane &, pl); - Constructor4(IN, float, a, IN, float, b, IN, float, c, IN, float, d); - Constructor1(IN, const osg::Vec4 &, vec); - Constructor2(IN, const osg::Vec3 &, norm, IN, float, d); - Constructor3(IN, const osg::Vec3 &, v1, IN, const osg::Vec3 &, v2, IN, const osg::Vec3 &, v3); - Method1(void, set, IN, const osg::Plane &, pl); - Method4(void, set, IN, float, a, IN, float, b, IN, float, c, IN, float, d); - Method1(void, set, IN, const osg::Vec4 &, vec); - Method2(void, set, IN, const osg::Vec3 &, norm, IN, float, d); - Method3(void, set, IN, const osg::Vec3 &, v1, IN, const osg::Vec3 &, v2, IN, const osg::Vec3 &, v3); - Method2(void, set, IN, const osg::Vec3 &, norm, IN, const osg::Vec3 &, point); - Method0(void, flip); - Method0(void, makeUnitLength); - Method0(void, calculateUpperLowerBBCorners); - Method0(bool, valid); - Method0(float *, ptr); - Method0(const float *, ptr); - Method0(osg::Vec4 &, asVec4); - Method0(const osg::Vec4 &, asVec4); - Method0(osg::Vec3, getNormal); - Method1(float, distance, IN, const osg::Vec3 &, v); - Method1(int, intersect, IN, const std::vector< osg::Vec3 > &, vertices); - Method1(int, intersect, IN, const osg::BoundingSphere &, bs); - Method1(int, intersect, IN, const osg::BoundingBox &, bb); - Method1(void, transform, IN, const osg::Matrix &, matrix); - Method1(void, transformProvidingInverse, IN, const osg::Matrix &, matrix); - WriteOnlyProperty(const osg::Vec4 &, ); - ReadOnlyProperty(osg::Vec3, Normal); + 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_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 diff --git a/src/osgWrappers/osg/Point.cpp b/src/osgWrappers/osg/Point.cpp index 2914015c6..c85e5835c 100644 --- a/src/osgWrappers/osg/Point.cpp +++ b/src/osgWrappers/osg/Point.cpp @@ -16,48 +16,56 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::Point) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Point &, point, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setSize, IN, float, size); - Method0(float, getSize); - Method1(void, setFadeThresholdSize, IN, float, fadeThresholdSize); - Method0(float, getFadeThresholdSize); - Method1(void, setDistanceAttenuation, IN, const osg::Vec3 &, distanceAttenuation); - Method0(const osg::Vec3 &, getDistanceAttenuation); - Method1(void, setMinSize, IN, float, minSize); - Method0(float, getMinSize); - Method1(void, setMaxSize, IN, float, maxSize); - Method0(float, getMaxSize); - Method1(void, apply, IN, osg::State &, state); - Property(const osg::Vec3 &, DistanceAttenuation); - Property(float, FadeThresholdSize); - Property(float, MaxSize); - Property(float, MinSize); - Property(float, Size); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::Point::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::Point::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method1(void, setPointParametersSupported, IN, bool, flag); - Method0(bool, isPointParametersSupported); - Method2(void, glPointParameterf, IN, GLenum, pname, IN, GLfloat, param); - Method2(void, glPointParameterfv, IN, GLenum, pname, IN, const GLfloat *, params); - WriteOnlyProperty(bool, PointParametersSupported); - WriteOnlyProperty(unsigned int, upGLExtenions); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/PointSprite.cpp b/src/osgWrappers/osg/PointSprite.cpp index 8da25a82f..b1a73f87a 100644 --- a/src/osgWrappers/osg/PointSprite.cpp +++ b/src/osgWrappers/osg/PointSprite.cpp @@ -15,20 +15,28 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::PointSprite) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::PointSprite &, texenv, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method0(bool, isTextureAttribute); - Method1(void, apply, IN, osg::State &, state); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::PointSprite &, texenv, , 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_Method0(bool, isTextureAttribute); + I_Method1(void, apply, IN, osg::State &, state); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/PolygonMode.cpp b/src/osgWrappers/osg/PolygonMode.cpp index 44a58dcb4..2386180fa 100644 --- a/src/osgWrappers/osg/PolygonMode.cpp +++ b/src/osgWrappers/osg/PolygonMode.cpp @@ -15,35 +15,43 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::PolygonMode::Mode) - EnumLabel(osg::PolygonMode::POINT); - EnumLabel(osg::PolygonMode::LINE); - EnumLabel(osg::PolygonMode::FILL); + I_EnumLabel(osg::PolygonMode::POINT); + I_EnumLabel(osg::PolygonMode::LINE); + I_EnumLabel(osg::PolygonMode::FILL); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::PolygonMode::Face) - EnumLabel(osg::PolygonMode::FRONT_AND_BACK); - EnumLabel(osg::PolygonMode::FRONT); - EnumLabel(osg::PolygonMode::BACK); + I_EnumLabel(osg::PolygonMode::FRONT_AND_BACK); + I_EnumLabel(osg::PolygonMode::FRONT); + I_EnumLabel(osg::PolygonMode::BACK); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::PolygonMode) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::PolygonMode &, pm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method2(void, setMode, IN, osg::PolygonMode::Face, face, IN, osg::PolygonMode::Mode, mode); - Method1(osg::PolygonMode::Mode, getMode, IN, osg::PolygonMode::Face, face); - Method0(bool, getFrontAndBack); - Method1(void, apply, IN, osg::State &, state); - ReadOnlyProperty(bool, FrontAndBack); - IndexedProperty1(osg::PolygonMode::Mode, Mode, osg::PolygonMode::Face, face); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/PolygonOffset.cpp b/src/osgWrappers/osg/PolygonOffset.cpp index 3ea8d6513..4be4caec1 100644 --- a/src/osgWrappers/osg/PolygonOffset.cpp +++ b/src/osgWrappers/osg/PolygonOffset.cpp @@ -15,26 +15,34 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset) - BaseType(osg::StateAttribute); - Constructor0(); - Constructor2(IN, float, factor, IN, float, units); - ConstructorWithDefaults2(IN, const osg::PolygonOffset &, po, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setFactor, IN, float, factor); - Method0(float, getFactor); - Method1(void, setUnits, IN, float, units); - Method0(float, getUnits); - Method1(void, apply, IN, osg::State &, state); - Property(float, Factor); - ReadOnlyProperty(osg::StateAttribute::Type, Type); - Property(float, Units); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_Constructor2(IN, float, factor, IN, float, units); + I_ConstructorWithDefaults2(IN, const osg::PolygonOffset &, po, , 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, float, factor); + I_Method0(float, getFactor); + I_Method1(void, setUnits, IN, float, units); + I_Method0(float, getUnits); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(float, Factor); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_Property(float, Units); END_REFLECTOR diff --git a/src/osgWrappers/osg/PolygonStipple.cpp b/src/osgWrappers/osg/PolygonStipple.cpp index a06602a65..ad8a16bd9 100644 --- a/src/osgWrappers/osg/PolygonStipple.cpp +++ b/src/osgWrappers/osg/PolygonStipple.cpp @@ -15,22 +15,30 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::PolygonStipple &, lw, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setMask, IN, const GLubyte *, mask); - Method0(const GLubyte *, getMask); - Method1(void, apply, IN, osg::State &, state); - Property(const GLubyte *, Mask); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::PolygonStipple &, 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, setMask, IN, const GLubyte *, mask); + I_Method0(const GLubyte *, getMask); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(const GLubyte *, Mask); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/Polytope.cpp b/src/osgWrappers/osg/Polytope.cpp index 06500b3e3..414b8092d 100644 --- a/src/osgWrappers/osg/Polytope.cpp +++ b/src/osgWrappers/osg/Polytope.cpp @@ -16,6 +16,14 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(unsigned int, osg::Polytope::ClippingMask); TYPE_NAME_ALIAS(std::vector< osg::Plane >, osg::Polytope::PlaneList); @@ -25,58 +33,58 @@ 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) - Constructor0(); - Constructor1(IN, const osg::Polytope &, cv); - Constructor1(IN, const osg::Polytope::PlaneList &, pl); - Method0(void, clear); - MethodWithDefaults2(void, setToUnitFrustum, IN, bool, withNear, true, IN, bool, withFar, true); - Method2(void, setAndTransformProvidingInverse, IN, const osg::Polytope &, pt, IN, const osg::Matrix &, matrix); - Method1(void, set, IN, const osg::Polytope::PlaneList &, pl); - Method1(void, add, IN, const osg::Plane &, pl); - Method0(void, flip); - Method0(osg::Polytope::PlaneList &, getPlaneList); - Method0(const osg::Polytope::PlaneList &, getPlaneList); - Method1(void, setReferenceVertexList, IN, osg::Polytope::VertexList &, vertices); - Method0(osg::Polytope::VertexList &, getReferenceVertexList); - Method0(const osg::Polytope::VertexList &, getReferenceVertexList); - Method0(void, setupMask); - Method0(osg::Polytope::ClippingMask &, getCurrentMask); - Method0(osg::Polytope::ClippingMask, getCurrentMask); - Method1(void, setResultMask, IN, osg::Polytope::ClippingMask, mask); - Method0(osg::Polytope::ClippingMask, getResultMask); - Method0(osg::Polytope::MaskStack &, getMaskStack); - Method0(const osg::Polytope::MaskStack &, getMaskStack); - Method0(void, pushCurrentMask); - Method0(void, popCurrentMask); - Method1(bool, contains, IN, const osg::Vec3 &, v); - Method1(bool, contains, IN, const std::vector< osg::Vec3 > &, vertices); - Method1(bool, contains, IN, const osg::BoundingSphere &, bs); - Method1(bool, contains, IN, const osg::BoundingBox &, bb); - Method1(bool, containsAllOf, IN, const std::vector< osg::Vec3 > &, vertices); - Method1(bool, containsAllOf, IN, const osg::BoundingSphere &, bs); - Method1(bool, containsAllOf, IN, const osg::BoundingBox &, bb); - Method1(void, transform, IN, const osg::Matrix &, matrix); - Method1(void, transformProvidingInverse, IN, const osg::Matrix &, matrix); - WriteOnlyProperty(const osg::Polytope::PlaneList &, ); - ReadOnlyProperty(osg::Polytope::ClippingMask, CurrentMask); - ReadOnlyProperty(osg::Polytope::MaskStack &, MaskStack); - ReadOnlyProperty(osg::Polytope::PlaneList &, PlaneList); - Property(osg::Polytope::VertexList &, ReferenceVertexList); - Property(osg::Polytope::ClippingMask, ResultMask); + 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 BEGIN_VALUE_REFLECTOR(osg::fast_back_stack< osg::Polytope::ClippingMask >) - Constructor0(); - Constructor1(IN, const osg::fast_back_stack< osg::Polytope::ClippingMask > &, fbs); - Constructor1(IN, const osg::Polytope::ClippingMask &, value); - Method0(void, clear); - Method0(bool, empty); - Method0(unsigned int, size); - Method0(osg::Polytope::ClippingMask &, back); - Method0(const osg::Polytope::ClippingMask &, back); - Method0(void, push_back); - Method1(void, push_back, IN, const osg::Polytope::ClippingMask &, value); - Method0(void, pop_back); + 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/PositionAttitudeTransform.cpp b/src/osgWrappers/osg/PositionAttitudeTransform.cpp index 2fb63f58d..d16a80500 100644 --- a/src/osgWrappers/osg/PositionAttitudeTransform.cpp +++ b/src/osgWrappers/osg/PositionAttitudeTransform.cpp @@ -17,31 +17,39 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::PositionAttitudeTransform) - BaseType(osg::Transform); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::PositionAttitudeTransform &, pat, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(osg::PositionAttitudeTransform *, asPositionAttitudeTransform); - Method0(const osg::PositionAttitudeTransform *, asPositionAttitudeTransform); - Method1(void, setPosition, IN, const osg::Vec3d &, pos); - Method0(const osg::Vec3d &, getPosition); - Method1(void, setAttitude, IN, const osg::Quat &, quat); - Method0(const osg::Quat &, getAttitude); - Method1(void, setScale, IN, const osg::Vec3d &, scale); - Method0(const osg::Vec3d &, getScale); - Method1(void, setPivotPoint, IN, const osg::Vec3d &, pivot); - Method0(const osg::Vec3d &, getPivotPoint); - Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - Property(const osg::Quat &, Attitude); - Property(const osg::Vec3d &, PivotPoint); - Property(const osg::Vec3d &, Position); - Property(const osg::Vec3d &, Scale); + I_BaseType(osg::Transform); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::PositionAttitudeTransform &, 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::PositionAttitudeTransform *, asPositionAttitudeTransform); + I_Method0(const osg::PositionAttitudeTransform *, asPositionAttitudeTransform); + 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, setScale, IN, const osg::Vec3d &, scale); + I_Method0(const osg::Vec3d &, getScale); + I_Method1(void, setPivotPoint, IN, const osg::Vec3d &, pivot); + I_Method0(const osg::Vec3d &, getPivotPoint); + 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(const osg::Vec3d &, PivotPoint); + I_Property(const osg::Vec3d &, Position); + I_Property(const osg::Vec3d &, Scale); END_REFLECTOR diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp index a9e0820fe..0e9c320ea 100644 --- a/src/osgWrappers/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/osg/PrimitiveSet.cpp @@ -17,210 +17,218 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::DrawArrayLengths) - BaseType(osg::PrimitiveSet); - ConstructorWithDefaults1(IN, GLenum, mode, 0); - ConstructorWithDefaults2(IN, const osg::DrawArrayLengths &, dal, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Constructor4(IN, GLenum, mode, IN, GLint, first, IN, unsigned int, no, IN, GLsizei *, ptr); - Constructor3(IN, GLenum, mode, IN, GLint, first, IN, unsigned int, no); - Constructor2(IN, GLenum, mode, IN, GLint, first); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setFirst, IN, GLint, first); - Method0(GLint, getFirst); - Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - Method0(unsigned int, getNumIndices); - Method1(unsigned int, index, IN, unsigned int, pos); - Method1(void, offsetIndices, IN, int, offset); - Method0(unsigned int, getNumPrimitives); - Property(GLint, First); + I_BaseType(osg::PrimitiveSet); + 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) - BaseType(osg::PrimitiveSet); - ConstructorWithDefaults1(IN, GLenum, mode, 0); - Constructor3(IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count); - ConstructorWithDefaults2(IN, const osg::DrawArrays &, da, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method3(void, set, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count); - Method1(void, setFirst, IN, GLint, first); - Method0(GLint, getFirst); - Method1(void, setCount, IN, GLsizei, count); - Method0(GLsizei, getCount); - Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - Method0(unsigned int, getNumIndices); - Method1(unsigned int, index, IN, unsigned int, pos); - Method1(void, offsetIndices, IN, int, offset); - Property(GLsizei, Count); - Property(GLint, First); + 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 BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUByte) - BaseType(osg::PrimitiveSet); - ConstructorWithDefaults1(IN, GLenum, mode, 0); - ConstructorWithDefaults2(IN, const osg::DrawElementsUByte &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Constructor3(IN, GLenum, mode, IN, unsigned int, no, IN, GLubyte *, ptr); - Constructor2(IN, GLenum, mode, IN, unsigned int, no); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(bool, supportsBufferObject); - Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - Method0(unsigned int, getNumIndices); - Method1(unsigned int, index, IN, unsigned int, pos); - Method1(void, offsetIndices, IN, int, offset); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::PrimitiveSet); + 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_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUInt) - BaseType(osg::PrimitiveSet); - ConstructorWithDefaults1(IN, GLenum, mode, 0); - ConstructorWithDefaults2(IN, const osg::DrawElementsUInt &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Constructor3(IN, GLenum, mode, IN, unsigned int, no, IN, GLuint *, ptr); - Constructor2(IN, GLenum, mode, IN, unsigned int, no); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(bool, supportsBufferObject); - Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - Method0(unsigned int, getNumIndices); - Method1(unsigned int, index, IN, unsigned int, pos); - Method1(void, offsetIndices, IN, int, offset); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::PrimitiveSet); + 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_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUShort) - BaseType(osg::PrimitiveSet); - ConstructorWithDefaults1(IN, GLenum, mode, 0); - ConstructorWithDefaults2(IN, const osg::DrawElementsUShort &, array, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Constructor3(IN, GLenum, mode, IN, unsigned int, no, IN, GLushort *, ptr); - Constructor2(IN, GLenum, mode, IN, unsigned int, no); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(bool, supportsBufferObject); - Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - Method0(unsigned int, getNumIndices); - Method1(unsigned int, index, IN, unsigned int, pos); - Method1(void, offsetIndices, IN, int, offset); - ReadOnlyProperty(const GLvoid *, DataPointer); - ReadOnlyProperty(unsigned int, TotalDataSize); + I_BaseType(osg::PrimitiveSet); + 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_ReadOnlyProperty(const GLvoid *, DataPointer); + I_ReadOnlyProperty(unsigned int, TotalDataSize); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveFunctor) - Constructor0(); - Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2 *, vertices); - Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3 *, vertices); - Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4 *, vertices); - Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count); - Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLubyte *, indices); - Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLushort *, indices); - Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLuint *, indices); - Method1(void, begin, IN, GLenum, mode); - Method1(void, vertex, IN, const osg::Vec2 &, vert); - Method1(void, vertex, IN, const osg::Vec3 &, vert); - Method1(void, vertex, IN, const osg::Vec4 &, vert); - Method2(void, vertex, IN, float, x, IN, float, y); - Method3(void, vertex, IN, float, x, IN, float, y, IN, float, z); - Method4(void, vertex, IN, float, x, IN, float, y, IN, float, z, IN, float, w); - Method0(void, end); + 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) - Constructor0(); - Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2 *, vertices); - Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3 *, vertices); - Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4 *, vertices); - Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count); - Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLubyte *, indices); - Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLushort *, indices); - Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLuint *, indices); - Method1(void, begin, IN, GLenum, mode); - Method1(void, vertex, IN, unsigned int, pos); - Method0(void, end); + 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); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::PrimitiveSet::Type) - EnumLabel(osg::PrimitiveSet::PrimitiveType); - EnumLabel(osg::PrimitiveSet::DrawArraysPrimitiveType); - EnumLabel(osg::PrimitiveSet::DrawArrayLengthsPrimitiveType); - EnumLabel(osg::PrimitiveSet::DrawElementsUBytePrimitiveType); - EnumLabel(osg::PrimitiveSet::DrawElementsUShortPrimitiveType); - EnumLabel(osg::PrimitiveSet::DrawElementsUIntPrimitiveType); + 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_ENUM_REFLECTOR(osg::PrimitiveSet::Mode) - EnumLabel(osg::PrimitiveSet::POINTS); - EnumLabel(osg::PrimitiveSet::LINES); - EnumLabel(osg::PrimitiveSet::LINE_STRIP); - EnumLabel(osg::PrimitiveSet::LINE_LOOP); - EnumLabel(osg::PrimitiveSet::TRIANGLES); - EnumLabel(osg::PrimitiveSet::TRIANGLE_STRIP); - EnumLabel(osg::PrimitiveSet::TRIANGLE_FAN); - EnumLabel(osg::PrimitiveSet::QUADS); - EnumLabel(osg::PrimitiveSet::QUAD_STRIP); - EnumLabel(osg::PrimitiveSet::POLYGON); + 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_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveSet) - BaseType(osg::Object); - ConstructorWithDefaults2(IN, osg::PrimitiveSet::Type, primType, osg::PrimitiveSet::PrimitiveType, IN, GLenum, mode, 0); - ConstructorWithDefaults2(IN, const osg::PrimitiveSet &, prim, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::PrimitiveSet::Type, getType); - Method0(const GLvoid *, getDataPointer); - Method0(unsigned int, getTotalDataSize); - Method0(bool, supportsBufferObject); - Method1(void, setMode, IN, GLenum, mode); - Method0(GLenum, getMode); - Method2(void, draw, IN, osg::State &, state, IN, bool, useVertexBufferObjects); - Method1(void, accept, IN, osg::PrimitiveFunctor &, functor); - Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, functor); - Method1(unsigned int, index, IN, unsigned int, pos); - Method0(unsigned int, getNumIndices); - Method1(void, offsetIndices, IN, int, offset); - Method0(unsigned int, getNumPrimitives); - Method0(void, dirty); - Method1(void, setModifiedCount, IN, unsigned int, value); - Method0(unsigned int, getModifiedCount); - ReadOnlyProperty(const GLvoid *, DataPointer); - Property(GLenum, Mode); - Property(unsigned int, ModifiedCount); - ReadOnlyProperty(unsigned int, TotalDataSize); - ReadOnlyProperty(osg::PrimitiveSet::Type, Type); + 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_ReadOnlyProperty(const GLvoid *, DataPointer); + I_Property(GLenum, Mode); + I_Property(unsigned int, ModifiedCount); + I_ReadOnlyProperty(unsigned int, TotalDataSize); + I_ReadOnlyProperty(osg::PrimitiveSet::Type, Type); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< GLsizei >, osg::VectorSizei); diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp index cb146eb7e..ff94c6bcf 100644 --- a/src/osgWrappers/osg/Program.cpp +++ b/src/osgWrappers/osg/Program.cpp @@ -17,66 +17,74 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindingList); TYPE_NAME_ALIAS(std::map< std::string COMMA std::pair< GLint COMMA GLenum > >, osg::Program::NameInfoMap); BEGIN_OBJECT_REFLECTOR(osg::Program) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Program &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, apply, IN, osg::State &, state); - Method1(void, compileGLObjects, IN, osg::State &, state); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - Method0(void, dirtyProgram); - Method1(bool, addShader, IN, osg::Shader *, shader); - Method0(unsigned int, getNumShaders); - Method1(osg::Shader *, getShader, IN, unsigned int, i); - Method1(const osg::Shader *, getShader, IN, unsigned int, i); - Method1(bool, removeShader, IN, osg::Shader *, shader); - Method2(void, addBindAttribLocation, IN, const std::string &, name, IN, GLuint, index); - Method1(void, removeBindAttribLocation, IN, const std::string &, name); - Method0(const osg::Program::AttribBindingList &, getAttribBindingList); - Method0(bool, isFixedFunction); - Method2(bool, getGlProgramInfoLog, IN, unsigned int, contextID, IN, std::string &, log); - Method1(void, setName, IN, const std::string &, name); - Method1(void, setName, IN, const char *, name); - Method0(const std::string &, getName); - Method1(const osg::Program::NameInfoMap &, getActiveUniforms, IN, unsigned int, contextID); - Method1(const osg::Program::NameInfoMap &, getActiveAttribs, IN, unsigned int, contextID); - Method1(osg::Program::PerContextProgram *, getPCP, IN, unsigned int, contextID); - ReadOnlyProperty(const osg::Program::AttribBindingList &, AttribBindingList); - Property(const std::string &, Name); - ArrayProperty_GA(osg::Shader *, Shader, Shaders, unsigned int, bool); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + 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(void, setName, IN, const std::string &, name); + I_Method1(void, setName, IN, const char *, name); + I_Method0(const std::string &, getName); + I_Method1(const osg::Program::NameInfoMap &, getActiveUniforms, IN, unsigned int, contextID); + I_Method1(const osg::Program::NameInfoMap &, getActiveAttribs, IN, unsigned int, contextID); + I_Method1(osg::Program::PerContextProgram *, getPCP, IN, unsigned int, contextID); + I_ReadOnlyProperty(const osg::Program::AttribBindingList &, AttribBindingList); + I_Property(const std::string &, Name); + I_ArrayProperty_GA(osg::Shader *, Shader, Shaders, unsigned int, bool); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram) - BaseType(osg::Referenced); - Constructor2(IN, const osg::Program *, program, IN, unsigned int, contextID); - Method0(GLuint, getHandle); - Method0(void, requestLink); - Method0(void, linkProgram); - Method0(bool, needsLink); - Method0(bool, isLinked); - Method1(bool, getInfoLog, IN, std::string &, infoLog); - Method0(void, useProgram); - Method0(void, resetAppliedUniforms); - Method1(void, apply, IN, const osg::Uniform &, uniform); - Method0(const osg::Program::NameInfoMap &, getActiveUniforms); - Method0(const osg::Program::NameInfoMap &, getActiveAttribs); - Method1(GLint, getUniformLocation, IN, const std::string &, name); - Method1(GLint, getAttribLocation, IN, const std::string &, name); - ReadOnlyProperty(const osg::Program::NameInfoMap &, ActiveAttribs); - ReadOnlyProperty(const osg::Program::NameInfoMap &, ActiveUniforms); - ReadOnlyProperty(GLuint, Handle); + 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, 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::NameInfoMap &, getActiveUniforms); + I_Method0(const osg::Program::NameInfoMap &, getActiveAttribs); + I_Method1(GLint, getUniformLocation, IN, const std::string &, name); + I_Method1(GLint, getAttribLocation, IN, const std::string &, name); + I_ReadOnlyProperty(const osg::Program::NameInfoMap &, ActiveAttribs); + I_ReadOnlyProperty(const osg::Program::NameInfoMap &, ActiveUniforms); + I_ReadOnlyProperty(GLuint, Handle); END_REFLECTOR STD_MAP_REFLECTOR(std::map< std::string COMMA GLuint >); diff --git a/src/osgWrappers/osg/Projection.cpp b/src/osgWrappers/osg/Projection.cpp index 4dc7f4501..9002a6bf3 100644 --- a/src/osgWrappers/osg/Projection.cpp +++ b/src/osgWrappers/osg/Projection.cpp @@ -15,21 +15,29 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::Projection) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Projection &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Constructor1(IN, const osg::Matrix &, matix); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, setMatrix, IN, const osg::Matrix &, mat); - Method0(const osg::Matrix &, getMatrix); - Method1(void, preMult, IN, const osg::Matrix &, mat); - Method1(void, postMult, IN, const osg::Matrix &, mat); - Property(const osg::Matrix &, Matrix); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::Projection &, 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_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_Property(const osg::Matrix &, Matrix); END_REFLECTOR diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index 848fccc33..cce93d5a6 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -17,43 +17,51 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< std::string >, osg::ProxyNode::FileNameList); BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode) - EnumLabel(osg::ProxyNode::USE_BOUNDING_SPHERE_CENTER); - EnumLabel(osg::ProxyNode::USER_DEFINED_CENTER); + I_EnumLabel(osg::ProxyNode::USE_BOUNDING_SPHERE_CENTER); + I_EnumLabel(osg::ProxyNode::USER_DEFINED_CENTER); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::ProxyNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(bool, addChild, IN, osg::Node *, child); - Method2(bool, addChild, IN, osg::Node *, child, IN, const std::string &, filename); - Method1(bool, removeChild, IN, osg::Node *, child); - Method1(void, setDatabasePath, IN, const std::string &, path); - Method0(const std::string &, getDatabasePath); - Method2(void, setFileName, IN, unsigned int, childNo, IN, const std::string &, filename); - Method1(const std::string &, getFileName, IN, unsigned int, childNo); - Method0(unsigned int, getNumFileNames); - Method1(void, setCenterMode, IN, osg::ProxyNode::CenterMode, mode); - Method0(osg::ProxyNode::CenterMode, getCenterMode); - Method1(void, setCenter, IN, const osg::Vec3 &, center); - Method0(const osg::Vec3 &, getCenter); - Method1(void, setRadius, IN, float, radius); - Method0(float, getRadius); - Method0(osg::BoundingSphere, computeBound); - Property(const osg::Vec3 &, Center); - Property(osg::ProxyNode::CenterMode, CenterMode); - Property(const std::string &, DatabasePath); - ArrayProperty_G(const std::string &, FileName, FileNames, unsigned int, void); - Property(float, Radius); + 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_Method1(bool, removeChild, IN, osg::Node *, child); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/Quat.cpp b/src/osgWrappers/osg/Quat.cpp index 52a2df7ed..f6311fd83 100644 --- a/src/osgWrappers/osg/Quat.cpp +++ b/src/osgWrappers/osg/Quat.cpp @@ -17,55 +17,63 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + #include TYPE_NAME_ALIAS(double, osg::Quat::value_type); BEGIN_VALUE_REFLECTOR(osg::Quat) - ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined - Comparator(osgIntrospection::PartialOrderComparator); // user-defined - Constructor0(); - 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); - Constructor1(IN, const osg::Vec4f &, v); - Constructor1(IN, const osg::Vec4d &, v); - Constructor2(IN, osg::Quat::value_type, angle, IN, const osg::Vec3f &, axis); - Constructor2(IN, osg::Quat::value_type, angle, IN, const osg::Vec3d &, axis); - 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); - 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); - Method0(osg::Vec4d, asVec4); - Method0(osg::Vec3d, asVec3); - 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); - Method1(void, set, IN, const osg::Vec4f &, v); - Method1(void, set, IN, const osg::Vec4d &, v); - Method1(void, set, IN, const osg::Matrixf &, matrix); - Method1(void, set, IN, const osg::Matrixd &, matrix); - Method1(void, get, IN, osg::Matrixf &, matrix); - Method1(void, get, IN, osg::Matrixd &, matrix); - Method0(osg::Quat::value_type &, x); - Method0(osg::Quat::value_type &, y); - Method0(osg::Quat::value_type &, z); - Method0(osg::Quat::value_type &, w); - Method0(osg::Quat::value_type, x); - Method0(osg::Quat::value_type, y); - Method0(osg::Quat::value_type, z); - Method0(osg::Quat::value_type, w); - Method0(bool, zeroRotation); - Method0(osg::Quat::value_type, length); - Method0(osg::Quat::value_type, length2); - Method0(osg::Quat, conj); - Method0(const osg::Quat, inverse); - 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); - Method2(void, makeRotate, IN, osg::Quat::value_type, angle, IN, const osg::Vec3f &, vec); - Method2(void, makeRotate, IN, osg::Quat::value_type, angle, IN, const osg::Vec3d &, vec); - 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); - 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); - Method2(void, makeRotate, IN, const osg::Vec3f &, vec1, IN, const osg::Vec3f &, vec2); - Method2(void, makeRotate, IN, const osg::Vec3d &, vec1, IN, const osg::Vec3d &, vec2); - Method2(void, makeRotate_original, IN, const osg::Vec3d &, vec1, IN, const osg::Vec3d &, vec2); - 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); - Method2(void, getRotate, IN, osg::Quat::value_type &, angle, IN, osg::Vec3f &, vec); - Method2(void, getRotate, IN, osg::Quat::value_type &, angle, IN, osg::Vec3d &, vec); - Method3(void, slerp, IN, osg::Quat::value_type, t, IN, const osg::Quat &, from, IN, const osg::Quat &, to); - WriteOnlyProperty(const osg::Vec4f &, ); + 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 diff --git a/src/osgWrappers/osg/RefNodePath.cpp b/src/osgWrappers/osg/RefNodePath.cpp index 585279d3f..49b7e11ec 100644 --- a/src/osgWrappers/osg/RefNodePath.cpp +++ b/src/osgWrappers/osg/RefNodePath.cpp @@ -12,10 +12,18 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osg::RefNodePath) - Constructor0(); - Constructor1(IN, const osg::RefNodePath &, refNodePath); - Constructor1(IN, const osg::NodePath &, nodePath); - Method0(bool, valid); + I_Constructor0(); + I_Constructor1(IN, const osg::RefNodePath &, refNodePath); + I_Constructor1(IN, const osg::NodePath &, nodePath); + I_Method0(bool, valid); END_REFLECTOR diff --git a/src/osgWrappers/osg/Referenced.cpp b/src/osgWrappers/osg/Referenced.cpp index 1912b862b..78b3042f7 100644 --- a/src/osgWrappers/osg/Referenced.cpp +++ b/src/osgWrappers/osg/Referenced.cpp @@ -11,22 +11,30 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osg::DeleteHandler) - Constructor0(); - Method0(void, flush); - Method1(void, doDelete, IN, const osg::Referenced *, object); - Method1(void, requestDelete, IN, const osg::Referenced *, object); + I_Constructor0(); + I_Method0(void, flush); + I_Method1(void, doDelete, IN, const osg::Referenced *, object); + I_Method1(void, requestDelete, IN, const osg::Referenced *, object); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Referenced) - Constructor0(); - Constructor1(IN, const osg::Referenced &, x); - Method1(void, setThreadSafeRefUnref, IN, bool, threadSafe); - Method0(bool, getThreadSafeRefUnref); - Method0(void, ref); - Method0(void, unref); - Method0(void, unref_nodelete); - Method0(int, referenceCount); - Property(bool, ThreadSafeRefUnref); + I_Constructor0(); + I_Constructor1(IN, const osg::Referenced &, x); + I_Method1(void, setThreadSafeRefUnref, IN, bool, threadSafe); + I_Method0(bool, getThreadSafeRefUnref); + I_Method0(void, ref); + I_Method0(void, unref); + I_Method0(void, unref_nodelete); + I_Method0(int, referenceCount); + I_Property(bool, ThreadSafeRefUnref); END_REFLECTOR diff --git a/src/osgWrappers/osg/Sequence.cpp b/src/osgWrappers/osg/Sequence.cpp index 07bf2279d..1290f6d77 100644 --- a/src/osgWrappers/osg/Sequence.cpp +++ b/src/osgWrappers/osg/Sequence.cpp @@ -14,41 +14,49 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Sequence::LoopMode) - EnumLabel(osg::Sequence::LOOP); - EnumLabel(osg::Sequence::SWING); + I_EnumLabel(osg::Sequence::LOOP); + I_EnumLabel(osg::Sequence::SWING); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Sequence::SequenceMode) - EnumLabel(osg::Sequence::START); - EnumLabel(osg::Sequence::STOP); - EnumLabel(osg::Sequence::PAUSE); - EnumLabel(osg::Sequence::RESUME); + 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) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Sequence &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(void, setValue, IN, int, value); - Method0(int, getValue); - Method2(void, setTime, IN, int, frame, IN, float, t); - Method1(float, getTime, IN, int, frame); - Method3(void, setInterval, IN, osg::Sequence::LoopMode, mode, IN, int, begin, IN, int, end); - Method3(void, getInterval, IN, osg::Sequence::LoopMode &, mode, IN, int &, begin, IN, int &, end); - MethodWithDefaults2(void, setDuration, IN, float, speed, , IN, int, nreps, -1); - Method2(void, getDuration, IN, float &, speed, IN, int &, nreps); - Method1(void, setMode, IN, osg::Sequence::SequenceMode, mode); - Method0(osg::Sequence::SequenceMode, getMode); - Property(osg::Sequence::SequenceMode, Mode); - IndexedProperty1(float, Time, int, frame); - Property(int, Value); + I_BaseType(osg::Group); + 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_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 a326d8bf1..a112b67c7 100644 --- a/src/osgWrappers/osg/ShadeModel.cpp +++ b/src/osgWrappers/osg/ShadeModel.cpp @@ -15,26 +15,34 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::ShadeModel::Mode) - EnumLabel(osg::ShadeModel::FLAT); - EnumLabel(osg::ShadeModel::SMOOTH); + I_EnumLabel(osg::ShadeModel::FLAT); + I_EnumLabel(osg::ShadeModel::SMOOTH); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::ShadeModel) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::ShadeModel &, sm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, setMode, IN, osg::ShadeModel::Mode, mode); - Method0(osg::ShadeModel::Mode, getMode); - Method1(void, apply, IN, osg::State &, state); - Property(osg::ShadeModel::Mode, Mode); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + 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 ed4c97686..c71223203 100644 --- a/src/osgWrappers/osg/Shader.cpp +++ b/src/osgWrappers/osg/Shader.cpp @@ -13,39 +13,47 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Shader::Type) - EnumLabel(osg::Shader::VERTEX); - EnumLabel(osg::Shader::FRAGMENT); - EnumLabel(osg::Shader::UNDEFINED); + I_EnumLabel(osg::Shader::VERTEX); + I_EnumLabel(osg::Shader::FRAGMENT); + I_EnumLabel(osg::Shader::UNDEFINED); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Shader) - BaseType(osg::Object); - ConstructorWithDefaults1(IN, osg::Shader::Type, type, osg::Shader::UNDEFINED); - Constructor2(IN, osg::Shader::Type, type, IN, const std::string &, source); - ConstructorWithDefaults2(IN, const osg::Shader &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(int, compare, IN, const osg::Shader &, rhs); - Method1(bool, setType, IN, osg::Shader::Type, t); - Method1(void, setShaderSource, IN, const std::string &, sourceText); - Method1(bool, loadShaderSourceFromFile, IN, const std::string &, fileName); - Method0(const std::string &, getShaderSource); - Method0(osg::Shader::Type, getType); - Method0(const char *, getTypename); - Method0(void, dirtyShader); - Method1(void, compileShader, IN, unsigned int, contextID); - Method2(void, attachShader, IN, unsigned int, contextID, IN, GLuint, program); - Method2(bool, getGlShaderInfoLog, IN, unsigned int, contextID, IN, std::string &, log); - Method1(void, setName, IN, const std::string &, name); - Method1(void, setName, IN, const char *, name); - Method0(const std::string &, getName); - Property(const std::string &, Name); - Property(const std::string &, ShaderSource); - PropertyWithReturnType(osg::Shader::Type, Type, bool); - ReadOnlyProperty(const char *, Typename); + 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_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_Method1(void, setName, IN, const std::string &, name); + I_Method1(void, setName, IN, const char *, name); + I_Method0(const std::string &, getName); + I_Property(const std::string &, Name); + I_Property(const std::string &, ShaderSource); + I_PropertyWithReturnType(osg::Shader::Type, Type, bool); + I_ReadOnlyProperty(const char *, Typename); END_REFLECTOR diff --git a/src/osgWrappers/osg/ShadowVolumeOccluder.cpp b/src/osgWrappers/osg/ShadowVolumeOccluder.cpp index 45310bedf..879ae6314 100644 --- a/src/osgWrappers/osg/ShadowVolumeOccluder.cpp +++ b/src/osgWrappers/osg/ShadowVolumeOccluder.cpp @@ -19,32 +19,40 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::Polytope >, osg::ShadowVolumeOccluder::HoleList); BEGIN_VALUE_REFLECTOR(osg::ShadowVolumeOccluder) - Constructor1(IN, const osg::ShadowVolumeOccluder &, svo); - Constructor0(); - MethodWithDefaults4(bool, computeOccluder, IN, const osg::NodePath &, nodePath, , IN, const osg::ConvexPlanarOccluder &, occluder, , IN, osg::CullStack &, cullStack, , IN, bool, createDrawables, false); - Method0(void, disableResultMasks); - Method0(void, pushCurrentMask); - Method0(void, popCurrentMask); - Method1(bool, matchProjectionMatrix, IN, const osg::Matrix &, matrix); - Method1(void, setNodePath, IN, osg::NodePath &, nodePath); - Method0(osg::NodePath &, getNodePath); - Method0(const osg::NodePath &, getNodePath); - Method0(float, getVolume); - Method0(osg::Polytope &, getOccluder); - Method0(const osg::Polytope &, getOccluder); - Method0(osg::ShadowVolumeOccluder::HoleList &, getHoleList); - Method0(const osg::ShadowVolumeOccluder::HoleList &, getHoleList); - Method1(bool, contains, IN, const std::vector< osg::Vec3 > &, vertices); - Method1(bool, contains, IN, const osg::BoundingSphere &, bound); - Method1(bool, contains, IN, const osg::BoundingBox &, bound); - Method1(void, transformProvidingInverse, IN, const osg::Matrix &, matrix); - ReadOnlyProperty(osg::ShadowVolumeOccluder::HoleList &, HoleList); - Property(osg::NodePath &, NodePath); - ReadOnlyProperty(osg::Polytope &, Occluder); - ReadOnlyProperty(float, Volume); + 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::ShadowVolumeOccluder >, osg::ShadowVolumeOccluderList); diff --git a/src/osgWrappers/osg/Shape.cpp b/src/osgWrappers/osg/Shape.cpp index 5779fc807..933603be6 100644 --- a/src/osgWrappers/osg/Shape.cpp +++ b/src/osgWrappers/osg/Shape.cpp @@ -17,324 +17,332 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::Box) - BaseType(osg::Shape); - Constructor0(); - Constructor2(IN, const osg::Vec3 &, center, IN, float, width); - Constructor4(IN, const osg::Vec3 &, center, IN, float, lengthX, IN, float, lengthY, IN, float, lengthZ); - ConstructorWithDefaults2(IN, const osg::Box &, box, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - Method0(bool, valid); - Method2(void, set, IN, const osg::Vec3 &, center, IN, const osg::Vec3 &, halfLengths); - Method1(void, setCenter, IN, const osg::Vec3 &, center); - Method0(const osg::Vec3 &, getCenter); - Method1(void, setHalfLengths, IN, const osg::Vec3 &, halfLengths); - Method0(const osg::Vec3 &, getHalfLengths); - Method1(void, setRotation, IN, const osg::Quat &, quat); - Method0(const osg::Quat &, getRotation); - Method0(osg::Matrix, computeRotationMatrix); - Method0(bool, zeroRotation); - Property(const osg::Vec3 &, Center); - Property(const osg::Vec3 &, HalfLengths); - Property(const osg::Quat &, Rotation); + 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) - BaseType(osg::Shape); - Constructor0(); - Constructor3(IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - ConstructorWithDefaults2(IN, const osg::Capsule &, capsule, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - Method0(bool, valid); - Method3(void, set, IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - Method1(void, setCenter, IN, const osg::Vec3 &, center); - Method0(const osg::Vec3 &, getCenter); - Method1(void, setRadius, IN, float, radius); - Method0(float, getRadius); - Method1(void, setHeight, IN, float, height); - Method0(float, getHeight); - Method1(void, setRotation, IN, const osg::Quat &, quat); - Method0(const osg::Quat &, getRotation); - Method0(osg::Matrix, computeRotationMatrix); - Method0(bool, zeroRotation); - Property(const osg::Vec3 &, Center); - Property(float, Height); - Property(float, Radius); - Property(const osg::Quat &, Rotation); + 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); BEGIN_OBJECT_REFLECTOR(osg::CompositeShape) - BaseType(osg::Shape); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::CompositeShape &, cs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - Method1(void, setShape, IN, osg::Shape *, shape); - Method0(osg::Shape *, getShape); - Method0(const osg::Shape *, getShape); - Method0(unsigned int, getNumChildren); - Method1(osg::Shape *, getChild, IN, unsigned int, i); - Method1(const osg::Shape *, getChild, IN, unsigned int, i); - Method1(void, addChild, IN, osg::Shape *, shape); - Method1(void, removeChild, IN, unsigned int, i); - Method1(unsigned int, findChildNo, IN, osg::Shape *, shape); - ArrayProperty_GA(osg::Shape *, Child, Children, unsigned int, void); - Property(osg::Shape *, Shape); + 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) - BaseType(osg::Shape); - Constructor0(); - Constructor3(IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - ConstructorWithDefaults2(IN, const osg::Cone &, cone, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - Method0(bool, valid); - Method3(void, set, IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - Method1(void, setCenter, IN, const osg::Vec3 &, center); - Method0(const osg::Vec3 &, getCenter); - Method1(void, setRadius, IN, float, radius); - Method0(float, getRadius); - Method1(void, setHeight, IN, float, height); - Method0(float, getHeight); - Method1(void, setRotation, IN, const osg::Quat &, quat); - Method0(const osg::Quat &, getRotation); - Method0(osg::Matrix, computeRotationMatrix); - Method0(bool, zeroRotation); - Method0(float, getBaseOffsetFactor); - Method0(float, getBaseOffset); - ReadOnlyProperty(float, BaseOffset); - ReadOnlyProperty(float, BaseOffsetFactor); - Property(const osg::Vec3 &, Center); - Property(float, Height); - Property(float, Radius); - Property(const osg::Quat &, Rotation); + 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) - Constructor0(); - Method1(void, apply, IN, const osg::Sphere &, x); - Method1(void, apply, IN, const osg::Box &, x); - Method1(void, apply, IN, const osg::Cone &, x); - Method1(void, apply, IN, const osg::Cylinder &, x); - Method1(void, apply, IN, const osg::Capsule &, x); - Method1(void, apply, IN, const osg::InfinitePlane &, x); - Method1(void, apply, IN, const osg::TriangleMesh &, x); - Method1(void, apply, IN, const osg::ConvexHull &, x); - Method1(void, apply, IN, const osg::HeightField &, x); - Method1(void, apply, IN, const osg::CompositeShape &, x); + 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) - BaseType(osg::TriangleMesh); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::ConvexHull &, hull, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); + 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) - BaseType(osg::Shape); - Constructor0(); - Constructor3(IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - ConstructorWithDefaults2(IN, const osg::Cylinder &, cylinder, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - Method0(bool, valid); - Method3(void, set, IN, const osg::Vec3 &, center, IN, float, radius, IN, float, height); - Method1(void, setCenter, IN, const osg::Vec3 &, center); - Method0(const osg::Vec3 &, getCenter); - Method1(void, setRadius, IN, float, radius); - Method0(float, getRadius); - Method1(void, setHeight, IN, float, height); - Method0(float, getHeight); - Method1(void, setRotation, IN, const osg::Quat &, quat); - Method0(const osg::Quat &, getRotation); - Method0(osg::Matrix, computeRotationMatrix); - Method0(bool, zeroRotation); - Property(const osg::Vec3 &, Center); - Property(float, Height); - Property(float, Radius); - Property(const osg::Quat &, Rotation); + 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) - BaseType(osg::Shape); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::HeightField &, mesh, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - Method2(void, allocate, IN, unsigned int, numColumns, IN, unsigned int, numRows); - Method0(unsigned int, getNumColumns); - Method0(unsigned int, getNumRows); - Method1(void, setOrigin, IN, const osg::Vec3 &, origin); - Method0(const osg::Vec3 &, getOrigin); - Method1(void, setXInterval, IN, float, dx); - Method0(float, getXInterval); - Method1(void, setYInterval, IN, float, dy); - Method0(float, getYInterval); - Method1(void, setSkirtHeight, IN, float, skirtHeight); - Method0(float, getSkirtHeight); - Method1(void, setBorderWidth, IN, unsigned int, borderWidth); - Method0(unsigned int, getBorderWidth); - Method1(void, setRotation, IN, const osg::Quat &, quat); - Method0(const osg::Quat &, getRotation); - Method0(osg::Matrix, computeRotationMatrix); - Method0(bool, zeroRotation); - Method3(void, setHeight, IN, unsigned int, c, IN, unsigned int, r, IN, float, value); - Method2(float &, getHeight, IN, unsigned int, c, IN, unsigned int, r); - Method2(float, getHeight, IN, unsigned int, c, IN, unsigned int, r); - Method0(osg::HeightField::HeightList &, getHeightList); - Method0(const osg::HeightField::HeightList &, getHeightList); - Method2(osg::Vec3, getVertex, IN, unsigned int, c, IN, unsigned int, r); - Method2(osg::Vec3, getNormal, IN, unsigned int, c, IN, unsigned int, r); - Property(unsigned int, BorderWidth); - IndexedProperty2(float, Height, unsigned int, c, unsigned int, r); - ReadOnlyProperty(osg::HeightField::HeightList &, HeightList); - Property(const osg::Vec3 &, Origin); - Property(const osg::Quat &, Rotation); - Property(float, SkirtHeight); - Property(float, XInterval); - Property(float, YInterval); + 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_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) - BaseType(osg::Shape); - BaseType(osg::Plane); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::InfinitePlane &, plane, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); + 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) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Shape &, sa, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, x); - Method1(void, accept, IN, osg::ConstShapeVisitor &, x); + 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) - Constructor0(); - Method1(void, apply, IN, osg::Sphere &, x); - Method1(void, apply, IN, osg::Box &, x); - Method1(void, apply, IN, osg::Cone &, x); - Method1(void, apply, IN, osg::Cylinder &, x); - Method1(void, apply, IN, osg::Capsule &, x); - Method1(void, apply, IN, osg::InfinitePlane &, x); - Method1(void, apply, IN, osg::TriangleMesh &, x); - Method1(void, apply, IN, osg::ConvexHull &, x); - Method1(void, apply, IN, osg::HeightField &, x); - Method1(void, apply, IN, osg::CompositeShape &, x); + 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) - BaseType(osg::Shape); - Constructor0(); - Constructor2(IN, const osg::Vec3 &, center, IN, float, radius); - ConstructorWithDefaults2(IN, const osg::Sphere &, sphere, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - Method0(bool, valid); - Method2(void, set, IN, const osg::Vec3 &, center, IN, float, radius); - Method1(void, setCenter, IN, const osg::Vec3 &, center); - Method0(const osg::Vec3 &, getCenter); - Method1(void, setRadius, IN, float, radius); - Method0(float, getRadius); - Property(const osg::Vec3 &, Center); - Property(float, Radius); + 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) - BaseType(osg::Shape); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::TriangleMesh &, mesh, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, accept, IN, osg::ShapeVisitor &, sv); - Method1(void, accept, IN, osg::ConstShapeVisitor &, csv); - Method1(void, setVertices, IN, osg::Vec3Array *, vertices); - Method0(osg::Vec3Array *, getVertices); - Method0(const osg::Vec3Array *, getVertices); - Method1(void, setIndices, IN, osg::IndexArray *, indices); - Method0(osg::IndexArray *, getIndices); - Method0(const osg::IndexArray *, getIndices); - Property(osg::IndexArray *, Indices); - Property(osg::Vec3Array *, Vertices); + 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(osg::HeightField, osg::Grid); BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Shape >) - Constructor0(); - Constructor1(IN, osg::Shape *, t); - Constructor1(IN, const osg::ref_ptr< osg::Shape > &, rp); - Method0(bool, valid); - Method0(osg::Shape *, get); - Method0(const osg::Shape *, get); - Method0(osg::Shape *, take); - Method0(osg::Shape *, release); - ReadOnlyProperty(osg::Shape *, ); + I_Constructor0(); + I_Constructor1(IN, osg::Shape *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::Shape > &, rp); + I_Method0(bool, valid); + I_Method0(osg::Shape *, get); + I_Method0(const osg::Shape *, get); + I_Method0(osg::Shape *, take); + I_Method0(osg::Shape *, release); + I_ReadOnlyProperty(osg::Shape *, ); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< float >); diff --git a/src/osgWrappers/osg/ShapeDrawable.cpp b/src/osgWrappers/osg/ShapeDrawable.cpp index c017fdb85..fae280606 100644 --- a/src/osgWrappers/osg/ShapeDrawable.cpp +++ b/src/osgWrappers/osg/ShapeDrawable.cpp @@ -19,75 +19,83 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::ShapeDrawable) - BaseType(osg::Drawable); - Constructor0(); - ConstructorWithDefaults2(IN, osg::Shape *, shape, , IN, osg::TessellationHints *, hints, 0); - ConstructorWithDefaults2(IN, const osg::ShapeDrawable &, pg, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setColor, IN, const osg::Vec4 &, color); - Method0(const osg::Vec4 &, getColor); - Method1(void, setTessellationHints, IN, osg::TessellationHints *, hints); - Method0(osg::TessellationHints *, getTessellationHints); - Method0(const osg::TessellationHints *, getTessellationHints); - Method1(void, drawImplementation, IN, osg::State &, state); - Method1(bool, supports, IN, osg::Drawable::AttributeFunctor &, x); - Method1(bool, supports, IN, osg::Drawable::ConstAttributeFunctor &, x); - Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); - Method1(bool, supports, IN, osg::PrimitiveFunctor &, x); - Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); - Method0(osg::BoundingBox, computeBound); - Property(const osg::Vec4 &, Color); - Property(osg::TessellationHints *, TessellationHints); + 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, osg::Drawable::AttributeFunctor &, x); + I_Method1(bool, supports, IN, osg::Drawable::ConstAttributeFunctor &, x); + I_Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); + I_Method1(bool, supports, IN, 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); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::TessellationHints::TessellationMode) - EnumLabel(osg::TessellationHints::USE_SHAPE_DEFAULTS); - EnumLabel(osg::TessellationHints::USE_TARGET_NUM_FACES); + I_EnumLabel(osg::TessellationHints::USE_SHAPE_DEFAULTS); + I_EnumLabel(osg::TessellationHints::USE_TARGET_NUM_FACES); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TessellationHints) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::TessellationHints &, tess, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setTessellationMode, IN, osg::TessellationHints::TessellationMode, mode); - Method0(osg::TessellationHints::TessellationMode, getTessellationMode); - Method1(void, setDetailRatio, IN, float, ratio); - Method0(float, getDetailRatio); - Method1(void, setTargetNumFaces, IN, unsigned int, target); - Method0(unsigned int, getTargetNumFaces); - Method1(void, setCreateFrontFace, IN, bool, on); - Method0(bool, getCreateFrontFace); - Method1(void, setCreateBackFace, IN, bool, on); - Method0(bool, getCreateBackFace); - Method1(void, setCreateNormals, IN, bool, on); - Method0(bool, getCreateNormals); - Method1(void, setCreateTextureCoords, IN, bool, on); - Method0(bool, getCreateTextureCoords); - Method1(void, setCreateTop, IN, bool, on); - Method0(bool, getCreateTop); - Method1(void, setCreateBody, IN, bool, on); - Method0(bool, getCreateBody); - Method1(void, setCreateBottom, IN, bool, on); - Method0(bool, getCreateBottom); - Property(bool, CreateBackFace); - Property(bool, CreateBody); - Property(bool, CreateBottom); - Property(bool, CreateFrontFace); - Property(bool, CreateNormals); - Property(bool, CreateTextureCoords); - Property(bool, CreateTop); - Property(float, DetailRatio); - Property(unsigned int, TargetNumFaces); - Property(osg::TessellationHints::TessellationMode, TessellationMode); + 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 b12f44a7e..8cd0dad6c 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -19,128 +19,136 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors) - EnumLabel(osg::State::NEVER_CHECK_GL_ERRORS); - EnumLabel(osg::State::ONCE_PER_FRAME); - EnumLabel(osg::State::ONCE_PER_ATTRIBUTE); + I_EnumLabel(osg::State::NEVER_CHECK_GL_ERRORS); + I_EnumLabel(osg::State::ONCE_PER_FRAME); + I_EnumLabel(osg::State::ONCE_PER_ATTRIBUTE); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::State) - BaseType(osg::Referenced); - Constructor0(); - Method1(void, pushStateSet, IN, const osg::StateSet *, dstate); - Method0(void, popStateSet); - Method0(void, popAllStateSets); - Method1(void, captureCurrentState, IN, osg::StateSet &, stateset); - Method0(void, reset); - Method0(const osg::Viewport *, getCurrentViewport); - Method1(void, setInitialViewMatrix, IN, const osg::RefMatrix *, matrix); - Method0(const osg::Matrix &, getInitialViewMatrix); - Method0(const osg::Matrix &, getInitialInverseViewMatrix); - Method1(void, applyProjectionMatrix, IN, const osg::RefMatrix *, matrix); - Method0(const osg::Matrix &, getProjectionMatrix); - Method1(void, applyModelViewMatrix, IN, const osg::RefMatrix *, matrix); - Method0(const osg::Matrix &, getModelViewMatrix); - Method0(osg::Polytope, getViewFrustum); - Method1(void, apply, IN, const osg::StateSet *, dstate); - Method0(void, apply); - Method2(void, setGlobalDefaultModeValue, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); - Method1(bool, getGlobalDefaultModeValue, IN, osg::StateAttribute::GLMode, mode); - Method2(bool, applyMode, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); - Method3(void, setGlobalDefaultTextureModeValue, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); - Method2(bool, getGlobalDefaultTextureModeValue, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - Method3(bool, applyTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode, IN, bool, enabled); - Method1(void, setGlobalDefaultAttribute, IN, const osg::StateAttribute *, attribute); - MethodWithDefaults2(const osg::StateAttribute *, getGlobalDefaultAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - Method1(bool, applyAttribute, IN, const osg::StateAttribute *, attribute); - Method2(void, setGlobalDefaultTextureAttribute, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute); - MethodWithDefaults3(const osg::StateAttribute *, getGlobalDefaultTextureAttribute, IN, unsigned int, unit, , IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - Method2(bool, applyTextureAttribute, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute); - Method2(void, haveAppliedMode, IN, osg::StateAttribute::GLMode, mode, IN, osg::StateAttribute::GLModeValue, value); - Method1(void, haveAppliedMode, IN, osg::StateAttribute::GLMode, mode); - Method1(void, haveAppliedAttribute, IN, const osg::StateAttribute *, attribute); - MethodWithDefaults2(void, haveAppliedAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - Method1(bool, getLastAppliedMode, IN, osg::StateAttribute::GLMode, mode); - MethodWithDefaults2(const osg::StateAttribute *, getLastAppliedAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - Method3(void, haveAppliedTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode, IN, osg::StateAttribute::GLModeValue, value); - Method2(void, haveAppliedTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - Method2(void, haveAppliedTextureAttribute, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute); - MethodWithDefaults3(void, haveAppliedTextureAttribute, IN, unsigned int, unit, , IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - Method2(bool, getLastAppliedTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - MethodWithDefaults3(const osg::StateAttribute *, getLastAppliedTextureAttribute, IN, unsigned int, unit, , IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - Method0(void, dirtyAllModes); - Method0(void, dirtyAllAttributes); - Method0(void, disableAllVertexArrays); - Method0(void, dirtyAllVertexArrays); - Method3(void, setInterleavedArrays, IN, GLenum, format, IN, GLsizei, stride, IN, const GLvoid *, pointer); - Method4(void, setVertexPointer, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - Method0(void, disableVertexPointer); - Method0(void, dirtyVertexPointer); - Method3(void, setNormalPointer, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - Method0(void, disableNormalPointer); - Method0(void, dirtyNormalPointer); - Method4(void, setColorPointer, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - Method0(void, disableColorPointer); - Method0(void, dirtyColorPointer); - Method0(bool, isSecondaryColorSupported); - Method4(void, setSecondaryColorPointer, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - Method0(void, disableSecondaryColorPointer); - Method0(void, dirtySecondaryColorPointer); - Method3(void, setIndexPointer, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - Method0(void, disableIndexPointer); - Method0(void, dirtyIndexPointer); - Method0(bool, isFogCoordSupported); - Method3(void, setFogCoordPointer, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - Method0(void, disableFogCoordPointer); - Method0(void, dirtyFogCoordPointer); - Method5(void, setTexCoordPointer, IN, unsigned int, unit, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr); - Method1(void, disableTexCoordPointer, IN, unsigned int, unit); - Method1(void, dirtyTexCoordPointer, IN, unsigned int, unit); - Method1(void, disableTexCoordPointersAboveAndIncluding, IN, unsigned int, unit); - Method1(void, dirtyTexCoordPointersAboveAndIncluding, IN, unsigned int, unit); - Method1(bool, setActiveTextureUnit, IN, unsigned int, unit); - Method0(unsigned int, getActiveTextureUnit); - Method1(bool, setClientActiveTextureUnit, IN, unsigned int, unit); - Method0(unsigned int, getClientActiveTextureUnit); - Method6(void, setVertexAttribPointer, IN, unsigned int, index, IN, GLint, size, IN, GLenum, type, IN, GLboolean, normalized, IN, GLsizei, stride, IN, const GLvoid *, ptr); - Method1(void, disableVertexAttribPointer, IN, unsigned int, index); - Method1(void, disableVertexAttribPointersAboveAndIncluding, IN, unsigned int, index); - Method1(void, dirtyVertexAttribPointersAboveAndIncluding, IN, unsigned int, index); - Method0(bool, isVertexBufferObjectSupported); - Method1(void, setLastAppliedProgramObject, IN, const osg::Program::PerContextProgram *, program); - Method0(const osg::Program::PerContextProgram *, getLastAppliedProgramObject); - Method1(GLint, getUniformLocation, IN, const std::string &, name); - Method1(GLint, getAttribLocation, IN, const std::string &, name); - Method1(void, setContextID, IN, unsigned int, contextID); - Method0(unsigned int, getContextID); - Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs); - Method0(const osg::FrameStamp *, getFrameStamp); - Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, vs); - Method0(const osg::DisplaySettings *, getDisplaySettings); - Method1(void, setAbortRenderingPtr, IN, bool *, abortPtr); - Method0(bool, getAbortRendering); - Method1(void, setCheckForGLErrors, IN, osg::State::CheckForGLErrors, check); - Method0(osg::State::CheckForGLErrors, getCheckForGLErrors); - Method1(bool, checkGLErrors, IN, const char *, str); - Method1(bool, checkGLErrors, IN, osg::StateAttribute::GLMode, mode); - Method1(bool, checkGLErrors, IN, const osg::StateAttribute *, attribute); - ReadOnlyProperty(bool, AbortRendering); - WriteOnlyProperty(bool *, AbortRenderingPtr); - PropertyWithReturnType(unsigned int, ActiveTextureUnit, bool); - Property(osg::State::CheckForGLErrors, CheckForGLErrors); - PropertyWithReturnType(unsigned int, ClientActiveTextureUnit, bool); - Property(unsigned int, ContextID); - ReadOnlyProperty(const osg::Viewport *, CurrentViewport); - WriteOnlyProperty(osg::DisplaySettings *, DisplaySettings); - WriteOnlyProperty(osg::FrameStamp *, FrameStamp); - WriteOnlyProperty(const osg::StateAttribute *, GlobalDefaultAttribute); - IndexedProperty1(bool, GlobalDefaultModeValue, osg::StateAttribute::GLMode, mode); - IndexedProperty2(bool, GlobalDefaultTextureModeValue, unsigned int, unit, osg::StateAttribute::GLMode, mode); - ReadOnlyProperty(const osg::Matrix &, InitialInverseViewMatrix); - WriteOnlyProperty(const osg::RefMatrix *, InitialViewMatrix); - Property(const osg::Program::PerContextProgram *, LastAppliedProgramObject); - ReadOnlyProperty(const osg::Matrix &, ModelViewMatrix); - ReadOnlyProperty(const osg::Matrix &, ProjectionMatrix); - ReadOnlyProperty(osg::Polytope, ViewFrustum); + I_BaseType(osg::Referenced); + I_Constructor0(); + 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, 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, setContextID, IN, unsigned int, contextID); + I_Method0(unsigned int, getContextID); + 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_ReadOnlyProperty(const osg::Matrix &, InitialInverseViewMatrix); + I_WriteOnlyProperty(const osg::RefMatrix *, InitialViewMatrix); + I_Property(const osg::Program::PerContextProgram *, LastAppliedProgramObject); + I_ReadOnlyProperty(const osg::Matrix &, ModelViewMatrix); + I_ReadOnlyProperty(const osg::Matrix &, ProjectionMatrix); + I_ReadOnlyProperty(osg::Polytope, ViewFrustum); END_REFLECTOR diff --git a/src/osgWrappers/osg/StateAttribute.cpp b/src/osgWrappers/osg/StateAttribute.cpp index fdd8fe97f..41489910c 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -16,6 +16,14 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(GLenum, osg::StateAttribute::GLMode); TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::GLModeValue); @@ -27,113 +35,113 @@ TYPE_NAME_ALIAS(std::pair< osg::StateAttribute::Type COMMA unsigned int >, osg: TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList); BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Values) - EnumLabel(osg::StateAttribute::OFF); - EnumLabel(osg::StateAttribute::ON); - EnumLabel(osg::StateAttribute::OVERRIDE); - EnumLabel(osg::StateAttribute::PROTECTED); - EnumLabel(osg::StateAttribute::INHERIT); + 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_ENUM_REFLECTOR(osg::StateAttribute::Type) - EnumLabel(osg::StateAttribute::TEXTURE); - EnumLabel(osg::StateAttribute::POLYGONMODE); - EnumLabel(osg::StateAttribute::POLYGONOFFSET); - EnumLabel(osg::StateAttribute::MATERIAL); - EnumLabel(osg::StateAttribute::ALPHAFUNC); - EnumLabel(osg::StateAttribute::ANTIALIAS); - EnumLabel(osg::StateAttribute::COLORTABLE); - EnumLabel(osg::StateAttribute::CULLFACE); - EnumLabel(osg::StateAttribute::FOG); - EnumLabel(osg::StateAttribute::FRONTFACE); - EnumLabel(osg::StateAttribute::LIGHT); - EnumLabel(osg::StateAttribute::POINT); - EnumLabel(osg::StateAttribute::LINEWIDTH); - EnumLabel(osg::StateAttribute::LINESTIPPLE); - EnumLabel(osg::StateAttribute::POLYGONSTIPPLE); - EnumLabel(osg::StateAttribute::SHADEMODEL); - EnumLabel(osg::StateAttribute::TEXENV); - EnumLabel(osg::StateAttribute::TEXENVFILTER); - EnumLabel(osg::StateAttribute::TEXGEN); - EnumLabel(osg::StateAttribute::TEXMAT); - EnumLabel(osg::StateAttribute::LIGHTMODEL); - EnumLabel(osg::StateAttribute::BLENDFUNC); - EnumLabel(osg::StateAttribute::BLENDEQUATION); - EnumLabel(osg::StateAttribute::LOGICOP); - EnumLabel(osg::StateAttribute::STENCIL); - EnumLabel(osg::StateAttribute::COLORMASK); - EnumLabel(osg::StateAttribute::DEPTH); - EnumLabel(osg::StateAttribute::VIEWPORT); - EnumLabel(osg::StateAttribute::BLENDCOLOR); - EnumLabel(osg::StateAttribute::MULTISAMPLE); - EnumLabel(osg::StateAttribute::CLIPPLANE); - EnumLabel(osg::StateAttribute::COLORMATRIX); - EnumLabel(osg::StateAttribute::VERTEXPROGRAM); - EnumLabel(osg::StateAttribute::FRAGMENTPROGRAM); - EnumLabel(osg::StateAttribute::POINTSPRITE); - EnumLabel(osg::StateAttribute::PROGRAM); - EnumLabel(osg::StateAttribute::VALIDATOR); - EnumLabel(osg::StateAttribute::VIEWMATRIXEXTRACTOR); - EnumLabel(osg::StateAttribute::OSGNV_PARAMETER_BLOCK); - EnumLabel(osg::StateAttribute::OSGNVEXT_TEXTURE_SHADER); - EnumLabel(osg::StateAttribute::OSGNVEXT_VERTEX_PROGRAM); - EnumLabel(osg::StateAttribute::OSGNVEXT_REGISTER_COMBINERS); - EnumLabel(osg::StateAttribute::OSGNVCG_PROGRAM); - EnumLabel(osg::StateAttribute::OSGNVSLANG_PROGRAM); - EnumLabel(osg::StateAttribute::OSGNVPARSE_PROGRAM_PARSER); + 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::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::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) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::StateAttribute &, sa, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method0(unsigned int, getMember); - Method0(osg::StateAttribute::TypeMemberPair, getTypeMemberPair); - Method0(bool, isTextureAttribute); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method0(const osg::StateAttribute::ParentList &, getParents); - Method1(osg::StateSet *, getParent, IN, unsigned int, i); - Method1(const osg::StateSet *, getParent, IN, unsigned int, i); - Method0(unsigned int, getNumParents); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x); - Method1(void, setUpdateCallback, IN, osg::StateAttribute::Callback *, uc); - Method0(osg::StateAttribute::Callback *, getUpdateCallback); - Method0(const osg::StateAttribute::Callback *, getUpdateCallback); - Method1(void, setEventCallback, IN, osg::StateAttribute::Callback *, ec); - Method0(osg::StateAttribute::Callback *, getEventCallback); - Method0(const osg::StateAttribute::Callback *, getEventCallback); - Method1(void, apply, IN, osg::State &, x); - Method1(void, compileGLObjects, IN, osg::State &, x); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); - Property(osg::StateAttribute::Callback *, EventCallback); - ReadOnlyProperty(unsigned int, Member); - ArrayProperty_G(osg::StateSet *, Parent, Parents, unsigned int, void); - ReadOnlyProperty(const osg::StateAttribute::ParentList &, Parents); - ReadOnlyProperty(osg::StateAttribute::Type, Type); - ReadOnlyProperty(osg::StateAttribute::TypeMemberPair, TypeMemberPair); - Property(osg::StateAttribute::Callback *, UpdateCallback); + 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(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); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::StateAttribute::Callback) - VirtualBaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::StateAttribute::Callback &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); +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); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute::ModeUsage) - Constructor0(); - Method1(void, usesMode, IN, osg::StateAttribute::GLMode, mode); - Method1(void, usesTextureMode, IN, osg::StateAttribute::GLMode, mode); + 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 bca05bc22..fc50e4cd0 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -17,6 +17,14 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::Object * >, osg::StateSet::ParentList); TYPE_NAME_ALIAS(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateSet::ModeList); @@ -34,155 +42,155 @@ TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::Uniform > COMMA osg::StateAttribu TYPE_NAME_ALIAS(std::map< std::string COMMA osg::StateSet::RefUniformPair >, osg::StateSet::UniformList); BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderingHint) - EnumLabel(osg::StateSet::DEFAULT_BIN); - EnumLabel(osg::StateSet::OPAQUE_BIN); - EnumLabel(osg::StateSet::TRANSPARENT_BIN); + 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) - EnumLabel(osg::StateSet::INHERIT_RENDERBIN_DETAILS); - EnumLabel(osg::StateSet::USE_RENDERBIN_DETAILS); - EnumLabel(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS); - EnumLabel(osg::StateSet::ENCLOSE_RENDERBIN_DETAILS); + I_EnumLabel(osg::StateSet::INHERIT_RENDERBIN_DETAILS); + I_EnumLabel(osg::StateSet::USE_RENDERBIN_DETAILS); + I_EnumLabel(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS); + I_EnumLabel(osg::StateSet::ENCLOSE_RENDERBIN_DETAILS); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::StateSet) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::StateSet &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - MethodWithDefaults2(int, compare, IN, const osg::StateSet &, rhs, , IN, bool, compareAttributeContents, false); - Method0(const osg::StateSet::ParentList &, getParents); - Method0(osg::StateSet::ParentList, getParents); - Method1(osg::Object *, getParent, IN, unsigned int, i); - Method1(const osg::Object *, getParent, IN, unsigned int, i); - Method0(unsigned int, getNumParents); - Method0(void, setGlobalDefaults); - Method0(void, clear); - Method1(void, merge, IN, const osg::StateSet &, rhs); - Method2(void, setMode, IN, osg::StateAttribute::GLMode, mode, IN, osg::StateAttribute::GLModeValue, value); - Method1(void, removeMode, IN, osg::StateAttribute::GLMode, mode); - Method1(osg::StateAttribute::GLModeValue, getMode, IN, osg::StateAttribute::GLMode, mode); - Method1(void, setModeList, IN, osg::StateSet::ModeList &, ml); - Method0(osg::StateSet::ModeList &, getModeList); - Method0(const osg::StateSet::ModeList &, getModeList); - MethodWithDefaults2(void, setAttribute, IN, osg::StateAttribute *, attribute, , IN, osg::StateAttribute::OverrideValue, value, osg::StateAttribute::OFF); - MethodWithDefaults2(void, setAttributeAndModes, IN, osg::StateAttribute *, attribute, , IN, osg::StateAttribute::GLModeValue, value, osg::StateAttribute::ON); - MethodWithDefaults2(void, removeAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - Method1(void, removeAttribute, IN, osg::StateAttribute *, attribute); - MethodWithDefaults2(osg::StateAttribute *, getAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - MethodWithDefaults2(const osg::StateAttribute *, getAttribute, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - MethodWithDefaults2(const osg::StateSet::RefAttributePair *, getAttributePair, IN, osg::StateAttribute::Type, type, , IN, unsigned int, member, 0); - Method1(void, setAttributeList, IN, osg::StateSet::AttributeList &, al); - Method0(osg::StateSet::AttributeList &, getAttributeList); - Method0(const osg::StateSet::AttributeList &, getAttributeList); - Method3(void, setTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode, IN, osg::StateAttribute::GLModeValue, value); - Method2(void, removeTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - Method2(osg::StateAttribute::GLModeValue, getTextureMode, IN, unsigned int, unit, IN, osg::StateAttribute::GLMode, mode); - Method1(void, setTextureModeList, IN, osg::StateSet::TextureModeList &, tml); - Method0(osg::StateSet::TextureModeList &, getTextureModeList); - Method0(const osg::StateSet::TextureModeList &, getTextureModeList); - MethodWithDefaults3(void, setTextureAttribute, IN, unsigned int, unit, , IN, osg::StateAttribute *, attribute, , IN, osg::StateAttribute::OverrideValue, value, osg::StateAttribute::OFF); - MethodWithDefaults3(void, setTextureAttributeAndModes, IN, unsigned int, unit, , IN, osg::StateAttribute *, attribute, , IN, osg::StateAttribute::GLModeValue, value, osg::StateAttribute::ON); - Method2(void, removeTextureAttribute, IN, unsigned int, unit, IN, osg::StateAttribute::Type, type); - Method2(void, removeTextureAttribute, IN, unsigned int, unit, IN, osg::StateAttribute *, attribute); - Method2(osg::StateAttribute *, getTextureAttribute, IN, unsigned int, unit, IN, osg::StateAttribute::Type, type); - Method2(const osg::StateAttribute *, getTextureAttribute, IN, unsigned int, unit, IN, osg::StateAttribute::Type, type); - Method2(const osg::StateSet::RefAttributePair *, getTextureAttributePair, IN, unsigned int, unit, IN, osg::StateAttribute::Type, type); - Method1(void, setTextureAttributeList, IN, osg::StateSet::TextureAttributeList &, tal); - Method0(osg::StateSet::TextureAttributeList &, getTextureAttributeList); - Method0(const osg::StateSet::TextureAttributeList &, getTextureAttributeList); - Method2(void, setAssociatedModes, IN, const osg::StateAttribute *, attribute, IN, osg::StateAttribute::GLModeValue, value); - Method3(void, setAssociatedTextureModes, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute, IN, osg::StateAttribute::GLModeValue, value); - MethodWithDefaults2(void, addUniform, IN, osg::Uniform *, uniform, , IN, osg::StateAttribute::OverrideValue, value, osg::StateAttribute::ON); - Method1(void, removeUniform, IN, const std::string &, name); - Method1(void, removeUniform, IN, osg::Uniform *, uniform); - Method1(osg::Uniform *, getUniform, IN, const std::string &, name); - Method2(osg::Uniform *, getOrCreateUniform, IN, const std::string &, name, IN, osg::Uniform::Type, type); - Method1(const osg::Uniform *, getUniform, IN, const std::string &, name); - Method1(const osg::StateSet::RefUniformPair *, getUniformPair, IN, const std::string &, name); - Method1(void, setUniformList, IN, osg::StateSet::UniformList &, al); - Method0(osg::StateSet::UniformList &, getUniformList); - Method0(const osg::StateSet::UniformList &, getUniformList); - Method1(void, setRenderingHint, IN, int, hint); - Method0(int, getRenderingHint); - MethodWithDefaults3(void, setRenderBinDetails, IN, int, binNum, , IN, const std::string &, binName, , IN, osg::StateSet::RenderBinMode, mode, osg::StateSet::USE_RENDERBIN_DETAILS); - Method0(void, setRenderBinToInherit); - Method0(bool, useRenderBinDetails); - Method1(void, setRenderBinMode, IN, osg::StateSet::RenderBinMode, mode); - Method0(osg::StateSet::RenderBinMode, getRenderBinMode); - Method1(void, setBinNumber, IN, int, num); - Method0(int, getBinNumber); - Method1(void, setBinName, IN, const std::string &, name); - Method0(const std::string &, getBinName); - Method1(void, setUpdateCallback, IN, osg::StateSet::Callback *, ac); - Method0(osg::StateSet::Callback *, getUpdateCallback); - Method0(const osg::StateSet::Callback *, getUpdateCallback); - Method0(bool, requiresUpdateTraversal); - Method0(unsigned int, getNumChildrenRequiringUpdateTraversal); - Method1(void, runUpdateCallbacks, IN, osg::NodeVisitor *, nv); - Method1(void, setEventCallback, IN, osg::StateSet::Callback *, ac); - Method0(osg::StateSet::Callback *, getEventCallback); - Method0(const osg::StateSet::Callback *, getEventCallback); - Method0(bool, requiresEventTraversal); - Method0(unsigned int, getNumChildrenRequiringEventTraversal); - Method1(void, runEventCallbacks, IN, osg::NodeVisitor *, nv); - Method1(void, compileGLObjects, IN, osg::State &, state); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - Property(osg::StateSet::AttributeList &, AttributeList); - Property(const std::string &, BinName); - Property(int, BinNumber); - Property(osg::StateSet::Callback *, EventCallback); + I_BaseType(osg::Object); + 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_Method2(osg::Uniform *, getOrCreateUniform, IN, const std::string &, name, IN, osg::Uniform::Type, type); + 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(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); - Property(osg::StateSet::ModeList &, ModeList); - ArrayProperty_G(osg::Object *, Parent, Parents, unsigned int, void); - ReadOnlyProperty(osg::StateSet::ParentList, Parents); - Property(osg::StateSet::RenderBinMode, RenderBinMode); - Property(int, RenderingHint); - Property(osg::StateSet::TextureAttributeList &, TextureAttributeList); - IndexedProperty2(osg::StateAttribute::GLModeValue, TextureMode, unsigned int, unit, osg::StateAttribute::GLMode, mode); - Property(osg::StateSet::TextureModeList &, TextureModeList); - Property(osg::StateSet::UniformList &, UniformList); - Property(osg::StateSet::Callback *, UpdateCallback); + 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_VALUE_REFLECTOR(osg::StateSet::Callback) - VirtualBaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::StateSet::Callback &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); +BEGIN_OBJECT_REFLECTOR(osg::StateSet::Callback) + I_VirtualBaseType(osg::Object); + 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 >) - Constructor0(); - Constructor1(IN, osg::StateAttribute *, t); - Constructor1(IN, const osg::ref_ptr< osg::StateAttribute > &, rp); - Method0(bool, valid); - Method0(osg::StateAttribute *, get); - Method0(const osg::StateAttribute *, get); - Method0(osg::StateAttribute *, take); - Method0(osg::StateAttribute *, release); - ReadOnlyProperty(osg::StateAttribute *, ); + I_Constructor0(); + I_Constructor1(IN, osg::StateAttribute *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::StateAttribute > &, rp); + I_Method0(bool, valid); + I_Method0(osg::StateAttribute *, get); + I_Method0(const osg::StateAttribute *, get); + I_Method0(osg::StateAttribute *, take); + I_Method0(osg::StateAttribute *, release); + I_ReadOnlyProperty(osg::StateAttribute *, ); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Uniform >) - Constructor0(); - Constructor1(IN, osg::Uniform *, t); - Constructor1(IN, const osg::ref_ptr< osg::Uniform > &, rp); - Method0(bool, valid); - Method0(osg::Uniform *, get); - Method0(const osg::Uniform *, get); - Method0(osg::Uniform *, take); - Method0(osg::Uniform *, release); - ReadOnlyProperty(osg::Uniform *, ); + I_Constructor0(); + I_Constructor1(IN, osg::Uniform *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::Uniform > &, rp); + I_Method0(bool, valid); + I_Method0(osg::Uniform *, get); + I_Method0(const osg::Uniform *, get); + I_Method0(osg::Uniform *, take); + I_Method0(osg::Uniform *, release); + 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); diff --git a/src/osgWrappers/osg/Stencil.cpp b/src/osgWrappers/osg/Stencil.cpp index 39f8013d4..804c267da 100644 --- a/src/osgWrappers/osg/Stencil.cpp +++ b/src/osgWrappers/osg/Stencil.cpp @@ -15,62 +15,70 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Stencil::Function) - EnumLabel(osg::Stencil::NEVER); - EnumLabel(osg::Stencil::LESS); - EnumLabel(osg::Stencil::EQUAL); - EnumLabel(osg::Stencil::LEQUAL); - EnumLabel(osg::Stencil::GREATER); - EnumLabel(osg::Stencil::NOTEQUAL); - EnumLabel(osg::Stencil::GEQUAL); - EnumLabel(osg::Stencil::ALWAYS); + 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) - EnumLabel(osg::Stencil::KEEP); - EnumLabel(osg::Stencil::ZERO); - EnumLabel(osg::Stencil::REPLACE); - EnumLabel(osg::Stencil::INCR); - EnumLabel(osg::Stencil::DECR); - EnumLabel(osg::Stencil::INVERT); + 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) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Stencil &, stencil, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method3(void, setFunction, IN, osg::Stencil::Function, func, IN, int, ref, IN, unsigned int, mask); - Method1(void, setFunction, IN, osg::Stencil::Function, func); - Method0(osg::Stencil::Function, getFunction); - Method1(void, setFunctionRef, IN, int, ref); - Method0(int, getFunctionRef); - Method1(void, setFunctionMask, IN, unsigned int, mask); - Method0(unsigned int, getFunctionMask); - Method3(void, setOperation, IN, osg::Stencil::Operation, sfail, IN, osg::Stencil::Operation, zfail, IN, osg::Stencil::Operation, zpass); - Method1(void, setStencilFailOperation, IN, osg::Stencil::Operation, sfail); - Method0(osg::Stencil::Operation, getStencilFailOperation); - Method1(void, setStencilPassAndDepthFailOperation, IN, osg::Stencil::Operation, zfail); - Method0(osg::Stencil::Operation, getStencilPassAndDepthFailOperation); - Method1(void, setStencilPassAndDepthPassOperation, IN, osg::Stencil::Operation, zpass); - Method0(osg::Stencil::Operation, getStencilPassAndDepthPassOperation); - Method1(void, setWriteMask, IN, unsigned int, mask); - Method0(unsigned int, getWriteMask); - Method1(void, apply, IN, osg::State &, state); - Property(osg::Stencil::Function, Function); - Property(unsigned int, FunctionMask); - Property(int, FunctionRef); - Property(osg::Stencil::Operation, StencilFailOperation); - Property(osg::Stencil::Operation, StencilPassAndDepthFailOperation); - Property(osg::Stencil::Operation, StencilPassAndDepthPassOperation); - ReadOnlyProperty(osg::StateAttribute::Type, Type); - Property(unsigned int, WriteMask); + I_BaseType(osg::StateAttribute); + 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 a45c2a2f7..b6af8a585 100644 --- a/src/osgWrappers/osg/Switch.cpp +++ b/src/osgWrappers/osg/Switch.cpp @@ -16,41 +16,49 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< bool >, osg::Switch::ValueList); BEGIN_OBJECT_REFLECTOR(osg::Switch) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Switch &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(void, setNewChildDefaultValue, IN, bool, value); - Method0(bool, getNewChildDefaultValue); - Method1(bool, addChild, IN, osg::Node *, child); - Method2(bool, addChild, IN, osg::Node *, child, IN, bool, value); - Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child); - Method3(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child, IN, bool, value); - Method1(bool, removeChild, IN, osg::Node *, child); - Method2(void, setValue, IN, unsigned int, pos, IN, bool, value); - Method1(bool, getValue, IN, unsigned int, pos); - Method2(void, setChildValue, IN, const osg::Node *, child, IN, bool, value); - Method1(bool, getChildValue, IN, const osg::Node *, child); - Method0(bool, setAllChildrenOff); - Method0(bool, setAllChildrenOn); - Method1(bool, setSingleChildOn, IN, unsigned int, pos); - Method1(void, setValueList, IN, const osg::Switch::ValueList &, values); - Method0(const osg::Switch::ValueList &, getValueList); - Method0(osg::BoundingSphere, computeBound); - IndexedProperty1(bool, ChildValue, const osg::Node *, child); - Property(bool, NewChildDefaultValue); - WriteOnlyPropertyWithReturnType(unsigned int, SingleChildOn, bool); - IndexedProperty1(bool, Value, unsigned int, pos); - Property(const osg::Switch::ValueList &, ValueList); + I_BaseType(osg::Group); + 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_Method1(bool, removeChild, IN, osg::Node *, child); + 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 >); diff --git a/src/osgWrappers/osg/TexEnv.cpp b/src/osgWrappers/osg/TexEnv.cpp index 8f51be6bb..d50089ba7 100644 --- a/src/osgWrappers/osg/TexEnv.cpp +++ b/src/osgWrappers/osg/TexEnv.cpp @@ -16,34 +16,42 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::TexEnv::Mode) - EnumLabel(osg::TexEnv::DECAL); - EnumLabel(osg::TexEnv::MODULATE); - EnumLabel(osg::TexEnv::BLEND); - EnumLabel(osg::TexEnv::REPLACE); - EnumLabel(osg::TexEnv::ADD); + I_EnumLabel(osg::TexEnv::DECAL); + I_EnumLabel(osg::TexEnv::MODULATE); + I_EnumLabel(osg::TexEnv::BLEND); + I_EnumLabel(osg::TexEnv::REPLACE); + I_EnumLabel(osg::TexEnv::ADD); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TexEnv) - BaseType(osg::StateAttribute); - ConstructorWithDefaults1(IN, osg::TexEnv::Mode, mode, osg::TexEnv::MODULATE); - ConstructorWithDefaults2(IN, const osg::TexEnv &, texenv, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method0(bool, isTextureAttribute); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, setMode, IN, osg::TexEnv::Mode, mode); - Method0(osg::TexEnv::Mode, getMode); - Method1(void, setColor, IN, const osg::Vec4 &, color); - Method0(osg::Vec4 &, getColor); - Method0(const osg::Vec4 &, getColor); - Method1(void, apply, IN, osg::State &, state); - Property(const osg::Vec4 &, Color); - Property(osg::TexEnv::Mode, Mode); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_ConstructorWithDefaults1(IN, osg::TexEnv::Mode, mode, osg::TexEnv::MODULATE); + I_ConstructorWithDefaults2(IN, const osg::TexEnv &, texenv, , 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(bool, isTextureAttribute); + I_Method1(int, compare, IN, const osg::StateAttribute &, sa); + I_Method1(void, setMode, IN, osg::TexEnv::Mode, mode); + I_Method0(osg::TexEnv::Mode, getMode); + I_Method1(void, setColor, IN, const osg::Vec4 &, color); + I_Method0(osg::Vec4 &, getColor); + I_Method0(const osg::Vec4 &, getColor); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(const osg::Vec4 &, Color); + I_Property(osg::TexEnv::Mode, Mode); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/TexEnvCombine.cpp b/src/osgWrappers/osg/TexEnvCombine.cpp index e8c19db0d..159a01989 100644 --- a/src/osgWrappers/osg/TexEnvCombine.cpp +++ b/src/osgWrappers/osg/TexEnvCombine.cpp @@ -17,106 +17,114 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::TexEnvCombine::CombineParam) - EnumLabel(osg::TexEnvCombine::REPLACE); - EnumLabel(osg::TexEnvCombine::MODULATE); - EnumLabel(osg::TexEnvCombine::ADD); - EnumLabel(osg::TexEnvCombine::ADD_SIGNED); - EnumLabel(osg::TexEnvCombine::INTERPOLATE); - EnumLabel(osg::TexEnvCombine::SUBTRACT); - EnumLabel(osg::TexEnvCombine::DOT3_RGB); - EnumLabel(osg::TexEnvCombine::DOT3_RGBA); + I_EnumLabel(osg::TexEnvCombine::REPLACE); + I_EnumLabel(osg::TexEnvCombine::MODULATE); + I_EnumLabel(osg::TexEnvCombine::ADD); + I_EnumLabel(osg::TexEnvCombine::ADD_SIGNED); + I_EnumLabel(osg::TexEnvCombine::INTERPOLATE); + I_EnumLabel(osg::TexEnvCombine::SUBTRACT); + I_EnumLabel(osg::TexEnvCombine::DOT3_RGB); + I_EnumLabel(osg::TexEnvCombine::DOT3_RGBA); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::TexEnvCombine::SourceParam) - EnumLabel(osg::TexEnvCombine::CONSTANT); - EnumLabel(osg::TexEnvCombine::PRIMARY_COLOR); - EnumLabel(osg::TexEnvCombine::PREVIOUS); - EnumLabel(osg::TexEnvCombine::TEXTURE); - EnumLabel(osg::TexEnvCombine::TEXTURE0); - EnumLabel(osg::TexEnvCombine::TEXTURE1); - EnumLabel(osg::TexEnvCombine::TEXTURE2); - EnumLabel(osg::TexEnvCombine::TEXTURE3); - EnumLabel(osg::TexEnvCombine::TEXTURE4); - EnumLabel(osg::TexEnvCombine::TEXTURE5); - EnumLabel(osg::TexEnvCombine::TEXTURE6); - EnumLabel(osg::TexEnvCombine::TEXTURE7); + I_EnumLabel(osg::TexEnvCombine::CONSTANT); + I_EnumLabel(osg::TexEnvCombine::PRIMARY_COLOR); + I_EnumLabel(osg::TexEnvCombine::PREVIOUS); + I_EnumLabel(osg::TexEnvCombine::TEXTURE); + I_EnumLabel(osg::TexEnvCombine::TEXTURE0); + I_EnumLabel(osg::TexEnvCombine::TEXTURE1); + I_EnumLabel(osg::TexEnvCombine::TEXTURE2); + I_EnumLabel(osg::TexEnvCombine::TEXTURE3); + I_EnumLabel(osg::TexEnvCombine::TEXTURE4); + I_EnumLabel(osg::TexEnvCombine::TEXTURE5); + I_EnumLabel(osg::TexEnvCombine::TEXTURE6); + I_EnumLabel(osg::TexEnvCombine::TEXTURE7); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::TexEnvCombine::OperandParam) - EnumLabel(osg::TexEnvCombine::SRC_COLOR); - EnumLabel(osg::TexEnvCombine::ONE_MINUS_SRC_COLOR); - EnumLabel(osg::TexEnvCombine::SRC_ALPHA); - EnumLabel(osg::TexEnvCombine::ONE_MINUS_SRC_ALPHA); + I_EnumLabel(osg::TexEnvCombine::SRC_COLOR); + I_EnumLabel(osg::TexEnvCombine::ONE_MINUS_SRC_COLOR); + I_EnumLabel(osg::TexEnvCombine::SRC_ALPHA); + I_EnumLabel(osg::TexEnvCombine::ONE_MINUS_SRC_ALPHA); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TexEnvCombine) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::TexEnvCombine &, texenv, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method0(bool, isTextureAttribute); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, setCombine_RGB, IN, GLint, cm); - Method1(void, setCombine_Alpha, IN, GLint, cm); - Method0(GLint, getCombine_RGB); - Method0(GLint, getCombine_Alpha); - Method1(void, setSource0_RGB, IN, GLint, sp); - Method1(void, setSource1_RGB, IN, GLint, sp); - Method1(void, setSource2_RGB, IN, GLint, sp); - Method1(void, setSource0_Alpha, IN, GLint, sp); - Method1(void, setSource1_Alpha, IN, GLint, sp); - Method1(void, setSource2_Alpha, IN, GLint, sp); - Method0(GLint, getSource0_RGB); - Method0(GLint, getSource1_RGB); - Method0(GLint, getSource2_RGB); - Method0(GLint, getSource0_Alpha); - Method0(GLint, getSource1_Alpha); - Method0(GLint, getSource2_Alpha); - Method1(void, setOperand0_RGB, IN, GLint, op); - Method1(void, setOperand1_RGB, IN, GLint, op); - Method1(void, setOperand2_RGB, IN, GLint, op); - Method1(void, setOperand0_Alpha, IN, GLint, op); - Method1(void, setOperand1_Alpha, IN, GLint, op); - Method1(void, setOperand2_Alpha, IN, GLint, op); - Method0(GLint, getOperand0_RGB); - Method0(GLint, getOperand1_RGB); - Method0(GLint, getOperand2_RGB); - Method0(GLint, getOperand0_Alpha); - Method0(GLint, getOperand1_Alpha); - Method0(GLint, getOperand2_Alpha); - Method1(void, setScale_RGB, IN, float, scale); - Method1(void, setScale_Alpha, IN, float, scale); - Method0(float, getScale_RGB); - Method0(float, getScale_Alpha); - Method1(void, setConstantColor, IN, const osg::Vec4 &, color); - Method0(const osg::Vec4 &, getConstantColor); - Method1(void, setConstantColorAsLightDirection, IN, const osg::Vec3 &, direction); - Method0(osg::Vec3, getConstantColorAsLightDirection); - Method1(void, apply, IN, osg::State &, state); - Property(GLint, Combine_Alpha); - Property(GLint, Combine_RGB); - Property(const osg::Vec4 &, ConstantColor); - ReadOnlyProperty(osg::Vec3, ConstantColorAsLightDirection); - Property(GLint, Operand0_Alpha); - Property(GLint, Operand0_RGB); - Property(GLint, Operand1_Alpha); - Property(GLint, Operand1_RGB); - Property(GLint, Operand2_Alpha); - Property(GLint, Operand2_RGB); - Property(float, Scale_Alpha); - Property(float, Scale_RGB); - Property(GLint, Source0_Alpha); - Property(GLint, Source0_RGB); - Property(GLint, Source1_Alpha); - Property(GLint, Source1_RGB); - Property(GLint, Source2_Alpha); - Property(GLint, Source2_RGB); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TexEnvCombine &, texenv, , 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(bool, isTextureAttribute); + I_Method1(int, compare, IN, const osg::StateAttribute &, sa); + I_Method1(void, setCombine_RGB, IN, GLint, cm); + I_Method1(void, setCombine_Alpha, IN, GLint, cm); + I_Method0(GLint, getCombine_RGB); + I_Method0(GLint, getCombine_Alpha); + I_Method1(void, setSource0_RGB, IN, GLint, sp); + I_Method1(void, setSource1_RGB, IN, GLint, sp); + I_Method1(void, setSource2_RGB, IN, GLint, sp); + I_Method1(void, setSource0_Alpha, IN, GLint, sp); + I_Method1(void, setSource1_Alpha, IN, GLint, sp); + I_Method1(void, setSource2_Alpha, IN, GLint, sp); + I_Method0(GLint, getSource0_RGB); + I_Method0(GLint, getSource1_RGB); + I_Method0(GLint, getSource2_RGB); + I_Method0(GLint, getSource0_Alpha); + I_Method0(GLint, getSource1_Alpha); + I_Method0(GLint, getSource2_Alpha); + I_Method1(void, setOperand0_RGB, IN, GLint, op); + I_Method1(void, setOperand1_RGB, IN, GLint, op); + I_Method1(void, setOperand2_RGB, IN, GLint, op); + I_Method1(void, setOperand0_Alpha, IN, GLint, op); + I_Method1(void, setOperand1_Alpha, IN, GLint, op); + I_Method1(void, setOperand2_Alpha, IN, GLint, op); + I_Method0(GLint, getOperand0_RGB); + I_Method0(GLint, getOperand1_RGB); + I_Method0(GLint, getOperand2_RGB); + I_Method0(GLint, getOperand0_Alpha); + I_Method0(GLint, getOperand1_Alpha); + I_Method0(GLint, getOperand2_Alpha); + I_Method1(void, setScale_RGB, IN, float, scale); + I_Method1(void, setScale_Alpha, IN, float, scale); + I_Method0(float, getScale_RGB); + I_Method0(float, getScale_Alpha); + I_Method1(void, setConstantColor, IN, const osg::Vec4 &, color); + I_Method0(const osg::Vec4 &, getConstantColor); + I_Method1(void, setConstantColorAsLightDirection, IN, const osg::Vec3 &, direction); + I_Method0(osg::Vec3, getConstantColorAsLightDirection); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(GLint, Combine_Alpha); + I_Property(GLint, Combine_RGB); + I_Property(const osg::Vec4 &, ConstantColor); + I_ReadOnlyProperty(osg::Vec3, ConstantColorAsLightDirection); + I_Property(GLint, Operand0_Alpha); + I_Property(GLint, Operand0_RGB); + I_Property(GLint, Operand1_Alpha); + I_Property(GLint, Operand1_RGB); + I_Property(GLint, Operand2_Alpha); + I_Property(GLint, Operand2_RGB); + I_Property(float, Scale_Alpha); + I_Property(float, Scale_RGB); + I_Property(GLint, Source0_Alpha); + I_Property(GLint, Source0_RGB); + I_Property(GLint, Source1_Alpha); + I_Property(GLint, Source1_RGB); + I_Property(GLint, Source2_Alpha); + I_Property(GLint, Source2_RGB); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/TexEnvFilter.cpp b/src/osgWrappers/osg/TexEnvFilter.cpp index c3ff8699c..d5c5aeaba 100644 --- a/src/osgWrappers/osg/TexEnvFilter.cpp +++ b/src/osgWrappers/osg/TexEnvFilter.cpp @@ -15,22 +15,30 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::TexEnvFilter) - BaseType(osg::StateAttribute); - ConstructorWithDefaults1(IN, float, lodBias, 0.0f); - ConstructorWithDefaults2(IN, const osg::TexEnvFilter &, texenv, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method0(bool, isTextureAttribute); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, setLodBias, IN, float, lodBias); - Method0(float, getLodBias); - Method1(void, apply, IN, osg::State &, state); - Property(float, LodBias); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_ConstructorWithDefaults1(IN, float, lodBias, 0.0f); + I_ConstructorWithDefaults2(IN, const osg::TexEnvFilter &, texenv, , 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(bool, isTextureAttribute); + I_Method1(int, compare, IN, const osg::StateAttribute &, sa); + I_Method1(void, setLodBias, IN, float, lodBias); + I_Method0(float, getLodBias); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(float, LodBias); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/TexGen.cpp b/src/osgWrappers/osg/TexGen.cpp index 016a6a565..9f9be45c8 100644 --- a/src/osgWrappers/osg/TexGen.cpp +++ b/src/osgWrappers/osg/TexGen.cpp @@ -17,44 +17,52 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::TexGen::Mode) - EnumLabel(osg::TexGen::OBJECT_LINEAR); - EnumLabel(osg::TexGen::EYE_LINEAR); - EnumLabel(osg::TexGen::SPHERE_MAP); - EnumLabel(osg::TexGen::NORMAL_MAP); - EnumLabel(osg::TexGen::REFLECTION_MAP); + I_EnumLabel(osg::TexGen::OBJECT_LINEAR); + I_EnumLabel(osg::TexGen::EYE_LINEAR); + I_EnumLabel(osg::TexGen::SPHERE_MAP); + I_EnumLabel(osg::TexGen::NORMAL_MAP); + I_EnumLabel(osg::TexGen::REFLECTION_MAP); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::TexGen::Coord) - EnumLabel(osg::TexGen::S); - EnumLabel(osg::TexGen::T); - EnumLabel(osg::TexGen::R); - EnumLabel(osg::TexGen::Q); + I_EnumLabel(osg::TexGen::S); + I_EnumLabel(osg::TexGen::T); + I_EnumLabel(osg::TexGen::R); + I_EnumLabel(osg::TexGen::Q); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TexGen) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::TexGen &, texgen, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method0(bool, isTextureAttribute); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, apply, IN, osg::State &, state); - Method1(void, setMode, IN, osg::TexGen::Mode, mode); - Method0(osg::TexGen::Mode, getMode); - Method2(void, setPlane, IN, osg::TexGen::Coord, which, IN, const osg::Plane &, plane); - Method1(osg::Plane &, getPlane, IN, osg::TexGen::Coord, which); - Method1(const osg::Plane &, getPlane, IN, osg::TexGen::Coord, which); - Method1(void, setPlanesFromMatrix, IN, const osg::Matrixd &, matrix); - Property(osg::TexGen::Mode, Mode); - IndexedProperty1(const osg::Plane &, Plane, osg::TexGen::Coord, which); - WriteOnlyProperty(const osg::Matrixd &, PlanesFromMatrix); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TexGen &, texgen, , 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(bool, isTextureAttribute); + 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, setMode, IN, osg::TexGen::Mode, mode); + I_Method0(osg::TexGen::Mode, getMode); + I_Method2(void, setPlane, IN, osg::TexGen::Coord, which, IN, const osg::Plane &, plane); + I_Method1(osg::Plane &, getPlane, IN, osg::TexGen::Coord, which); + I_Method1(const osg::Plane &, getPlane, IN, osg::TexGen::Coord, which); + I_Method1(void, setPlanesFromMatrix, IN, const osg::Matrixd &, matrix); + I_Property(osg::TexGen::Mode, Mode); + I_IndexedProperty1(const osg::Plane &, Plane, osg::TexGen::Coord, which); + I_WriteOnlyProperty(const osg::Matrixd &, PlanesFromMatrix); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/TexGenNode.cpp b/src/osgWrappers/osg/TexGenNode.cpp index 52a48d273..c9cea3a21 100644 --- a/src/osgWrappers/osg/TexGenNode.cpp +++ b/src/osgWrappers/osg/TexGenNode.cpp @@ -15,23 +15,31 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::TexGenNode) - BaseType(osg::Group); - Constructor0(); - Constructor1(IN, osg::TexGen *, texgen); - ConstructorWithDefaults2(IN, const osg::TexGenNode &, tgb, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, setTextureUnit, IN, unsigned int, textureUnit); - Method0(unsigned int, getTextureUnit); - Method1(void, setTexGen, IN, osg::TexGen *, texgen); - Method0(osg::TexGen *, getTexGen); - Method0(const osg::TexGen *, getTexGen); - Property(osg::TexGen *, TexGen); - Property(unsigned int, TextureUnit); + I_BaseType(osg::Group); + I_Constructor0(); + I_Constructor1(IN, osg::TexGen *, texgen); + I_ConstructorWithDefaults2(IN, const osg::TexGenNode &, tgb, , 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, setTextureUnit, IN, unsigned int, textureUnit); + I_Method0(unsigned int, getTextureUnit); + I_Method1(void, setTexGen, IN, osg::TexGen *, texgen); + I_Method0(osg::TexGen *, getTexGen); + I_Method0(const osg::TexGen *, getTexGen); + I_Property(osg::TexGen *, TexGen); + I_Property(unsigned int, TextureUnit); END_REFLECTOR diff --git a/src/osgWrappers/osg/TexMat.cpp b/src/osgWrappers/osg/TexMat.cpp index f2faa3582..9349f1c37 100644 --- a/src/osgWrappers/osg/TexMat.cpp +++ b/src/osgWrappers/osg/TexMat.cpp @@ -16,23 +16,31 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::TexMat) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::TexMat &, texmat, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method0(bool, isTextureAttribute); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(void, setMatrix, IN, const osg::Matrix &, matrix); - Method0(osg::Matrix &, getMatrix); - Method0(const osg::Matrix &, getMatrix); - Method1(void, apply, IN, osg::State &, state); - Property(const osg::Matrix &, Matrix); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::TexMat &, texmat, , 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(bool, isTextureAttribute); + I_Method1(int, compare, IN, const osg::StateAttribute &, sa); + I_Method1(void, setMatrix, IN, const osg::Matrix &, matrix); + I_Method0(osg::Matrix &, getMatrix); + I_Method0(const osg::Matrix &, getMatrix); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(const osg::Matrix &, Matrix); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 3a3ee674a..39125fb1f 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -17,213 +17,221 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Texture::TextureObject > >, osg::Texture::TextureObjectList); TYPE_NAME_ALIAS(std::map< unsigned int COMMA osg::Texture::TextureObjectList >, osg::Texture::TextureObjectListMap); BEGIN_ENUM_REFLECTOR(osg::Texture::WrapParameter) - EnumLabel(osg::Texture::WRAP_S); - EnumLabel(osg::Texture::WRAP_T); - EnumLabel(osg::Texture::WRAP_R); + I_EnumLabel(osg::Texture::WRAP_S); + I_EnumLabel(osg::Texture::WRAP_T); + I_EnumLabel(osg::Texture::WRAP_R); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Texture::WrapMode) - EnumLabel(osg::Texture::CLAMP); - EnumLabel(osg::Texture::CLAMP_TO_EDGE); - EnumLabel(osg::Texture::CLAMP_TO_BORDER); - EnumLabel(osg::Texture::REPEAT); - EnumLabel(osg::Texture::MIRROR); + I_EnumLabel(osg::Texture::CLAMP); + I_EnumLabel(osg::Texture::CLAMP_TO_EDGE); + I_EnumLabel(osg::Texture::CLAMP_TO_BORDER); + I_EnumLabel(osg::Texture::REPEAT); + I_EnumLabel(osg::Texture::MIRROR); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Texture::FilterParameter) - EnumLabel(osg::Texture::MIN_FILTER); - EnumLabel(osg::Texture::MAG_FILTER); + I_EnumLabel(osg::Texture::MIN_FILTER); + I_EnumLabel(osg::Texture::MAG_FILTER); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Texture::FilterMode) - EnumLabel(osg::Texture::LINEAR); - EnumLabel(osg::Texture::LINEAR_MIPMAP_LINEAR); - EnumLabel(osg::Texture::LINEAR_MIPMAP_NEAREST); - EnumLabel(osg::Texture::NEAREST); - EnumLabel(osg::Texture::NEAREST_MIPMAP_LINEAR); - EnumLabel(osg::Texture::NEAREST_MIPMAP_NEAREST); + I_EnumLabel(osg::Texture::LINEAR); + I_EnumLabel(osg::Texture::LINEAR_MIPMAP_LINEAR); + I_EnumLabel(osg::Texture::LINEAR_MIPMAP_NEAREST); + I_EnumLabel(osg::Texture::NEAREST); + I_EnumLabel(osg::Texture::NEAREST_MIPMAP_LINEAR); + I_EnumLabel(osg::Texture::NEAREST_MIPMAP_NEAREST); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Texture::InternalFormatMode) - EnumLabel(osg::Texture::USE_IMAGE_DATA_FORMAT); - EnumLabel(osg::Texture::USE_USER_DEFINED_FORMAT); - EnumLabel(osg::Texture::USE_ARB_COMPRESSION); - EnumLabel(osg::Texture::USE_S3TC_DXT1_COMPRESSION); - EnumLabel(osg::Texture::USE_S3TC_DXT3_COMPRESSION); - EnumLabel(osg::Texture::USE_S3TC_DXT5_COMPRESSION); + I_EnumLabel(osg::Texture::USE_IMAGE_DATA_FORMAT); + I_EnumLabel(osg::Texture::USE_USER_DEFINED_FORMAT); + I_EnumLabel(osg::Texture::USE_ARB_COMPRESSION); + I_EnumLabel(osg::Texture::USE_S3TC_DXT1_COMPRESSION); + I_EnumLabel(osg::Texture::USE_S3TC_DXT3_COMPRESSION); + I_EnumLabel(osg::Texture::USE_S3TC_DXT5_COMPRESSION); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Texture::ShadowCompareFunc) - EnumLabel(osg::Texture::LEQUAL); - EnumLabel(osg::Texture::GEQUAL); + I_EnumLabel(osg::Texture::LEQUAL); + I_EnumLabel(osg::Texture::GEQUAL); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osg::Texture::ShadowTextureMode) - EnumLabel(osg::Texture::LUMINANCE); - EnumLabel(osg::Texture::INTENSITY); - EnumLabel(osg::Texture::ALPHA); + I_EnumLabel(osg::Texture::LUMINANCE); + I_EnumLabel(osg::Texture::INTENSITY); + I_EnumLabel(osg::Texture::ALPHA); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Texture &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method0(bool, isTextureAttribute); - Method2(void, setWrap, IN, osg::Texture::WrapParameter, which, IN, osg::Texture::WrapMode, wrap); - Method1(osg::Texture::WrapMode, getWrap, IN, osg::Texture::WrapParameter, which); - Method1(void, setBorderColor, IN, const osg::Vec4 &, color); - Method0(const osg::Vec4 &, getBorderColor); - Method1(void, setBorderWidth, IN, GLint, width); - Method0(GLint, getBorderWidth); - Method2(void, setFilter, IN, osg::Texture::FilterParameter, which, IN, osg::Texture::FilterMode, filter); - Method1(osg::Texture::FilterMode, getFilter, IN, osg::Texture::FilterParameter, which); - Method1(void, setMaxAnisotropy, IN, float, anis); - Method0(float, getMaxAnisotropy); - Method1(void, setUseHardwareMipMapGeneration, IN, bool, useHardwareMipMapGeneration); - Method0(bool, getUseHardwareMipMapGeneration); - Method1(void, setUnRefImageDataAfterApply, IN, bool, flag); - Method0(bool, getUnRefImageDataAfterApply); - Method1(void, setClientStorageHint, IN, bool, flag); - Method0(bool, getClientStorageHint); - Method1(void, setResizeNonPowerOfTwoHint, IN, bool, flag); - Method0(bool, getResizeNonPowerOfTwoHint); - Method1(void, setInternalFormatMode, IN, osg::Texture::InternalFormatMode, mode); - Method0(osg::Texture::InternalFormatMode, getInternalFormatMode); - Method1(void, setInternalFormat, IN, GLint, internalFormat); - Method0(GLint, getInternalFormat); - Method0(bool, isCompressedInternalFormat); - Method1(osg::Texture::TextureObject *, getTextureObject, IN, unsigned int, contextID); - Method0(void, dirtyTextureObject); - Method0(bool, areAllTextureObjectsLoaded); - Method1(unsigned int &, getTextureParameterDirty, IN, unsigned int, contextID); - Method0(void, dirtyTextureParameters); - Method1(void, setShadowComparison, IN, bool, flag); - Method1(void, setShadowCompareFunc, IN, osg::Texture::ShadowCompareFunc, func); - Method0(osg::Texture::ShadowCompareFunc, getShadowCompareFunc); - Method1(void, setShadowTextureMode, IN, osg::Texture::ShadowTextureMode, mode); - Method0(osg::Texture::ShadowTextureMode, getShadowTextureMode); - Method1(void, setShadowAmbient, IN, float, shadow_ambient); - Method0(float, getShadowAmbient); - Method2(void, setImage, IN, unsigned int, face, IN, osg::Image *, image); - Method1(osg::Image *, getImage, IN, unsigned int, face); - Method1(const osg::Image *, getImage, IN, unsigned int, face); - Method0(unsigned int, getNumImages); - Method1(void, apply, IN, osg::State &, state); - Method1(void, compileGLObjects, IN, osg::State &, state); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - Method6(void, applyTexImage2D_load, IN, osg::State &, state, IN, GLenum, target, IN, const osg::Image *, image, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, numMipmapLevels); - Method7(void, applyTexImage2D_subload, IN, osg::State &, state, IN, GLenum, target, IN, const osg::Image *, image, IN, GLsizei, width, IN, GLsizei, height, IN, GLint, inInternalFormat, IN, GLsizei, numMipmapLevels); - Method1(void, takeTextureObjects, IN, osg::Texture::TextureObjectListMap &, toblm); - Property(const osg::Vec4 &, BorderColor); - Property(GLint, BorderWidth); - Property(bool, ClientStorageHint); - IndexedProperty1(osg::Texture::FilterMode, Filter, osg::Texture::FilterParameter, which); - ArrayProperty_G(osg::Image *, Image, Images, unsigned int, void); - Property(GLint, InternalFormat); - Property(osg::Texture::InternalFormatMode, InternalFormatMode); - Property(float, MaxAnisotropy); - Property(bool, ResizeNonPowerOfTwoHint); - Property(float, ShadowAmbient); - Property(osg::Texture::ShadowCompareFunc, ShadowCompareFunc); - WriteOnlyProperty(bool, ShadowComparison); - Property(osg::Texture::ShadowTextureMode, ShadowTextureMode); - ReadOnlyProperty(osg::StateAttribute::Type, Type); - Property(bool, UnRefImageDataAfterApply); - Property(bool, UseHardwareMipMapGeneration); - IndexedProperty1(osg::Texture::WrapMode, Wrap, osg::Texture::WrapParameter, which); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::Texture &, 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_Method0(bool, isTextureAttribute); + I_Method2(void, setWrap, IN, osg::Texture::WrapParameter, which, IN, osg::Texture::WrapMode, wrap); + I_Method1(osg::Texture::WrapMode, getWrap, IN, osg::Texture::WrapParameter, which); + I_Method1(void, setBorderColor, IN, const osg::Vec4 &, color); + I_Method0(const osg::Vec4 &, getBorderColor); + I_Method1(void, setBorderWidth, IN, GLint, width); + I_Method0(GLint, getBorderWidth); + I_Method2(void, setFilter, IN, osg::Texture::FilterParameter, which, IN, osg::Texture::FilterMode, filter); + I_Method1(osg::Texture::FilterMode, getFilter, IN, osg::Texture::FilterParameter, which); + I_Method1(void, setMaxAnisotropy, IN, float, anis); + I_Method0(float, getMaxAnisotropy); + I_Method1(void, setUseHardwareMipMapGeneration, IN, bool, useHardwareMipMapGeneration); + I_Method0(bool, getUseHardwareMipMapGeneration); + I_Method1(void, setUnRefImageDataAfterApply, IN, bool, flag); + I_Method0(bool, getUnRefImageDataAfterApply); + I_Method1(void, setClientStorageHint, IN, bool, flag); + I_Method0(bool, getClientStorageHint); + I_Method1(void, setResizeNonPowerOfTwoHint, IN, bool, flag); + I_Method0(bool, getResizeNonPowerOfTwoHint); + I_Method1(void, setInternalFormatMode, IN, osg::Texture::InternalFormatMode, mode); + I_Method0(osg::Texture::InternalFormatMode, getInternalFormatMode); + I_Method1(void, setInternalFormat, IN, GLint, internalFormat); + I_Method0(GLint, getInternalFormat); + I_Method0(bool, isCompressedInternalFormat); + I_Method1(osg::Texture::TextureObject *, getTextureObject, IN, unsigned int, contextID); + I_Method0(void, dirtyTextureObject); + I_Method0(bool, areAllTextureObjectsLoaded); + I_Method1(unsigned int &, getTextureParameterDirty, IN, unsigned int, contextID); + I_Method0(void, dirtyTextureParameters); + I_Method1(void, setShadowComparison, IN, bool, flag); + I_Method1(void, setShadowCompareFunc, IN, osg::Texture::ShadowCompareFunc, func); + I_Method0(osg::Texture::ShadowCompareFunc, getShadowCompareFunc); + I_Method1(void, setShadowTextureMode, IN, osg::Texture::ShadowTextureMode, mode); + I_Method0(osg::Texture::ShadowTextureMode, getShadowTextureMode); + I_Method1(void, setShadowAmbient, IN, float, shadow_ambient); + I_Method0(float, getShadowAmbient); + 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_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_Method6(void, applyTexImage2D_load, IN, osg::State &, state, IN, GLenum, target, IN, const osg::Image *, image, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, numMipmapLevels); + I_Method7(void, applyTexImage2D_subload, IN, osg::State &, state, IN, GLenum, target, IN, const osg::Image *, image, IN, GLsizei, width, IN, GLsizei, height, IN, GLint, inInternalFormat, IN, GLsizei, numMipmapLevels); + I_Method1(void, takeTextureObjects, IN, osg::Texture::TextureObjectListMap &, toblm); + I_Property(const osg::Vec4 &, BorderColor); + I_Property(GLint, BorderWidth); + I_Property(bool, ClientStorageHint); + I_IndexedProperty1(osg::Texture::FilterMode, Filter, osg::Texture::FilterParameter, which); + I_ArrayProperty_G(osg::Image *, Image, Images, unsigned int, void); + I_Property(GLint, InternalFormat); + I_Property(osg::Texture::InternalFormatMode, InternalFormatMode); + I_Property(float, MaxAnisotropy); + I_Property(bool, ResizeNonPowerOfTwoHint); + I_Property(float, ShadowAmbient); + I_Property(osg::Texture::ShadowCompareFunc, ShadowCompareFunc); + I_WriteOnlyProperty(bool, ShadowComparison); + I_Property(osg::Texture::ShadowTextureMode, ShadowTextureMode); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_Property(bool, UnRefImageDataAfterApply); + I_Property(bool, UseHardwareMipMapGeneration); + I_IndexedProperty1(osg::Texture::WrapMode, Wrap, osg::Texture::WrapParameter, which); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Texture::Extensions) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::Texture::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::Texture::Extensions &, rhs); - Method1(void, setupGLExtensions, IN, unsigned int, contextID); - Method1(void, setMultiTexturingSupported, IN, bool, flag); - Method0(bool, isMultiTexturingSupported); - Method1(void, setTextureFilterAnisotropicSupported, IN, bool, flag); - Method0(bool, isTextureFilterAnisotropicSupported); - Method1(void, setTextureCompressionARBSupported, IN, bool, flag); - Method0(bool, isTextureCompressionARBSupported); - Method1(void, setTextureCompressionS3TCSupported, IN, bool, flag); - Method0(bool, isTextureCompressionS3TCSupported); - Method1(void, setTextureMirroredRepeatSupported, IN, bool, flag); - Method0(bool, isTextureMirroredRepeatSupported); - Method1(void, setTextureEdgeClampSupported, IN, bool, flag); - Method0(bool, isTextureEdgeClampSupported); - Method1(void, setTextureBorderClampSupported, IN, bool, flag); - Method0(bool, isTextureBorderClampSupported); - Method1(void, setGenerateMipMapSupported, IN, bool, flag); - Method0(bool, isGenerateMipMapSupported); - Method1(void, setShadowSupported, IN, bool, flag); - Method0(bool, isShadowSupported); - Method1(void, setShadowAmbientSupported, IN, bool, flag); - Method0(bool, isShadowAmbientSupported); - Method1(void, setMaxTextureSize, IN, GLint, maxsize); - Method0(GLint, maxTextureSize); - Method1(void, setNumTextureUnits, IN, GLint, nunits); - Method0(GLint, numTextureUnits); - Method0(bool, isCompressedTexImage2DSupported); - Method1(void, setCompressedTexImage2DProc, IN, void *, ptr); - Method8(void, glCompressedTexImage2D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalformat, IN, GLsizei, width, IN, GLsizei, height, IN, GLint, border, IN, GLsizei, imageSize, IN, const GLvoid *, data); - Method1(void, setCompressedTexSubImage2DProc, IN, void *, ptr); - Method9(void, glCompressedTexSubImage2D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLenum, format, IN, GLsizei, type, IN, const GLvoid *, data); - Method1(void, setGetCompressedTexImageProc, IN, void *, ptr); - Method3(void, glGetCompressedTexImage, IN, GLenum, target, IN, GLint, level, IN, GLvoid *, data); - Method0(bool, isClientStorageSupported); - Method0(bool, isNonPowerOfTwoTextureSupported); - WriteOnlyProperty(void *, CompressedTexImage2DProc); - WriteOnlyProperty(void *, CompressedTexSubImage2DProc); - WriteOnlyProperty(bool, GenerateMipMapSupported); - WriteOnlyProperty(void *, GetCompressedTexImageProc); - WriteOnlyProperty(GLint, MaxTextureSize); - WriteOnlyProperty(bool, MultiTexturingSupported); - WriteOnlyProperty(GLint, NumTextureUnits); - WriteOnlyProperty(bool, ShadowAmbientSupported); - WriteOnlyProperty(bool, ShadowSupported); - WriteOnlyProperty(bool, TextureBorderClampSupported); - WriteOnlyProperty(bool, TextureCompressionARBSupported); - WriteOnlyProperty(bool, TextureCompressionS3TCSupported); - WriteOnlyProperty(bool, TextureEdgeClampSupported); - WriteOnlyProperty(bool, TextureFilterAnisotropicSupported); - WriteOnlyProperty(bool, TextureMirroredRepeatSupported); - WriteOnlyProperty(unsigned int, upGLExtensions); + I_BaseType(osg::Referenced); + I_Constructor1(IN, unsigned int, contextID); + I_Constructor1(IN, const osg::Texture::Extensions &, rhs); + I_Method1(void, lowestCommonDenominator, IN, const osg::Texture::Extensions &, rhs); + I_Method1(void, setupGLExtensions, IN, unsigned int, contextID); + I_Method1(void, setMultiTexturingSupported, IN, bool, flag); + I_Method0(bool, isMultiTexturingSupported); + I_Method1(void, setTextureFilterAnisotropicSupported, IN, bool, flag); + I_Method0(bool, isTextureFilterAnisotropicSupported); + I_Method1(void, setTextureCompressionARBSupported, IN, bool, flag); + I_Method0(bool, isTextureCompressionARBSupported); + I_Method1(void, setTextureCompressionS3TCSupported, IN, bool, flag); + I_Method0(bool, isTextureCompressionS3TCSupported); + I_Method1(void, setTextureMirroredRepeatSupported, IN, bool, flag); + I_Method0(bool, isTextureMirroredRepeatSupported); + I_Method1(void, setTextureEdgeClampSupported, IN, bool, flag); + I_Method0(bool, isTextureEdgeClampSupported); + I_Method1(void, setTextureBorderClampSupported, IN, bool, flag); + I_Method0(bool, isTextureBorderClampSupported); + I_Method1(void, setGenerateMipMapSupported, IN, bool, flag); + I_Method0(bool, isGenerateMipMapSupported); + I_Method1(void, setShadowSupported, IN, bool, flag); + I_Method0(bool, isShadowSupported); + I_Method1(void, setShadowAmbientSupported, IN, bool, flag); + I_Method0(bool, isShadowAmbientSupported); + I_Method1(void, setMaxTextureSize, IN, GLint, maxsize); + I_Method0(GLint, maxTextureSize); + I_Method1(void, setNumTextureUnits, IN, GLint, nunits); + I_Method0(GLint, numTextureUnits); + I_Method0(bool, isCompressedTexImage2DSupported); + I_Method1(void, setCompressedTexImage2DProc, IN, void *, ptr); + I_Method8(void, glCompressedTexImage2D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalformat, IN, GLsizei, width, IN, GLsizei, height, IN, GLint, border, IN, GLsizei, imageSize, IN, const GLvoid *, data); + I_Method1(void, setCompressedTexSubImage2DProc, IN, void *, ptr); + I_Method9(void, glCompressedTexSubImage2D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLenum, format, IN, GLsizei, type, IN, const GLvoid *, data); + I_Method1(void, setGetCompressedTexImageProc, IN, void *, ptr); + I_Method3(void, glGetCompressedTexImage, IN, GLenum, target, IN, GLint, level, IN, GLvoid *, data); + I_Method0(bool, isClientStorageSupported); + I_Method0(bool, isNonPowerOfTwoTextureSupported); + I_WriteOnlyProperty(void *, CompressedTexImage2DProc); + I_WriteOnlyProperty(void *, CompressedTexSubImage2DProc); + I_WriteOnlyProperty(bool, GenerateMipMapSupported); + I_WriteOnlyProperty(void *, GetCompressedTexImageProc); + I_WriteOnlyProperty(GLint, MaxTextureSize); + I_WriteOnlyProperty(bool, MultiTexturingSupported); + I_WriteOnlyProperty(GLint, NumTextureUnits); + I_WriteOnlyProperty(bool, ShadowAmbientSupported); + I_WriteOnlyProperty(bool, ShadowSupported); + I_WriteOnlyProperty(bool, TextureBorderClampSupported); + I_WriteOnlyProperty(bool, TextureCompressionARBSupported); + I_WriteOnlyProperty(bool, TextureCompressionS3TCSupported); + I_WriteOnlyProperty(bool, TextureEdgeClampSupported); + I_WriteOnlyProperty(bool, TextureFilterAnisotropicSupported); + I_WriteOnlyProperty(bool, TextureMirroredRepeatSupported); + I_WriteOnlyProperty(unsigned int, upGLExtensions); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::Texture::TextureObject) - BaseType(osg::Referenced); - Constructor2(IN, GLuint, id, IN, GLenum, target); - Constructor8(IN, GLuint, id, IN, GLenum, target, IN, GLint, numMipmapLevels, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border); - Method7(bool, match, IN, GLenum, target, IN, GLint, numMipmapLevels, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border); - Method0(void, bind); - MethodWithDefaults1(void, setAllocated, IN, bool, allocated, true); - Method6(void, setAllocated, IN, GLint, numMipmapLevels, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border); - Method0(bool, isAllocated); - Method0(bool, isReusable); - WriteOnlyProperty(bool, Allocated); +BEGIN_OBJECT_REFLECTOR(osg::Texture::TextureObject) + I_BaseType(osg::Referenced); + I_Constructor2(IN, GLuint, id, IN, GLenum, target); + I_Constructor8(IN, GLuint, id, IN, GLenum, target, IN, GLint, numMipmapLevels, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border); + I_Method7(bool, match, IN, GLenum, target, IN, GLint, numMipmapLevels, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border); + I_Method0(void, bind); + I_MethodWithDefaults1(void, setAllocated, IN, bool, allocated, true); + I_Method6(void, setAllocated, IN, GLint, numMipmapLevels, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border); + I_Method0(bool, isAllocated); + I_Method0(bool, isReusable); + I_WriteOnlyProperty(bool, Allocated); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Texture::TextureObject >) - Constructor0(); - Constructor1(IN, osg::Texture::TextureObject *, t); - Constructor1(IN, const osg::ref_ptr< osg::Texture::TextureObject > &, rp); - Method0(bool, valid); - Method0(osg::Texture::TextureObject *, get); - Method0(const osg::Texture::TextureObject *, get); - Method0(osg::Texture::TextureObject *, take); - Method0(osg::Texture::TextureObject *, release); - ReadOnlyProperty(osg::Texture::TextureObject *, ); + I_Constructor0(); + I_Constructor1(IN, osg::Texture::TextureObject *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::Texture::TextureObject > &, rp); + I_Method0(bool, valid); + I_Method0(osg::Texture::TextureObject *, get); + I_Method0(const osg::Texture::TextureObject *, get); + I_Method0(osg::Texture::TextureObject *, take); + I_Method0(osg::Texture::TextureObject *, release); + I_ReadOnlyProperty(osg::Texture::TextureObject *, ); END_REFLECTOR STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Texture::TextureObject > >); diff --git a/src/osgWrappers/osg/Texture1D.cpp b/src/osgWrappers/osg/Texture1D.cpp index d6d47208b..ad9f40065 100644 --- a/src/osgWrappers/osg/Texture1D.cpp +++ b/src/osgWrappers/osg/Texture1D.cpp @@ -16,47 +16,55 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture1D) - BaseType(osg::Texture); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Texture1D &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, rhs); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setImage, IN, osg::Image *, image); - Method0(osg::Image *, getImage); - Method0(const osg::Image *, getImage); - Method1(unsigned int &, getModifiedCount, IN, unsigned int, contextID); - Method2(void, setImage, IN, unsigned, int, IN, osg::Image *, image); - Method1(osg::Image *, getImage, IN, unsigned, int); - Method1(const osg::Image *, getImage, IN, unsigned, int); - Method0(unsigned int, getNumImages); - Method1(void, setTextureSize, IN, int, width); - Method1(void, getTextureSize, IN, int &, width); - Method1(void, setSubloadCallback, IN, osg::Texture1D::SubloadCallback *, cb); - Method0(osg::Texture1D::SubloadCallback *, getSubloadCallback); - Method0(const osg::Texture1D::SubloadCallback *, getSubloadCallback); - Method1(void, setNumMipmapLevels, IN, unsigned int, num); - Method0(unsigned int, getNumMipmapLevels); - Method4(void, copyTexImage1D, IN, osg::State &, state, IN, int, x, IN, int, y, IN, int, width); - Method5(void, copyTexSubImage1D, IN, osg::State &, state, IN, int, xoffset, IN, int, x, IN, int, y, IN, int, width); - Method1(void, apply, IN, osg::State &, state); - Property(osg::Image *, Image); - WriteOnlyProperty(unsigned int, NumMipmapLevels); - Property(osg::Texture1D::SubloadCallback *, SubloadCallback); - WriteOnlyProperty(int, TextureSize); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::Texture); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osg::Texture1D &, 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_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + 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_Method1(void, setTextureSize, IN, int, width); + I_Method1(void, getTextureSize, IN, int &, width); + I_Method1(void, setSubloadCallback, IN, osg::Texture1D::SubloadCallback *, cb); + I_Method0(osg::Texture1D::SubloadCallback *, getSubloadCallback); + I_Method0(const osg::Texture1D::SubloadCallback *, getSubloadCallback); + I_Method1(void, setNumMipmapLevels, IN, unsigned int, num); + I_Method0(unsigned int, getNumMipmapLevels); + I_Method4(void, copyTexImage1D, IN, osg::State &, state, IN, int, x, IN, int, y, IN, int, width); + I_Method5(void, copyTexSubImage1D, IN, osg::State &, state, IN, int, xoffset, IN, int, x, IN, int, y, IN, int, width); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(osg::Image *, Image); + I_WriteOnlyProperty(unsigned int, NumMipmapLevels); + I_Property(osg::Texture1D::SubloadCallback *, SubloadCallback); + I_WriteOnlyProperty(int, TextureSize); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture1D::SubloadCallback) - BaseType(osg::Referenced); - Constructor0(); - Method2(void, load, IN, const osg::Texture1D &, texture, IN, osg::State &, state); - Method2(void, subload, IN, const osg::Texture1D &, texture, IN, osg::State &, state); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method2(void, load, IN, const osg::Texture1D &, texture, IN, osg::State &, state); + I_Method2(void, subload, IN, const osg::Texture1D &, texture, IN, osg::State &, state); END_REFLECTOR diff --git a/src/osgWrappers/osg/Texture2D.cpp b/src/osgWrappers/osg/Texture2D.cpp index f330b2497..f69368ba4 100644 --- a/src/osgWrappers/osg/Texture2D.cpp +++ b/src/osgWrappers/osg/Texture2D.cpp @@ -16,52 +16,60 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture2D) - BaseType(osg::Texture); - Constructor0(); - Constructor1(IN, osg::Image *, image); - ConstructorWithDefaults2(IN, const osg::Texture2D &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, rhs); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setImage, IN, osg::Image *, image); - Method0(osg::Image *, getImage); - Method0(const osg::Image *, getImage); - Method1(unsigned int &, getModifiedCount, IN, unsigned int, contextID); - Method2(void, setImage, IN, unsigned, int, IN, osg::Image *, image); - Method1(osg::Image *, getImage, IN, unsigned, int); - Method1(const osg::Image *, getImage, IN, unsigned, int); - Method0(unsigned int, getNumImages); - Method2(void, setTextureSize, IN, int, width, IN, int, height); - Method1(void, setTextureWidth, IN, int, width); - Method0(int, getTextureWidth); - Method1(void, setTextureHeight, IN, int, height); - Method0(int, getTextureHeight); - Method1(void, setSubloadCallback, IN, osg::Texture2D::SubloadCallback *, cb); - Method0(osg::Texture2D::SubloadCallback *, getSubloadCallback); - Method0(const osg::Texture2D::SubloadCallback *, getSubloadCallback); - Method1(void, setNumMipmapLevels, IN, unsigned int, num); - Method0(unsigned int, getNumMipmapLevels); - Method5(void, copyTexImage2D, IN, osg::State &, state, IN, int, x, IN, int, y, IN, int, width, IN, int, height); - 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); - Method1(void, apply, IN, osg::State &, state); - Property(osg::Image *, Image); - WriteOnlyProperty(unsigned int, NumMipmapLevels); - Property(osg::Texture2D::SubloadCallback *, SubloadCallback); - Property(int, TextureHeight); - Property(int, TextureWidth); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::Texture); + I_Constructor0(); + I_Constructor1(IN, osg::Image *, image); + I_ConstructorWithDefaults2(IN, const osg::Texture2D &, 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_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + 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::Texture2D::SubloadCallback *, cb); + I_Method0(osg::Texture2D::SubloadCallback *, getSubloadCallback); + I_Method0(const osg::Texture2D::SubloadCallback *, getSubloadCallback); + I_Method1(void, setNumMipmapLevels, IN, unsigned int, num); + I_Method0(unsigned int, getNumMipmapLevels); + 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_WriteOnlyProperty(unsigned int, NumMipmapLevels); + I_Property(osg::Texture2D::SubloadCallback *, SubloadCallback); + I_Property(int, TextureHeight); + I_Property(int, TextureWidth); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture2D::SubloadCallback) - BaseType(osg::Referenced); - Constructor0(); - Method2(void, load, IN, const osg::Texture2D &, texture, IN, osg::State &, state); - Method2(void, subload, IN, const osg::Texture2D &, texture, IN, osg::State &, state); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method2(void, load, IN, const osg::Texture2D &, texture, IN, osg::State &, state); + I_Method2(void, subload, IN, const osg::Texture2D &, texture, IN, osg::State &, state); END_REFLECTOR diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index d309402b9..05f118f03 100644 --- a/src/osgWrappers/osg/Texture3D.cpp +++ b/src/osgWrappers/osg/Texture3D.cpp @@ -16,83 +16,91 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D) - BaseType(osg::Texture); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Texture3D &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, rhs); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setImage, IN, osg::Image *, image); - Method0(osg::Image *, getImage); - Method0(const osg::Image *, getImage); - Method1(unsigned int &, getModifiedCount, IN, unsigned int, contextID); - Method2(void, setImage, IN, unsigned, int, IN, osg::Image *, image); - Method1(osg::Image *, getImage, IN, unsigned, int); - Method1(const osg::Image *, getImage, IN, unsigned, int); - Method0(unsigned int, getNumImages); - Method3(void, setTextureSize, IN, int, width, IN, int, height, IN, int, depth); - Method3(void, getTextureSize, IN, int &, width, IN, int &, height, IN, int &, depth); - Method1(void, setSubloadCallback, IN, osg::Texture3D::SubloadCallback *, cb); - Method0(osg::Texture3D::SubloadCallback *, getSubloadCallback); - Method0(const osg::Texture3D::SubloadCallback *, getSubloadCallback); - Method1(void, setNumMipmapLevels, IN, unsigned int, num); - Method0(unsigned int, getNumMipmapLevels); - 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); - Method1(void, apply, IN, osg::State &, state); - Property(osg::Image *, Image); - WriteOnlyProperty(unsigned int, NumMipmapLevels); - Property(osg::Texture3D::SubloadCallback *, SubloadCallback); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + 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_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + 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, 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_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Texture3D::Extensions) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::Texture3D::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::Texture3D::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method1(void, setTexture3DSupported, IN, bool, flag); - Method0(bool, isTexture3DSupported); - Method1(void, setTexture3DFast, IN, bool, flag); - Method0(bool, isTexture3DFast); - Method1(void, setMaxTexture3DSize, IN, GLint, maxsize); - Method0(GLint, maxTexture3DSize); - Method1(void, setTexImage3DProc, IN, void *, ptr); - 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); - Method1(void, setTexSubImage3DProc, IN, void *, ptr); - 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); - Method1(void, setCopyTexSubImage3DProc, IN, void *, ptr); - 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); - Method0(bool, isCompressedTexImage3DSupported); - Method1(void, setCompressedTexImage3DProc, IN, void *, ptr); - 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); - Method0(bool, isCompressedTexSubImage3DSupported); - Method1(void, setCompressedTexSubImage3DProc, IN, void *, ptr); - 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); - Method1(void, setBuild3DMipmapsProc, IN, void *, ptr); - 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); - WriteOnlyProperty(void *, Build3DMipmapsProc); - WriteOnlyProperty(void *, CompressedTexImage3DProc); - WriteOnlyProperty(void *, CompressedTexSubImage3DProc); - WriteOnlyProperty(void *, CopyTexSubImage3DProc); - WriteOnlyProperty(GLint, MaxTexture3DSize); - WriteOnlyProperty(void *, TexImage3DProc); - WriteOnlyProperty(void *, TexSubImage3DProc); - WriteOnlyProperty(bool, Texture3DFast); - WriteOnlyProperty(bool, Texture3DSupported); - WriteOnlyProperty(unsigned int, upGLExtenions); + 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, setupGLExtenions, 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, upGLExtenions); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D::SubloadCallback) - BaseType(osg::Referenced); - Constructor0(); - Method2(void, load, IN, const osg::Texture3D &, texture, IN, osg::State &, state); - Method2(void, subload, IN, const osg::Texture3D &, texture, IN, osg::State &, state); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/TextureCubeMap.cpp b/src/osgWrappers/osg/TextureCubeMap.cpp index ceab0395f..f4ce71fbf 100644 --- a/src/osgWrappers/osg/TextureCubeMap.cpp +++ b/src/osgWrappers/osg/TextureCubeMap.cpp @@ -16,62 +16,70 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::TextureCubeMap::Face) - EnumLabel(osg::TextureCubeMap::POSITIVE_X); - EnumLabel(osg::TextureCubeMap::NEGATIVE_X); - EnumLabel(osg::TextureCubeMap::POSITIVE_Y); - EnumLabel(osg::TextureCubeMap::NEGATIVE_Y); - EnumLabel(osg::TextureCubeMap::POSITIVE_Z); - EnumLabel(osg::TextureCubeMap::NEGATIVE_Z); + 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) - BaseType(osg::Texture); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::TextureCubeMap &, cm, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, rhs); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method2(void, setImage, IN, unsigned int, face, IN, osg::Image *, image); - Method1(osg::Image *, getImage, IN, unsigned int, face); - Method1(const osg::Image *, getImage, IN, unsigned int, face); - Method0(unsigned int, getNumImages); - Method2(unsigned int &, getModifiedCount, IN, unsigned int, face, IN, unsigned int, contextID); - Method2(void, setTextureSize, IN, int, width, IN, int, height); - Method2(void, getTextureSize, IN, int &, width, IN, int &, height); - Method1(void, setSubloadCallback, IN, osg::TextureCubeMap::SubloadCallback *, cb); - Method0(osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); - Method0(const osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); - Method1(void, setNumMipmapLevels, IN, unsigned int, num); - Method0(unsigned int, getNumMipmapLevels); - Method1(void, apply, IN, osg::State &, state); - ArrayProperty_G(osg::Image *, Image, Images, unsigned int, void); - WriteOnlyProperty(unsigned int, NumMipmapLevels); - Property(osg::TextureCubeMap::SubloadCallback *, SubloadCallback); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + 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(osg::StateAttribute::Type, getType); + I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + 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_Method2(void, getTextureSize, IN, int &, width, IN, int &, height); + 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_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_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap::Extensions) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::TextureCubeMap::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::TextureCubeMap::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method1(void, setCubeMapSupported, IN, bool, flag); - Method0(bool, isCubeMapSupported); - WriteOnlyProperty(bool, CubeMapSupported); - WriteOnlyProperty(unsigned int, upGLExtenions); + 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_WriteOnlyProperty(bool, CubeMapSupported); + I_WriteOnlyProperty(unsigned int, upGLExtenions); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureCubeMap::SubloadCallback) - BaseType(osg::Referenced); - Constructor0(); - Method2(void, load, IN, const osg::TextureCubeMap &, texture, IN, osg::State &, state); - Method2(void, subload, IN, const osg::TextureCubeMap &, texture, IN, osg::State &, state); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/TextureRectangle.cpp b/src/osgWrappers/osg/TextureRectangle.cpp index ab419cd06..80820cb56 100644 --- a/src/osgWrappers/osg/TextureRectangle.cpp +++ b/src/osgWrappers/osg/TextureRectangle.cpp @@ -16,44 +16,52 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle) - BaseType(osg::Texture); - Constructor0(); - Constructor1(IN, osg::Image *, image); - ConstructorWithDefaults2(IN, const osg::TextureRectangle &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, rhs); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(void, setImage, IN, osg::Image *, image); - Method0(osg::Image *, getImage); - Method0(const osg::Image *, getImage); - Method1(unsigned int &, getModifiedCount, IN, unsigned int, contextID); - Method2(void, setImage, IN, unsigned, int, IN, osg::Image *, image); - Method1(osg::Image *, getImage, IN, unsigned, int); - Method1(const osg::Image *, getImage, IN, unsigned, int); - Method0(unsigned int, getNumImages); - Method2(void, setTextureSize, IN, int, width, IN, int, height); - Method2(void, getTextureSize, IN, int &, width, IN, int &, height); - Method1(void, setSubloadCallback, IN, osg::TextureRectangle::SubloadCallback *, cb); - Method0(osg::TextureRectangle::SubloadCallback *, getSubloadCallback); - Method0(const osg::TextureRectangle::SubloadCallback *, getSubloadCallback); - Method5(void, copyTexImage2D, IN, osg::State &, state, IN, int, x, IN, int, y, IN, int, width, IN, int, height); - 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); - Method1(void, apply, IN, osg::State &, state); - Property(osg::Image *, Image); - Property(osg::TextureRectangle::SubloadCallback *, SubloadCallback); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + 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_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + 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_Method2(void, getTextureSize, IN, int &, width, IN, int &, height); + 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_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle::SubloadCallback) - BaseType(osg::Referenced); - Constructor0(); - Method2(void, load, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); - Method2(void, subload, IN, const osg::TextureRectangle &, x, IN, osg::State &, x); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/Timer.cpp b/src/osgWrappers/osg/Timer.cpp index 2c2c73d24..772e018ae 100644 --- a/src/osgWrappers/osg/Timer.cpp +++ b/src/osgWrappers/osg/Timer.cpp @@ -11,15 +11,23 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osg::Timer) - Constructor0(); - Method0(osg::Timer_t, tick); - Method2(double, delta_s, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); - Method2(double, delta_m, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); - Method2(double, delta_u, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); - Method2(double, delta_n, IN, osg::Timer_t, t1, IN, osg::Timer_t, t2); - Method0(double, getSecondsPerTick); - ReadOnlyProperty(double, SecondsPerTick); + 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 TYPE_NAME_ALIAS(unsigned long long, osg::Timer_t); diff --git a/src/osgWrappers/osg/Transform.cpp b/src/osgWrappers/osg/Transform.cpp index 3b133aeec..2920fab93 100644 --- a/src/osgWrappers/osg/Transform.cpp +++ b/src/osgWrappers/osg/Transform.cpp @@ -18,32 +18,40 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osg::Transform::ReferenceFrame) - EnumLabel(osg::Transform::RELATIVE_RF); - EnumLabel(osg::Transform::ABSOLUTE_RF); + I_EnumLabel(osg::Transform::RELATIVE_RF); + I_EnumLabel(osg::Transform::ABSOLUTE_RF); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Transform) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::Transform &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(osg::Transform *, asTransform); - Method0(const osg::Transform *, asTransform); - Method0(osg::MatrixTransform *, asMatrixTransform); - Method0(const osg::MatrixTransform *, asMatrixTransform); - Method0(osg::PositionAttitudeTransform *, asPositionAttitudeTransform); - Method0(const osg::PositionAttitudeTransform *, asPositionAttitudeTransform); - Method1(void, setReferenceFrame, IN, osg::Transform::ReferenceFrame, rf); - Method0(osg::Transform::ReferenceFrame, getReferenceFrame); - Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); - Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); - Method0(osg::BoundingSphere, computeBound); - Property(osg::Transform::ReferenceFrame, ReferenceFrame); + 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_Property(osg::Transform::ReferenceFrame, ReferenceFrame); END_REFLECTOR diff --git a/src/osgWrappers/osg/UByte4.cpp b/src/osgWrappers/osg/UByte4.cpp index 467658063..d1ab5399b 100644 --- a/src/osgWrappers/osg/UByte4.cpp +++ b/src/osgWrappers/osg/UByte4.cpp @@ -11,19 +11,27 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osg::UByte4) - Constructor0(); - Constructor4(IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a); - Method0(unsigned char *, ptr); - Method0(const unsigned char *, ptr); - Method4(void, set, IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a); - Method0(unsigned char &, r); - Method0(unsigned char &, g); - Method0(unsigned char &, b); - Method0(unsigned char &, a); - Method0(unsigned char, r); - Method0(unsigned char, g); - Method0(unsigned char, b); - Method0(unsigned char, a); + I_Constructor0(); + I_Constructor4(IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a); + I_Method0(unsigned char *, ptr); + 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/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp index 27773b89a..7886be99f 100644 --- a/src/osgWrappers/osg/Uniform.cpp +++ b/src/osgWrappers/osg/Uniform.cpp @@ -21,125 +21,133 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::Uniform::ParentList); BEGIN_ENUM_REFLECTOR(osg::Uniform::Type) - EnumLabel(osg::Uniform::FLOAT); - EnumLabel(osg::Uniform::FLOAT_VEC2); - EnumLabel(osg::Uniform::FLOAT_VEC3); - EnumLabel(osg::Uniform::FLOAT_VEC4); - EnumLabel(osg::Uniform::INT); - EnumLabel(osg::Uniform::INT_VEC2); - EnumLabel(osg::Uniform::INT_VEC3); - EnumLabel(osg::Uniform::INT_VEC4); - EnumLabel(osg::Uniform::BOOL); - EnumLabel(osg::Uniform::BOOL_VEC2); - EnumLabel(osg::Uniform::BOOL_VEC3); - EnumLabel(osg::Uniform::BOOL_VEC4); - EnumLabel(osg::Uniform::FLOAT_MAT2); - EnumLabel(osg::Uniform::FLOAT_MAT3); - EnumLabel(osg::Uniform::FLOAT_MAT4); - EnumLabel(osg::Uniform::SAMPLER_1D); - EnumLabel(osg::Uniform::SAMPLER_2D); - EnumLabel(osg::Uniform::SAMPLER_3D); - EnumLabel(osg::Uniform::SAMPLER_CUBE); - EnumLabel(osg::Uniform::SAMPLER_1D_SHADOW); - EnumLabel(osg::Uniform::SAMPLER_2D_SHADOW); - EnumLabel(osg::Uniform::UNDEFINED); + 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) - BaseType(osg::Object); - Constructor0(); - Constructor2(IN, osg::Uniform::Type, type, IN, const std::string &, name); - ConstructorWithDefaults2(IN, const osg::Uniform &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, setType, IN, osg::Uniform::Type, t); - Method1(bool, setName, IN, const std::string &, name); - Method0(const std::string &, getName); - Method0(const osg::Uniform::Type, getType); - Constructor2(IN, const char *, name, IN, float, f); - Constructor2(IN, const char *, name, IN, int, i); - Constructor2(IN, const char *, name, IN, bool, b); - Constructor2(IN, const char *, name, IN, const osg::Vec2 &, v2); - Constructor2(IN, const char *, name, IN, const osg::Vec3 &, v3); - Constructor2(IN, const char *, name, IN, const osg::Vec4 &, v4); - Constructor2(IN, const char *, name, IN, const osg::Matrixf &, m4); - Constructor2(IN, const char *, name, IN, const osg::Matrixd &, m4); - Constructor3(IN, const char *, name, IN, int, i0, IN, int, i1); - Constructor4(IN, const char *, name, IN, int, i0, IN, int, i1, IN, int, i2); - Constructor5(IN, const char *, name, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); - Constructor3(IN, const char *, name, IN, bool, b0, IN, bool, b1); - Constructor4(IN, const char *, name, IN, bool, b0, IN, bool, b1, IN, bool, b2); - Constructor5(IN, const char *, name, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); - Method1(int, compare, IN, const osg::Uniform &, rhs); - Method1(int, compareData, IN, const osg::Uniform &, rhs); - Method1(void, copyData, IN, const osg::Uniform &, rhs); - Method0(const osg::Uniform::ParentList &, getParents); - Method0(osg::Uniform::ParentList, getParents); - Method1(osg::StateSet *, getParent, IN, unsigned int, i); - Method1(const osg::StateSet *, getParent, IN, unsigned int, i); - Method0(unsigned int, getNumParents); - Method1(bool, set, IN, float, f); - Method1(bool, set, IN, int, i); - Method1(bool, set, IN, bool, b); - Method1(bool, set, IN, const osg::Vec2 &, v2); - Method1(bool, set, IN, const osg::Vec3 &, v3); - Method1(bool, set, IN, const osg::Vec4 &, v4); - Method1(bool, set, IN, const osg::Matrixf &, m4); - Method1(bool, set, IN, const osg::Matrixd &, m4); - Method2(bool, set, IN, int, i0, IN, int, i1); - Method3(bool, set, IN, int, i0, IN, int, i1, IN, int, i2); - Method4(bool, set, IN, int, i0, IN, int, i1, IN, int, i2, IN, int, i3); - Method2(bool, set, IN, bool, b0, IN, bool, b1); - Method3(bool, set, IN, bool, b0, IN, bool, b1, IN, bool, b2); - Method4(bool, set, IN, bool, b0, IN, bool, b1, IN, bool, b2, IN, bool, b3); - Method1(bool, get, IN, float &, f); - Method1(bool, get, IN, int &, i); - Method1(bool, get, IN, bool &, b); - Method1(bool, get, IN, osg::Vec2 &, v2); - Method1(bool, get, IN, osg::Vec3 &, v3); - Method1(bool, get, IN, osg::Vec4 &, v4); - Method1(bool, get, IN, osg::Matrixf &, m4); - Method1(bool, get, IN, osg::Matrixd &, m4); - Method2(bool, get, IN, int &, i0, IN, int &, i1); - Method3(bool, get, IN, int &, i0, IN, int &, i1, IN, int &, i2); - Method4(bool, get, IN, int &, i0, IN, int &, i1, IN, int &, i2, IN, int &, i3); - Method2(bool, get, IN, bool &, b0, IN, bool &, b1); - Method3(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2); - Method4(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3); - Method1(void, setUpdateCallback, IN, osg::Uniform::Callback *, uc); - Method0(osg::Uniform::Callback *, getUpdateCallback); - Method0(const osg::Uniform::Callback *, getUpdateCallback); - Method1(void, setEventCallback, IN, osg::Uniform::Callback *, ec); - Method0(osg::Uniform::Callback *, getEventCallback); - Method0(const osg::Uniform::Callback *, getEventCallback); - Method0(void, dirty); - Method1(void, setModifiedCount, IN, unsigned int, mc); - Method0(unsigned int, getModifiedCount); - Method2(void, apply, IN, const osg::GL2Extensions *, ext, IN, GLint, location); - WriteOnlyPropertyWithReturnType(bool, , bool); - Property(osg::Uniform::Callback *, EventCallback); - Property(unsigned int, ModifiedCount); - PropertyWithReturnType(const std::string &, Name, bool); - ArrayProperty_G(osg::StateSet *, Parent, Parents, unsigned int, void); - ReadOnlyProperty(osg::Uniform::ParentList, Parents); - WriteOnlyPropertyWithReturnType(osg::Uniform::Type, Type, bool); - Property(osg::Uniform::Callback *, UpdateCallback); + I_BaseType(osg::Object); + I_Constructor0(); + I_Constructor2(IN, osg::Uniform::Type, type, IN, const std::string &, name); + 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_Method1(bool, setName, IN, const std::string &, name); + I_Method0(const std::string &, getName); + I_Method0(const osg::Uniform::Type, getType); + 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::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::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::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_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(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_Property(osg::Uniform::Callback *, EventCallback); + I_Property(unsigned int, ModifiedCount); + I_PropertyWithReturnType(const std::string &, Name, bool); + 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 -BEGIN_VALUE_REFLECTOR(osg::Uniform::Callback) - VirtualBaseType(osg::Object); - Constructor0(); - Constructor2(IN, const osg::Uniform::Callback &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); +BEGIN_OBJECT_REFLECTOR(osg::Uniform::Callback) + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec2.cpp b/src/osgWrappers/osg/Vec2.cpp index 6471dbc15..440550ea4 100644 --- a/src/osgWrappers/osg/Vec2.cpp +++ b/src/osgWrappers/osg/Vec2.cpp @@ -11,5 +11,13 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(osg::Vec2f, osg::Vec2); diff --git a/src/osgWrappers/osg/Vec2d.cpp b/src/osgWrappers/osg/Vec2d.cpp index 66fc783ef..43789573c 100644 --- a/src/osgWrappers/osg/Vec2d.cpp +++ b/src/osgWrappers/osg/Vec2d.cpp @@ -12,27 +12,35 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + #include TYPE_NAME_ALIAS(double, osg::Vec2d::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec2d) - ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined - Comparator(osgIntrospection::PartialOrderComparator); // user-defined - Constructor0(); - Constructor2(IN, osg::Vec2d::value_type, x, IN, osg::Vec2d::value_type, y); - Constructor1(IN, const osg::Vec2f &, vec); - Method0(osg::Vec2d::value_type *, ptr); - Method0(const osg::Vec2d::value_type *, ptr); - Method2(void, set, IN, osg::Vec2d::value_type, x, IN, osg::Vec2d::value_type, y); - Method0(osg::Vec2d::value_type &, x); - Method0(osg::Vec2d::value_type &, y); - Method0(osg::Vec2d::value_type, x); - Method0(osg::Vec2d::value_type, y); - Method0(bool, valid); - Method0(bool, isNaN); - Method0(osg::Vec2d::value_type, length); - Method0(osg::Vec2d::value_type, length2); - Method0(osg::Vec2d::value_type, normalize); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec2f.cpp b/src/osgWrappers/osg/Vec2f.cpp index 333e4cb2a..962e96805 100644 --- a/src/osgWrappers/osg/Vec2f.cpp +++ b/src/osgWrappers/osg/Vec2f.cpp @@ -11,26 +11,34 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + #include TYPE_NAME_ALIAS(float, osg::Vec2f::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec2f) - ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined - Comparator(osgIntrospection::PartialOrderComparator); // user-defined - Constructor0(); - Constructor2(IN, osg::Vec2f::value_type, x, IN, osg::Vec2f::value_type, y); - Method0(osg::Vec2f::value_type *, ptr); - Method0(const osg::Vec2f::value_type *, ptr); - Method2(void, set, IN, osg::Vec2f::value_type, x, IN, osg::Vec2f::value_type, y); - Method0(osg::Vec2f::value_type &, x); - Method0(osg::Vec2f::value_type &, y); - Method0(osg::Vec2f::value_type, x); - Method0(osg::Vec2f::value_type, y); - Method0(bool, valid); - Method0(bool, isNaN); - Method0(osg::Vec2f::value_type, length); - Method0(osg::Vec2f::value_type, length2); - Method0(osg::Vec2f::value_type, normalize); + 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); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec3.cpp b/src/osgWrappers/osg/Vec3.cpp index 7a2c1cb19..7beeea20e 100644 --- a/src/osgWrappers/osg/Vec3.cpp +++ b/src/osgWrappers/osg/Vec3.cpp @@ -11,5 +11,13 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(osg::Vec3f, osg::Vec3); diff --git a/src/osgWrappers/osg/Vec3d.cpp b/src/osgWrappers/osg/Vec3d.cpp index 14476d83b..33143b26a 100644 --- a/src/osgWrappers/osg/Vec3d.cpp +++ b/src/osgWrappers/osg/Vec3d.cpp @@ -13,32 +13,40 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + #include TYPE_NAME_ALIAS(double, osg::Vec3d::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec3d) - ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined - Comparator(osgIntrospection::PartialOrderComparator); // user-defined - Constructor0(); - Constructor1(IN, const osg::Vec3f &, vec); - Constructor3(IN, osg::Vec3d::value_type, x, IN, osg::Vec3d::value_type, y, IN, osg::Vec3d::value_type, z); - Constructor2(IN, const osg::Vec2d &, v2, IN, osg::Vec3d::value_type, zz); - Method0(osg::Vec3d::value_type *, ptr); - Method0(const osg::Vec3d::value_type *, ptr); - Method3(void, set, IN, osg::Vec3d::value_type, x, IN, osg::Vec3d::value_type, y, IN, osg::Vec3d::value_type, z); - Method1(void, set, IN, const osg::Vec3d &, rhs); - Method0(osg::Vec3d::value_type &, x); - Method0(osg::Vec3d::value_type &, y); - Method0(osg::Vec3d::value_type &, z); - Method0(osg::Vec3d::value_type, x); - Method0(osg::Vec3d::value_type, y); - Method0(osg::Vec3d::value_type, z); - Method0(bool, valid); - Method0(bool, isNaN); - Method0(osg::Vec3d::value_type, length); - Method0(osg::Vec3d::value_type, length2); - Method0(osg::Vec3d::value_type, normalize); - WriteOnlyProperty(const osg::Vec3d &, ); + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor1(IN, const osg::Vec3f &, vec); + I_Constructor3(IN, osg::Vec3d::value_type, x, IN, osg::Vec3d::value_type, y, IN, osg::Vec3d::value_type, z); + I_Constructor2(IN, const osg::Vec2d &, v2, IN, osg::Vec3d::value_type, zz); + I_Method0(osg::Vec3d::value_type *, ptr); + I_Method0(const osg::Vec3d::value_type *, ptr); + I_Method3(void, set, IN, osg::Vec3d::value_type, x, IN, osg::Vec3d::value_type, y, IN, osg::Vec3d::value_type, z); + I_Method1(void, set, IN, const osg::Vec3d &, rhs); + I_Method0(osg::Vec3d::value_type &, x); + I_Method0(osg::Vec3d::value_type &, y); + I_Method0(osg::Vec3d::value_type &, z); + I_Method0(osg::Vec3d::value_type, x); + I_Method0(osg::Vec3d::value_type, y); + I_Method0(osg::Vec3d::value_type, z); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec3d::value_type, length); + I_Method0(osg::Vec3d::value_type, length2); + I_Method0(osg::Vec3d::value_type, normalize); + I_WriteOnlyProperty(const osg::Vec3d &, ); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec3f.cpp b/src/osgWrappers/osg/Vec3f.cpp index 4d3805ec0..d33495644 100644 --- a/src/osgWrappers/osg/Vec3f.cpp +++ b/src/osgWrappers/osg/Vec3f.cpp @@ -12,31 +12,39 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + #include TYPE_NAME_ALIAS(float, osg::Vec3f::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec3f) - ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined - Comparator(osgIntrospection::PartialOrderComparator); // user-defined - Constructor0(); - Constructor3(IN, osg::Vec3f::value_type, x, IN, osg::Vec3f::value_type, y, IN, osg::Vec3f::value_type, z); - Constructor2(IN, const osg::Vec2f &, v2, IN, osg::Vec3f::value_type, zz); - Method0(osg::Vec3f::value_type *, ptr); - Method0(const osg::Vec3f::value_type *, ptr); - Method3(void, set, IN, osg::Vec3f::value_type, x, IN, osg::Vec3f::value_type, y, IN, osg::Vec3f::value_type, z); - Method1(void, set, IN, const osg::Vec3f &, rhs); - Method0(osg::Vec3f::value_type &, x); - Method0(osg::Vec3f::value_type &, y); - Method0(osg::Vec3f::value_type &, z); - Method0(osg::Vec3f::value_type, x); - Method0(osg::Vec3f::value_type, y); - Method0(osg::Vec3f::value_type, z); - Method0(bool, valid); - Method0(bool, isNaN); - Method0(osg::Vec3f::value_type, length); - Method0(osg::Vec3f::value_type, length2); - Method0(osg::Vec3f::value_type, normalize); - WriteOnlyProperty(const osg::Vec3f &, ); + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor3(IN, osg::Vec3f::value_type, x, IN, osg::Vec3f::value_type, y, IN, osg::Vec3f::value_type, z); + I_Constructor2(IN, const osg::Vec2f &, v2, IN, osg::Vec3f::value_type, zz); + I_Method0(osg::Vec3f::value_type *, ptr); + I_Method0(const osg::Vec3f::value_type *, ptr); + I_Method3(void, set, IN, osg::Vec3f::value_type, x, IN, osg::Vec3f::value_type, y, IN, osg::Vec3f::value_type, z); + I_Method1(void, set, IN, const osg::Vec3f &, rhs); + I_Method0(osg::Vec3f::value_type &, x); + I_Method0(osg::Vec3f::value_type &, y); + I_Method0(osg::Vec3f::value_type &, z); + I_Method0(osg::Vec3f::value_type, x); + I_Method0(osg::Vec3f::value_type, y); + I_Method0(osg::Vec3f::value_type, z); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec3f::value_type, length); + I_Method0(osg::Vec3f::value_type, length2); + I_Method0(osg::Vec3f::value_type, normalize); + I_WriteOnlyProperty(const osg::Vec3f &, ); END_REFLECTOR diff --git a/src/osgWrappers/osg/Vec4.cpp b/src/osgWrappers/osg/Vec4.cpp index a306a0349..6663b4b71 100644 --- a/src/osgWrappers/osg/Vec4.cpp +++ b/src/osgWrappers/osg/Vec4.cpp @@ -11,5 +11,13 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(osg::Vec4f, osg::Vec4); diff --git a/src/osgWrappers/osg/Vec4d.cpp b/src/osgWrappers/osg/Vec4d.cpp index 112ef50ee..e33187f40 100644 --- a/src/osgWrappers/osg/Vec4d.cpp +++ b/src/osgWrappers/osg/Vec4d.cpp @@ -13,42 +13,50 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + #include TYPE_NAME_ALIAS(double, osg::Vec4d::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec4d) - ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined - Comparator(osgIntrospection::PartialOrderComparator); // user-defined - Constructor0(); - 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); - Constructor2(IN, const osg::Vec3d &, v3, IN, osg::Vec4d::value_type, w); - Constructor1(IN, const osg::Vec4f &, vec); - Method0(osg::Vec4d::value_type *, ptr); - Method0(const osg::Vec4d::value_type *, ptr); - 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); - Method0(osg::Vec4d::value_type &, x); - Method0(osg::Vec4d::value_type &, y); - Method0(osg::Vec4d::value_type &, z); - Method0(osg::Vec4d::value_type &, w); - Method0(osg::Vec4d::value_type, x); - Method0(osg::Vec4d::value_type, y); - Method0(osg::Vec4d::value_type, z); - Method0(osg::Vec4d::value_type, w); - Method0(osg::Vec4d::value_type &, red); - Method0(osg::Vec4d::value_type &, green); - Method0(osg::Vec4d::value_type &, blue); - Method0(osg::Vec4d::value_type &, alpha); - Method0(osg::Vec4d::value_type, red); - Method0(osg::Vec4d::value_type, green); - Method0(osg::Vec4d::value_type, blue); - Method0(osg::Vec4d::value_type, alpha); - Method0(unsigned long, asABGR); - Method0(unsigned long, asRGBA); - Method0(bool, valid); - Method0(bool, isNaN); - Method0(osg::Vec4d::value_type, length); - Method0(osg::Vec4d::value_type, length2); - Method0(osg::Vec4d::value_type, normalize); + 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 &, red); + I_Method0(osg::Vec4d::value_type &, green); + I_Method0(osg::Vec4d::value_type &, blue); + I_Method0(osg::Vec4d::value_type &, alpha); + I_Method0(osg::Vec4d::value_type, red); + I_Method0(osg::Vec4d::value_type, green); + I_Method0(osg::Vec4d::value_type, blue); + I_Method0(osg::Vec4d::value_type, alpha); + I_Method0(unsigned long, asABGR); + I_Method0(unsigned long, 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/Vec4f.cpp b/src/osgWrappers/osg/Vec4f.cpp index b93ae3222..c091e6da8 100644 --- a/src/osgWrappers/osg/Vec4f.cpp +++ b/src/osgWrappers/osg/Vec4f.cpp @@ -12,41 +12,49 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + #include TYPE_NAME_ALIAS(float, osg::Vec4f::value_type); BEGIN_VALUE_REFLECTOR(osg::Vec4f) - ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined - Comparator(osgIntrospection::PartialOrderComparator); // user-defined - Constructor0(); - Constructor4(IN, osg::Vec4f::value_type, x, IN, osg::Vec4f::value_type, y, IN, osg::Vec4f::value_type, z, IN, osg::Vec4f::value_type, w); - Constructor2(IN, const osg::Vec3f &, v3, IN, osg::Vec4f::value_type, w); - Method0(osg::Vec4f::value_type *, ptr); - Method0(const osg::Vec4f::value_type *, ptr); - Method4(void, set, IN, osg::Vec4f::value_type, x, IN, osg::Vec4f::value_type, y, IN, osg::Vec4f::value_type, z, IN, osg::Vec4f::value_type, w); - Method0(osg::Vec4f::value_type &, x); - Method0(osg::Vec4f::value_type &, y); - Method0(osg::Vec4f::value_type &, z); - Method0(osg::Vec4f::value_type &, w); - Method0(osg::Vec4f::value_type, x); - Method0(osg::Vec4f::value_type, y); - Method0(osg::Vec4f::value_type, z); - Method0(osg::Vec4f::value_type, w); - Method0(osg::Vec4f::value_type &, red); - Method0(osg::Vec4f::value_type &, green); - Method0(osg::Vec4f::value_type &, blue); - Method0(osg::Vec4f::value_type &, alpha); - Method0(osg::Vec4f::value_type, red); - Method0(osg::Vec4f::value_type, green); - Method0(osg::Vec4f::value_type, blue); - Method0(osg::Vec4f::value_type, alpha); - Method0(unsigned long, asABGR); - Method0(unsigned long, asRGBA); - Method0(bool, valid); - Method0(bool, isNaN); - Method0(osg::Vec4f::value_type, length); - Method0(osg::Vec4f::value_type, length2); - Method0(osg::Vec4f::value_type, normalize); + I_ReaderWriter(osgIntrospection::StdReaderWriter); // user-defined + I_Comparator(osgIntrospection::PartialOrderComparator); // user-defined + I_Constructor0(); + I_Constructor4(IN, osg::Vec4f::value_type, x, IN, osg::Vec4f::value_type, y, IN, osg::Vec4f::value_type, z, IN, osg::Vec4f::value_type, w); + I_Constructor2(IN, const osg::Vec3f &, v3, IN, osg::Vec4f::value_type, w); + I_Method0(osg::Vec4f::value_type *, ptr); + I_Method0(const osg::Vec4f::value_type *, ptr); + I_Method4(void, set, IN, osg::Vec4f::value_type, x, IN, osg::Vec4f::value_type, y, IN, osg::Vec4f::value_type, z, IN, osg::Vec4f::value_type, w); + I_Method0(osg::Vec4f::value_type &, x); + I_Method0(osg::Vec4f::value_type &, y); + I_Method0(osg::Vec4f::value_type &, z); + I_Method0(osg::Vec4f::value_type &, w); + I_Method0(osg::Vec4f::value_type, x); + I_Method0(osg::Vec4f::value_type, y); + I_Method0(osg::Vec4f::value_type, z); + I_Method0(osg::Vec4f::value_type, w); + I_Method0(osg::Vec4f::value_type &, red); + I_Method0(osg::Vec4f::value_type &, green); + I_Method0(osg::Vec4f::value_type &, blue); + I_Method0(osg::Vec4f::value_type &, alpha); + I_Method0(osg::Vec4f::value_type, red); + I_Method0(osg::Vec4f::value_type, green); + I_Method0(osg::Vec4f::value_type, blue); + I_Method0(osg::Vec4f::value_type, alpha); + I_Method0(unsigned long, asABGR); + I_Method0(unsigned long, asRGBA); + I_Method0(bool, valid); + I_Method0(bool, isNaN); + I_Method0(osg::Vec4f::value_type, length); + I_Method0(osg::Vec4f::value_type, length2); + I_Method0(osg::Vec4f::value_type, normalize); END_REFLECTOR diff --git a/src/osgWrappers/osg/VertexProgram.cpp b/src/osgWrappers/osg/VertexProgram.cpp index c41157c67..2760265f4 100644 --- a/src/osgWrappers/osg/VertexProgram.cpp +++ b/src/osgWrappers/osg/VertexProgram.cpp @@ -17,58 +17,66 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::VertexProgram::LocalParamList); TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::VertexProgram::MatrixList); BEGIN_OBJECT_REFLECTOR(osg::VertexProgram) - BaseType(osg::StateAttribute); - Constructor0(); - ConstructorWithDefaults2(IN, const osg::VertexProgram &, vp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); - Method1(GLuint &, getVertexProgramID, IN, unsigned int, contextID); - Method1(void, setVertexProgram, IN, const char *, program); - Method1(void, setVertexProgram, IN, const std::string &, program); - Method0(const std::string &, getVertexProgram); - Method2(void, setProgramLocalParameter, IN, const GLuint, index, IN, const osg::Vec4 &, p); - Method1(void, setLocalParameters, IN, const osg::VertexProgram::LocalParamList &, lpl); - Method0(osg::VertexProgram::LocalParamList &, getLocalParameters); - Method0(const osg::VertexProgram::LocalParamList &, getLocalParameters); - Method2(void, setMatrix, IN, const GLenum, mode, IN, const osg::Matrix &, matrix); - Method1(void, setMatrices, IN, const osg::VertexProgram::MatrixList &, matrices); - Method0(osg::VertexProgram::MatrixList &, getMatrices); - Method0(const osg::VertexProgram::MatrixList &, getMatrices); - Method0(void, dirtyVertexProgramObject); - Method1(void, apply, IN, osg::State &, state); - Method1(void, compileGLObjects, IN, osg::State &, state); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - Property(const osg::VertexProgram::LocalParamList &, LocalParameters); - Property(const osg::VertexProgram::MatrixList &, Matrices); - ReadOnlyProperty(osg::StateAttribute::Type, Type); - Property(const std::string &, 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) - BaseType(osg::Referenced); - Constructor1(IN, unsigned int, contextID); - Constructor1(IN, const osg::VertexProgram::Extensions &, rhs); - Method1(void, lowestCommonDenominator, IN, const osg::VertexProgram::Extensions &, rhs); - Method1(void, setupGLExtenions, IN, unsigned int, contextID); - Method1(void, setVertexProgramSupported, IN, bool, flag); - Method0(bool, isVertexProgramSupported); - Method2(void, glBindProgram, IN, GLenum, target, IN, GLuint, id); - Method2(void, glGenPrograms, IN, GLsizei, n, IN, GLuint *, programs); - Method2(void, glDeletePrograms, IN, GLsizei, n, IN, GLuint *, programs); - Method4(void, glProgramString, IN, GLenum, target, IN, GLenum, format, IN, GLsizei, len, IN, const void *, string); - Method3(void, glProgramLocalParameter4fv, IN, GLenum, target, IN, GLuint, index, IN, const GLfloat *, params); - WriteOnlyProperty(bool, VertexProgramSupported); - WriteOnlyProperty(unsigned int, upGLExtenions); + 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_WriteOnlyProperty(bool, VertexProgramSupported); + I_WriteOnlyProperty(unsigned int, upGLExtenions); END_REFLECTOR diff --git a/src/osgWrappers/osg/Viewport.cpp b/src/osgWrappers/osg/Viewport.cpp index 0a4c22098..6ea08d60f 100644 --- a/src/osgWrappers/osg/Viewport.cpp +++ b/src/osgWrappers/osg/Viewport.cpp @@ -16,28 +16,36 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osg::Viewport) - BaseType(osg::StateAttribute); - Constructor0(); - Constructor4(IN, int, x, IN, int, y, IN, int, width, IN, int, height); - ConstructorWithDefaults2(IN, const osg::Viewport &, vp, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method4(void, setViewport, IN, int, x, IN, int, y, IN, int, width, IN, int, height); - Method4(void, getViewport, IN, int &, x, IN, int &, y, IN, int &, width, IN, int &, height); - Method0(int, x); - Method0(int, y); - Method0(int, width); - Method0(int, height); - Method0(bool, valid); - Method0(float, aspectRatio); - Method0(const osg::Matrix, computeWindowMatrix); - Method1(void, apply, IN, osg::State &, state); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_Constructor4(IN, int, x, IN, int, y, IN, int, width, IN, int, height); + I_ConstructorWithDefaults2(IN, const osg::Viewport &, 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_Method4(void, setViewport, IN, int, x, IN, int, y, IN, int, width, IN, int, height); + I_Method4(void, getViewport, IN, int &, x, IN, int &, y, IN, int &, width, IN, int &, height); + I_Method0(int, x); + I_Method0(int, y); + I_Method0(int, width); + I_Method0(int, height); + I_Method0(bool, valid); + I_Method0(float, aspectRatio); + I_Method0(const osg::Matrix, computeWindowMatrix); + I_Method1(void, apply, IN, osg::State &, state); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/Archive.cpp b/src/osgWrappers/osgDB/Archive.cpp index 3db199185..c013c63eb 100644 --- a/src/osgWrappers/osgDB/Archive.cpp +++ b/src/osgWrappers/osgDB/Archive.cpp @@ -16,26 +16,34 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::Archive::FileNameList); BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Archive) - BaseType(osgDB::ReaderWriter); - Constructor0(); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, acceptsExtension, IN, const std::string &, x); - Method0(void, close); - Method1(bool, fileExists, IN, const std::string &, filename); - Method0(std::string, getMasterFileName); - Method1(bool, getFileNames, IN, osgDB::Archive::FileNameList &, fileNameList); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readImage, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - ReadOnlyProperty(std::string, MasterFileName); + I_BaseType(osgDB::ReaderWriter); + I_Constructor0(); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, acceptsExtension, IN, const std::string &, x); + I_Method0(void, close); + I_Method1(bool, fileExists, IN, const std::string &, filename); + I_Method0(std::string, getMasterFileName); + I_Method1(bool, getFileNames, IN, osgDB::Archive::FileNameList &, fileNameList); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readImage, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_ReadOnlyProperty(std::string, MasterFileName); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index dbec10306..3850654aa 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -17,16 +17,26 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgDB::Block) - BaseType(osg::Referenced); - Constructor0(); - Method0(void, block); - Method0(void, release); - Method0(void, reset); - Method1(void, set, IN, bool, doRelease); - WriteOnlyProperty(bool, ); + I_BaseType(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 +TYPE_NAME_ALIAS(OpenThreads::Thread::ThreadPriority, osgDB::DatabasePager::ThreadPriority); + TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::PagedLOD > >, osgDB::DatabasePager::PagedLODList); TYPE_NAME_ALIAS(std::set< osg::ref_ptr< osg::StateSet > >, osgDB::DatabasePager::StateSetList); @@ -40,83 +50,83 @@ TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgDB::DatabasePager::DataToCompil TYPE_NAME_ALIAS(std::set< unsigned int >, osgDB::DatabasePager::ActiveGraphicsContexts); BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) - BaseType(osg::NodeVisitor::DatabaseRequestHandler); - Constructor0(); - Method4(void, requestNodeFile, IN, const std::string &, fileName, IN, osg::Group *, group, IN, float, priority, IN, const osg::FrameStamp *, framestamp); - Method0(void, run); - Method0(int, cancel); - Method0(void, clear); - Method1(void, setDatabasePagerThreadPause, IN, bool, pause); - Method0(bool, getDatabasePagerThreadPause); - Method1(void, setAcceptNewDatabaseRequests, IN, bool, acceptNewRequests); - Method0(bool, getAcceptNewDatabaseRequests); - Method1(void, setUseFrameBlock, IN, bool, useFrameBlock); - Method0(bool, getUseFrameBlock); - Method0(osgDB::Block *, getFrameBlock); - Method1(void, setThreadPriorityDuringFrame, IN, ThreadPriority, duringFrame); - Method0(ThreadPriority, getThreadPriorityDuringFrame); - Method1(void, setThreadPriorityOutwithFrame, IN, ThreadPriority, outwithFrame); - Method0(ThreadPriority, getThreadPriorityOutwithFrame); - Method0(int, getNumFramesActive); - Method1(void, signalBeginFrame, IN, const osg::FrameStamp *, framestamp); - Method0(void, signalEndFrame); - Method1(void, registerPagedLODs, IN, osg::Node *, subgraph); - Method1(void, setTargetFrameRate, IN, double, tfr); - Method0(double, getTargetFrameRate); - Method1(void, setMinimumTimeAvailableForGLCompileAndDeletePerFrame, IN, double, ta); - Method0(double, getMinimumTimeAvailableForGLCompileAndDeletePerFrame); - Method1(void, setMaximumNumOfObjectsToCompilePerFrame, IN, unsigned int, num); - Method0(unsigned int, getMaximumNumOfObjectsToCompilePerFrame); - Method1(void, setExpiryDelay, IN, double, expiryDelay); - Method0(double, getExpiryDelay); - Method1(void, setDeleteRemovedSubgraphsInDatabaseThread, IN, bool, flag); - Method0(bool, getDeleteRemovedSubgraphsInDatabaseThread); - Method2(void, setUnrefImageDataAfterApplyPolicy, IN, bool, changeAutoUnRef, IN, bool, valueAutoUnRef); - Method2(void, getUnrefImageDataAfterApplyPolicy, IN, bool &, changeAutoUnRef, IN, bool &, valueAutoUnRef); - Method2(void, setMaxAnisotropyPolicy, IN, bool, changeAnisotropy, IN, float, valueAnisotropy); - Method2(void, getMaxAnisotropyPolicy, IN, bool &, changeAnisotropy, IN, float &, valueAnisotropy); - Method0(bool, requiresUpdateSceneGraph); - Method1(void, updateSceneGraph, IN, double, currentFrameTime); - Method2(void, setCompileGLObjectsForContextID, IN, unsigned int, contextID, IN, bool, on); - Method1(bool, getCompileGLObjectsForContextID, IN, unsigned int, contextID); - Method0(bool, requiresCompileGLObjects); - Method2(void, compileGLObjects, IN, osg::State &, state, IN, double &, availableTime); - Property(bool, AcceptNewDatabaseRequests); - IndexedProperty1(bool, CompileGLObjectsForContextID, unsigned int, contextID); - Property(bool, DatabasePagerThreadPause); - Property(bool, DeleteRemovedSubgraphsInDatabaseThread); - Property(double, ExpiryDelay); - ReadOnlyProperty(osgDB::Block *, FrameBlock); - Property(unsigned int, MaximumNumOfObjectsToCompilePerFrame); - Property(double, MinimumTimeAvailableForGLCompileAndDeletePerFrame); - Property(double, TargetFrameRate); - Property(ThreadPriority, ThreadPriorityDuringFrame); - Property(ThreadPriority, ThreadPriorityOutwithFrame); - Property(bool, UseFrameBlock); + I_BaseType(osg::NodeVisitor::DatabaseRequestHandler); + I_Constructor0(); + I_Method4(void, requestNodeFile, IN, const std::string &, fileName, IN, osg::Group *, group, IN, float, priority, IN, const osg::FrameStamp *, framestamp); + I_Method0(void, run); + I_Method0(int, cancel); + I_Method0(void, clear); + I_Method1(void, setDatabasePagerThreadPause, IN, bool, pause); + I_Method0(bool, getDatabasePagerThreadPause); + I_Method1(void, setAcceptNewDatabaseRequests, IN, bool, acceptNewRequests); + I_Method0(bool, getAcceptNewDatabaseRequests); + I_Method1(void, setUseFrameBlock, IN, bool, useFrameBlock); + I_Method0(bool, getUseFrameBlock); + I_Method0(osgDB::Block *, getFrameBlock); + I_Method1(void, setThreadPriorityDuringFrame, IN, osgDB::DatabasePager::ThreadPriority, duringFrame); + I_Method0(osgDB::DatabasePager::ThreadPriority, getThreadPriorityDuringFrame); + I_Method1(void, setThreadPriorityOutwithFrame, IN, osgDB::DatabasePager::ThreadPriority, outwithFrame); + I_Method0(osgDB::DatabasePager::ThreadPriority, getThreadPriorityOutwithFrame); + I_Method0(int, getNumFramesActive); + I_Method1(void, signalBeginFrame, IN, const osg::FrameStamp *, framestamp); + I_Method0(void, signalEndFrame); + I_Method1(void, registerPagedLODs, IN, osg::Node *, subgraph); + I_Method1(void, setTargetFrameRate, IN, double, tfr); + I_Method0(double, getTargetFrameRate); + I_Method1(void, setMinimumTimeAvailableForGLCompileAndDeletePerFrame, IN, double, ta); + I_Method0(double, getMinimumTimeAvailableForGLCompileAndDeletePerFrame); + I_Method1(void, setMaximumNumOfObjectsToCompilePerFrame, IN, unsigned int, num); + I_Method0(unsigned int, getMaximumNumOfObjectsToCompilePerFrame); + I_Method1(void, setExpiryDelay, IN, double, expiryDelay); + I_Method0(double, getExpiryDelay); + I_Method1(void, setDeleteRemovedSubgraphsInDatabaseThread, IN, bool, flag); + I_Method0(bool, getDeleteRemovedSubgraphsInDatabaseThread); + I_Method2(void, setUnrefImageDataAfterApplyPolicy, IN, bool, changeAutoUnRef, IN, bool, valueAutoUnRef); + I_Method2(void, getUnrefImageDataAfterApplyPolicy, IN, bool &, changeAutoUnRef, IN, bool &, valueAutoUnRef); + I_Method2(void, setMaxAnisotropyPolicy, IN, bool, changeAnisotropy, IN, float, valueAnisotropy); + I_Method2(void, getMaxAnisotropyPolicy, IN, bool &, changeAnisotropy, IN, float &, valueAnisotropy); + I_Method0(bool, requiresUpdateSceneGraph); + I_Method1(void, updateSceneGraph, IN, double, currentFrameTime); + I_Method2(void, setCompileGLObjectsForContextID, IN, unsigned int, contextID, IN, bool, on); + I_Method1(bool, getCompileGLObjectsForContextID, IN, unsigned int, contextID); + I_Method0(bool, requiresCompileGLObjects); + I_Method2(void, compileGLObjects, IN, osg::State &, state, IN, double &, availableTime); + I_Property(bool, AcceptNewDatabaseRequests); + I_IndexedProperty1(bool, CompileGLObjectsForContextID, unsigned int, contextID); + I_Property(bool, DatabasePagerThreadPause); + I_Property(bool, DeleteRemovedSubgraphsInDatabaseThread); + I_Property(double, ExpiryDelay); + I_ReadOnlyProperty(osgDB::Block *, FrameBlock); + I_Property(unsigned int, MaximumNumOfObjectsToCompilePerFrame); + I_Property(double, MinimumTimeAvailableForGLCompileAndDeletePerFrame); + I_Property(double, TargetFrameRate); + I_Property(osgDB::DatabasePager::ThreadPriority, ThreadPriorityDuringFrame); + I_Property(osgDB::DatabasePager::ThreadPriority, ThreadPriorityOutwithFrame); + I_Property(bool, UseFrameBlock); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PagedLOD >) - Constructor0(); - Constructor1(IN, osg::PagedLOD *, t); - Constructor1(IN, const osg::ref_ptr< osg::PagedLOD > &, rp); - Method0(bool, valid); - Method0(osg::PagedLOD *, get); - Method0(const osg::PagedLOD *, get); - Method0(osg::PagedLOD *, take); - Method0(osg::PagedLOD *, release); - ReadOnlyProperty(osg::PagedLOD *, ); + I_Constructor0(); + I_Constructor1(IN, osg::PagedLOD *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::PagedLOD > &, rp); + I_Method0(bool, valid); + I_Method0(osg::PagedLOD *, get); + I_Method0(const osg::PagedLOD *, get); + I_Method0(osg::PagedLOD *, take); + I_Method0(osg::PagedLOD *, release); + I_ReadOnlyProperty(osg::PagedLOD *, ); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::StateSet >) - Constructor0(); - Constructor1(IN, osg::StateSet *, t); - Constructor1(IN, const osg::ref_ptr< osg::StateSet > &, rp); - Method0(bool, valid); - Method0(osg::StateSet *, get); - Method0(const osg::StateSet *, get); - Method0(osg::StateSet *, take); - Method0(osg::StateSet *, release); - ReadOnlyProperty(osg::StateSet *, ); + I_Constructor0(); + I_Constructor1(IN, osg::StateSet *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::StateSet > &, rp); + I_Method0(bool, valid); + I_Method0(osg::StateSet *, get); + I_Method0(const osg::StateSet *, get); + I_Method0(osg::StateSet *, take); + I_Method0(osg::StateSet *, release); + I_ReadOnlyProperty(osg::StateSet *, ); END_REFLECTOR STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::PagedLOD > >); diff --git a/src/osgWrappers/osgDB/DotOsgWrapper.cpp b/src/osgWrappers/osgDB/DotOsgWrapper.cpp index 57e1925fd..aaf9234ca 100644 --- a/src/osgWrappers/osgDB/DotOsgWrapper.cpp +++ b/src/osgWrappers/osgDB/DotOsgWrapper.cpp @@ -12,31 +12,39 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::DotOsgWrapper::Associates); -TYPE_NAME_ALIAS(bool(*, osgDB::DotOsgWrapper::ReadFunc); - -TYPE_NAME_ALIAS(bool(*, osgDB::DotOsgWrapper::WriteFunc); - +TYPE_NAME_ALIAS(bool (*)(osg::Object&,osgDB::Input&), osgDB::DotOsgWrapper::ReadFunc); + +TYPE_NAME_ALIAS(bool (*)(const osg::Object&,osgDB::Output&), osgDB::DotOsgWrapper::WriteFunc); + BEGIN_ENUM_REFLECTOR(osgDB::DotOsgWrapper::ReadWriteMode) - EnumLabel(osgDB::DotOsgWrapper::READ_AND_WRITE); - EnumLabel(osgDB::DotOsgWrapper::READ_ONLY); + I_EnumLabel(osgDB::DotOsgWrapper::READ_AND_WRITE); + I_EnumLabel(osgDB::DotOsgWrapper::READ_ONLY); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgDB::DotOsgWrapper) - BaseType(osg::Referenced); - ConstructorWithDefaults6(IN, osg::Object *, proto, , IN, const std::string &, name, , IN, const std::string &, associates, , IN, osgDB::DotOsgWrapper::ReadFunc, readFunc, , IN, osgDB::DotOsgWrapper::WriteFunc, writeFunc, , IN, osgDB::DotOsgWrapper::ReadWriteMode, readWriteMode, osgDB::DotOsgWrapper::READ_AND_WRITE); - Method0(const osg::Object *, getPrototype); - Method0(const std::string &, getName); - Method0(const osgDB::DotOsgWrapper::Associates &, getAssociates); - Method0(osgDB::DotOsgWrapper::ReadFunc, getReadFunc); - Method0(osgDB::DotOsgWrapper::WriteFunc, getWriteFunc); - Method0(osgDB::DotOsgWrapper::ReadWriteMode, getReadWriteMode); - ReadOnlyProperty(const osgDB::DotOsgWrapper::Associates &, Associates); - ReadOnlyProperty(const std::string &, Name); - ReadOnlyProperty(const osg::Object *, Prototype); - ReadOnlyProperty(osgDB::DotOsgWrapper::ReadFunc, ReadFunc); - ReadOnlyProperty(osgDB::DotOsgWrapper::ReadWriteMode, ReadWriteMode); - ReadOnlyProperty(osgDB::DotOsgWrapper::WriteFunc, WriteFunc); + I_BaseType(osg::Referenced); + I_ConstructorWithDefaults6(IN, osg::Object *, proto, , IN, const std::string &, name, , IN, const std::string &, associates, , IN, osgDB::DotOsgWrapper::ReadFunc, readFunc, , IN, osgDB::DotOsgWrapper::WriteFunc, writeFunc, , IN, osgDB::DotOsgWrapper::ReadWriteMode, readWriteMode, osgDB::DotOsgWrapper::READ_AND_WRITE); + I_Method0(const osg::Object *, getPrototype); + I_Method0(const std::string &, getName); + I_Method0(const osgDB::DotOsgWrapper::Associates &, getAssociates); + I_Method0(osgDB::DotOsgWrapper::ReadFunc, getReadFunc); + I_Method0(osgDB::DotOsgWrapper::WriteFunc, getWriteFunc); + I_Method0(osgDB::DotOsgWrapper::ReadWriteMode, getReadWriteMode); + I_ReadOnlyProperty(const osgDB::DotOsgWrapper::Associates &, Associates); + I_ReadOnlyProperty(const std::string &, Name); + I_ReadOnlyProperty(const osg::Object *, Prototype); + I_ReadOnlyProperty(osgDB::DotOsgWrapper::ReadFunc, ReadFunc); + I_ReadOnlyProperty(osgDB::DotOsgWrapper::ReadWriteMode, ReadWriteMode); + I_ReadOnlyProperty(osgDB::DotOsgWrapper::WriteFunc, WriteFunc); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/DynamicLibrary.cpp b/src/osgWrappers/osgDB/DynamicLibrary.cpp index da47f6b65..7897d1a30 100644 --- a/src/osgWrappers/osgDB/DynamicLibrary.cpp +++ b/src/osgWrappers/osgDB/DynamicLibrary.cpp @@ -11,18 +11,26 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::HANDLE); TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::PROC_ADDRESS); BEGIN_OBJECT_REFLECTOR(osgDB::DynamicLibrary) - BaseType(osg::Referenced); - Method0(const std::string &, getName); - Method0(const std::string &, getFullName); - Method0(osgDB::DynamicLibrary::HANDLE, getHandle); - Method1(osgDB::DynamicLibrary::PROC_ADDRESS, getProcAddress, IN, const std::string &, procName); - ReadOnlyProperty(const std::string &, FullName); - ReadOnlyProperty(osgDB::DynamicLibrary::HANDLE, Handle); - ReadOnlyProperty(const std::string &, Name); + I_BaseType(osg::Referenced); + I_Method0(const std::string &, getName); + I_Method0(const std::string &, getFullName); + I_Method0(osgDB::DynamicLibrary::HANDLE, getHandle); + I_Method1(osgDB::DynamicLibrary::PROC_ADDRESS, getProcAddress, IN, const std::string &, procName); + I_ReadOnlyProperty(const std::string &, FullName); + I_ReadOnlyProperty(osgDB::DynamicLibrary::HANDLE, Handle); + I_ReadOnlyProperty(const std::string &, Name); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/Field.cpp b/src/osgWrappers/osgDB/Field.cpp index ba8289132..ff79b8975 100644 --- a/src/osgWrappers/osgDB/Field.cpp +++ b/src/osgWrappers/osgDB/Field.cpp @@ -11,58 +11,62 @@ #include -BEGIN_ENUM_REFLECTOR(osgDB::Field::@2) - EnumLabel(osgDB::Field::MIN_CACHE_SIZE); -END_REFLECTOR +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif BEGIN_ENUM_REFLECTOR(osgDB::Field::FieldType) - EnumLabel(osgDB::Field::OPEN_BRACKET); - EnumLabel(osgDB::Field::CLOSE_BRACKET); - EnumLabel(osgDB::Field::STRING); - EnumLabel(osgDB::Field::WORD); - EnumLabel(osgDB::Field::REAL); - EnumLabel(osgDB::Field::INTEGER); - EnumLabel(osgDB::Field::BLANK); - EnumLabel(osgDB::Field::UNINITIALISED); + I_EnumLabel(osgDB::Field::OPEN_BRACKET); + I_EnumLabel(osgDB::Field::CLOSE_BRACKET); + I_EnumLabel(osgDB::Field::STRING); + I_EnumLabel(osgDB::Field::WORD); + I_EnumLabel(osgDB::Field::REAL); + I_EnumLabel(osgDB::Field::INTEGER); + I_EnumLabel(osgDB::Field::BLANK); + I_EnumLabel(osgDB::Field::UNINITIALISED); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgDB::Field) - Constructor0(); - Constructor1(IN, const osgDB::Field &, field); - Method0(void, reset); - Method1(void, addChar, IN, char, c); - Method0(int, getNoCharacters); - MethodWithDefaults1(void, setWithinQuotes, IN, bool, withinQuotes, true); - Method0(bool, getWithinQuotes); - Method1(void, setNoNestedBrackets, IN, int, no); - Method0(int, getNoNestedBrackets); - Method0(osgDB::Field::FieldType, getFieldType); - Method0(bool, isValid); - Method0(bool, isOpenBracket); - Method0(bool, isCloseBracket); - Method0(bool, isWord); - Method1(bool, matchWord, IN, const char *, str); - Method2(bool, matchWord, IN, const char *, str, IN, int, noCharacters); - Method0(bool, isString); - Method1(bool, matchString, IN, const char *, str); - Method2(bool, matchString, IN, const char *, str, IN, int, noCharacters); - Method0(bool, isQuotedString); - Method0(const char *, getStr); - Method0(char *, takeStr); - Method0(bool, isInt); - Method1(bool, matchInt, IN, int, i); - Method1(bool, getInt, IN, int &, i); - Method0(bool, isUInt); - Method1(bool, matchUInt, IN, unsigned int, i); - Method1(bool, getUInt, IN, unsigned int &, i); - Method0(bool, isFloat); - Method1(bool, matchFloat, IN, float, f); - Method1(bool, getFloat, IN, float &, f); - Method1(bool, getFloat, IN, double &, f); - ReadOnlyProperty(osgDB::Field::FieldType, FieldType); - ReadOnlyProperty(int, NoCharacters); - Property(int, NoNestedBrackets); - ReadOnlyProperty(const char *, Str); - Property(bool, WithinQuotes); + I_Constructor0(); + I_Constructor1(IN, const osgDB::Field &, field); + I_Method0(void, reset); + I_Method1(void, addChar, IN, char, c); + I_Method0(int, getNoCharacters); + I_MethodWithDefaults1(void, setWithinQuotes, IN, bool, withinQuotes, true); + I_Method0(bool, getWithinQuotes); + I_Method1(void, setNoNestedBrackets, IN, int, no); + I_Method0(int, getNoNestedBrackets); + I_Method0(osgDB::Field::FieldType, getFieldType); + I_Method0(bool, isValid); + I_Method0(bool, isOpenBracket); + I_Method0(bool, isCloseBracket); + I_Method0(bool, isWord); + I_Method1(bool, matchWord, IN, const char *, str); + I_Method2(bool, matchWord, IN, const char *, str, IN, int, noCharacters); + I_Method0(bool, isString); + I_Method1(bool, matchString, IN, const char *, str); + I_Method2(bool, matchString, IN, const char *, str, IN, int, noCharacters); + I_Method0(bool, isQuotedString); + I_Method0(const char *, getStr); + I_Method0(char *, takeStr); + I_Method0(bool, isInt); + I_Method1(bool, matchInt, IN, int, i); + I_Method1(bool, getInt, IN, int &, i); + I_Method0(bool, isUInt); + I_Method1(bool, matchUInt, IN, unsigned int, i); + I_Method1(bool, getUInt, IN, unsigned int &, i); + I_Method0(bool, isFloat); + I_Method1(bool, matchFloat, IN, float, f); + I_Method1(bool, getFloat, IN, float &, f); + I_Method1(bool, getFloat, IN, double &, f); + I_ReadOnlyProperty(osgDB::Field::FieldType, FieldType); + I_ReadOnlyProperty(int, NoCharacters); + I_Property(int, NoNestedBrackets); + I_ReadOnlyProperty(const char *, Str); + I_Property(bool, WithinQuotes); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/FieldReader.cpp b/src/osgWrappers/osgDB/FieldReader.cpp index 89a68256a..0f4f97d30 100644 --- a/src/osgWrappers/osgDB/FieldReader.cpp +++ b/src/osgWrappers/osgDB/FieldReader.cpp @@ -12,15 +12,23 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osgDB::FieldReader) - Constructor0(); - Constructor1(IN, const osgDB::FieldReader &, ic); - Method1(void, attach, IN, std::istream *, input); - Method0(void, detach); - Method0(bool, eof); - Method1(bool, readField, IN, osgDB::Field &, fieldPtr); - Method0(void, ignoreField); - Method0(int, getNoNestedBrackets); - ReadOnlyProperty(int, NoNestedBrackets); + I_Constructor0(); + I_Constructor1(IN, const osgDB::FieldReader &, ic); + I_Method1(void, attach, IN, std::istream *, input); + I_Method0(void, detach); + I_Method0(bool, eof); + I_Method1(bool, readField, IN, osgDB::Field &, fieldPtr); + I_Method0(void, ignoreField); + I_Method0(int, getNoNestedBrackets); + I_ReadOnlyProperty(int, NoNestedBrackets); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/FieldReaderIterator.cpp b/src/osgWrappers/osgDB/FieldReaderIterator.cpp index 1419b0ee4..1536df238 100644 --- a/src/osgWrappers/osgDB/FieldReaderIterator.cpp +++ b/src/osgWrappers/osgDB/FieldReaderIterator.cpp @@ -19,44 +19,48 @@ #include #include -BEGIN_ENUM_REFLECTOR(osgDB::FieldReaderIterator::@3) - EnumLabel(osgDB::FieldReaderIterator::MINIMUM_FIELD_READER_QUEUE_SIZE); -END_REFLECTOR +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif BEGIN_VALUE_REFLECTOR(osgDB::FieldReaderIterator) - Constructor0(); - Constructor1(IN, const osgDB::FieldReaderIterator &, ic); - Method1(void, attach, IN, std::istream *, input); - Method0(void, detach); - Method0(bool, eof); - Method0(osgDB::FieldReader &, getFieldReader); - Method2(void, insert, IN, int, pos, IN, osgDB::Field *, field); - Method2(void, insert, IN, int, pos, IN, const char *, str); - Method1(osgDB::Field &, field, IN, int, pos); - Method0(void, advanceOverCurrentFieldOrBlock); - Method0(void, advanceToEndOfCurrentBlock); - Method1(void, advanceToEndOfBlock, IN, int, noNestBrackets); - Method1(bool, matchSequence, IN, const char *, str); - Method2(bool, readSequence, IN, const char *, keyword, IN, std::string &, value); - Method2(bool, readSequence, IN, const char *, keyword, IN, unsigned int &, value); - Method2(bool, readSequence, IN, const char *, keyword, IN, int &, value); - Method2(bool, readSequence, IN, const char *, keyword, IN, float &, value); - Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec2f &, value); - Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec3f &, value); - Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec4f &, value); - Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec2d &, value); - Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec3d &, value); - Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec4d &, value); - Method1(bool, readSequence, IN, std::string &, value); - Method1(bool, readSequence, IN, unsigned int &, value); - Method1(bool, readSequence, IN, int &, value); - Method1(bool, readSequence, IN, float &, value); - Method1(bool, readSequence, IN, osg::Vec2f &, value); - Method1(bool, readSequence, IN, osg::Vec3f &, value); - Method1(bool, readSequence, IN, osg::Vec4f &, value); - Method1(bool, readSequence, IN, osg::Vec2d &, value); - Method1(bool, readSequence, IN, osg::Vec3d &, value); - Method1(bool, readSequence, IN, osg::Vec4d &, value); - ReadOnlyProperty(osgDB::FieldReader &, FieldReader); + I_Constructor0(); + I_Constructor1(IN, const osgDB::FieldReaderIterator &, ic); + I_Method1(void, attach, IN, std::istream *, input); + I_Method0(void, detach); + I_Method0(bool, eof); + I_Method0(osgDB::FieldReader &, getFieldReader); + I_Method2(void, insert, IN, int, pos, IN, osgDB::Field *, field); + I_Method2(void, insert, IN, int, pos, IN, const char *, str); + I_Method1(osgDB::Field &, field, IN, int, pos); + I_Method0(void, advanceOverCurrentFieldOrBlock); + I_Method0(void, advanceToEndOfCurrentBlock); + I_Method1(void, advanceToEndOfBlock, IN, int, noNestBrackets); + I_Method1(bool, matchSequence, IN, const char *, str); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, std::string &, value); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, unsigned int &, value); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, int &, value); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, float &, value); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec2f &, value); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec3f &, value); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec4f &, value); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec2d &, value); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec3d &, value); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec4d &, value); + I_Method1(bool, readSequence, IN, std::string &, value); + I_Method1(bool, readSequence, IN, unsigned int &, value); + I_Method1(bool, readSequence, IN, int &, value); + I_Method1(bool, readSequence, IN, float &, value); + I_Method1(bool, readSequence, IN, osg::Vec2f &, value); + I_Method1(bool, readSequence, IN, osg::Vec3f &, value); + I_Method1(bool, readSequence, IN, osg::Vec4f &, value); + I_Method1(bool, readSequence, IN, osg::Vec2d &, value); + I_Method1(bool, readSequence, IN, osg::Vec3d &, value); + I_Method1(bool, readSequence, IN, osg::Vec4d &, value); + I_ReadOnlyProperty(osgDB::FieldReader &, FieldReader); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/FileUtils.cpp b/src/osgWrappers/osgDB/FileUtils.cpp index 17f5570ea..a6fc93e81 100644 --- a/src/osgWrappers/osgDB/FileUtils.cpp +++ b/src/osgWrappers/osgDB/FileUtils.cpp @@ -11,5 +11,24 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::DirectoryContents); +BEGIN_ENUM_REFLECTOR(osgDB::CaseSensitivity) + I_EnumLabel(osgDB::CASE_SENSITIVE); + I_EnumLabel(osgDB::CASE_INSENSITIVE); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osgDB::FileType) + I_EnumLabel(osgDB::FILE_NOT_FOUND); + I_EnumLabel(osgDB::REGULAR_FILE); + I_EnumLabel(osgDB::DIRECTORY); +END_REFLECTOR + diff --git a/src/osgWrappers/osgDB/ImageOptions.cpp b/src/osgWrappers/osgDB/ImageOptions.cpp index 0ebd775eb..a632576a7 100644 --- a/src/osgWrappers/osgDB/ImageOptions.cpp +++ b/src/osgWrappers/osgDB/ImageOptions.cpp @@ -13,44 +13,52 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgDB::ImageOptions::ImageWindowMode) - EnumLabel(osgDB::ImageOptions::ALL_IMAGE); - EnumLabel(osgDB::ImageOptions::RATIO_WINDOW); - EnumLabel(osgDB::ImageOptions::PIXEL_WINDOW); + I_EnumLabel(osgDB::ImageOptions::ALL_IMAGE); + I_EnumLabel(osgDB::ImageOptions::RATIO_WINDOW); + I_EnumLabel(osgDB::ImageOptions::PIXEL_WINDOW); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgDB::ImageOptions::ImageSamplingMode) - EnumLabel(osgDB::ImageOptions::NEAREST); - EnumLabel(osgDB::ImageOptions::LINEAR); - EnumLabel(osgDB::ImageOptions::CUBIC); + I_EnumLabel(osgDB::ImageOptions::NEAREST); + I_EnumLabel(osgDB::ImageOptions::LINEAR); + I_EnumLabel(osgDB::ImageOptions::CUBIC); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgDB::ImageOptions) - BaseType(osgDB::ReaderWriter::Options); - Constructor0(); - Constructor1(IN, const std::string &, str); - ConstructorWithDefaults2(IN, const osgDB::ImageOptions &, options, , IN, const osg::CopyOp, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(void, init); +BEGIN_OBJECT_REFLECTOR(osgDB::ImageOptions) + I_BaseType(osgDB::ReaderWriter::Options); + I_Constructor0(); + I_Constructor1(IN, const std::string &, str); + I_ConstructorWithDefaults2(IN, const osgDB::ImageOptions &, options, , 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(void, init); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgDB::ImageOptions::PixelWindow) - Constructor0(); - Method4(void, set, IN, unsigned int, x, IN, unsigned int, y, IN, unsigned int, w, IN, unsigned int, h); + I_Constructor0(); + I_Method4(void, set, IN, unsigned int, x, IN, unsigned int, y, IN, unsigned int, w, IN, unsigned int, h); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgDB::ImageOptions::RatioWindow) - Constructor0(); - Method4(void, set, IN, double, x, IN, double, y, IN, double, w, IN, double, h); + I_Constructor0(); + I_Method4(void, set, IN, double, x, IN, double, y, IN, double, w, IN, double, h); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgDB::ImageOptions::TexCoordRange) - BaseType(osg::Referenced); - Constructor0(); - Method4(void, set, IN, double, x, IN, double, y, IN, double, w, IN, double, h); +BEGIN_OBJECT_REFLECTOR(osgDB::ImageOptions::TexCoordRange) + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method4(void, set, IN, double, x, IN, double, y, IN, double, w, IN, double, h); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/Input.cpp b/src/osgWrappers/osgDB/Input.cpp index 2ca404e5c..4a2f25c5c 100644 --- a/src/osgWrappers/osgDB/Input.cpp +++ b/src/osgWrappers/osgDB/Input.cpp @@ -19,24 +19,32 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgDB::Input) - BaseType(osgDB::FieldReaderIterator); - Constructor0(); - Method1(void, setOptions, IN, const osgDB::ReaderWriter::Options *, options); - Method0(const osgDB::ReaderWriter::Options *, getOptions); - Method1(osg::Object *, readObjectOfType, IN, const osg::Object &, compObj); - Method1(osg::Object *, readObjectOfType, IN, const osgDB::basic_type_wrapper &, btw); - Method0(osg::Object *, readObject); - Method0(osg::Image *, readImage); - Method0(osg::Drawable *, readDrawable); - Method0(osg::StateAttribute *, readStateAttribute); - Method0(osg::Uniform *, readUniform); - Method0(osg::Node *, readNode); - Method1(osg::Object *, readObject, IN, const std::string &, fileName); - Method1(osg::Image *, readImage, IN, const std::string &, fileName); - Method1(osg::Node *, readNode, IN, const std::string &, fileName); - Method1(osg::Object *, getObjectForUniqueID, IN, const std::string &, uniqueID); - Method2(void, regisiterUniqueIDForObject, IN, const std::string &, uniqueID, IN, osg::Object *, obj); - Property(const osgDB::ReaderWriter::Options *, Options); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgDB::Input) + I_BaseType(osgDB::FieldReaderIterator); + I_Constructor0(); + I_Method1(void, setOptions, IN, const osgDB::ReaderWriter::Options *, options); + I_Method0(const osgDB::ReaderWriter::Options *, getOptions); + I_Method1(osg::Object *, readObjectOfType, IN, const osg::Object &, compObj); + I_Method1(osg::Object *, readObjectOfType, IN, const osgDB::basic_type_wrapper &, btw); + I_Method0(osg::Object *, readObject); + I_Method0(osg::Image *, readImage); + I_Method0(osg::Drawable *, readDrawable); + I_Method0(osg::StateAttribute *, readStateAttribute); + I_Method0(osg::Uniform *, readUniform); + I_Method0(osg::Node *, readNode); + I_Method1(osg::Object *, readObject, IN, const std::string &, fileName); + I_Method1(osg::Image *, readImage, IN, const std::string &, fileName); + I_Method1(osg::Node *, readNode, IN, const std::string &, fileName); + I_Method1(osg::Object *, getObjectForUniqueID, IN, const std::string &, uniqueID); + I_Method2(void, regisiterUniqueIDForObject, IN, const std::string &, uniqueID, IN, osg::Object *, obj); + I_Property(const osgDB::ReaderWriter::Options *, Options); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/Output.cpp b/src/osgWrappers/osgDB/Output.cpp index 58aec5fb9..2a3945fc3 100644 --- a/src/osgWrappers/osgDB/Output.cpp +++ b/src/osgWrappers/osgDB/Output.cpp @@ -12,39 +12,18 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgDB::Output::PathNameHint) - EnumLabel(osgDB::Output::AS_IS); - EnumLabel(osgDB::Output::FULL_PATH); - EnumLabel(osgDB::Output::RELATIVE_PATH); - EnumLabel(osgDB::Output::FILENAME_ONLY); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osgDB::Output) - Constructor0(); - Constructor1(IN, const char *, name); - Method1(void, open, IN, const char *, name); - Method0(osgDB::Output &, indent); - Method1(std::string, wrapString, IN, const std::string &, str); - Method1(void, setIndentStep, IN, int, step); - Method0(int, getIndentStep); - Method1(void, setIndent, IN, int, indent); - Method0(int, getIndent); - Method1(void, setNumIndicesPerLine, IN, int, num); - Method0(int, getNumIndicesPerLine); - Method0(void, moveIn); - Method0(void, moveOut); - Method1(bool, writeObject, IN, const osg::Object &, obj); - Method2(bool, getUniqueIDForObject, IN, const osg::Object *, obj, IN, std::string &, uniqueID); - Method2(bool, createUniqueIDForObject, IN, const osg::Object *, obj, IN, std::string &, uniqueID); - Method2(bool, registerUniqueIDForObject, IN, const osg::Object *, obj, IN, std::string &, uniqueID); - Method1(void, setPathNameHint, IN, const osgDB::Output::PathNameHint, pnh); - Method0(osgDB::Output::PathNameHint, getPathNameHint); - Method1(std::string, getFileNameForOutput, IN, const std::string &, filename); - Method0(const std::string &, getFileName); - ReadOnlyProperty(const std::string &, FileName); - Property(int, Indent); - Property(int, IndentStep); - WriteOnlyProperty(int, NumIndicesPerLine); - ReadOnlyProperty(osgDB::Output::PathNameHint, PathNameHint); + I_EnumLabel(osgDB::Output::AS_IS); + I_EnumLabel(osgDB::Output::FULL_PATH); + I_EnumLabel(osgDB::Output::RELATIVE_PATH); + I_EnumLabel(osgDB::Output::FILENAME_ONLY); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/ParameterOutput.cpp b/src/osgWrappers/osgDB/ParameterOutput.cpp index 1af7e0b4a..cd02ef23f 100644 --- a/src/osgWrappers/osgDB/ParameterOutput.cpp +++ b/src/osgWrappers/osgDB/ParameterOutput.cpp @@ -12,11 +12,19 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osgDB::ParameterOutput) - Constructor1(IN, osgDB::Output &, fw); - Constructor2(IN, osgDB::Output &, fw, IN, int, numItemsPerLine); - Method0(void, begin); - Method0(void, newLine); - Method0(void, end); + I_Constructor1(IN, osgDB::Output &, fw); + I_Constructor2(IN, osgDB::Output &, fw, IN, int, numItemsPerLine); + I_Method0(void, begin); + I_Method0(void, newLine); + I_Method0(void, end); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index 78ba473cc..848c0130b 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -17,132 +17,140 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::ArchiveStatus) - EnumLabel(osgDB::ReaderWriter::READ); - EnumLabel(osgDB::ReaderWriter::WRITE); - EnumLabel(osgDB::ReaderWriter::CREATE); + I_EnumLabel(osgDB::ReaderWriter::READ); + I_EnumLabel(osgDB::ReaderWriter::WRITE); + I_EnumLabel(osgDB::ReaderWriter::CREATE); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgDB::ReaderWriter) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgDB::ReaderWriter &, rw, , IN, const osg::CopyOp, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, acceptsExtension, IN, const std::string &, x); - MethodWithDefaults4(osgDB::ReaderWriter::ReadResult, openArchive, IN, const std::string &, x, , IN, osgDB::ReaderWriter::ArchiveStatus, x, , IN, unsigned, int, 4096, IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, openArchive, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readImage, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readObject, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readImage, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readNode, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, x, , IN, std::ostream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, x, , IN, std::ostream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, x, , IN, std::ostream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); - MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, x, , IN, std::ostream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); +BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter &, rw, , 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, acceptsExtension, IN, const std::string &, x); + I_MethodWithDefaults4(osgDB::ReaderWriter::ReadResult, openArchive, IN, const std::string &, x, , IN, osgDB::ReaderWriter::ArchiveStatus, x, , IN, unsigned, int, 4096, IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, openArchive, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readImage, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, x, , IN, const std::string &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readObject, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readImage, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults2(osgDB::ReaderWriter::ReadResult, readNode, IN, std::istream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, x, , IN, std::ostream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, x, , IN, std::ostream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, x, , IN, std::ostream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); + I_MethodWithDefaults3(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, x, , IN, std::ostream &, x, , IN, const osgDB::ReaderWriter::Options *, x, NULL); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::Options::CacheHintOptions) - EnumLabel(osgDB::ReaderWriter::Options::CACHE_NONE); - EnumLabel(osgDB::ReaderWriter::Options::CACHE_NODES); - EnumLabel(osgDB::ReaderWriter::Options::CACHE_IMAGES); - EnumLabel(osgDB::ReaderWriter::Options::CACHE_HEIGHTFIELDS); - EnumLabel(osgDB::ReaderWriter::Options::CACHE_ARCHIVES); - EnumLabel(osgDB::ReaderWriter::Options::CACHE_OBJECTS); - EnumLabel(osgDB::ReaderWriter::Options::CACHE_ALL); + I_EnumLabel(osgDB::ReaderWriter::Options::CACHE_NONE); + I_EnumLabel(osgDB::ReaderWriter::Options::CACHE_NODES); + I_EnumLabel(osgDB::ReaderWriter::Options::CACHE_IMAGES); + I_EnumLabel(osgDB::ReaderWriter::Options::CACHE_HEIGHTFIELDS); + I_EnumLabel(osgDB::ReaderWriter::Options::CACHE_ARCHIVES); + I_EnumLabel(osgDB::ReaderWriter::Options::CACHE_OBJECTS); + I_EnumLabel(osgDB::ReaderWriter::Options::CACHE_ALL); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter::Options) - BaseType(osg::Object); - Constructor0(); - Constructor1(IN, const std::string &, str); - ConstructorWithDefaults2(IN, const osgDB::ReaderWriter::Options &, options, , IN, const osg::CopyOp, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setOptionString, IN, const std::string &, str); - Method0(const std::string &, getOptionString); - Method1(void, setDatabasePath, IN, const std::string &, str); - Method0(osgDB::FilePathList &, getDatabasePathList); - Method0(const osgDB::FilePathList &, getDatabasePathList); - Method1(void, setObjectCacheHint, IN, osgDB::ReaderWriter::Options::CacheHintOptions, useObjectCache); - Method0(osgDB::ReaderWriter::Options::CacheHintOptions, getObjectCacheHint); - WriteOnlyProperty(const std::string &, DatabasePath); - ReadOnlyProperty(osgDB::FilePathList &, DatabasePathList); - Property(osgDB::ReaderWriter::Options::CacheHintOptions, ObjectCacheHint); - Property(const std::string &, OptionString); + I_BaseType(osg::Object); + I_Constructor0(); + I_Constructor1(IN, const std::string &, str); + I_ConstructorWithDefaults2(IN, const osgDB::ReaderWriter::Options &, options, , 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, setOptionString, IN, const std::string &, str); + I_Method0(const std::string &, getOptionString); + I_Method1(void, setDatabasePath, IN, const std::string &, str); + I_Method0(osgDB::FilePathList &, getDatabasePathList); + I_Method0(const osgDB::FilePathList &, getDatabasePathList); + I_Method1(void, setObjectCacheHint, IN, osgDB::ReaderWriter::Options::CacheHintOptions, useObjectCache); + I_Method0(osgDB::ReaderWriter::Options::CacheHintOptions, getObjectCacheHint); + I_WriteOnlyProperty(const std::string &, DatabasePath); + I_ReadOnlyProperty(osgDB::FilePathList &, DatabasePathList); + I_Property(osgDB::ReaderWriter::Options::CacheHintOptions, ObjectCacheHint); + I_Property(const std::string &, OptionString); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::ReadResult::ReadStatus) - EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_NOT_HANDLED); - EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_NOT_FOUND); - EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_LOADED); - EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_LOADED_FROM_CACHE); - EnumLabel(osgDB::ReaderWriter::ReadResult::ERROR_IN_READING_FILE); + I_EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_NOT_HANDLED); + I_EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_NOT_FOUND); + I_EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_LOADED); + I_EnumLabel(osgDB::ReaderWriter::ReadResult::FILE_LOADED_FROM_CACHE); + I_EnumLabel(osgDB::ReaderWriter::ReadResult::ERROR_IN_READING_FILE); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgDB::ReaderWriter::ReadResult) - ConstructorWithDefaults1(IN, osgDB::ReaderWriter::ReadResult::ReadStatus, status, osgDB::ReaderWriter::ReadResult::FILE_NOT_HANDLED); - Constructor1(IN, const std::string &, m); - ConstructorWithDefaults2(IN, osg::Object *, obj, , IN, osgDB::ReaderWriter::ReadResult::ReadStatus, status, osgDB::ReaderWriter::ReadResult::FILE_LOADED); - Constructor1(IN, const osgDB::ReaderWriter::ReadResult &, rr); - Method0(osg::Object *, getObject); - Method0(osg::Image *, getImage); - Method0(osg::HeightField *, getHeightField); - Method0(osg::Node *, getNode); - Method0(osgDB::Archive *, getArchive); - Method0(bool, validObject); - Method0(bool, validImage); - Method0(bool, validHeightField); - Method0(bool, validNode); - Method0(bool, validArchive); - Method0(osg::Object *, takeObject); - Method0(osg::Image *, takeImage); - Method0(osg::HeightField *, takeHeightField); - Method0(osg::Node *, takeNode); - Method0(osgDB::Archive *, takeArchive); - Method0(const std::string &, message); - Method0(osgDB::ReaderWriter::ReadResult::ReadStatus, status); - Method0(bool, success); - Method0(bool, loadedFromCache); - Method0(bool, error); - Method0(bool, notHandled); - Method0(bool, notFound); - ReadOnlyProperty(osgDB::Archive *, Archive); - ReadOnlyProperty(osg::HeightField *, HeightField); - ReadOnlyProperty(osg::Image *, Image); - ReadOnlyProperty(osg::Node *, Node); - ReadOnlyProperty(osg::Object *, Object); + I_ConstructorWithDefaults1(IN, osgDB::ReaderWriter::ReadResult::ReadStatus, status, osgDB::ReaderWriter::ReadResult::FILE_NOT_HANDLED); + I_Constructor1(IN, const std::string &, m); + I_ConstructorWithDefaults2(IN, osg::Object *, obj, , IN, osgDB::ReaderWriter::ReadResult::ReadStatus, status, osgDB::ReaderWriter::ReadResult::FILE_LOADED); + I_Constructor1(IN, const osgDB::ReaderWriter::ReadResult &, rr); + I_Method0(osg::Object *, getObject); + I_Method0(osg::Image *, getImage); + I_Method0(osg::HeightField *, getHeightField); + I_Method0(osg::Node *, getNode); + I_Method0(osgDB::Archive *, getArchive); + I_Method0(bool, validObject); + I_Method0(bool, validImage); + I_Method0(bool, validHeightField); + I_Method0(bool, validNode); + I_Method0(bool, validArchive); + I_Method0(osg::Object *, takeObject); + I_Method0(osg::Image *, takeImage); + I_Method0(osg::HeightField *, takeHeightField); + I_Method0(osg::Node *, takeNode); + I_Method0(osgDB::Archive *, takeArchive); + I_Method0(const std::string &, message); + I_Method0(osgDB::ReaderWriter::ReadResult::ReadStatus, status); + I_Method0(bool, success); + I_Method0(bool, loadedFromCache); + I_Method0(bool, error); + I_Method0(bool, notHandled); + I_Method0(bool, notFound); + I_ReadOnlyProperty(osgDB::Archive *, Archive); + I_ReadOnlyProperty(osg::HeightField *, HeightField); + I_ReadOnlyProperty(osg::Image *, Image); + I_ReadOnlyProperty(osg::Node *, Node); + I_ReadOnlyProperty(osg::Object *, Object); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::WriteResult::WriteStatus) - EnumLabel(osgDB::ReaderWriter::WriteResult::FILE_NOT_HANDLED); - EnumLabel(osgDB::ReaderWriter::WriteResult::FILE_SAVED); - EnumLabel(osgDB::ReaderWriter::WriteResult::ERROR_IN_WRITING_FILE); + I_EnumLabel(osgDB::ReaderWriter::WriteResult::FILE_NOT_HANDLED); + I_EnumLabel(osgDB::ReaderWriter::WriteResult::FILE_SAVED); + I_EnumLabel(osgDB::ReaderWriter::WriteResult::ERROR_IN_WRITING_FILE); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgDB::ReaderWriter::WriteResult) - ConstructorWithDefaults1(IN, osgDB::ReaderWriter::WriteResult::WriteStatus, status, osgDB::ReaderWriter::WriteResult::FILE_NOT_HANDLED); - Constructor1(IN, const std::string &, m); - Constructor1(IN, const osgDB::ReaderWriter::WriteResult &, rr); - Method0(const std::string &, message); - Method0(osgDB::ReaderWriter::WriteResult::WriteStatus, status); - Method0(bool, success); - Method0(bool, error); - Method0(bool, notHandled); + I_ConstructorWithDefaults1(IN, osgDB::ReaderWriter::WriteResult::WriteStatus, status, osgDB::ReaderWriter::WriteResult::FILE_NOT_HANDLED); + I_Constructor1(IN, const std::string &, m); + I_Constructor1(IN, const osgDB::ReaderWriter::WriteResult &, rr); + I_Method0(const std::string &, message); + I_Method0(osgDB::ReaderWriter::WriteResult::WriteStatus, status); + I_Method0(bool, success); + I_Method0(bool, error); + I_Method0(bool, notHandled); END_REFLECTOR TYPE_NAME_ALIAS(std::deque< std::string >, osgDB::FilePathList); diff --git a/src/osgWrappers/osgDB/ReentrantMutex.cpp b/src/osgWrappers/osgDB/ReentrantMutex.cpp index b5460f6fa..65cc1d54d 100644 --- a/src/osgWrappers/osgDB/ReentrantMutex.cpp +++ b/src/osgWrappers/osgDB/ReentrantMutex.cpp @@ -11,10 +11,18 @@ #include -BEGIN_VALUE_REFLECTOR(osgDB::ReentrantMutex) - Constructor0(); - Method0(int, lock); - Method0(int, unlock); - Method0(int, trylock); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgDB::ReentrantMutex) + I_Constructor0(); + I_Method0(int, lock); + I_Method0(int, unlock); + I_Method0(int, trylock); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index 674f4a21b..ddcb7c472 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -28,129 +28,137 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::basic_type_wrapper) - Constructor0(); - Method1(bool, matches, IN, const osg::Object *, proto); + I_Constructor0(); + I_Method1(bool, matches, IN, const osg::Object *, proto); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgDB::RegisterDotOsgWrapperProxy) - ConstructorWithDefaults6(IN, osg::Object *, proto, , IN, const std::string &, name, , IN, const std::string &, associates, , IN, osgDB::DotOsgWrapper::ReadFunc, readFunc, , IN, osgDB::DotOsgWrapper::WriteFunc, writeFunc, , IN, osgDB::DotOsgWrapper::ReadWriteMode, readWriteMode, osgDB::DotOsgWrapper::READ_AND_WRITE); + I_ConstructorWithDefaults6(IN, osg::Object *, proto, , IN, const std::string &, name, , IN, const std::string &, associates, , IN, osgDB::DotOsgWrapper::ReadFunc, readFunc, , IN, osgDB::DotOsgWrapper::WriteFunc, writeFunc, , IN, osgDB::DotOsgWrapper::ReadWriteMode, readWriteMode, osgDB::DotOsgWrapper::READ_AND_WRITE); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgDB::Registry) - BaseType(osg::Referenced); - Method1(void, readCommandLine, IN, osg::ArgumentParser &, commandLine); - Method2(void, addFileExtensionAlias, IN, const std::string, mapExt, IN, const std::string, toExt); - Method1(void, addDotOsgWrapper, IN, osgDB::DotOsgWrapper *, wrapper); - Method1(void, removeDotOsgWrapper, IN, osgDB::DotOsgWrapper *, wrapper); - Method1(void, addReaderWriter, IN, osgDB::ReaderWriter *, rw); - Method1(void, removeReaderWriter, IN, osgDB::ReaderWriter *, rw); - Method1(std::string, createLibraryNameForFile, IN, const std::string &, fileName); - Method1(std::string, createLibraryNameForExtension, IN, const std::string &, ext); - Method1(std::string, createLibraryNameForNodeKit, IN, const std::string &, name); - Method1(bool, loadLibrary, IN, const std::string &, fileName); - Method1(bool, closeLibrary, IN, const std::string &, fileName); - Method0(void, closeAllLibraries); - Method1(osgDB::ReaderWriter *, getReaderWriterForExtension, IN, const std::string &, ext); - Method2(osg::Object *, readObjectOfType, IN, const osg::Object &, compObj, IN, osgDB::Input &, fr); - Method2(osg::Object *, readObjectOfType, IN, const osgDB::basic_type_wrapper &, btw, IN, osgDB::Input &, fr); - Method1(osg::Object *, readObject, IN, osgDB::Input &, fr); - Method1(osg::Image *, readImage, IN, osgDB::Input &, fr); - Method1(osg::Drawable *, readDrawable, IN, osgDB::Input &, fr); - Method1(osg::Uniform *, readUniform, IN, osgDB::Input &, fr); - Method1(osg::StateAttribute *, readStateAttribute, IN, osgDB::Input &, fr); - Method1(osg::Node *, readNode, IN, osgDB::Input &, fr); - Method2(bool, writeObject, IN, const osg::Object &, obj, IN, osgDB::Output &, fw); - Method1(void, setReadFileCallback, IN, osgDB::Registry::ReadFileCallback *, cb); - Method0(osgDB::Registry::ReadFileCallback *, getReadFileCallback); - Method0(const osgDB::Registry::ReadFileCallback *, getReadFileCallback); - Method4(osgDB::ReaderWriter::ReadResult, openArchive, IN, const std::string &, fileName, IN, osgDB::ReaderWriter::ArchiveStatus, status, IN, unsigned int, indexBlockSizeHint, IN, const osgDB::ReaderWriter::Options *, options); - Method4(osgDB::ReaderWriter::ReadResult, openArchiveImplementation, IN, const std::string &, fileName, IN, osgDB::ReaderWriter::ArchiveStatus, status, IN, unsigned int, indexBlockSizeHint, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readObjectImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readImage, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readImageImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readHeightFieldImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readNodeImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); - Method1(void, setWriteFileCallback, IN, osgDB::Registry::WriteFileCallback *, cb); - Method0(osgDB::Registry::WriteFileCallback *, getWriteFileCallback); - Method0(const osgDB::Registry::WriteFileCallback *, getWriteFileCallback); - Method2(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, obj, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeObjectImplementation, IN, const osg::Object &, obj, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, obj, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeImageImplementation, IN, const osg::Image &, obj, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, obj, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeHeightFieldImplementation, IN, const osg::HeightField &, obj, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, node, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeNodeImplementation, IN, const osg::Node &, node, IN, const std::string &, fileName); - Method1(void, setCreateNodeFromImage, IN, bool, flag); - Method0(bool, getCreateNodeFromImage); - Method1(void, setOptions, IN, osgDB::ReaderWriter::Options *, opt); - Method0(osgDB::ReaderWriter::Options *, getOptions); - Method0(const osgDB::ReaderWriter::Options *, getOptions); - Method0(void, initFilePathLists); - Method0(void, initDataFilePathList); - Method1(void, setDataFilePathList, IN, const osgDB::FilePathList &, filepath); - Method1(void, setDataFilePathList, IN, const std::string &, paths); - Method0(osgDB::FilePathList &, getDataFilePathList); - Method0(const osgDB::FilePathList &, getDataFilePathList); - Method0(void, initLibraryFilePathList); - Method1(void, setLibraryFilePathList, IN, const osgDB::FilePathList &, filepath); - Method1(void, setLibraryFilePathList, IN, const std::string &, paths); - Method0(osgDB::FilePathList &, getLibraryFilePathList); - Method0(const osgDB::FilePathList &, getLibraryFilePathList); - Method1(void, updateTimeStampOfObjectsInCacheWithExtenalReferences, IN, double, currentTime); - Method1(void, removeExpiredObjectsInCache, IN, double, expiryTime); - Method0(void, clearObjectCache); - MethodWithDefaults3(void, addEntryToObjectCache, IN, const std::string &, filename, , IN, osg::Object *, object, , IN, double, timestamp, 0.0); - Method1(osg::Object *, getFromObjectCache, IN, const std::string &, fileName); - Method2(void, addToArchiveCache, IN, const std::string &, fileName, IN, osgDB::Archive *, archive); - Method1(void, removeFromArchiveCache, IN, const std::string &, fileName); - Method1(osgDB::Archive *, getFromArchiveCache, IN, const std::string &, fileName); - Method0(void, clearArchiveCache); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - Method1(osgDB::DynamicLibrary *, getLibrary, IN, const std::string &, fileName); - Method1(void, setDatabasePager, IN, osgDB::DatabasePager *, databasePager); - Method0(osgDB::DatabasePager *, getOrCreateDatabasePager); - Method0(osgDB::DatabasePager *, getDatabasePager); - Method1(void, setSharedStateManager, IN, osgDB::SharedStateManager *, SharedStateManager); - Method0(osgDB::SharedStateManager *, getOrCreateSharedStateManager); - Method0(osgDB::SharedStateManager *, getSharedStateManager); - Property(bool, CreateNodeFromImage); - Property(const osgDB::FilePathList &, DataFilePathList); - Property(osgDB::DatabasePager *, DatabasePager); - Property(const osgDB::FilePathList &, LibraryFilePathList); - Property(osgDB::ReaderWriter::Options *, Options); - Property(osgDB::Registry::ReadFileCallback *, ReadFileCallback); - Property(osgDB::SharedStateManager *, SharedStateManager); - Property(osgDB::Registry::WriteFileCallback *, WriteFileCallback); + I_BaseType(osg::Referenced); + I_Method1(void, readCommandLine, IN, osg::ArgumentParser &, commandLine); + I_Method2(void, addFileExtensionAlias, IN, const std::string, mapExt, IN, const std::string, toExt); + I_Method1(void, addDotOsgWrapper, IN, osgDB::DotOsgWrapper *, wrapper); + I_Method1(void, removeDotOsgWrapper, IN, osgDB::DotOsgWrapper *, wrapper); + I_Method1(void, addReaderWriter, IN, osgDB::ReaderWriter *, rw); + I_Method1(void, removeReaderWriter, IN, osgDB::ReaderWriter *, rw); + I_Method1(std::string, createLibraryNameForFile, IN, const std::string &, fileName); + I_Method1(std::string, createLibraryNameForExtension, IN, const std::string &, ext); + I_Method1(std::string, createLibraryNameForNodeKit, IN, const std::string &, name); + I_Method1(bool, loadLibrary, IN, const std::string &, fileName); + I_Method1(bool, closeLibrary, IN, const std::string &, fileName); + I_Method0(void, closeAllLibraries); + I_Method1(osgDB::ReaderWriter *, getReaderWriterForExtension, IN, const std::string &, ext); + I_Method2(osg::Object *, readObjectOfType, IN, const osg::Object &, compObj, IN, osgDB::Input &, fr); + I_Method2(osg::Object *, readObjectOfType, IN, const osgDB::basic_type_wrapper &, btw, IN, osgDB::Input &, fr); + I_Method1(osg::Object *, readObject, IN, osgDB::Input &, fr); + I_Method1(osg::Image *, readImage, IN, osgDB::Input &, fr); + I_Method1(osg::Drawable *, readDrawable, IN, osgDB::Input &, fr); + I_Method1(osg::Uniform *, readUniform, IN, osgDB::Input &, fr); + I_Method1(osg::StateAttribute *, readStateAttribute, IN, osgDB::Input &, fr); + I_Method1(osg::Node *, readNode, IN, osgDB::Input &, fr); + I_Method2(bool, writeObject, IN, const osg::Object &, obj, IN, osgDB::Output &, fw); + I_Method1(void, setReadFileCallback, IN, osgDB::Registry::ReadFileCallback *, cb); + I_Method0(osgDB::Registry::ReadFileCallback *, getReadFileCallback); + I_Method0(const osgDB::Registry::ReadFileCallback *, getReadFileCallback); + I_Method4(osgDB::ReaderWriter::ReadResult, openArchive, IN, const std::string &, fileName, IN, osgDB::ReaderWriter::ArchiveStatus, status, IN, unsigned int, indexBlockSizeHint, IN, const osgDB::ReaderWriter::Options *, options); + I_Method4(osgDB::ReaderWriter::ReadResult, openArchiveImplementation, IN, const std::string &, fileName, IN, osgDB::ReaderWriter::ArchiveStatus, status, IN, unsigned int, indexBlockSizeHint, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readObjectImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readImage, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readImageImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readHeightFieldImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readNodeImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options); + I_Method1(void, setWriteFileCallback, IN, osgDB::Registry::WriteFileCallback *, cb); + I_Method0(osgDB::Registry::WriteFileCallback *, getWriteFileCallback); + I_Method0(const osgDB::Registry::WriteFileCallback *, getWriteFileCallback); + I_Method2(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, obj, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeObjectImplementation, IN, const osg::Object &, obj, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, obj, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeImageImplementation, IN, const osg::Image &, obj, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, obj, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeHeightFieldImplementation, IN, const osg::HeightField &, obj, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, node, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeNodeImplementation, IN, const osg::Node &, node, IN, const std::string &, fileName); + I_Method1(void, setCreateNodeFromImage, IN, bool, flag); + I_Method0(bool, getCreateNodeFromImage); + I_Method1(void, setOptions, IN, osgDB::ReaderWriter::Options *, opt); + I_Method0(osgDB::ReaderWriter::Options *, getOptions); + I_Method0(const osgDB::ReaderWriter::Options *, getOptions); + I_Method0(void, initFilePathLists); + I_Method0(void, initDataFilePathList); + I_Method1(void, setDataFilePathList, IN, const osgDB::FilePathList &, filepath); + I_Method1(void, setDataFilePathList, IN, const std::string &, paths); + I_Method0(osgDB::FilePathList &, getDataFilePathList); + I_Method0(const osgDB::FilePathList &, getDataFilePathList); + I_Method0(void, initLibraryFilePathList); + I_Method1(void, setLibraryFilePathList, IN, const osgDB::FilePathList &, filepath); + I_Method1(void, setLibraryFilePathList, IN, const std::string &, paths); + I_Method0(osgDB::FilePathList &, getLibraryFilePathList); + I_Method0(const osgDB::FilePathList &, getLibraryFilePathList); + I_Method1(void, updateTimeStampOfObjectsInCacheWithExtenalReferences, IN, double, currentTime); + I_Method1(void, removeExpiredObjectsInCache, IN, double, expiryTime); + I_Method0(void, clearObjectCache); + I_MethodWithDefaults3(void, addEntryToObjectCache, IN, const std::string &, filename, , IN, osg::Object *, object, , IN, double, timestamp, 0.0); + I_Method1(osg::Object *, getFromObjectCache, IN, const std::string &, fileName); + I_Method2(void, addToArchiveCache, IN, const std::string &, fileName, IN, osgDB::Archive *, archive); + I_Method1(void, removeFromArchiveCache, IN, const std::string &, fileName); + I_Method1(osgDB::Archive *, getFromArchiveCache, IN, const std::string &, fileName); + I_Method0(void, clearArchiveCache); + I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); + I_Method1(osgDB::DynamicLibrary *, getLibrary, IN, const std::string &, fileName); + I_Method1(void, setDatabasePager, IN, osgDB::DatabasePager *, databasePager); + I_Method0(osgDB::DatabasePager *, getOrCreateDatabasePager); + I_Method0(osgDB::DatabasePager *, getDatabasePager); + I_Method1(void, setSharedStateManager, IN, osgDB::SharedStateManager *, SharedStateManager); + I_Method0(osgDB::SharedStateManager *, getOrCreateSharedStateManager); + I_Method0(osgDB::SharedStateManager *, getSharedStateManager); + I_Property(bool, CreateNodeFromImage); + I_Property(const osgDB::FilePathList &, DataFilePathList); + I_Property(osgDB::DatabasePager *, DatabasePager); + I_Property(const osgDB::FilePathList &, LibraryFilePathList); + I_Property(osgDB::ReaderWriter::Options *, Options); + I_Property(osgDB::Registry::ReadFileCallback *, ReadFileCallback); + I_Property(osgDB::SharedStateManager *, SharedStateManager); + I_Property(osgDB::Registry::WriteFileCallback *, WriteFileCallback); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgDB::Registry::ReadFileCallback) - BaseType(osg::Referenced); - Constructor0(); - Method4(osgDB::ReaderWriter::ReadResult, openArchive, IN, const std::string &, filename, IN, osgDB::ReaderWriter::ArchiveStatus, status, IN, unsigned int, indexBlockSizeHint, IN, const osgDB::ReaderWriter::Options *, useObjectCache); - Method2(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readImage, IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); - Method2(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method4(osgDB::ReaderWriter::ReadResult, openArchive, IN, const std::string &, filename, IN, osgDB::ReaderWriter::ArchiveStatus, status, IN, unsigned int, indexBlockSizeHint, IN, const osgDB::ReaderWriter::Options *, useObjectCache); + I_Method2(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readImage, IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readHeightField, IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); + I_Method2(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Registry::ReadFunctor) - Constructor2(IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); - Method1(osgDB::ReaderWriter::ReadResult, doRead, IN, osgDB::ReaderWriter &, rw); - Method1(bool, isValid, IN, osgDB::ReaderWriter::ReadResult &, readResult); - Method1(bool, isValid, IN, osg::Object *, object); + I_Constructor2(IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options); + I_Method1(osgDB::ReaderWriter::ReadResult, doRead, IN, osgDB::ReaderWriter &, rw); + I_Method1(bool, isValid, IN, osgDB::ReaderWriter::ReadResult &, readResult); + I_Method1(bool, isValid, IN, osg::Object *, object); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgDB::Registry::WriteFileCallback) - BaseType(osg::Referenced); - Constructor0(); - Method2(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, obj, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, obj, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, obj, IN, const std::string &, fileName); - Method2(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, obj, IN, const std::string &, fileName); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method2(osgDB::ReaderWriter::WriteResult, writeObject, IN, const osg::Object &, obj, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeImage, IN, const osg::Image &, obj, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeHeightField, IN, const osg::HeightField &, obj, IN, const std::string &, fileName); + I_Method2(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, obj, IN, const std::string &, fileName); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/SharedStateManager.cpp b/src/osgWrappers/osgDB/SharedStateManager.cpp index f1e85370b..305c5b64c 100644 --- a/src/osgWrappers/osgDB/SharedStateManager.cpp +++ b/src/osgWrappers/osgDB/SharedStateManager.cpp @@ -13,22 +13,30 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgDB::SharedStateManager::ShareMode) - EnumLabel(osgDB::SharedStateManager::SHARE_NONE); - EnumLabel(osgDB::SharedStateManager::SHARE_TEXTURES); - EnumLabel(osgDB::SharedStateManager::SHARE_STATESETS); - EnumLabel(osgDB::SharedStateManager::SHARE_ALL); + I_EnumLabel(osgDB::SharedStateManager::SHARE_NONE); + I_EnumLabel(osgDB::SharedStateManager::SHARE_TEXTURES); + I_EnumLabel(osgDB::SharedStateManager::SHARE_STATESETS); + I_EnumLabel(osgDB::SharedStateManager::SHARE_ALL); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgDB::SharedStateManager) - BaseType(osg::NodeVisitor); - Constructor0(); - Method1(void, setShareMode, IN, unsigned int, mode); - Method0(unsigned int, getShareMode); - Method0(void, prune); - MethodWithDefaults2(void, share, IN, osg::Node *, node, , IN, OpenThreads::Mutex *, mt, 0); - Method1(void, apply, IN, osg::Node &, node); - Method1(void, apply, IN, osg::Geode &, geode); - Property(unsigned int, ShareMode); +BEGIN_OBJECT_REFLECTOR(osgDB::SharedStateManager) + I_BaseType(osg::NodeVisitor); + I_Constructor0(); + I_Method1(void, setShareMode, IN, unsigned int, mode); + I_Method0(unsigned int, getShareMode); + I_Method0(void, prune); + I_MethodWithDefaults2(void, share, IN, osg::Node *, node, , IN, OpenThreads::Mutex *, mt, 0); + I_Method1(void, apply, IN, osg::Node &, node); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_Property(unsigned int, ShareMode); END_REFLECTOR diff --git a/src/osgWrappers/osgFX/AnisotropicLighting.cpp b/src/osgWrappers/osgFX/AnisotropicLighting.cpp index 436acb4db..58363bfd3 100644 --- a/src/osgWrappers/osgFX/AnisotropicLighting.cpp +++ b/src/osgWrappers/osgFX/AnisotropicLighting.cpp @@ -15,25 +15,33 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgFX::AnisotropicLighting) - BaseType(osgFX::Effect); - Constructor0(); - ConstructorWithDefaults2(IN, const osgFX::AnisotropicLighting &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(const char *, effectName); - Method0(const char *, effectDescription); - Method0(const char *, effectAuthor); - Method0(osg::Image *, getLightingMap); - Method0(const osg::Image *, getLightingMap); - Method1(void, setLightingMap, IN, osg::Image *, image); - Method0(int, getLightNumber); - Method1(void, setLightNumber, IN, int, n); - Property(int, LightNumber); - Property(osg::Image *, LightingMap); + I_BaseType(osgFX::Effect); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgFX::AnisotropicLighting &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(const char *, effectName); + I_Method0(const char *, effectDescription); + I_Method0(const char *, effectAuthor); + I_Method0(osg::Image *, getLightingMap); + I_Method0(const osg::Image *, getLightingMap); + I_Method1(void, setLightingMap, IN, osg::Image *, image); + I_Method0(int, getLightNumber); + I_Method1(void, setLightNumber, IN, int, n); + I_Property(int, LightNumber); + I_Property(osg::Image *, LightingMap); END_REFLECTOR diff --git a/src/osgWrappers/osgFX/BumpMapping.cpp b/src/osgWrappers/osgFX/BumpMapping.cpp index a59b5cea4..d3f32d4fa 100644 --- a/src/osgWrappers/osgFX/BumpMapping.cpp +++ b/src/osgWrappers/osgFX/BumpMapping.cpp @@ -17,39 +17,47 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgFX::BumpMapping) - BaseType(osgFX::Effect); - Constructor0(); - ConstructorWithDefaults2(IN, const osgFX::BumpMapping &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(const char *, effectName); - Method0(const char *, effectDescription); - Method0(const char *, effectAuthor); - Method0(int, getLightNumber); - Method1(void, setLightNumber, IN, int, n); - Method0(int, getDiffuseTextureUnit); - Method1(void, setDiffuseTextureUnit, IN, int, n); - Method0(int, getNormalMapTextureUnit); - Method1(void, setNormalMapTextureUnit, IN, int, n); - Method0(osg::Texture2D *, getOverrideDiffuseTexture); - Method0(const osg::Texture2D *, getOverrideDiffuseTexture); - Method1(void, setOverrideDiffuseTexture, IN, osg::Texture2D *, texture); - Method0(osg::Texture2D *, getOverrideNormalMapTexture); - Method0(const osg::Texture2D *, getOverrideNormalMapTexture); - Method1(void, setOverrideNormalMapTexture, IN, osg::Texture2D *, texture); - Method1(void, prepareGeometry, IN, osg::Geometry *, geo); - Method1(void, prepareNode, IN, osg::Node *, node); - Method0(void, prepareChildren); - Method0(void, setUpDemo); - Property(int, DiffuseTextureUnit); - Property(int, LightNumber); - Property(int, NormalMapTextureUnit); - Property(osg::Texture2D *, OverrideDiffuseTexture); - Property(osg::Texture2D *, OverrideNormalMapTexture); + I_BaseType(osgFX::Effect); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgFX::BumpMapping &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(const char *, effectName); + I_Method0(const char *, effectDescription); + I_Method0(const char *, effectAuthor); + I_Method0(int, getLightNumber); + I_Method1(void, setLightNumber, IN, int, n); + I_Method0(int, getDiffuseTextureUnit); + I_Method1(void, setDiffuseTextureUnit, IN, int, n); + I_Method0(int, getNormalMapTextureUnit); + I_Method1(void, setNormalMapTextureUnit, IN, int, n); + I_Method0(osg::Texture2D *, getOverrideDiffuseTexture); + I_Method0(const osg::Texture2D *, getOverrideDiffuseTexture); + I_Method1(void, setOverrideDiffuseTexture, IN, osg::Texture2D *, texture); + I_Method0(osg::Texture2D *, getOverrideNormalMapTexture); + I_Method0(const osg::Texture2D *, getOverrideNormalMapTexture); + I_Method1(void, setOverrideNormalMapTexture, IN, osg::Texture2D *, texture); + I_Method1(void, prepareGeometry, IN, osg::Geometry *, geo); + I_Method1(void, prepareNode, IN, osg::Node *, node); + I_Method0(void, prepareChildren); + I_Method0(void, setUpDemo); + I_Property(int, DiffuseTextureUnit); + I_Property(int, LightNumber); + I_Property(int, NormalMapTextureUnit); + I_Property(osg::Texture2D *, OverrideDiffuseTexture); + I_Property(osg::Texture2D *, OverrideNormalMapTexture); END_REFLECTOR diff --git a/src/osgWrappers/osgFX/Cartoon.cpp b/src/osgWrappers/osgFX/Cartoon.cpp index 65b2c5fac..1dcb2fd4e 100644 --- a/src/osgWrappers/osgFX/Cartoon.cpp +++ b/src/osgWrappers/osgFX/Cartoon.cpp @@ -15,27 +15,35 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgFX::Cartoon) - BaseType(osgFX::Effect); - Constructor0(); - ConstructorWithDefaults2(IN, const osgFX::Cartoon &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(const char *, effectName); - Method0(const char *, effectDescription); - Method0(const char *, effectAuthor); - Method0(const osg::Vec4 &, getOutlineColor); - Method1(void, setOutlineColor, IN, const osg::Vec4 &, color); - Method0(float, getOutlineLineWidth); - Method1(void, setOutlineLineWidth, IN, float, w); - Method0(int, getLightNumber); - Method1(void, setLightNumber, IN, int, n); - Property(int, LightNumber); - Property(const osg::Vec4 &, OutlineColor); - Property(float, OutlineLineWidth); + I_BaseType(osgFX::Effect); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgFX::Cartoon &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(const char *, effectName); + I_Method0(const char *, effectDescription); + I_Method0(const char *, effectAuthor); + I_Method0(const osg::Vec4 &, getOutlineColor); + I_Method1(void, setOutlineColor, IN, const osg::Vec4 &, color); + I_Method0(float, getOutlineLineWidth); + I_Method1(void, setOutlineLineWidth, IN, float, w); + I_Method0(int, getLightNumber); + I_Method1(void, setLightNumber, IN, int, n); + I_Property(int, LightNumber); + I_Property(const osg::Vec4 &, OutlineColor); + I_Property(float, OutlineLineWidth); END_REFLECTOR diff --git a/src/osgWrappers/osgFX/Effect.cpp b/src/osgWrappers/osgFX/Effect.cpp index d00c44b88..209a9be9d 100644 --- a/src/osgWrappers/osgFX/Effect.cpp +++ b/src/osgWrappers/osgFX/Effect.cpp @@ -15,32 +15,40 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgFX::Effect::TechniqueSelection) - EnumLabel(osgFX::Effect::AUTO_DETECT); + I_EnumLabel(osgFX::Effect::AUTO_DETECT); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::Effect) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osgFX::Effect &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(const char *, effectName); - Method0(const char *, effectDescription); - Method0(const char *, effectAuthor); - Method0(bool, getEnabled); - Method1(void, setEnabled, IN, bool, v); - Method0(void, setUpDemo); - Method0(int, getNumTechniques); - Method1(osgFX::Technique *, getTechnique, IN, int, i); - Method1(const osgFX::Technique *, getTechnique, IN, int, i); - Method0(int, getSelectedTechnique); - MethodWithDefaults1(void, selectTechnique, IN, int, i, osgFX::Effect::AUTO_DETECT); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(void, inherited_traverse, IN, osg::NodeVisitor &, nv); - Property(bool, Enabled); - ReadOnlyProperty(int, SelectedTechnique); - ArrayProperty_G(osgFX::Technique *, Technique, Techniques, int, void); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgFX::Effect &, copy, , 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(const char *, effectName); + I_Method0(const char *, effectDescription); + I_Method0(const char *, effectAuthor); + I_Method0(bool, getEnabled); + I_Method1(void, setEnabled, IN, bool, v); + I_Method0(void, setUpDemo); + I_Method0(int, getNumTechniques); + I_Method1(osgFX::Technique *, getTechnique, IN, int, i); + I_Method1(const osgFX::Technique *, getTechnique, IN, int, i); + I_Method0(int, getSelectedTechnique); + I_MethodWithDefaults1(void, selectTechnique, IN, int, i, osgFX::Effect::AUTO_DETECT); + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); + I_Method1(void, inherited_traverse, IN, osg::NodeVisitor &, nv); + I_Property(bool, Enabled); + I_ReadOnlyProperty(int, SelectedTechnique); + I_ArrayProperty_G(osgFX::Technique *, Technique, Techniques, int, void); END_REFLECTOR diff --git a/src/osgWrappers/osgFX/MultiTextureControl.cpp b/src/osgWrappers/osgFX/MultiTextureControl.cpp index c4fe578d7..f4894337d 100644 --- a/src/osgWrappers/osgFX/MultiTextureControl.cpp +++ b/src/osgWrappers/osgFX/MultiTextureControl.cpp @@ -14,19 +14,27 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgFX::MultiTextureControl) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osgFX::MultiTextureControl &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method2(void, setTextureWeight, IN, unsigned int, unit, IN, float, weight); - Method1(float, getTextureWeight, IN, unsigned int, unit); - Method0(unsigned int, getNumTextureWeights); - ArrayProperty_G(float, TextureWeight, TextureWeights, unsigned int, void); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgFX::MultiTextureControl &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method2(void, setTextureWeight, IN, unsigned int, unit, IN, float, weight); + I_Method1(float, getTextureWeight, IN, unsigned int, unit); + I_Method0(unsigned int, getNumTextureWeights); + I_ArrayProperty_G(float, TextureWeight, TextureWeights, unsigned int, void); END_REFLECTOR diff --git a/src/osgWrappers/osgFX/Registry.cpp b/src/osgWrappers/osgFX/Registry.cpp index db7c3c0e5..1a21e3720 100644 --- a/src/osgWrappers/osgFX/Registry.cpp +++ b/src/osgWrappers/osgFX/Registry.cpp @@ -12,29 +12,25 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ref_ptr< const osgFX::Effect > >, osgFX::Registry::EffectMap); BEGIN_OBJECT_REFLECTOR(osgFX::Registry) - BaseType(osg::Referenced); - Method1(void, registerEffect, IN, const osgFX::Effect *, effect); - Method0(const osgFX::Registry::EffectMap &, getEffectMap); - ReadOnlyProperty(const osgFX::Registry::EffectMap &, EffectMap); + I_BaseType(osg::Referenced); + I_Method1(void, registerEffect, IN, const osgFX::Effect *, effect); + I_Method0(const osgFX::Registry::EffectMap &, getEffectMap); + I_ReadOnlyProperty(const osgFX::Registry::EffectMap &, EffectMap); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgFX::Registry::Proxy) - Constructor1(IN, const osgFX::Effect *, effect); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< const osgFX::Effect >) - Constructor0(); - Constructor1(IN, const osgFX::Effect *, t); - Constructor1(IN, const osg::ref_ptr< const osgFX::Effect > &, rp); - Method0(bool, valid); - Method0(const osgFX::Effect *, get); - Method0(const const osgFX::Effect *, get); - Method0(const osgFX::Effect *, take); - Method0(const osgFX::Effect *, release); - ReadOnlyProperty(const osgFX::Effect *, ); + I_Constructor1(IN, const osgFX::Effect *, effect); END_REFLECTOR STD_MAP_REFLECTOR(std::map< std::string COMMA osg::ref_ptr< const osgFX::Effect > >); diff --git a/src/osgWrappers/osgFX/Scribe.cpp b/src/osgWrappers/osgFX/Scribe.cpp index 848a43d05..549d93118 100644 --- a/src/osgWrappers/osgFX/Scribe.cpp +++ b/src/osgWrappers/osgFX/Scribe.cpp @@ -15,24 +15,32 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgFX::Scribe) - BaseType(osgFX::Effect); - Constructor0(); - ConstructorWithDefaults2(IN, const osgFX::Scribe &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(const char *, effectName); - Method0(const char *, effectDescription); - Method0(const char *, effectAuthor); - Method0(const osg::Vec4 &, getWireframeColor); - Method1(void, setWireframeColor, IN, const osg::Vec4 &, color); - Method0(float, getWireframeLineWidth); - Method1(void, setWireframeLineWidth, IN, float, w); - Property(const osg::Vec4 &, WireframeColor); - Property(float, WireframeLineWidth); + I_BaseType(osgFX::Effect); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgFX::Scribe &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(const char *, effectName); + I_Method0(const char *, effectDescription); + I_Method0(const char *, effectAuthor); + I_Method0(const osg::Vec4 &, getWireframeColor); + I_Method1(void, setWireframeColor, IN, const osg::Vec4 &, color); + I_Method0(float, getWireframeLineWidth); + I_Method1(void, setWireframeLineWidth, IN, float, w); + I_Property(const osg::Vec4 &, WireframeColor); + I_Property(float, WireframeLineWidth); END_REFLECTOR diff --git a/src/osgWrappers/osgFX/SpecularHighlights.cpp b/src/osgWrappers/osgFX/SpecularHighlights.cpp index da23a4b72..42e3d2661 100644 --- a/src/osgWrappers/osgFX/SpecularHighlights.cpp +++ b/src/osgWrappers/osgFX/SpecularHighlights.cpp @@ -15,30 +15,38 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgFX::SpecularHighlights) - BaseType(osgFX::Effect); - Constructor0(); - ConstructorWithDefaults2(IN, const osgFX::SpecularHighlights &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(const char *, effectName); - Method0(const char *, effectDescription); - Method0(const char *, effectAuthor); - Method0(int, getLightNumber); - Method1(void, setLightNumber, IN, int, n); - Method0(int, getTextureUnit); - Method1(void, setTextureUnit, IN, int, n); - Method0(const osg::Vec4 &, getSpecularColor); - Method1(void, setSpecularColor, IN, const osg::Vec4 &, color); - Method0(float, getSpecularExponent); - Method1(void, setSpecularExponent, IN, float, e); - Property(int, LightNumber); - Property(const osg::Vec4 &, SpecularColor); - Property(float, SpecularExponent); - Property(int, TextureUnit); + I_BaseType(osgFX::Effect); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgFX::SpecularHighlights &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(const char *, effectName); + I_Method0(const char *, effectDescription); + I_Method0(const char *, effectAuthor); + I_Method0(int, getLightNumber); + I_Method1(void, setLightNumber, IN, int, n); + I_Method0(int, getTextureUnit); + I_Method1(void, setTextureUnit, IN, int, n); + I_Method0(const osg::Vec4 &, getSpecularColor); + I_Method1(void, setSpecularColor, IN, const osg::Vec4 &, color); + I_Method0(float, getSpecularExponent); + I_Method1(void, setSpecularExponent, IN, float, e); + I_Property(int, LightNumber); + I_Property(const osg::Vec4 &, SpecularColor); + I_Property(float, SpecularExponent); + I_Property(int, TextureUnit); END_REFLECTOR diff --git a/src/osgWrappers/osgFX/Technique.cpp b/src/osgWrappers/osgFX/Technique.cpp index fbabfd81e..12fe6c6a9 100644 --- a/src/osgWrappers/osgFX/Technique.cpp +++ b/src/osgWrappers/osgFX/Technique.cpp @@ -15,18 +15,24 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::Technique) - BaseType(osg::Referenced); - Constructor0(); - Method0(const char *, techniqueName); - Method0(const char *, techniqueDescription); - Method1(void, getRequiredExtensions, IN, std::vector< std::string > &, x); - Method1(bool, validate, IN, osg::State &, x); - Method0(int, getNumPasses); - Method1(osg::StateSet *, getPassStateSet, IN, int, i); - Method1(const osg::StateSet *, getPassStateSet, IN, int, i); - Method2(void, traverse, IN, osg::NodeVisitor &, nv, IN, osgFX::Effect *, fx); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method0(const char *, techniqueName); + I_Method0(const char *, techniqueDescription); + I_Method1(void, getRequiredExtensions, IN, std::vector< std::string > &, x); + I_Method1(bool, validate, IN, osg::State &, x); + I_Method0(int, getNumPasses); + I_Method1(osg::StateSet *, getPassStateSet, IN, int, i); + I_Method1(const osg::StateSet *, getPassStateSet, IN, int, i); + I_Method2(void, traverse, IN, osg::NodeVisitor &, nv, IN, osgFX::Effect *, fx); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< std::string > &); - diff --git a/src/osgWrappers/osgFX/Validator.cpp b/src/osgWrappers/osgFX/Validator.cpp index 0cfb9a89c..d284d5029 100644 --- a/src/osgWrappers/osgFX/Validator.cpp +++ b/src/osgWrappers/osgFX/Validator.cpp @@ -16,21 +16,29 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgFX::Validator) - BaseType(osg::StateAttribute); - Constructor0(); - Constructor1(IN, osgFX::Effect *, effect); - ConstructorWithDefaults2(IN, const osgFX::Validator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osg::StateAttribute::Type, getType); - Method1(void, apply, IN, osg::State &, state); - Method1(void, compileGLObjects, IN, osg::State &, state); - Method1(int, compare, IN, const osg::StateAttribute &, sa); - Method0(void, disable); - ReadOnlyProperty(osg::StateAttribute::Type, Type); + I_BaseType(osg::StateAttribute); + I_Constructor0(); + I_Constructor1(IN, osgFX::Effect *, effect); + I_ConstructorWithDefaults2(IN, const osgFX::Validator &, 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_Method1(void, apply, IN, osg::State &, state); + I_Method1(void, compileGLObjects, IN, osg::State &, state); + I_Method1(int, compare, IN, const osg::StateAttribute &, sa); + I_Method0(void, disable); + I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp index fcfa10786..3462d3ced 100644 --- a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp @@ -16,31 +16,39 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgGA::AnimationPathManipulator) - BaseType(osgGA::MatrixManipulator); - ConstructorWithDefaults1(IN, osg::AnimationPath *, animationPath, 0); - Constructor1(IN, const std::string &, filename); - Method0(const char *, className); - Method1(void, setPrintOutTimingInfo, IN, bool, printOutTiminInfo); - Method0(bool, getPrintOutTimingInfo); - Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); - Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); - Method0(osg::Matrixd, getMatrix); - Method0(osg::Matrixd, getInverseMatrix); - Method1(void, setAnimationPath, IN, osg::AnimationPath *, animationPath); - Method0(osg::AnimationPath *, getAnimationPath); - Method0(const osg::AnimationPath *, getAnimationPath); - Method0(bool, valid); - Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, home, IN, double, currentTime); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - Property(osg::AnimationPath *, AnimationPath); - WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); - WriteOnlyProperty(const osg::Matrixd &, ByMatrix); - ReadOnlyProperty(osg::Matrixd, InverseMatrix); - ReadOnlyProperty(osg::Matrixd, Matrix); - Property(bool, PrintOutTimingInfo); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgGA::AnimationPathManipulator) + I_BaseType(osgGA::MatrixManipulator); + I_ConstructorWithDefaults1(IN, osg::AnimationPath *, animationPath, 0); + I_Constructor1(IN, const std::string &, filename); + I_Method0(const char *, className); + I_Method1(void, setPrintOutTimingInfo, IN, bool, printOutTiminInfo); + I_Method0(bool, getPrintOutTimingInfo); + I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); + I_Method0(osg::Matrixd, getMatrix); + I_Method0(osg::Matrixd, getInverseMatrix); + I_Method1(void, setAnimationPath, IN, osg::AnimationPath *, animationPath); + I_Method0(osg::AnimationPath *, getAnimationPath); + I_Method0(const osg::AnimationPath *, getAnimationPath); + I_Method0(bool, valid); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, home, IN, double, currentTime); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_Property(osg::AnimationPath *, AnimationPath); + I_WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); + I_WriteOnlyProperty(const osg::Matrixd &, ByMatrix); + I_ReadOnlyProperty(osg::Matrixd, InverseMatrix); + I_ReadOnlyProperty(osg::Matrixd, Matrix); + I_Property(bool, PrintOutTimingInfo); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/DriveManipulator.cpp b/src/osgWrappers/osgGA/DriveManipulator.cpp index c31f9f68a..b3a8f7942 100644 --- a/src/osgWrappers/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/osgGA/DriveManipulator.cpp @@ -16,26 +16,34 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgGA::DriveManipulator) - BaseType(osgGA::MatrixManipulator); - Constructor0(); - Method0(const char *, className); - Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); - Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); - Method0(osg::Matrixd, getMatrix); - Method0(osg::Matrixd, getInverseMatrix); - Method1(void, setNode, IN, osg::Node *, x); - Method0(const osg::Node *, getNode); - Method0(osg::Node *, getNode); - Method0(void, computeHomePosition); - Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); - WriteOnlyProperty(const osg::Matrixd &, ByMatrix); - ReadOnlyProperty(osg::Matrixd, InverseMatrix); - ReadOnlyProperty(osg::Matrixd, Matrix); - Property(osg::Node *, Node); + I_BaseType(osgGA::MatrixManipulator); + I_Constructor0(); + I_Method0(const char *, className); + I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); + I_Method0(osg::Matrixd, getMatrix); + I_Method0(osg::Matrixd, getInverseMatrix); + I_Method1(void, setNode, IN, osg::Node *, x); + I_Method0(const osg::Node *, getNode); + I_Method0(osg::Node *, getNode); + I_Method0(void, computeHomePosition); + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); + I_WriteOnlyProperty(const osg::Matrixd &, ByMatrix); + I_ReadOnlyProperty(osg::Matrixd, InverseMatrix); + I_ReadOnlyProperty(osg::Matrixd, Matrix); + I_Property(osg::Node *, Node); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/EventVisitor.cpp b/src/osgWrappers/osgGA/EventVisitor.cpp index e5dfde386..9fbe23e94 100644 --- a/src/osgWrappers/osgGA/EventVisitor.cpp +++ b/src/osgWrappers/osgGA/EventVisitor.cpp @@ -23,44 +23,52 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >, osgGA::EventVisitor::EventList); -BEGIN_VALUE_REFLECTOR(osgGA::EventVisitor) - BaseType(osg::NodeVisitor); - Constructor0(); - Method1(void, setActionAdapter, IN, osgGA::GUIActionAdapter *, actionAdapter); - Method0(osgGA::GUIActionAdapter *, getActionAdapter); - Method0(const osgGA::GUIActionAdapter *, getActionAdapter); - Method1(void, setEventList, IN, const osgGA::EventVisitor::EventList &, events); - Method0(osgGA::EventVisitor::EventList &, getEventList); - Method0(const osgGA::EventVisitor::EventList &, getEventList); - Method1(void, addEvent, IN, osgGA::GUIEventAdapter *, event); - Method1(void, removeEvent, IN, osgGA::GUIEventAdapter *, event); - Method0(void, reset); - Method1(void, apply, IN, osg::Node &, node); - Method1(void, apply, IN, osg::Geode &, node); - Method1(void, apply, IN, osg::Billboard &, node); - Method1(void, apply, IN, osg::LightSource &, node); - Method1(void, apply, IN, osg::Group &, node); - Method1(void, apply, IN, osg::Transform &, node); - Method1(void, apply, IN, osg::Projection &, node); - Method1(void, apply, IN, osg::Switch &, node); - Method1(void, apply, IN, osg::LOD &, node); - Method1(void, apply, IN, osg::OccluderNode &, node); - Property(osgGA::GUIActionAdapter *, ActionAdapter); - Property(const osgGA::EventVisitor::EventList &, EventList); +BEGIN_OBJECT_REFLECTOR(osgGA::EventVisitor) + I_BaseType(osg::NodeVisitor); + I_Constructor0(); + I_Method1(void, setActionAdapter, IN, osgGA::GUIActionAdapter *, actionAdapter); + I_Method0(osgGA::GUIActionAdapter *, getActionAdapter); + I_Method0(const osgGA::GUIActionAdapter *, getActionAdapter); + I_Method1(void, setEventList, IN, const osgGA::EventVisitor::EventList &, events); + I_Method0(osgGA::EventVisitor::EventList &, getEventList); + I_Method0(const osgGA::EventVisitor::EventList &, getEventList); + I_Method1(void, addEvent, IN, osgGA::GUIEventAdapter *, event); + I_Method1(void, removeEvent, IN, osgGA::GUIEventAdapter *, event); + I_Method0(void, reset); + 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::LightSource &, node); + I_Method1(void, apply, IN, osg::Group &, node); + 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_Property(osgGA::GUIActionAdapter *, ActionAdapter); + I_Property(const osgGA::EventVisitor::EventList &, EventList); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventAdapter >) - Constructor0(); - Constructor1(IN, osgGA::GUIEventAdapter *, t); - Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventAdapter > &, rp); - Method0(bool, valid); - Method0(osgGA::GUIEventAdapter *, get); - Method0(const osgGA::GUIEventAdapter *, get); - Method0(osgGA::GUIEventAdapter *, take); - Method0(osgGA::GUIEventAdapter *, release); - ReadOnlyProperty(osgGA::GUIEventAdapter *, ); + I_Constructor0(); + I_Constructor1(IN, osgGA::GUIEventAdapter *, t); + I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventAdapter > &, rp); + I_Method0(bool, valid); + I_Method0(osgGA::GUIEventAdapter *, get); + I_Method0(const osgGA::GUIEventAdapter *, get); + I_Method0(osgGA::GUIEventAdapter *, take); + I_Method0(osgGA::GUIEventAdapter *, release); + I_ReadOnlyProperty(osgGA::GUIEventAdapter *, ); END_REFLECTOR STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >); diff --git a/src/osgWrappers/osgGA/FlightManipulator.cpp b/src/osgWrappers/osgGA/FlightManipulator.cpp index 53bfb9e4e..df7adf787 100644 --- a/src/osgWrappers/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/osgGA/FlightManipulator.cpp @@ -16,32 +16,40 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgGA::FlightManipulator::YawControlMode) - EnumLabel(osgGA::FlightManipulator::YAW_AUTOMATICALLY_WHEN_BANKED); - EnumLabel(osgGA::FlightManipulator::NO_AUTOMATIC_YAW); + I_EnumLabel(osgGA::FlightManipulator::YAW_AUTOMATICALLY_WHEN_BANKED); + I_EnumLabel(osgGA::FlightManipulator::NO_AUTOMATIC_YAW); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgGA::FlightManipulator) - BaseType(osgGA::MatrixManipulator); - Constructor0(); - Method0(const char *, className); - Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); - Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); - Method0(osg::Matrixd, getMatrix); - Method0(osg::Matrixd, getInverseMatrix); - Method1(void, setNode, IN, osg::Node *, x); - Method0(const osg::Node *, getNode); - Method0(osg::Node *, getNode); - Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - Method1(void, setYawControlMode, IN, osgGA::FlightManipulator::YawControlMode, ycm); - WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); - WriteOnlyProperty(const osg::Matrixd &, ByMatrix); - ReadOnlyProperty(osg::Matrixd, InverseMatrix); - ReadOnlyProperty(osg::Matrixd, Matrix); - Property(osg::Node *, Node); - WriteOnlyProperty(osgGA::FlightManipulator::YawControlMode, YawControlMode); + I_BaseType(osgGA::MatrixManipulator); + I_Constructor0(); + I_Method0(const char *, className); + I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); + I_Method0(osg::Matrixd, getMatrix); + I_Method0(osg::Matrixd, getInverseMatrix); + I_Method1(void, setNode, IN, osg::Node *, x); + I_Method0(const osg::Node *, getNode); + I_Method0(osg::Node *, getNode); + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_Method1(void, setYawControlMode, IN, osgGA::FlightManipulator::YawControlMode, ycm); + I_WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); + I_WriteOnlyProperty(const osg::Matrixd &, ByMatrix); + I_ReadOnlyProperty(osg::Matrixd, InverseMatrix); + I_ReadOnlyProperty(osg::Matrixd, Matrix); + I_Property(osg::Node *, Node); + I_WriteOnlyProperty(osgGA::FlightManipulator::YawControlMode, YawControlMode); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/GUIActionAdapter.cpp b/src/osgWrappers/osgGA/GUIActionAdapter.cpp index f7707affc..1f6c9cdfe 100644 --- a/src/osgWrappers/osgGA/GUIActionAdapter.cpp +++ b/src/osgWrappers/osgGA/GUIActionAdapter.cpp @@ -11,10 +11,18 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::GUIActionAdapter) - Constructor0(); - Method0(void, requestRedraw); - MethodWithDefaults1(void, requestContinuousUpdate, IN, bool, needed, true); - Method2(void, requestWarpPointer, IN, float, x, IN, float, y); + I_Constructor0(); + I_Method0(void, requestRedraw); + I_MethodWithDefaults1(void, requestContinuousUpdate, IN, bool, needed, true); + I_Method2(void, requestWarpPointer, IN, float, x, IN, float, y); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/GUIEventAdapter.cpp b/src/osgWrappers/osgGA/GUIEventAdapter.cpp index c5a2fa6f6..09c5ee38c 100644 --- a/src/osgWrappers/osgGA/GUIEventAdapter.cpp +++ b/src/osgWrappers/osgGA/GUIEventAdapter.cpp @@ -11,207 +11,215 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::MouseButtonMask) - EnumLabel(osgGA::GUIEventAdapter::LEFT_MOUSE_BUTTON); - EnumLabel(osgGA::GUIEventAdapter::MIDDLE_MOUSE_BUTTON); - EnumLabel(osgGA::GUIEventAdapter::RIGHT_MOUSE_BUTTON); + I_EnumLabel(osgGA::GUIEventAdapter::LEFT_MOUSE_BUTTON); + I_EnumLabel(osgGA::GUIEventAdapter::MIDDLE_MOUSE_BUTTON); + I_EnumLabel(osgGA::GUIEventAdapter::RIGHT_MOUSE_BUTTON); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::EventType) - EnumLabel(osgGA::GUIEventAdapter::NONE); - EnumLabel(osgGA::GUIEventAdapter::PUSH); - EnumLabel(osgGA::GUIEventAdapter::RELEASE); - EnumLabel(osgGA::GUIEventAdapter::DOUBLECLICK); - EnumLabel(osgGA::GUIEventAdapter::DRAG); - EnumLabel(osgGA::GUIEventAdapter::MOVE); - EnumLabel(osgGA::GUIEventAdapter::KEYDOWN); - EnumLabel(osgGA::GUIEventAdapter::KEYUP); - EnumLabel(osgGA::GUIEventAdapter::FRAME); - EnumLabel(osgGA::GUIEventAdapter::RESIZE); - EnumLabel(osgGA::GUIEventAdapter::SCROLLUP); - EnumLabel(osgGA::GUIEventAdapter::SCROLLDOWN); - EnumLabel(osgGA::GUIEventAdapter::SCROLLLEFT); - EnumLabel(osgGA::GUIEventAdapter::SCROLLRIGHT); + I_EnumLabel(osgGA::GUIEventAdapter::NONE); + I_EnumLabel(osgGA::GUIEventAdapter::PUSH); + I_EnumLabel(osgGA::GUIEventAdapter::RELEASE); + I_EnumLabel(osgGA::GUIEventAdapter::DOUBLECLICK); + I_EnumLabel(osgGA::GUIEventAdapter::DRAG); + I_EnumLabel(osgGA::GUIEventAdapter::MOVE); + I_EnumLabel(osgGA::GUIEventAdapter::KEYDOWN); + I_EnumLabel(osgGA::GUIEventAdapter::KEYUP); + I_EnumLabel(osgGA::GUIEventAdapter::FRAME); + I_EnumLabel(osgGA::GUIEventAdapter::RESIZE); + I_EnumLabel(osgGA::GUIEventAdapter::SCROLLUP); + I_EnumLabel(osgGA::GUIEventAdapter::SCROLLDOWN); + I_EnumLabel(osgGA::GUIEventAdapter::SCROLLLEFT); + I_EnumLabel(osgGA::GUIEventAdapter::SCROLLRIGHT); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::KeySymbol) - EnumLabel(osgGA::GUIEventAdapter::KEY_Space); - EnumLabel(osgGA::GUIEventAdapter::KEY_BackSpace); - EnumLabel(osgGA::GUIEventAdapter::KEY_Tab); - EnumLabel(osgGA::GUIEventAdapter::KEY_Linefeed); - EnumLabel(osgGA::GUIEventAdapter::KEY_Clear); - EnumLabel(osgGA::GUIEventAdapter::KEY_Return); - EnumLabel(osgGA::GUIEventAdapter::KEY_Pause); - EnumLabel(osgGA::GUIEventAdapter::KEY_Scroll_Lock); - EnumLabel(osgGA::GUIEventAdapter::KEY_Sys_Req); - EnumLabel(osgGA::GUIEventAdapter::KEY_Escape); - EnumLabel(osgGA::GUIEventAdapter::KEY_Delete); - EnumLabel(osgGA::GUIEventAdapter::KEY_Home); - EnumLabel(osgGA::GUIEventAdapter::KEY_Left); - EnumLabel(osgGA::GUIEventAdapter::KEY_Up); - EnumLabel(osgGA::GUIEventAdapter::KEY_Right); - EnumLabel(osgGA::GUIEventAdapter::KEY_Down); - EnumLabel(osgGA::GUIEventAdapter::KEY_Prior); - EnumLabel(osgGA::GUIEventAdapter::KEY_Page_Up); - EnumLabel(osgGA::GUIEventAdapter::KEY_Next); - EnumLabel(osgGA::GUIEventAdapter::KEY_Page_Down); - EnumLabel(osgGA::GUIEventAdapter::KEY_End); - EnumLabel(osgGA::GUIEventAdapter::KEY_Begin); - EnumLabel(osgGA::GUIEventAdapter::KEY_Select); - EnumLabel(osgGA::GUIEventAdapter::KEY_Print); - EnumLabel(osgGA::GUIEventAdapter::KEY_Execute); - EnumLabel(osgGA::GUIEventAdapter::KEY_Insert); - EnumLabel(osgGA::GUIEventAdapter::KEY_Undo); - EnumLabel(osgGA::GUIEventAdapter::KEY_Redo); - EnumLabel(osgGA::GUIEventAdapter::KEY_Menu); - EnumLabel(osgGA::GUIEventAdapter::KEY_Find); - EnumLabel(osgGA::GUIEventAdapter::KEY_Cancel); - EnumLabel(osgGA::GUIEventAdapter::KEY_Help); - EnumLabel(osgGA::GUIEventAdapter::KEY_Break); - EnumLabel(osgGA::GUIEventAdapter::KEY_Mode_switch); - EnumLabel(osgGA::GUIEventAdapter::KEY_Script_switch); - EnumLabel(osgGA::GUIEventAdapter::KEY_Num_Lock); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Space); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Tab); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Enter); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_F1); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_F2); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_F3); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_F4); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Home); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Left); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Up); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Right); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Down); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Prior); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Page_Up); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Next); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Page_Down); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_End); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Begin); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Insert); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Delete); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Equal); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Multiply); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Add); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Separator); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Subtract); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Decimal); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Divide); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_0); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_1); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_2); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_3); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_4); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_5); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_6); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_7); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_8); - EnumLabel(osgGA::GUIEventAdapter::KEY_KP_9); - EnumLabel(osgGA::GUIEventAdapter::KEY_F1); - EnumLabel(osgGA::GUIEventAdapter::KEY_F2); - EnumLabel(osgGA::GUIEventAdapter::KEY_F3); - EnumLabel(osgGA::GUIEventAdapter::KEY_F4); - EnumLabel(osgGA::GUIEventAdapter::KEY_F5); - EnumLabel(osgGA::GUIEventAdapter::KEY_F6); - EnumLabel(osgGA::GUIEventAdapter::KEY_F7); - EnumLabel(osgGA::GUIEventAdapter::KEY_F8); - EnumLabel(osgGA::GUIEventAdapter::KEY_F9); - EnumLabel(osgGA::GUIEventAdapter::KEY_F10); - EnumLabel(osgGA::GUIEventAdapter::KEY_F11); - EnumLabel(osgGA::GUIEventAdapter::KEY_F12); - EnumLabel(osgGA::GUIEventAdapter::KEY_F13); - EnumLabel(osgGA::GUIEventAdapter::KEY_F14); - EnumLabel(osgGA::GUIEventAdapter::KEY_F15); - EnumLabel(osgGA::GUIEventAdapter::KEY_F16); - EnumLabel(osgGA::GUIEventAdapter::KEY_F17); - EnumLabel(osgGA::GUIEventAdapter::KEY_F18); - EnumLabel(osgGA::GUIEventAdapter::KEY_F19); - EnumLabel(osgGA::GUIEventAdapter::KEY_F20); - EnumLabel(osgGA::GUIEventAdapter::KEY_F21); - EnumLabel(osgGA::GUIEventAdapter::KEY_F22); - EnumLabel(osgGA::GUIEventAdapter::KEY_F23); - EnumLabel(osgGA::GUIEventAdapter::KEY_F24); - EnumLabel(osgGA::GUIEventAdapter::KEY_F25); - EnumLabel(osgGA::GUIEventAdapter::KEY_F26); - EnumLabel(osgGA::GUIEventAdapter::KEY_F27); - EnumLabel(osgGA::GUIEventAdapter::KEY_F28); - EnumLabel(osgGA::GUIEventAdapter::KEY_F29); - EnumLabel(osgGA::GUIEventAdapter::KEY_F30); - EnumLabel(osgGA::GUIEventAdapter::KEY_F31); - EnumLabel(osgGA::GUIEventAdapter::KEY_F32); - EnumLabel(osgGA::GUIEventAdapter::KEY_F33); - EnumLabel(osgGA::GUIEventAdapter::KEY_F34); - EnumLabel(osgGA::GUIEventAdapter::KEY_F35); - EnumLabel(osgGA::GUIEventAdapter::KEY_Shift_L); - EnumLabel(osgGA::GUIEventAdapter::KEY_Shift_R); - EnumLabel(osgGA::GUIEventAdapter::KEY_Control_L); - EnumLabel(osgGA::GUIEventAdapter::KEY_Control_R); - EnumLabel(osgGA::GUIEventAdapter::KEY_Caps_Lock); - EnumLabel(osgGA::GUIEventAdapter::KEY_Shift_Lock); - EnumLabel(osgGA::GUIEventAdapter::KEY_Meta_L); - EnumLabel(osgGA::GUIEventAdapter::KEY_Meta_R); - EnumLabel(osgGA::GUIEventAdapter::KEY_Alt_L); - EnumLabel(osgGA::GUIEventAdapter::KEY_Alt_R); - EnumLabel(osgGA::GUIEventAdapter::KEY_Super_L); - EnumLabel(osgGA::GUIEventAdapter::KEY_Super_R); - EnumLabel(osgGA::GUIEventAdapter::KEY_Hyper_L); - EnumLabel(osgGA::GUIEventAdapter::KEY_Hyper_R); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Space); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_BackSpace); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Tab); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Linefeed); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Clear); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Return); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Pause); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Scroll_Lock); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Sys_Req); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Escape); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Delete); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Home); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Left); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Up); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Right); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Down); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Prior); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Page_Up); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Next); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Page_Down); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_End); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Begin); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Select); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Print); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Execute); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Insert); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Undo); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Redo); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Menu); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Find); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Cancel); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Help); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Break); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Mode_switch); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Script_switch); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Num_Lock); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Space); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Tab); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Enter); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_F1); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_F2); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_F3); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_F4); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Home); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Left); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Up); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Right); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Down); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Prior); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Page_Up); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Next); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Page_Down); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_End); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Begin); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Insert); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Delete); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Equal); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Multiply); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Add); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Separator); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Subtract); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Decimal); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_Divide); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_0); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_1); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_2); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_3); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_4); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_5); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_6); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_7); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_8); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_KP_9); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F1); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F2); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F3); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F4); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F5); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F6); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F7); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F8); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F9); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F10); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F11); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F12); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F13); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F14); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F15); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F16); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F17); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F18); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F19); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F20); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F21); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F22); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F23); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F24); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F25); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F26); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F27); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F28); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F29); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F30); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F31); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F32); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F33); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F34); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_F35); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Shift_L); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Shift_R); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Control_L); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Control_R); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Caps_Lock); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Shift_Lock); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Meta_L); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Meta_R); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Alt_L); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Alt_R); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Super_L); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Super_R); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Hyper_L); + I_EnumLabel(osgGA::GUIEventAdapter::KEY_Hyper_R); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::ModKeyMask) - EnumLabel(osgGA::GUIEventAdapter::MODKEY_LEFT_SHIFT); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_RIGHT_SHIFT); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_LEFT_CTRL); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_RIGHT_CTRL); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_LEFT_ALT); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_RIGHT_ALT); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_LEFT_META); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_RIGHT_META); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_NUM_LOCK); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_CAPS_LOCK); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_CTRL); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_SHIFT); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_ALT); - EnumLabel(osgGA::GUIEventAdapter::MODKEY_META); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_LEFT_SHIFT); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_RIGHT_SHIFT); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_LEFT_CTRL); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_RIGHT_CTRL); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_LEFT_ALT); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_RIGHT_ALT); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_LEFT_META); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_RIGHT_META); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_NUM_LOCK); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_CAPS_LOCK); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_CTRL); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_SHIFT); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_ALT); + I_EnumLabel(osgGA::GUIEventAdapter::MODKEY_META); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::MouseYOrientation) - EnumLabel(osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS); - EnumLabel(osgGA::GUIEventAdapter::Y_INCREASING_DOWNWARDS); + I_EnumLabel(osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS); + I_EnumLabel(osgGA::GUIEventAdapter::Y_INCREASING_DOWNWARDS); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::GUIEventAdapter) - BaseType(osg::Referenced); - Method0(osgGA::GUIEventAdapter::EventType, getEventType); - Method0(int, getKey); - Method0(int, getButton); - Method1(void, setMouseYOrientation, IN, osgGA::GUIEventAdapter::MouseYOrientation, myo); - Method0(osgGA::GUIEventAdapter::MouseYOrientation, getMouseYOrientation); - Method0(float, getXmin); - Method0(float, getXmax); - Method0(float, getYmin); - Method0(float, getYmax); - Method0(float, getX); - Method0(float, getY); - Method0(unsigned int, getButtonMask); - Method0(unsigned int, getModKeyMask); - Method0(double, time); - Method0(float, getXnormalized); - Method0(float, getYnormalized); - ReadOnlyProperty(int, Button); - ReadOnlyProperty(unsigned int, ButtonMask); - ReadOnlyProperty(osgGA::GUIEventAdapter::EventType, EventType); - ReadOnlyProperty(int, Key); - ReadOnlyProperty(unsigned int, ModKeyMask); - Property(osgGA::GUIEventAdapter::MouseYOrientation, MouseYOrientation); - ReadOnlyProperty(float, X); - ReadOnlyProperty(float, Xmax); - ReadOnlyProperty(float, Xmin); - ReadOnlyProperty(float, Xnormalized); - ReadOnlyProperty(float, Y); - ReadOnlyProperty(float, Ymax); - ReadOnlyProperty(float, Ymin); - ReadOnlyProperty(float, Ynormalized); + I_BaseType(osg::Referenced); + I_Method0(osgGA::GUIEventAdapter::EventType, getEventType); + I_Method0(int, getKey); + I_Method0(int, getButton); + I_Method1(void, setMouseYOrientation, IN, osgGA::GUIEventAdapter::MouseYOrientation, myo); + I_Method0(osgGA::GUIEventAdapter::MouseYOrientation, getMouseYOrientation); + I_Method0(float, getXmin); + I_Method0(float, getXmax); + I_Method0(float, getYmin); + I_Method0(float, getYmax); + I_Method0(float, getX); + I_Method0(float, getY); + I_Method0(unsigned int, getButtonMask); + I_Method0(unsigned int, getModKeyMask); + I_Method0(double, time); + I_Method0(float, getXnormalized); + I_Method0(float, getYnormalized); + I_ReadOnlyProperty(int, Button); + I_ReadOnlyProperty(unsigned int, ButtonMask); + I_ReadOnlyProperty(osgGA::GUIEventAdapter::EventType, EventType); + I_ReadOnlyProperty(int, Key); + I_ReadOnlyProperty(unsigned int, ModKeyMask); + I_Property(osgGA::GUIEventAdapter::MouseYOrientation, MouseYOrientation); + I_ReadOnlyProperty(float, X); + I_ReadOnlyProperty(float, Xmax); + I_ReadOnlyProperty(float, Xmin); + I_ReadOnlyProperty(float, Xnormalized); + I_ReadOnlyProperty(float, Y); + I_ReadOnlyProperty(float, Ymax); + I_ReadOnlyProperty(float, Ymin); + I_ReadOnlyProperty(float, Ynormalized); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/GUIEventHandler.cpp b/src/osgWrappers/osgGA/GUIEventHandler.cpp index a0b7c1b38..fd27a4745 100644 --- a/src/osgWrappers/osgGA/GUIEventHandler.cpp +++ b/src/osgWrappers/osgGA/GUIEventHandler.cpp @@ -20,58 +20,66 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgGA::GUIEventHandler > >, osgGA::CompositeGUIEventHandler::ChildList); -BEGIN_VALUE_REFLECTOR(osgGA::CompositeGUIEventHandler) - BaseType(osgGA::GUIEventHandler); - Constructor0(); - Method0(const char *, className); - Method0(const osgGA::CompositeGUIEventHandler *, getComposite); - Method0(osgGA::CompositeGUIEventHandler *, getComposite); - Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, object, IN, osg::NodeVisitor *, nv); - Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, v); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - Method1(bool, addChild, IN, osgGA::GUIEventHandler *, geh); - Method1(bool, removeChild, IN, osgGA::GUIEventHandler *, geh); - Method0(unsigned int, getNumChildren); - Method1(osgGA::GUIEventHandler *, getChild, IN, unsigned int, i); - Method1(const osgGA::GUIEventHandler *, getChild, IN, unsigned int, i); - Method1(bool, containsNode, IN, const osgGA::GUIEventHandler *, node); - Method1(ChildList::iterator, findChild, IN, const osgGA::GUIEventHandler *, node); - ArrayProperty_GA(osgGA::GUIEventHandler *, Child, Children, unsigned int, bool); - ReadOnlyProperty(osgGA::CompositeGUIEventHandler *, Composite); +BEGIN_OBJECT_REFLECTOR(osgGA::CompositeGUIEventHandler) + I_BaseType(osgGA::GUIEventHandler); + I_Constructor0(); + I_Method0(const char *, className); + I_Method0(const osgGA::CompositeGUIEventHandler *, getComposite); + I_Method0(osgGA::CompositeGUIEventHandler *, getComposite); + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, object, IN, osg::NodeVisitor *, nv); + I_Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, v); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_Method1(bool, addChild, IN, osgGA::GUIEventHandler *, geh); + I_Method1(bool, removeChild, IN, osgGA::GUIEventHandler *, geh); + I_Method0(unsigned int, getNumChildren); + I_Method1(osgGA::GUIEventHandler *, getChild, IN, unsigned int, i); + I_Method1(const osgGA::GUIEventHandler *, getChild, IN, unsigned int, i); + I_Method1(bool, containsNode, IN, const osgGA::GUIEventHandler *, node); + I_Method1(osgGA::CompositeGUIEventHandler::ChildList::iterator, findChild, IN, const osgGA::GUIEventHandler *, node); + I_ArrayProperty_GA(osgGA::GUIEventHandler *, Child, Children, unsigned int, bool); + I_ReadOnlyProperty(osgGA::CompositeGUIEventHandler *, Composite); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgGA::GUIEventHandler) - BaseType(osg::NodeCallback); - BaseType(osg::Drawable::EventCallback); - Constructor0(); - Constructor2(IN, const osgGA::GUIEventHandler &, x, IN, const osg::CopyOp &, x); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method2(void, event, IN, osg::NodeVisitor *, nv, IN, osg::Drawable *, drawable); - Method0(const osgGA::CompositeGUIEventHandler *, getComposite); - Method0(osgGA::CompositeGUIEventHandler *, getComposite); - Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); - Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, x); - Method1(void, getUsage, IN, osg::ApplicationUsage &, x); - ReadOnlyProperty(osgGA::CompositeGUIEventHandler *, Composite); +BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventHandler) + I_BaseType(osg::NodeCallback); + I_BaseType(osg::Drawable::EventCallback); + I_Constructor0(); + I_Constructor2(IN, const osgGA::GUIEventHandler &, 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 *, nv, IN, osg::Drawable *, drawable); + I_Method0(const osgGA::CompositeGUIEventHandler *, getComposite); + I_Method0(osgGA::CompositeGUIEventHandler *, getComposite); + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); + I_Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, x); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, x); + I_ReadOnlyProperty(osgGA::CompositeGUIEventHandler *, Composite); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) - Constructor0(); - Constructor1(IN, osgGA::GUIEventHandler *, t); - Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp); - Method0(bool, valid); - Method0(osgGA::GUIEventHandler *, get); - Method0(const osgGA::GUIEventHandler *, get); - Method0(osgGA::GUIEventHandler *, take); - Method0(osgGA::GUIEventHandler *, release); - ReadOnlyProperty(osgGA::GUIEventHandler *, ); + I_Constructor0(); + I_Constructor1(IN, osgGA::GUIEventHandler *, t); + I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp); + I_Method0(bool, valid); + I_Method0(osgGA::GUIEventHandler *, get); + I_Method0(const osgGA::GUIEventHandler *, get); + I_Method0(osgGA::GUIEventHandler *, take); + I_Method0(osgGA::GUIEventHandler *, release); + I_ReadOnlyProperty(osgGA::GUIEventHandler *, ); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgGA::GUIEventHandler > >); diff --git a/src/osgWrappers/osgGA/GUIEventHandlerVisitor.cpp b/src/osgWrappers/osgGA/GUIEventHandlerVisitor.cpp index 0ef99625a..da2bfe3db 100644 --- a/src/osgWrappers/osgGA/GUIEventHandlerVisitor.cpp +++ b/src/osgWrappers/osgGA/GUIEventHandlerVisitor.cpp @@ -16,14 +16,22 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventHandlerVisitor) - Method1(void, visit, IN, osgGA::GUIEventHandler &, x); - Method1(void, visit, IN, osgGA::CompositeGUIEventHandler &, x); - Method1(void, visit, IN, osgGA::MatrixManipulator &, x); - Method1(void, visit, IN, osgGA::StateSetManipulator &, x); - Method0(const osgGA::GUIEventAdapter *, getGUIEventAdapter); - Method0(osgGA::GUIActionAdapter *, getGUIActionAdapter); - ReadOnlyProperty(osgGA::GUIActionAdapter *, GUIActionAdapter); - ReadOnlyProperty(const osgGA::GUIEventAdapter *, GUIEventAdapter); + I_Method1(void, visit, IN, osgGA::GUIEventHandler &, x); + I_Method1(void, visit, IN, osgGA::CompositeGUIEventHandler &, x); + I_Method1(void, visit, IN, osgGA::MatrixManipulator &, x); + I_Method1(void, visit, IN, osgGA::StateSetManipulator &, x); + I_Method0(const osgGA::GUIEventAdapter *, getGUIEventAdapter); + I_Method0(osgGA::GUIActionAdapter *, getGUIActionAdapter); + I_ReadOnlyProperty(osgGA::GUIActionAdapter *, GUIActionAdapter); + I_ReadOnlyProperty(const osgGA::GUIEventAdapter *, GUIEventAdapter); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp index 619fdebaf..73130fb3e 100644 --- a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp @@ -19,67 +19,75 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::pair< std::string COMMA osg::ref_ptr< osgGA::MatrixManipulator > >, osgGA::KeySwitchMatrixManipulator::NamedManipulator); TYPE_NAME_ALIAS(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >, osgGA::KeySwitchMatrixManipulator::KeyManipMap); -BEGIN_VALUE_REFLECTOR(osgGA::KeySwitchMatrixManipulator) - BaseType(osgGA::MatrixManipulator); - Constructor0(); - Method0(const char *, className); - Method3(void, addMatrixManipulator, IN, int, key, IN, std::string, name, IN, osgGA::MatrixManipulator *, cm); - Method1(void, addNumberedMatrixManipulator, IN, osgGA::MatrixManipulator *, cm); - Method0(unsigned int, getNumMatrixManipulators); - Method1(void, selectMatrixManipulator, IN, unsigned int, num); - Method0(osgGA::KeySwitchMatrixManipulator::KeyManipMap &, getKeyManipMap); - Method0(const osgGA::KeySwitchMatrixManipulator::KeyManipMap &, getKeyManipMap); - Method0(osgGA::MatrixManipulator *, getCurrentMatrixManipulator); - Method0(const osgGA::MatrixManipulator *, getCurrentMatrixManipulator); - Method1(osgGA::MatrixManipulator *, getMatrixManipulator, IN, unsigned int, key); - Method1(const osgGA::MatrixManipulator *, getMatrixManipulator, IN, unsigned int, key); - Method1(void, setMinimumDistance, IN, float, minimumDistance); - Method1(void, setCoordinateFrameCallback, IN, osgGA::MatrixManipulator::CoordinateFrameCallback *, cb); - Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); - Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); - Method0(osg::Matrixd, getMatrix); - Method0(osg::Matrixd, getInverseMatrix); - Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); - Method0(float, getFusionDistanceValue); - Method1(void, setNode, IN, osg::Node *, n); - Method0(const osg::Node *, getNode); - Method0(osg::Node *, getNode); - MethodWithDefaults4(void, setHomePosition, IN, const osg::Vec3d &, eye, , IN, const osg::Vec3d &, center, , IN, const osg::Vec3d &, up, , IN, bool, autoComputeHomePosition, false); - Method1(void, setAutoComputeHomePosition, IN, bool, flag); - Method0(void, computeHomePosition); - Method2(void, home, IN, const osgGA::GUIEventAdapter &, ee, IN, osgGA::GUIActionAdapter &, aa); - Method2(void, init, IN, const osgGA::GUIEventAdapter &, ee, IN, osgGA::GUIActionAdapter &, aa); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - WriteOnlyProperty(bool, AutoComputeHomePosition); - WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); - WriteOnlyProperty(const osg::Matrixd &, ByMatrix); - WriteOnlyProperty(osgGA::MatrixManipulator::CoordinateFrameCallback *, CoordinateFrameCallback); - ReadOnlyProperty(osgGA::MatrixManipulator *, CurrentMatrixManipulator); - ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); - ReadOnlyProperty(float, FusionDistanceValue); - ReadOnlyProperty(osg::Matrixd, InverseMatrix); - ReadOnlyProperty(osgGA::KeySwitchMatrixManipulator::KeyManipMap &, KeyManipMap); - ReadOnlyProperty(osg::Matrixd, Matrix); - ArrayProperty_G(osgGA::MatrixManipulator *, MatrixManipulator, MatrixManipulators, unsigned int, void); - WriteOnlyProperty(float, MinimumDistance); - Property(osg::Node *, Node); +BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) + I_BaseType(osgGA::MatrixManipulator); + I_Constructor0(); + I_Method0(const char *, className); + I_Method3(void, addMatrixManipulator, IN, int, key, IN, std::string, name, IN, osgGA::MatrixManipulator *, cm); + I_Method1(void, addNumberedMatrixManipulator, IN, osgGA::MatrixManipulator *, cm); + I_Method0(unsigned int, getNumMatrixManipulators); + I_Method1(void, selectMatrixManipulator, IN, unsigned int, num); + I_Method0(osgGA::KeySwitchMatrixManipulator::KeyManipMap &, getKeyManipMap); + I_Method0(const osgGA::KeySwitchMatrixManipulator::KeyManipMap &, getKeyManipMap); + I_Method0(osgGA::MatrixManipulator *, getCurrentMatrixManipulator); + I_Method0(const osgGA::MatrixManipulator *, getCurrentMatrixManipulator); + I_Method1(osgGA::MatrixManipulator *, getMatrixManipulator, IN, unsigned int, key); + I_Method1(const osgGA::MatrixManipulator *, getMatrixManipulator, IN, unsigned int, key); + I_Method1(void, setMinimumDistance, IN, float, minimumDistance); + I_Method1(void, setCoordinateFrameCallback, IN, osgGA::MatrixManipulator::CoordinateFrameCallback *, cb); + I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); + I_Method0(osg::Matrixd, getMatrix); + I_Method0(osg::Matrixd, getInverseMatrix); + I_Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); + I_Method0(float, getFusionDistanceValue); + I_Method1(void, setNode, IN, osg::Node *, n); + I_Method0(const osg::Node *, getNode); + I_Method0(osg::Node *, getNode); + I_MethodWithDefaults4(void, setHomePosition, IN, const osg::Vec3d &, eye, , IN, const osg::Vec3d &, center, , IN, const osg::Vec3d &, up, , IN, bool, autoComputeHomePosition, false); + I_Method1(void, setAutoComputeHomePosition, IN, bool, flag); + I_Method0(void, computeHomePosition); + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ee, IN, osgGA::GUIActionAdapter &, aa); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ee, IN, osgGA::GUIActionAdapter &, aa); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_WriteOnlyProperty(bool, AutoComputeHomePosition); + I_WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); + I_WriteOnlyProperty(const osg::Matrixd &, ByMatrix); + I_WriteOnlyProperty(osgGA::MatrixManipulator::CoordinateFrameCallback *, CoordinateFrameCallback); + I_ReadOnlyProperty(osgGA::MatrixManipulator *, CurrentMatrixManipulator); + I_ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); + I_ReadOnlyProperty(float, FusionDistanceValue); + I_ReadOnlyProperty(osg::Matrixd, InverseMatrix); + I_ReadOnlyProperty(osgGA::KeySwitchMatrixManipulator::KeyManipMap &, KeyManipMap); + I_ReadOnlyProperty(osg::Matrixd, Matrix); + I_ArrayProperty_G(osgGA::MatrixManipulator *, MatrixManipulator, MatrixManipulators, unsigned int, void); + I_WriteOnlyProperty(float, MinimumDistance); + I_Property(osg::Node *, Node); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::MatrixManipulator >) - Constructor0(); - Constructor1(IN, osgGA::MatrixManipulator *, t); - Constructor1(IN, const osg::ref_ptr< osgGA::MatrixManipulator > &, rp); - Method0(bool, valid); - Method0(osgGA::MatrixManipulator *, get); - Method0(const osgGA::MatrixManipulator *, get); - Method0(osgGA::MatrixManipulator *, take); - Method0(osgGA::MatrixManipulator *, release); - ReadOnlyProperty(osgGA::MatrixManipulator *, ); + I_Constructor0(); + I_Constructor1(IN, osgGA::MatrixManipulator *, t); + I_Constructor1(IN, const osg::ref_ptr< osgGA::MatrixManipulator > &, rp); + I_Method0(bool, valid); + I_Method0(osgGA::MatrixManipulator *, get); + I_Method0(const osgGA::MatrixManipulator *, get); + I_Method0(osgGA::MatrixManipulator *, take); + I_Method0(osgGA::MatrixManipulator *, release); + I_ReadOnlyProperty(osgGA::MatrixManipulator *, ); END_REFLECTOR STD_MAP_REFLECTOR(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >); diff --git a/src/osgWrappers/osgGA/MatrixManipulator.cpp b/src/osgWrappers/osgGA/MatrixManipulator.cpp index c6881eccc..a1ba12777 100644 --- a/src/osgWrappers/osgGA/MatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/MatrixManipulator.cpp @@ -19,55 +19,63 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) - BaseType(osgGA::GUIEventHandler); - Method0(const char *, className); - Method1(void, setMinimumDistance, IN, float, minimumDistance); - Method0(float, getMinimumDistance); - Method1(void, setCoordinateFrameCallback, IN, osgGA::MatrixManipulator::CoordinateFrameCallback *, cb); - Method0(osgGA::MatrixManipulator::CoordinateFrameCallback *, getCoordinateFrameCallback); - Method0(const osgGA::MatrixManipulator::CoordinateFrameCallback *, getCoordinateFrameCallback); - Method1(osg::CoordinateFrame, getCoordinateFrame, IN, const osg::Vec3d &, position); - Method1(osg::Vec3d, getSideVector, IN, const osg::CoordinateFrame &, cf); - Method1(osg::Vec3d, getFrontVector, IN, const osg::CoordinateFrame &, cf); - Method1(osg::Vec3d, getUpVector, IN, const osg::CoordinateFrame &, cf); - Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); - Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); - Method0(osg::Matrixd, getMatrix); - Method0(osg::Matrixd, getInverseMatrix); - Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); - Method0(float, getFusionDistanceValue); - Method1(void, setIntersectTraversalMask, IN, unsigned int, mask); - Method0(unsigned int, getIntersectTraversalMask); - Method1(void, setNode, IN, osg::Node *, x); - Method0(const osg::Node *, getNode); - Method0(osg::Node *, getNode); - MethodWithDefaults4(void, setHomePosition, IN, const osg::Vec3d &, eye, , IN, const osg::Vec3d &, center, , IN, const osg::Vec3d &, up, , IN, bool, autoComputeHomePosition, false); - Method3(void, getHomePosition, IN, osg::Vec3d &, eye, IN, osg::Vec3d &, center, IN, osg::Vec3d &, up); - Method1(void, setAutoComputeHomePosition, IN, bool, flag); - Method0(bool, getAutoComputeHomePosition); - Method0(void, computeHomePosition); - Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); - Method1(void, home, IN, double, x); - Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, v); - Property(bool, AutoComputeHomePosition); - WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); - WriteOnlyProperty(const osg::Matrixd &, ByMatrix); - Property(osgGA::MatrixManipulator::CoordinateFrameCallback *, CoordinateFrameCallback); - ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); - ReadOnlyProperty(float, FusionDistanceValue); - Property(unsigned int, IntersectTraversalMask); - ReadOnlyProperty(osg::Matrixd, InverseMatrix); - ReadOnlyProperty(osg::Matrixd, Matrix); - Property(float, MinimumDistance); - Property(osg::Node *, Node); + I_BaseType(osgGA::GUIEventHandler); + I_Method0(const char *, className); + I_Method1(void, setMinimumDistance, IN, float, minimumDistance); + I_Method0(float, getMinimumDistance); + I_Method1(void, setCoordinateFrameCallback, IN, osgGA::MatrixManipulator::CoordinateFrameCallback *, cb); + I_Method0(osgGA::MatrixManipulator::CoordinateFrameCallback *, getCoordinateFrameCallback); + I_Method0(const osgGA::MatrixManipulator::CoordinateFrameCallback *, getCoordinateFrameCallback); + I_Method1(osg::CoordinateFrame, getCoordinateFrame, IN, const osg::Vec3d &, position); + I_Method1(osg::Vec3d, getSideVector, IN, const osg::CoordinateFrame &, cf); + I_Method1(osg::Vec3d, getFrontVector, IN, const osg::CoordinateFrame &, cf); + I_Method1(osg::Vec3d, getUpVector, IN, const osg::CoordinateFrame &, cf); + I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); + I_Method0(osg::Matrixd, getMatrix); + I_Method0(osg::Matrixd, getInverseMatrix); + I_Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); + I_Method0(float, getFusionDistanceValue); + I_Method1(void, setIntersectTraversalMask, IN, unsigned int, mask); + I_Method0(unsigned int, getIntersectTraversalMask); + I_Method1(void, setNode, IN, osg::Node *, x); + I_Method0(const osg::Node *, getNode); + I_Method0(osg::Node *, getNode); + I_MethodWithDefaults4(void, setHomePosition, IN, const osg::Vec3d &, eye, , IN, const osg::Vec3d &, center, , IN, const osg::Vec3d &, up, , IN, bool, autoComputeHomePosition, false); + I_Method3(void, getHomePosition, IN, osg::Vec3d &, eye, IN, osg::Vec3d &, center, IN, osg::Vec3d &, up); + I_Method1(void, setAutoComputeHomePosition, IN, bool, flag); + I_Method0(bool, getAutoComputeHomePosition); + I_Method0(void, computeHomePosition); + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); + I_Method1(void, home, IN, double, x); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, v); + I_Property(bool, AutoComputeHomePosition); + I_WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); + I_WriteOnlyProperty(const osg::Matrixd &, ByMatrix); + I_Property(osgGA::MatrixManipulator::CoordinateFrameCallback *, CoordinateFrameCallback); + I_ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); + I_ReadOnlyProperty(float, FusionDistanceValue); + I_Property(unsigned int, IntersectTraversalMask); + I_ReadOnlyProperty(osg::Matrixd, InverseMatrix); + I_ReadOnlyProperty(osg::Matrixd, Matrix); + I_Property(float, MinimumDistance); + I_Property(osg::Node *, Node); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator::CoordinateFrameCallback) - BaseType(osg::Referenced); - Constructor0(); - Method1(osg::CoordinateFrame, getCoordinateFrame, IN, const osg::Vec3d &, position); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method1(osg::CoordinateFrame, getCoordinateFrame, IN, const osg::Vec3d &, position); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index 242b3598e..7c36faa3c 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -18,57 +18,65 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::TrackerMode) - EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER); - EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER_AND_AZIM); - EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER_AND_ROTATION); + I_EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER); + I_EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER_AND_AZIM); + I_EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER_AND_ROTATION); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::RotationMode) - EnumLabel(osgGA::NodeTrackerManipulator::TRACKBALL); - EnumLabel(osgGA::NodeTrackerManipulator::ELEVATION_AZIM); + I_EnumLabel(osgGA::NodeTrackerManipulator::TRACKBALL); + I_EnumLabel(osgGA::NodeTrackerManipulator::ELEVATION_AZIM); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) - BaseType(osgGA::MatrixManipulator); - Constructor0(); - Method0(const char *, className); - Method1(void, setTrackNodePath, IN, const osg::RefNodePath &, nodePath); - Method1(void, setTrackNodePath, IN, const osg::NodePath &, nodePath); - Method0(osg::RefNodePath &, getTrackNodePath); - Method0(const osg::RefNodePath &, getTrackNodePath); - Method1(void, setTrackNode, IN, osg::Node *, node); - Method0(osg::Node *, getTrackNode); - Method0(const osg::Node *, getTrackNode); - Method1(void, setTrackerMode, IN, osgGA::NodeTrackerManipulator::TrackerMode, mode); - Method0(osgGA::NodeTrackerManipulator::TrackerMode, getTrackerNode); - Method1(void, setRotationMode, IN, osgGA::NodeTrackerManipulator::RotationMode, mode); - Method0(osgGA::NodeTrackerManipulator::RotationMode, getRotationMode); - Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); - Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); - Method0(osg::Matrixd, getMatrix); - Method0(osg::Matrixd, getInverseMatrix); - Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); - Method0(float, getFusionDistanceValue); - Method1(void, setNode, IN, osg::Node *, x); - Method0(const osg::Node *, getNode); - Method0(osg::Node *, getNode); - Method0(void, computeHomePosition); - Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); - WriteOnlyProperty(const osg::Matrixd &, ByMatrix); - ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); - ReadOnlyProperty(float, FusionDistanceValue); - ReadOnlyProperty(osg::Matrixd, InverseMatrix); - ReadOnlyProperty(osg::Matrixd, Matrix); - Property(osg::Node *, Node); - Property(osgGA::NodeTrackerManipulator::RotationMode, RotationMode); - Property(osg::Node *, TrackNode); - Property(const osg::RefNodePath &, TrackNodePath); - WriteOnlyProperty(osgGA::NodeTrackerManipulator::TrackerMode, TrackerMode); - ReadOnlyProperty(osgGA::NodeTrackerManipulator::TrackerMode, TrackerNode); + I_BaseType(osgGA::MatrixManipulator); + I_Constructor0(); + I_Method0(const char *, className); + I_Method1(void, setTrackNodePath, IN, const osg::RefNodePath &, nodePath); + I_Method1(void, setTrackNodePath, IN, const osg::NodePath &, nodePath); + I_Method0(osg::RefNodePath &, getTrackNodePath); + I_Method0(const osg::RefNodePath &, getTrackNodePath); + I_Method1(void, setTrackNode, IN, osg::Node *, node); + I_Method0(osg::Node *, getTrackNode); + I_Method0(const osg::Node *, getTrackNode); + I_Method1(void, setTrackerMode, IN, osgGA::NodeTrackerManipulator::TrackerMode, mode); + I_Method0(osgGA::NodeTrackerManipulator::TrackerMode, getTrackerNode); + I_Method1(void, setRotationMode, IN, osgGA::NodeTrackerManipulator::RotationMode, mode); + I_Method0(osgGA::NodeTrackerManipulator::RotationMode, getRotationMode); + I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); + I_Method0(osg::Matrixd, getMatrix); + I_Method0(osg::Matrixd, getInverseMatrix); + I_Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); + I_Method0(float, getFusionDistanceValue); + I_Method1(void, setNode, IN, osg::Node *, x); + I_Method0(const osg::Node *, getNode); + I_Method0(osg::Node *, getNode); + I_Method0(void, computeHomePosition); + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); + I_WriteOnlyProperty(const osg::Matrixd &, ByMatrix); + I_ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); + I_ReadOnlyProperty(float, FusionDistanceValue); + I_ReadOnlyProperty(osg::Matrixd, InverseMatrix); + I_ReadOnlyProperty(osg::Matrixd, Matrix); + I_Property(osg::Node *, Node); + I_Property(osgGA::NodeTrackerManipulator::RotationMode, RotationMode); + I_Property(osg::Node *, TrackNode); + I_Property(const osg::RefNodePath &, TrackNodePath); + I_WriteOnlyProperty(osgGA::NodeTrackerManipulator::TrackerMode, TrackerMode); + I_ReadOnlyProperty(osgGA::NodeTrackerManipulator::TrackerMode, TrackerNode); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/SetSceneViewVisitor.cpp b/src/osgWrappers/osgGA/SetSceneViewVisitor.cpp index 0277cfd0d..6db4cbcc2 100644 --- a/src/osgWrappers/osgGA/SetSceneViewVisitor.cpp +++ b/src/osgWrappers/osgGA/SetSceneViewVisitor.cpp @@ -16,10 +16,18 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgGA::SetSceneViewVisitor) - BaseType(osgGA::GUIEventHandlerVisitor); - Constructor3(IN, osgGA::GUIEventAdapter *, in, IN, osgGA::GUIActionAdapter *, out, IN, osgUtil::SceneView *, sv); - Method1(void, visit, IN, osgGA::MatrixManipulator &, cm); - Method1(void, visit, IN, osgGA::StateSetManipulator &, cm); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgGA::SetSceneViewVisitor) + I_BaseType(osgGA::GUIEventHandlerVisitor); + I_Constructor3(IN, osgGA::GUIEventAdapter *, in, IN, osgGA::GUIActionAdapter *, out, IN, osgUtil::SceneView *, sv); + I_Method1(void, visit, IN, osgGA::MatrixManipulator &, cm); + I_Method1(void, visit, IN, osgGA::StateSetManipulator &, cm); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/StateSetManipulator.cpp b/src/osgWrappers/osgGA/StateSetManipulator.cpp index 5dafdc3de..420beb9b5 100644 --- a/src/osgWrappers/osgGA/StateSetManipulator.cpp +++ b/src/osgWrappers/osgGA/StateSetManipulator.cpp @@ -16,16 +16,24 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgGA::StateSetManipulator) - BaseType(osgGA::GUIEventHandler); - Constructor0(); - Method0(const char *, className); - Method1(void, setStateSet, IN, osg::StateSet *, x); - Method0(osg::StateSet *, getStateSet); - Method0(const osg::StateSet *, getStateSet); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, x); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - Property(osg::StateSet *, StateSet); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgGA::StateSetManipulator) + I_BaseType(osgGA::GUIEventHandler); + I_Constructor0(); + I_Method0(const char *, className); + I_Method1(void, setStateSet, IN, osg::StateSet *, x); + I_Method0(osg::StateSet *, getStateSet); + I_Method0(const osg::StateSet *, getStateSet); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, x); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_Property(osg::StateSet *, StateSet); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/TerrainManipulator.cpp b/src/osgWrappers/osgGA/TerrainManipulator.cpp index 4c688b2c9..874e73f34 100644 --- a/src/osgWrappers/osgGA/TerrainManipulator.cpp +++ b/src/osgWrappers/osgGA/TerrainManipulator.cpp @@ -17,37 +17,45 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgGA::TerrainManipulator::RotationMode) - EnumLabel(osgGA::TerrainManipulator::ELEVATION_AZIM_ROLL); - EnumLabel(osgGA::TerrainManipulator::ELEVATION_AZIM); + I_EnumLabel(osgGA::TerrainManipulator::ELEVATION_AZIM_ROLL); + I_EnumLabel(osgGA::TerrainManipulator::ELEVATION_AZIM); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgGA::TerrainManipulator) - BaseType(osgGA::MatrixManipulator); - Constructor0(); - Method0(const char *, className); - Method1(void, setRotationMode, IN, osgGA::TerrainManipulator::RotationMode, mode); - Method0(osgGA::TerrainManipulator::RotationMode, getRotationMode); - Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); - Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); - Method0(osg::Matrixd, getMatrix); - Method0(osg::Matrixd, getInverseMatrix); - Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); - Method0(float, getFusionDistanceValue); - Method1(void, setNode, IN, osg::Node *, x); - Method0(const osg::Node *, getNode); - Method0(osg::Node *, getNode); - Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); - WriteOnlyProperty(const osg::Matrixd &, ByMatrix); - ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); - ReadOnlyProperty(float, FusionDistanceValue); - ReadOnlyProperty(osg::Matrixd, InverseMatrix); - ReadOnlyProperty(osg::Matrixd, Matrix); - Property(osg::Node *, Node); - Property(osgGA::TerrainManipulator::RotationMode, RotationMode); + I_BaseType(osgGA::MatrixManipulator); + I_Constructor0(); + I_Method0(const char *, className); + I_Method1(void, setRotationMode, IN, osgGA::TerrainManipulator::RotationMode, mode); + I_Method0(osgGA::TerrainManipulator::RotationMode, getRotationMode); + I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); + I_Method0(osg::Matrixd, getMatrix); + I_Method0(osg::Matrixd, getInverseMatrix); + I_Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); + I_Method0(float, getFusionDistanceValue); + I_Method1(void, setNode, IN, osg::Node *, x); + I_Method0(const osg::Node *, getNode); + I_Method0(osg::Node *, getNode); + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); + I_WriteOnlyProperty(const osg::Matrixd &, ByMatrix); + I_ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); + I_ReadOnlyProperty(float, FusionDistanceValue); + I_ReadOnlyProperty(osg::Matrixd, InverseMatrix); + I_ReadOnlyProperty(osg::Matrixd, Matrix); + I_Property(osg::Node *, Node); + I_Property(osgGA::TerrainManipulator::RotationMode, RotationMode); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/TrackballManipulator.cpp b/src/osgWrappers/osgGA/TrackballManipulator.cpp index 4e1f8d10e..0747b3420 100644 --- a/src/osgWrappers/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/osgGA/TrackballManipulator.cpp @@ -17,36 +17,44 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) - BaseType(osgGA::MatrixManipulator); - Constructor0(); - Method0(const char *, className); - Method1(void, setMinimumZoomScale, IN, float, minimumZoomScale); - Method0(float, getMinimumZoomScale); - Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); - Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); - Method0(osg::Matrixd, getMatrix); - Method0(osg::Matrixd, getInverseMatrix); - Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); - Method0(float, getFusionDistanceValue); - Method1(void, setNode, IN, osg::Node *, x); - Method0(const osg::Node *, getNode); - Method0(osg::Node *, getNode); - Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, home, IN, double, x); - Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - Method1(void, setTrackballSize, IN, float, size); - Method0(float, getTrackballSize); - WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); - WriteOnlyProperty(const osg::Matrixd &, ByMatrix); - ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); - ReadOnlyProperty(float, FusionDistanceValue); - ReadOnlyProperty(osg::Matrixd, InverseMatrix); - ReadOnlyProperty(osg::Matrixd, Matrix); - Property(float, MinimumZoomScale); - Property(osg::Node *, Node); - Property(float, TrackballSize); + I_BaseType(osgGA::MatrixManipulator); + I_Constructor0(); + I_Method0(const char *, className); + I_Method1(void, setMinimumZoomScale, IN, float, minimumZoomScale); + I_Method0(float, getMinimumZoomScale); + I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix); + I_Method0(osg::Matrixd, getMatrix); + I_Method0(osg::Matrixd, getInverseMatrix); + I_Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); + I_Method0(float, getFusionDistanceValue); + I_Method1(void, setNode, IN, osg::Node *, x); + I_Method0(const osg::Node *, getNode); + I_Method0(osg::Node *, getNode); + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, home, IN, double, x); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_Method1(void, setTrackballSize, IN, float, size); + I_Method0(float, getTrackballSize); + I_WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); + I_WriteOnlyProperty(const osg::Matrixd &, ByMatrix); + I_ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); + I_ReadOnlyProperty(float, FusionDistanceValue); + I_ReadOnlyProperty(osg::Matrixd, InverseMatrix); + I_ReadOnlyProperty(osg::Matrixd, Matrix); + I_Property(float, MinimumZoomScale); + I_Property(osg::Node *, Node); + I_Property(float, TrackballSize); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/UFOManipulator.cpp b/src/osgWrappers/osgGA/UFOManipulator.cpp index 1fb9d53ed..5e6f72bf6 100644 --- a/src/osgWrappers/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/osgGA/UFOManipulator.cpp @@ -17,32 +17,36 @@ #include #include -BEGIN_VALUE_REFLECTOR(UFOManipulator) - Constructor0(); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osgGA::UFOManipulator) - BaseType(osgGA::MatrixManipulator); - Constructor0(); - Method0(const char *, className); - Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); - Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, invmat); - Method0(osg::Matrixd, getMatrix); - Method0(osg::Matrixd, getInverseMatrix); - Method1(void, setNode, IN, osg::Node *, x); - Method0(const osg::Node *, getNode); - Method0(osg::Node *, getNode); - Method0(void, computeHomePosition); - Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); - Method1(void, home, IN, double, x); - Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - Method3(void, getCurrentPositionAsLookAt, IN, osg::Vec3 &, eye, IN, osg::Vec3 &, center, IN, osg::Vec3 &, up); - WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); - WriteOnlyProperty(const osg::Matrixd &, ByMatrix); - ReadOnlyProperty(osg::Matrixd, InverseMatrix); - ReadOnlyProperty(osg::Matrixd, Matrix); - Property(osg::Node *, Node); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgGA::UFOManipulator) + I_BaseType(osgGA::MatrixManipulator); + I_Constructor0(); + I_Method0(const char *, className); + I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, invmat); + I_Method0(osg::Matrixd, getMatrix); + I_Method0(osg::Matrixd, getInverseMatrix); + I_Method1(void, setNode, IN, osg::Node *, x); + I_Method0(const osg::Node *, getNode); + I_Method0(osg::Node *, getNode); + I_Method0(void, computeHomePosition); + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); + I_Method1(void, home, IN, double, x); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_Method3(void, getCurrentPositionAsLookAt, IN, osg::Vec3 &, eye, IN, osg::Vec3 &, center, IN, osg::Vec3 &, up); + I_WriteOnlyProperty(const osg::Matrixd &, ByInverseMatrix); + I_WriteOnlyProperty(const osg::Matrixd &, ByMatrix); + I_ReadOnlyProperty(osg::Matrixd, InverseMatrix); + I_ReadOnlyProperty(osg::Matrixd, Matrix); + I_Property(osg::Node *, Node); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/AccelOperator.cpp b/src/osgWrappers/osgParticle/AccelOperator.cpp index 6536ba9fe..13988a4e5 100644 --- a/src/osgWrappers/osgParticle/AccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AccelOperator.cpp @@ -16,21 +16,29 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::AccelOperator) - BaseType(osgParticle::Operator); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::AccelOperator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(const osg::Vec3 &, getAcceleration); - Method1(void, setAcceleration, IN, const osg::Vec3 &, v); - MethodWithDefaults1(void, setToGravity, IN, float, scale, 1); - Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); - Method1(void, beginOperate, IN, osgParticle::Program *, prg); - Property(const osg::Vec3 &, Acceleration); - WriteOnlyProperty(float, ToGravity); + I_BaseType(osgParticle::Operator); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::AccelOperator &, 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(const osg::Vec3 &, getAcceleration); + I_Method1(void, setAcceleration, IN, const osg::Vec3 &, v); + I_MethodWithDefaults1(void, setToGravity, IN, float, scale, 1); + I_Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); + I_Method1(void, beginOperate, IN, osgParticle::Program *, prg); + I_Property(const osg::Vec3 &, Acceleration); + I_WriteOnlyProperty(float, ToGravity); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp index 6a75bac3a..e1008d1cd 100644 --- a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp @@ -16,19 +16,27 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::AngularAccelOperator) - BaseType(osgParticle::Operator); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::AngularAccelOperator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(const osg::Vec3 &, getAngularAcceleration); - Method1(void, setAngularAcceleration, IN, const osg::Vec3 &, v); - Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); - Method1(void, beginOperate, IN, osgParticle::Program *, prg); - Property(const osg::Vec3 &, AngularAcceleration); + I_BaseType(osgParticle::Operator); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::AngularAccelOperator &, 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(const osg::Vec3 &, getAngularAcceleration); + I_Method1(void, setAngularAcceleration, IN, const osg::Vec3 &, v); + I_Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); + I_Method1(void, beginOperate, IN, osgParticle::Program *, prg); + I_Property(const osg::Vec3 &, AngularAcceleration); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/CenteredPlacer.cpp b/src/osgWrappers/osgParticle/CenteredPlacer.cpp index 81949b741..fec95e267 100644 --- a/src/osgWrappers/osgParticle/CenteredPlacer.cpp +++ b/src/osgWrappers/osgParticle/CenteredPlacer.cpp @@ -14,16 +14,24 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::CenteredPlacer) - BaseType(osgParticle::Placer); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::CenteredPlacer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const osg::Vec3 &, getCenter); - Method1(void, setCenter, IN, const osg::Vec3 &, v); - Method3(void, setCenter, IN, float, x, IN, float, y, IN, float, z); - Property(const osg::Vec3 &, Center); + I_BaseType(osgParticle::Placer); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::CenteredPlacer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const osg::Vec3 &, getCenter); + I_Method1(void, setCenter, IN, const osg::Vec3 &, v); + I_Method3(void, setCenter, IN, float, x, IN, float, y, IN, float, z); + I_Property(const osg::Vec3 &, Center); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/Counter.cpp b/src/osgWrappers/osgParticle/Counter.cpp index 72d3d957b..17cf63d5a 100644 --- a/src/osgWrappers/osgParticle/Counter.cpp +++ b/src/osgWrappers/osgParticle/Counter.cpp @@ -13,13 +13,21 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Counter) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::Counter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method1(int, numParticlesToCreate, IN, double, dt); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::Counter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method1(int, numParticlesToCreate, IN, double, dt); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/Emitter.cpp b/src/osgWrappers/osgParticle/Emitter.cpp index 658df24d6..4c547afbe 100644 --- a/src/osgWrappers/osgParticle/Emitter.cpp +++ b/src/osgWrappers/osgParticle/Emitter.cpp @@ -15,19 +15,27 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Emitter) - BaseType(osgParticle::ParticleProcessor); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::Emitter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(const osgParticle::Particle &, getParticleTemplate); - Method1(void, setParticleTemplate, IN, const osgParticle::Particle &, p); - Method0(bool, getUseDefaultTemplate); - Method1(void, setUseDefaultTemplate, IN, bool, v); - Property(const osgParticle::Particle &, ParticleTemplate); - Property(bool, UseDefaultTemplate); + I_BaseType(osgParticle::ParticleProcessor); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::Emitter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(const osgParticle::Particle &, getParticleTemplate); + I_Method1(void, setParticleTemplate, IN, const osgParticle::Particle &, p); + I_Method0(bool, getUseDefaultTemplate); + I_Method1(void, setUseDefaultTemplate, IN, bool, v); + I_Property(const osgParticle::Particle &, ParticleTemplate); + I_Property(bool, UseDefaultTemplate); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ExplosionDebriEffect.cpp b/src/osgWrappers/osgParticle/ExplosionDebriEffect.cpp index 8307eb357..656fbce7e 100644 --- a/src/osgWrappers/osgParticle/ExplosionDebriEffect.cpp +++ b/src/osgWrappers/osgParticle/ExplosionDebriEffect.cpp @@ -17,23 +17,31 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgParticle::ExplosionDebriEffect) - BaseType(osgParticle::ParticleEffect); - ConstructorWithDefaults3(IN, const osg::Vec3 &, position, osg::Vec3(0.0f, 0.0f, 0.0f), IN, float, scale, 1.0f, IN, float, intensity, 1.0f); - ConstructorWithDefaults2(IN, const osgParticle::ExplosionDebriEffect &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(void, setDefaults); - Method0(void, setUpEmitterAndProgram); - Method0(osgParticle::Emitter *, getEmitter); - Method0(const osgParticle::Emitter *, getEmitter); - Method0(osgParticle::Program *, getProgram); - Method0(const osgParticle::Program *, getProgram); - ReadOnlyProperty(osgParticle::Emitter *, Emitter); - ReadOnlyProperty(osgParticle::Program *, Program); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionDebriEffect) + I_BaseType(osgParticle::ParticleEffect); + I_ConstructorWithDefaults3(IN, const osg::Vec3 &, position, osg::Vec3(0.0f, 0.0f, 0.0f), IN, float, scale, 1.0f, IN, float, intensity, 1.0f); + I_ConstructorWithDefaults2(IN, const osgParticle::ExplosionDebriEffect &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(void, setDefaults); + I_Method0(void, setUpEmitterAndProgram); + I_Method0(osgParticle::Emitter *, getEmitter); + I_Method0(const osgParticle::Emitter *, getEmitter); + I_Method0(osgParticle::Program *, getProgram); + I_Method0(const osgParticle::Program *, getProgram); + I_ReadOnlyProperty(osgParticle::Emitter *, Emitter); + I_ReadOnlyProperty(osgParticle::Program *, Program); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ExplosionEffect.cpp b/src/osgWrappers/osgParticle/ExplosionEffect.cpp index 103741d6a..c8c09c285 100644 --- a/src/osgWrappers/osgParticle/ExplosionEffect.cpp +++ b/src/osgWrappers/osgParticle/ExplosionEffect.cpp @@ -17,23 +17,31 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgParticle::ExplosionEffect) - BaseType(osgParticle::ParticleEffect); - ConstructorWithDefaults3(IN, const osg::Vec3 &, position, osg::Vec3(0.0f, 0.0f, 0.0f), IN, float, scale, 1.0f, IN, float, intensity, 1.0f); - ConstructorWithDefaults2(IN, const osgParticle::ExplosionEffect &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(void, setDefaults); - Method0(void, setUpEmitterAndProgram); - Method0(osgParticle::Emitter *, getEmitter); - Method0(const osgParticle::Emitter *, getEmitter); - Method0(osgParticle::Program *, getProgram); - Method0(const osgParticle::Program *, getProgram); - ReadOnlyProperty(osgParticle::Emitter *, Emitter); - ReadOnlyProperty(osgParticle::Program *, Program); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionEffect) + I_BaseType(osgParticle::ParticleEffect); + I_ConstructorWithDefaults3(IN, const osg::Vec3 &, position, osg::Vec3(0.0f, 0.0f, 0.0f), IN, float, scale, 1.0f, IN, float, intensity, 1.0f); + I_ConstructorWithDefaults2(IN, const osgParticle::ExplosionEffect &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(void, setDefaults); + I_Method0(void, setUpEmitterAndProgram); + I_Method0(osgParticle::Emitter *, getEmitter); + I_Method0(const osgParticle::Emitter *, getEmitter); + I_Method0(osgParticle::Program *, getProgram); + I_Method0(const osgParticle::Program *, getProgram); + I_ReadOnlyProperty(osgParticle::Emitter *, Emitter); + I_ReadOnlyProperty(osgParticle::Program *, Program); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/FireEffect.cpp b/src/osgWrappers/osgParticle/FireEffect.cpp index e64296d4e..c65412e52 100644 --- a/src/osgWrappers/osgParticle/FireEffect.cpp +++ b/src/osgWrappers/osgParticle/FireEffect.cpp @@ -17,23 +17,31 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgParticle::FireEffect) - BaseType(osgParticle::ParticleEffect); - ConstructorWithDefaults3(IN, const osg::Vec3 &, position, osg::Vec3(0.0f, 0.0f, 0.0f), IN, float, scale, 1.0f, IN, float, intensity, 1.0f); - ConstructorWithDefaults2(IN, const osgParticle::FireEffect &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(void, setDefaults); - Method0(void, setUpEmitterAndProgram); - Method0(osgParticle::Emitter *, getEmitter); - Method0(const osgParticle::Emitter *, getEmitter); - Method0(osgParticle::Program *, getProgram); - Method0(const osgParticle::Program *, getProgram); - ReadOnlyProperty(osgParticle::Emitter *, Emitter); - ReadOnlyProperty(osgParticle::Program *, Program); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgParticle::FireEffect) + I_BaseType(osgParticle::ParticleEffect); + I_ConstructorWithDefaults3(IN, const osg::Vec3 &, position, osg::Vec3(0.0f, 0.0f, 0.0f), IN, float, scale, 1.0f, IN, float, intensity, 1.0f); + I_ConstructorWithDefaults2(IN, const osgParticle::FireEffect &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(void, setDefaults); + I_Method0(void, setUpEmitterAndProgram); + I_Method0(osgParticle::Emitter *, getEmitter); + I_Method0(const osgParticle::Emitter *, getEmitter); + I_Method0(osgParticle::Program *, getProgram); + I_Method0(const osgParticle::Program *, getProgram); + I_ReadOnlyProperty(osgParticle::Emitter *, Emitter); + I_ReadOnlyProperty(osgParticle::Program *, Program); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp b/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp index eeddac3aa..2432953c0 100644 --- a/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp +++ b/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp @@ -16,30 +16,38 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::FluidFrictionOperator) - BaseType(osgParticle::Operator); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::FluidFrictionOperator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setFluidDensity, IN, float, d); - Method0(float, getFluidDensity); - Method1(void, setFluidViscosity, IN, float, v); - Method0(float, getFluidViscosity); - Method1(void, setWind, IN, const osg::Vec3 &, wind); - Method0(const osg::Vec3 &, getWind); - Method1(void, setOverrideRadius, IN, float, r); - Method0(float, getOverrideRadius); - Method0(void, setFluidToAir); - Method0(void, setFluidToWater); - Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); - Method1(void, beginOperate, IN, osgParticle::Program *, prg); - Property(float, FluidDensity); - Property(float, FluidViscosity); - Property(float, OverrideRadius); - Property(const osg::Vec3 &, Wind); + I_BaseType(osgParticle::Operator); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::FluidFrictionOperator &, 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_Method1(void, setFluidDensity, IN, float, d); + I_Method0(float, getFluidDensity); + I_Method1(void, setFluidViscosity, IN, float, v); + I_Method0(float, getFluidViscosity); + I_Method1(void, setWind, IN, const osg::Vec3 &, wind); + I_Method0(const osg::Vec3 &, getWind); + I_Method1(void, setOverrideRadius, IN, float, r); + I_Method0(float, getOverrideRadius); + I_Method0(void, setFluidToAir); + I_Method0(void, setFluidToWater); + I_Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); + I_Method1(void, beginOperate, IN, osgParticle::Program *, prg); + I_Property(float, FluidDensity); + I_Property(float, FluidViscosity); + I_Property(float, OverrideRadius); + I_Property(const osg::Vec3 &, Wind); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/FluidProgram.cpp b/src/osgWrappers/osgParticle/FluidProgram.cpp index 79f89a61d..d1b5ff57c 100644 --- a/src/osgWrappers/osgParticle/FluidProgram.cpp +++ b/src/osgWrappers/osgParticle/FluidProgram.cpp @@ -15,31 +15,39 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::FluidProgram) - BaseType(osgParticle::Program); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::FluidProgram &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, setFluidViscosity, IN, float, v); - Method0(float, getFluidViscosity); - Method1(void, setFluidDensity, IN, float, d); - Method0(float, getFluidDensity); - Method1(void, setWind, IN, const osg::Vec3 &, wind); - Method0(const osg::Vec3 &, getWind); - Method1(void, setAcceleration, IN, const osg::Vec3 &, v); - Method0(const osg::Vec3 &, getAcceleration); - MethodWithDefaults1(void, setToGravity, IN, float, scale, 1.0f); - Method0(void, setFluidToAir); - Method0(void, setFluidToWater); - Property(const osg::Vec3 &, Acceleration); - Property(float, FluidDensity); - Property(float, FluidViscosity); - WriteOnlyProperty(float, ToGravity); - Property(const osg::Vec3 &, Wind); + I_BaseType(osgParticle::Program); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::FluidProgram &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method1(void, setFluidViscosity, IN, float, v); + I_Method0(float, getFluidViscosity); + I_Method1(void, setFluidDensity, IN, float, d); + I_Method0(float, getFluidDensity); + I_Method1(void, setWind, IN, const osg::Vec3 &, wind); + I_Method0(const osg::Vec3 &, getWind); + I_Method1(void, setAcceleration, IN, const osg::Vec3 &, v); + I_Method0(const osg::Vec3 &, getAcceleration); + I_MethodWithDefaults1(void, setToGravity, IN, float, scale, 1.0f); + I_Method0(void, setFluidToAir); + I_Method0(void, setFluidToWater); + I_Property(const osg::Vec3 &, Acceleration); + I_Property(float, FluidDensity); + I_Property(float, FluidViscosity); + I_WriteOnlyProperty(float, ToGravity); + I_Property(const osg::Vec3 &, Wind); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ForceOperator.cpp b/src/osgWrappers/osgParticle/ForceOperator.cpp index 2206208da..71c72e5b8 100644 --- a/src/osgWrappers/osgParticle/ForceOperator.cpp +++ b/src/osgWrappers/osgParticle/ForceOperator.cpp @@ -16,19 +16,27 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::ForceOperator) - BaseType(osgParticle::Operator); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::ForceOperator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(const osg::Vec3 &, getForce); - Method1(void, setForce, IN, const osg::Vec3 &, f); - Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); - Method1(void, beginOperate, IN, osgParticle::Program *, prg); - Property(const osg::Vec3 &, Force); + I_BaseType(osgParticle::Operator); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::ForceOperator &, 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(const osg::Vec3 &, getForce); + I_Method1(void, setForce, IN, const osg::Vec3 &, f); + I_Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); + I_Method1(void, beginOperate, IN, osgParticle::Program *, prg); + I_Property(const osg::Vec3 &, Force); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/Interpolator.cpp b/src/osgWrappers/osgParticle/Interpolator.cpp index d7b3c893f..b74acc4fb 100644 --- a/src/osgWrappers/osgParticle/Interpolator.cpp +++ b/src/osgWrappers/osgParticle/Interpolator.cpp @@ -16,16 +16,24 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Interpolator) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::Interpolator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method3(float, interpolate, IN, float, t, IN, float, y1, IN, float, y2); - Method3(osg::Vec2, interpolate, IN, float, t, IN, const osg::Vec2 &, y1, IN, const osg::Vec2 &, y2); - Method3(osg::Vec3, interpolate, IN, float, t, IN, const osg::Vec3 &, y1, IN, const osg::Vec3 &, y2); - Method3(osg::Vec4, interpolate, IN, float, t, IN, const osg::Vec4 &, y1, IN, const osg::Vec4 &, y2); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::Interpolator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method3(float, interpolate, IN, float, t, IN, float, y1, IN, float, y2); + I_Method3(osg::Vec2, interpolate, IN, float, t, IN, const osg::Vec2 &, y1, IN, const osg::Vec2 &, y2); + I_Method3(osg::Vec3, interpolate, IN, float, t, IN, const osg::Vec3 &, y1, IN, const osg::Vec3 &, y2); + I_Method3(osg::Vec4, interpolate, IN, float, t, IN, const osg::Vec4 &, y1, IN, const osg::Vec4 &, y2); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/LinearInterpolator.cpp b/src/osgWrappers/osgParticle/LinearInterpolator.cpp index 4862b1fc9..b504bbfaa 100644 --- a/src/osgWrappers/osgParticle/LinearInterpolator.cpp +++ b/src/osgWrappers/osgParticle/LinearInterpolator.cpp @@ -13,15 +13,23 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::LinearInterpolator) - BaseType(osgParticle::Interpolator); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::LinearInterpolator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method3(float, interpolate, IN, float, t, IN, float, y1, IN, float, y2); + I_BaseType(osgParticle::Interpolator); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::LinearInterpolator &, 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_Method3(float, interpolate, IN, float, t, IN, float, y1, IN, float, y2); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ModularEmitter.cpp b/src/osgWrappers/osgParticle/ModularEmitter.cpp index 8da528e53..ba6e81a09 100644 --- a/src/osgWrappers/osgParticle/ModularEmitter.cpp +++ b/src/osgWrappers/osgParticle/ModularEmitter.cpp @@ -17,27 +17,35 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::ModularEmitter) - BaseType(osgParticle::Emitter); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::ModularEmitter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(osgParticle::Counter *, getCounter); - Method0(const osgParticle::Counter *, getCounter); - Method1(void, setCounter, IN, osgParticle::Counter *, c); - Method0(osgParticle::Placer *, getPlacer); - Method0(const osgParticle::Placer *, getPlacer); - Method1(void, setPlacer, IN, osgParticle::Placer *, p); - Method0(osgParticle::Shooter *, getShooter); - Method0(const osgParticle::Shooter *, getShooter); - Method1(void, setShooter, IN, osgParticle::Shooter *, s); - Property(osgParticle::Counter *, Counter); - Property(osgParticle::Placer *, Placer); - Property(osgParticle::Shooter *, Shooter); + I_BaseType(osgParticle::Emitter); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::ModularEmitter &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(osgParticle::Counter *, getCounter); + I_Method0(const osgParticle::Counter *, getCounter); + I_Method1(void, setCounter, IN, osgParticle::Counter *, c); + I_Method0(osgParticle::Placer *, getPlacer); + I_Method0(const osgParticle::Placer *, getPlacer); + I_Method1(void, setPlacer, IN, osgParticle::Placer *, p); + I_Method0(osgParticle::Shooter *, getShooter); + I_Method0(const osgParticle::Shooter *, getShooter); + I_Method1(void, setShooter, IN, osgParticle::Shooter *, s); + I_Property(osgParticle::Counter *, Counter); + I_Property(osgParticle::Placer *, Placer); + I_Property(osgParticle::Shooter *, Shooter); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ModularProgram.cpp b/src/osgWrappers/osgParticle/ModularProgram.cpp index cedb7a495..1a31b58b4 100644 --- a/src/osgWrappers/osgParticle/ModularProgram.cpp +++ b/src/osgWrappers/osgParticle/ModularProgram.cpp @@ -15,20 +15,28 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::ModularProgram) - BaseType(osgParticle::Program); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::ModularProgram &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(int, numOperators); - Method1(void, addOperator, IN, osgParticle::Operator *, o); - Method1(osgParticle::Operator *, getOperator, IN, int, i); - Method1(const osgParticle::Operator *, getOperator, IN, int, i); - Method1(void, removeOperator, IN, int, i); + I_BaseType(osgParticle::Program); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::ModularProgram &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(int, numOperators); + I_Method1(void, addOperator, IN, osgParticle::Operator *, o); + I_Method1(osgParticle::Operator *, getOperator, IN, int, i); + I_Method1(const osgParticle::Operator *, getOperator, IN, int, i); + I_Method1(void, removeOperator, IN, int, i); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp index fcd6e4148..09be77eeb 100644 --- a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp @@ -15,23 +15,31 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::MultiSegmentPlacer) - BaseType(osgParticle::Placer); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::MultiSegmentPlacer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(int, numVertices); - Method1(const osg::Vec3 &, getVertex, IN, int, i); - Method2(void, setVertex, IN, int, i, IN, const osg::Vec3 &, v); - Method4(void, setVertex, IN, int, i, IN, float, x, IN, float, y, IN, float, z); - Method1(void, addVertex, IN, const osg::Vec3 &, v); - Method3(void, addVertex, IN, float, x, IN, float, y, IN, float, z); - Method1(void, removeVertex, IN, int, i); - Method1(void, place, IN, osgParticle::Particle *, P); - IndexedProperty1(const osg::Vec3 &, Vertex, int, i); + I_BaseType(osgParticle::Placer); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::MultiSegmentPlacer &, 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, numVertices); + I_Method1(const osg::Vec3 &, getVertex, IN, int, i); + I_Method2(void, setVertex, IN, int, i, IN, const osg::Vec3 &, v); + I_Method4(void, setVertex, IN, int, i, IN, float, x, IN, float, y, IN, float, z); + I_Method1(void, addVertex, IN, const osg::Vec3 &, v); + I_Method3(void, addVertex, IN, float, x, IN, float, y, IN, float, z); + I_Method1(void, removeVertex, IN, int, i); + I_Method1(void, place, IN, osgParticle::Particle *, P); + I_IndexedProperty1(const osg::Vec3 &, Vertex, int, i); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/Operator.cpp b/src/osgWrappers/osgParticle/Operator.cpp index 22462df63..4fdf9fba5 100644 --- a/src/osgWrappers/osgParticle/Operator.cpp +++ b/src/osgWrappers/osgParticle/Operator.cpp @@ -15,18 +15,26 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Operator) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::Operator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(bool, isEnabled); - Method1(void, setEnabled, IN, bool, v); - Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); - Method1(void, beginOperate, IN, osgParticle::Program *, x); - Method0(void, endOperate); - WriteOnlyProperty(bool, Enabled); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::Operator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(bool, isEnabled); + I_Method1(void, setEnabled, IN, bool, v); + I_Method2(void, operate, IN, osgParticle::Particle *, P, IN, double, dt); + I_Method1(void, beginOperate, IN, osgParticle::Program *, x); + I_Method0(void, endOperate); + I_WriteOnlyProperty(bool, Enabled); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/Particle.cpp b/src/osgWrappers/osgParticle/Particle.cpp index ea834fb78..0fa806698 100644 --- a/src/osgWrappers/osgParticle/Particle.cpp +++ b/src/osgWrappers/osgParticle/Particle.cpp @@ -15,78 +15,86 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgParticle::Particle::Shape) - EnumLabel(osgParticle::Particle::POINT); - EnumLabel(osgParticle::Particle::QUAD); - EnumLabel(osgParticle::Particle::QUAD_TRIANGLESTRIP); - EnumLabel(osgParticle::Particle::HEXAGON); - EnumLabel(osgParticle::Particle::LINE); + I_EnumLabel(osgParticle::Particle::POINT); + I_EnumLabel(osgParticle::Particle::QUAD); + I_EnumLabel(osgParticle::Particle::QUAD_TRIANGLESTRIP); + I_EnumLabel(osgParticle::Particle::HEXAGON); + I_EnumLabel(osgParticle::Particle::LINE); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::Particle) - Constructor0(); - Method0(osgParticle::Particle::Shape, getShape); - Method1(void, setShape, IN, osgParticle::Particle::Shape, s); - Method0(bool, isAlive); - Method0(double, getLifeTime); - Method0(double, getAge); - Method0(const osgParticle::rangef &, getSizeRange); - Method0(const osgParticle::rangef &, getAlphaRange); - Method0(const osgParticle::rangev4 &, getColorRange); - Method0(const osgParticle::Interpolator *, getSizeInterpolator); - Method0(const osgParticle::Interpolator *, getAlphaInterpolator); - Method0(const osgParticle::Interpolator *, getColorInterpolator); - Method0(float, getRadius); - Method0(float, getMass); - Method0(float, getMassInv); - Method0(const osg::Vec3 &, getPosition); - Method0(const osg::Vec3 &, getVelocity); - Method0(const osg::Vec3 &, getPreviousPosition); - Method0(const osg::Vec3 &, getAngle); - Method0(const osg::Vec3 &, getAngularVelocity); - Method0(const osg::Vec3 &, getPreviousAngle); - Method0(void, kill); - Method1(void, setLifeTime, IN, double, t); - Method1(void, setSizeRange, IN, const osgParticle::rangef &, r); - Method1(void, setAlphaRange, IN, const osgParticle::rangef &, r); - Method1(void, setColorRange, IN, const osgParticle::rangev4 &, r); - Method1(void, setSizeInterpolator, IN, osgParticle::Interpolator *, ri); - Method1(void, setAlphaInterpolator, IN, osgParticle::Interpolator *, ai); - Method1(void, setColorInterpolator, IN, osgParticle::Interpolator *, ci); - Method1(void, setRadius, IN, float, r); - Method1(void, setMass, IN, float, m); - Method1(void, setPosition, IN, const osg::Vec3 &, p); - Method1(void, setVelocity, IN, const osg::Vec3 &, v); - Method1(void, addVelocity, IN, const osg::Vec3 &, dv); - Method1(void, transformPositionVelocity, IN, const osg::Matrix &, xform); - Method1(void, setAngle, IN, const osg::Vec3 &, a); - Method1(void, setAngularVelocity, IN, const osg::Vec3 &, v); - Method1(void, addAngularVelocity, IN, const osg::Vec3 &, dv); - Method1(void, transformAngleVelocity, IN, const osg::Matrix &, xform); - Method1(bool, update, IN, double, dt); - Method0(void, beginRender); - MethodWithDefaults4(void, render, IN, const osg::Vec3 &, xpos, , IN, const osg::Vec3 &, px, , IN, const osg::Vec3 &, py, , IN, float, scale, 1.0f); - Method0(void, endRender); - Method0(float, getCurrentSize); - MethodWithDefaults3(void, setTextureTile, IN, int, sTile, , IN, int, tTile, , IN, int, numTiles, 0); - ReadOnlyProperty(double, Age); - WriteOnlyProperty(osgParticle::Interpolator *, AlphaInterpolator); - Property(const osgParticle::rangef &, AlphaRange); - Property(const osg::Vec3 &, Angle); - Property(const osg::Vec3 &, AngularVelocity); - WriteOnlyProperty(osgParticle::Interpolator *, ColorInterpolator); - Property(const osgParticle::rangev4 &, ColorRange); - ReadOnlyProperty(float, CurrentSize); - Property(double, LifeTime); - Property(float, Mass); - ReadOnlyProperty(float, MassInv); - Property(const osg::Vec3 &, Position); - ReadOnlyProperty(const osg::Vec3 &, PreviousAngle); - ReadOnlyProperty(const osg::Vec3 &, PreviousPosition); - Property(float, Radius); - Property(osgParticle::Particle::Shape, Shape); - WriteOnlyProperty(osgParticle::Interpolator *, SizeInterpolator); - Property(const osgParticle::rangef &, SizeRange); - Property(const osg::Vec3 &, Velocity); + I_Constructor0(); + I_Method0(osgParticle::Particle::Shape, getShape); + I_Method1(void, setShape, IN, osgParticle::Particle::Shape, s); + I_Method0(bool, isAlive); + I_Method0(double, getLifeTime); + I_Method0(double, getAge); + I_Method0(const osgParticle::rangef &, getSizeRange); + I_Method0(const osgParticle::rangef &, getAlphaRange); + I_Method0(const osgParticle::rangev4 &, getColorRange); + I_Method0(const osgParticle::Interpolator *, getSizeInterpolator); + I_Method0(const osgParticle::Interpolator *, getAlphaInterpolator); + I_Method0(const osgParticle::Interpolator *, getColorInterpolator); + I_Method0(float, getRadius); + I_Method0(float, getMass); + I_Method0(float, getMassInv); + I_Method0(const osg::Vec3 &, getPosition); + I_Method0(const osg::Vec3 &, getVelocity); + I_Method0(const osg::Vec3 &, getPreviousPosition); + I_Method0(const osg::Vec3 &, getAngle); + I_Method0(const osg::Vec3 &, getAngularVelocity); + I_Method0(const osg::Vec3 &, getPreviousAngle); + I_Method0(void, kill); + I_Method1(void, setLifeTime, IN, double, t); + I_Method1(void, setSizeRange, IN, const osgParticle::rangef &, r); + I_Method1(void, setAlphaRange, IN, const osgParticle::rangef &, r); + I_Method1(void, setColorRange, IN, const osgParticle::rangev4 &, r); + I_Method1(void, setSizeInterpolator, IN, osgParticle::Interpolator *, ri); + I_Method1(void, setAlphaInterpolator, IN, osgParticle::Interpolator *, ai); + I_Method1(void, setColorInterpolator, IN, osgParticle::Interpolator *, ci); + I_Method1(void, setRadius, IN, float, r); + I_Method1(void, setMass, IN, float, m); + I_Method1(void, setPosition, IN, const osg::Vec3 &, p); + I_Method1(void, setVelocity, IN, const osg::Vec3 &, v); + I_Method1(void, addVelocity, IN, const osg::Vec3 &, dv); + I_Method1(void, transformPositionVelocity, IN, const osg::Matrix &, xform); + I_Method1(void, setAngle, IN, const osg::Vec3 &, a); + I_Method1(void, setAngularVelocity, IN, const osg::Vec3 &, v); + I_Method1(void, addAngularVelocity, IN, const osg::Vec3 &, dv); + I_Method1(void, transformAngleVelocity, IN, const osg::Matrix &, xform); + I_Method1(bool, update, IN, double, dt); + I_Method0(void, beginRender); + I_MethodWithDefaults4(void, render, IN, const osg::Vec3 &, xpos, , IN, const osg::Vec3 &, px, , IN, const osg::Vec3 &, py, , IN, float, scale, 1.0f); + I_Method0(void, endRender); + I_Method0(float, getCurrentSize); + I_MethodWithDefaults3(void, setTextureTile, IN, int, sTile, , IN, int, tTile, , IN, int, numTiles, 0); + I_ReadOnlyProperty(double, Age); + I_WriteOnlyProperty(osgParticle::Interpolator *, AlphaInterpolator); + I_Property(const osgParticle::rangef &, AlphaRange); + I_Property(const osg::Vec3 &, Angle); + I_Property(const osg::Vec3 &, AngularVelocity); + I_WriteOnlyProperty(osgParticle::Interpolator *, ColorInterpolator); + I_Property(const osgParticle::rangev4 &, ColorRange); + I_ReadOnlyProperty(float, CurrentSize); + I_Property(double, LifeTime); + I_Property(float, Mass); + I_ReadOnlyProperty(float, MassInv); + I_Property(const osg::Vec3 &, Position); + I_ReadOnlyProperty(const osg::Vec3 &, PreviousAngle); + I_ReadOnlyProperty(const osg::Vec3 &, PreviousPosition); + I_Property(float, Radius); + I_Property(osgParticle::Particle::Shape, Shape); + I_WriteOnlyProperty(osgParticle::Interpolator *, SizeInterpolator); + I_Property(const osgParticle::rangef &, SizeRange); + I_Property(const osg::Vec3 &, Velocity); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ParticleEffect.cpp b/src/osgWrappers/osgParticle/ParticleEffect.cpp index 791a573fe..1c3b6d056 100644 --- a/src/osgWrappers/osgParticle/ParticleEffect.cpp +++ b/src/osgWrappers/osgParticle/ParticleEffect.cpp @@ -19,57 +19,65 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleEffect) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::ParticleEffect &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, setUseLocalParticleSystem, IN, bool, local); - Method0(bool, getUseLocalParticleSystem); - Method1(void, setTextureFileName, IN, const std::string &, filename); - Method0(const std::string &, getTextureFileName); - Method1(void, setDefaultParticleTemplate, IN, const osgParticle::Particle &, p); - Method0(const osgParticle::Particle &, getDefaultParticleTemplate); - Method1(void, setPosition, IN, const osg::Vec3 &, position); - Method0(const osg::Vec3 &, getPosition); - Method1(void, setScale, IN, float, scale); - Method0(float, getScale); - Method1(void, setIntensity, IN, float, intensity); - Method0(float, getIntensity); - Method1(void, setStartTime, IN, double, startTime); - Method0(double, getStartTime); - Method1(void, setEmitterDuration, IN, double, duration); - Method0(double, getEmitterDuration); - Method1(void, setParticleDuration, IN, double, duration); - Method0(double, getParticleDuration); - Method1(void, setWind, IN, const osg::Vec3 &, wind); - Method0(const osg::Vec3 &, getWind); - Method0(bool, areAllParticlesDead); - Method0(osgParticle::Emitter *, getEmitter); - Method0(const osgParticle::Emitter *, getEmitter); - Method0(osgParticle::Program *, getProgram); - Method0(const osgParticle::Program *, getProgram); - Method1(void, setParticleSystem, IN, osgParticle::ParticleSystem *, ps); - Method0(osgParticle::ParticleSystem *, getParticleSystem); - Method0(const osgParticle::ParticleSystem *, getParticleSystem); - Method0(void, setDefaults); - Method0(void, setUpEmitterAndProgram); - Method0(void, buildEffect); - Property(const osgParticle::Particle &, DefaultParticleTemplate); - ReadOnlyProperty(osgParticle::Emitter *, Emitter); - Property(double, EmitterDuration); - Property(float, Intensity); - Property(double, ParticleDuration); - Property(osgParticle::ParticleSystem *, ParticleSystem); - Property(const osg::Vec3 &, Position); - ReadOnlyProperty(osgParticle::Program *, Program); - Property(float, Scale); - Property(double, StartTime); - Property(const std::string &, TextureFileName); - Property(bool, UseLocalParticleSystem); - Property(const osg::Vec3 &, Wind); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::ParticleEffect &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method1(void, setUseLocalParticleSystem, IN, bool, local); + I_Method0(bool, getUseLocalParticleSystem); + I_Method1(void, setTextureFileName, IN, const std::string &, filename); + I_Method0(const std::string &, getTextureFileName); + I_Method1(void, setDefaultParticleTemplate, IN, const osgParticle::Particle &, p); + I_Method0(const osgParticle::Particle &, getDefaultParticleTemplate); + I_Method1(void, setPosition, IN, const osg::Vec3 &, position); + I_Method0(const osg::Vec3 &, getPosition); + I_Method1(void, setScale, IN, float, scale); + I_Method0(float, getScale); + I_Method1(void, setIntensity, IN, float, intensity); + I_Method0(float, getIntensity); + I_Method1(void, setStartTime, IN, double, startTime); + I_Method0(double, getStartTime); + I_Method1(void, setEmitterDuration, IN, double, duration); + I_Method0(double, getEmitterDuration); + I_Method1(void, setParticleDuration, IN, double, duration); + I_Method0(double, getParticleDuration); + I_Method1(void, setWind, IN, const osg::Vec3 &, wind); + I_Method0(const osg::Vec3 &, getWind); + I_Method0(bool, areAllParticlesDead); + I_Method0(osgParticle::Emitter *, getEmitter); + I_Method0(const osgParticle::Emitter *, getEmitter); + I_Method0(osgParticle::Program *, getProgram); + I_Method0(const osgParticle::Program *, getProgram); + I_Method1(void, setParticleSystem, IN, osgParticle::ParticleSystem *, ps); + I_Method0(osgParticle::ParticleSystem *, getParticleSystem); + I_Method0(const osgParticle::ParticleSystem *, getParticleSystem); + I_Method0(void, setDefaults); + I_Method0(void, setUpEmitterAndProgram); + I_Method0(void, buildEffect); + I_Property(const osgParticle::Particle &, DefaultParticleTemplate); + I_ReadOnlyProperty(osgParticle::Emitter *, Emitter); + I_Property(double, EmitterDuration); + I_Property(float, Intensity); + I_Property(double, ParticleDuration); + I_Property(osgParticle::ParticleSystem *, ParticleSystem); + I_Property(const osg::Vec3 &, Position); + I_ReadOnlyProperty(osgParticle::Program *, Program); + I_Property(float, Scale); + I_Property(double, StartTime); + I_Property(const std::string &, TextureFileName); + I_Property(bool, UseLocalParticleSystem); + I_Property(const osg::Vec3 &, Wind); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ParticleProcessor.cpp b/src/osgWrappers/osgParticle/ParticleProcessor.cpp index ec0c5c7dd..8ca45f15d 100644 --- a/src/osgWrappers/osgParticle/ParticleProcessor.cpp +++ b/src/osgWrappers/osgParticle/ParticleProcessor.cpp @@ -18,54 +18,62 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgParticle::ParticleProcessor::ReferenceFrame) - EnumLabel(osgParticle::ParticleProcessor::RELATIVE_RF); - EnumLabel(osgParticle::ParticleProcessor::ABSOLUTE_RF); + I_EnumLabel(osgParticle::ParticleProcessor::RELATIVE_RF); + I_EnumLabel(osgParticle::ParticleProcessor::ABSOLUTE_RF); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleProcessor) - BaseType(osg::Node); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::ParticleProcessor &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(osgParticle::ParticleProcessor::ReferenceFrame, getReferenceFrame); - Method1(void, setReferenceFrame, IN, osgParticle::ParticleProcessor::ReferenceFrame, rf); - Method0(bool, isEnabled); - Method1(void, setEnabled, IN, bool, v); - Method0(osgParticle::ParticleSystem *, getParticleSystem); - Method0(const osgParticle::ParticleSystem *, getParticleSystem); - Method1(void, setParticleSystem, IN, osgParticle::ParticleSystem *, ps); - Method1(void, setEndless, IN, bool, type); - Method0(bool, isEndless); - Method1(void, setLifeTime, IN, double, t); - Method0(double, getLifeTime); - Method1(void, setStartTime, IN, double, t); - Method0(double, getStartTime); - Method1(void, setCurrentTime, IN, double, t); - Method0(double, getCurrentTime); - Method1(void, setResetTime, IN, double, t); - Method0(double, getResetTime); - Method0(bool, isAlive); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method0(const osg::Matrix &, getLocalToWorldMatrix); - Method0(const osg::Matrix &, getWorldToLocalMatrix); - Method1(osg::Vec3, transformLocalToWorld, IN, const osg::Vec3 &, P); - Method1(osg::Vec3, rotateLocalToWorld, IN, const osg::Vec3 &, P); - Method1(osg::Vec3, transformWorldToLocal, IN, const osg::Vec3 &, P); - Method1(osg::Vec3, rotateWorldToLocal, IN, const osg::Vec3 &, P); - Method0(osg::BoundingSphere, computeBound); - Property(double, CurrentTime); - WriteOnlyProperty(bool, Enabled); - WriteOnlyProperty(bool, Endless); - Property(double, LifeTime); - ReadOnlyProperty(const osg::Matrix &, LocalToWorldMatrix); - Property(osgParticle::ParticleSystem *, ParticleSystem); - Property(osgParticle::ParticleProcessor::ReferenceFrame, ReferenceFrame); - Property(double, ResetTime); - Property(double, StartTime); - ReadOnlyProperty(const osg::Matrix &, WorldToLocalMatrix); + I_BaseType(osg::Node); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::ParticleProcessor &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(osgParticle::ParticleProcessor::ReferenceFrame, getReferenceFrame); + I_Method1(void, setReferenceFrame, IN, osgParticle::ParticleProcessor::ReferenceFrame, rf); + I_Method0(bool, isEnabled); + I_Method1(void, setEnabled, IN, bool, v); + I_Method0(osgParticle::ParticleSystem *, getParticleSystem); + I_Method0(const osgParticle::ParticleSystem *, getParticleSystem); + I_Method1(void, setParticleSystem, IN, osgParticle::ParticleSystem *, ps); + I_Method1(void, setEndless, IN, bool, type); + I_Method0(bool, isEndless); + I_Method1(void, setLifeTime, IN, double, t); + I_Method0(double, getLifeTime); + I_Method1(void, setStartTime, IN, double, t); + I_Method0(double, getStartTime); + I_Method1(void, setCurrentTime, IN, double, t); + I_Method0(double, getCurrentTime); + I_Method1(void, setResetTime, IN, double, t); + I_Method0(double, getResetTime); + I_Method0(bool, isAlive); + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); + I_Method0(const osg::Matrix &, getLocalToWorldMatrix); + I_Method0(const osg::Matrix &, getWorldToLocalMatrix); + I_Method1(osg::Vec3, transformLocalToWorld, IN, const osg::Vec3 &, P); + I_Method1(osg::Vec3, rotateLocalToWorld, IN, const osg::Vec3 &, P); + I_Method1(osg::Vec3, transformWorldToLocal, IN, const osg::Vec3 &, P); + I_Method1(osg::Vec3, rotateWorldToLocal, IN, const osg::Vec3 &, P); + I_Method0(osg::BoundingSphere, computeBound); + I_Property(double, CurrentTime); + I_WriteOnlyProperty(bool, Enabled); + I_WriteOnlyProperty(bool, Endless); + I_Property(double, LifeTime); + I_ReadOnlyProperty(const osg::Matrix &, LocalToWorldMatrix); + I_Property(osgParticle::ParticleSystem *, ParticleSystem); + I_Property(osgParticle::ParticleProcessor::ReferenceFrame, ReferenceFrame); + I_Property(double, ResetTime); + I_Property(double, StartTime); + I_ReadOnlyProperty(const osg::Matrix &, WorldToLocalMatrix); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ParticleSystem.cpp b/src/osgWrappers/osgParticle/ParticleSystem.cpp index b759e8892..d2c7167a6 100644 --- a/src/osgWrappers/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp @@ -17,61 +17,69 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgParticle::ParticleSystem::Alignment) - EnumLabel(osgParticle::ParticleSystem::BILLBOARD); - EnumLabel(osgParticle::ParticleSystem::FIXED); + I_EnumLabel(osgParticle::ParticleSystem::BILLBOARD); + I_EnumLabel(osgParticle::ParticleSystem::FIXED); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystem) - BaseType(osg::Drawable); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::ParticleSystem &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(osgParticle::ParticleSystem::Alignment, getParticleAlignment); - Method1(void, setParticleAlignment, IN, osgParticle::ParticleSystem::Alignment, a); - Method0(const osg::Vec3 &, getAlignVectorX); - Method1(void, setAlignVectorX, IN, const osg::Vec3 &, v); - Method0(const osg::Vec3 &, getAlignVectorY); - Method1(void, setAlignVectorY, IN, const osg::Vec3 &, v); - Method2(void, setAlignVectors, IN, const osg::Vec3 &, X, IN, const osg::Vec3 &, Y); - Method0(const osg::BoundingBox &, getDefaultBoundingBox); - Method1(void, setDefaultBoundingBox, IN, const osg::BoundingBox &, bbox); - Method0(bool, getDoublePassRendering); - Method1(void, setDoublePassRendering, IN, bool, v); - Method0(bool, isFrozen); - Method1(void, setFrozen, IN, bool, v); - Method0(int, numParticles); - Method0(int, numDeadParticles); - Method0(bool, areAllParticlesDead); - Method1(osgParticle::Particle *, getParticle, IN, int, i); - Method1(const osgParticle::Particle *, getParticle, IN, int, i); - Method1(osgParticle::Particle *, createParticle, IN, const osgParticle::Particle *, ptemplate); - Method1(void, destroyParticle, IN, int, i); - Method0(int, getLastFrameNumber); - Method0(osgParticle::Particle &, getDefaultParticleTemplate); - Method0(const osgParticle::Particle &, getDefaultParticleTemplate); - Method1(void, setDefaultParticleTemplate, IN, const osgParticle::Particle &, p); - Method0(bool, getFreezeOnCull); - Method1(void, setFreezeOnCull, IN, bool, v); - MethodWithDefaults4(void, setDefaultAttributes, IN, const std::string &, texturefile, "", IN, bool, emissive_particles, true, IN, bool, lighting, false, IN, int, texture_unit, 0); - Method0(int, getLevelOfDetail); - Method1(void, setLevelOfDetail, IN, int, v); - Method1(void, update, IN, double, dt); - Method1(void, drawImplementation, IN, osg::State &, state); - Method0(osg::BoundingBox, computeBound); - Property(const osg::Vec3 &, AlignVectorX); - Property(const osg::Vec3 &, AlignVectorY); - Property(const osg::BoundingBox &, DefaultBoundingBox); - Property(const osgParticle::Particle &, DefaultParticleTemplate); - Property(bool, DoublePassRendering); - Property(bool, FreezeOnCull); - WriteOnlyProperty(bool, Frozen); - ReadOnlyProperty(int, LastFrameNumber); - Property(int, LevelOfDetail); - Property(osgParticle::ParticleSystem::Alignment, ParticleAlignment); + I_BaseType(osg::Drawable); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::ParticleSystem &, 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(osgParticle::ParticleSystem::Alignment, getParticleAlignment); + I_Method1(void, setParticleAlignment, IN, osgParticle::ParticleSystem::Alignment, a); + I_Method0(const osg::Vec3 &, getAlignVectorX); + I_Method1(void, setAlignVectorX, IN, const osg::Vec3 &, v); + I_Method0(const osg::Vec3 &, getAlignVectorY); + I_Method1(void, setAlignVectorY, IN, const osg::Vec3 &, v); + I_Method2(void, setAlignVectors, IN, const osg::Vec3 &, X, IN, const osg::Vec3 &, Y); + I_Method0(const osg::BoundingBox &, getDefaultBoundingBox); + I_Method1(void, setDefaultBoundingBox, IN, const osg::BoundingBox &, bbox); + I_Method0(bool, getDoublePassRendering); + I_Method1(void, setDoublePassRendering, IN, bool, v); + I_Method0(bool, isFrozen); + I_Method1(void, setFrozen, IN, bool, v); + I_Method0(int, numParticles); + I_Method0(int, numDeadParticles); + I_Method0(bool, areAllParticlesDead); + I_Method1(osgParticle::Particle *, getParticle, IN, int, i); + I_Method1(const osgParticle::Particle *, getParticle, IN, int, i); + I_Method1(osgParticle::Particle *, createParticle, IN, const osgParticle::Particle *, ptemplate); + I_Method1(void, destroyParticle, IN, int, i); + I_Method0(int, getLastFrameNumber); + I_Method0(osgParticle::Particle &, getDefaultParticleTemplate); + I_Method0(const osgParticle::Particle &, getDefaultParticleTemplate); + I_Method1(void, setDefaultParticleTemplate, IN, const osgParticle::Particle &, p); + I_Method0(bool, getFreezeOnCull); + I_Method1(void, setFreezeOnCull, IN, bool, v); + I_MethodWithDefaults4(void, setDefaultAttributes, IN, const std::string &, texturefile, "", IN, bool, emissive_particles, true, IN, bool, lighting, false, IN, int, texture_unit, 0); + I_Method0(int, getLevelOfDetail); + I_Method1(void, setLevelOfDetail, IN, int, v); + I_Method1(void, update, IN, double, dt); + I_Method1(void, drawImplementation, IN, osg::State &, state); + I_Method0(osg::BoundingBox, computeBound); + I_Property(const osg::Vec3 &, AlignVectorX); + I_Property(const osg::Vec3 &, AlignVectorY); + I_Property(const osg::BoundingBox &, DefaultBoundingBox); + I_Property(const osgParticle::Particle &, DefaultParticleTemplate); + I_Property(bool, DoublePassRendering); + I_Property(bool, FreezeOnCull); + I_WriteOnlyProperty(bool, Frozen); + I_ReadOnlyProperty(int, LastFrameNumber); + I_Property(int, LevelOfDetail); + I_Property(osgParticle::ParticleSystem::Alignment, ParticleAlignment); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp index 861d6d9ce..e18957a30 100644 --- a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp @@ -16,28 +16,36 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystemUpdater) - BaseType(osg::Node); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::ParticleSystemUpdater &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(bool, addParticleSystem, IN, osgParticle::ParticleSystem *, ps); - Method1(bool, removeParticleSystem, IN, osgParticle::ParticleSystem *, ps); - MethodWithDefaults2(bool, removeParticleSystem, IN, unsigned int, i, , IN, unsigned int, numParticleSystemsToRemove, 1); - Method2(bool, replaceParticleSystem, IN, osgParticle::ParticleSystem *, origPS, IN, osgParticle::ParticleSystem *, newPS); - Method2(bool, setParticleSystem, IN, unsigned int, i, IN, osgParticle::ParticleSystem *, ps); - Method0(unsigned int, getNumParticleSystems); - Method1(osgParticle::ParticleSystem *, getParticleSystem, IN, unsigned int, i); - Method1(const osgParticle::ParticleSystem *, getParticleSystem, IN, unsigned int, i); - Method1(bool, containsParticleSystem, IN, const osgParticle::ParticleSystem *, ps); - Method1(unsigned int, getParticleSystemIndex, IN, const osgParticle::ParticleSystem *, ps); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method0(osg::BoundingSphere, computeBound); - ArrayProperty_GSA(osgParticle::ParticleSystem *, ParticleSystem, ParticleSystems, unsigned int, bool); + I_BaseType(osg::Node); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::ParticleSystemUpdater &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method1(bool, addParticleSystem, IN, osgParticle::ParticleSystem *, ps); + I_Method1(bool, removeParticleSystem, IN, osgParticle::ParticleSystem *, ps); + I_MethodWithDefaults2(bool, removeParticleSystem, IN, unsigned int, i, , IN, unsigned int, numParticleSystemsToRemove, 1); + I_Method2(bool, replaceParticleSystem, IN, osgParticle::ParticleSystem *, origPS, IN, osgParticle::ParticleSystem *, newPS); + I_Method2(bool, setParticleSystem, IN, unsigned int, i, IN, osgParticle::ParticleSystem *, ps); + I_Method0(unsigned int, getNumParticleSystems); + I_Method1(osgParticle::ParticleSystem *, getParticleSystem, IN, unsigned int, i); + I_Method1(const osgParticle::ParticleSystem *, getParticleSystem, IN, unsigned int, i); + I_Method1(bool, containsParticleSystem, IN, const osgParticle::ParticleSystem *, ps); + I_Method1(unsigned int, getParticleSystemIndex, IN, const osgParticle::ParticleSystem *, ps); + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); + I_Method0(osg::BoundingSphere, computeBound); + I_ArrayProperty_GSA(osgParticle::ParticleSystem *, ParticleSystem, ParticleSystems, unsigned int, bool); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/Placer.cpp b/src/osgWrappers/osgParticle/Placer.cpp index e18d769c9..ed1ddf5a9 100644 --- a/src/osgWrappers/osgParticle/Placer.cpp +++ b/src/osgWrappers/osgParticle/Placer.cpp @@ -14,13 +14,21 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Placer) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::Placer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method1(void, place, IN, osgParticle::Particle *, P); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::Placer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method1(void, place, IN, osgParticle::Particle *, P); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/PointPlacer.cpp b/src/osgWrappers/osgParticle/PointPlacer.cpp index 676f1629c..5b570893f 100644 --- a/src/osgWrappers/osgParticle/PointPlacer.cpp +++ b/src/osgWrappers/osgParticle/PointPlacer.cpp @@ -14,15 +14,23 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::PointPlacer) - BaseType(osgParticle::CenteredPlacer); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::PointPlacer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, place, IN, osgParticle::Particle *, P); + I_BaseType(osgParticle::CenteredPlacer); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::PointPlacer &, 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_Method1(void, place, IN, osgParticle::Particle *, P); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/Program.cpp b/src/osgWrappers/osgParticle/Program.cpp index eefe97e98..4457ab0a1 100644 --- a/src/osgWrappers/osgParticle/Program.cpp +++ b/src/osgWrappers/osgParticle/Program.cpp @@ -14,13 +14,21 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Program) - BaseType(osgParticle::ParticleProcessor); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::Program &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_BaseType(osgParticle::ParticleProcessor); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::Program &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/RadialShooter.cpp b/src/osgWrappers/osgParticle/RadialShooter.cpp index 8563f98d2..98eb2a8d8 100644 --- a/src/osgWrappers/osgParticle/RadialShooter.cpp +++ b/src/osgWrappers/osgParticle/RadialShooter.cpp @@ -16,31 +16,39 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::RadialShooter) - BaseType(osgParticle::Shooter); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::RadialShooter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(const osgParticle::rangef &, getThetaRange); - Method1(void, setThetaRange, IN, const osgParticle::rangef &, r); - Method2(void, setThetaRange, IN, float, r1, IN, float, r2); - Method0(const osgParticle::rangef &, getPhiRange); - Method1(void, setPhiRange, IN, const osgParticle::rangef &, r); - Method2(void, setPhiRange, IN, float, r1, IN, float, r2); - Method0(const osgParticle::rangef &, getInitialSpeedRange); - Method1(void, setInitialSpeedRange, IN, const osgParticle::rangef &, r); - Method2(void, setInitialSpeedRange, IN, float, r1, IN, float, r2); - Method0(const osgParticle::rangev3 &, getInitialRotationalSpeedRange); - Method1(void, setInitialRotationalSpeedRange, IN, const osgParticle::rangev3 &, r); - Method2(void, setInitialRotationalSpeedRange, IN, const osg::Vec3 &, r1, IN, const osg::Vec3 &, r2); - Method1(void, shoot, IN, osgParticle::Particle *, P); - Property(const osgParticle::rangev3 &, InitialRotationalSpeedRange); - Property(const osgParticle::rangef &, InitialSpeedRange); - Property(const osgParticle::rangef &, PhiRange); - Property(const osgParticle::rangef &, ThetaRange); + I_BaseType(osgParticle::Shooter); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::RadialShooter &, 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(const osgParticle::rangef &, getThetaRange); + I_Method1(void, setThetaRange, IN, const osgParticle::rangef &, r); + I_Method2(void, setThetaRange, IN, float, r1, IN, float, r2); + I_Method0(const osgParticle::rangef &, getPhiRange); + I_Method1(void, setPhiRange, IN, const osgParticle::rangef &, r); + I_Method2(void, setPhiRange, IN, float, r1, IN, float, r2); + I_Method0(const osgParticle::rangef &, getInitialSpeedRange); + I_Method1(void, setInitialSpeedRange, IN, const osgParticle::rangef &, r); + I_Method2(void, setInitialSpeedRange, IN, float, r1, IN, float, r2); + I_Method0(const osgParticle::rangev3 &, getInitialRotationalSpeedRange); + I_Method1(void, setInitialRotationalSpeedRange, IN, const osgParticle::rangev3 &, r); + I_Method2(void, setInitialRotationalSpeedRange, IN, const osg::Vec3 &, r1, IN, const osg::Vec3 &, r2); + I_Method1(void, shoot, IN, osgParticle::Particle *, P); + I_Property(const osgParticle::rangev3 &, InitialRotationalSpeedRange); + I_Property(const osgParticle::rangef &, InitialSpeedRange); + I_Property(const osgParticle::rangef &, PhiRange); + I_Property(const osgParticle::rangef &, ThetaRange); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/RandomRateCounter.cpp b/src/osgWrappers/osgParticle/RandomRateCounter.cpp index 939362aac..a1484ba67 100644 --- a/src/osgWrappers/osgParticle/RandomRateCounter.cpp +++ b/src/osgWrappers/osgParticle/RandomRateCounter.cpp @@ -13,15 +13,23 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::RandomRateCounter) - BaseType(osgParticle::VariableRateCounter); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::RandomRateCounter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(int, numParticlesToCreate, IN, double, dt); + I_BaseType(osgParticle::VariableRateCounter); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::RandomRateCounter &, 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_Method1(int, numParticlesToCreate, IN, double, dt); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/SectorPlacer.cpp b/src/osgWrappers/osgParticle/SectorPlacer.cpp index 2123d8f4a..92a082768 100644 --- a/src/osgWrappers/osgParticle/SectorPlacer.cpp +++ b/src/osgWrappers/osgParticle/SectorPlacer.cpp @@ -15,23 +15,31 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::SectorPlacer) - BaseType(osgParticle::CenteredPlacer); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::SectorPlacer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const osgParticle::rangef &, getRadiusRange); - Method1(void, setRadiusRange, IN, const osgParticle::rangef &, r); - Method2(void, setRadiusRange, IN, float, r1, IN, float, r2); - Method0(const osgParticle::rangef &, getPhiRange); - Method1(void, setPhiRange, IN, const osgParticle::rangef &, r); - Method2(void, setPhiRange, IN, float, r1, IN, float, r2); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, place, IN, osgParticle::Particle *, P); - Property(const osgParticle::rangef &, PhiRange); - Property(const osgParticle::rangef &, RadiusRange); + I_BaseType(osgParticle::CenteredPlacer); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::SectorPlacer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const osgParticle::rangef &, getRadiusRange); + I_Method1(void, setRadiusRange, IN, const osgParticle::rangef &, r); + I_Method2(void, setRadiusRange, IN, float, r1, IN, float, r2); + I_Method0(const osgParticle::rangef &, getPhiRange); + I_Method1(void, setPhiRange, IN, const osgParticle::rangef &, r); + I_Method2(void, setPhiRange, IN, float, r1, IN, float, r2); + 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, place, IN, osgParticle::Particle *, P); + I_Property(const osgParticle::rangef &, PhiRange); + I_Property(const osgParticle::rangef &, RadiusRange); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/SegmentPlacer.cpp b/src/osgWrappers/osgParticle/SegmentPlacer.cpp index cefae1628..a149c48e0 100644 --- a/src/osgWrappers/osgParticle/SegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/SegmentPlacer.cpp @@ -15,24 +15,32 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgParticle::SegmentPlacer) - BaseType(osgParticle::Placer); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::SegmentPlacer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(const osg::Vec3 &, getVertexA); - Method1(void, setVertexA, IN, const osg::Vec3 &, v); - Method3(void, setVertexA, IN, float, x, IN, float, y, IN, float, z); - Method0(const osg::Vec3 &, getVertexB); - Method1(void, setVertexB, IN, const osg::Vec3 &, v); - Method3(void, setVertexB, IN, float, x, IN, float, y, IN, float, z); - Method2(void, setSegment, IN, const osg::Vec3 &, A, IN, const osg::Vec3 &, B); - Method1(void, place, IN, osgParticle::Particle *, P); - Property(const osg::Vec3 &, VertexA); - Property(const osg::Vec3 &, VertexB); + I_BaseType(osgParticle::Placer); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::SegmentPlacer &, 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(const osg::Vec3 &, getVertexA); + I_Method1(void, setVertexA, IN, const osg::Vec3 &, v); + I_Method3(void, setVertexA, IN, float, x, IN, float, y, IN, float, z); + I_Method0(const osg::Vec3 &, getVertexB); + I_Method1(void, setVertexB, IN, const osg::Vec3 &, v); + I_Method3(void, setVertexB, IN, float, x, IN, float, y, IN, float, z); + I_Method2(void, setSegment, IN, const osg::Vec3 &, A, IN, const osg::Vec3 &, B); + I_Method1(void, place, IN, osgParticle::Particle *, P); + I_Property(const osg::Vec3 &, VertexA); + I_Property(const osg::Vec3 &, VertexB); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/Shooter.cpp b/src/osgWrappers/osgParticle/Shooter.cpp index 8db011104..542bb89a6 100644 --- a/src/osgWrappers/osgParticle/Shooter.cpp +++ b/src/osgWrappers/osgParticle/Shooter.cpp @@ -14,13 +14,21 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Shooter) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::Shooter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method1(void, shoot, IN, osgParticle::Particle *, P); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::Shooter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method1(void, shoot, IN, osgParticle::Particle *, P); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/SmokeEffect.cpp b/src/osgWrappers/osgParticle/SmokeEffect.cpp index 2c61b2833..21ac13559 100644 --- a/src/osgWrappers/osgParticle/SmokeEffect.cpp +++ b/src/osgWrappers/osgParticle/SmokeEffect.cpp @@ -17,23 +17,31 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgParticle::SmokeEffect) - BaseType(osgParticle::ParticleEffect); - ConstructorWithDefaults3(IN, const osg::Vec3 &, position, osg::Vec3(0.0f, 0.0f, 0.0f), IN, float, scale, 1.0f, IN, float, intensity, 1.0f); - ConstructorWithDefaults2(IN, const osgParticle::SmokeEffect &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method0(void, setDefaults); - Method0(void, setUpEmitterAndProgram); - Method0(osgParticle::Emitter *, getEmitter); - Method0(const osgParticle::Emitter *, getEmitter); - Method0(osgParticle::Program *, getProgram); - Method0(const osgParticle::Program *, getProgram); - ReadOnlyProperty(osgParticle::Emitter *, Emitter); - ReadOnlyProperty(osgParticle::Program *, Program); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgParticle::SmokeEffect) + I_BaseType(osgParticle::ParticleEffect); + I_ConstructorWithDefaults3(IN, const osg::Vec3 &, position, osg::Vec3(0.0f, 0.0f, 0.0f), IN, float, scale, 1.0f, IN, float, intensity, 1.0f); + I_ConstructorWithDefaults2(IN, const osgParticle::SmokeEffect &, 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 *, className); + I_Method0(const char *, libraryName); + I_Method1(void, accept, IN, osg::NodeVisitor &, nv); + I_Method0(void, setDefaults); + I_Method0(void, setUpEmitterAndProgram); + I_Method0(osgParticle::Emitter *, getEmitter); + I_Method0(const osgParticle::Emitter *, getEmitter); + I_Method0(osgParticle::Program *, getProgram); + I_Method0(const osgParticle::Program *, getProgram); + I_ReadOnlyProperty(osgParticle::Emitter *, Emitter); + I_ReadOnlyProperty(osgParticle::Program *, Program); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/VariableRateCounter.cpp b/src/osgWrappers/osgParticle/VariableRateCounter.cpp index e007bf6c9..a7d09e49e 100644 --- a/src/osgWrappers/osgParticle/VariableRateCounter.cpp +++ b/src/osgWrappers/osgParticle/VariableRateCounter.cpp @@ -14,16 +14,24 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::VariableRateCounter) - BaseType(osgParticle::Counter); - Constructor0(); - ConstructorWithDefaults2(IN, const osgParticle::VariableRateCounter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const osgParticle::rangef &, getRateRange); - Method1(void, setRateRange, IN, const osgParticle::rangef &, r); - Method2(void, setRateRange, IN, float, minrange, IN, float, maxrange); - Property(const osgParticle::rangef &, RateRange); + I_BaseType(osgParticle::Counter); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::VariableRateCounter &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const osgParticle::rangef &, getRateRange); + I_Method1(void, setRateRange, IN, const osgParticle::rangef &, r); + I_Method2(void, setRateRange, IN, float, minrange, IN, float, maxrange); + I_Property(const osgParticle::rangef &, RateRange); END_REFLECTOR diff --git a/src/osgWrappers/osgParticle/range.cpp b/src/osgWrappers/osgParticle/range.cpp index b8f95d890..4debbf57c 100644 --- a/src/osgWrappers/osgParticle/range.cpp +++ b/src/osgWrappers/osgParticle/range.cpp @@ -14,6 +14,14 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(osgParticle::range< float >, osgParticle::rangef); TYPE_NAME_ALIAS(osgParticle::range< osg::Vec2 >, osgParticle::rangev2); @@ -23,42 +31,42 @@ TYPE_NAME_ALIAS(osgParticle::range< osg::Vec3 >, osgParticle::rangev3); TYPE_NAME_ALIAS(osgParticle::range< osg::Vec4 >, osgParticle::rangev4); BEGIN_VALUE_REFLECTOR(osgParticle::range< float >) - Constructor0(); - Constructor2(IN, const float &, mn, IN, const float &, mx); - Method2(void, set, IN, const float &, mn, IN, const float &, mx); - Method0(float, get_random); - Method0(float, get_random_sqrtf); - ReadOnlyProperty(float, _random); - ReadOnlyProperty(float, _random_sqrtf); + I_Constructor0(); + I_Constructor2(IN, const float &, mn, IN, const float &, mx); + I_Method2(void, set, IN, const float &, mn, IN, const float &, mx); + I_Method0(float, get_random); + I_Method0(float, get_random_sqrtf); + I_ReadOnlyProperty(float, _random); + I_ReadOnlyProperty(float, _random_sqrtf); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec2 >) - Constructor0(); - Constructor2(IN, const osg::Vec2 &, mn, IN, const osg::Vec2 &, mx); - Method2(void, set, IN, const osg::Vec2 &, mn, IN, const osg::Vec2 &, mx); - Method0(osg::Vec2, get_random); - Method0(osg::Vec2, get_random_sqrtf); - ReadOnlyProperty(osg::Vec2, _random); - ReadOnlyProperty(osg::Vec2, _random_sqrtf); + I_Constructor0(); + I_Constructor2(IN, const osg::Vec2 &, mn, IN, const osg::Vec2 &, mx); + I_Method2(void, set, IN, const osg::Vec2 &, mn, IN, const osg::Vec2 &, mx); + I_Method0(osg::Vec2, get_random); + I_Method0(osg::Vec2, get_random_sqrtf); + I_ReadOnlyProperty(osg::Vec2, _random); + I_ReadOnlyProperty(osg::Vec2, _random_sqrtf); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec3 >) - Constructor0(); - Constructor2(IN, const osg::Vec3 &, mn, IN, const osg::Vec3 &, mx); - Method2(void, set, IN, const osg::Vec3 &, mn, IN, const osg::Vec3 &, mx); - Method0(osg::Vec3, get_random); - Method0(osg::Vec3, get_random_sqrtf); - ReadOnlyProperty(osg::Vec3, _random); - ReadOnlyProperty(osg::Vec3, _random_sqrtf); + I_Constructor0(); + I_Constructor2(IN, const osg::Vec3 &, mn, IN, const osg::Vec3 &, mx); + I_Method2(void, set, IN, const osg::Vec3 &, mn, IN, const osg::Vec3 &, mx); + I_Method0(osg::Vec3, get_random); + I_Method0(osg::Vec3, get_random_sqrtf); + I_ReadOnlyProperty(osg::Vec3, _random); + I_ReadOnlyProperty(osg::Vec3, _random_sqrtf); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgParticle::range< osg::Vec4 >) - Constructor0(); - Constructor2(IN, const osg::Vec4 &, mn, IN, const osg::Vec4 &, mx); - Method2(void, set, IN, const osg::Vec4 &, mn, IN, const osg::Vec4 &, mx); - Method0(osg::Vec4, get_random); - Method0(osg::Vec4, get_random_sqrtf); - ReadOnlyProperty(osg::Vec4, _random); - ReadOnlyProperty(osg::Vec4, _random_sqrtf); + I_Constructor0(); + I_Constructor2(IN, const osg::Vec4 &, mn, IN, const osg::Vec4 &, mx); + I_Method2(void, set, IN, const osg::Vec4 &, mn, IN, const osg::Vec4 &, mx); + I_Method0(osg::Vec4, get_random); + I_Method0(osg::Vec4, get_random_sqrtf); + I_ReadOnlyProperty(osg::Vec4, _random); + I_ReadOnlyProperty(osg::Vec4, _random_sqrtf); END_REFLECTOR diff --git a/src/osgWrappers/osgProducer/EventAdapter.cpp b/src/osgWrappers/osgProducer/EventAdapter.cpp index c6233588b..3343beaeb 100644 --- a/src/osgWrappers/osgProducer/EventAdapter.cpp +++ b/src/osgWrappers/osgProducer/EventAdapter.cpp @@ -12,40 +12,48 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgProducer::EventAdapter) - BaseType(osgGA::GUIEventAdapter); - Constructor0(); - Method0(osgGA::GUIEventAdapter::EventType, getEventType); - Method0(int, getKey); - Method0(int, getButton); - Method0(float, getXmin); - Method0(float, getXmax); - Method0(float, getYmin); - Method0(float, getYmax); - Method0(float, getX); - Method0(float, getY); - Method0(unsigned int, getButtonMask); - Method0(double, time); - Method0(unsigned int, getModKeyMask); - Method5(void, adaptResize, IN, double, t, IN, float, Xmin, IN, float, Ymin, IN, float, Xmax, IN, float, Ymax); - Method2(void, adaptMouseScroll, IN, double, t, IN, Producer::KeyboardMouseCallback::ScrollingMotion, sm); - Method3(void, adaptMouseMotion, IN, double, t, IN, float, x, IN, float, y); - Method4(void, adaptButtonPress, IN, double, t, IN, float, x, IN, float, y, IN, unsigned int, button); - Method4(void, adaptButtonRelease, IN, double, t, IN, float, x, IN, float, y, IN, unsigned int, button); - Method2(void, adaptKeyPress, IN, double, t, IN, Producer::KeySymbol, key); - Method2(void, adaptKeyRelease, IN, double, t, IN, Producer::KeySymbol, key); - Method1(void, adaptFrame, IN, double, t); - Method0(void, copyStaticVariables); - ReadOnlyProperty(int, Button); - ReadOnlyProperty(unsigned int, ButtonMask); - ReadOnlyProperty(osgGA::GUIEventAdapter::EventType, EventType); - ReadOnlyProperty(int, Key); - ReadOnlyProperty(unsigned int, ModKeyMask); - ReadOnlyProperty(float, X); - ReadOnlyProperty(float, Xmax); - ReadOnlyProperty(float, Xmin); - ReadOnlyProperty(float, Y); - ReadOnlyProperty(float, Ymax); - ReadOnlyProperty(float, Ymin); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgProducer::EventAdapter) + I_BaseType(osgGA::GUIEventAdapter); + I_Constructor0(); + I_Method0(osgGA::GUIEventAdapter::EventType, getEventType); + I_Method0(int, getKey); + I_Method0(int, getButton); + I_Method0(float, getXmin); + I_Method0(float, getXmax); + I_Method0(float, getYmin); + I_Method0(float, getYmax); + I_Method0(float, getX); + I_Method0(float, getY); + I_Method0(unsigned int, getButtonMask); + I_Method0(double, time); + I_Method0(unsigned int, getModKeyMask); + I_Method5(void, adaptResize, IN, double, t, IN, float, Xmin, IN, float, Ymin, IN, float, Xmax, IN, float, Ymax); + I_Method2(void, adaptMouseScroll, IN, double, t, IN, Producer::KeyboardMouseCallback::ScrollingMotion, sm); + I_Method3(void, adaptMouseMotion, IN, double, t, IN, float, x, IN, float, y); + I_Method4(void, adaptButtonPress, IN, double, t, IN, float, x, IN, float, y, IN, unsigned int, button); + I_Method4(void, adaptButtonRelease, IN, double, t, IN, float, x, IN, float, y, IN, unsigned int, button); + I_Method2(void, adaptKeyPress, IN, double, t, IN, Producer::KeySymbol, key); + I_Method2(void, adaptKeyRelease, IN, double, t, IN, Producer::KeySymbol, key); + I_Method1(void, adaptFrame, IN, double, t); + I_Method0(void, copyStaticVariables); + I_ReadOnlyProperty(int, Button); + I_ReadOnlyProperty(unsigned int, ButtonMask); + I_ReadOnlyProperty(osgGA::GUIEventAdapter::EventType, EventType); + I_ReadOnlyProperty(int, Key); + I_ReadOnlyProperty(unsigned int, ModKeyMask); + I_ReadOnlyProperty(float, X); + I_ReadOnlyProperty(float, Xmax); + I_ReadOnlyProperty(float, Xmin); + I_ReadOnlyProperty(float, Y); + I_ReadOnlyProperty(float, Ymax); + I_ReadOnlyProperty(float, Ymin); END_REFLECTOR diff --git a/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp b/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp index 65f94092b..d0f09377f 100644 --- a/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp +++ b/src/osgWrappers/osgProducer/KeyboardMouseCallback.cpp @@ -13,51 +13,59 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgProducer::EventAdapter > >, osgProducer::KeyboardMouseCallback::EventQueue); -BEGIN_VALUE_REFLECTOR(osgProducer::KeyboardMouseCallback) - ConstructorWithDefaults3(IN, Producer::KeyboardMouse *, keyboardMouse, , IN, bool &, done, , IN, bool, escapeKeySetsDone, true); - Method1(void, mouseScroll, IN, Producer::KeyboardMouseCallback::ScrollingMotion, sm); - Method2(void, mouseMotion, IN, float, mx, IN, float, my); - Method2(void, passiveMouseMotion, IN, float, mx, IN, float, my); - Method2(void, mouseWarp, IN, float, mx, IN, float, my); - Method3(void, buttonPress, IN, float, mx, IN, float, my, IN, unsigned int, mbutton); - Method3(void, doubleButtonPress, IN, float, mx, IN, float, my, IN, unsigned int, mbutton); - Method3(void, buttonRelease, IN, float, mx, IN, float, my, IN, unsigned int, mbutton); - Method1(void, keyPress, IN, Producer::KeyCharacter, key); - Method1(void, keyRelease, IN, Producer::KeyCharacter, key); - Method1(void, specialKeyPress, IN, Producer::KeyCharacter, key); - Method1(void, specialKeyRelease, IN, Producer::KeyCharacter, key); - Method4(void, windowConfig, IN, int, x, IN, int, y, IN, unsigned int, width, IN, unsigned int, height); - Method0(void, shutdown); - Method1(void, setEscapeSetDone, IN, bool, esc); - Method0(bool, getEscapeSetDone); - Method1(double, getEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue); - Method0(bool, done); - Method0(float, mx); - Method0(float, my); - Method0(unsigned int, mbutton); - Method1(void, setStartTick, IN, osg::Timer_t, tick); - Method0(double, getTime); - Method0(Producer::KeyboardMouse *, getKeyboardMouse); - Method0(const Producer::KeyboardMouse *, getKeyboardMouse); - Method0(osgProducer::EventAdapter *, createEventAdapter); - Property(bool, EscapeSetDone); - ReadOnlyProperty(Producer::KeyboardMouse *, KeyboardMouse); - WriteOnlyProperty(osg::Timer_t, StartTick); - ReadOnlyProperty(double, Time); +BEGIN_OBJECT_REFLECTOR(osgProducer::KeyboardMouseCallback) + I_ConstructorWithDefaults3(IN, Producer::KeyboardMouse *, keyboardMouse, , IN, bool &, done, , IN, bool, escapeKeySetsDone, true); + I_Method1(void, mouseScroll, IN, Producer::KeyboardMouseCallback::ScrollingMotion, sm); + I_Method2(void, mouseMotion, IN, float, mx, IN, float, my); + I_Method2(void, passiveMouseMotion, IN, float, mx, IN, float, my); + I_Method2(void, mouseWarp, IN, float, mx, IN, float, my); + I_Method3(void, buttonPress, IN, float, mx, IN, float, my, IN, unsigned int, mbutton); + I_Method3(void, doubleButtonPress, IN, float, mx, IN, float, my, IN, unsigned int, mbutton); + I_Method3(void, buttonRelease, IN, float, mx, IN, float, my, IN, unsigned int, mbutton); + I_Method1(void, keyPress, IN, Producer::KeyCharacter, key); + I_Method1(void, keyRelease, IN, Producer::KeyCharacter, key); + I_Method1(void, specialKeyPress, IN, Producer::KeyCharacter, key); + I_Method1(void, specialKeyRelease, IN, Producer::KeyCharacter, key); + I_Method4(void, windowConfig, IN, int, x, IN, int, y, IN, unsigned int, width, IN, unsigned int, height); + I_Method0(void, shutdown); + I_Method1(void, setEscapeSetDone, IN, bool, esc); + I_Method0(bool, getEscapeSetDone); + I_Method1(double, getEventQueue, IN, osgProducer::KeyboardMouseCallback::EventQueue &, queue); + I_Method0(bool, done); + I_Method0(float, mx); + I_Method0(float, my); + I_Method0(unsigned int, mbutton); + I_Method1(void, setStartTick, IN, osg::Timer_t, tick); + I_Method0(double, getTime); + I_Method0(Producer::KeyboardMouse *, getKeyboardMouse); + I_Method0(const Producer::KeyboardMouse *, getKeyboardMouse); + I_Method0(osgProducer::EventAdapter *, createEventAdapter); + I_Property(bool, EscapeSetDone); + I_ReadOnlyProperty(Producer::KeyboardMouse *, KeyboardMouse); + I_WriteOnlyProperty(osg::Timer_t, StartTick); + I_ReadOnlyProperty(double, Time); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgProducer::EventAdapter >) - Constructor0(); - Constructor1(IN, osgProducer::EventAdapter *, t); - Constructor1(IN, const osg::ref_ptr< osgProducer::EventAdapter > &, rp); - Method0(bool, valid); - Method0(osgProducer::EventAdapter *, get); - Method0(const osgProducer::EventAdapter *, get); - Method0(osgProducer::EventAdapter *, take); - Method0(osgProducer::EventAdapter *, release); - ReadOnlyProperty(osgProducer::EventAdapter *, ); + I_Constructor0(); + I_Constructor1(IN, osgProducer::EventAdapter *, t); + I_Constructor1(IN, const osg::ref_ptr< osgProducer::EventAdapter > &, rp); + I_Method0(bool, valid); + I_Method0(osgProducer::EventAdapter *, get); + I_Method0(const osgProducer::EventAdapter *, get); + I_Method0(osgProducer::EventAdapter *, take); + I_Method0(osgProducer::EventAdapter *, release); + I_ReadOnlyProperty(osgProducer::EventAdapter *, ); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgProducer::EventAdapter > >); diff --git a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp index 6f3719fdd..0894eaa99 100644 --- a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp +++ b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp @@ -23,77 +23,87 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +TYPE_NAME_ALIAS(Producer::CameraGroup::ThreadingModel, osgProducer::OsgCameraGroup::ThreadingModel); + TYPE_NAME_ALIAS(std::vector< Producer::ref_ptr< osgProducer::OsgSceneHandler > >, osgProducer::OsgCameraGroup::SceneHandlerList); BEGIN_VALUE_REFLECTOR(osgProducer::OsgCameraGroup) - Constructor0(); - Constructor1(IN, Producer::CameraConfig *, cfg); - Constructor1(IN, const std::string &, configFile); - Constructor1(IN, osg::ArgumentParser &, arguments); - Method1(void, setApplicationUsage, IN, osg::ApplicationUsage *, au); - Method0(osg::ApplicationUsage *, getApplicationUsage); - Method0(const osg::ApplicationUsage *, getApplicationUsage); - Method0(osgProducer::OsgCameraGroup::SceneHandlerList &, getSceneHandlerList); - Method0(const osgProducer::OsgCameraGroup::SceneHandlerList &, getSceneHandlerList); - Method1(void, setSceneData, IN, osg::Node *, scene); - Method0(osg::Node *, getSceneData); - Method0(const osg::Node *, getSceneData); - Method1(void, setSceneDecorator, IN, osg::Group *, decorator); - Method0(osg::Group *, getSceneDecorator); - Method0(const osg::Group *, getSceneDecorator); - Method0(osg::Node *, getTopMostSceneData); - Method0(const osg::Node *, getTopMostSceneData); - Method0(void, updatedSceneData); - Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, ds); - Method0(osg::DisplaySettings *, getDisplaySettings); - Method0(const osg::DisplaySettings *, getDisplaySettings); - Method1(void, setCullSettings, IN, const osg::CullSettings &, cs); - Method0(osg::CullSettings &, getCullSettings); - Method0(const osg::CullSettings &, getCullSettings); - Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs); - Method0(osg::FrameStamp *, getFrameStamp); - Method0(const osg::FrameStamp *, getFrameStamp); - Method1(void, setGlobalStateSet, IN, osg::StateSet *, sset); - Method0(osg::StateSet *, getGlobalStateSet); - Method0(const osg::StateSet *, getGlobalStateSet); - Method1(void, setClearColor, IN, const osg::Vec4 &, clearColor); - Method0(const osg::Vec4 &, getClearColor); - Method1(void, setLODScale, IN, float, scale); - Method0(float, getLODScale); - MethodWithDefaults2(void, setFusionDistance, IN, osgUtil::SceneView::FusionDistanceMode, mode, , IN, float, value, 1.0f); - Method1(void, setRealizeSceneViewOptions, IN, unsigned int, options); - Method0(unsigned int, getRealizeSceneViewOptions); - Method1(void, setRealizeCallback, IN, osgProducer::OsgCameraGroup::RealizeCallback *, cb); - Method0(osgProducer::OsgCameraGroup::RealizeCallback *, getRealizeCallback); - Method0(const osgProducer::OsgCameraGroup::RealizeCallback *, getRealizeCallback); - Method0(void, advance); - Method1(bool, realize, IN, ThreadingModel, thread_model); - Method0(bool, realize); - Method1(void, setView, IN, const osg::Matrixd &, matrix); - Method0(osg::Matrixd, getViewMatrix); - Method0(void, sync); - Method0(void, frame); - Method0(void, cleanup_frame); - Property(osg::ApplicationUsage *, ApplicationUsage); - Property(const osg::Vec4 &, ClearColor); - Property(const osg::CullSettings &, CullSettings); - Property(osg::DisplaySettings *, DisplaySettings); - Property(osg::FrameStamp *, FrameStamp); - Property(osg::StateSet *, GlobalStateSet); - Property(float, LODScale); - Property(osgProducer::OsgCameraGroup::RealizeCallback *, RealizeCallback); - Property(unsigned int, RealizeSceneViewOptions); - Property(osg::Node *, SceneData); - Property(osg::Group *, SceneDecorator); - ReadOnlyProperty(osgProducer::OsgCameraGroup::SceneHandlerList &, SceneHandlerList); - ReadOnlyProperty(osg::Node *, TopMostSceneData); - WriteOnlyProperty(const osg::Matrixd &, View); - ReadOnlyProperty(osg::Matrixd, ViewMatrix); + I_Constructor0(); + I_Constructor1(IN, Producer::CameraConfig *, cfg); + I_Constructor1(IN, const std::string &, configFile); + I_Constructor1(IN, osg::ArgumentParser &, arguments); + I_Method1(void, setApplicationUsage, IN, osg::ApplicationUsage *, au); + I_Method0(osg::ApplicationUsage *, getApplicationUsage); + I_Method0(const osg::ApplicationUsage *, getApplicationUsage); + I_Method0(osgProducer::OsgCameraGroup::SceneHandlerList &, getSceneHandlerList); + I_Method0(const osgProducer::OsgCameraGroup::SceneHandlerList &, getSceneHandlerList); + I_Method1(void, setSceneData, IN, osg::Node *, scene); + I_Method0(osg::Node *, getSceneData); + I_Method0(const osg::Node *, getSceneData); + I_Method1(void, setSceneDecorator, IN, osg::Group *, decorator); + I_Method0(osg::Group *, getSceneDecorator); + I_Method0(const osg::Group *, getSceneDecorator); + I_Method0(osg::Node *, getTopMostSceneData); + I_Method0(const osg::Node *, getTopMostSceneData); + I_Method0(void, updatedSceneData); + I_Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, ds); + I_Method0(osg::DisplaySettings *, getDisplaySettings); + I_Method0(const osg::DisplaySettings *, getDisplaySettings); + I_Method1(void, setCullSettings, IN, const osg::CullSettings &, cs); + I_Method0(osg::CullSettings &, getCullSettings); + I_Method0(const osg::CullSettings &, getCullSettings); + I_Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs); + I_Method0(osg::FrameStamp *, getFrameStamp); + I_Method0(const osg::FrameStamp *, getFrameStamp); + I_Method1(void, setGlobalStateSet, IN, osg::StateSet *, sset); + I_Method0(osg::StateSet *, getGlobalStateSet); + I_Method0(const osg::StateSet *, getGlobalStateSet); + I_Method1(void, setClearColor, IN, const osg::Vec4 &, clearColor); + I_Method0(const osg::Vec4 &, getClearColor); + I_Method1(void, setLODScale, IN, float, scale); + I_Method0(float, getLODScale); + I_MethodWithDefaults2(void, setFusionDistance, IN, osgUtil::SceneView::FusionDistanceMode, mode, , IN, float, value, 1.0f); + I_Method1(void, setRealizeSceneViewOptions, IN, unsigned int, options); + I_Method0(unsigned int, getRealizeSceneViewOptions); + I_Method1(void, setRealizeCallback, IN, osgProducer::OsgCameraGroup::RealizeCallback *, cb); + I_Method0(osgProducer::OsgCameraGroup::RealizeCallback *, getRealizeCallback); + I_Method0(const osgProducer::OsgCameraGroup::RealizeCallback *, getRealizeCallback); + I_Method0(void, advance); + I_Method1(bool, realize, IN, osgProducer::OsgCameraGroup::ThreadingModel, thread_model); + I_Method0(bool, realize); + I_Method1(void, setView, IN, const osg::Matrixd &, matrix); + I_Method0(osg::Matrixd, getViewMatrix); + I_Method0(void, sync); + I_Method0(void, frame); + I_Method0(void, cleanup_frame); + I_Property(osg::ApplicationUsage *, ApplicationUsage); + I_Property(const osg::Vec4 &, ClearColor); + I_Property(const osg::CullSettings &, CullSettings); + I_Property(osg::DisplaySettings *, DisplaySettings); + I_Property(osg::FrameStamp *, FrameStamp); + I_Property(osg::StateSet *, GlobalStateSet); + I_Property(float, LODScale); + I_Property(osgProducer::OsgCameraGroup::RealizeCallback *, RealizeCallback); + I_Property(unsigned int, RealizeSceneViewOptions); + I_Property(osg::Node *, SceneData); + I_Property(osg::Group *, SceneDecorator); + I_ReadOnlyProperty(osgProducer::OsgCameraGroup::SceneHandlerList &, SceneHandlerList); + I_ReadOnlyProperty(osg::Node *, TopMostSceneData); + I_WriteOnlyProperty(const osg::Matrixd &, View); + I_ReadOnlyProperty(osg::Matrixd, ViewMatrix); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::OsgCameraGroup::RealizeCallback) - BaseType(osg::Referenced); - Constructor0(); + I_BaseType(osg::Referenced); + I_Constructor0(); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< Producer::ref_ptr< osgProducer::OsgSceneHandler > >); diff --git a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp b/src/osgWrappers/osgProducer/OsgSceneHandler.cpp index fbe1faf3e..e8972ac9d 100644 --- a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp +++ b/src/osgWrappers/osgProducer/OsgSceneHandler.cpp @@ -13,40 +13,48 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgProducer::OsgSceneHandler) - ConstructorWithDefaults1(IN, osg::DisplaySettings *, ds, NULL); - Method1(void, setSceneView, IN, osgUtil::SceneView *, sceneView); - Method0(osgUtil::SceneView *, getSceneView); - Method0(const osgUtil::SceneView *, getSceneView); - Method0(void, init); - Method1(void, clear, IN, Producer::Camera &, camera); - Method1(void, clearImplementation, IN, Producer::Camera &, camera); - Method1(void, setClearCallback, IN, osgProducer::OsgSceneHandler::Callback *, callback); - Method0(osgProducer::OsgSceneHandler::Callback *, getClearCallback); - Method0(const osgProducer::OsgSceneHandler::Callback *, getClearCallback); - Method1(void, cull, IN, Producer::Camera &, camera); - Method1(void, cullImplementation, IN, Producer::Camera &, camera); - Method1(void, setCullCallback, IN, osgProducer::OsgSceneHandler::Callback *, callback); - Method0(osgProducer::OsgSceneHandler::Callback *, getCullCallback); - Method0(const osgProducer::OsgSceneHandler::Callback *, getCullCallback); - Method1(void, draw, IN, Producer::Camera &, camera); - Method1(void, drawImplementation, IN, Producer::Camera &, camera); - Method1(void, setDrawCallback, IN, osgProducer::OsgSceneHandler::Callback *, callback); - Method0(osgProducer::OsgSceneHandler::Callback *, getDrawCallback); - Method0(const osgProducer::OsgSceneHandler::Callback *, getDrawCallback); - Method1(void, setContextID, IN, int, id); - Method1(void, setFlushOfAllDeletedGLObjectsOnNextFrame, IN, bool, flag); - Method0(bool, getFlushOfAllDeletedGLObjectsOnNextFrame); - Property(osgProducer::OsgSceneHandler::Callback *, ClearCallback); - WriteOnlyProperty(int, ContextID); - Property(osgProducer::OsgSceneHandler::Callback *, CullCallback); - Property(osgProducer::OsgSceneHandler::Callback *, DrawCallback); - Property(bool, FlushOfAllDeletedGLObjectsOnNextFrame); - Property(osgUtil::SceneView *, SceneView); + I_ConstructorWithDefaults1(IN, osg::DisplaySettings *, ds, NULL); + I_Method1(void, setSceneView, IN, osgUtil::SceneView *, sceneView); + I_Method0(osgUtil::SceneView *, getSceneView); + I_Method0(const osgUtil::SceneView *, getSceneView); + I_Method0(void, init); + I_Method1(void, clear, IN, Producer::Camera &, camera); + I_Method1(void, clearImplementation, IN, Producer::Camera &, camera); + I_Method1(void, setClearCallback, IN, osgProducer::OsgSceneHandler::Callback *, callback); + I_Method0(osgProducer::OsgSceneHandler::Callback *, getClearCallback); + I_Method0(const osgProducer::OsgSceneHandler::Callback *, getClearCallback); + I_Method1(void, cull, IN, Producer::Camera &, camera); + I_Method1(void, cullImplementation, IN, Producer::Camera &, camera); + I_Method1(void, setCullCallback, IN, osgProducer::OsgSceneHandler::Callback *, callback); + I_Method0(osgProducer::OsgSceneHandler::Callback *, getCullCallback); + I_Method0(const osgProducer::OsgSceneHandler::Callback *, getCullCallback); + I_Method1(void, draw, IN, Producer::Camera &, camera); + I_Method1(void, drawImplementation, IN, Producer::Camera &, camera); + I_Method1(void, setDrawCallback, IN, osgProducer::OsgSceneHandler::Callback *, callback); + I_Method0(osgProducer::OsgSceneHandler::Callback *, getDrawCallback); + I_Method0(const osgProducer::OsgSceneHandler::Callback *, getDrawCallback); + I_Method1(void, setContextID, IN, int, id); + I_Method1(void, setFlushOfAllDeletedGLObjectsOnNextFrame, IN, bool, flag); + I_Method0(bool, getFlushOfAllDeletedGLObjectsOnNextFrame); + I_Property(osgProducer::OsgSceneHandler::Callback *, ClearCallback); + I_WriteOnlyProperty(int, ContextID); + I_Property(osgProducer::OsgSceneHandler::Callback *, CullCallback); + I_Property(osgProducer::OsgSceneHandler::Callback *, DrawCallback); + I_Property(bool, FlushOfAllDeletedGLObjectsOnNextFrame); + I_Property(osgUtil::SceneView *, SceneView); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::OsgSceneHandler::Callback) - BaseType(osg::Referenced); - Constructor0(); + I_BaseType(osg::Referenced); + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osgProducer/Viewer.cpp b/src/osgWrappers/osgProducer/Viewer.cpp index 56d0f0859..795fdccf1 100644 --- a/src/osgWrappers/osgProducer/Viewer.cpp +++ b/src/osgWrappers/osgProducer/Viewer.cpp @@ -21,123 +21,132 @@ #include #include #include +#include #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgProducer::Viewer::EventHandlerList); BEGIN_ENUM_REFLECTOR(osgProducer::Viewer::ViewerOptions) - EnumLabel(osgProducer::Viewer::NO_EVENT_HANDLERS); - EnumLabel(osgProducer::Viewer::TRACKBALL_MANIPULATOR); - EnumLabel(osgProducer::Viewer::DRIVE_MANIPULATOR); - EnumLabel(osgProducer::Viewer::FLIGHT_MANIPULATOR); - EnumLabel(osgProducer::Viewer::TERRAIN_MANIPULATOR); - EnumLabel(osgProducer::Viewer::UFO_MANIPULATOR); - EnumLabel(osgProducer::Viewer::STATE_MANIPULATOR); - EnumLabel(osgProducer::Viewer::HEAD_LIGHT_SOURCE); - EnumLabel(osgProducer::Viewer::SKY_LIGHT_SOURCE); - EnumLabel(osgProducer::Viewer::STATS_MANIPULATOR); - EnumLabel(osgProducer::Viewer::VIEWER_MANIPULATOR); - EnumLabel(osgProducer::Viewer::ESCAPE_SETS_DONE); - EnumLabel(osgProducer::Viewer::STANDARD_SETTINGS); + I_EnumLabel(osgProducer::Viewer::NO_EVENT_HANDLERS); + I_EnumLabel(osgProducer::Viewer::TRACKBALL_MANIPULATOR); + I_EnumLabel(osgProducer::Viewer::DRIVE_MANIPULATOR); + I_EnumLabel(osgProducer::Viewer::FLIGHT_MANIPULATOR); + I_EnumLabel(osgProducer::Viewer::TERRAIN_MANIPULATOR); + I_EnumLabel(osgProducer::Viewer::UFO_MANIPULATOR); + I_EnumLabel(osgProducer::Viewer::STATE_MANIPULATOR); + I_EnumLabel(osgProducer::Viewer::HEAD_LIGHT_SOURCE); + I_EnumLabel(osgProducer::Viewer::SKY_LIGHT_SOURCE); + I_EnumLabel(osgProducer::Viewer::STATS_MANIPULATOR); + I_EnumLabel(osgProducer::Viewer::VIEWER_MANIPULATOR); + I_EnumLabel(osgProducer::Viewer::ESCAPE_SETS_DONE); + I_EnumLabel(osgProducer::Viewer::STANDARD_SETTINGS); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgProducer::Viewer) - BaseType(osgProducer::OsgCameraGroup); - BaseType(osgGA::GUIActionAdapter); - Constructor0(); - Constructor1(IN, Producer::CameraConfig *, cfg); - Constructor1(IN, const std::string &, configFile); - Constructor1(IN, osg::ArgumentParser &, arguments); - MethodWithDefaults1(void, setUpViewer, IN, unsigned int, options, osgProducer::Viewer::STANDARD_SETTINGS); - Method1(void, setDoneAtElapsedTime, IN, double, elapsedTime); - Method0(double, getDoneAtElapsedTime); - Method1(void, setDoneAtElapsedTimeEnabled, IN, bool, enabled); - Method0(bool, getDoneAtElapsedTimeEnabled); - Method1(void, setDoneAtFrameNumber, IN, unsigned int, frameNumber); - Method0(unsigned int, getDoneAtFrameNumber); - Method1(void, setDoneAtFrameNumberEnabled, IN, bool, enabled); - Method0(bool, getDoneAtFrameNumberEnabled); - Method1(void, setDone, IN, bool, done); - Method0(bool, getDone); - Method0(bool, done); - Method1(void, setWriteImageWhenDone, IN, bool, enabled); - Method0(bool, getWriteImageWhenDone); - Method1(void, setWriteImageFileName, IN, const std::string &, filename); - Method0(const std::string &, getWriteImageFileName); - Method1(void, setViewByMatrix, IN, const Producer::Matrix &, pm); - Method1(bool, realize, IN, ThreadingModel, thread_model); - Method0(bool, realize); - Method0(void, update); - Method1(void, setUpdateVisitor, IN, osg::NodeVisitor *, nv); - Method0(osg::NodeVisitor *, getUpdateVisitor); - Method0(const osg::NodeVisitor *, getUpdateVisitor); - Method1(void, setEventVisitor, IN, osgGA::EventVisitor *, nv); - Method0(osgGA::EventVisitor *, getEventVisitor); - Method0(const osgGA::EventVisitor *, getEventVisitor); - Method0(void, computeActiveCoordindateSystemNodePath); - Method1(void, setCoordindateSystemNodePath, IN, const osg::RefNodePath &, nodePath); - Method1(void, setCoordindateSystemNodePath, IN, const osg::NodePath &, nodePath); - Method0(const osg::RefNodePath &, getCoordindateSystemNodePath); - Method0(void, frame); - Method0(void, requestRedraw); - Method1(void, requestContinuousUpdate, IN, bool, x); - Method2(void, requestWarpPointer, IN, float, x, IN, float, y); - Method5(bool, computePixelCoords, IN, float, x, IN, float, y, IN, unsigned int, cameraNum, IN, float &, pixel_x, IN, float &, pixel_y); - Method5(bool, computeNearFarPoints, IN, float, x, IN, float, y, IN, unsigned int, cameraNum, IN, osg::Vec3 &, near, IN, osg::Vec3 &, far); - MethodWithDefaults6(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, unsigned int, cameraNum, , IN, osg::Node *, node, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff); - MethodWithDefaults5(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, unsigned int, cameraNum, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff); - MethodWithDefaults5(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, osg::Node *, node, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff); - MethodWithDefaults4(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff); - Method1(void, setKeyboardMouse, IN, Producer::KeyboardMouse *, kbm); - Method0(Producer::KeyboardMouse *, getKeyboardMouse); - Method0(const Producer::KeyboardMouse *, getKeyboardMouse); - Method1(void, setKeyboardMouseCallback, IN, osgProducer::KeyboardMouseCallback *, kbmcb); - Method0(osgProducer::KeyboardMouseCallback *, getKeyboardMouseCallback); - Method0(const osgProducer::KeyboardMouseCallback *, getKeyboardMouseCallback); - Method0(osgProducer::Viewer::EventHandlerList &, getEventHandlerList); - Method0(const osgProducer::Viewer::EventHandlerList &, getEventHandlerList); - Method0(osgGA::KeySwitchMatrixManipulator *, getKeySwitchMatrixManipulator); - Method0(const osgGA::KeySwitchMatrixManipulator *, getKeySwitchMatrixManipulator); - Method1(unsigned int, addCameraManipulator, IN, osgGA::MatrixManipulator *, cm); - Method1(void, selectCameraManipulator, IN, unsigned int, no); - Method1(void, getCameraManipulatorNameList, IN, std::list< std::string > &, nameList); - Method1(bool, selectCameraManipulatorByName, IN, const std::string &, name); - Method1(osgGA::MatrixManipulator *, getCameraManipulatorByName, IN, const std::string &, name); - Method1(void, setRecordingAnimationPath, IN, bool, on); - Method0(bool, getRecordingAnimationPath); - Method1(void, setAnimationPath, IN, osg::AnimationPath *, path); - Method0(osg::AnimationPath *, getAnimationPath); - Method0(const osg::AnimationPath *, getAnimationPath); - Method0(const double *, getPosition); - Method0(double, getSpeed); - Method0(osg::Quat, getOrientation); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - Method0(void, updatedSceneData); - Property(osg::AnimationPath *, AnimationPath); - Property(const osg::RefNodePath &, CoordindateSystemNodePath); - Property(bool, Done); - Property(double, DoneAtElapsedTime); - Property(bool, DoneAtElapsedTimeEnabled); - Property(unsigned int, DoneAtFrameNumber); - Property(bool, DoneAtFrameNumberEnabled); - ReadOnlyProperty(osgProducer::Viewer::EventHandlerList &, EventHandlerList); - Property(osgGA::EventVisitor *, EventVisitor); - ReadOnlyProperty(osgGA::KeySwitchMatrixManipulator *, KeySwitchMatrixManipulator); - Property(Producer::KeyboardMouse *, KeyboardMouse); - Property(osgProducer::KeyboardMouseCallback *, KeyboardMouseCallback); - ReadOnlyProperty(osg::Quat, Orientation); - ReadOnlyProperty(const double *, Position); - Property(bool, RecordingAnimationPath); - ReadOnlyProperty(double, Speed); - WriteOnlyProperty(unsigned int, UpViewer); - Property(osg::NodeVisitor *, UpdateVisitor); - WriteOnlyProperty(const Producer::Matrix &, ViewByMatrix); - Property(const std::string &, WriteImageFileName); - Property(bool, WriteImageWhenDone); +BEGIN_OBJECT_REFLECTOR(osgProducer::Viewer) + I_BaseType(osgProducer::OsgCameraGroup); + I_BaseType(osgGA::GUIActionAdapter); + I_Constructor0(); + I_Constructor1(IN, Producer::CameraConfig *, cfg); + I_Constructor1(IN, const std::string &, configFile); + I_Constructor1(IN, osg::ArgumentParser &, arguments); + I_MethodWithDefaults1(void, setUpViewer, IN, unsigned int, options, osgProducer::Viewer::STANDARD_SETTINGS); + I_Method1(void, setDoneAtElapsedTime, IN, double, elapsedTime); + I_Method0(double, getDoneAtElapsedTime); + I_Method1(void, setDoneAtElapsedTimeEnabled, IN, bool, enabled); + I_Method0(bool, getDoneAtElapsedTimeEnabled); + I_Method1(void, setDoneAtFrameNumber, IN, unsigned int, frameNumber); + I_Method0(unsigned int, getDoneAtFrameNumber); + I_Method1(void, setDoneAtFrameNumberEnabled, IN, bool, enabled); + I_Method0(bool, getDoneAtFrameNumberEnabled); + I_Method1(void, setDone, IN, bool, done); + I_Method0(bool, getDone); + I_Method0(bool, done); + I_Method1(void, setWriteImageWhenDone, IN, bool, enabled); + I_Method0(bool, getWriteImageWhenDone); + I_Method1(void, setWriteImageFileName, IN, const std::string &, filename); + I_Method0(const std::string &, getWriteImageFileName); + I_Method1(void, setViewByMatrix, IN, const Producer::Matrix &, pm); + I_Method1(bool, realize, IN, osgProducer::OsgCameraGroup::ThreadingModel, thread_model); + I_Method0(bool, realize); + I_Method0(void, update); + I_Method1(void, setUpdateVisitor, IN, osg::NodeVisitor *, nv); + I_Method0(osg::NodeVisitor *, getUpdateVisitor); + I_Method0(const osg::NodeVisitor *, getUpdateVisitor); + I_Method1(void, setEventVisitor, IN, osgGA::EventVisitor *, nv); + I_Method0(osgGA::EventVisitor *, getEventVisitor); + I_Method0(const osgGA::EventVisitor *, getEventVisitor); + I_Method0(void, computeActiveCoordindateSystemNodePath); + I_Method1(void, setCoordindateSystemNodePath, IN, const osg::RefNodePath &, nodePath); + I_Method1(void, setCoordindateSystemNodePath, IN, const osg::NodePath &, nodePath); + I_Method0(const osg::RefNodePath &, getCoordindateSystemNodePath); + I_Method0(void, frame); + I_Method0(void, requestRedraw); + I_Method1(void, requestContinuousUpdate, IN, bool, x); + I_Method2(void, requestWarpPointer, IN, float, x, IN, float, y); + I_Method5(bool, computePixelCoords, IN, float, x, IN, float, y, IN, unsigned int, cameraNum, IN, float &, pixel_x, IN, float &, pixel_y); + I_Method5(bool, computeNearFarPoints, IN, float, x, IN, float, y, IN, unsigned int, cameraNum, IN, osg::Vec3 &, near, IN, osg::Vec3 &, far); + I_MethodWithDefaults6(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, unsigned int, cameraNum, , IN, osg::Node *, node, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff); + I_MethodWithDefaults5(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, unsigned int, cameraNum, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff); + I_MethodWithDefaults5(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, osg::Node *, node, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff); + I_MethodWithDefaults4(bool, computeIntersections, IN, float, x, , IN, float, y, , IN, osgUtil::IntersectVisitor::HitList &, hits, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff); + I_Method1(void, setKeyboardMouse, IN, Producer::KeyboardMouse *, kbm); + I_Method0(Producer::KeyboardMouse *, getKeyboardMouse); + I_Method0(const Producer::KeyboardMouse *, getKeyboardMouse); + I_Method1(void, setKeyboardMouseCallback, IN, osgProducer::KeyboardMouseCallback *, kbmcb); + I_Method0(osgProducer::KeyboardMouseCallback *, getKeyboardMouseCallback); + I_Method0(const osgProducer::KeyboardMouseCallback *, getKeyboardMouseCallback); + I_Method0(osgProducer::Viewer::EventHandlerList &, getEventHandlerList); + I_Method0(const osgProducer::Viewer::EventHandlerList &, getEventHandlerList); + I_Method0(osgGA::KeySwitchMatrixManipulator *, getKeySwitchMatrixManipulator); + I_Method0(const osgGA::KeySwitchMatrixManipulator *, getKeySwitchMatrixManipulator); + I_Method1(unsigned int, addCameraManipulator, IN, osgGA::MatrixManipulator *, cm); + I_Method1(void, selectCameraManipulator, IN, unsigned int, no); + I_Method1(void, getCameraManipulatorNameList, IN, std::list< std::string > &, nameList); + I_Method1(bool, selectCameraManipulatorByName, IN, const std::string &, name); + I_Method1(osgGA::MatrixManipulator *, getCameraManipulatorByName, IN, const std::string &, name); + I_Method1(void, setRecordingAnimationPath, IN, bool, on); + I_Method0(bool, getRecordingAnimationPath); + I_Method1(void, setAnimationPath, IN, osg::AnimationPath *, path); + I_Method0(osg::AnimationPath *, getAnimationPath); + I_Method0(const osg::AnimationPath *, getAnimationPath); + I_Method0(const double *, getPosition); + I_Method0(double, getSpeed); + I_Method0(osg::Quat, getOrientation); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_Method0(void, updatedSceneData); + I_Property(osg::AnimationPath *, AnimationPath); + I_Property(const osg::RefNodePath &, CoordindateSystemNodePath); + I_Property(bool, Done); + I_Property(double, DoneAtElapsedTime); + I_Property(bool, DoneAtElapsedTimeEnabled); + I_Property(unsigned int, DoneAtFrameNumber); + I_Property(bool, DoneAtFrameNumberEnabled); + I_ReadOnlyProperty(osgProducer::Viewer::EventHandlerList &, EventHandlerList); + I_Property(osgGA::EventVisitor *, EventVisitor); + I_ReadOnlyProperty(osgGA::KeySwitchMatrixManipulator *, KeySwitchMatrixManipulator); + I_Property(Producer::KeyboardMouse *, KeyboardMouse); + I_Property(osgProducer::KeyboardMouseCallback *, KeyboardMouseCallback); + I_ReadOnlyProperty(osg::Quat, Orientation); + I_ReadOnlyProperty(const double *, Position); + I_Property(bool, RecordingAnimationPath); + I_ReadOnlyProperty(double, Speed); + I_WriteOnlyProperty(unsigned int, UpViewer); + I_Property(osg::NodeVisitor *, UpdateVisitor); + I_WriteOnlyProperty(const Producer::Matrix &, ViewByMatrix); + I_Property(const std::string &, WriteImageFileName); + I_Property(bool, WriteImageWhenDone); END_REFLECTOR STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >); -STD_LIST_REFLECTOR(std::list< std::string > &); +STD_LIST_REFLECTOR(std::list< std::string >); diff --git a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp b/src/osgWrappers/osgProducer/ViewerEventHandler.cpp index 04bfe460c..16dc00bed 100644 --- a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp +++ b/src/osgWrappers/osgProducer/ViewerEventHandler.cpp @@ -16,34 +16,42 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgProducer::ViewerEventHandler::FrameStatsMode) - EnumLabel(osgProducer::ViewerEventHandler::NO_STATS); - EnumLabel(osgProducer::ViewerEventHandler::FRAME_RATE); - EnumLabel(osgProducer::ViewerEventHandler::CAMERA_STATS); + I_EnumLabel(osgProducer::ViewerEventHandler::NO_STATS); + I_EnumLabel(osgProducer::ViewerEventHandler::FRAME_RATE); + I_EnumLabel(osgProducer::ViewerEventHandler::CAMERA_STATS); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgProducer::ViewerEventHandler) - BaseType(osgGA::GUIEventHandler); - Constructor1(IN, osgProducer::OsgCameraGroup *, cg); - Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa); - Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, gehv); - Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); - Method0(osgProducer::OsgCameraGroup *, getOsgCameraGroup); - Method0(const osgProducer::OsgCameraGroup *, getOsgCameraGroup); - Method1(void, setWriteNodeFileName, IN, const std::string &, filename); - Method0(const std::string &, getWriteNodeFileName); - Method1(void, setDisplayHelp, IN, bool, displayHelp); - Method0(bool, getDisplayHelp); - Method1(void, setFrameStatsMode, IN, osgProducer::ViewerEventHandler::FrameStatsMode, mode); - Method0(osgProducer::ViewerEventHandler::FrameStatsMode, getFrameStatsMode); - Method1(void, setWriteImageOnNextFrame, IN, bool, writeImageOnNextFrame); - Method1(void, setWriteImageFileName, IN, const std::string &, filename); - Method0(const std::string &, getWriteImageFileName); - Property(bool, DisplayHelp); - Property(osgProducer::ViewerEventHandler::FrameStatsMode, FrameStatsMode); - ReadOnlyProperty(osgProducer::OsgCameraGroup *, OsgCameraGroup); - Property(const std::string &, WriteImageFileName); - WriteOnlyProperty(bool, WriteImageOnNextFrame); - Property(const std::string &, WriteNodeFileName); +BEGIN_OBJECT_REFLECTOR(osgProducer::ViewerEventHandler) + I_BaseType(osgGA::GUIEventHandler); + I_Constructor1(IN, osgProducer::OsgCameraGroup *, cg); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa); + I_Method1(void, accept, IN, osgGA::GUIEventHandlerVisitor &, gehv); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage); + I_Method0(osgProducer::OsgCameraGroup *, getOsgCameraGroup); + I_Method0(const osgProducer::OsgCameraGroup *, getOsgCameraGroup); + I_Method1(void, setWriteNodeFileName, IN, const std::string &, filename); + I_Method0(const std::string &, getWriteNodeFileName); + I_Method1(void, setDisplayHelp, IN, bool, displayHelp); + I_Method0(bool, getDisplayHelp); + I_Method1(void, setFrameStatsMode, IN, osgProducer::ViewerEventHandler::FrameStatsMode, mode); + I_Method0(osgProducer::ViewerEventHandler::FrameStatsMode, getFrameStatsMode); + I_Method1(void, setWriteImageOnNextFrame, IN, bool, writeImageOnNextFrame); + I_Method1(void, setWriteImageFileName, IN, const std::string &, filename); + I_Method0(const std::string &, getWriteImageFileName); + I_Property(bool, DisplayHelp); + I_Property(osgProducer::ViewerEventHandler::FrameStatsMode, FrameStatsMode); + I_ReadOnlyProperty(osgProducer::OsgCameraGroup *, OsgCameraGroup); + I_Property(const std::string &, WriteImageFileName); + I_WriteOnlyProperty(bool, WriteImageOnNextFrame); + I_Property(const std::string &, WriteNodeFileName); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/BlinkSequence.cpp b/src/osgWrappers/osgSim/BlinkSequence.cpp index 8c63e6803..00aa02278 100644 --- a/src/osgWrappers/osgSim/BlinkSequence.cpp +++ b/src/osgWrappers/osgSim/BlinkSequence.cpp @@ -14,40 +14,48 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgSim::BlinkSequence) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::BlinkSequence &, bs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method2(void, addPulse, IN, double, length, IN, const osg::Vec4 &, color); - Method0(int, getNumPulses); - Method3(void, getPulse, IN, unsigned int, i, IN, double &, length, IN, osg::Vec4 &, color); - Method0(double, getPulsePeriod); - Method1(void, setSequenceGroup, IN, osgSim::SequenceGroup *, sg); - Method0(osgSim::SequenceGroup *, getSequenceGroup); - Method0(const osgSim::SequenceGroup *, getSequenceGroup); - Method1(void, setPhaseShift, IN, double, ps); - Method0(double, getPhaseShift); - Method1(double, localTime, IN, double, time); - Method2(osg::Vec4, color, IN, double, time, IN, double, length); - Property(double, PhaseShift); - ReadOnlyProperty(double, PulsePeriod); - Property(osgSim::SequenceGroup *, SequenceGroup); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgSim::BlinkSequence) + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::BlinkSequence &, bs, , 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(void, addPulse, IN, double, length, IN, const osg::Vec4 &, color); + I_Method0(int, getNumPulses); + I_Method3(void, getPulse, IN, unsigned int, i, IN, double &, length, IN, osg::Vec4 &, color); + I_Method0(double, getPulsePeriod); + I_Method1(void, setSequenceGroup, IN, osgSim::SequenceGroup *, sg); + I_Method0(osgSim::SequenceGroup *, getSequenceGroup); + I_Method0(const osgSim::SequenceGroup *, getSequenceGroup); + I_Method1(void, setPhaseShift, IN, double, ps); + I_Method0(double, getPhaseShift); + I_Method1(double, localTime, IN, double, time); + I_Method2(osg::Vec4, color, IN, double, time, IN, double, length); + I_Property(double, PhaseShift); + I_ReadOnlyProperty(double, PulsePeriod); + I_Property(osgSim::SequenceGroup *, SequenceGroup); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgSim::SequenceGroup) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::SequenceGroup &, bs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Constructor1(IN, double, baseTime); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); +BEGIN_OBJECT_REFLECTOR(osgSim::SequenceGroup) + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::SequenceGroup &, bs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Constructor1(IN, double, baseTime); + 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 diff --git a/src/osgWrappers/osgSim/ColorRange.cpp b/src/osgWrappers/osgSim/ColorRange.cpp index bbe9f61a3..5d6a43e34 100644 --- a/src/osgWrappers/osgSim/ColorRange.cpp +++ b/src/osgWrappers/osgSim/ColorRange.cpp @@ -12,12 +12,22 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgSim::ColorRange) - BaseType(osgSim::ScalarsToColors); - Constructor2(IN, float, min, IN, float, max); - Constructor3(IN, float, min, IN, float, max, IN, const std::vector< osg::Vec4 > &, colors); - Method1(void, setColors, IN, const std::vector< osg::Vec4 > &, colors); - Method1(osg::Vec4, getColor, IN, float, scalar); - WriteOnlyProperty(const std::vector< osg::Vec4 > &, Colors); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgSim::ColorRange) + I_BaseType(osgSim::ScalarsToColors); + I_Constructor2(IN, float, min, IN, float, max); + I_Constructor3(IN, float, min, IN, float, max, IN, const std::vector< osg::Vec4 > &, colors); + I_Method1(void, setColors, IN, const std::vector< osg::Vec4 > &, colors); + I_Method1(osg::Vec4, getColor, IN, float, scalar); + I_WriteOnlyProperty(const std::vector< osg::Vec4 > &, Colors); END_REFLECTOR +STD_VECTOR_REFLECTOR(std::vector< osg::Vec4 >); + diff --git a/src/osgWrappers/osgSim/DOFTransform.cpp b/src/osgWrappers/osgSim/DOFTransform.cpp index c6e039a1d..0f433ef91 100644 --- a/src/osgWrappers/osgSim/DOFTransform.cpp +++ b/src/osgWrappers/osgSim/DOFTransform.cpp @@ -16,82 +16,90 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgSim::DOFTransform::MultOrder) - EnumLabel(osgSim::DOFTransform::PRH); - EnumLabel(osgSim::DOFTransform::PHR); - EnumLabel(osgSim::DOFTransform::HPR); - EnumLabel(osgSim::DOFTransform::HRP); - EnumLabel(osgSim::DOFTransform::RPH); - EnumLabel(osgSim::DOFTransform::RHP); + I_EnumLabel(osgSim::DOFTransform::PRH); + I_EnumLabel(osgSim::DOFTransform::PHR); + I_EnumLabel(osgSim::DOFTransform::HPR); + I_EnumLabel(osgSim::DOFTransform::HRP); + I_EnumLabel(osgSim::DOFTransform::RPH); + I_EnumLabel(osgSim::DOFTransform::RHP); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgSim::DOFTransform) - BaseType(osg::Transform); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::DOFTransform &, dof, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(void, setMinHPR, IN, const osg::Vec3 &, hpr); - Method0(const osg::Vec3 &, getMinHPR); - Method1(void, setMaxHPR, IN, const osg::Vec3 &, hpr); - Method0(const osg::Vec3 &, getMaxHPR); - Method1(void, setIncrementHPR, IN, const osg::Vec3 &, hpr); - Method0(const osg::Vec3 &, getIncrementHPR); - Method1(void, setCurrentHPR, IN, const osg::Vec3 &, hpr); - Method0(const osg::Vec3 &, getCurrentHPR); - Method1(void, updateCurrentHPR, IN, const osg::Vec3 &, hpr); - Method1(void, setMinTranslate, IN, const osg::Vec3 &, translate); - Method0(const osg::Vec3 &, getMinTranslate); - Method1(void, setMaxTranslate, IN, const osg::Vec3 &, translate); - Method0(const osg::Vec3 &, getMaxTranslate); - Method1(void, setIncrementTranslate, IN, const osg::Vec3 &, translate); - Method0(const osg::Vec3 &, getIncrementTranslate); - Method1(void, setCurrentTranslate, IN, const osg::Vec3 &, translate); - Method0(const osg::Vec3 &, getCurrentTranslate); - Method1(void, updateCurrentTranslate, IN, const osg::Vec3 &, translate); - Method1(void, setMinScale, IN, const osg::Vec3 &, scale); - Method0(const osg::Vec3 &, getMinScale); - Method1(void, setMaxScale, IN, const osg::Vec3 &, scale); - Method0(const osg::Vec3 &, getMaxScale); - Method1(void, setIncrementScale, IN, const osg::Vec3 &, scale); - Method0(const osg::Vec3 &, getIncrementScale); - Method1(void, setCurrentScale, IN, const osg::Vec3 &, scale); - Method0(const osg::Vec3 &, getCurrentScale); - Method1(void, updateCurrentScale, IN, const osg::Vec3 &, scale); - Method1(void, setPutMatrix, IN, const osg::Matrix &, put); - Method0(const osg::Matrix &, getPutMatrix); - Method1(void, setInversePutMatrix, IN, const osg::Matrix &, inversePut); - Method0(const osg::Matrix &, getInversePutMatrix); - Method1(void, setLimitationFlags, IN, unsigned long, flags); - Method0(unsigned long, getLimitationFlags); - Method1(void, setHPRMultOrder, IN, const osgSim::DOFTransform::MultOrder, order); - Method0(const osgSim::DOFTransform::MultOrder, getHPRMultOrder); - Method1(void, setAnimationOn, IN, bool, do_animate); - Method0(bool, getAnimationOn); - Method1(void, animate, IN, float, deltaTime); - Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv); - Property(bool, AnimationOn); - Property(const osg::Vec3 &, CurrentHPR); - Property(const osg::Vec3 &, CurrentScale); - Property(const osg::Vec3 &, CurrentTranslate); - Property(const osgSim::DOFTransform::MultOrder, HPRMultOrder); - Property(const osg::Vec3 &, IncrementHPR); - Property(const osg::Vec3 &, IncrementScale); - Property(const osg::Vec3 &, IncrementTranslate); - Property(const osg::Matrix &, InversePutMatrix); - Property(unsigned long, LimitationFlags); - Property(const osg::Vec3 &, MaxHPR); - Property(const osg::Vec3 &, MaxScale); - Property(const osg::Vec3 &, MaxTranslate); - Property(const osg::Vec3 &, MinHPR); - Property(const osg::Vec3 &, MinScale); - Property(const osg::Vec3 &, MinTranslate); - Property(const osg::Matrix &, PutMatrix); + I_BaseType(osg::Transform); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::DOFTransform &, dof, , 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, setMinHPR, IN, const osg::Vec3 &, hpr); + I_Method0(const osg::Vec3 &, getMinHPR); + I_Method1(void, setMaxHPR, IN, const osg::Vec3 &, hpr); + I_Method0(const osg::Vec3 &, getMaxHPR); + I_Method1(void, setIncrementHPR, IN, const osg::Vec3 &, hpr); + I_Method0(const osg::Vec3 &, getIncrementHPR); + I_Method1(void, setCurrentHPR, IN, const osg::Vec3 &, hpr); + I_Method0(const osg::Vec3 &, getCurrentHPR); + I_Method1(void, updateCurrentHPR, IN, const osg::Vec3 &, hpr); + I_Method1(void, setMinTranslate, IN, const osg::Vec3 &, translate); + I_Method0(const osg::Vec3 &, getMinTranslate); + I_Method1(void, setMaxTranslate, IN, const osg::Vec3 &, translate); + I_Method0(const osg::Vec3 &, getMaxTranslate); + I_Method1(void, setIncrementTranslate, IN, const osg::Vec3 &, translate); + I_Method0(const osg::Vec3 &, getIncrementTranslate); + I_Method1(void, setCurrentTranslate, IN, const osg::Vec3 &, translate); + I_Method0(const osg::Vec3 &, getCurrentTranslate); + I_Method1(void, updateCurrentTranslate, IN, const osg::Vec3 &, translate); + I_Method1(void, setMinScale, IN, const osg::Vec3 &, scale); + I_Method0(const osg::Vec3 &, getMinScale); + I_Method1(void, setMaxScale, IN, const osg::Vec3 &, scale); + I_Method0(const osg::Vec3 &, getMaxScale); + I_Method1(void, setIncrementScale, IN, const osg::Vec3 &, scale); + I_Method0(const osg::Vec3 &, getIncrementScale); + I_Method1(void, setCurrentScale, IN, const osg::Vec3 &, scale); + I_Method0(const osg::Vec3 &, getCurrentScale); + I_Method1(void, updateCurrentScale, IN, const osg::Vec3 &, scale); + I_Method1(void, setPutMatrix, IN, const osg::Matrix &, put); + I_Method0(const osg::Matrix &, getPutMatrix); + I_Method1(void, setInversePutMatrix, IN, const osg::Matrix &, inversePut); + I_Method0(const osg::Matrix &, getInversePutMatrix); + I_Method1(void, setLimitationFlags, IN, unsigned long, flags); + I_Method0(unsigned long, getLimitationFlags); + I_Method1(void, setHPRMultOrder, IN, const osgSim::DOFTransform::MultOrder, order); + I_Method0(const osgSim::DOFTransform::MultOrder, getHPRMultOrder); + I_Method1(void, setAnimationOn, IN, bool, do_animate); + I_Method0(bool, getAnimationOn); + I_Method1(void, animate, IN, float, deltaTime); + 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(bool, AnimationOn); + I_Property(const osg::Vec3 &, CurrentHPR); + I_Property(const osg::Vec3 &, CurrentScale); + I_Property(const osg::Vec3 &, CurrentTranslate); + I_Property(const osgSim::DOFTransform::MultOrder, HPRMultOrder); + I_Property(const osg::Vec3 &, IncrementHPR); + I_Property(const osg::Vec3 &, IncrementScale); + I_Property(const osg::Vec3 &, IncrementTranslate); + I_Property(const osg::Matrix &, InversePutMatrix); + I_Property(unsigned long, LimitationFlags); + I_Property(const osg::Vec3 &, MaxHPR); + I_Property(const osg::Vec3 &, MaxScale); + I_Property(const osg::Vec3 &, MaxTranslate); + I_Property(const osg::Vec3 &, MinHPR); + I_Property(const osg::Vec3 &, MinScale); + I_Property(const osg::Vec3 &, MinTranslate); + I_Property(const osg::Matrix &, PutMatrix); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/GeographicLocation.cpp b/src/osgWrappers/osgSim/GeographicLocation.cpp index a942133f2..7bbf687b4 100644 --- a/src/osgWrappers/osgSim/GeographicLocation.cpp +++ b/src/osgWrappers/osgSim/GeographicLocation.cpp @@ -11,18 +11,26 @@ #include -BEGIN_VALUE_REFLECTOR(osgSim::GeographicLocation) - BaseType(osg::Referenced); - Constructor0(); - Constructor2(IN, double, lat, IN, double, lon); - Method0(double *, ptr); - Method0(const double *, ptr); - Method2(void, set, IN, double, lat, IN, double, lon); - Method0(double &, latitude); - Method0(double &, longitude); - Method0(double, latitude); - Method0(double, longitude); - Method0(bool, valid); - Method0(bool, isNaN); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgSim::GeographicLocation) + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Constructor2(IN, double, lat, IN, double, lon); + I_Method0(double *, ptr); + I_Method0(const double *, ptr); + I_Method2(void, set, IN, double, lat, IN, double, lon); + I_Method0(double &, latitude); + I_Method0(double &, longitude); + I_Method0(double, latitude); + I_Method0(double, longitude); + I_Method0(bool, valid); + I_Method0(bool, isNaN); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/Impostor.cpp b/src/osgWrappers/osgSim/Impostor.cpp index 9f6d4f2c5..3f7b3f49f 100644 --- a/src/osgWrappers/osgSim/Impostor.cpp +++ b/src/osgWrappers/osgSim/Impostor.cpp @@ -17,41 +17,49 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgSim::ImpostorSprite > >, osgSim::Impostor::ImpostorSpriteList); BEGIN_OBJECT_REFLECTOR(osgSim::Impostor) - BaseType(osg::LOD); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::Impostor &, es, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(void, setImpostorThreshold, IN, float, distance); - Method0(float, getImpostorThreshold); - MethodWithDefaults1(void, setImpostorThresholdToBound, IN, float, ratio, 1.0f); - Method2(osgSim::ImpostorSprite *, findBestImpostorSprite, IN, unsigned int, contextID, IN, const osg::Vec3 &, currLocalEyePoint); - Method2(void, addImpostorSprite, IN, unsigned int, contextID, IN, osgSim::ImpostorSprite *, is); - Method1(osgSim::Impostor::ImpostorSpriteList &, getImpostorSpriteList, IN, unsigned int, contexID); - Method1(const osgSim::Impostor::ImpostorSpriteList &, getImpostorSpriteList, IN, unsigned int, contexID); - Method0(osg::BoundingSphere, computeBound); - Property(float, ImpostorThreshold); - WriteOnlyProperty(float, ImpostorThresholdToBound); + I_BaseType(osg::LOD); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::Impostor &, 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_Method1(void, traverse, IN, osg::NodeVisitor &, nv); + I_Method1(void, setImpostorThreshold, IN, float, distance); + I_Method0(float, getImpostorThreshold); + I_MethodWithDefaults1(void, setImpostorThresholdToBound, IN, float, ratio, 1.0f); + I_Method2(osgSim::ImpostorSprite *, findBestImpostorSprite, IN, unsigned int, contextID, IN, const osg::Vec3 &, currLocalEyePoint); + I_Method2(void, addImpostorSprite, IN, unsigned int, contextID, IN, osgSim::ImpostorSprite *, is); + I_Method1(osgSim::Impostor::ImpostorSpriteList &, getImpostorSpriteList, IN, unsigned int, contexID); + I_Method1(const osgSim::Impostor::ImpostorSpriteList &, getImpostorSpriteList, IN, unsigned int, contexID); + I_Method0(osg::BoundingSphere, computeBound); + I_Property(float, ImpostorThreshold); + I_WriteOnlyProperty(float, ImpostorThresholdToBound); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgSim::ImpostorSprite >) - Constructor0(); - Constructor1(IN, osgSim::ImpostorSprite *, t); - Constructor1(IN, const osg::ref_ptr< osgSim::ImpostorSprite > &, rp); - Method0(bool, valid); - Method0(osgSim::ImpostorSprite *, get); - Method0(const osgSim::ImpostorSprite *, get); - Method0(osgSim::ImpostorSprite *, take); - Method0(osgSim::ImpostorSprite *, release); - ReadOnlyProperty(osgSim::ImpostorSprite *, ); + I_Constructor0(); + I_Constructor1(IN, osgSim::ImpostorSprite *, t); + I_Constructor1(IN, const osg::ref_ptr< osgSim::ImpostorSprite > &, rp); + I_Method0(bool, valid); + I_Method0(osgSim::ImpostorSprite *, get); + I_Method0(const osgSim::ImpostorSprite *, get); + I_Method0(osgSim::ImpostorSprite *, take); + I_Method0(osgSim::ImpostorSprite *, release); + I_ReadOnlyProperty(osgSim::ImpostorSprite *, ); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgSim::ImpostorSprite > >); diff --git a/src/osgWrappers/osgSim/ImpostorSprite.cpp b/src/osgWrappers/osgSim/ImpostorSprite.cpp index 8279ff50e..1a710892f 100644 --- a/src/osgWrappers/osgSim/ImpostorSprite.cpp +++ b/src/osgWrappers/osgSim/ImpostorSprite.cpp @@ -23,60 +23,68 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgSim::ImpostorSprite) - BaseType(osg::Drawable); - Constructor0(); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setParent, IN, osgSim::Impostor *, parent); - Method0(osgSim::Impostor *, getParent); - Method0(const osgSim::Impostor *, getParent); - Method1(void, setStoredLocalEyePoint, IN, const osg::Vec3 &, v); - Method0(const osg::Vec3 &, getStoredLocalEyePoint); - Method1(void, setLastFrameUsed, IN, int, frameNumber); - Method0(int, getLastFrameUsed); - Method0(osg::Vec3 *, getCoords); - Method0(const osg::Vec3 *, getCoords); - Method0(osg::Vec2 *, getTexCoords); - Method0(const osg::Vec2 *, getTexCoords); - Method0(osg::Vec3 *, getControlCoords); - Method0(const osg::Vec3 *, getControlCoords); - Method1(float, calcPixelError, IN, const osg::Matrix &, MVPW); - Method3(void, setTexture, IN, osg::Texture2D *, tex, IN, int, s, IN, int, t); - Method0(osg::Texture2D *, getTexture); - Method0(const osg::Texture2D *, getTexture); - Method0(int, s); - Method0(int, t); - Method1(void, drawImplementation, IN, osg::State &, state); - Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); - Method1(void, accept, IN, osg::Drawable::AttributeFunctor &, af); - Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); - Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); - Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); - Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); - Method0(osg::BoundingBox, computeBound); - ReadOnlyProperty(osg::Vec3 *, ControlCoords); - ReadOnlyProperty(osg::Vec3 *, Coords); - Property(int, LastFrameUsed); - Property(osgSim::Impostor *, Parent); - Property(const osg::Vec3 &, StoredLocalEyePoint); - ReadOnlyProperty(osg::Vec2 *, TexCoords); - ReadOnlyProperty(osg::Texture2D *, Texture); + I_BaseType(osg::Drawable); + I_Constructor0(); + 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, setParent, IN, osgSim::Impostor *, parent); + I_Method0(osgSim::Impostor *, getParent); + I_Method0(const osgSim::Impostor *, getParent); + I_Method1(void, setStoredLocalEyePoint, IN, const osg::Vec3 &, v); + I_Method0(const osg::Vec3 &, getStoredLocalEyePoint); + I_Method1(void, setLastFrameUsed, IN, int, frameNumber); + I_Method0(int, getLastFrameUsed); + I_Method0(osg::Vec3 *, getCoords); + I_Method0(const osg::Vec3 *, getCoords); + I_Method0(osg::Vec2 *, getTexCoords); + I_Method0(const osg::Vec2 *, getTexCoords); + I_Method0(osg::Vec3 *, getControlCoords); + I_Method0(const osg::Vec3 *, getControlCoords); + I_Method1(float, calcPixelError, IN, const osg::Matrix &, MVPW); + I_Method3(void, setTexture, IN, osg::Texture2D *, tex, IN, int, s, IN, int, t); + I_Method0(osg::Texture2D *, getTexture); + I_Method0(const osg::Texture2D *, getTexture); + I_Method0(int, s); + I_Method0(int, t); + 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_Method0(osg::BoundingBox, computeBound); + I_ReadOnlyProperty(osg::Vec3 *, ControlCoords); + I_ReadOnlyProperty(osg::Vec3 *, Coords); + I_Property(int, LastFrameUsed); + I_Property(osgSim::Impostor *, Parent); + I_Property(const osg::Vec3 &, StoredLocalEyePoint); + I_ReadOnlyProperty(osg::Vec2 *, TexCoords); + I_ReadOnlyProperty(osg::Texture2D *, Texture); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgSim::ImpostorSpriteManager) - BaseType(osg::Referenced); - Constructor0(); - Method0(bool, empty); - Method0(osgSim::ImpostorSprite *, first); - Method0(osgSim::ImpostorSprite *, last); - Method1(void, push_back, IN, osgSim::ImpostorSprite *, is); - Method1(void, remove, IN, osgSim::ImpostorSprite *, is); - Method3(osgSim::ImpostorSprite *, createOrReuseImpostorSprite, IN, int, s, IN, int, t, IN, int, frameNumber); - Method0(osg::StateSet *, createOrReuseStateSet); - Method0(void, reset); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method0(bool, empty); + I_Method0(osgSim::ImpostorSprite *, first); + I_Method0(osgSim::ImpostorSprite *, last); + I_Method1(void, push_back, IN, osgSim::ImpostorSprite *, is); + I_Method1(void, remove, IN, osgSim::ImpostorSprite *, is); + I_Method3(osgSim::ImpostorSprite *, createOrReuseImpostorSprite, IN, int, s, IN, int, t, IN, int, frameNumber); + I_Method0(osg::StateSet *, createOrReuseStateSet); + I_Method0(void, reset); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp b/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp index ebffeca16..6b47dd9fa 100644 --- a/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp +++ b/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp @@ -14,19 +14,27 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgSim::InsertImpostorsVisitor) - BaseType(osg::NodeVisitor); - Constructor0(); - Method1(void, setImpostorThresholdRatio, IN, float, ratio); - Method0(float, getImpostorThresholdRatio); - Method1(void, setMaximumNumberOfNestedImpostors, IN, unsigned int, num); - Method0(unsigned int, getMaximumNumberOfNestedImpostors); - Method0(void, reset); - Method1(void, apply, IN, osg::Node &, node); - Method1(void, apply, IN, osg::Group &, node); - Method1(void, apply, IN, osg::LOD &, node); - Method0(void, insertImpostors); - Property(float, ImpostorThresholdRatio); - Property(unsigned int, MaximumNumberOfNestedImpostors); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgSim::InsertImpostorsVisitor) + I_BaseType(osg::NodeVisitor); + I_Constructor0(); + I_Method1(void, setImpostorThresholdRatio, IN, float, ratio); + I_Method0(float, getImpostorThresholdRatio); + I_Method1(void, setMaximumNumberOfNestedImpostors, IN, unsigned int, num); + I_Method0(unsigned int, getMaximumNumberOfNestedImpostors); + I_Method0(void, reset); + I_Method1(void, apply, IN, osg::Node &, node); + I_Method1(void, apply, IN, osg::Group &, node); + I_Method1(void, apply, IN, osg::LOD &, node); + I_Method0(void, insertImpostors); + I_Property(float, ImpostorThresholdRatio); + I_Property(unsigned int, MaximumNumberOfNestedImpostors); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/LightPoint.cpp b/src/osgWrappers/osgSim/LightPoint.cpp index 7818fd541..fb5d4961e 100644 --- a/src/osgWrappers/osgSim/LightPoint.cpp +++ b/src/osgWrappers/osgSim/LightPoint.cpp @@ -15,15 +15,23 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgSim::LightPoint::BlendingMode) - EnumLabel(osgSim::LightPoint::ADDITIVE); - EnumLabel(osgSim::LightPoint::BLENDED); + I_EnumLabel(osgSim::LightPoint::ADDITIVE); + I_EnumLabel(osgSim::LightPoint::BLENDED); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgSim::LightPoint) - Constructor0(); - Constructor2(IN, const osg::Vec3 &, position, IN, const osg::Vec4 &, color); - ConstructorWithDefaults8(IN, bool, on, , IN, const osg::Vec3 &, position, , IN, const osg::Vec4 &, color, , IN, float, intensity, 1.0f, IN, float, radius, 1.0f, IN, osgSim::Sector *, sector, 0, IN, osgSim::BlinkSequence *, blinkSequence, 0, IN, osgSim::LightPoint::BlendingMode, blendingMode, osgSim::LightPoint::BLENDED); - Constructor1(IN, const osgSim::LightPoint &, lp); + I_Constructor0(); + I_Constructor2(IN, const osg::Vec3 &, position, IN, const osg::Vec4 &, color); + I_ConstructorWithDefaults8(IN, bool, on, , IN, const osg::Vec3 &, position, , IN, const osg::Vec4 &, color, , IN, float, intensity, 1.0f, IN, float, radius, 1.0f, IN, osgSim::Sector *, sector, 0, IN, osgSim::BlinkSequence *, blinkSequence, 0, IN, osgSim::LightPoint::BlendingMode, blendingMode, osgSim::LightPoint::BLENDED); + I_Constructor1(IN, const osgSim::LightPoint &, lp); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/LightPointNode.cpp b/src/osgWrappers/osgSim/LightPointNode.cpp index 0344fa497..f906be7ff 100644 --- a/src/osgWrappers/osgSim/LightPointNode.cpp +++ b/src/osgWrappers/osgSim/LightPointNode.cpp @@ -17,42 +17,50 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osgSim::LightPoint >, osgSim::LightPointNode::LightPointList); BEGIN_OBJECT_REFLECTOR(osgSim::LightPointNode) - BaseType(osg::Node); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::LightPointNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method0(unsigned int, getNumLightPoints); - Method1(unsigned int, addLightPoint, IN, const osgSim::LightPoint &, lp); - Method1(void, removeLightPoint, IN, unsigned int, pos); - Method1(osgSim::LightPoint &, getLightPoint, IN, unsigned int, pos); - Method1(const osgSim::LightPoint &, getLightPoint, IN, unsigned int, pos); - Method1(void, setLightPointList, IN, const osgSim::LightPointNode::LightPointList &, lpl); - Method0(osgSim::LightPointNode::LightPointList &, getLightPointList); - Method0(const osgSim::LightPointNode::LightPointList &, getLightPointList); - Method1(void, setMinPixelSize, IN, float, minPixelSize); - Method0(float, getMinPixelSize); - Method1(void, setMaxPixelSize, IN, float, maxPixelSize); - Method0(float, getMaxPixelSize); - Method1(void, setMaxVisibleDistance2, IN, float, maxVisibleDistance2); - Method0(float, getMaxVisibleDistance2); - Method1(void, setLightPointSystem, IN, osgSim::LightPointSystem *, lps); - Method0(osgSim::LightPointSystem *, getLightPointSystem); - Method0(osg::BoundingSphere, computeBound); - ArrayProperty_GA(const osgSim::LightPoint &, LightPoint, LightPoints, unsigned int, unsigned int); - Property(const osgSim::LightPointNode::LightPointList &, LightPointList); - Property(osgSim::LightPointSystem *, LightPointSystem); - Property(float, MaxPixelSize); - Property(float, MaxVisibleDistance2); - Property(float, MinPixelSize); + I_BaseType(osg::Node); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::LightPointNode &, 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_Method0(unsigned int, getNumLightPoints); + I_Method1(unsigned int, addLightPoint, IN, const osgSim::LightPoint &, lp); + I_Method1(void, removeLightPoint, IN, unsigned int, pos); + I_Method1(osgSim::LightPoint &, getLightPoint, IN, unsigned int, pos); + I_Method1(const osgSim::LightPoint &, getLightPoint, IN, unsigned int, pos); + I_Method1(void, setLightPointList, IN, const osgSim::LightPointNode::LightPointList &, lpl); + I_Method0(osgSim::LightPointNode::LightPointList &, getLightPointList); + I_Method0(const osgSim::LightPointNode::LightPointList &, getLightPointList); + I_Method1(void, setMinPixelSize, IN, float, minPixelSize); + I_Method0(float, getMinPixelSize); + I_Method1(void, setMaxPixelSize, IN, float, maxPixelSize); + I_Method0(float, getMaxPixelSize); + I_Method1(void, setMaxVisibleDistance2, IN, float, maxVisibleDistance2); + I_Method0(float, getMaxVisibleDistance2); + I_Method1(void, setLightPointSystem, IN, osgSim::LightPointSystem *, lps); + I_Method0(osgSim::LightPointSystem *, getLightPointSystem); + I_Method0(osg::BoundingSphere, computeBound); + I_ArrayProperty_GA(const osgSim::LightPoint &, LightPoint, LightPoints, unsigned int, unsigned int); + I_Property(const osgSim::LightPointNode::LightPointList &, LightPointList); + I_Property(osgSim::LightPointSystem *, LightPointSystem); + I_Property(float, MaxPixelSize); + I_Property(float, MaxVisibleDistance2); + I_Property(float, MinPixelSize); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osgSim::LightPoint >); diff --git a/src/osgWrappers/osgSim/LightPointSystem.cpp b/src/osgWrappers/osgSim/LightPointSystem.cpp index 11616cda8..f559042cf 100644 --- a/src/osgWrappers/osgSim/LightPointSystem.cpp +++ b/src/osgWrappers/osgSim/LightPointSystem.cpp @@ -13,26 +13,34 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgSim::LightPointSystem::AnimationState) - EnumLabel(osgSim::LightPointSystem::ANIMATION_ON); - EnumLabel(osgSim::LightPointSystem::ANIMATION_OFF); - EnumLabel(osgSim::LightPointSystem::ANIMATION_RANDOM); + I_EnumLabel(osgSim::LightPointSystem::ANIMATION_ON); + I_EnumLabel(osgSim::LightPointSystem::ANIMATION_OFF); + I_EnumLabel(osgSim::LightPointSystem::ANIMATION_RANDOM); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgSim::LightPointSystem) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::LightPointSystem &, lps, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setIntensity, IN, float, intensity); - Method0(float, getIntensity); - Method1(void, setAnimationState, IN, osgSim::LightPointSystem::AnimationState, state); - Method0(osgSim::LightPointSystem::AnimationState, getAnimationState); - Property(osgSim::LightPointSystem::AnimationState, AnimationState); - Property(float, Intensity); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::LightPointSystem &, lps, , 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, setIntensity, IN, float, intensity); + I_Method0(float, getIntensity); + I_Method1(void, setAnimationState, IN, osgSim::LightPointSystem::AnimationState, state); + I_Method0(osgSim::LightPointSystem::AnimationState, getAnimationState); + I_Property(osgSim::LightPointSystem::AnimationState, AnimationState); + I_Property(float, Intensity); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/MultiSwitch.cpp b/src/osgWrappers/osgSim/MultiSwitch.cpp index fd7e24664..a540c4067 100644 --- a/src/osgWrappers/osgSim/MultiSwitch.cpp +++ b/src/osgWrappers/osgSim/MultiSwitch.cpp @@ -15,47 +15,55 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< bool >, osgSim::MultiSwitch::ValueList); TYPE_NAME_ALIAS(std::vector< osgSim::MultiSwitch::ValueList >, osgSim::MultiSwitch::SwitchSetList); BEGIN_OBJECT_REFLECTOR(osgSim::MultiSwitch) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::MultiSwitch &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(void, setNewChildDefaultValue, IN, bool, value); - Method0(bool, getNewChildDefaultValue); - Method1(bool, addChild, IN, osg::Node *, child); - Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child); - Method1(bool, removeChild, IN, osg::Node *, child); - Method3(void, setValue, IN, unsigned int, switchSet, IN, unsigned int, pos, IN, bool, value); - Method2(bool, getValue, IN, unsigned int, switchSet, IN, unsigned int, pos); - Method3(void, setChildValue, IN, const osg::Node *, child, IN, unsigned int, switchSet, IN, bool, value); - Method2(bool, getChildValue, IN, const osg::Node *, child, IN, unsigned int, switchSet); - Method1(bool, setAllChildrenOff, IN, unsigned int, switchSet); - Method1(bool, setAllChildrenOn, IN, unsigned int, switchSet); - Method2(bool, setSingleChildOn, IN, unsigned int, switchSet, IN, unsigned int, pos); - Method1(void, setActiveSwitchSet, IN, unsigned int, switchSet); - Method0(unsigned int, getActiveSwitchSet); - Method1(void, setSwitchSetList, IN, const osgSim::MultiSwitch::SwitchSetList &, switchSetList); - Method0(const osgSim::MultiSwitch::SwitchSetList &, getSwitchSetList); - Method2(void, setValueList, IN, unsigned int, switchSet, IN, const osgSim::MultiSwitch::ValueList &, values); - Method1(const osgSim::MultiSwitch::ValueList &, getValueList, IN, unsigned int, switchSet); - Property(unsigned int, ActiveSwitchSet); - WriteOnlyPropertyWithReturnType(unsigned int, AllChildrenOff, bool); - WriteOnlyPropertyWithReturnType(unsigned int, AllChildrenOn, bool); - IndexedProperty2(bool, ChildValue, const osg::Node *, child, unsigned int, switchSet); - Property(bool, NewChildDefaultValue); - Property(const osgSim::MultiSwitch::SwitchSetList &, SwitchSetList); - IndexedProperty2(bool, Value, unsigned int, switchSet, unsigned int, pos); - IndexedProperty1(const osgSim::MultiSwitch::ValueList &, ValueList, unsigned int, switchSet); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::MultiSwitch &, 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, insertChild, IN, unsigned int, index, IN, osg::Node *, child); + I_Method1(bool, removeChild, IN, osg::Node *, child); + I_Method3(void, setValue, IN, unsigned int, switchSet, IN, unsigned int, pos, IN, bool, value); + I_Method2(bool, getValue, IN, unsigned int, switchSet, IN, unsigned int, pos); + I_Method3(void, setChildValue, IN, const osg::Node *, child, IN, unsigned int, switchSet, IN, bool, value); + I_Method2(bool, getChildValue, IN, const osg::Node *, child, IN, unsigned int, switchSet); + I_Method1(bool, setAllChildrenOff, IN, unsigned int, switchSet); + I_Method1(bool, setAllChildrenOn, IN, unsigned int, switchSet); + I_Method2(bool, setSingleChildOn, IN, unsigned int, switchSet, IN, unsigned int, pos); + I_Method1(void, setActiveSwitchSet, IN, unsigned int, switchSet); + I_Method0(unsigned int, getActiveSwitchSet); + I_Method1(void, setSwitchSetList, IN, const osgSim::MultiSwitch::SwitchSetList &, switchSetList); + I_Method0(const osgSim::MultiSwitch::SwitchSetList &, getSwitchSetList); + I_Method2(void, setValueList, IN, unsigned int, switchSet, IN, const osgSim::MultiSwitch::ValueList &, values); + I_Method1(const osgSim::MultiSwitch::ValueList &, getValueList, IN, unsigned int, switchSet); + I_Property(unsigned int, ActiveSwitchSet); + I_WriteOnlyPropertyWithReturnType(unsigned int, AllChildrenOff, bool); + I_WriteOnlyPropertyWithReturnType(unsigned int, AllChildrenOn, bool); + I_IndexedProperty2(bool, ChildValue, const osg::Node *, child, unsigned int, switchSet); + I_Property(bool, NewChildDefaultValue); + I_Property(const osgSim::MultiSwitch::SwitchSetList &, SwitchSetList); + I_IndexedProperty2(bool, Value, unsigned int, switchSet, unsigned int, pos); + I_IndexedProperty1(const osgSim::MultiSwitch::ValueList &, ValueList, unsigned int, switchSet); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osgSim::MultiSwitch::ValueList >); diff --git a/src/osgWrappers/osgSim/ScalarBar.cpp b/src/osgWrappers/osgSim/ScalarBar.cpp index c4fc6e686..f83b2aca5 100644 --- a/src/osgWrappers/osgSim/ScalarBar.cpp +++ b/src/osgWrappers/osgSim/ScalarBar.cpp @@ -16,62 +16,70 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgSim::ScalarBar::Orientation) - EnumLabel(osgSim::ScalarBar::HORIZONTAL); - EnumLabel(osgSim::ScalarBar::VERTICAL); + I_EnumLabel(osgSim::ScalarBar::HORIZONTAL); + I_EnumLabel(osgSim::ScalarBar::VERTICAL); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgSim::ScalarBar) - BaseType(osg::Geode); - Constructor0(); - ConstructorWithDefaults7(IN, int, numColors, , IN, int, numLabels, , IN, osgSim::ScalarsToColors *, stc, , IN, const std::string &, title, , IN, osgSim::ScalarBar::Orientation, orientation, osgSim::ScalarBar::HORIZONTAL, IN, float, aspectRatio, 0.25, IN, osgSim::ScalarBar::ScalarPrinter *, sp, new osgSim::ScalarBar::ScalarPrinter); - Constructor2(IN, const osgSim::ScalarBar &, rhs, IN, const osg::CopyOp &, co); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, setNumColors, IN, int, numColors); - Method0(int, getNumColors); - Method1(void, setNumLabels, IN, int, numLabels); - Method0(int, getNumLabels); - Method1(void, setScalarsToColors, IN, osgSim::ScalarsToColors *, stc); - Method0(const osgSim::ScalarsToColors *, getScalarsToColors); - Method1(void, setTitle, IN, const std::string &, title); - Method0(std::string, getTitle); - Method1(void, setPosition, IN, const osg::Vec3 &, pos); - Method0(const osg::Vec3 &, getPosition); - Method1(void, setWidth, IN, float, width); - Method0(float, getWidth); - Method1(void, setAspectRatio, IN, float, aspectRatio); - Method0(float, getAspectRatio); - Method1(void, setOrientation, IN, osgSim::ScalarBar::Orientation, orientation); - Method0(osgSim::ScalarBar::Orientation, getOrientation); - Method1(void, setScalarPrinter, IN, osgSim::ScalarBar::ScalarPrinter *, sp); - Method0(const osgSim::ScalarBar::ScalarPrinter *, getScalarPrinter); - Method1(void, setTextProperties, IN, const osgSim::ScalarBar::TextProperties &, tp); - Method0(const osgSim::ScalarBar::TextProperties &, getTextProperties); - Method0(void, update); - Property(float, AspectRatio); - WriteOnlyProperty(int, NumColors); - WriteOnlyProperty(int, NumLabels); - Property(osgSim::ScalarBar::Orientation, Orientation); - Property(const osg::Vec3 &, Position); - WriteOnlyProperty(osgSim::ScalarBar::ScalarPrinter *, ScalarPrinter); - WriteOnlyProperty(osgSim::ScalarsToColors *, ScalarsToColors); - Property(const osgSim::ScalarBar::TextProperties &, TextProperties); - ReadOnlyProperty(std::string, Title); - Property(float, Width); + I_BaseType(osg::Geode); + I_Constructor0(); + I_ConstructorWithDefaults7(IN, int, numColors, , IN, int, numLabels, , IN, osgSim::ScalarsToColors *, stc, , IN, const std::string &, title, , IN, osgSim::ScalarBar::Orientation, orientation, osgSim::ScalarBar::HORIZONTAL, IN, float, aspectRatio, 0.25, IN, osgSim::ScalarBar::ScalarPrinter *, sp, new osgSim::ScalarBar::ScalarPrinter); + I_Constructor2(IN, const osgSim::ScalarBar &, rhs, IN, const osg::CopyOp &, co); + 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, setNumColors, IN, int, numColors); + I_Method0(int, getNumColors); + I_Method1(void, setNumLabels, IN, int, numLabels); + I_Method0(int, getNumLabels); + I_Method1(void, setScalarsToColors, IN, osgSim::ScalarsToColors *, stc); + I_Method0(const osgSim::ScalarsToColors *, getScalarsToColors); + I_Method1(void, setTitle, IN, const std::string &, title); + I_Method0(std::string, getTitle); + I_Method1(void, setPosition, IN, const osg::Vec3 &, pos); + I_Method0(const osg::Vec3 &, getPosition); + I_Method1(void, setWidth, IN, float, width); + I_Method0(float, getWidth); + I_Method1(void, setAspectRatio, IN, float, aspectRatio); + I_Method0(float, getAspectRatio); + I_Method1(void, setOrientation, IN, osgSim::ScalarBar::Orientation, orientation); + I_Method0(osgSim::ScalarBar::Orientation, getOrientation); + I_Method1(void, setScalarPrinter, IN, osgSim::ScalarBar::ScalarPrinter *, sp); + I_Method0(const osgSim::ScalarBar::ScalarPrinter *, getScalarPrinter); + I_Method1(void, setTextProperties, IN, const osgSim::ScalarBar::TextProperties &, tp); + I_Method0(const osgSim::ScalarBar::TextProperties &, getTextProperties); + I_Method0(void, update); + I_Property(float, AspectRatio); + I_WriteOnlyProperty(int, NumColors); + I_WriteOnlyProperty(int, NumLabels); + I_Property(osgSim::ScalarBar::Orientation, Orientation); + I_Property(const osg::Vec3 &, Position); + I_WriteOnlyProperty(osgSim::ScalarBar::ScalarPrinter *, ScalarPrinter); + I_WriteOnlyProperty(osgSim::ScalarsToColors *, ScalarsToColors); + I_Property(const osgSim::ScalarBar::TextProperties &, TextProperties); + I_ReadOnlyProperty(std::string, Title); + I_Property(float, Width); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgSim::ScalarBar::ScalarPrinter) - BaseType(osg::Referenced); - Constructor0(); - Method1(std::string, printScalar, IN, float, scalar); +BEGIN_OBJECT_REFLECTOR(osgSim::ScalarBar::ScalarPrinter) + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method1(std::string, printScalar, IN, float, scalar); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgSim::ScalarBar::TextProperties) - Constructor0(); + I_Constructor0(); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/ScalarsToColors.cpp b/src/osgWrappers/osgSim/ScalarsToColors.cpp index 3784d58e9..2a3735a3d 100644 --- a/src/osgWrappers/osgSim/ScalarsToColors.cpp +++ b/src/osgWrappers/osgSim/ScalarsToColors.cpp @@ -12,13 +12,21 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgSim::ScalarsToColors) - BaseType(osg::Referenced); - Constructor2(IN, float, scalarMin, IN, float, scalarMax); - Method1(osg::Vec4, getColor, IN, float, scalar); - Method0(float, getMin); - Method0(float, getMax); - ReadOnlyProperty(float, Max); - ReadOnlyProperty(float, Min); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgSim::ScalarsToColors) + I_BaseType(osg::Referenced); + I_Constructor2(IN, float, scalarMin, IN, float, scalarMax); + I_Method1(osg::Vec4, getColor, IN, float, scalar); + I_Method0(float, getMin); + I_Method0(float, getMax); + I_ReadOnlyProperty(float, Max); + I_ReadOnlyProperty(float, Min); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/Sector.cpp b/src/osgWrappers/osgSim/Sector.cpp index fb0c063b8..160c93d0b 100644 --- a/src/osgWrappers/osgSim/Sector.cpp +++ b/src/osgWrappers/osgSim/Sector.cpp @@ -14,119 +14,127 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgSim::AzimElevationSector) - BaseType(osgSim::Sector); - BaseType(osgSim::AzimRange); - BaseType(osgSim::ElevationRange); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::AzimElevationSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - ConstructorWithDefaults5(IN, float, minAzimuth, , IN, float, maxAzimuth, , IN, float, minElevation, , IN, float, maxElevation, , IN, float, fadeAngle, 0.0f); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); + I_BaseType(osgSim::Sector); + I_BaseType(osgSim::AzimRange); + I_BaseType(osgSim::ElevationRange); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::AzimElevationSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_ConstructorWithDefaults5(IN, float, minAzimuth, , IN, float, maxAzimuth, , IN, float, minElevation, , IN, float, maxElevation, , IN, float, fadeAngle, 0.0f); + 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(osgSim::AzimRange) - Constructor0(); - MethodWithDefaults3(void, setAzimuthRange, IN, float, minAzimuth, , IN, float, maxAzimuth, , IN, float, fadeAngle, 0.0f); - Method3(void, getAzimuthRange, IN, float &, minAzimuth, IN, float &, maxAzimuth, IN, float &, fadeAngle); - Method1(float, azimSector, IN, const osg::Vec3 &, eyeLocal); + I_Constructor0(); + I_MethodWithDefaults3(void, setAzimuthRange, IN, float, minAzimuth, , IN, float, maxAzimuth, , IN, float, fadeAngle, 0.0f); + I_Method3(void, getAzimuthRange, IN, float &, minAzimuth, IN, float &, maxAzimuth, IN, float &, fadeAngle); + I_Method1(float, azimSector, IN, const osg::Vec3 &, eyeLocal); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgSim::AzimSector) - BaseType(osgSim::Sector); - BaseType(osgSim::AzimRange); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::AzimSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - ConstructorWithDefaults3(IN, float, minAzimuth, , IN, float, maxAzimuth, , IN, float, fadeAngle, 0.0f); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); + I_BaseType(osgSim::Sector); + I_BaseType(osgSim::AzimRange); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::AzimSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_ConstructorWithDefaults3(IN, float, minAzimuth, , IN, float, maxAzimuth, , IN, float, fadeAngle, 0.0f); + 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(osgSim::ConeSector) - BaseType(osgSim::Sector); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::ConeSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - ConstructorWithDefaults3(IN, const osg::Vec3 &, axis, , IN, float, angle, , IN, float, fadeangle, 0.0f); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setAxis, IN, const osg::Vec3 &, axis); - Method0(const osg::Vec3 &, getAxis); - MethodWithDefaults2(void, setAngle, IN, float, angle, , IN, float, fadeangle, 0.0f); - Method0(float, getAngle); - Method0(float, getFadeAngle); - ReadOnlyProperty(float, Angle); - Property(const osg::Vec3 &, Axis); - ReadOnlyProperty(float, FadeAngle); + I_BaseType(osgSim::Sector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::ConeSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_ConstructorWithDefaults3(IN, const osg::Vec3 &, axis, , IN, float, angle, , IN, float, fadeangle, 0.0f); + 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, setAxis, IN, const osg::Vec3 &, axis); + I_Method0(const osg::Vec3 &, getAxis); + I_MethodWithDefaults2(void, setAngle, IN, float, angle, , IN, float, fadeangle, 0.0f); + I_Method0(float, getAngle); + I_Method0(float, getFadeAngle); + I_ReadOnlyProperty(float, Angle); + I_Property(const osg::Vec3 &, Axis); + I_ReadOnlyProperty(float, FadeAngle); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgSim::DirectionalSector) - BaseType(osgSim::Sector); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::DirectionalSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - ConstructorWithDefaults5(IN, const osg::Vec3 &, direction, , IN, float, horizLobeAngle, , IN, float, vertLobeAngle, , IN, float, lobeRollAngle, , IN, float, fadeAngle, 0.0f); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(void, setDirection, IN, const osg::Vec3 &, direction); - Method0(const osg::Vec3 &, getDirection); - Method1(void, setHorizLobeAngle, IN, float, angle); - Method0(float, getHorizLobeAngle); - Method1(void, setLobeRollAngle, IN, float, angle); - Method0(float, getLobeRollAngle); - Method1(void, setVertLobeAngle, IN, float, angle); - Method0(float, getVertLobeAngle); - Method1(void, setFadeAngle, IN, float, angle); - Method0(float, getFadeAngle); - Method0(void, computeMatrix); - Property(const osg::Vec3 &, Direction); - Property(float, FadeAngle); - Property(float, HorizLobeAngle); - Property(float, LobeRollAngle); - Property(float, VertLobeAngle); + I_BaseType(osgSim::Sector); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::DirectionalSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_ConstructorWithDefaults5(IN, const osg::Vec3 &, direction, , IN, float, horizLobeAngle, , IN, float, vertLobeAngle, , IN, float, lobeRollAngle, , IN, float, fadeAngle, 0.0f); + 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, setDirection, IN, const osg::Vec3 &, direction); + I_Method0(const osg::Vec3 &, getDirection); + I_Method1(void, setHorizLobeAngle, IN, float, angle); + I_Method0(float, getHorizLobeAngle); + I_Method1(void, setLobeRollAngle, IN, float, angle); + I_Method0(float, getLobeRollAngle); + I_Method1(void, setVertLobeAngle, IN, float, angle); + I_Method0(float, getVertLobeAngle); + I_Method1(void, setFadeAngle, IN, float, angle); + I_Method0(float, getFadeAngle); + I_Method0(void, computeMatrix); + I_Property(const osg::Vec3 &, Direction); + I_Property(float, FadeAngle); + I_Property(float, HorizLobeAngle); + I_Property(float, LobeRollAngle); + I_Property(float, VertLobeAngle); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgSim::ElevationRange) - Constructor0(); - MethodWithDefaults3(void, setElevationRange, IN, float, minElevation, , IN, float, maxElevation, , IN, float, fadeAngle, 0.0f); - Method0(float, getMinElevation); - Method0(float, getMaxElevation); - Method0(float, getFadeAngle); - Method1(float, elevationSector, IN, const osg::Vec3 &, eyeLocal); - ReadOnlyProperty(float, FadeAngle); - ReadOnlyProperty(float, MaxElevation); - ReadOnlyProperty(float, MinElevation); + I_Constructor0(); + I_MethodWithDefaults3(void, setElevationRange, IN, float, minElevation, , IN, float, maxElevation, , IN, float, fadeAngle, 0.0f); + I_Method0(float, getMinElevation); + I_Method0(float, getMaxElevation); + I_Method0(float, getFadeAngle); + I_Method1(float, elevationSector, IN, const osg::Vec3 &, eyeLocal); + I_ReadOnlyProperty(float, FadeAngle); + I_ReadOnlyProperty(float, MaxElevation); + I_ReadOnlyProperty(float, MinElevation); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgSim::ElevationSector) - BaseType(osgSim::Sector); - BaseType(osgSim::ElevationRange); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::ElevationSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - ConstructorWithDefaults3(IN, float, minElevation, , IN, float, maxElevation, , IN, float, fadeAngle, 0.0f); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); + I_BaseType(osgSim::Sector); + I_BaseType(osgSim::ElevationRange); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::ElevationSector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_ConstructorWithDefaults3(IN, float, minElevation, , IN, float, maxElevation, , IN, float, fadeAngle, 0.0f); + 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_ABSTRACT_OBJECT_REFLECTOR(osgSim::Sector) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::Sector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const char *, libraryName); - Method0(const char *, className); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::Sector &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/SphereSegment.cpp b/src/osgWrappers/osgSim/SphereSegment.cpp index 1b19a2e6f..2b3c17a0c 100644 --- a/src/osgWrappers/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/osgSim/SphereSegment.cpp @@ -16,55 +16,63 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgSim::SphereSegment::DrawMask) - EnumLabel(osgSim::SphereSegment::SURFACE); - EnumLabel(osgSim::SphereSegment::SPOKES); - EnumLabel(osgSim::SphereSegment::EDGELINE); - EnumLabel(osgSim::SphereSegment::SIDES); - EnumLabel(osgSim::SphereSegment::ALL); + I_EnumLabel(osgSim::SphereSegment::SURFACE); + I_EnumLabel(osgSim::SphereSegment::SPOKES); + I_EnumLabel(osgSim::SphereSegment::EDGELINE); + I_EnumLabel(osgSim::SphereSegment::SIDES); + I_EnumLabel(osgSim::SphereSegment::ALL); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgSim::SphereSegment) - BaseType(osg::Geode); - Constructor0(); - Constructor7(IN, const osg::Vec3 &, centre, IN, float, radius, IN, float, azMin, IN, float, azMax, IN, float, elevMin, IN, float, elevMax, IN, int, density); - Constructor6(IN, const osg::Vec3 &, centre, IN, float, radius, IN, const osg::Vec3 &, vec, IN, float, azRange, IN, float, elevRange, IN, int, density); - Constructor2(IN, const osgSim::SphereSegment &, rhs, IN, const osg::CopyOp &, co); - Method1(void, setCentre, IN, const osg::Vec3 &, c); - Method0(const osg::Vec3 &, getCentre); - Method1(void, setRadius, IN, float, r); - Method0(float, getRadius); - Method3(void, setArea, IN, const osg::Vec3 &, v, IN, float, azRange, IN, float, elevRange); - Method3(void, getArea, IN, osg::Vec3 &, v, IN, float &, azRange, IN, float &, elevRange); - Method4(void, setArea, IN, float, azMin, IN, float, azMax, IN, float, elevMin, IN, float, elevMax); - Method4(void, getArea, IN, float &, azMin, IN, float &, azMax, IN, float &, elevMin, IN, float &, elevMax); - Method1(void, setDensity, IN, int, d); - Method0(int, getDensity); - Method1(void, setDrawMask, IN, osgSim::SphereSegment::DrawMask, dm); - Method0(osgSim::SphereSegment::DrawMask, getDrawMask); - Method1(void, setSurfaceColor, IN, const osg::Vec4 &, c); - Method0(osg::Vec4, getSurfaceColor); - Method1(void, setSpokeColor, IN, const osg::Vec4 &, c); - Method0(osg::Vec4, getSpokeColor); - Method1(void, setEdgeLineColor, IN, const osg::Vec4 &, c); - Method0(osg::Vec4, getEdgeLineColor); - Method1(void, setSideColor, IN, const osg::Vec4 &, c); - Method0(osg::Vec4, getSideColor); - Method1(void, setAllColors, IN, const osg::Vec4 &, c); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - WriteOnlyProperty(const osg::Vec4 &, AllColors); - Property(const osg::Vec3 &, Centre); - Property(int, Density); - Property(osgSim::SphereSegment::DrawMask, DrawMask); - ReadOnlyProperty(osg::Vec4, EdgeLineColor); - Property(float, Radius); - ReadOnlyProperty(osg::Vec4, SideColor); - ReadOnlyProperty(osg::Vec4, SpokeColor); - ReadOnlyProperty(osg::Vec4, SurfaceColor); +BEGIN_OBJECT_REFLECTOR(osgSim::SphereSegment) + I_BaseType(osg::Geode); + I_Constructor0(); + I_Constructor7(IN, const osg::Vec3 &, centre, IN, float, radius, IN, float, azMin, IN, float, azMax, IN, float, elevMin, IN, float, elevMax, IN, int, density); + I_Constructor6(IN, const osg::Vec3 &, centre, IN, float, radius, IN, const osg::Vec3 &, vec, IN, float, azRange, IN, float, elevRange, IN, int, density); + I_Constructor2(IN, const osgSim::SphereSegment &, rhs, IN, const osg::CopyOp &, co); + I_Method1(void, setCentre, IN, const osg::Vec3 &, c); + I_Method0(const osg::Vec3 &, getCentre); + I_Method1(void, setRadius, IN, float, r); + I_Method0(float, getRadius); + I_Method3(void, setArea, IN, const osg::Vec3 &, v, IN, float, azRange, IN, float, elevRange); + I_Method3(void, getArea, IN, osg::Vec3 &, v, IN, float &, azRange, IN, float &, elevRange); + I_Method4(void, setArea, IN, float, azMin, IN, float, azMax, IN, float, elevMin, IN, float, elevMax); + I_Method4(void, getArea, IN, float &, azMin, IN, float &, azMax, IN, float &, elevMin, IN, float &, elevMax); + I_Method1(void, setDensity, IN, int, d); + I_Method0(int, getDensity); + I_Method1(void, setDrawMask, IN, osgSim::SphereSegment::DrawMask, dm); + I_Method0(osgSim::SphereSegment::DrawMask, getDrawMask); + I_Method1(void, setSurfaceColor, IN, const osg::Vec4 &, c); + I_Method0(osg::Vec4, getSurfaceColor); + I_Method1(void, setSpokeColor, IN, const osg::Vec4 &, c); + I_Method0(osg::Vec4, getSpokeColor); + I_Method1(void, setEdgeLineColor, IN, const osg::Vec4 &, c); + I_Method0(osg::Vec4, getEdgeLineColor); + I_Method1(void, setSideColor, IN, const osg::Vec4 &, c); + I_Method0(osg::Vec4, getSideColor); + I_Method1(void, setAllColors, IN, const osg::Vec4 &, c); + 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_WriteOnlyProperty(const osg::Vec4 &, AllColors); + I_Property(const osg::Vec3 &, Centre); + I_Property(int, Density); + I_Property(osgSim::SphereSegment::DrawMask, DrawMask); + I_ReadOnlyProperty(osg::Vec4, EdgeLineColor); + I_Property(float, Radius); + I_ReadOnlyProperty(osg::Vec4, SideColor); + I_ReadOnlyProperty(osg::Vec4, SpokeColor); + I_ReadOnlyProperty(osg::Vec4, SurfaceColor); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/VisibilityGroup.cpp b/src/osgWrappers/osgSim/VisibilityGroup.cpp index 3c1b5aa97..7728e478a 100644 --- a/src/osgWrappers/osgSim/VisibilityGroup.cpp +++ b/src/osgWrappers/osgSim/VisibilityGroup.cpp @@ -15,26 +15,34 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgSim::VisibilityGroup) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osgSim::VisibilityGroup &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(void, setVisibilityVolume, IN, osg::Node *, node); - Method0(osg::Node *, getVisibilityVolume); - Method0(const osg::Node *, getVisibilityVolume); - Method1(void, setVolumeIntersectionMask, IN, osg::Node::NodeMask, mask); - Method0(osg::Node::NodeMask, getVolumeIntersectionMask); - Method1(void, setSegmentLength, IN, float, length); - Method0(float, getSegmentLength); - Property(float, SegmentLength); - Property(osg::Node *, VisibilityVolume); - Property(osg::Node::NodeMask, VolumeIntersectionMask); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgSim::VisibilityGroup &, 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, setVisibilityVolume, IN, osg::Node *, node); + I_Method0(osg::Node *, getVisibilityVolume); + I_Method0(const osg::Node *, getVisibilityVolume); + I_Method1(void, setVolumeIntersectionMask, IN, osg::Node::NodeMask, mask); + I_Method0(osg::Node::NodeMask, getVolumeIntersectionMask); + I_Method1(void, setSegmentLength, IN, float, length); + I_Method0(float, getSegmentLength); + I_Property(float, SegmentLength); + I_Property(osg::Node *, VisibilityVolume); + I_Property(osg::Node::NodeMask, VolumeIntersectionMask); END_REFLECTOR diff --git a/src/osgWrappers/osgTerrain/DataSet.cpp b/src/osgWrappers/osgTerrain/DataSet.cpp index c4bd619d7..16d6ac89e 100644 --- a/src/osgWrappers/osgTerrain/DataSet.cpp +++ b/src/osgWrappers/osgTerrain/DataSet.cpp @@ -19,6 +19,14 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgTerrain::DataSet::CompositeDestination * >, osgTerrain::DataSet::Row); TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgTerrain::DataSet::Row >, osgTerrain::DataSet::Level); @@ -26,169 +34,169 @@ TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgTerrain::DataSet::Row >, osgTer TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgTerrain::DataSet::Level >, osgTerrain::DataSet::QuadMap); BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::CompositeType) - EnumLabel(osgTerrain::DataSet::GROUP); - EnumLabel(osgTerrain::DataSet::LOD); - EnumLabel(osgTerrain::DataSet::PAGED_LOD); + I_EnumLabel(osgTerrain::DataSet::GROUP); + I_EnumLabel(osgTerrain::DataSet::LOD); + I_EnumLabel(osgTerrain::DataSet::PAGED_LOD); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::DatabaseType) - EnumLabel(osgTerrain::DataSet::LOD_DATABASE); - EnumLabel(osgTerrain::DataSet::PagedLOD_DATABASE); + I_EnumLabel(osgTerrain::DataSet::LOD_DATABASE); + I_EnumLabel(osgTerrain::DataSet::PagedLOD_DATABASE); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::GeometryType) - EnumLabel(osgTerrain::DataSet::HEIGHT_FIELD); - EnumLabel(osgTerrain::DataSet::POLYGONAL); + I_EnumLabel(osgTerrain::DataSet::HEIGHT_FIELD); + I_EnumLabel(osgTerrain::DataSet::POLYGONAL); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::TextureType) - EnumLabel(osgTerrain::DataSet::RGB_24); - EnumLabel(osgTerrain::DataSet::RGBA); - EnumLabel(osgTerrain::DataSet::RGB_16); - EnumLabel(osgTerrain::DataSet::RGBA_16); - EnumLabel(osgTerrain::DataSet::COMPRESSED_TEXTURE); - EnumLabel(osgTerrain::DataSet::COMPRESSED_RGBA_TEXTURE); + I_EnumLabel(osgTerrain::DataSet::RGB_24); + I_EnumLabel(osgTerrain::DataSet::RGBA); + I_EnumLabel(osgTerrain::DataSet::RGB_16); + I_EnumLabel(osgTerrain::DataSet::RGBA_16); + I_EnumLabel(osgTerrain::DataSet::COMPRESSED_TEXTURE); + I_EnumLabel(osgTerrain::DataSet::COMPRESSED_RGBA_TEXTURE); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::MipMappingMode) - EnumLabel(osgTerrain::DataSet::NO_MIP_MAPPING); - EnumLabel(osgTerrain::DataSet::MIP_MAPPING_HARDWARE); - EnumLabel(osgTerrain::DataSet::MIP_MAPPING_IMAGERY); + I_EnumLabel(osgTerrain::DataSet::NO_MIP_MAPPING); + I_EnumLabel(osgTerrain::DataSet::MIP_MAPPING_HARDWARE); + I_EnumLabel(osgTerrain::DataSet::MIP_MAPPING_IMAGERY); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet) - BaseType(osg::Referenced); - Method1(void, insertTileToQuadMap, IN, osgTerrain::DataSet::CompositeDestination *, tile); - Method3(osgTerrain::DataSet::DestinationTile *, getTile, IN, unsigned int, level, IN, unsigned int, X, IN, unsigned int, Y); - Method3(osgTerrain::DataSet::CompositeDestination *, getComposite, IN, unsigned int, level, IN, unsigned int, X, IN, unsigned int, Y); - Method2(osgTerrain::DataSet::Row &, getRow, IN, unsigned int, level, IN, unsigned int, Y); - Constructor0(); - Method1(void, addSource, IN, osgTerrain::DataSet::Source *, source); - Method1(void, addSource, IN, osgTerrain::DataSet::CompositeSource *, composite); - Method0(void, loadSources); - Method1(void, setMaximumTileImageSize, IN, unsigned int, size); - Method0(unsigned int, getMaximumTileImageSize); - Method1(void, setMaximumTileTerrainSize, IN, unsigned int, size); - Method0(unsigned int, getMaximumTileTerrainSize); - Method1(void, setMaximumVisibleDistanceOfTopLevel, IN, float, d); - Method0(float, getMaximumVisibleDistanceOfTopLevel); - Method1(void, setRadiusToMaxVisibleDistanceRatio, IN, float, ratio); - Method0(float, getRadiusToMaxVisibleDistanceRatio); - Method1(void, setVerticalScale, IN, float, verticalScale); - Method0(float, getVerticalScale); - Method1(void, setSkirtRatio, IN, float, skirtRatio); - Method0(float, getSkirtRatio); - Method1(void, setDefaultColor, IN, const osg::Vec4 &, defaultColor); - Method0(const osg::Vec4 &, getDefaultColor); - Method1(void, setDestinationCoordinateSystem, IN, const std::string &, wellKnownText); - Method1(void, setDestinationCoordinateSystem, IN, osg::CoordinateSystemNode *, cs); - Method0(osg::CoordinateSystemNode *, getDestinationCoordinateSystem); - Method1(void, setIntermediateCoordinateSystem, IN, const std::string &, wellKnownText); - Method1(void, setIntermediateCoordinateSystem, IN, osg::CoordinateSystemNode *, cs); - Method0(osg::CoordinateSystemNode *, getIntermediateCoordinateSystem); - Method1(void, setConvertFromGeographicToGeocentric, IN, bool, flag); - Method0(bool, getConvertFromGeographicToGeocentric); - Method1(void, setEllipsoidModel, IN, osg::EllipsoidModel *, et); - Method0(osg::EllipsoidModel *, getEllipsoidModel); - Method0(const osg::EllipsoidModel *, getEllipsoidModel); - Method0(bool, mapLatLongsToXYZ); - Method1(void, setDestinationExtents, IN, const osg::BoundingBox &, extents); - Method1(void, setDestinationGeoTransform, IN, const osg::Matrixd &, geoTransform); - Method1(void, setArchiveName, IN, const std::string &, filename); - Method0(const std::string &, getArchiveName); - Method1(void, setArchive, IN, osgDB::Archive *, archive); - Method0(osgDB::Archive *, getArchive); - Method1(void, setDestinationName, IN, const std::string &, filename); - Method1(void, setDestinationTileBaseName, IN, const std::string &, basename); - Method0(const std::string &, getDestinationTileBaseName); - Method1(void, setDestinationTileExtension, IN, const std::string &, extension); - Method0(const std::string &, getDestinationTileExtension); - Method1(void, setDatabaseType, IN, osgTerrain::DataSet::DatabaseType, type); - Method0(osgTerrain::DataSet::DatabaseType, getDatabaseType); - Method1(void, setGeometryType, IN, osgTerrain::DataSet::GeometryType, type); - Method0(osgTerrain::DataSet::GeometryType, getGeometryType); - Method1(void, setTextureType, IN, osgTerrain::DataSet::TextureType, type); - Method0(osgTerrain::DataSet::TextureType, getTextureType); - Method1(void, setMaxAnisotropy, IN, float, d); - Method0(float, getMaxAnisotropy); - Method1(void, setMipMappingMode, IN, osgTerrain::DataSet::MipMappingMode, mipMappingMode); - Method0(osgTerrain::DataSet::MipMappingMode, getMipMappingMode); - Method1(void, setUseLocalTileTransform, IN, bool, flag); - Method0(bool, getUseLocalTileTransform); - Method1(void, setDecorateGeneratedSceneGraphWithCoordinateSystemNode, IN, bool, flag); - Method0(bool, getDecorateGeneratedSceneGraphWithCoordinateSystemNode); - Method1(void, setDecorateGeneratedSceneGraphWithMultiTextureControl, IN, bool, flag); - Method0(bool, getDecorateGeneratedSceneGraphWithMultiTextureControl); - Method0(unsigned int, getNumOfTextureLevels); - Method1(void, setCommentString, IN, const std::string &, comment); - Method0(const std::string &, getCommentString); - Method1(void, setWriteNodeBeforeSimplification, IN, bool, flag); - Method0(bool, getWriteNodeBeforeSimplification); - Method9(osgTerrain::DataSet::CompositeDestination *, createDestinationGraph, IN, osgTerrain::DataSet::CompositeDestination *, parent, IN, osg::CoordinateSystemNode *, cs, IN, const osg::BoundingBox &, extents, IN, unsigned int, maxImageSize, IN, unsigned int, maxTerrainSize, IN, unsigned int, currentLevel, IN, unsigned int, currentX, IN, unsigned int, currentY, IN, unsigned int, maxNumLevels); - Method1(void, computeDestinationGraphFromSources, IN, unsigned int, numLevels); - Method0(void, updateSourcesForDestinationGraphNeeds); - Method0(void, populateDestinationGraphFromSources); - Method1(void, createDestination, IN, unsigned int, numLevels); - Method0(void, buildDestination); - Method0(void, writeDestination); - Method0(osg::Node *, getDestinationRootNode); - Method2(void, _writeNodeFile, IN, const osg::Node &, node, IN, const std::string &, filename); - Method2(void, _writeImageFile, IN, const osg::Image &, image, IN, const std::string &, filename); - Property(osgDB::Archive *, Archive); - Property(const std::string &, ArchiveName); - Property(const std::string &, CommentString); - Property(bool, ConvertFromGeographicToGeocentric); - Property(osgTerrain::DataSet::DatabaseType, DatabaseType); - Property(bool, DecorateGeneratedSceneGraphWithCoordinateSystemNode); - Property(bool, DecorateGeneratedSceneGraphWithMultiTextureControl); - Property(const osg::Vec4 &, DefaultColor); - Property(osg::CoordinateSystemNode *, DestinationCoordinateSystem); - WriteOnlyProperty(const osg::BoundingBox &, DestinationExtents); - WriteOnlyProperty(const osg::Matrixd &, DestinationGeoTransform); - WriteOnlyProperty(const std::string &, DestinationName); - ReadOnlyProperty(osg::Node *, DestinationRootNode); - Property(const std::string &, DestinationTileBaseName); - Property(const std::string &, DestinationTileExtension); - Property(osg::EllipsoidModel *, EllipsoidModel); - Property(osgTerrain::DataSet::GeometryType, GeometryType); - Property(osg::CoordinateSystemNode *, IntermediateCoordinateSystem); - Property(float, MaxAnisotropy); - Property(unsigned int, MaximumTileImageSize); - Property(unsigned int, MaximumTileTerrainSize); - Property(float, MaximumVisibleDistanceOfTopLevel); - Property(osgTerrain::DataSet::MipMappingMode, MipMappingMode); - Property(float, RadiusToMaxVisibleDistanceRatio); - Property(float, SkirtRatio); - Property(osgTerrain::DataSet::TextureType, TextureType); - Property(bool, UseLocalTileTransform); - Property(float, VerticalScale); - Property(bool, WriteNodeBeforeSimplification); + I_BaseType(osg::Referenced); + I_Method1(void, insertTileToQuadMap, IN, osgTerrain::DataSet::CompositeDestination *, tile); + I_Method3(osgTerrain::DataSet::DestinationTile *, getTile, IN, unsigned int, level, IN, unsigned int, X, IN, unsigned int, Y); + I_Method3(osgTerrain::DataSet::CompositeDestination *, getComposite, IN, unsigned int, level, IN, unsigned int, X, IN, unsigned int, Y); + I_Method2(osgTerrain::DataSet::Row &, getRow, IN, unsigned int, level, IN, unsigned int, Y); + I_Constructor0(); + I_Method1(void, addSource, IN, osgTerrain::DataSet::Source *, source); + I_Method1(void, addSource, IN, osgTerrain::DataSet::CompositeSource *, composite); + I_Method0(void, loadSources); + I_Method1(void, setMaximumTileImageSize, IN, unsigned int, size); + I_Method0(unsigned int, getMaximumTileImageSize); + I_Method1(void, setMaximumTileTerrainSize, IN, unsigned int, size); + I_Method0(unsigned int, getMaximumTileTerrainSize); + I_Method1(void, setMaximumVisibleDistanceOfTopLevel, IN, float, d); + I_Method0(float, getMaximumVisibleDistanceOfTopLevel); + I_Method1(void, setRadiusToMaxVisibleDistanceRatio, IN, float, ratio); + I_Method0(float, getRadiusToMaxVisibleDistanceRatio); + I_Method1(void, setVerticalScale, IN, float, verticalScale); + I_Method0(float, getVerticalScale); + I_Method1(void, setSkirtRatio, IN, float, skirtRatio); + I_Method0(float, getSkirtRatio); + I_Method1(void, setDefaultColor, IN, const osg::Vec4 &, defaultColor); + I_Method0(const osg::Vec4 &, getDefaultColor); + I_Method1(void, setDestinationCoordinateSystem, IN, const std::string &, wellKnownText); + I_Method1(void, setDestinationCoordinateSystem, IN, osg::CoordinateSystemNode *, cs); + I_Method0(osg::CoordinateSystemNode *, getDestinationCoordinateSystem); + I_Method1(void, setIntermediateCoordinateSystem, IN, const std::string &, wellKnownText); + I_Method1(void, setIntermediateCoordinateSystem, IN, osg::CoordinateSystemNode *, cs); + I_Method0(osg::CoordinateSystemNode *, getIntermediateCoordinateSystem); + I_Method1(void, setConvertFromGeographicToGeocentric, IN, bool, flag); + I_Method0(bool, getConvertFromGeographicToGeocentric); + I_Method1(void, setEllipsoidModel, IN, osg::EllipsoidModel *, et); + I_Method0(osg::EllipsoidModel *, getEllipsoidModel); + I_Method0(const osg::EllipsoidModel *, getEllipsoidModel); + I_Method0(bool, mapLatLongsToXYZ); + I_Method1(void, setDestinationExtents, IN, const osg::BoundingBox &, extents); + I_Method1(void, setDestinationGeoTransform, IN, const osg::Matrixd &, geoTransform); + I_Method1(void, setArchiveName, IN, const std::string &, filename); + I_Method0(const std::string &, getArchiveName); + I_Method1(void, setArchive, IN, osgDB::Archive *, archive); + I_Method0(osgDB::Archive *, getArchive); + I_Method1(void, setDestinationName, IN, const std::string &, filename); + I_Method1(void, setDestinationTileBaseName, IN, const std::string &, basename); + I_Method0(const std::string &, getDestinationTileBaseName); + I_Method1(void, setDestinationTileExtension, IN, const std::string &, extension); + I_Method0(const std::string &, getDestinationTileExtension); + I_Method1(void, setDatabaseType, IN, osgTerrain::DataSet::DatabaseType, type); + I_Method0(osgTerrain::DataSet::DatabaseType, getDatabaseType); + I_Method1(void, setGeometryType, IN, osgTerrain::DataSet::GeometryType, type); + I_Method0(osgTerrain::DataSet::GeometryType, getGeometryType); + I_Method1(void, setTextureType, IN, osgTerrain::DataSet::TextureType, type); + I_Method0(osgTerrain::DataSet::TextureType, getTextureType); + I_Method1(void, setMaxAnisotropy, IN, float, d); + I_Method0(float, getMaxAnisotropy); + I_Method1(void, setMipMappingMode, IN, osgTerrain::DataSet::MipMappingMode, mipMappingMode); + I_Method0(osgTerrain::DataSet::MipMappingMode, getMipMappingMode); + I_Method1(void, setUseLocalTileTransform, IN, bool, flag); + I_Method0(bool, getUseLocalTileTransform); + I_Method1(void, setDecorateGeneratedSceneGraphWithCoordinateSystemNode, IN, bool, flag); + I_Method0(bool, getDecorateGeneratedSceneGraphWithCoordinateSystemNode); + I_Method1(void, setDecorateGeneratedSceneGraphWithMultiTextureControl, IN, bool, flag); + I_Method0(bool, getDecorateGeneratedSceneGraphWithMultiTextureControl); + I_Method0(unsigned int, getNumOfTextureLevels); + I_Method1(void, setCommentString, IN, const std::string &, comment); + I_Method0(const std::string &, getCommentString); + I_Method1(void, setWriteNodeBeforeSimplification, IN, bool, flag); + I_Method0(bool, getWriteNodeBeforeSimplification); + I_Method9(osgTerrain::DataSet::CompositeDestination *, createDestinationGraph, IN, osgTerrain::DataSet::CompositeDestination *, parent, IN, osg::CoordinateSystemNode *, cs, IN, const osg::BoundingBox &, extents, IN, unsigned int, maxImageSize, IN, unsigned int, maxTerrainSize, IN, unsigned int, currentLevel, IN, unsigned int, currentX, IN, unsigned int, currentY, IN, unsigned int, maxNumLevels); + I_Method1(void, computeDestinationGraphFromSources, IN, unsigned int, numLevels); + I_Method0(void, updateSourcesForDestinationGraphNeeds); + I_Method0(void, populateDestinationGraphFromSources); + I_Method1(void, createDestination, IN, unsigned int, numLevels); + I_Method0(void, buildDestination); + I_Method0(void, writeDestination); + I_Method0(osg::Node *, getDestinationRootNode); + I_Method2(void, _writeNodeFile, IN, const osg::Node &, node, IN, const std::string &, filename); + I_Method2(void, _writeImageFile, IN, const osg::Image &, image, IN, const std::string &, filename); + I_Property(osgDB::Archive *, Archive); + I_Property(const std::string &, ArchiveName); + I_Property(const std::string &, CommentString); + I_Property(bool, ConvertFromGeographicToGeocentric); + I_Property(osgTerrain::DataSet::DatabaseType, DatabaseType); + I_Property(bool, DecorateGeneratedSceneGraphWithCoordinateSystemNode); + I_Property(bool, DecorateGeneratedSceneGraphWithMultiTextureControl); + I_Property(const osg::Vec4 &, DefaultColor); + I_Property(osg::CoordinateSystemNode *, DestinationCoordinateSystem); + I_WriteOnlyProperty(const osg::BoundingBox &, DestinationExtents); + I_WriteOnlyProperty(const osg::Matrixd &, DestinationGeoTransform); + I_WriteOnlyProperty(const std::string &, DestinationName); + I_ReadOnlyProperty(osg::Node *, DestinationRootNode); + I_Property(const std::string &, DestinationTileBaseName); + I_Property(const std::string &, DestinationTileExtension); + I_Property(osg::EllipsoidModel *, EllipsoidModel); + I_Property(osgTerrain::DataSet::GeometryType, GeometryType); + I_Property(osg::CoordinateSystemNode *, IntermediateCoordinateSystem); + I_Property(float, MaxAnisotropy); + I_Property(unsigned int, MaximumTileImageSize); + I_Property(unsigned int, MaximumTileTerrainSize); + I_Property(float, MaximumVisibleDistanceOfTopLevel); + I_Property(osgTerrain::DataSet::MipMappingMode, MipMappingMode); + I_Property(float, RadiusToMaxVisibleDistanceRatio); + I_Property(float, SkirtRatio); + I_Property(osgTerrain::DataSet::TextureType, TextureType); + I_Property(bool, UseLocalTileTransform); + I_Property(float, VerticalScale); + I_Property(bool, WriteNodeBeforeSimplification); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgTerrain::DataSet::DestinationTile > >, osgTerrain::DataSet::CompositeDestination::TileList); TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgTerrain::DataSet::CompositeDestination > >, osgTerrain::DataSet::CompositeDestination::ChildList); -BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::CompositeDestination) - BaseType(osg::Referenced); - BaseType(osgTerrain::DataSet::SpatialProperties); - Constructor0(); - Constructor2(IN, osg::CoordinateSystemNode *, cs, IN, const osg::BoundingBox &, extents); - Method0(void, computeNeighboursFromQuadMap); - Method1(void, addRequiredResolutions, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); - Method1(void, readFrom, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); - Method0(void, equalizeBoundaries); - Method0(osg::Node *, createScene); - Method0(bool, areSubTilesComplete); - Method0(std::string, getSubTileName); - Method0(osg::Node *, createPagedLODScene); - Method0(osg::Node *, createSubTileScene); - Method0(void, unrefSubTileData); - Method0(void, unrefLocalData); - Method1(void, setSubTilesGenerated, IN, bool, generated); - Method0(bool, getSubTilesGenerated); - ReadOnlyProperty(std::string, SubTileName); - Property(bool, SubTilesGenerated); +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::CompositeDestination) + I_BaseType(osg::Referenced); + I_BaseType(osgTerrain::DataSet::SpatialProperties); + I_Constructor0(); + I_Constructor2(IN, osg::CoordinateSystemNode *, cs, IN, const osg::BoundingBox &, extents); + I_Method0(void, computeNeighboursFromQuadMap); + I_Method1(void, addRequiredResolutions, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); + I_Method1(void, readFrom, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); + I_Method0(void, equalizeBoundaries); + I_Method0(osg::Node *, createScene); + I_Method0(bool, areSubTilesComplete); + I_Method0(std::string, getSubTileName); + I_Method0(osg::Node *, createPagedLODScene); + I_Method0(osg::Node *, createSubTileScene); + I_Method0(void, unrefSubTileData); + I_Method0(void, unrefLocalData); + I_Method1(void, setSubTilesGenerated, IN, bool, generated); + I_Method0(bool, getSubTilesGenerated); + I_ReadOnlyProperty(std::string, SubTileName); + I_Property(bool, SubTilesGenerated); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgTerrain::DataSet::Source > >, osgTerrain::DataSet::CompositeSource::SourceList); @@ -199,269 +207,269 @@ TYPE_NAME_ALIAS(osgTerrain::DataSet::CompositeSource::base_source_iterator< osgT TYPE_NAME_ALIAS(osgTerrain::DataSet::CompositeSource::base_source_iterator< osgTerrain::DataSet::CompositeSource::LODSourceAdvancer >, osgTerrain::DataSet::CompositeSource::source_lod_iterator); -BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::CompositeSource) - BaseType(osg::Referenced); - BaseType(osgTerrain::DataSet::SpatialProperties); - ConstructorWithDefaults1(IN, osgTerrain::DataSet::CompositeType, type, osgTerrain::DataSet::GROUP); - Method1(void, setType, IN, osgTerrain::DataSet::CompositeType, type); - Method0(osgTerrain::DataSet::CompositeType, getType); - Method0(void, setSortValueFromSourceDataResolution); - Method0(void, sort); - Property(osgTerrain::DataSet::CompositeType, Type); +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::CompositeSource) + I_BaseType(osg::Referenced); + I_BaseType(osgTerrain::DataSet::SpatialProperties); + I_ConstructorWithDefaults1(IN, osgTerrain::DataSet::CompositeType, type, osgTerrain::DataSet::GROUP); + I_Method1(void, setType, IN, osgTerrain::DataSet::CompositeType, type); + I_Method0(osgTerrain::DataSet::CompositeType, getType); + I_Method0(void, setSortValueFromSourceDataResolution); + I_Method0(void, sort); + I_Property(osgTerrain::DataSet::CompositeType, Type); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::CompositeSource::DefaultSourceAdvancer) - Constructor0(); - Method2(bool, isActive, IN, const osgTerrain::DataSet::CompositeSource &, composite, IN, int, index); - Method2(bool, advanceToNextSource, IN, const osgTerrain::DataSet::CompositeSource &, composite, IN, int &, index); + I_Constructor0(); + I_Method2(bool, isActive, IN, const osgTerrain::DataSet::CompositeSource &, composite, IN, int, index); + I_Method2(bool, advanceToNextSource, IN, const osgTerrain::DataSet::CompositeSource &, composite, IN, int &, index); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::CompositeSource::iterator::IteratorMode) - EnumLabel(osgTerrain::DataSet::CompositeSource::iterator::ACTIVE); - EnumLabel(osgTerrain::DataSet::CompositeSource::iterator::ALL); + I_EnumLabel(osgTerrain::DataSet::CompositeSource::iterator::ACTIVE); + I_EnumLabel(osgTerrain::DataSet::CompositeSource::iterator::ALL); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::CompositeSource::iterator) - ConstructorWithDefaults2(IN, osgTerrain::DataSet::CompositeSource *, composite, 0, IN, osgTerrain::DataSet::CompositeSource::iterator::IteratorMode, mode, osgTerrain::DataSet::CompositeSource::iterator::ALL); - Constructor1(IN, const osgTerrain::DataSet::CompositeSource::iterator &, rhs); - Method0(bool, valid); - Method0(bool, advance); + I_ConstructorWithDefaults2(IN, osgTerrain::DataSet::CompositeSource *, composite, 0, IN, osgTerrain::DataSet::CompositeSource::iterator::IteratorMode, mode, osgTerrain::DataSet::CompositeSource::iterator::ALL); + I_Constructor1(IN, const osgTerrain::DataSet::CompositeSource::iterator &, rhs); + I_Method0(bool, valid); + I_Method0(bool, advance); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::CompositeSource::LODSourceAdvancer) - ConstructorWithDefaults1(IN, float, targetResolution, 0.0f); - Method2(bool, advanceToNextSource, IN, const osgTerrain::DataSet::CompositeSource &, composite, IN, int &, index); + I_ConstructorWithDefaults1(IN, float, targetResolution, 0.0f); + I_Method2(bool, advanceToNextSource, IN, const osgTerrain::DataSet::CompositeSource &, composite, IN, int &, index); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Image > >, osgTerrain::DataSet::DestinationData::ImageList); TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Node > >, osgTerrain::DataSet::DestinationData::ModelList); -BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::DestinationData) - BaseType(osg::Referenced); - Constructor1(IN, osgTerrain::DataSet *, dataSet); +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationData) + I_BaseType(osg::Referenced); + I_Constructor1(IN, osgTerrain::DataSet *, dataSet); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::DestinationTile::Position) - EnumLabel(osgTerrain::DataSet::DestinationTile::LEFT); - EnumLabel(osgTerrain::DataSet::DestinationTile::LEFT_BELOW); - EnumLabel(osgTerrain::DataSet::DestinationTile::BELOW); - EnumLabel(osgTerrain::DataSet::DestinationTile::BELOW_RIGHT); - EnumLabel(osgTerrain::DataSet::DestinationTile::RIGHT); - EnumLabel(osgTerrain::DataSet::DestinationTile::RIGHT_ABOVE); - EnumLabel(osgTerrain::DataSet::DestinationTile::ABOVE); - EnumLabel(osgTerrain::DataSet::DestinationTile::ABOVE_LEFT); - EnumLabel(osgTerrain::DataSet::DestinationTile::NUMBER_OF_POSITIONS); + I_EnumLabel(osgTerrain::DataSet::DestinationTile::LEFT); + I_EnumLabel(osgTerrain::DataSet::DestinationTile::LEFT_BELOW); + I_EnumLabel(osgTerrain::DataSet::DestinationTile::BELOW); + I_EnumLabel(osgTerrain::DataSet::DestinationTile::BELOW_RIGHT); + I_EnumLabel(osgTerrain::DataSet::DestinationTile::RIGHT); + I_EnumLabel(osgTerrain::DataSet::DestinationTile::RIGHT_ABOVE); + I_EnumLabel(osgTerrain::DataSet::DestinationTile::ABOVE); + I_EnumLabel(osgTerrain::DataSet::DestinationTile::ABOVE_LEFT); + I_EnumLabel(osgTerrain::DataSet::DestinationTile::NUMBER_OF_POSITIONS); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::DestinationTile) - BaseType(osg::Referenced); - BaseType(osgTerrain::DataSet::SpatialProperties); - Constructor0(); - Method0(void, computeNeighboursFromQuadMap); - Method8(void, setNeighbours, IN, osgTerrain::DataSet::DestinationTile *, left, IN, osgTerrain::DataSet::DestinationTile *, left_below, IN, osgTerrain::DataSet::DestinationTile *, below, IN, osgTerrain::DataSet::DestinationTile *, below_right, IN, osgTerrain::DataSet::DestinationTile *, right, IN, osgTerrain::DataSet::DestinationTile *, right_above, IN, osgTerrain::DataSet::DestinationTile *, above, IN, osgTerrain::DataSet::DestinationTile *, above_left); - Method0(void, checkNeighbouringTiles); - Method2(void, setMaximumImagerySize, IN, unsigned int, maxNumColumns, IN, unsigned int, maxNumRows); - Method2(void, setMaximumTerrainSize, IN, unsigned int, maxNumColumns, IN, unsigned int, maxNumRows); - Method1(void, computeMaximumSourceResolution, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); - Method5(bool, computeImageResolution, IN, unsigned int, layer, IN, unsigned int &, numColumns, IN, unsigned int &, numRows, IN, double &, resX, IN, double &, resY); - Method4(bool, computeTerrainResolution, IN, unsigned int &, numColumns, IN, unsigned int &, numRows, IN, double &, resX, IN, double &, resY); - Method0(void, allocate); - Method1(void, addRequiredResolutions, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); - Method1(void, readFrom, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); - Method1(void, equalizeCorner, IN, osgTerrain::DataSet::DestinationTile::Position, position); - Method1(void, equalizeEdge, IN, osgTerrain::DataSet::DestinationTile::Position, position); - Method0(void, equalizeBoundaries); - Method1(void, setTileComplete, IN, bool, complete); - Method0(bool, getTileComplete); - Method0(void, optimizeResolution); - Method0(osg::Node *, createScene); - Method0(osg::StateSet *, createStateSet); - Method0(osg::Node *, createHeightField); - Method0(osg::Node *, createPolygonal); - Method0(void, unrefData); - Method1(osgTerrain::DataSet::DestinationTile::ImageData &, getImageData, IN, unsigned int, layer); - Property(bool, TileComplete); +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationTile) + I_BaseType(osg::Referenced); + I_BaseType(osgTerrain::DataSet::SpatialProperties); + I_Constructor0(); + I_Method0(void, computeNeighboursFromQuadMap); + I_Method8(void, setNeighbours, IN, osgTerrain::DataSet::DestinationTile *, left, IN, osgTerrain::DataSet::DestinationTile *, left_below, IN, osgTerrain::DataSet::DestinationTile *, below, IN, osgTerrain::DataSet::DestinationTile *, below_right, IN, osgTerrain::DataSet::DestinationTile *, right, IN, osgTerrain::DataSet::DestinationTile *, right_above, IN, osgTerrain::DataSet::DestinationTile *, above, IN, osgTerrain::DataSet::DestinationTile *, above_left); + I_Method0(void, checkNeighbouringTiles); + I_Method2(void, setMaximumImagerySize, IN, unsigned int, maxNumColumns, IN, unsigned int, maxNumRows); + I_Method2(void, setMaximumTerrainSize, IN, unsigned int, maxNumColumns, IN, unsigned int, maxNumRows); + I_Method1(void, computeMaximumSourceResolution, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); + I_Method5(bool, computeImageResolution, IN, unsigned int, layer, IN, unsigned int &, numColumns, IN, unsigned int &, numRows, IN, double &, resX, IN, double &, resY); + I_Method4(bool, computeTerrainResolution, IN, unsigned int &, numColumns, IN, unsigned int &, numRows, IN, double &, resX, IN, double &, resY); + I_Method0(void, allocate); + I_Method1(void, addRequiredResolutions, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); + I_Method1(void, readFrom, IN, osgTerrain::DataSet::CompositeSource *, sourceGraph); + I_Method1(void, equalizeCorner, IN, osgTerrain::DataSet::DestinationTile::Position, position); + I_Method1(void, equalizeEdge, IN, osgTerrain::DataSet::DestinationTile::Position, position); + I_Method0(void, equalizeBoundaries); + I_Method1(void, setTileComplete, IN, bool, complete); + I_Method0(bool, getTileComplete); + I_Method0(void, optimizeResolution); + I_Method0(osg::Node *, createScene); + I_Method0(osg::StateSet *, createStateSet); + I_Method0(osg::Node *, createHeightField); + I_Method0(osg::Node *, createPolygonal); + I_Method0(void, unrefData); + I_Method1(osgTerrain::DataSet::DestinationTile::ImageData &, getImageData, IN, unsigned int, layer); + I_Property(bool, TileComplete); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::DestinationTile::ImageData) - Constructor0(); + I_Constructor0(); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osgTerrain::DataSet::Source::ResolutionPair >, osgTerrain::DataSet::Source::ResolutionList); BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::Source::Type) - EnumLabel(osgTerrain::DataSet::Source::IMAGE); - EnumLabel(osgTerrain::DataSet::Source::HEIGHT_FIELD); - EnumLabel(osgTerrain::DataSet::Source::MODEL); + I_EnumLabel(osgTerrain::DataSet::Source::IMAGE); + I_EnumLabel(osgTerrain::DataSet::Source::HEIGHT_FIELD); + I_EnumLabel(osgTerrain::DataSet::Source::MODEL); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::Source::ParameterPolicy) - EnumLabel(osgTerrain::DataSet::Source::PREFER_CONFIG_SETTINGS); - EnumLabel(osgTerrain::DataSet::Source::PREFER_CONFIG_SETTINGS_BUT_SCALE_BY_FILE_RESOLUTION); - EnumLabel(osgTerrain::DataSet::Source::PREFER_FILE_SETTINGS); + I_EnumLabel(osgTerrain::DataSet::Source::PREFER_CONFIG_SETTINGS); + I_EnumLabel(osgTerrain::DataSet::Source::PREFER_CONFIG_SETTINGS_BUT_SCALE_BY_FILE_RESOLUTION); + I_EnumLabel(osgTerrain::DataSet::Source::PREFER_FILE_SETTINGS); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::Source) - BaseType(osg::Referenced); - BaseType(osgTerrain::DataSet::SpatialProperties); - Constructor0(); - Constructor2(IN, osgTerrain::DataSet::Source::Type, type, IN, const std::string &, filename); - Method1(void, setSortValue, IN, double, s); - Method0(double, getSortValue); - Method0(void, setSortValueFromSourceDataResolution); - Method1(void, setType, IN, osgTerrain::DataSet::Source::Type, type); - Method0(osgTerrain::DataSet::Source::Type, getType); - Method1(void, setFileName, IN, const std::string &, filename); - Method0(const std::string &, getFileName); - Method1(void, setTemporaryFile, IN, bool, temporaryFile); - Method0(bool, getTemporaryFile); - Method1(void, setCoordinateSystemPolicy, IN, osgTerrain::DataSet::Source::ParameterPolicy, policy); - Method0(osgTerrain::DataSet::Source::ParameterPolicy, getCoordinateSystemPolicy); - Method1(void, setCoordinateSystem, IN, const std::string &, wellKnownText); - Method1(void, setCoordinateSystem, IN, osg::CoordinateSystemNode *, cs); - Method0(osg::CoordinateSystemNode *, getCoordinateSystem); - Method1(void, setGeoTransformPolicy, IN, osgTerrain::DataSet::Source::ParameterPolicy, policy); - Method0(osgTerrain::DataSet::Source::ParameterPolicy, getGeoTransformPolicy); - Method1(void, setGeoTransform, IN, osg::Matrixd &, transform); - Method0(osg::Matrixd &, getGeoTransform); - Method4(void, setGeoTransformFromRange, IN, double, xMin, IN, double, xMax, IN, double, yMin, IN, double, yMax); - Method0(void, assignCoordinateSystemAndGeoTransformAccordingToParameterPolicy); - Method1(void, setMinLevel, IN, unsigned int, minLevel); - Method1(void, setMaxLevel, IN, unsigned int, maxLevel); - Method2(void, setMinMaxLevel, IN, unsigned int, minLevel, IN, unsigned int, maxLevel); - Method0(unsigned int, getMinLevel); - Method0(unsigned int, getMaxLevel); - Method1(void, setLayer, IN, unsigned int, layer); - Method0(unsigned int, getLayer); - Method1(void, setSourceData, IN, osgTerrain::DataSet::SourceData *, data); - Method0(osgTerrain::DataSet::SourceData *, getSourceData); - Method1(bool, intersects, IN, const osgTerrain::DataSet::SpatialProperties &, sp); - Method0(void, loadSourceData); - Method1(bool, needReproject, IN, const osg::CoordinateSystemNode *, cs); - Method3(bool, needReproject, IN, const osg::CoordinateSystemNode *, cs, IN, double, minResolution, IN, double, maxResolution); - MethodWithDefaults3(osgTerrain::DataSet::Source *, doReproject, IN, const std::string &, filename, , IN, osg::CoordinateSystemNode *, cs, , IN, double, targetResolution, 0.0); - Method0(void, buildOverviews); - Method2(void, addRequiredResolution, IN, double, resX, IN, double, resY); - Method1(void, setRequiredResolutions, IN, osgTerrain::DataSet::Source::ResolutionList &, resolutions); - Method0(osgTerrain::DataSet::Source::ResolutionList &, getRequiredResolutions); - Method0(const osgTerrain::DataSet::Source::ResolutionList &, getRequiredResolutions); - Method0(void, consolodateRequiredResolutions); - Property(osg::CoordinateSystemNode *, CoordinateSystem); - Property(osgTerrain::DataSet::Source::ParameterPolicy, CoordinateSystemPolicy); - Property(const std::string &, FileName); - Property(osg::Matrixd &, GeoTransform); - Property(osgTerrain::DataSet::Source::ParameterPolicy, GeoTransformPolicy); - Property(unsigned int, Layer); - Property(unsigned int, MaxLevel); - Property(unsigned int, MinLevel); - Property(osgTerrain::DataSet::Source::ResolutionList &, RequiredResolutions); - Property(double, SortValue); - Property(osgTerrain::DataSet::SourceData *, SourceData); - Property(bool, TemporaryFile); - Property(osgTerrain::DataSet::Source::Type, Type); +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::Source) + I_BaseType(osg::Referenced); + I_BaseType(osgTerrain::DataSet::SpatialProperties); + I_Constructor0(); + I_Constructor2(IN, osgTerrain::DataSet::Source::Type, type, IN, const std::string &, filename); + I_Method1(void, setSortValue, IN, double, s); + I_Method0(double, getSortValue); + I_Method0(void, setSortValueFromSourceDataResolution); + I_Method1(void, setType, IN, osgTerrain::DataSet::Source::Type, type); + I_Method0(osgTerrain::DataSet::Source::Type, getType); + I_Method1(void, setFileName, IN, const std::string &, filename); + I_Method0(const std::string &, getFileName); + I_Method1(void, setTemporaryFile, IN, bool, temporaryFile); + I_Method0(bool, getTemporaryFile); + I_Method1(void, setCoordinateSystemPolicy, IN, osgTerrain::DataSet::Source::ParameterPolicy, policy); + I_Method0(osgTerrain::DataSet::Source::ParameterPolicy, getCoordinateSystemPolicy); + I_Method1(void, setCoordinateSystem, IN, const std::string &, wellKnownText); + I_Method1(void, setCoordinateSystem, IN, osg::CoordinateSystemNode *, cs); + I_Method0(osg::CoordinateSystemNode *, getCoordinateSystem); + I_Method1(void, setGeoTransformPolicy, IN, osgTerrain::DataSet::Source::ParameterPolicy, policy); + I_Method0(osgTerrain::DataSet::Source::ParameterPolicy, getGeoTransformPolicy); + I_Method1(void, setGeoTransform, IN, osg::Matrixd &, transform); + I_Method0(osg::Matrixd &, getGeoTransform); + I_Method4(void, setGeoTransformFromRange, IN, double, xMin, IN, double, xMax, IN, double, yMin, IN, double, yMax); + I_Method0(void, assignCoordinateSystemAndGeoTransformAccordingToParameterPolicy); + I_Method1(void, setMinLevel, IN, unsigned int, minLevel); + I_Method1(void, setMaxLevel, IN, unsigned int, maxLevel); + I_Method2(void, setMinMaxLevel, IN, unsigned int, minLevel, IN, unsigned int, maxLevel); + I_Method0(unsigned int, getMinLevel); + I_Method0(unsigned int, getMaxLevel); + I_Method1(void, setLayer, IN, unsigned int, layer); + I_Method0(unsigned int, getLayer); + I_Method1(void, setSourceData, IN, osgTerrain::DataSet::SourceData *, data); + I_Method0(osgTerrain::DataSet::SourceData *, getSourceData); + I_Method1(bool, intersects, IN, const osgTerrain::DataSet::SpatialProperties &, sp); + I_Method0(void, loadSourceData); + I_Method1(bool, needReproject, IN, const osg::CoordinateSystemNode *, cs); + I_Method3(bool, needReproject, IN, const osg::CoordinateSystemNode *, cs, IN, double, minResolution, IN, double, maxResolution); + I_MethodWithDefaults3(osgTerrain::DataSet::Source *, doReproject, IN, const std::string &, filename, , IN, osg::CoordinateSystemNode *, cs, , IN, double, targetResolution, 0.0); + I_Method0(void, buildOverviews); + I_Method2(void, addRequiredResolution, IN, double, resX, IN, double, resY); + I_Method1(void, setRequiredResolutions, IN, osgTerrain::DataSet::Source::ResolutionList &, resolutions); + I_Method0(osgTerrain::DataSet::Source::ResolutionList &, getRequiredResolutions); + I_Method0(const osgTerrain::DataSet::Source::ResolutionList &, getRequiredResolutions); + I_Method0(void, consolodateRequiredResolutions); + I_Property(osg::CoordinateSystemNode *, CoordinateSystem); + I_Property(osgTerrain::DataSet::Source::ParameterPolicy, CoordinateSystemPolicy); + I_Property(const std::string &, FileName); + I_Property(osg::Matrixd &, GeoTransform); + I_Property(osgTerrain::DataSet::Source::ParameterPolicy, GeoTransformPolicy); + I_Property(unsigned int, Layer); + I_Property(unsigned int, MaxLevel); + I_Property(unsigned int, MinLevel); + I_Property(osgTerrain::DataSet::Source::ResolutionList &, RequiredResolutions); + I_Property(double, SortValue); + I_Property(osgTerrain::DataSet::SourceData *, SourceData); + I_Property(bool, TemporaryFile); + I_Property(osgTerrain::DataSet::Source::Type, Type); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::Source::ResolutionPair) - Constructor0(); - Constructor2(IN, double, x, IN, double, y); + I_Constructor0(); + I_Constructor2(IN, double, x, IN, double, y); END_REFLECTOR TYPE_NAME_ALIAS(std::map< const osg::CoordinateSystemNode * COMMA osgTerrain::DataSet::SpatialProperties >, osgTerrain::DataSet::SourceData::SpatialPropertiesMap); -BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::SourceData) - BaseType(osg::Referenced); - BaseType(osgTerrain::DataSet::SpatialProperties); - ConstructorWithDefaults1(IN, osgTerrain::DataSet::Source *, source, 0); - Method1(osg::BoundingBox, getExtents, IN, const osg::CoordinateSystemNode *, cs); - Method1(const osgTerrain::DataSet::SpatialProperties &, computeSpatialProperties, IN, const osg::CoordinateSystemNode *, cs); - Method1(bool, intersects, IN, const osgTerrain::DataSet::SpatialProperties &, sp); - Method1(void, read, IN, osgTerrain::DataSet::DestinationData &, destination); - Method1(void, readImage, IN, osgTerrain::DataSet::DestinationData &, destination); - Method1(void, readHeightField, IN, osgTerrain::DataSet::DestinationData &, destination); - Method1(void, readModels, IN, osgTerrain::DataSet::DestinationData &, destination); +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::SourceData) + I_BaseType(osg::Referenced); + I_BaseType(osgTerrain::DataSet::SpatialProperties); + I_ConstructorWithDefaults1(IN, osgTerrain::DataSet::Source *, source, 0); + I_Method1(osg::BoundingBox, getExtents, IN, const osg::CoordinateSystemNode *, cs); + I_Method1(const osgTerrain::DataSet::SpatialProperties &, computeSpatialProperties, IN, const osg::CoordinateSystemNode *, cs); + I_Method1(bool, intersects, IN, const osgTerrain::DataSet::SpatialProperties &, sp); + I_Method1(void, read, IN, osgTerrain::DataSet::DestinationData &, destination); + I_Method1(void, readImage, IN, osgTerrain::DataSet::DestinationData &, destination); + I_Method1(void, readHeightField, IN, osgTerrain::DataSet::DestinationData &, destination); + I_Method1(void, readModels, IN, osgTerrain::DataSet::DestinationData &, destination); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::SpatialProperties) - Constructor0(); - Constructor1(IN, const osgTerrain::DataSet::SpatialProperties &, sp); - Constructor2(IN, osg::CoordinateSystemNode *, cs, IN, const osg::BoundingBox &, extents); - Method1(osgTerrain::DataSet::SpatialProperties &, assignSpatialProperties, IN, const osgTerrain::DataSet::SpatialProperties &, sp); - Method0(void, computeExtents); + I_Constructor0(); + I_Constructor1(IN, const osgTerrain::DataSet::SpatialProperties &, sp); + I_Constructor2(IN, osg::CoordinateSystemNode *, cs, IN, const osg::BoundingBox &, extents); + I_Method1(osgTerrain::DataSet::SpatialProperties &, assignSpatialProperties, IN, const osgTerrain::DataSet::SpatialProperties &, sp); + I_Method0(void, computeExtents); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Image >) - Constructor0(); - Constructor1(IN, osg::Image *, t); - Constructor1(IN, const osg::ref_ptr< osg::Image > &, rp); - Method0(bool, valid); - Method0(osg::Image *, get); - Method0(const osg::Image *, get); - Method0(osg::Image *, take); - Method0(osg::Image *, release); - ReadOnlyProperty(osg::Image *, ); + I_Constructor0(); + I_Constructor1(IN, osg::Image *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::Image > &, rp); + I_Method0(bool, valid); + I_Method0(osg::Image *, get); + I_Method0(const osg::Image *, get); + I_Method0(osg::Image *, take); + I_Method0(osg::Image *, release); + I_ReadOnlyProperty(osg::Image *, ); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::CompositeDestination >) - Constructor0(); - Constructor1(IN, osgTerrain::DataSet::CompositeDestination *, t); - Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::CompositeDestination > &, rp); - Method0(bool, valid); - Method0(osgTerrain::DataSet::CompositeDestination *, get); - Method0(const osgTerrain::DataSet::CompositeDestination *, get); - Method0(osgTerrain::DataSet::CompositeDestination *, take); - Method0(osgTerrain::DataSet::CompositeDestination *, release); - ReadOnlyProperty(osgTerrain::DataSet::CompositeDestination *, ); + I_Constructor0(); + I_Constructor1(IN, osgTerrain::DataSet::CompositeDestination *, t); + I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::CompositeDestination > &, rp); + I_Method0(bool, valid); + I_Method0(osgTerrain::DataSet::CompositeDestination *, get); + I_Method0(const osgTerrain::DataSet::CompositeDestination *, get); + I_Method0(osgTerrain::DataSet::CompositeDestination *, take); + I_Method0(osgTerrain::DataSet::CompositeDestination *, release); + I_ReadOnlyProperty(osgTerrain::DataSet::CompositeDestination *, ); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::CompositeSource >) - Constructor0(); - Constructor1(IN, osgTerrain::DataSet::CompositeSource *, t); - Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::CompositeSource > &, rp); - Method0(bool, valid); - Method0(osgTerrain::DataSet::CompositeSource *, get); - Method0(const osgTerrain::DataSet::CompositeSource *, get); - Method0(osgTerrain::DataSet::CompositeSource *, take); - Method0(osgTerrain::DataSet::CompositeSource *, release); - ReadOnlyProperty(osgTerrain::DataSet::CompositeSource *, ); + I_Constructor0(); + I_Constructor1(IN, osgTerrain::DataSet::CompositeSource *, t); + I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::CompositeSource > &, rp); + I_Method0(bool, valid); + I_Method0(osgTerrain::DataSet::CompositeSource *, get); + I_Method0(const osgTerrain::DataSet::CompositeSource *, get); + I_Method0(osgTerrain::DataSet::CompositeSource *, take); + I_Method0(osgTerrain::DataSet::CompositeSource *, release); + I_ReadOnlyProperty(osgTerrain::DataSet::CompositeSource *, ); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::DestinationTile >) - Constructor0(); - Constructor1(IN, osgTerrain::DataSet::DestinationTile *, t); - Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::DestinationTile > &, rp); - Method0(bool, valid); - Method0(osgTerrain::DataSet::DestinationTile *, get); - Method0(const osgTerrain::DataSet::DestinationTile *, get); - Method0(osgTerrain::DataSet::DestinationTile *, take); - Method0(osgTerrain::DataSet::DestinationTile *, release); - ReadOnlyProperty(osgTerrain::DataSet::DestinationTile *, ); + I_Constructor0(); + I_Constructor1(IN, osgTerrain::DataSet::DestinationTile *, t); + I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::DestinationTile > &, rp); + I_Method0(bool, valid); + I_Method0(osgTerrain::DataSet::DestinationTile *, get); + I_Method0(const osgTerrain::DataSet::DestinationTile *, get); + I_Method0(osgTerrain::DataSet::DestinationTile *, take); + I_Method0(osgTerrain::DataSet::DestinationTile *, release); + I_ReadOnlyProperty(osgTerrain::DataSet::DestinationTile *, ); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::DataSet::Source >) - Constructor0(); - Constructor1(IN, osgTerrain::DataSet::Source *, t); - Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::Source > &, rp); - Method0(bool, valid); - Method0(osgTerrain::DataSet::Source *, get); - Method0(const osgTerrain::DataSet::Source *, get); - Method0(osgTerrain::DataSet::Source *, take); - Method0(osgTerrain::DataSet::Source *, release); - ReadOnlyProperty(osgTerrain::DataSet::Source *, ); + I_Constructor0(); + I_Constructor1(IN, osgTerrain::DataSet::Source *, t); + I_Constructor1(IN, const osg::ref_ptr< osgTerrain::DataSet::Source > &, rp); + I_Method0(bool, valid); + I_Method0(osgTerrain::DataSet::Source *, get); + I_Method0(const osgTerrain::DataSet::Source *, get); + I_Method0(osgTerrain::DataSet::Source *, take); + I_Method0(osgTerrain::DataSet::Source *, release); + I_ReadOnlyProperty(osgTerrain::DataSet::Source *, ); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::CompositeSource::base_source_iterator< osgTerrain::DataSet::CompositeSource::DefaultSourceAdvancer >) - ConstructorWithDefaults2(IN, osgTerrain::DataSet::CompositeSource *, composite, 0, IN, osgTerrain::DataSet::CompositeSource::DefaultSourceAdvancer, advancer, osgTerrain::DataSet::CompositeSource::DefaultSourceAdvancer()); - Constructor1(IN, const osgTerrain::DataSet::CompositeSource::base_source_iterator< osgTerrain::DataSet::CompositeSource::DefaultSourceAdvancer > &, rhs); - Method0(bool, valid); - Method0(bool, advance); + I_ConstructorWithDefaults2(IN, osgTerrain::DataSet::CompositeSource *, composite, 0, IN, osgTerrain::DataSet::CompositeSource::DefaultSourceAdvancer, advancer, osgTerrain::DataSet::CompositeSource::DefaultSourceAdvancer()); + I_Constructor1(IN, const osgTerrain::DataSet::CompositeSource::base_source_iterator< osgTerrain::DataSet::CompositeSource::DefaultSourceAdvancer > &, rhs); + I_Method0(bool, valid); + I_Method0(bool, advance); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgTerrain::DataSet::CompositeSource::base_source_iterator< osgTerrain::DataSet::CompositeSource::LODSourceAdvancer >) - ConstructorWithDefaults2(IN, osgTerrain::DataSet::CompositeSource *, composite, 0, IN, osgTerrain::DataSet::CompositeSource::LODSourceAdvancer, advancer, osgTerrain::DataSet::CompositeSource::LODSourceAdvancer()); - Constructor1(IN, const osgTerrain::DataSet::CompositeSource::base_source_iterator< osgTerrain::DataSet::CompositeSource::LODSourceAdvancer > &, rhs); - Method0(bool, valid); - Method0(bool, advance); + I_ConstructorWithDefaults2(IN, osgTerrain::DataSet::CompositeSource *, composite, 0, IN, osgTerrain::DataSet::CompositeSource::LODSourceAdvancer, advancer, osgTerrain::DataSet::CompositeSource::LODSourceAdvancer()); + I_Constructor1(IN, const osgTerrain::DataSet::CompositeSource::base_source_iterator< osgTerrain::DataSet::CompositeSource::LODSourceAdvancer > &, rhs); + I_Method0(bool, valid); + I_Method0(bool, advance); END_REFLECTOR STD_MAP_REFLECTOR(std::map< const osg::CoordinateSystemNode * COMMA osgTerrain::DataSet::SpatialProperties >); diff --git a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp b/src/osgWrappers/osgTerrain/HeightFieldNode.cpp index 893316c5a..341770a8f 100644 --- a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp +++ b/src/osgWrappers/osgTerrain/HeightFieldNode.cpp @@ -17,42 +17,50 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldNode) - BaseType(osg::Group); - Constructor0(); - ConstructorWithDefaults2(IN, const osgTerrain::HeightFieldNode &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method1(void, accept, IN, osg::NodeVisitor &, nv); - Method1(void, traverse, IN, osg::NodeVisitor &, nv); - Method1(void, setHeightField, IN, osg::HeightField *, heightField); - Method0(osg::HeightField *, getHeightField); - Method0(const osg::HeightField *, getHeightField); - Method0(void, heightFieldHasBeenModified); - Method1(void, setRenderer, IN, osgTerrain::HeightFieldRenderer *, renderer); - Method0(osgTerrain::HeightFieldRenderer *, getRenderer); - Method0(const osgTerrain::HeightFieldRenderer *, getRenderer); - Method1(void, setBaseTextureImage, IN, osg::Image *, image); - Method0(osg::Image *, getBaseTextureImage); - Method0(const osg::Image *, getBaseTextureImage); - Method1(void, setDetailTextureImage, IN, osg::Image *, image); - Method0(osg::Image *, getDetailTextureImage); - Method0(const osg::Image *, getDetailTextureImage); - Method1(void, setCloudShadowTextureImage, IN, osg::Image *, image); - Method0(osg::Image *, getCloudShadowTextureImage); - Method0(const osg::Image *, getCloudShadowTextureImage); - Method1(void, setNormalMapImage, IN, osg::Image *, image); - Method0(osg::Image *, getNormalMapImage); - Method0(const osg::Image *, getNormalMapImage); - Method0(void, computeNormalMap); - Property(osg::Image *, BaseTextureImage); - Property(osg::Image *, CloudShadowTextureImage); - Property(osg::Image *, DetailTextureImage); - Property(osg::HeightField *, HeightField); - Property(osg::Image *, NormalMapImage); - Property(osgTerrain::HeightFieldRenderer *, Renderer); + I_BaseType(osg::Group); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgTerrain::HeightFieldNode &, 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, setHeightField, IN, osg::HeightField *, heightField); + I_Method0(osg::HeightField *, getHeightField); + I_Method0(const osg::HeightField *, getHeightField); + I_Method0(void, heightFieldHasBeenModified); + I_Method1(void, setRenderer, IN, osgTerrain::HeightFieldRenderer *, renderer); + I_Method0(osgTerrain::HeightFieldRenderer *, getRenderer); + I_Method0(const osgTerrain::HeightFieldRenderer *, getRenderer); + I_Method1(void, setBaseTextureImage, IN, osg::Image *, image); + I_Method0(osg::Image *, getBaseTextureImage); + I_Method0(const osg::Image *, getBaseTextureImage); + I_Method1(void, setDetailTextureImage, IN, osg::Image *, image); + I_Method0(osg::Image *, getDetailTextureImage); + I_Method0(const osg::Image *, getDetailTextureImage); + I_Method1(void, setCloudShadowTextureImage, IN, osg::Image *, image); + I_Method0(osg::Image *, getCloudShadowTextureImage); + I_Method0(const osg::Image *, getCloudShadowTextureImage); + I_Method1(void, setNormalMapImage, IN, osg::Image *, image); + I_Method0(osg::Image *, getNormalMapImage); + I_Method0(const osg::Image *, getNormalMapImage); + I_Method0(void, computeNormalMap); + I_Property(osg::Image *, BaseTextureImage); + I_Property(osg::Image *, CloudShadowTextureImage); + I_Property(osg::Image *, DetailTextureImage); + I_Property(osg::HeightField *, HeightField); + I_Property(osg::Image *, NormalMapImage); + I_Property(osgTerrain::HeightFieldRenderer *, Renderer); END_REFLECTOR diff --git a/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp b/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp index 459fbb0cb..1008201a1 100644 --- a/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp +++ b/src/osgWrappers/osgTerrain/HeightFieldRenderer.cpp @@ -15,16 +15,24 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::HeightFieldRenderer) - BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, const osgTerrain::HeightFieldRenderer &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osgTerrain::HeightFieldNode *, getHeightFieldNode); - Method0(const osgTerrain::HeightFieldNode *, getHeightFieldNode); - Method0(void, initialize); - Method0(void, heightFieldHasBeenModified); - Method1(void, update, IN, osgUtil::UpdateVisitor *, nv); - Method1(void, cull, IN, osgUtil::CullVisitor *, nv); - ReadOnlyProperty(osgTerrain::HeightFieldNode *, HeightFieldNode); + I_BaseType(osg::Object); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgTerrain::HeightFieldRenderer &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osgTerrain::HeightFieldNode *, getHeightFieldNode); + I_Method0(const osgTerrain::HeightFieldNode *, getHeightFieldNode); + I_Method0(void, initialize); + I_Method0(void, heightFieldHasBeenModified); + I_Method1(void, update, IN, osgUtil::UpdateVisitor *, nv); + I_Method1(void, cull, IN, osgUtil::CullVisitor *, nv); + I_ReadOnlyProperty(osgTerrain::HeightFieldNode *, HeightFieldNode); END_REFLECTOR diff --git a/src/osgWrappers/osgText/Export.cpp b/src/osgWrappers/osgText/Export.cpp index ffce0be5e..40d804cd4 100644 --- a/src/osgWrappers/osgText/Export.cpp +++ b/src/osgWrappers/osgText/Export.cpp @@ -11,3 +11,11 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + diff --git a/src/osgWrappers/osgText/Font.cpp b/src/osgWrappers/osgText/Font.cpp index 3fb5f1c33..bba719301 100644 --- a/src/osgWrappers/osgText/Font.cpp +++ b/src/osgWrappers/osgText/Font.cpp @@ -18,114 +18,128 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgText::Font) - BaseType(osg::Object); - ConstructorWithDefaults1(IN, osgText::Font::FontImplementation *, implementation, 0); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - Method0(std::string, getFileName); - Method2(void, setFontResolution, IN, unsigned int, width, IN, unsigned int, height); - Method0(unsigned int, getFontWidth); - Method0(unsigned int, getFontHeight); - Method3(osg::Vec2, getKerning, IN, unsigned int, leftcharcode, IN, unsigned int, rightcharcode, IN, KerningType, kerningType); - Method1(osgText::Font::Glyph *, getGlyph, IN, unsigned int, charcode); - Method0(bool, hasVertical); - Method1(void, setGlyphImageMargin, IN, unsigned int, margin); - Method0(unsigned int, getGlyphImageMargin); - Method2(void, setTextureSizeHint, IN, unsigned int, width, IN, unsigned int, height); - Method0(unsigned int, getTextureWidthHint); - Method0(unsigned int, getTextureHeightHint); - Method1(void, setMinFilterHint, IN, osg::Texture::FilterMode, mode); - Method0(osg::Texture::FilterMode, getMinFilterHint); - Method1(void, setMagFilterHint, IN, osg::Texture::FilterMode, mode); - Method0(osg::Texture::FilterMode, getMagFilterHint); - Method1(void, setImplementation, IN, osgText::Font::FontImplementation *, implementation); - Method0(osgText::Font::FontImplementation *, getImplementation); - Method0(const osgText::Font::FontImplementation *, getImplementation); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - ReadOnlyProperty(std::string, FileName); - ReadOnlyProperty(unsigned int, FontHeight); - ReadOnlyProperty(unsigned int, FontWidth); - Property(unsigned int, GlyphImageMargin); - Property(osgText::Font::FontImplementation *, Implementation); - Property(osg::Texture::FilterMode, MagFilterHint); - Property(osg::Texture::FilterMode, MinFilterHint); - ReadOnlyProperty(unsigned int, TextureHeightHint); - ReadOnlyProperty(unsigned int, TextureWidthHint); + I_BaseType(osg::Object); + I_ConstructorWithDefaults1(IN, osgText::Font::FontImplementation *, implementation, 0); + 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 *, className); + I_Method0(const char *, libraryName); + I_Method0(std::string, getFileName); + I_Method2(void, setFontResolution, IN, unsigned int, width, IN, unsigned int, height); + I_Method0(unsigned int, getFontWidth); + I_Method0(unsigned int, getFontHeight); + I_Method3(osg::Vec2, getKerning, IN, unsigned int, leftcharcode, IN, unsigned int, rightcharcode, IN, osgText::KerningType, kerningType); + I_Method1(osgText::Font::Glyph *, getGlyph, IN, unsigned int, charcode); + I_Method0(bool, hasVertical); + I_Method1(void, setGlyphImageMargin, IN, unsigned int, margin); + I_Method0(unsigned int, getGlyphImageMargin); + I_Method2(void, setTextureSizeHint, IN, unsigned int, width, IN, unsigned int, height); + I_Method0(unsigned int, getTextureWidthHint); + I_Method0(unsigned int, getTextureHeightHint); + I_Method1(void, setMinFilterHint, IN, osg::Texture::FilterMode, mode); + I_Method0(osg::Texture::FilterMode, getMinFilterHint); + I_Method1(void, setMagFilterHint, IN, osg::Texture::FilterMode, mode); + I_Method0(osg::Texture::FilterMode, getMagFilterHint); + I_Method1(void, setImplementation, IN, osgText::Font::FontImplementation *, implementation); + I_Method0(osgText::Font::FontImplementation *, getImplementation); + I_Method0(const osgText::Font::FontImplementation *, getImplementation); + I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); + I_ReadOnlyProperty(std::string, FileName); + I_ReadOnlyProperty(unsigned int, FontHeight); + I_ReadOnlyProperty(unsigned int, FontWidth); + I_Property(unsigned int, GlyphImageMargin); + I_Property(osgText::Font::FontImplementation *, Implementation); + I_Property(osg::Texture::FilterMode, MagFilterHint); + I_Property(osg::Texture::FilterMode, MinFilterHint); + I_ReadOnlyProperty(unsigned int, TextureHeightHint); + I_ReadOnlyProperty(unsigned int, TextureWidthHint); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font::FontImplementation) - BaseType(osg::Referenced); - Constructor0(); - Method0(std::string, getFileName); - Method2(void, setFontResolution, IN, unsigned int, width, IN, unsigned int, height); - Method1(osgText::Font::Glyph *, getGlyph, IN, unsigned int, charcode); - Method3(osg::Vec2, getKerning, IN, unsigned int, leftcharcode, IN, unsigned int, rightcharcode, IN, KerningType, kerningType); - Method0(bool, hasVertical); - Method1(void, setFontWidth, IN, unsigned int, width); - Method1(void, setFontHeight, IN, unsigned int, height); - Method4(void, addGlyph, IN, unsigned int, width, IN, unsigned int, height, IN, unsigned int, charcode, IN, osgText::Font::Glyph *, glyph); - ReadOnlyProperty(std::string, FileName); - WriteOnlyProperty(unsigned int, FontHeight); - WriteOnlyProperty(unsigned int, FontWidth); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method0(std::string, getFileName); + I_Method2(void, setFontResolution, IN, unsigned int, width, IN, unsigned int, height); + I_Method1(osgText::Font::Glyph *, getGlyph, IN, unsigned int, charcode); + I_Method3(osg::Vec2, getKerning, IN, unsigned int, leftcharcode, IN, unsigned int, rightcharcode, IN, osgText::KerningType, kerningType); + I_Method0(bool, hasVertical); + I_Method1(void, setFontWidth, IN, unsigned int, width); + I_Method1(void, setFontHeight, IN, unsigned int, height); + I_Method4(void, addGlyph, IN, unsigned int, width, IN, unsigned int, height, IN, unsigned int, charcode, IN, osgText::Font::Glyph *, glyph); + I_ReadOnlyProperty(std::string, FileName); + I_WriteOnlyProperty(unsigned int, FontHeight); + I_WriteOnlyProperty(unsigned int, FontWidth); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgText::Font::Glyph) - BaseType(osg::Image); - Constructor0(); - Method0(unsigned int, getGlyphCode); - Method1(void, setHorizontalBearing, IN, const osg::Vec2 &, bearing); - Method0(const osg::Vec2 &, getHorizontalBearing); - Method1(void, setHorizontalAdvance, IN, float, advance); - Method0(float, getHorizontalAdvance); - Method1(void, setVerticalBearing, IN, const osg::Vec2 &, bearing); - Method0(const osg::Vec2 &, getVerticalBearing); - Method1(void, setVerticalAdvance, IN, float, advance); - Method0(float, getVerticalAdvance); - Method1(void, setTexture, IN, osgText::Font::GlyphTexture *, texture); - Method0(osgText::Font::GlyphTexture *, getTexture); - Method0(const osgText::Font::GlyphTexture *, getTexture); - Method0(osg::StateSet *, getStateSet); - Method0(const osg::StateSet *, getStateSet); - Method2(void, setTexturePosition, IN, int, posX, IN, int, posY); - Method0(int, getTexturePositionX); - Method0(int, getTexturePositionY); - Method1(void, setMinTexCoord, IN, const osg::Vec2 &, coord); - Method0(const osg::Vec2 &, getMinTexCoord); - Method1(void, setMaxTexCoord, IN, const osg::Vec2 &, coord); - Method0(const osg::Vec2 &, getMaxTexCoord); - Method0(void, subload); - Method1(void, draw, IN, osg::State &, state); - ReadOnlyProperty(unsigned int, GlyphCode); - Property(float, HorizontalAdvance); - Property(const osg::Vec2 &, HorizontalBearing); - Property(const osg::Vec2 &, MaxTexCoord); - Property(const osg::Vec2 &, MinTexCoord); - ReadOnlyProperty(osg::StateSet *, StateSet); - Property(osgText::Font::GlyphTexture *, Texture); - ReadOnlyProperty(int, TexturePositionX); - ReadOnlyProperty(int, TexturePositionY); - Property(float, VerticalAdvance); - Property(const osg::Vec2 &, VerticalBearing); + I_BaseType(osg::Image); + I_Constructor0(); + I_Method0(unsigned int, getGlyphCode); + I_Method1(void, setHorizontalBearing, IN, const osg::Vec2 &, bearing); + I_Method0(const osg::Vec2 &, getHorizontalBearing); + I_Method1(void, setHorizontalAdvance, IN, float, advance); + I_Method0(float, getHorizontalAdvance); + I_Method1(void, setVerticalBearing, IN, const osg::Vec2 &, bearing); + I_Method0(const osg::Vec2 &, getVerticalBearing); + I_Method1(void, setVerticalAdvance, IN, float, advance); + I_Method0(float, getVerticalAdvance); + I_Method1(void, setTexture, IN, osgText::Font::GlyphTexture *, texture); + I_Method0(osgText::Font::GlyphTexture *, getTexture); + I_Method0(const osgText::Font::GlyphTexture *, getTexture); + I_Method0(osg::StateSet *, getStateSet); + I_Method0(const osg::StateSet *, getStateSet); + I_Method2(void, setTexturePosition, IN, int, posX, IN, int, posY); + I_Method0(int, getTexturePositionX); + I_Method0(int, getTexturePositionY); + I_Method1(void, setMinTexCoord, IN, const osg::Vec2 &, coord); + I_Method0(const osg::Vec2 &, getMinTexCoord); + I_Method1(void, setMaxTexCoord, IN, const osg::Vec2 &, coord); + I_Method0(const osg::Vec2 &, getMaxTexCoord); + I_Method0(void, subload); + I_Method1(void, draw, IN, osg::State &, state); + I_ReadOnlyProperty(unsigned int, GlyphCode); + I_Property(float, HorizontalAdvance); + I_Property(const osg::Vec2 &, HorizontalBearing); + I_Property(const osg::Vec2 &, MaxTexCoord); + I_Property(const osg::Vec2 &, MinTexCoord); + I_ReadOnlyProperty(osg::StateSet *, StateSet); + I_Property(osgText::Font::GlyphTexture *, Texture); + I_ReadOnlyProperty(int, TexturePositionX); + I_ReadOnlyProperty(int, TexturePositionY); + I_Property(float, VerticalAdvance); + I_Property(const osg::Vec2 &, VerticalBearing); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font::GlyphTexture) - BaseType(osg::Texture2D); - Constructor0(); - Method0(const char *, className); - Method1(int, compare, IN, const osg::StateAttribute &, rhs); - Method1(void, setStateSet, IN, osg::StateSet *, stateset); - Method0(osg::StateSet *, getStateSet); - Method0(const osg::StateSet *, getStateSet); - Method1(void, setGlyphImageMargin, IN, unsigned int, margin); - Method0(unsigned int, getGlyphImageMargin); - Method3(bool, getSpaceForGlyph, IN, osgText::Font::Glyph *, glyph, IN, int &, posX, IN, int &, posY); - Method3(void, addGlyph, IN, osgText::Font::Glyph *, glyph, IN, int, posX, IN, int, posY); - Method1(void, apply, IN, osg::State &, state); - Property(unsigned int, GlyphImageMargin); - Property(osg::StateSet *, StateSet); + I_BaseType(osg::Texture2D); + I_Constructor0(); + I_Method0(const char *, className); + I_Method1(int, compare, IN, const osg::StateAttribute &, rhs); + I_Method1(void, setStateSet, IN, osg::StateSet *, stateset); + I_Method0(osg::StateSet *, getStateSet); + I_Method0(const osg::StateSet *, getStateSet); + I_Method1(void, setGlyphImageMargin, IN, unsigned int, margin); + I_Method0(unsigned int, getGlyphImageMargin); + I_Method3(bool, getSpaceForGlyph, IN, osgText::Font::Glyph *, glyph, IN, int &, posX, IN, int &, posY); + I_Method3(void, addGlyph, IN, osgText::Font::Glyph *, glyph, IN, int, posX, IN, int, posY); + I_Method1(void, apply, IN, osg::State &, state); + I_Property(unsigned int, GlyphImageMargin); + I_Property(osg::StateSet *, StateSet); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osgText::KerningType) + I_EnumLabel(osgText::KERNING_DEFAULT); + I_EnumLabel(osgText::KERNING_UNFITTED); + I_EnumLabel(osgText::KERNING_NONE); END_REFLECTOR diff --git a/src/osgWrappers/osgText/String.cpp b/src/osgWrappers/osgText/String.cpp index 8a6430a6d..5f8ec084b 100644 --- a/src/osgWrappers/osgText/String.cpp +++ b/src/osgWrappers/osgText/String.cpp @@ -11,31 +11,39 @@ #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ENUM_REFLECTOR(osgText::String::Encoding) - EnumLabel(osgText::String::ENCODING_UNDEFINED); - EnumLabel(osgText::String::ENCODING_ASCII); - EnumLabel(osgText::String::ENCODING_UTF8); - EnumLabel(osgText::String::ENCODING_UTF16); - EnumLabel(osgText::String::ENCODING_UTF16_BE); - EnumLabel(osgText::String::ENCODING_UTF16_LE); - EnumLabel(osgText::String::ENCODING_UTF32); - EnumLabel(osgText::String::ENCODING_UTF32_BE); - EnumLabel(osgText::String::ENCODING_UTF32_LE); - EnumLabel(osgText::String::ENCODING_SIGNATURE); + I_EnumLabel(osgText::String::ENCODING_UNDEFINED); + I_EnumLabel(osgText::String::ENCODING_ASCII); + I_EnumLabel(osgText::String::ENCODING_UTF8); + I_EnumLabel(osgText::String::ENCODING_UTF16); + I_EnumLabel(osgText::String::ENCODING_UTF16_BE); + I_EnumLabel(osgText::String::ENCODING_UTF16_LE); + I_EnumLabel(osgText::String::ENCODING_UTF32); + I_EnumLabel(osgText::String::ENCODING_UTF32_BE); + I_EnumLabel(osgText::String::ENCODING_UTF32_LE); + I_EnumLabel(osgText::String::ENCODING_SIGNATURE); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgText::String) - BaseType(osg::Referenced); - Constructor0(); - Constructor1(IN, const osgText::String &, str); - Constructor1(IN, const std::string &, str); - Constructor1(IN, const wchar_t *, text); - Constructor2(IN, const std::string &, text, IN, osgText::String::Encoding, encoding); - Method1(void, set, IN, const std::string &, str); - Method1(void, set, IN, const wchar_t *, text); - Method2(void, set, IN, const std::string &, text, IN, osgText::String::Encoding, encoding); - Method0(std::string, createUTF8EncodedString); - WriteOnlyProperty(const wchar_t *, ); +BEGIN_OBJECT_REFLECTOR(osgText::String) + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Constructor1(IN, const osgText::String &, str); + I_Constructor1(IN, const std::string &, str); + I_Constructor1(IN, const wchar_t *, text); + I_Constructor2(IN, const std::string &, text, IN, osgText::String::Encoding, encoding); + I_Method1(void, set, IN, const std::string &, str); + I_Method1(void, set, IN, const wchar_t *, text); + I_Method2(void, set, IN, const std::string &, text, IN, osgText::String::Encoding, encoding); + I_Method0(std::string, createUTF8EncodedString); + I_WriteOnlyProperty(const wchar_t *, ); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< unsigned int >, osgText::VectorUInt); diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index eb7022962..9b2325a06 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -23,129 +23,137 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::map< osg::ref_ptr< osg::StateSet > COMMA osgText::Text::GlyphQuads >, osgText::Text::TextureGlyphQuadMap); BEGIN_ENUM_REFLECTOR(osgText::Text::CharacterSizeMode) - EnumLabel(osgText::Text::OBJECT_COORDS); - EnumLabel(osgText::Text::SCREEN_COORDS); - EnumLabel(osgText::Text::OBJECT_COORDS_WITH_MAXIMUM_SCREEN_SIZE_CAPPED_BY_FONT_HEIGHT); + I_EnumLabel(osgText::Text::OBJECT_COORDS); + I_EnumLabel(osgText::Text::SCREEN_COORDS); + I_EnumLabel(osgText::Text::OBJECT_COORDS_WITH_MAXIMUM_SCREEN_SIZE_CAPPED_BY_FONT_HEIGHT); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgText::Text::AlignmentType) - EnumLabel(osgText::Text::LEFT_TOP); - EnumLabel(osgText::Text::LEFT_CENTER); - EnumLabel(osgText::Text::LEFT_BOTTOM); - EnumLabel(osgText::Text::CENTER_TOP); - EnumLabel(osgText::Text::CENTER_CENTER); - EnumLabel(osgText::Text::CENTER_BOTTOM); - EnumLabel(osgText::Text::RIGHT_TOP); - EnumLabel(osgText::Text::RIGHT_CENTER); - EnumLabel(osgText::Text::RIGHT_BOTTOM); - EnumLabel(osgText::Text::LEFT_BASE_LINE); - EnumLabel(osgText::Text::CENTER_BASE_LINE); - EnumLabel(osgText::Text::RIGHT_BASE_LINE); - EnumLabel(osgText::Text::BASE_LINE); + I_EnumLabel(osgText::Text::LEFT_TOP); + I_EnumLabel(osgText::Text::LEFT_CENTER); + I_EnumLabel(osgText::Text::LEFT_BOTTOM); + I_EnumLabel(osgText::Text::CENTER_TOP); + I_EnumLabel(osgText::Text::CENTER_CENTER); + I_EnumLabel(osgText::Text::CENTER_BOTTOM); + I_EnumLabel(osgText::Text::RIGHT_TOP); + I_EnumLabel(osgText::Text::RIGHT_CENTER); + I_EnumLabel(osgText::Text::RIGHT_BOTTOM); + I_EnumLabel(osgText::Text::LEFT_BASE_LINE); + I_EnumLabel(osgText::Text::CENTER_BASE_LINE); + I_EnumLabel(osgText::Text::RIGHT_BASE_LINE); + I_EnumLabel(osgText::Text::BASE_LINE); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgText::Text::AxisAlignment) - EnumLabel(osgText::Text::XY_PLANE); - EnumLabel(osgText::Text::REVERSED_XY_PLANE); - EnumLabel(osgText::Text::XZ_PLANE); - EnumLabel(osgText::Text::REVERSED_XZ_PLANE); - EnumLabel(osgText::Text::YZ_PLANE); - EnumLabel(osgText::Text::REVERSED_YZ_PLANE); - EnumLabel(osgText::Text::SCREEN); + I_EnumLabel(osgText::Text::XY_PLANE); + I_EnumLabel(osgText::Text::REVERSED_XY_PLANE); + I_EnumLabel(osgText::Text::XZ_PLANE); + I_EnumLabel(osgText::Text::REVERSED_XZ_PLANE); + I_EnumLabel(osgText::Text::YZ_PLANE); + I_EnumLabel(osgText::Text::REVERSED_YZ_PLANE); + I_EnumLabel(osgText::Text::SCREEN); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgText::Text::Layout) - EnumLabel(osgText::Text::LEFT_TO_RIGHT); - EnumLabel(osgText::Text::RIGHT_TO_LEFT); - EnumLabel(osgText::Text::VERTICAL); + I_EnumLabel(osgText::Text::LEFT_TO_RIGHT); + I_EnumLabel(osgText::Text::RIGHT_TO_LEFT); + I_EnumLabel(osgText::Text::VERTICAL); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgText::Text::DrawModeMask) - EnumLabel(osgText::Text::TEXT); - EnumLabel(osgText::Text::BOUNDINGBOX); - EnumLabel(osgText::Text::ALIGNMENT); + I_EnumLabel(osgText::Text::TEXT); + I_EnumLabel(osgText::Text::BOUNDINGBOX); + I_EnumLabel(osgText::Text::ALIGNMENT); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgText::Text) - BaseType(osg::Drawable); - Constructor0(); - ConstructorWithDefaults2(IN, const osgText::Text &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(const char *, libraryName); - MethodWithDefaults1(void, setFont, IN, osgText::Font *, font, 0); - Method1(void, setFont, IN, const std::string &, fontfile); - Method0(const osgText::Font *, getFont); - Method2(void, setFontResolution, IN, unsigned int, width, IN, unsigned int, height); - Method0(unsigned int, getFontWidth); - Method0(unsigned int, getFontHeight); - Method1(void, setText, IN, const osgText::String &, text); - Method1(void, setText, IN, const std::string &, text); - Method2(void, setText, IN, const std::string &, text, IN, osgText::String::Encoding, encoding); - Method1(void, setText, IN, const wchar_t *, text); - Method0(osgText::String &, getText); - Method0(const osgText::String &, getText); - Method0(void, update); - MethodWithDefaults2(void, setCharacterSize, IN, float, height, , IN, float, aspectRatio, 1.0f); - Method0(float, getCharacterHeight); - Method0(float, getCharacterAspectRatio); - Method1(void, setCharacterSizeMode, IN, osgText::Text::CharacterSizeMode, mode); - Method0(osgText::Text::CharacterSizeMode, getCharacterSizeMode); - Method1(void, setMaximumWidth, IN, float, maximumWidth); - Method0(float, getMaximumWidth); - Method1(void, setMaximumHeight, IN, float, maximumHeight); - Method0(float, getMaximumHeight); - Method1(void, setPosition, IN, const osg::Vec3 &, pos); - Method0(const osg::Vec3 &, getPosition); - Method1(void, setAlignment, IN, osgText::Text::AlignmentType, alignment); - Method0(osgText::Text::AlignmentType, getAlignment); - Method1(void, setAxisAlignment, IN, osgText::Text::AxisAlignment, axis); - Method1(void, setRotation, IN, const osg::Quat &, quat); - Method0(const osg::Quat &, getRotation); - Method1(void, setAutoRotateToScreen, IN, bool, autoRotateToScreen); - Method0(bool, getAutoRotateToScreen); - Method1(void, setLayout, IN, osgText::Text::Layout, layout); - Method0(osgText::Text::Layout, getLayout); - Method1(void, setColor, IN, const osg::Vec4 &, color); - Method0(const osg::Vec4 &, getColor); - Method1(void, setDrawMode, IN, unsigned int, mode); - Method0(unsigned int, getDrawMode); - Method1(void, setKerningType, IN, KerningType, kerningType); - Method0(KerningType, getKerningType); - Method1(void, drawImplementation, IN, osg::State &, state); - Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); - Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); - Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); - Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); - Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); - MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); - Method1(const osgText::Text::GlyphQuads *, getGlyphQuads, IN, osg::StateSet *, stateSet); - Method0(const osgText::Text::TextureGlyphQuadMap &, getTextureGlyphQuadMap); - Method0(osg::BoundingBox, computeBound); - Property(osgText::Text::AlignmentType, Alignment); - Property(bool, AutoRotateToScreen); - WriteOnlyProperty(osgText::Text::AxisAlignment, AxisAlignment); - ReadOnlyProperty(float, CharacterAspectRatio); - ReadOnlyProperty(float, CharacterHeight); - Property(osgText::Text::CharacterSizeMode, CharacterSizeMode); - Property(const osg::Vec4 &, Color); - Property(unsigned int, DrawMode); - WriteOnlyProperty(osgText::Font *, Font); - ReadOnlyProperty(unsigned int, FontHeight); - ReadOnlyProperty(unsigned int, FontWidth); - Property(KerningType, KerningType); - Property(osgText::Text::Layout, Layout); - Property(float, MaximumHeight); - Property(float, MaximumWidth); - Property(const osg::Vec3 &, Position); - Property(const osg::Quat &, Rotation); - Property(const osgText::String &, Text); - ReadOnlyProperty(const osgText::Text::TextureGlyphQuadMap &, TextureGlyphQuadMap); + I_BaseType(osg::Drawable); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgText::Text &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, className); + I_Method0(const char *, libraryName); + I_MethodWithDefaults1(void, setFont, IN, osgText::Font *, font, 0); + I_Method1(void, setFont, IN, const std::string &, fontfile); + I_Method0(const osgText::Font *, getFont); + I_Method2(void, setFontResolution, IN, unsigned int, width, IN, unsigned int, height); + I_Method0(unsigned int, getFontWidth); + I_Method0(unsigned int, getFontHeight); + I_Method1(void, setText, IN, const osgText::String &, text); + I_Method1(void, setText, IN, const std::string &, text); + I_Method2(void, setText, IN, const std::string &, text, IN, osgText::String::Encoding, encoding); + I_Method1(void, setText, IN, const wchar_t *, text); + I_Method0(osgText::String &, getText); + I_Method0(const osgText::String &, getText); + I_Method0(void, update); + I_MethodWithDefaults2(void, setCharacterSize, IN, float, height, , IN, float, aspectRatio, 1.0f); + I_Method0(float, getCharacterHeight); + I_Method0(float, getCharacterAspectRatio); + I_Method1(void, setCharacterSizeMode, IN, osgText::Text::CharacterSizeMode, mode); + I_Method0(osgText::Text::CharacterSizeMode, getCharacterSizeMode); + I_Method1(void, setMaximumWidth, IN, float, maximumWidth); + I_Method0(float, getMaximumWidth); + I_Method1(void, setMaximumHeight, IN, float, maximumHeight); + I_Method0(float, getMaximumHeight); + I_Method1(void, setPosition, IN, const osg::Vec3 &, pos); + I_Method0(const osg::Vec3 &, getPosition); + I_Method1(void, setAlignment, IN, osgText::Text::AlignmentType, alignment); + I_Method0(osgText::Text::AlignmentType, getAlignment); + I_Method1(void, setAxisAlignment, IN, osgText::Text::AxisAlignment, axis); + I_Method1(void, setRotation, IN, const osg::Quat &, quat); + I_Method0(const osg::Quat &, getRotation); + I_Method1(void, setAutoRotateToScreen, IN, bool, autoRotateToScreen); + I_Method0(bool, getAutoRotateToScreen); + I_Method1(void, setLayout, IN, osgText::Text::Layout, layout); + I_Method0(osgText::Text::Layout, getLayout); + I_Method1(void, setColor, IN, const osg::Vec4 &, color); + I_Method0(const osg::Vec4 &, getColor); + I_Method1(void, setDrawMode, IN, unsigned int, mode); + I_Method0(unsigned int, getDrawMode); + I_Method1(void, setKerningType, IN, osgText::KerningType, kerningType); + I_Method0(osgText::KerningType, getKerningType); + I_Method1(void, drawImplementation, IN, osg::State &, state); + I_Method1(bool, supports, IN, const osg::Drawable::AttributeFunctor &, x); + I_Method1(bool, supports, IN, const osg::Drawable::ConstAttributeFunctor &, x); + I_Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); + I_Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); + I_Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); + I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); + I_Method1(const osgText::Text::GlyphQuads *, getGlyphQuads, IN, osg::StateSet *, stateSet); + I_Method0(const osgText::Text::TextureGlyphQuadMap &, getTextureGlyphQuadMap); + I_Method0(osg::BoundingBox, computeBound); + I_Property(osgText::Text::AlignmentType, Alignment); + I_Property(bool, AutoRotateToScreen); + I_WriteOnlyProperty(osgText::Text::AxisAlignment, AxisAlignment); + I_ReadOnlyProperty(float, CharacterAspectRatio); + I_ReadOnlyProperty(float, CharacterHeight); + I_Property(osgText::Text::CharacterSizeMode, CharacterSizeMode); + I_Property(const osg::Vec4 &, Color); + I_Property(unsigned int, DrawMode); + I_WriteOnlyProperty(osgText::Font *, Font); + I_ReadOnlyProperty(unsigned int, FontHeight); + I_ReadOnlyProperty(unsigned int, FontWidth); + I_Property(osgText::KerningType, KerningType); + I_Property(osgText::Text::Layout, Layout); + I_Property(float, MaximumHeight); + I_Property(float, MaximumWidth); + I_Property(const osg::Vec3 &, Position); + I_Property(const osg::Quat &, Rotation); + I_Property(const osgText::String &, Text); + I_ReadOnlyProperty(const osgText::Text::TextureGlyphQuadMap &, TextureGlyphQuadMap); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osgText::Font::Glyph * >, osgText::Text::GlyphQuads::Glyphs); @@ -159,21 +167,21 @@ TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgText::Text::GlyphQuads::Coords3); TYPE_NAME_ALIAS(std::vector< osg::Vec2 >, osgText::Text::GlyphQuads::TexCoords); BEGIN_VALUE_REFLECTOR(osgText::Text::GlyphQuads) - Constructor0(); - Method0(osgText::Text::GlyphQuads::Glyphs, getGlyphs); - Method0(const osgText::Text::GlyphQuads::Glyphs, getGlyphs); - Method0(osgText::Text::GlyphQuads::Coords2 &, getCoords); - Method0(const osgText::Text::GlyphQuads::Coords2 &, getCoords); - Method1(osgText::Text::GlyphQuads::Coords3 &, getTransformedCoords, IN, unsigned int, contexID); - Method1(const osgText::Text::GlyphQuads::Coords3 &, getTransformedCoords, IN, unsigned int, contexID); - Method0(osgText::Text::GlyphQuads::TexCoords &, getTexCoords); - Method0(const osgText::Text::GlyphQuads::TexCoords &, getTexCoords); - Method0(osgText::Text::GlyphQuads::LineNumbers &, getLineNumbers); - Method0(const osgText::Text::GlyphQuads::LineNumbers &, getLineNumbers); - ReadOnlyProperty(osgText::Text::GlyphQuads::Coords2 &, Coords); - ReadOnlyProperty(osgText::Text::GlyphQuads::Glyphs, Glyphs); - ReadOnlyProperty(osgText::Text::GlyphQuads::LineNumbers &, LineNumbers); - ReadOnlyProperty(osgText::Text::GlyphQuads::TexCoords &, TexCoords); + I_Constructor0(); + I_Method0(osgText::Text::GlyphQuads::Glyphs, getGlyphs); + I_Method0(const osgText::Text::GlyphQuads::Glyphs, getGlyphs); + I_Method0(osgText::Text::GlyphQuads::Coords2 &, getCoords); + I_Method0(const osgText::Text::GlyphQuads::Coords2 &, getCoords); + I_Method1(osgText::Text::GlyphQuads::Coords3 &, getTransformedCoords, IN, unsigned int, contexID); + I_Method1(const osgText::Text::GlyphQuads::Coords3 &, getTransformedCoords, IN, unsigned int, contexID); + I_Method0(osgText::Text::GlyphQuads::TexCoords &, getTexCoords); + I_Method0(const osgText::Text::GlyphQuads::TexCoords &, getTexCoords); + I_Method0(osgText::Text::GlyphQuads::LineNumbers &, getLineNumbers); + I_Method0(const osgText::Text::GlyphQuads::LineNumbers &, getLineNumbers); + I_ReadOnlyProperty(osgText::Text::GlyphQuads::Coords2 &, Coords); + I_ReadOnlyProperty(osgText::Text::GlyphQuads::Glyphs, Glyphs); + I_ReadOnlyProperty(osgText::Text::GlyphQuads::LineNumbers &, LineNumbers); + I_ReadOnlyProperty(osgText::Text::GlyphQuads::TexCoords &, TexCoords); END_REFLECTOR STD_MAP_REFLECTOR(std::map< osg::ref_ptr< osg::StateSet > COMMA osgText::Text::GlyphQuads >); diff --git a/src/osgWrappers/osgUtil/CubeMapGenerator.cpp b/src/osgWrappers/osgUtil/CubeMapGenerator.cpp index bd5e9142a..1727c9eb5 100644 --- a/src/osgWrappers/osgUtil/CubeMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/CubeMapGenerator.cpp @@ -14,12 +14,20 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::CubeMapGenerator) - BaseType(osg::Referenced); - ConstructorWithDefaults1(IN, int, texture_size, 64); - ConstructorWithDefaults2(IN, const osgUtil::CubeMapGenerator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method1(osg::Image *, getImage, IN, osg::TextureCubeMap::Face, face); - Method1(const osg::Image *, getImage, IN, osg::TextureCubeMap::Face, face); - MethodWithDefaults1(void, generateMap, IN, bool, use_osg_system, true); + I_BaseType(osg::Referenced); + I_ConstructorWithDefaults1(IN, int, texture_size, 64); + I_ConstructorWithDefaults2(IN, const osgUtil::CubeMapGenerator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method1(osg::Image *, getImage, IN, osg::TextureCubeMap::Face, face); + I_Method1(const osg::Image *, getImage, IN, osg::TextureCubeMap::Face, face); + I_MethodWithDefaults1(void, generateMap, IN, bool, use_osg_system, true); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index 38ce6a557..d752dadc8 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -37,68 +37,76 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(osg::Matrix::value_type, osgUtil::CullVisitor::value_type); -BEGIN_VALUE_REFLECTOR(osgUtil::CullVisitor) - BaseType(osg::NodeVisitor); - BaseType(osg::CullStack); - Constructor0(); - Method0(osgUtil::CullVisitor *, cloneType); - Method0(void, reset); - Method0(osg::Vec3, getEyePoint); - Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale); - Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale); - Method1(void, apply, IN, osg::Node &, x); - Method1(void, apply, IN, osg::Geode &, node); - Method1(void, apply, IN, osg::Billboard &, node); - Method1(void, apply, IN, osg::LightSource &, node); - Method1(void, apply, IN, osg::ClipNode &, node); - Method1(void, apply, IN, osg::TexGenNode &, node); - Method1(void, apply, IN, osg::Group &, node); - Method1(void, apply, IN, osg::Transform &, node); - Method1(void, apply, IN, osg::Projection &, node); - Method1(void, apply, IN, osg::Switch &, node); - Method1(void, apply, IN, osg::LOD &, node); - Method1(void, apply, IN, osg::ClearNode &, node); - Method1(void, apply, IN, osg::OccluderNode &, node); - Method1(void, setClearNode, IN, const osg::ClearNode *, earthSky); - Method0(const osg::ClearNode *, getClearNode); - Method1(void, pushStateSet, IN, const osg::StateSet *, ss); - Method0(void, popStateSet); - Method1(void, setRenderGraph, IN, osgUtil::RenderGraph *, rg); - Method0(osgUtil::RenderGraph *, getRootRenderGraph); - Method0(osgUtil::RenderGraph *, getCurrentRenderGraph); - Method1(void, setRenderStage, IN, osgUtil::RenderStage *, rg); - Method0(osgUtil::RenderStage *, getRenderStage); - Method0(osgUtil::RenderBin *, getCurrentRenderBin); - Method1(void, setCurrentRenderBin, IN, osgUtil::RenderBin *, rb); - Method0(osgUtil::CullVisitor::value_type, getCalculatedNearPlane); - Method0(osgUtil::CullVisitor::value_type, getCalculatedFarPlane); - Method3(osgUtil::CullVisitor::value_type, computeNearestPointInFrustum, IN, const osg::Matrix &, matrix, IN, const osg::Polytope::PlaneList &, planes, IN, const osg::Drawable &, drawable); - Method2(bool, updateCalculatedNearFar, IN, const osg::Matrix &, matrix, IN, const osg::BoundingBox &, bb); - MethodWithDefaults3(bool, updateCalculatedNearFar, IN, const osg::Matrix &, matrix, , IN, const osg::Drawable &, drawable, , IN, bool, isBillboard, false); - Method1(void, updateCalculatedNearFar, IN, const osg::Vec3 &, pos); - Method2(void, addDrawable, IN, osg::Drawable *, drawable, IN, osg::RefMatrix *, matrix); - Method3(void, addDrawableAndDepth, IN, osg::Drawable *, drawable, IN, osg::RefMatrix *, matrix, IN, float, depth); - Method2(void, addPositionedAttribute, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); - Method3(void, addPositionedTextureAttribute, IN, unsigned int, textureUnit, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); - Method0(void, popProjectionMatrix); - Method3(bool, clampProjectionMatrixImplementation, IN, osg::Matrixf &, projection, IN, double &, znear, IN, double &, zfar); - Method3(bool, clampProjectionMatrixImplementation, IN, osg::Matrixd &, projection, IN, double &, znear, IN, double &, zfar); - Method3(bool, clampProjectionMatrix, IN, osg::Matrixf &, projection, IN, osgUtil::CullVisitor::value_type &, znear, IN, osgUtil::CullVisitor::value_type &, zfar); - Method3(bool, clampProjectionMatrix, IN, osg::Matrixd &, projection, IN, osgUtil::CullVisitor::value_type &, znear, IN, osgUtil::CullVisitor::value_type &, zfar); - Method1(void, setState, IN, osg::State *, state); - Method0(osg::State *, getState); - Method0(const osg::State *, getState); - ReadOnlyProperty(osgUtil::CullVisitor::value_type, CalculatedFarPlane); - ReadOnlyProperty(osgUtil::CullVisitor::value_type, CalculatedNearPlane); - Property(const osg::ClearNode *, ClearNode); - Property(osgUtil::RenderBin *, CurrentRenderBin); - ReadOnlyProperty(osgUtil::RenderGraph *, CurrentRenderGraph); - ReadOnlyProperty(osg::Vec3, EyePoint); - WriteOnlyProperty(osgUtil::RenderGraph *, RenderGraph); - Property(osgUtil::RenderStage *, RenderStage); - ReadOnlyProperty(osgUtil::RenderGraph *, RootRenderGraph); - Property(osg::State *, State); +BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor) + I_BaseType(osg::NodeVisitor); + I_BaseType(osg::CullStack); + I_Constructor0(); + I_Method0(osgUtil::CullVisitor *, cloneType); + I_Method0(void, reset); + I_Method0(osg::Vec3, getEyePoint); + 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::Geode &, node); + I_Method1(void, apply, IN, osg::Billboard &, node); + I_Method1(void, apply, IN, osg::LightSource &, node); + I_Method1(void, apply, IN, osg::ClipNode &, node); + I_Method1(void, apply, IN, osg::TexGenNode &, node); + I_Method1(void, apply, IN, osg::Group &, node); + 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::ClearNode &, node); + I_Method1(void, apply, IN, osg::OccluderNode &, node); + I_Method1(void, setClearNode, IN, const osg::ClearNode *, earthSky); + I_Method0(const osg::ClearNode *, getClearNode); + I_Method1(void, pushStateSet, IN, const osg::StateSet *, ss); + I_Method0(void, popStateSet); + I_Method1(void, setRenderGraph, IN, osgUtil::RenderGraph *, rg); + I_Method0(osgUtil::RenderGraph *, getRootRenderGraph); + I_Method0(osgUtil::RenderGraph *, getCurrentRenderGraph); + I_Method1(void, setRenderStage, IN, osgUtil::RenderStage *, rg); + I_Method0(osgUtil::RenderStage *, getRenderStage); + I_Method0(osgUtil::RenderBin *, getCurrentRenderBin); + I_Method1(void, setCurrentRenderBin, IN, osgUtil::RenderBin *, rb); + I_Method0(osgUtil::CullVisitor::value_type, getCalculatedNearPlane); + I_Method0(osgUtil::CullVisitor::value_type, getCalculatedFarPlane); + I_Method3(osgUtil::CullVisitor::value_type, computeNearestPointInFrustum, IN, const osg::Matrix &, matrix, IN, const osg::Polytope::PlaneList &, planes, IN, const osg::Drawable &, drawable); + I_Method2(bool, updateCalculatedNearFar, IN, const osg::Matrix &, matrix, IN, const osg::BoundingBox &, bb); + I_MethodWithDefaults3(bool, updateCalculatedNearFar, IN, const osg::Matrix &, matrix, , IN, const osg::Drawable &, drawable, , IN, bool, isBillboard, false); + I_Method1(void, updateCalculatedNearFar, IN, const osg::Vec3 &, pos); + I_Method2(void, addDrawable, IN, osg::Drawable *, drawable, IN, osg::RefMatrix *, matrix); + I_Method3(void, addDrawableAndDepth, IN, osg::Drawable *, drawable, IN, osg::RefMatrix *, matrix, IN, float, depth); + I_Method2(void, addPositionedAttribute, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); + I_Method3(void, addPositionedTextureAttribute, IN, unsigned int, textureUnit, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); + I_Method0(void, popProjectionMatrix); + 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); + I_Method3(bool, clampProjectionMatrix, IN, osg::Matrixf &, projection, IN, osgUtil::CullVisitor::value_type &, znear, IN, osgUtil::CullVisitor::value_type &, zfar); + I_Method3(bool, clampProjectionMatrix, IN, osg::Matrixd &, projection, IN, osgUtil::CullVisitor::value_type &, znear, IN, osgUtil::CullVisitor::value_type &, zfar); + I_Method1(void, setState, IN, osg::State *, state); + I_Method0(osg::State *, getState); + I_Method0(const osg::State *, getState); + I_ReadOnlyProperty(osgUtil::CullVisitor::value_type, CalculatedFarPlane); + I_ReadOnlyProperty(osgUtil::CullVisitor::value_type, CalculatedNearPlane); + I_Property(const osg::ClearNode *, ClearNode); + I_Property(osgUtil::RenderBin *, CurrentRenderBin); + I_ReadOnlyProperty(osgUtil::RenderGraph *, CurrentRenderGraph); + I_ReadOnlyProperty(osg::Vec3, EyePoint); + I_WriteOnlyProperty(osgUtil::RenderGraph *, RenderGraph); + I_Property(osgUtil::RenderStage *, RenderStage); + I_ReadOnlyProperty(osgUtil::RenderGraph *, RootRenderGraph); + I_Property(osg::State *, State); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp index 7f1785a4d..04b2acd12 100644 --- a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp @@ -14,22 +14,30 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayTriangulator) - BaseType(osg::Referenced); - Constructor0(); - ConstructorWithDefaults2(IN, osg::Vec3Array *, points, , IN, osg::Vec3Array *, normals, 0); - ConstructorWithDefaults2(IN, const osgUtil::DelaunayTriangulator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(const osg::Vec3Array *, getInputPointArray); - Method0(osg::Vec3Array *, getInputPointArray); - Method1(void, setInputPointArray, IN, osg::Vec3Array *, points); - Method0(const osg::Vec3Array *, getOutputNormalArray); - Method0(osg::Vec3Array *, getOutputNormalArray); - Method1(void, setOutputNormalArray, IN, osg::Vec3Array *, normals); - Method0(bool, triangulate); - Method0(const osg::DrawElementsUInt *, getTriangles); - Method0(osg::DrawElementsUInt *, getTriangles); - Property(osg::Vec3Array *, InputPointArray); - Property(osg::Vec3Array *, OutputNormalArray); - ReadOnlyProperty(osg::DrawElementsUInt *, Triangles); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, osg::Vec3Array *, points, , IN, osg::Vec3Array *, normals, 0); + I_ConstructorWithDefaults2(IN, const osgUtil::DelaunayTriangulator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(const osg::Vec3Array *, getInputPointArray); + I_Method0(osg::Vec3Array *, getInputPointArray); + I_Method1(void, setInputPointArray, IN, osg::Vec3Array *, points); + I_Method0(const osg::Vec3Array *, getOutputNormalArray); + I_Method0(osg::Vec3Array *, getOutputNormalArray); + I_Method1(void, setOutputNormalArray, IN, osg::Vec3Array *, normals); + I_Method0(bool, triangulate); + I_Method0(const osg::DrawElementsUInt *, getTriangles); + I_Method0(osg::DrawElementsUInt *, getTriangles); + I_Property(osg::Vec3Array *, InputPointArray); + I_Property(osg::Vec3Array *, OutputNormalArray); + I_ReadOnlyProperty(osg::DrawElementsUInt *, Triangles); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp b/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp index 0da0f9eb7..83b5743f8 100644 --- a/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp +++ b/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp @@ -15,14 +15,22 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgUtil::DisplayRequirementsVisitor) - BaseType(osg::NodeVisitor); - Constructor0(); - Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, ds); - Method0(const osg::DisplaySettings *, getDisplaySettings); - Method1(void, applyStateSet, IN, osg::StateSet &, stateset); - Method1(void, apply, IN, osg::Node &, node); - Method1(void, apply, IN, osg::Geode &, geode); - WriteOnlyProperty(osg::DisplaySettings *, DisplaySettings); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgUtil::DisplayRequirementsVisitor) + I_BaseType(osg::NodeVisitor); + I_Constructor0(); + I_Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, ds); + I_Method0(const osg::DisplaySettings *, getDisplaySettings); + I_Method1(void, applyStateSet, IN, osg::StateSet &, stateset); + I_Method1(void, apply, IN, osg::Node &, node); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_WriteOnlyProperty(osg::DisplaySettings *, DisplaySettings); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index 1143e91dd..42ead34d4 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -16,31 +16,39 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(unsigned int, osgUtil::GLObjectsVisitor::Mode); BEGIN_ENUM_REFLECTOR(osgUtil::GLObjectsVisitor::ModeValues) - EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_ON_DISPLAY_LISTS); - EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_OFF_DISPLAY_LISTS); - EnumLabel(osgUtil::GLObjectsVisitor::COMPILE_DISPLAY_LISTS); - EnumLabel(osgUtil::GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES); - EnumLabel(osgUtil::GLObjectsVisitor::RELEASE_DISPLAY_LISTS); - EnumLabel(osgUtil::GLObjectsVisitor::RELEASE_STATE_ATTRIBUTES); - EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_ON_VERTEX_BUFFER_OBJECTS); - EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_OFF_VERTEX_BUFFER_OBJECTS); + I_EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_ON_DISPLAY_LISTS); + I_EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_OFF_DISPLAY_LISTS); + I_EnumLabel(osgUtil::GLObjectsVisitor::COMPILE_DISPLAY_LISTS); + I_EnumLabel(osgUtil::GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES); + I_EnumLabel(osgUtil::GLObjectsVisitor::RELEASE_DISPLAY_LISTS); + I_EnumLabel(osgUtil::GLObjectsVisitor::RELEASE_STATE_ATTRIBUTES); + I_EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_ON_VERTEX_BUFFER_OBJECTS); + I_EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_OFF_VERTEX_BUFFER_OBJECTS); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::GLObjectsVisitor) - BaseType(osg::NodeVisitor); - ConstructorWithDefaults1(IN, osgUtil::GLObjectsVisitor::Mode, mode, osgUtil::GLObjectsVisitor::COMPILE_DISPLAY_LISTS|osgUtil::GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES); - Method1(void, setMode, IN, osgUtil::GLObjectsVisitor::Mode, mode); - Method0(osgUtil::GLObjectsVisitor::Mode, getMode); - Method1(void, setState, IN, osg::State *, state); - Method0(osg::State *, getState); - Method1(void, apply, IN, osg::Node &, node); - Method1(void, apply, IN, osg::Geode &, node); - Method1(void, apply, IN, osg::Drawable &, drawable); - Method1(void, apply, IN, osg::StateSet &, stateset); - Property(osgUtil::GLObjectsVisitor::Mode, Mode); - Property(osg::State *, State); +BEGIN_OBJECT_REFLECTOR(osgUtil::GLObjectsVisitor) + I_BaseType(osg::NodeVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::GLObjectsVisitor::Mode, mode, osgUtil::GLObjectsVisitor::COMPILE_DISPLAY_LISTS|osgUtil::GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES); + I_Method1(void, setMode, IN, osgUtil::GLObjectsVisitor::Mode, mode); + I_Method0(osgUtil::GLObjectsVisitor::Mode, getMode); + I_Method1(void, setState, IN, osg::State *, state); + I_Method0(osg::State *, getState); + I_Method1(void, apply, IN, osg::Node &, node); + I_Method1(void, apply, IN, osg::Geode &, node); + I_Method1(void, apply, IN, osg::Drawable &, drawable); + I_Method1(void, apply, IN, osg::StateSet &, stateset); + I_Property(osgUtil::GLObjectsVisitor::Mode, Mode); + I_Property(osg::State *, State); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp index aad0fdce2..6029a8570 100644 --- a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp @@ -13,9 +13,17 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgUtil::HalfWayMapGenerator) - BaseType(osgUtil::CubeMapGenerator); - ConstructorWithDefaults2(IN, const osg::Vec3 &, light_direction, , IN, int, texture_size, 64); - Constructor2(IN, const osgUtil::HalfWayMapGenerator &, copy, IN, const osg::CopyOp &, copyop); + I_BaseType(osgUtil::CubeMapGenerator); + I_ConstructorWithDefaults2(IN, const osg::Vec3 &, light_direction, , IN, int, texture_size, 64); + I_Constructor2(IN, const osgUtil::HalfWayMapGenerator &, copy, IN, const osg::CopyOp &, copyop); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp index b5de52471..03dd9ec38 100644 --- a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp @@ -14,9 +14,17 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgUtil::HighlightMapGenerator) - BaseType(osgUtil::CubeMapGenerator); - ConstructorWithDefaults4(IN, const osg::Vec3 &, light_direction, , IN, const osg::Vec4 &, light_color, , IN, float, specular_exponent, , IN, int, texture_size, 64); - ConstructorWithDefaults2(IN, const osgUtil::HighlightMapGenerator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_BaseType(osgUtil::CubeMapGenerator); + I_ConstructorWithDefaults4(IN, const osg::Vec3 &, light_direction, , IN, const osg::Vec4 &, light_color, , IN, float, specular_exponent, , IN, int, texture_size, 64); + I_ConstructorWithDefaults2(IN, const osgUtil::HighlightMapGenerator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/IntersectVisitor.cpp b/src/osgWrappers/osgUtil/IntersectVisitor.cpp index 8efded4ab..ad204bc91 100644 --- a/src/osgWrappers/osgUtil/IntersectVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectVisitor.cpp @@ -22,42 +22,50 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< int >, osgUtil::Hit::VecIndexList); BEGIN_VALUE_REFLECTOR(osgUtil::Hit) - Constructor0(); - Constructor1(IN, const osgUtil::Hit &, hit); - Method0(const osg::Vec3 &, getLocalIntersectPoint); - Method0(const osg::Vec3 &, getLocalIntersectNormal); - Method0(const osg::Vec3, getWorldIntersectPoint); - Method0(const osg::Vec3, getWorldIntersectNormal); - Method0(float, getRatio); - Method0(const osg::LineSegment *, getOriginalLineSegment); - Method0(const osg::LineSegment *, getLocalLineSegment); - Method0(osg::NodePath &, getNodePath); - Method0(const osg::NodePath &, getNodePath); - Method0(osg::Geode *, getGeode); - Method0(const osg::Geode *, getGeode); - Method0(osg::Drawable *, getDrawable); - Method0(const osg::Drawable *, getDrawable); - Method0(const osg::RefMatrix *, getMatrix); - Method0(const osg::RefMatrix *, getInverseMatrix); - Method0(const osgUtil::Hit::VecIndexList &, getVecIndexList); - Method0(int, getPrimitiveIndex); - ReadOnlyProperty(osg::Drawable *, Drawable); - ReadOnlyProperty(osg::Geode *, Geode); - ReadOnlyProperty(const osg::RefMatrix *, InverseMatrix); - ReadOnlyProperty(const osg::Vec3 &, LocalIntersectNormal); - ReadOnlyProperty(const osg::Vec3 &, LocalIntersectPoint); - ReadOnlyProperty(const osg::LineSegment *, LocalLineSegment); - ReadOnlyProperty(const osg::RefMatrix *, Matrix); - ReadOnlyProperty(osg::NodePath &, NodePath); - ReadOnlyProperty(const osg::LineSegment *, OriginalLineSegment); - ReadOnlyProperty(int, PrimitiveIndex); - ReadOnlyProperty(float, Ratio); - ReadOnlyProperty(const osgUtil::Hit::VecIndexList &, VecIndexList); - ReadOnlyProperty(const osg::Vec3, WorldIntersectNormal); - ReadOnlyProperty(const osg::Vec3, WorldIntersectPoint); + I_Constructor0(); + I_Constructor1(IN, const osgUtil::Hit &, hit); + I_Method0(const osg::Vec3 &, getLocalIntersectPoint); + I_Method0(const osg::Vec3 &, getLocalIntersectNormal); + I_Method0(const osg::Vec3, getWorldIntersectPoint); + I_Method0(const osg::Vec3, getWorldIntersectNormal); + I_Method0(float, getRatio); + I_Method0(const osg::LineSegment *, getOriginalLineSegment); + I_Method0(const osg::LineSegment *, getLocalLineSegment); + I_Method0(osg::NodePath &, getNodePath); + I_Method0(const osg::NodePath &, getNodePath); + I_Method0(osg::Geode *, getGeode); + I_Method0(const osg::Geode *, getGeode); + I_Method0(osg::Drawable *, getDrawable); + I_Method0(const osg::Drawable *, getDrawable); + I_Method0(const osg::RefMatrix *, getMatrix); + I_Method0(const osg::RefMatrix *, getInverseMatrix); + I_Method0(const osgUtil::Hit::VecIndexList &, getVecIndexList); + I_Method0(int, getPrimitiveIndex); + I_ReadOnlyProperty(osg::Drawable *, Drawable); + I_ReadOnlyProperty(osg::Geode *, Geode); + I_ReadOnlyProperty(const osg::RefMatrix *, InverseMatrix); + I_ReadOnlyProperty(const osg::Vec3 &, LocalIntersectNormal); + I_ReadOnlyProperty(const osg::Vec3 &, LocalIntersectPoint); + I_ReadOnlyProperty(const osg::LineSegment *, LocalLineSegment); + I_ReadOnlyProperty(const osg::RefMatrix *, Matrix); + I_ReadOnlyProperty(osg::NodePath &, NodePath); + I_ReadOnlyProperty(const osg::LineSegment *, OriginalLineSegment); + I_ReadOnlyProperty(int, PrimitiveIndex); + I_ReadOnlyProperty(float, Ratio); + I_ReadOnlyProperty(const osgUtil::Hit::VecIndexList &, VecIndexList); + I_ReadOnlyProperty(const osg::Vec3, WorldIntersectNormal); + I_ReadOnlyProperty(const osg::Vec3, WorldIntersectPoint); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osgUtil::Hit >, osgUtil::IntersectVisitor::HitList); @@ -65,32 +73,32 @@ TYPE_NAME_ALIAS(std::vector< osgUtil::Hit >, osgUtil::IntersectVisitor::HitList) TYPE_NAME_ALIAS(std::map< osg::LineSegment * COMMA osgUtil::IntersectVisitor::HitList >, osgUtil::IntersectVisitor::LineSegmentHitListMap); BEGIN_ENUM_REFLECTOR(osgUtil::IntersectVisitor::LODSelectionMode) - EnumLabel(osgUtil::IntersectVisitor::USE_HEIGHEST_LEVEL_OF_DETAIL); - EnumLabel(osgUtil::IntersectVisitor::USE_SEGMENT_START_POINT_AS_EYE_POINT_FOR_LOD_LEVEL_SELECTION); + I_EnumLabel(osgUtil::IntersectVisitor::USE_HEIGHEST_LEVEL_OF_DETAIL); + I_EnumLabel(osgUtil::IntersectVisitor::USE_SEGMENT_START_POINT_AS_EYE_POINT_FOR_LOD_LEVEL_SELECTION); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::IntersectVisitor) - BaseType(osg::NodeVisitor); - Constructor0(); - Method0(void, reset); - Method1(void, addLineSegment, IN, osg::LineSegment *, seg); - Method1(osgUtil::IntersectVisitor::HitList &, getHitList, IN, osg::LineSegment *, seg); - Method1(int, getNumHits, IN, osg::LineSegment *, seg); - Method0(bool, hits); - Method1(void, setLODSelectionMode, IN, osgUtil::IntersectVisitor::LODSelectionMode, mode); - Method0(osgUtil::IntersectVisitor::LODSelectionMode, getLODSelectionMode); - Method1(void, setEyePoint, IN, const osg::Vec3 &, eye); - Method0(osg::Vec3, getEyePoint); - Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale); - Method1(void, apply, IN, osg::Node &, x); - Method1(void, apply, IN, osg::Geode &, node); - Method1(void, apply, IN, osg::Billboard &, node); - Method1(void, apply, IN, osg::Group &, node); - Method1(void, apply, IN, osg::Transform &, node); - Method1(void, apply, IN, osg::Switch &, node); - Method1(void, apply, IN, osg::LOD &, node); - ReadOnlyProperty(osg::Vec3, EyePoint); - Property(osgUtil::IntersectVisitor::LODSelectionMode, LODSelectionMode); +BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectVisitor) + I_BaseType(osg::NodeVisitor); + I_Constructor0(); + I_Method0(void, reset); + I_Method1(void, addLineSegment, IN, osg::LineSegment *, seg); + I_Method1(osgUtil::IntersectVisitor::HitList &, getHitList, IN, osg::LineSegment *, seg); + I_Method1(int, getNumHits, IN, osg::LineSegment *, seg); + I_Method0(bool, hits); + I_Method1(void, setLODSelectionMode, IN, osgUtil::IntersectVisitor::LODSelectionMode, mode); + I_Method0(osgUtil::IntersectVisitor::LODSelectionMode, getLODSelectionMode); + I_Method1(void, setEyePoint, IN, const osg::Vec3 &, eye); + I_Method0(osg::Vec3, getEyePoint); + I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale); + I_Method1(void, apply, IN, osg::Node &, x); + 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::Transform &, node); + I_Method1(void, apply, IN, osg::Switch &, node); + I_Method1(void, apply, IN, osg::LOD &, node); + I_ReadOnlyProperty(osg::Vec3, EyePoint); + I_Property(osgUtil::IntersectVisitor::LODSelectionMode, LODSelectionMode); END_REFLECTOR STD_MAP_REFLECTOR(std::map< osg::LineSegment * COMMA osgUtil::IntersectVisitor::HitList >); diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp index 58fc8942a..be03541f3 100644 --- a/src/osgWrappers/osgUtil/Optimizer.cpp +++ b/src/osgWrappers/osgUtil/Optimizer.cpp @@ -24,180 +24,188 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgUtil::BaseOptimizerVisitor) - BaseType(osg::NodeVisitor); - Constructor2(IN, osgUtil::Optimizer *, optimizer, IN, unsigned int, operation); - Method1(bool, isOperationPermissibleForObject, IN, const osg::StateSet *, object); - Method1(bool, isOperationPermissibleForObject, IN, const osg::StateAttribute *, object); - Method1(bool, isOperationPermissibleForObject, IN, const osg::Drawable *, object); - Method1(bool, isOperationPermissibleForObject, IN, const osg::Node *, object); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgUtil::BaseOptimizerVisitor) + I_BaseType(osg::NodeVisitor); + I_Constructor2(IN, osgUtil::Optimizer *, optimizer, IN, unsigned int, operation); + I_Method1(bool, isOperationPermissibleForObject, IN, const osg::StateSet *, object); + I_Method1(bool, isOperationPermissibleForObject, IN, const osg::StateAttribute *, object); + I_Method1(bool, isOperationPermissibleForObject, IN, const osg::Drawable *, object); + I_Method1(bool, isOperationPermissibleForObject, IN, const osg::Node *, object); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgUtil::Optimizer::OptimizationOptions) - EnumLabel(osgUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS); - EnumLabel(osgUtil::Optimizer::REMOVE_REDUNDANT_NODES); - EnumLabel(osgUtil::Optimizer::REMOVE_LOADED_PROXY_NODES); - EnumLabel(osgUtil::Optimizer::COMBINE_ADJACENT_LODS); - EnumLabel(osgUtil::Optimizer::SHARE_DUPLICATE_STATE); - EnumLabel(osgUtil::Optimizer::MERGE_GEOMETRY); - EnumLabel(osgUtil::Optimizer::CHECK_GEOMETRY); - EnumLabel(osgUtil::Optimizer::SPATIALIZE_GROUPS); - EnumLabel(osgUtil::Optimizer::COPY_SHARED_NODES); - EnumLabel(osgUtil::Optimizer::TRISTRIP_GEOMETRY); - EnumLabel(osgUtil::Optimizer::TESSELATE_GEOMETRY); - EnumLabel(osgUtil::Optimizer::OPTIMIZE_TEXTURE_SETTINGS); - EnumLabel(osgUtil::Optimizer::DEFAULT_OPTIMIZATIONS); - EnumLabel(osgUtil::Optimizer::ALL_OPTIMIZATIONS); + I_EnumLabel(osgUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS); + I_EnumLabel(osgUtil::Optimizer::REMOVE_REDUNDANT_NODES); + I_EnumLabel(osgUtil::Optimizer::REMOVE_LOADED_PROXY_NODES); + I_EnumLabel(osgUtil::Optimizer::COMBINE_ADJACENT_LODS); + I_EnumLabel(osgUtil::Optimizer::SHARE_DUPLICATE_STATE); + I_EnumLabel(osgUtil::Optimizer::MERGE_GEOMETRY); + I_EnumLabel(osgUtil::Optimizer::CHECK_GEOMETRY); + I_EnumLabel(osgUtil::Optimizer::SPATIALIZE_GROUPS); + I_EnumLabel(osgUtil::Optimizer::COPY_SHARED_NODES); + I_EnumLabel(osgUtil::Optimizer::TRISTRIP_GEOMETRY); + I_EnumLabel(osgUtil::Optimizer::TESSELATE_GEOMETRY); + I_EnumLabel(osgUtil::Optimizer::OPTIMIZE_TEXTURE_SETTINGS); + I_EnumLabel(osgUtil::Optimizer::DEFAULT_OPTIMIZATIONS); + I_EnumLabel(osgUtil::Optimizer::ALL_OPTIMIZATIONS); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer) - Constructor0(); - Method0(void, reset); - Method1(void, optimize, IN, osg::Node *, node); - Method2(void, optimize, IN, osg::Node *, node, IN, unsigned int, options); - Method1(void, setIsOperationPermissibleForObjectCallback, IN, osgUtil::Optimizer::IsOperationPermissibleForObjectCallback *, callback); - Method0(osgUtil::Optimizer::IsOperationPermissibleForObjectCallback *, getIsOperationPermissibleForObjectCallback); - Method0(const osgUtil::Optimizer::IsOperationPermissibleForObjectCallback *, getIsOperationPermissibleForObjectCallback); - Method2(void, setPermissibleOptimizationsForObject, IN, const osg::Object *, object, IN, unsigned int, options); - Method1(unsigned int, getPermissibleOptimizationsForObject, IN, const osg::Object *, object); - Method2(bool, isOperationPermissibleForObject, IN, const osg::StateSet *, object, IN, unsigned int, option); - Method2(bool, isOperationPermissibleForObject, IN, const osg::StateAttribute *, object, IN, unsigned int, option); - Method2(bool, isOperationPermissibleForObject, IN, const osg::Drawable *, object, IN, unsigned int, option); - Method2(bool, isOperationPermissibleForObject, IN, const osg::Node *, object, IN, unsigned int, option); - Method2(bool, isOperationPermissibleForObjectImplementation, IN, const osg::StateSet *, stateset, IN, unsigned int, option); - Method2(bool, isOperationPermissibleForObjectImplementation, IN, const osg::StateAttribute *, attribute, IN, unsigned int, option); - Method2(bool, isOperationPermissibleForObjectImplementation, IN, const osg::Drawable *, drawable, IN, unsigned int, option); - Method2(bool, isOperationPermissibleForObjectImplementation, IN, const osg::Node *, node, IN, unsigned int, option); - Property(osgUtil::Optimizer::IsOperationPermissibleForObjectCallback *, IsOperationPermissibleForObjectCallback); - IndexedProperty1(unsigned int, PermissibleOptimizationsForObject, const osg::Object *, object); + I_Constructor0(); + I_Method0(void, reset); + I_Method1(void, optimize, IN, osg::Node *, node); + I_Method2(void, optimize, IN, osg::Node *, node, IN, unsigned int, options); + I_Method1(void, setIsOperationPermissibleForObjectCallback, IN, osgUtil::Optimizer::IsOperationPermissibleForObjectCallback *, callback); + I_Method0(osgUtil::Optimizer::IsOperationPermissibleForObjectCallback *, getIsOperationPermissibleForObjectCallback); + I_Method0(const osgUtil::Optimizer::IsOperationPermissibleForObjectCallback *, getIsOperationPermissibleForObjectCallback); + I_Method2(void, setPermissibleOptimizationsForObject, IN, const osg::Object *, object, IN, unsigned int, options); + I_Method1(unsigned int, getPermissibleOptimizationsForObject, IN, const osg::Object *, object); + I_Method2(bool, isOperationPermissibleForObject, IN, const osg::StateSet *, object, IN, unsigned int, option); + I_Method2(bool, isOperationPermissibleForObject, IN, const osg::StateAttribute *, object, IN, unsigned int, option); + I_Method2(bool, isOperationPermissibleForObject, IN, const osg::Drawable *, object, IN, unsigned int, option); + I_Method2(bool, isOperationPermissibleForObject, IN, const osg::Node *, object, IN, unsigned int, option); + I_Method2(bool, isOperationPermissibleForObjectImplementation, IN, const osg::StateSet *, stateset, IN, unsigned int, option); + I_Method2(bool, isOperationPermissibleForObjectImplementation, IN, const osg::StateAttribute *, attribute, IN, unsigned int, option); + I_Method2(bool, isOperationPermissibleForObjectImplementation, IN, const osg::Drawable *, drawable, IN, unsigned int, option); + I_Method2(bool, isOperationPermissibleForObjectImplementation, IN, const osg::Node *, node, IN, unsigned int, option); + I_Property(osgUtil::Optimizer::IsOperationPermissibleForObjectCallback *, IsOperationPermissibleForObjectCallback); + I_IndexedProperty1(unsigned int, PermissibleOptimizationsForObject, const osg::Object *, object); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::CheckGeometryVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::Geode &, geode); - Method1(void, checkGeode, IN, osg::Geode &, geode); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CheckGeometryVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_Method1(void, checkGeode, IN, osg::Geode &, geode); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::CombineLODsVisitor::GroupList); -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::CombineLODsVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::LOD &, lod); - Method0(void, combineLODs); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineLODsVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::LOD &, lod); + I_Method0(void, combineLODs); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::CombineStaticTransformsVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::MatrixTransform &, transform); - Method1(bool, removeTransforms, IN, osg::Node *, nodeWeCannotRemove); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineStaticTransformsVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::MatrixTransform &, transform); + I_Method1(bool, removeTransforms, IN, osg::Node *, nodeWeCannotRemove); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::CopySharedSubgraphsVisitor::SharedNodeList); -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::CopySharedSubgraphsVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::Node &, node); - Method0(void, copySharedNodes); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CopySharedSubgraphsVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::Node &, node); + I_Method0(void, copySharedNodes); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::FlattenStaticTransformsVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::Node &, geode); - Method1(void, apply, IN, osg::Geode &, geode); - Method1(void, apply, IN, osg::Billboard &, geode); - Method1(void, apply, IN, osg::ProxyNode &, node); - Method1(void, apply, IN, osg::Transform &, transform); - Method1(bool, removeTransforms, IN, osg::Node *, nodeWeCannotRemove); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenStaticTransformsVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::Node &, geode); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_Method1(void, apply, IN, osg::Billboard &, geode); + I_Method1(void, apply, IN, osg::ProxyNode &, node); + I_Method1(void, apply, IN, osg::Transform &, transform); + I_Method1(bool, removeTransforms, IN, osg::Node *, nodeWeCannotRemove); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::IsOperationPermissibleForObjectCallback) - BaseType(osg::Referenced); - Constructor0(); - Method3(bool, isOperationPermissibleForObjectImplementation, IN, const osgUtil::Optimizer *, optimizer, IN, const osg::StateSet *, stateset, IN, unsigned int, option); - Method3(bool, isOperationPermissibleForObjectImplementation, IN, const osgUtil::Optimizer *, optimizer, IN, const osg::StateAttribute *, attribute, IN, unsigned int, option); - Method3(bool, isOperationPermissibleForObjectImplementation, IN, const osgUtil::Optimizer *, optimizer, IN, const osg::Drawable *, drawable, IN, unsigned int, option); - Method3(bool, isOperationPermissibleForObjectImplementation, IN, const osgUtil::Optimizer *, optimizer, IN, const osg::Node *, node, IN, unsigned int, option); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::IsOperationPermissibleForObjectCallback) + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method3(bool, isOperationPermissibleForObjectImplementation, IN, const osgUtil::Optimizer *, optimizer, IN, const osg::StateSet *, stateset, IN, unsigned int, option); + I_Method3(bool, isOperationPermissibleForObjectImplementation, IN, const osgUtil::Optimizer *, optimizer, IN, const osg::StateAttribute *, attribute, IN, unsigned int, option); + I_Method3(bool, isOperationPermissibleForObjectImplementation, IN, const osgUtil::Optimizer *, optimizer, IN, const osg::Drawable *, drawable, IN, unsigned int, option); + I_Method3(bool, isOperationPermissibleForObjectImplementation, IN, const osgUtil::Optimizer *, optimizer, IN, const osg::Node *, node, IN, unsigned int, option); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::MergeGeometryVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, setTargetMaximumNumberOfVertices, IN, unsigned int, num); - Method0(unsigned int, getTargetMaximumNumberOfVertices); - Method1(void, apply, IN, osg::Geode &, geode); - Method1(void, apply, IN, osg::Billboard &, x); - Method1(bool, mergeGeode, IN, osg::Geode &, geode); - Property(unsigned int, TargetMaximumNumberOfVertices); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeometryVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, setTargetMaximumNumberOfVertices, IN, unsigned int, num); + I_Method0(unsigned int, getTargetMaximumNumberOfVertices); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_Method1(void, apply, IN, osg::Billboard &, x); + I_Method1(bool, mergeGeode, IN, osg::Geode &, geode); + I_Property(unsigned int, TargetMaximumNumberOfVertices); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveEmptyNodesVisitor::NodeList); -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::RemoveEmptyNodesVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::Geode &, geode); - Method1(void, apply, IN, osg::Group &, group); - Method0(void, removeEmptyNodes); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveEmptyNodesVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_Method1(void, apply, IN, osg::Group &, group); + I_Method0(void, removeEmptyNodes); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor::NodeList); -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::ProxyNode &, group); - Method0(void, removeRedundantNodes); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::ProxyNode &, group); + I_Method0(void, removeRedundantNodes); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveRedundantNodesVisitor::NodeList); -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::RemoveRedundantNodesVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::Group &, group); - Method1(void, apply, IN, osg::Transform &, transform); - Method0(void, removeRedundantNodes); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveRedundantNodesVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::Group &, group); + I_Method1(void, apply, IN, osg::Transform &, transform); + I_Method0(void, removeRedundantNodes); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::SpatializeGroupsVisitor::GroupsToDivideList); -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::SpatializeGroupsVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::Group &, group); - MethodWithDefaults1(bool, divide, IN, unsigned int, maxNumTreesPerCell, 8); - Method2(bool, divide, IN, osg::Group *, group, IN, unsigned int, maxNumTreesPerCell); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::SpatializeGroupsVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::Group &, group); + I_MethodWithDefaults1(bool, divide, IN, unsigned int, maxNumTreesPerCell, 8); + I_Method2(bool, divide, IN, osg::Group *, group, IN, unsigned int, maxNumTreesPerCell); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::StateVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method0(void, reset); - Method1(void, apply, IN, osg::Node &, node); - Method1(void, apply, IN, osg::Geode &, geode); - Method0(void, optimize); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::StateVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method0(void, reset); + I_Method1(void, apply, IN, osg::Node &, node); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_Method0(void, optimize); END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::TesselateVisitor::GroupList); -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::TesselateVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::Geode &, geode); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TesselateVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::Geode &, geode); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::TextureVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults7(IN, bool, changeAutoUnRef, , IN, bool, valueAutoUnRef, , IN, bool, changeClientImageStorage, , IN, bool, valueClientImageStorage, , IN, bool, changeAnisotropy, , IN, float, valueAnisotropy, , IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, apply, IN, osg::Geode &, node); - Method1(void, apply, IN, osg::Node &, node); - Method1(void, apply, IN, osg::StateSet &, stateset); - Method1(void, apply, IN, osg::Texture &, texture); +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults7(IN, bool, changeAutoUnRef, , IN, bool, valueAutoUnRef, , IN, bool, changeClientImageStorage, , IN, bool, valueClientImageStorage, , IN, bool, changeAnisotropy, , IN, float, valueAnisotropy, , IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, apply, IN, osg::Geode &, node); + I_Method1(void, apply, IN, osg::Node &, node); + I_Method1(void, apply, IN, osg::StateSet &, stateset); + I_Method1(void, apply, IN, osg::Texture &, texture); END_REFLECTOR STD_SET_REFLECTOR(std::set< osg::Group * >); diff --git a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp index b7c568ed4..b7386860e 100644 --- a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp @@ -12,9 +12,17 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgUtil::ReflectionMapGenerator) - BaseType(osgUtil::CubeMapGenerator); - ConstructorWithDefaults1(IN, int, texture_size, 64); - ConstructorWithDefaults2(IN, const osgUtil::ReflectionMapGenerator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_BaseType(osgUtil::CubeMapGenerator); + I_ConstructorWithDefaults1(IN, int, texture_size, 64); + I_ConstructorWithDefaults2(IN, const osgUtil::ReflectionMapGenerator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/RenderBin.cpp b/src/osgWrappers/osgUtil/RenderBin.cpp index 8dfe4394a..1964d55eb 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -18,8 +18,16 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osgUtil::RegisterRenderBinProxy) - Constructor2(IN, const std::string &, binName, IN, osgUtil::RenderBin *, proto); + I_Constructor2(IN, const std::string &, binName, IN, osgUtil::RenderBin *, proto); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osgUtil::RenderLeaf * >, osgUtil::RenderBin::RenderLeafList); @@ -29,85 +37,85 @@ TYPE_NAME_ALIAS(std::vector< osgUtil::RenderGraph * >, osgUtil::RenderBin::Rende TYPE_NAME_ALIAS(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >, osgUtil::RenderBin::RenderBinList); BEGIN_ENUM_REFLECTOR(osgUtil::RenderBin::SortMode) - EnumLabel(osgUtil::RenderBin::SORT_BY_STATE); - EnumLabel(osgUtil::RenderBin::SORT_FRONT_TO_BACK); - EnumLabel(osgUtil::RenderBin::SORT_BACK_TO_FRONT); + I_EnumLabel(osgUtil::RenderBin::SORT_BY_STATE); + I_EnumLabel(osgUtil::RenderBin::SORT_FRONT_TO_BACK); + I_EnumLabel(osgUtil::RenderBin::SORT_BACK_TO_FRONT); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) - BaseType(osg::Object); - ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, osgUtil::RenderBin::SORT_BY_STATE); - ConstructorWithDefaults2(IN, const osgUtil::RenderBin &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(void, reset); - Method0(osgUtil::RenderBin *, getParent); - Method0(const osgUtil::RenderBin *, getParent); - Method0(osgUtil::RenderStage *, getStage); - Method0(const osgUtil::RenderStage *, getStage); - Method0(int, getBinNum); - Method0(osgUtil::RenderBin::RenderGraphList &, getRenderGraphList); - Method0(const osgUtil::RenderBin::RenderGraphList &, getRenderGraphList); - Method0(osgUtil::RenderBin::RenderBinList &, getRenderBinList); - Method0(const osgUtil::RenderBin::RenderBinList &, getRenderBinList); - Method0(osgUtil::RenderBin::RenderLeafList &, getRenderLeafList); - Method0(const osgUtil::RenderBin::RenderLeafList &, getRenderLeafList); - Method2(osgUtil::RenderBin *, find_or_insert, IN, int, binNum, IN, const std::string &, binName); - Method1(void, addRenderGraph, IN, osgUtil::RenderGraph *, rg); - Method0(void, sort); - Method0(void, sortImplementation); - Method1(void, setSortMode, IN, osgUtil::RenderBin::SortMode, mode); - Method0(osgUtil::RenderBin::SortMode, getSortMode); - Method0(void, sortByState); - Method0(void, sortFrontToBack); - Method0(void, sortBackToFront); - Method1(void, setSortCallback, IN, osgUtil::RenderBin::SortCallback *, sortCallback); - Method0(osgUtil::RenderBin::SortCallback *, getSortCallback); - Method0(const osgUtil::RenderBin::SortCallback *, getSortCallback); - Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); - Method2(void, drawImplementation, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); - Method1(void, setDrawCallback, IN, osgUtil::RenderBin::DrawCallback *, drawCallback); - Method0(osgUtil::RenderBin::DrawCallback *, getDrawCallback); - Method0(const osgUtil::RenderBin::DrawCallback *, getDrawCallback); - Method1(bool, getStats, IN, osgUtil::Statistics *, primStats); - Method1(void, getPrims, IN, osgUtil::Statistics *, primStats); - Method2(bool, getPrims, IN, osgUtil::Statistics *, primStats, IN, int, nbin); - ReadOnlyProperty(int, BinNum); - Property(osgUtil::RenderBin::DrawCallback *, DrawCallback); - ReadOnlyProperty(osgUtil::RenderBin *, Parent); - ReadOnlyProperty(osgUtil::RenderBin::RenderBinList &, RenderBinList); - ReadOnlyProperty(osgUtil::RenderBin::RenderGraphList &, RenderGraphList); - ReadOnlyProperty(osgUtil::RenderBin::RenderLeafList &, RenderLeafList); - Property(osgUtil::RenderBin::SortCallback *, SortCallback); - Property(osgUtil::RenderBin::SortMode, SortMode); - ReadOnlyProperty(osgUtil::RenderStage *, Stage); + I_BaseType(osg::Object); + I_ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, osgUtil::RenderBin::SORT_BY_STATE); + I_ConstructorWithDefaults2(IN, const osgUtil::RenderBin &, 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(void, reset); + I_Method0(osgUtil::RenderBin *, getParent); + I_Method0(const osgUtil::RenderBin *, getParent); + I_Method0(osgUtil::RenderStage *, getStage); + I_Method0(const osgUtil::RenderStage *, getStage); + I_Method0(int, getBinNum); + I_Method0(osgUtil::RenderBin::RenderGraphList &, getRenderGraphList); + I_Method0(const osgUtil::RenderBin::RenderGraphList &, getRenderGraphList); + I_Method0(osgUtil::RenderBin::RenderBinList &, getRenderBinList); + I_Method0(const osgUtil::RenderBin::RenderBinList &, getRenderBinList); + I_Method0(osgUtil::RenderBin::RenderLeafList &, getRenderLeafList); + I_Method0(const osgUtil::RenderBin::RenderLeafList &, getRenderLeafList); + I_Method2(osgUtil::RenderBin *, find_or_insert, IN, int, binNum, IN, const std::string &, binName); + I_Method1(void, addRenderGraph, IN, osgUtil::RenderGraph *, rg); + I_Method0(void, sort); + I_Method0(void, sortImplementation); + I_Method1(void, setSortMode, IN, osgUtil::RenderBin::SortMode, mode); + I_Method0(osgUtil::RenderBin::SortMode, getSortMode); + I_Method0(void, sortByState); + I_Method0(void, sortFrontToBack); + I_Method0(void, sortBackToFront); + I_Method1(void, setSortCallback, IN, osgUtil::RenderBin::SortCallback *, sortCallback); + I_Method0(osgUtil::RenderBin::SortCallback *, getSortCallback); + I_Method0(const osgUtil::RenderBin::SortCallback *, getSortCallback); + I_Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Method2(void, drawImplementation, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Method1(void, setDrawCallback, IN, osgUtil::RenderBin::DrawCallback *, drawCallback); + I_Method0(osgUtil::RenderBin::DrawCallback *, getDrawCallback); + I_Method0(const osgUtil::RenderBin::DrawCallback *, getDrawCallback); + I_Method1(bool, getStats, IN, osgUtil::Statistics *, primStats); + I_Method1(void, getPrims, IN, osgUtil::Statistics *, primStats); + I_Method2(bool, getPrims, IN, osgUtil::Statistics *, primStats, IN, int, nbin); + I_ReadOnlyProperty(int, BinNum); + I_Property(osgUtil::RenderBin::DrawCallback *, DrawCallback); + I_ReadOnlyProperty(osgUtil::RenderBin *, Parent); + I_ReadOnlyProperty(osgUtil::RenderBin::RenderBinList &, RenderBinList); + I_ReadOnlyProperty(osgUtil::RenderBin::RenderGraphList &, RenderGraphList); + I_ReadOnlyProperty(osgUtil::RenderBin::RenderLeafList &, RenderLeafList); + I_Property(osgUtil::RenderBin::SortCallback *, SortCallback); + I_Property(osgUtil::RenderBin::SortMode, SortMode); + I_ReadOnlyProperty(osgUtil::RenderStage *, Stage); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::RenderBin::DrawCallback) - BaseType(osg::Referenced); - Constructor0(); - Method3(void, drawImplementation, IN, osgUtil::RenderBin *, bin, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method3(void, drawImplementation, IN, osgUtil::RenderBin *, bin, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::RenderBin::SortCallback) - BaseType(osg::Referenced); - Constructor0(); - Method1(void, sortImplementation, IN, osgUtil::RenderBin *, x); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method1(void, sortImplementation, IN, osgUtil::RenderBin *, x); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderBin >) - Constructor0(); - Constructor1(IN, osgUtil::RenderBin *, t); - Constructor1(IN, const osg::ref_ptr< osgUtil::RenderBin > &, rp); - Method0(bool, valid); - Method0(osgUtil::RenderBin *, get); - Method0(const osgUtil::RenderBin *, get); - Method0(osgUtil::RenderBin *, take); - Method0(osgUtil::RenderBin *, release); - ReadOnlyProperty(osgUtil::RenderBin *, ); + I_Constructor0(); + I_Constructor1(IN, osgUtil::RenderBin *, t); + I_Constructor1(IN, const osg::ref_ptr< osgUtil::RenderBin > &, rp); + I_Method0(bool, valid); + I_Method0(osgUtil::RenderBin *, get); + I_Method0(const osgUtil::RenderBin *, get); + I_Method0(osgUtil::RenderBin *, take); + I_Method0(osgUtil::RenderBin *, release); + I_ReadOnlyProperty(osgUtil::RenderBin *, ); END_REFLECTOR STD_MAP_REFLECTOR(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >); diff --git a/src/osgWrappers/osgUtil/RenderGraph.cpp b/src/osgWrappers/osgUtil/RenderGraph.cpp index 48f3e68db..615ba452a 100644 --- a/src/osgWrappers/osgUtil/RenderGraph.cpp +++ b/src/osgWrappers/osgUtil/RenderGraph.cpp @@ -14,59 +14,67 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_VALUE_REFLECTOR(osgUtil::LeafDepthSortFunctor) - Constructor0(); + I_Constructor0(); END_REFLECTOR TYPE_NAME_ALIAS(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::RenderGraph > >, osgUtil::RenderGraph::ChildList); TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::RenderLeaf > >, osgUtil::RenderGraph::LeafList); -BEGIN_VALUE_REFLECTOR(osgUtil::RenderGraph) - BaseType(osg::Referenced); - Constructor0(); - Constructor2(IN, osgUtil::RenderGraph *, parent, IN, const osg::StateSet *, stateset); - Method0(osgUtil::RenderGraph *, cloneType); - Method1(void, setUserData, IN, osg::Referenced *, obj); - Method0(osg::Referenced *, getUserData); - Method0(const osg::Referenced *, getUserData); - Method0(bool, empty); - Method0(bool, leaves_empty); - Method0(float, getAverageDistance); - Method0(float, getMinimumDistance); - Method0(void, sortFrontToBack); - Method0(void, reset); - Method0(void, clean); - Method0(void, prune); - Method1(osgUtil::RenderGraph *, find_or_insert, IN, const osg::StateSet *, stateset); - Method1(void, addLeaf, IN, osgUtil::RenderLeaf *, leaf); - ReadOnlyProperty(float, AverageDistance); - ReadOnlyProperty(float, MinimumDistance); - Property(osg::Referenced *, UserData); +BEGIN_OBJECT_REFLECTOR(osgUtil::RenderGraph) + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Constructor2(IN, osgUtil::RenderGraph *, parent, IN, const osg::StateSet *, stateset); + I_Method0(osgUtil::RenderGraph *, cloneType); + I_Method1(void, setUserData, IN, osg::Referenced *, obj); + I_Method0(osg::Referenced *, getUserData); + I_Method0(const osg::Referenced *, getUserData); + I_Method0(bool, empty); + I_Method0(bool, leaves_empty); + I_Method0(float, getAverageDistance); + I_Method0(float, getMinimumDistance); + I_Method0(void, sortFrontToBack); + I_Method0(void, reset); + I_Method0(void, clean); + I_Method0(void, prune); + I_Method1(osgUtil::RenderGraph *, find_or_insert, IN, const osg::StateSet *, stateset); + I_Method1(void, addLeaf, IN, osgUtil::RenderLeaf *, leaf); + I_ReadOnlyProperty(float, AverageDistance); + I_ReadOnlyProperty(float, MinimumDistance); + I_Property(osg::Referenced *, UserData); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderGraph >) - Constructor0(); - Constructor1(IN, osgUtil::RenderGraph *, t); - Constructor1(IN, const osg::ref_ptr< osgUtil::RenderGraph > &, rp); - Method0(bool, valid); - Method0(osgUtil::RenderGraph *, get); - Method0(const osgUtil::RenderGraph *, get); - Method0(osgUtil::RenderGraph *, take); - Method0(osgUtil::RenderGraph *, release); - ReadOnlyProperty(osgUtil::RenderGraph *, ); + I_Constructor0(); + I_Constructor1(IN, osgUtil::RenderGraph *, t); + I_Constructor1(IN, const osg::ref_ptr< osgUtil::RenderGraph > &, rp); + I_Method0(bool, valid); + I_Method0(osgUtil::RenderGraph *, get); + I_Method0(const osgUtil::RenderGraph *, get); + I_Method0(osgUtil::RenderGraph *, take); + I_Method0(osgUtil::RenderGraph *, release); + I_ReadOnlyProperty(osgUtil::RenderGraph *, ); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderLeaf >) - Constructor0(); - Constructor1(IN, osgUtil::RenderLeaf *, t); - Constructor1(IN, const osg::ref_ptr< osgUtil::RenderLeaf > &, rp); - Method0(bool, valid); - Method0(osgUtil::RenderLeaf *, get); - Method0(const osgUtil::RenderLeaf *, get); - Method0(osgUtil::RenderLeaf *, take); - Method0(osgUtil::RenderLeaf *, release); - ReadOnlyProperty(osgUtil::RenderLeaf *, ); + I_Constructor0(); + I_Constructor1(IN, osgUtil::RenderLeaf *, t); + I_Constructor1(IN, const osg::ref_ptr< osgUtil::RenderLeaf > &, rp); + I_Method0(bool, valid); + I_Method0(osgUtil::RenderLeaf *, get); + I_Method0(const osgUtil::RenderLeaf *, get); + I_Method0(osgUtil::RenderLeaf *, take); + I_Method0(osgUtil::RenderLeaf *, release); + I_ReadOnlyProperty(osgUtil::RenderLeaf *, ); END_REFLECTOR STD_MAP_REFLECTOR(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::RenderGraph > >); diff --git a/src/osgWrappers/osgUtil/RenderLeaf.cpp b/src/osgWrappers/osgUtil/RenderLeaf.cpp index 275a65224..574257921 100644 --- a/src/osgWrappers/osgUtil/RenderLeaf.cpp +++ b/src/osgWrappers/osgUtil/RenderLeaf.cpp @@ -14,11 +14,19 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgUtil::RenderLeaf) - BaseType(osg::Referenced); - ConstructorWithDefaults4(IN, osg::Drawable *, drawable, , IN, osg::RefMatrix *, projection, , IN, osg::RefMatrix *, modelview, , IN, float, depth, 0.0f); - MethodWithDefaults4(void, set, IN, osg::Drawable *, drawable, , IN, osg::RefMatrix *, projection, , IN, osg::RefMatrix *, modelview, , IN, float, depth, 0.0f); - Method0(void, reset); - Method2(void, render, IN, osg::State &, state, IN, osgUtil::RenderLeaf *, previous); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgUtil::RenderLeaf) + I_BaseType(osg::Referenced); + I_ConstructorWithDefaults4(IN, osg::Drawable *, drawable, , IN, osg::RefMatrix *, projection, , IN, osg::RefMatrix *, modelview, , IN, float, depth, 0.0f); + I_MethodWithDefaults4(void, set, IN, osg::Drawable *, drawable, , IN, osg::RefMatrix *, projection, , IN, osg::RefMatrix *, modelview, , IN, float, depth, 0.0f); + I_Method0(void, reset); + I_Method2(void, render, IN, osg::State &, state, IN, osgUtil::RenderLeaf *, previous); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index 0515dcfad..00c26e3e8 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -23,47 +23,55 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) - BaseType(osgUtil::RenderBin); - ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, osgUtil::RenderBin::SORT_BY_STATE); - ConstructorWithDefaults2(IN, const osgUtil::RenderStage &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, className); - Method0(void, reset); - Method1(void, setViewport, IN, osg::Viewport *, viewport); - Method0(const osg::Viewport *, getViewport); - Method0(osg::Viewport *, getViewport); - Method1(void, setClearMask, IN, GLbitfield, mask); - Method0(GLbitfield, getClearMask); - Method1(void, setColorMask, IN, osg::ColorMask *, cm); - Method0(osg::ColorMask *, getColorMask); - Method0(const osg::ColorMask *, getColorMask); - Method1(void, setClearColor, IN, const osg::Vec4 &, color); - Method0(const osg::Vec4 &, getClearColor); - Method1(void, setClearAccum, IN, const osg::Vec4 &, color); - Method0(const osg::Vec4 &, getClearAccum); - Method1(void, setClearDepth, IN, double, depth); - Method0(double, getClearDepth); - Method1(void, setClearStencil, IN, int, stencil); - Method0(int, getClearStencil); - Method1(void, setRenderStageLighting, IN, osgUtil::RenderStageLighting *, rsl); - Method0(osgUtil::RenderStageLighting *, getRenderStageLighting); - Method2(void, addPositionedAttribute, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); - Method3(void, addPositionedTextureAttribute, IN, unsigned int, textureUnit, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); - Method2(void, drawPreRenderStages, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); - Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); - Method2(void, drawImplementation, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); - Method1(void, addToDependencyList, IN, osgUtil::RenderStage *, rs); - Method1(bool, getStats, IN, osgUtil::Statistics *, primStats); - Property(const osg::Vec4 &, ClearAccum); - Property(const osg::Vec4 &, ClearColor); - Property(double, ClearDepth); - Property(GLbitfield, ClearMask); - Property(int, ClearStencil); - Property(osg::ColorMask *, ColorMask); - Property(osgUtil::RenderStageLighting *, RenderStageLighting); - Property(osg::Viewport *, Viewport); + I_BaseType(osgUtil::RenderBin); + I_ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, osgUtil::RenderBin::SORT_BY_STATE); + I_ConstructorWithDefaults2(IN, const osgUtil::RenderStage &, 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 *, className); + I_Method0(void, reset); + I_Method1(void, setViewport, IN, osg::Viewport *, viewport); + I_Method0(const osg::Viewport *, getViewport); + I_Method0(osg::Viewport *, getViewport); + I_Method1(void, setClearMask, IN, GLbitfield, mask); + I_Method0(GLbitfield, getClearMask); + I_Method1(void, setColorMask, IN, osg::ColorMask *, cm); + I_Method0(osg::ColorMask *, getColorMask); + I_Method0(const osg::ColorMask *, getColorMask); + I_Method1(void, setClearColor, IN, const osg::Vec4 &, color); + I_Method0(const osg::Vec4 &, getClearColor); + I_Method1(void, setClearAccum, IN, const osg::Vec4 &, color); + I_Method0(const osg::Vec4 &, getClearAccum); + I_Method1(void, setClearDepth, IN, double, depth); + I_Method0(double, getClearDepth); + I_Method1(void, setClearStencil, IN, int, stencil); + I_Method0(int, getClearStencil); + I_Method1(void, setRenderStageLighting, IN, osgUtil::RenderStageLighting *, rsl); + I_Method0(osgUtil::RenderStageLighting *, getRenderStageLighting); + I_Method2(void, addPositionedAttribute, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); + I_Method3(void, addPositionedTextureAttribute, IN, unsigned int, textureUnit, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); + I_Method2(void, drawPreRenderStages, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Method2(void, drawImplementation, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Method1(void, addToDependencyList, IN, osgUtil::RenderStage *, rs); + I_Method1(bool, getStats, IN, osgUtil::Statistics *, primStats); + I_Property(const osg::Vec4 &, ClearAccum); + I_Property(const osg::Vec4 &, ClearColor); + I_Property(double, ClearDepth); + I_Property(GLbitfield, ClearMask); + I_Property(int, ClearStencil); + I_Property(osg::ColorMask *, ColorMask); + I_Property(osgUtil::RenderStageLighting *, RenderStageLighting); + I_Property(osg::Viewport *, Viewport); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/RenderStageLighting.cpp b/src/osgWrappers/osgUtil/RenderStageLighting.cpp index cdc74c041..efed775d4 100644 --- a/src/osgWrappers/osgUtil/RenderStageLighting.cpp +++ b/src/osgWrappers/osgUtil/RenderStageLighting.cpp @@ -17,6 +17,14 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< const osg::StateAttribute > COMMA osg::ref_ptr< osg::RefMatrix > >, osgUtil::RenderStageLighting::AttrMatrixPair); TYPE_NAME_ALIAS(std::vector< osgUtil::RenderStageLighting::AttrMatrixPair >, osgUtil::RenderStageLighting::AttrMatrixList); @@ -24,41 +32,29 @@ TYPE_NAME_ALIAS(std::vector< osgUtil::RenderStageLighting::AttrMatrixPair >, osg TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgUtil::RenderStageLighting::AttrMatrixList >, osgUtil::RenderStageLighting::TexUnitAttrMatrixListMap); BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStageLighting) - BaseType(osg::Object); - Constructor0(); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(void, reset); - Method2(void, addPositionedAttribute, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); - Method3(void, addPositionedTextureAttribute, IN, unsigned int, textureUnit, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); - Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< const osg::StateAttribute >) - Constructor0(); - Constructor1(IN, const osg::StateAttribute *, t); - Constructor1(IN, const osg::ref_ptr< const osg::StateAttribute > &, rp); - Method0(bool, valid); - Method0(const osg::StateAttribute *, get); - Method0(const const osg::StateAttribute *, get); - Method0(const osg::StateAttribute *, take); - Method0(const osg::StateAttribute *, release); - ReadOnlyProperty(const osg::StateAttribute *, ); + I_BaseType(osg::Object); + I_Constructor0(); + 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(void, reset); + I_Method2(void, addPositionedAttribute, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); + I_Method3(void, addPositionedTextureAttribute, IN, unsigned int, textureUnit, IN, osg::RefMatrix *, matrix, IN, const osg::StateAttribute *, attr); + I_Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::RefMatrix >) - Constructor0(); - Constructor1(IN, osg::RefMatrix *, t); - Constructor1(IN, const osg::ref_ptr< osg::RefMatrix > &, rp); - Method0(bool, valid); - Method0(osg::RefMatrix *, get); - Method0(const osg::RefMatrix *, get); - Method0(osg::RefMatrix *, take); - Method0(osg::RefMatrix *, release); - ReadOnlyProperty(osg::RefMatrix *, ); + I_Constructor0(); + I_Constructor1(IN, osg::RefMatrix *, t); + I_Constructor1(IN, const osg::ref_ptr< osg::RefMatrix > &, rp); + I_Method0(bool, valid); + I_Method0(osg::RefMatrix *, get); + I_Method0(const osg::RefMatrix *, get); + I_Method0(osg::RefMatrix *, take); + I_Method0(osg::RefMatrix *, release); + I_ReadOnlyProperty(osg::RefMatrix *, ); END_REFLECTOR STD_MAP_REFLECTOR(std::map< unsigned int COMMA osgUtil::RenderStageLighting::AttrMatrixList >); diff --git a/src/osgWrappers/osgUtil/RenderToTextureStage.cpp b/src/osgWrappers/osgUtil/RenderToTextureStage.cpp index 9f9e9a444..b3825c631 100644 --- a/src/osgWrappers/osgUtil/RenderToTextureStage.cpp +++ b/src/osgWrappers/osgUtil/RenderToTextureStage.cpp @@ -17,27 +17,35 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgUtil::RenderToTextureStage) - BaseType(osgUtil::RenderStage); - Constructor0(); - Method0(osg::Object *, cloneType); - Method1(osg::Object *, clone, IN, const osg::CopyOp &, x); - Method1(bool, isSameKindAs, IN, const osg::Object *, obj); - Method0(const char *, libraryName); - Method0(const char *, className); - Method0(void, reset); - Method1(void, setTexture, IN, osg::Texture2D *, texture); - Method0(osg::Texture2D *, getTexture); - Method1(void, setImage, IN, osg::Image *, image); - Method0(osg::Image *, getImage); - Method1(void, setImageReadPixelFormat, IN, GLenum, format); - Method0(GLenum, getImageReadPixelFormat); - Method1(void, setImageReadPixelDataType, IN, GLenum, type); - Method0(GLenum, getImageReadPixelDataType); - Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); - Property(osg::Image *, Image); - Property(GLenum, ImageReadPixelDataType); - Property(GLenum, ImageReadPixelFormat); - Property(osg::Texture2D *, Texture); + I_BaseType(osgUtil::RenderStage); + I_Constructor0(); + 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(void, reset); + I_Method1(void, setTexture, IN, osg::Texture2D *, texture); + I_Method0(osg::Texture2D *, getTexture); + I_Method1(void, setImage, IN, osg::Image *, image); + I_Method0(osg::Image *, getImage); + I_Method1(void, setImageReadPixelFormat, IN, GLenum, format); + I_Method0(GLenum, getImageReadPixelFormat); + I_Method1(void, setImageReadPixelDataType, IN, GLenum, type); + I_Method0(GLenum, getImageReadPixelDataType); + I_Method2(void, draw, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); + I_Property(osg::Image *, Image); + I_Property(GLenum, ImageReadPixelDataType); + I_Property(GLenum, ImageReadPixelFormat); + I_Property(osg::Texture2D *, Texture); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index b4e53d809..98f218651 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -27,188 +27,196 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(osgUtil::SceneView::Options, osgUtil::SceneView::LightingMode); BEGIN_ENUM_REFLECTOR(osgUtil::SceneView::Options) - EnumLabel(osgUtil::SceneView::NO_SCENEVIEW_LIGHT); - EnumLabel(osgUtil::SceneView::HEADLIGHT); - EnumLabel(osgUtil::SceneView::SKY_LIGHT); - EnumLabel(osgUtil::SceneView::COMPILE_GLOBJECTS_AT_INIT); - EnumLabel(osgUtil::SceneView::STANDARD_SETTINGS); + I_EnumLabel(osgUtil::SceneView::NO_SCENEVIEW_LIGHT); + I_EnumLabel(osgUtil::SceneView::HEADLIGHT); + I_EnumLabel(osgUtil::SceneView::SKY_LIGHT); + I_EnumLabel(osgUtil::SceneView::COMPILE_GLOBJECTS_AT_INIT); + I_EnumLabel(osgUtil::SceneView::STANDARD_SETTINGS); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgUtil::SceneView::ActiveUniforms) - EnumLabel(osgUtil::SceneView::FRAME_NUMBER_UNIFORM); - EnumLabel(osgUtil::SceneView::FRAME_TIME_UNIFORM); - EnumLabel(osgUtil::SceneView::DELTA_FRAME_TIME_UNIFORM); - EnumLabel(osgUtil::SceneView::VIEW_MATRIX_UNIFORM); - EnumLabel(osgUtil::SceneView::INVERSE_VIEW_MATRIX_UNIFORM); - EnumLabel(osgUtil::SceneView::DEFAULT_UNIFORMS); - EnumLabel(osgUtil::SceneView::ALL_UNIFORMS); + I_EnumLabel(osgUtil::SceneView::FRAME_NUMBER_UNIFORM); + I_EnumLabel(osgUtil::SceneView::FRAME_TIME_UNIFORM); + I_EnumLabel(osgUtil::SceneView::DELTA_FRAME_TIME_UNIFORM); + I_EnumLabel(osgUtil::SceneView::VIEW_MATRIX_UNIFORM); + I_EnumLabel(osgUtil::SceneView::INVERSE_VIEW_MATRIX_UNIFORM); + I_EnumLabel(osgUtil::SceneView::DEFAULT_UNIFORMS); + I_EnumLabel(osgUtil::SceneView::ALL_UNIFORMS); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgUtil::SceneView::FusionDistanceMode) - EnumLabel(osgUtil::SceneView::USE_FUSION_DISTANCE_VALUE); - EnumLabel(osgUtil::SceneView::PROPORTIONAL_TO_SCREEN_DISTANCE); + I_EnumLabel(osgUtil::SceneView::USE_FUSION_DISTANCE_VALUE); + I_EnumLabel(osgUtil::SceneView::PROPORTIONAL_TO_SCREEN_DISTANCE); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) - BaseType(osg::Referenced); - BaseType(osg::CullSettings); - ConstructorWithDefaults1(IN, osg::DisplaySettings *, ds, NULL); - MethodWithDefaults1(void, setDefaults, IN, unsigned int, options, osgUtil::SceneView::STANDARD_SETTINGS); - Method1(void, setSceneData, IN, osg::Node *, node); - Method0(osg::Node *, getSceneData); - Method0(const osg::Node *, getSceneData); - Method1(void, setViewport, IN, osg::Viewport *, viewport); - Method4(void, setViewport, IN, int, x, IN, int, y, IN, int, width, IN, int, height); - Method0(const osg::Viewport *, getViewport); - Method0(osg::Viewport *, getViewport); - Method4(void, getViewport, IN, int &, x, IN, int &, y, IN, int &, width, IN, int &, height); - Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, vs); - Method0(const osg::DisplaySettings *, getDisplaySettings); - Method0(osg::DisplaySettings *, getDisplaySettings); - Method1(void, setClearColor, IN, const osg::Vec4 &, color); - Method0(const osg::Vec4 &, getClearColor); - Method1(void, setGlobalStateSet, IN, osg::StateSet *, state); - Method0(osg::StateSet *, getGlobalStateSet); - Method0(const osg::StateSet *, getGlobalStateSet); - Method1(void, setLocalStateSet, IN, osg::StateSet *, state); - Method0(osg::StateSet *, getLocalStateSet); - Method0(const osg::StateSet *, getLocalStateSet); - Method1(void, setActiveUniforms, IN, int, activeUniforms); - Method1(int, getActiveUniforms, IN, int, activeUniforms); - Method0(void, updateUniforms); - Method1(void, setLightingMode, IN, osgUtil::SceneView::LightingMode, mode); - Method0(osgUtil::SceneView::LightingMode, getLightingMode); - Method1(void, setLight, IN, osg::Light *, light); - Method0(osg::Light *, getLight); - Method0(const osg::Light *, getLight); - Method1(void, setState, IN, osg::State *, state); - Method0(osg::State *, getState); - Method0(const osg::State *, getState); - Method1(void, setProjectionMatrix, IN, const osg::Matrixf &, matrix); - Method1(void, setProjectionMatrix, IN, const osg::Matrixd &, matrix); - Method6(void, setProjectionMatrixAsOrtho, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - Method4(void, setProjectionMatrixAsOrtho2D, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top); - Method6(void, setProjectionMatrixAsFrustum, IN, double, left, IN, double, right, IN, double, bottom, IN, double, top, IN, double, zNear, IN, double, zFar); - Method4(void, setProjectionMatrixAsPerspective, IN, double, fovy, IN, double, aspectRatio, IN, double, zNear, IN, double, zFar); - Method0(osg::Matrixd &, getProjectionMatrix); - Method0(const osg::Matrixd &, getProjectionMatrix); - Method6(bool, getProjectionMatrixAsOrtho, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - Method6(bool, getProjectionMatrixAsFrustum, IN, double &, left, IN, double &, right, IN, double &, bottom, IN, double &, top, IN, double &, zNear, IN, double &, zFar); - Method4(bool, getProjectionMatrixAsPerspective, IN, double &, fovy, IN, double &, aspectRatio, IN, double &, zNear, IN, double &, zFar); - Method1(void, setViewMatrix, IN, const osg::Matrixf &, matrix); - Method1(void, setViewMatrix, IN, const osg::Matrixd &, matrix); - Method3(void, setViewMatrixAsLookAt, IN, const osg::Vec3 &, eye, IN, const osg::Vec3 &, center, IN, const osg::Vec3 &, up); - Method0(osg::Matrixd &, getViewMatrix); - Method0(const osg::Matrixd &, getViewMatrix); - MethodWithDefaults4(void, getViewMatrixAsLookAt, IN, osg::Vec3 &, eye, , IN, osg::Vec3 &, center, , IN, osg::Vec3 &, up, , IN, float, lookDistance, 1.0f); - Method1(void, setInitVisitor, IN, osg::NodeVisitor *, av); - Method0(osg::NodeVisitor *, getInitVisitor); - Method0(const osg::NodeVisitor *, getInitVisitor); - Method1(void, setUpdateVisitor, IN, osg::NodeVisitor *, av); - Method0(osg::NodeVisitor *, getUpdateVisitor); - Method0(const osg::NodeVisitor *, getUpdateVisitor); - Method1(void, setCullVisitor, IN, osgUtil::CullVisitor *, cv); - Method0(osgUtil::CullVisitor *, getCullVisitor); - Method0(const osgUtil::CullVisitor *, getCullVisitor); - Method1(void, setCullVisitorLeft, IN, osgUtil::CullVisitor *, cv); - Method0(osgUtil::CullVisitor *, getCullVisitorLeft); - Method0(const osgUtil::CullVisitor *, getCullVisitorLeft); - Method1(void, setCullVisitorRight, IN, osgUtil::CullVisitor *, cv); - Method0(osgUtil::CullVisitor *, getCullVisitorRight); - Method0(const osgUtil::CullVisitor *, getCullVisitorRight); - Method1(void, setCollectOccludersVisitor, IN, osg::CollectOccludersVisitor *, cov); - Method0(osg::CollectOccludersVisitor *, getCollectOccludersVisitor); - Method0(const osg::CollectOccludersVisitor *, getCollectOccludersVisitor); - Method1(void, setRenderGraph, IN, osgUtil::RenderGraph *, rg); - Method0(osgUtil::RenderGraph *, getRenderGraph); - Method0(const osgUtil::RenderGraph *, getRenderGraph); - Method1(void, setRenderGraphLeft, IN, osgUtil::RenderGraph *, rg); - Method0(osgUtil::RenderGraph *, getRenderGraphLeft); - Method0(const osgUtil::RenderGraph *, getRenderGraphLeft); - Method1(void, setRenderGraphRight, IN, osgUtil::RenderGraph *, rg); - Method0(osgUtil::RenderGraph *, getRenderGraphRight); - Method0(const osgUtil::RenderGraph *, getRenderGraphRight); - Method1(void, setRenderStage, IN, osgUtil::RenderStage *, rs); - Method0(osgUtil::RenderStage *, getRenderStage); - Method0(const osgUtil::RenderStage *, getRenderStage); - Method1(void, setRenderStageLeft, IN, osgUtil::RenderStage *, rs); - Method0(osgUtil::RenderStage *, getRenderStageLeft); - Method0(const osgUtil::RenderStage *, getRenderStageLeft); - Method1(void, setRenderStageRight, IN, osgUtil::RenderStage *, rs); - Method0(osgUtil::RenderStage *, getRenderStageRight); - Method0(const osgUtil::RenderStage *, getRenderStageRight); - Method1(void, setDrawBufferValue, IN, GLenum, drawBufferValue); - Method0(GLenum, getDrawBufferValue); - MethodWithDefaults2(void, setFusionDistance, IN, osgUtil::SceneView::FusionDistanceMode, mode, , IN, float, value, 1.0f); - Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); - Method0(float, getFusionDistanceValue); - Method1(void, setPrioritizeTextures, IN, bool, pt); - Method0(bool, getPrioritizeTextures); - Method1(void, setComputeStereoMatricesCallback, IN, osgUtil::SceneView::ComputeStereoMatricesCallback *, callback); - Method0(osgUtil::SceneView::ComputeStereoMatricesCallback *, getComputeStereoMatricesCallback); - Method0(const osgUtil::SceneView::ComputeStereoMatricesCallback *, getComputeStereoMatricesCallback); - Method2(bool, projectWindowIntoObject, IN, const osg::Vec3 &, window, IN, osg::Vec3 &, object); - Method4(bool, projectWindowXYIntoObject, IN, int, x, IN, int, y, IN, osg::Vec3 &, near_point, IN, osg::Vec3 &, far_point); - Method2(bool, projectObjectIntoWindow, IN, const osg::Vec3 &, object, IN, osg::Vec3 &, window); - Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs); - Method0(const osg::FrameStamp *, getFrameStamp); - Method1(osg::Matrixd, computeLeftEyeProjection, IN, const osg::Matrixd &, projection); - Method1(osg::Matrixd, computeLeftEyeView, IN, const osg::Matrixd &, view); - Method1(osg::Matrixd, computeRightEyeProjection, IN, const osg::Matrixd &, projection); - Method1(osg::Matrixd, computeRightEyeView, IN, const osg::Matrixd &, view); - Method1(osg::Matrixd, computeLeftEyeProjectionImplementation, IN, const osg::Matrixd &, projection); - Method1(osg::Matrixd, computeLeftEyeViewImplementation, IN, const osg::Matrixd &, view); - Method1(osg::Matrixd, computeRightEyeProjectionImplementation, IN, const osg::Matrixd &, projection); - Method1(osg::Matrixd, computeRightEyeViewImplementation, IN, const osg::Matrixd &, view); - Method0(void, init); - Method0(void, update); - Method0(void, cull); - Method0(void, draw); - Method0(void, releaseAllGLObjects); - Method0(void, flushAllDeletedGLObjects); - Method1(void, flushDeletedGLObjects, IN, double &, availableTime); - WriteOnlyProperty(int, ActiveUniforms); - Property(const osg::Vec4 &, ClearColor); - Property(osg::CollectOccludersVisitor *, CollectOccludersVisitor); - Property(osgUtil::SceneView::ComputeStereoMatricesCallback *, ComputeStereoMatricesCallback); - Property(osgUtil::CullVisitor *, CullVisitor); - Property(osgUtil::CullVisitor *, CullVisitorLeft); - Property(osgUtil::CullVisitor *, CullVisitorRight); - WriteOnlyProperty(unsigned int, Defaults); - Property(osg::DisplaySettings *, DisplaySettings); - Property(GLenum, DrawBufferValue); - WriteOnlyProperty(osg::FrameStamp *, FrameStamp); - ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); - ReadOnlyProperty(float, FusionDistanceValue); - Property(osg::StateSet *, GlobalStateSet); - Property(osg::NodeVisitor *, InitVisitor); - Property(osg::Light *, Light); - Property(osgUtil::SceneView::LightingMode, LightingMode); - Property(osg::StateSet *, LocalStateSet); - Property(bool, PrioritizeTextures); - Property(const osg::Matrixd &, ProjectionMatrix); - Property(osgUtil::RenderGraph *, RenderGraph); - Property(osgUtil::RenderGraph *, RenderGraphLeft); - Property(osgUtil::RenderGraph *, RenderGraphRight); - Property(osgUtil::RenderStage *, RenderStage); - Property(osgUtil::RenderStage *, RenderStageLeft); - Property(osgUtil::RenderStage *, RenderStageRight); - Property(osg::Node *, SceneData); - Property(osg::State *, State); - Property(osg::NodeVisitor *, UpdateVisitor); - Property(const osg::Matrixd &, ViewMatrix); - Property(osg::Viewport *, Viewport); + I_BaseType(osg::Referenced); + I_BaseType(osg::CullSettings); + I_ConstructorWithDefaults1(IN, osg::DisplaySettings *, ds, NULL); + I_MethodWithDefaults1(void, setDefaults, IN, unsigned int, options, osgUtil::SceneView::STANDARD_SETTINGS); + I_Method1(void, setSceneData, IN, osg::Node *, node); + I_Method0(osg::Node *, getSceneData); + I_Method0(const osg::Node *, getSceneData); + I_Method1(void, setViewport, IN, osg::Viewport *, viewport); + I_Method4(void, setViewport, IN, int, x, IN, int, y, IN, int, width, IN, int, height); + I_Method0(const osg::Viewport *, getViewport); + I_Method0(osg::Viewport *, getViewport); + I_Method4(void, getViewport, IN, int &, x, IN, int &, y, IN, int &, width, IN, int &, height); + I_Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, vs); + I_Method0(const osg::DisplaySettings *, getDisplaySettings); + I_Method0(osg::DisplaySettings *, getDisplaySettings); + I_Method1(void, setClearColor, IN, const osg::Vec4 &, color); + I_Method0(const osg::Vec4 &, getClearColor); + I_Method1(void, setGlobalStateSet, IN, osg::StateSet *, state); + I_Method0(osg::StateSet *, getGlobalStateSet); + I_Method0(const osg::StateSet *, getGlobalStateSet); + I_Method1(void, setLocalStateSet, IN, osg::StateSet *, state); + I_Method0(osg::StateSet *, getLocalStateSet); + I_Method0(const osg::StateSet *, getLocalStateSet); + I_Method1(void, setActiveUniforms, IN, int, activeUniforms); + I_Method1(int, getActiveUniforms, IN, int, activeUniforms); + I_Method0(void, updateUniforms); + I_Method1(void, setLightingMode, IN, osgUtil::SceneView::LightingMode, mode); + I_Method0(osgUtil::SceneView::LightingMode, getLightingMode); + I_Method1(void, setLight, IN, osg::Light *, light); + I_Method0(osg::Light *, getLight); + I_Method0(const osg::Light *, getLight); + I_Method1(void, setState, IN, osg::State *, state); + I_Method0(osg::State *, getState); + I_Method0(const osg::State *, getState); + 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_Method1(void, setInitVisitor, IN, osg::NodeVisitor *, av); + I_Method0(osg::NodeVisitor *, getInitVisitor); + I_Method0(const osg::NodeVisitor *, getInitVisitor); + I_Method1(void, setUpdateVisitor, IN, osg::NodeVisitor *, av); + I_Method0(osg::NodeVisitor *, getUpdateVisitor); + I_Method0(const osg::NodeVisitor *, getUpdateVisitor); + I_Method1(void, setCullVisitor, IN, osgUtil::CullVisitor *, cv); + I_Method0(osgUtil::CullVisitor *, getCullVisitor); + I_Method0(const osgUtil::CullVisitor *, getCullVisitor); + I_Method1(void, setCullVisitorLeft, IN, osgUtil::CullVisitor *, cv); + I_Method0(osgUtil::CullVisitor *, getCullVisitorLeft); + I_Method0(const osgUtil::CullVisitor *, getCullVisitorLeft); + I_Method1(void, setCullVisitorRight, IN, osgUtil::CullVisitor *, cv); + I_Method0(osgUtil::CullVisitor *, getCullVisitorRight); + I_Method0(const osgUtil::CullVisitor *, getCullVisitorRight); + I_Method1(void, setCollectOccludersVisitor, IN, osg::CollectOccludersVisitor *, cov); + I_Method0(osg::CollectOccludersVisitor *, getCollectOccludersVisitor); + I_Method0(const osg::CollectOccludersVisitor *, getCollectOccludersVisitor); + I_Method1(void, setRenderGraph, IN, osgUtil::RenderGraph *, rg); + I_Method0(osgUtil::RenderGraph *, getRenderGraph); + I_Method0(const osgUtil::RenderGraph *, getRenderGraph); + I_Method1(void, setRenderGraphLeft, IN, osgUtil::RenderGraph *, rg); + I_Method0(osgUtil::RenderGraph *, getRenderGraphLeft); + I_Method0(const osgUtil::RenderGraph *, getRenderGraphLeft); + I_Method1(void, setRenderGraphRight, IN, osgUtil::RenderGraph *, rg); + I_Method0(osgUtil::RenderGraph *, getRenderGraphRight); + I_Method0(const osgUtil::RenderGraph *, getRenderGraphRight); + I_Method1(void, setRenderStage, IN, osgUtil::RenderStage *, rs); + I_Method0(osgUtil::RenderStage *, getRenderStage); + I_Method0(const osgUtil::RenderStage *, getRenderStage); + I_Method1(void, setRenderStageLeft, IN, osgUtil::RenderStage *, rs); + I_Method0(osgUtil::RenderStage *, getRenderStageLeft); + I_Method0(const osgUtil::RenderStage *, getRenderStageLeft); + I_Method1(void, setRenderStageRight, IN, osgUtil::RenderStage *, rs); + I_Method0(osgUtil::RenderStage *, getRenderStageRight); + I_Method0(const osgUtil::RenderStage *, getRenderStageRight); + I_Method1(void, setDrawBufferValue, IN, GLenum, drawBufferValue); + I_Method0(GLenum, getDrawBufferValue); + I_MethodWithDefaults2(void, setFusionDistance, IN, osgUtil::SceneView::FusionDistanceMode, mode, , IN, float, value, 1.0f); + I_Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode); + I_Method0(float, getFusionDistanceValue); + I_Method1(void, setPrioritizeTextures, IN, bool, pt); + I_Method0(bool, getPrioritizeTextures); + I_Method1(void, setComputeStereoMatricesCallback, IN, osgUtil::SceneView::ComputeStereoMatricesCallback *, callback); + I_Method0(osgUtil::SceneView::ComputeStereoMatricesCallback *, getComputeStereoMatricesCallback); + I_Method0(const osgUtil::SceneView::ComputeStereoMatricesCallback *, getComputeStereoMatricesCallback); + I_Method2(bool, projectWindowIntoObject, IN, const osg::Vec3 &, window, IN, osg::Vec3 &, object); + I_Method4(bool, projectWindowXYIntoObject, IN, int, x, IN, int, y, IN, osg::Vec3 &, near_point, IN, osg::Vec3 &, far_point); + I_Method2(bool, projectObjectIntoWindow, IN, const osg::Vec3 &, object, IN, osg::Vec3 &, window); + I_Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs); + I_Method0(const osg::FrameStamp *, getFrameStamp); + I_Method1(osg::Matrixd, computeLeftEyeProjection, IN, const osg::Matrixd &, projection); + I_Method1(osg::Matrixd, computeLeftEyeView, IN, const osg::Matrixd &, view); + I_Method1(osg::Matrixd, computeRightEyeProjection, IN, const osg::Matrixd &, projection); + I_Method1(osg::Matrixd, computeRightEyeView, IN, const osg::Matrixd &, view); + I_Method1(osg::Matrixd, computeLeftEyeProjectionImplementation, IN, const osg::Matrixd &, projection); + I_Method1(osg::Matrixd, computeLeftEyeViewImplementation, IN, const osg::Matrixd &, view); + I_Method1(osg::Matrixd, computeRightEyeProjectionImplementation, IN, const osg::Matrixd &, projection); + I_Method1(osg::Matrixd, computeRightEyeViewImplementation, IN, const osg::Matrixd &, view); + I_Method0(void, init); + I_Method0(void, update); + I_Method0(void, cull); + I_Method0(void, draw); + I_Method0(void, releaseAllGLObjects); + I_Method0(void, flushAllDeletedGLObjects); + I_Method1(void, flushDeletedGLObjects, IN, double &, availableTime); + I_WriteOnlyProperty(int, ActiveUniforms); + I_Property(const osg::Vec4 &, ClearColor); + I_Property(osg::CollectOccludersVisitor *, CollectOccludersVisitor); + I_Property(osgUtil::SceneView::ComputeStereoMatricesCallback *, ComputeStereoMatricesCallback); + I_Property(osgUtil::CullVisitor *, CullVisitor); + I_Property(osgUtil::CullVisitor *, CullVisitorLeft); + I_Property(osgUtil::CullVisitor *, CullVisitorRight); + I_WriteOnlyProperty(unsigned int, Defaults); + I_Property(osg::DisplaySettings *, DisplaySettings); + I_Property(GLenum, DrawBufferValue); + I_WriteOnlyProperty(osg::FrameStamp *, FrameStamp); + I_ReadOnlyProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode); + I_ReadOnlyProperty(float, FusionDistanceValue); + I_Property(osg::StateSet *, GlobalStateSet); + I_Property(osg::NodeVisitor *, InitVisitor); + I_Property(osg::Light *, Light); + I_Property(osgUtil::SceneView::LightingMode, LightingMode); + I_Property(osg::StateSet *, LocalStateSet); + I_Property(bool, PrioritizeTextures); + I_Property(const osg::Matrixd &, ProjectionMatrix); + I_Property(osgUtil::RenderGraph *, RenderGraph); + I_Property(osgUtil::RenderGraph *, RenderGraphLeft); + I_Property(osgUtil::RenderGraph *, RenderGraphRight); + I_Property(osgUtil::RenderStage *, RenderStage); + I_Property(osgUtil::RenderStage *, RenderStageLeft); + I_Property(osgUtil::RenderStage *, RenderStageRight); + I_Property(osg::Node *, SceneData); + I_Property(osg::State *, State); + I_Property(osg::NodeVisitor *, UpdateVisitor); + I_Property(const osg::Matrixd &, ViewMatrix); + I_Property(osg::Viewport *, Viewport); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::SceneView::ComputeStereoMatricesCallback) - BaseType(osg::Referenced); - Constructor0(); - Method1(osg::Matrixd, computeLeftEyeProjection, IN, const osg::Matrixd &, projection); - Method1(osg::Matrixd, computeLeftEyeView, IN, const osg::Matrixd &, view); - Method1(osg::Matrixd, computeRightEyeProjection, IN, const osg::Matrixd &, projection); - Method1(osg::Matrixd, computeRightEyeView, IN, const osg::Matrixd &, view); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method1(osg::Matrixd, computeLeftEyeProjection, IN, const osg::Matrixd &, projection); + I_Method1(osg::Matrixd, computeLeftEyeView, IN, const osg::Matrixd &, view); + I_Method1(osg::Matrixd, computeRightEyeProjection, IN, const osg::Matrixd &, projection); + I_Method1(osg::Matrixd, computeRightEyeView, IN, const osg::Matrixd &, view); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/Simplifier.cpp b/src/osgWrappers/osgUtil/Simplifier.cpp index 7a50f7246..5a9fb42e1 100644 --- a/src/osgWrappers/osgUtil/Simplifier.cpp +++ b/src/osgWrappers/osgUtil/Simplifier.cpp @@ -13,31 +13,39 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< unsigned int >, osgUtil::Simplifier::IndexList); -BEGIN_VALUE_REFLECTOR(osgUtil::Simplifier) - BaseType(osg::NodeVisitor); - ConstructorWithDefaults2(IN, float, sampleRatio, 1.0f, IN, float, maximumError, 0.0f); - Method1(void, setSampleRatio, IN, float, sampleRatio); - Method0(float, getSampleRatio); - Method1(void, setMaximumError, IN, float, error); - Method0(float, getMaximumError); - Method1(void, setContinueSimplificationCallback, IN, osgUtil::Simplifier::ContinueSimplificationCallback *, cb); - Method0(osgUtil::Simplifier::ContinueSimplificationCallback *, getContinueSimplificationCallback); - Method0(const osgUtil::Simplifier::ContinueSimplificationCallback *, getContinueSimplificationCallback); - Method3(bool, continueSimplification, IN, float, nextError, IN, unsigned int, numOriginalPrimitives, IN, unsigned int, numRemainingPrimitives); - Method3(bool, continueSimplificationImplementation, IN, float, nextError, IN, unsigned int, numOriginalPrimitives, IN, unsigned int, numRemainingPrimitives); - Method1(void, apply, IN, osg::Geode &, geode); - Method1(void, simplify, IN, osg::Geometry &, geometry); - Method2(void, simplify, IN, osg::Geometry &, geometry, IN, const osgUtil::Simplifier::IndexList &, protectedPoints); - Property(osgUtil::Simplifier::ContinueSimplificationCallback *, ContinueSimplificationCallback); - Property(float, MaximumError); - Property(float, SampleRatio); +BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier) + I_BaseType(osg::NodeVisitor); + I_ConstructorWithDefaults2(IN, float, sampleRatio, 1.0f, IN, float, maximumError, 0.0f); + I_Method1(void, setSampleRatio, IN, float, sampleRatio); + I_Method0(float, getSampleRatio); + I_Method1(void, setMaximumError, IN, float, error); + I_Method0(float, getMaximumError); + I_Method1(void, setContinueSimplificationCallback, IN, osgUtil::Simplifier::ContinueSimplificationCallback *, cb); + I_Method0(osgUtil::Simplifier::ContinueSimplificationCallback *, getContinueSimplificationCallback); + I_Method0(const osgUtil::Simplifier::ContinueSimplificationCallback *, getContinueSimplificationCallback); + I_Method3(bool, continueSimplification, IN, float, nextError, IN, unsigned int, numOriginalPrimitives, IN, unsigned int, numRemainingPrimitives); + I_Method3(bool, continueSimplificationImplementation, IN, float, nextError, IN, unsigned int, numOriginalPrimitives, IN, unsigned int, numRemainingPrimitives); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_Method1(void, simplify, IN, osg::Geometry &, geometry); + I_Method2(void, simplify, IN, osg::Geometry &, geometry, IN, const osgUtil::Simplifier::IndexList &, protectedPoints); + I_Property(osgUtil::Simplifier::ContinueSimplificationCallback *, ContinueSimplificationCallback); + I_Property(float, MaximumError); + I_Property(float, SampleRatio); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier::ContinueSimplificationCallback) - BaseType(osg::Referenced); - Constructor0(); - Method4(bool, continueSimplification, IN, const osgUtil::Simplifier &, simplifier, IN, float, nextError, IN, unsigned int, numOriginalPrimitives, IN, unsigned int, numRemainingPrimitives); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method4(bool, continueSimplification, IN, const osgUtil::Simplifier &, simplifier, IN, float, nextError, IN, unsigned int, numOriginalPrimitives, IN, unsigned int, numRemainingPrimitives); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/SmoothingVisitor.cpp b/src/osgWrappers/osgUtil/SmoothingVisitor.cpp index d10f3802b..a1bc1d08f 100644 --- a/src/osgWrappers/osgUtil/SmoothingVisitor.cpp +++ b/src/osgWrappers/osgUtil/SmoothingVisitor.cpp @@ -12,9 +12,17 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgUtil::SmoothingVisitor) - BaseType(osg::NodeVisitor); - Constructor0(); - Method1(void, apply, IN, osg::Geode &, geode); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgUtil::SmoothingVisitor) + I_BaseType(osg::NodeVisitor); + I_Constructor0(); + I_Method1(void, apply, IN, osg::Geode &, geode); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index 9036d436a..d8b4ae6d4 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -14,6 +14,14 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::pair< unsigned int COMMA unsigned int >, osgUtil::Statistics::PrimitivePair); TYPE_NAME_ALIAS(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >, osgUtil::Statistics::PrimtiveValueMap); @@ -21,51 +29,51 @@ TYPE_NAME_ALIAS(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >, os TYPE_NAME_ALIAS(std::map< GLenum COMMA unsigned int >, osgUtil::Statistics::PrimtiveCountMap); BEGIN_ENUM_REFLECTOR(osgUtil::Statistics::statsType) - EnumLabel(osgUtil::Statistics::STAT_NONE); - EnumLabel(osgUtil::Statistics::STAT_FRAMERATE); - EnumLabel(osgUtil::Statistics::STAT_GRAPHS); - EnumLabel(osgUtil::Statistics::STAT_PRIMS); - EnumLabel(osgUtil::Statistics::STAT_PRIMSPERVIEW); - EnumLabel(osgUtil::Statistics::STAT_PRIMSPERBIN); - EnumLabel(osgUtil::Statistics::STAT_DC); - EnumLabel(osgUtil::Statistics::STAT_RESTART); + I_EnumLabel(osgUtil::Statistics::STAT_NONE); + I_EnumLabel(osgUtil::Statistics::STAT_FRAMERATE); + I_EnumLabel(osgUtil::Statistics::STAT_GRAPHS); + I_EnumLabel(osgUtil::Statistics::STAT_PRIMS); + I_EnumLabel(osgUtil::Statistics::STAT_PRIMSPERVIEW); + I_EnumLabel(osgUtil::Statistics::STAT_PRIMSPERBIN); + I_EnumLabel(osgUtil::Statistics::STAT_DC); + I_EnumLabel(osgUtil::Statistics::STAT_RESTART); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::Statistics) - BaseType(osg::PrimitiveFunctor); - Constructor0(); - Method0(void, reset); - Method1(void, setType, IN, osgUtil::Statistics::statsType, t); - Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3 *, x); - Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2 *, x); - Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4 *, x); - Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, x, IN, GLsizei, count); - Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLubyte *, x); - Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLushort *, x); - Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLuint *, x); - Method1(void, begin, IN, GLenum, mode); - Method0(void, vertex); - Method3(void, vertex, IN, float, x, IN, float, x, IN, float, x); - Method1(void, vertex, IN, const osg::Vec3 &, x); - Method1(void, vertex, IN, const osg::Vec2 &, x); - Method1(void, vertex, IN, const osg::Vec4 &, x); - Method2(void, vertex, IN, float, x, IN, float, x); - Method4(void, vertex, IN, float, x, IN, float, x, IN, float, x, IN, float, x); - Method0(void, end); - Method0(void, addDrawable); - Method0(void, addMatrix); - Method1(void, addLight, IN, int, np); - Method1(void, addImpostor, IN, int, np); - Method0(int, getBins); - Method1(void, setDepth, IN, int, d); - Method1(void, addBins, IN, int, np); - Method1(void, setBinNo, IN, int, n); - Method0(PrimtiveCountMap::iterator, GetPrimitivesBegin); - Method0(PrimtiveCountMap::iterator, GetPrimitivesEnd); - WriteOnlyProperty(int, BinNo); - ReadOnlyProperty(int, Bins); - WriteOnlyProperty(int, Depth); - WriteOnlyProperty(osgUtil::Statistics::statsType, Type); +BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics) + I_BaseType(osg::PrimitiveFunctor); + I_Constructor0(); + I_Method0(void, reset); + I_Method1(void, setType, IN, osgUtil::Statistics::statsType, t); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3 *, x); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2 *, x); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4 *, x); + I_Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, x, IN, GLsizei, count); + I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLubyte *, x); + I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLushort *, x); + I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLuint *, x); + I_Method1(void, begin, IN, GLenum, mode); + I_Method0(void, vertex); + I_Method3(void, vertex, IN, float, x, IN, float, x, IN, float, x); + I_Method1(void, vertex, IN, const osg::Vec3 &, x); + I_Method1(void, vertex, IN, const osg::Vec2 &, x); + I_Method1(void, vertex, IN, const osg::Vec4 &, x); + I_Method2(void, vertex, IN, float, x, IN, float, x); + I_Method4(void, vertex, IN, float, x, IN, float, x, IN, float, x, IN, float, x); + I_Method0(void, end); + I_Method0(void, addDrawable); + I_Method0(void, addMatrix); + I_Method1(void, addLight, IN, int, np); + I_Method1(void, addImpostor, IN, int, np); + I_Method0(int, getBins); + I_Method1(void, setDepth, IN, int, d); + I_Method1(void, addBins, IN, int, np); + I_Method1(void, setBinNo, IN, int, n); + I_Method0(osgUtil::Statistics::PrimtiveCountMap::iterator, GetPrimitivesBegin); + I_Method0(osgUtil::Statistics::PrimtiveCountMap::iterator, GetPrimitivesEnd); + I_WriteOnlyProperty(int, BinNo); + I_ReadOnlyProperty(int, Bins); + I_WriteOnlyProperty(int, Depth); + I_WriteOnlyProperty(osgUtil::Statistics::statsType, Type); END_REFLECTOR STD_MAP_REFLECTOR(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >); diff --git a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp index 329ac641a..b05bf4891 100644 --- a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp +++ b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp @@ -14,24 +14,32 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + BEGIN_OBJECT_REFLECTOR(osgUtil::TangentSpaceGenerator) - BaseType(osg::Referenced); - Constructor0(); - ConstructorWithDefaults2(IN, const osgUtil::TangentSpaceGenerator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); - MethodWithDefaults2(void, generate, IN, osg::Geometry *, geo, , IN, int, normal_map_tex_unit, 0); - Method0(osg::Vec4Array *, getTangentArray); - Method0(const osg::Vec4Array *, getTangentArray); - Method1(void, setTangentArray, IN, osg::Vec4Array *, array); - Method0(osg::Vec4Array *, getNormalArray); - Method0(const osg::Vec4Array *, getNormalArray); - Method1(void, setNormalArray, IN, osg::Vec4Array *, array); - Method0(osg::Vec4Array *, getBinormalArray); - Method0(const osg::Vec4Array *, getBinormalArray); - Method1(void, setBinormalArray, IN, osg::Vec4Array *, array); - Method0(osg::IndexArray *, getIndices); - Property(osg::Vec4Array *, BinormalArray); - ReadOnlyProperty(osg::IndexArray *, Indices); - Property(osg::Vec4Array *, NormalArray); - Property(osg::Vec4Array *, TangentArray); + I_BaseType(osg::Referenced); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgUtil::TangentSpaceGenerator &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_MethodWithDefaults2(void, generate, IN, osg::Geometry *, geo, , IN, int, normal_map_tex_unit, 0); + I_Method0(osg::Vec4Array *, getTangentArray); + I_Method0(const osg::Vec4Array *, getTangentArray); + I_Method1(void, setTangentArray, IN, osg::Vec4Array *, array); + I_Method0(osg::Vec4Array *, getNormalArray); + I_Method0(const osg::Vec4Array *, getNormalArray); + I_Method1(void, setNormalArray, IN, osg::Vec4Array *, array); + I_Method0(osg::Vec4Array *, getBinormalArray); + I_Method0(const osg::Vec4Array *, getBinormalArray); + I_Method1(void, setBinormalArray, IN, osg::Vec4Array *, array); + I_Method0(osg::IndexArray *, getIndices); + I_Property(osg::Vec4Array *, BinormalArray); + I_ReadOnlyProperty(osg::IndexArray *, Indices); + I_Property(osg::Vec4Array *, NormalArray); + I_Property(osg::Vec4Array *, TangentArray); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/Tesselator.cpp b/src/osgWrappers/osgUtil/Tesselator.cpp index 79fe2cb5d..d7941ae60 100644 --- a/src/osgWrappers/osgUtil/Tesselator.cpp +++ b/src/osgWrappers/osgUtil/Tesselator.cpp @@ -13,66 +13,74 @@ #include #include +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tesselator::VertexPointList); TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::Tesselator::Prim > >, osgUtil::Tesselator::PrimList); BEGIN_ENUM_REFLECTOR(osgUtil::Tesselator::WindingType) - EnumLabel(osgUtil::Tesselator::TESS_WINDING_ODD); - EnumLabel(osgUtil::Tesselator::TESS_WINDING_NONZERO); - EnumLabel(osgUtil::Tesselator::TESS_WINDING_POSITIVE); - EnumLabel(osgUtil::Tesselator::TESS_WINDING_NEGATIVE); - EnumLabel(osgUtil::Tesselator::TESS_WINDING_ABS_GEQ_TWO); + I_EnumLabel(osgUtil::Tesselator::TESS_WINDING_ODD); + I_EnumLabel(osgUtil::Tesselator::TESS_WINDING_NONZERO); + I_EnumLabel(osgUtil::Tesselator::TESS_WINDING_POSITIVE); + I_EnumLabel(osgUtil::Tesselator::TESS_WINDING_NEGATIVE); + I_EnumLabel(osgUtil::Tesselator::TESS_WINDING_ABS_GEQ_TWO); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgUtil::Tesselator::TesselationType) - EnumLabel(osgUtil::Tesselator::TESS_TYPE_GEOMETRY); - EnumLabel(osgUtil::Tesselator::TESS_TYPE_DRAWABLE); - EnumLabel(osgUtil::Tesselator::TESS_TYPE_POLYGONS); + I_EnumLabel(osgUtil::Tesselator::TESS_TYPE_GEOMETRY); + I_EnumLabel(osgUtil::Tesselator::TESS_TYPE_DRAWABLE); + I_EnumLabel(osgUtil::Tesselator::TESS_TYPE_POLYGONS); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgUtil::Tesselator) - BaseType(osg::Referenced); - Constructor0(); - Method1(void, setBoundaryOnly, IN, const bool, tt); - Method0(const bool, getBoundaryOnly); - Method1(void, setWindingType, IN, const osgUtil::Tesselator::WindingType, wt); - Method0(const osgUtil::Tesselator::WindingType, getWindingType); - Method1(void, setTesselationType, IN, const osgUtil::Tesselator::TesselationType, tt); - Method0(const osgUtil::Tesselator::TesselationType, getTesselationType); - Method1(void, retesselatePolygons, IN, osg::Geometry &, cxgeom); - Method0(osg::Geometry::PrimitiveSetList, getContours); - Method0(void, beginTesselation); - Method0(void, beginContour); - Method1(void, addVertex, IN, osg::Vec3 *, vertex); - Method0(void, endContour); - Method0(void, endTesselation); - Method0(osgUtil::Tesselator::PrimList &, getPrimList); - Method0(void, reset); - Property(const bool, BoundaryOnly); - ReadOnlyProperty(osg::Geometry::PrimitiveSetList, Contours); - ReadOnlyProperty(osgUtil::Tesselator::PrimList &, PrimList); - Property(const osgUtil::Tesselator::TesselationType, TesselationType); - Property(const osgUtil::Tesselator::WindingType, WindingType); +BEGIN_OBJECT_REFLECTOR(osgUtil::Tesselator) + I_BaseType(osg::Referenced); + I_Constructor0(); + I_Method1(void, setBoundaryOnly, IN, const bool, tt); + I_Method0(const bool, getBoundaryOnly); + I_Method1(void, setWindingType, IN, const osgUtil::Tesselator::WindingType, wt); + I_Method0(const osgUtil::Tesselator::WindingType, getWindingType); + I_Method1(void, setTesselationType, IN, const osgUtil::Tesselator::TesselationType, tt); + I_Method0(const osgUtil::Tesselator::TesselationType, getTesselationType); + I_Method1(void, retesselatePolygons, IN, osg::Geometry &, cxgeom); + I_Method0(osg::Geometry::PrimitiveSetList, getContours); + I_Method0(void, beginTesselation); + I_Method0(void, beginContour); + I_Method1(void, addVertex, IN, osg::Vec3 *, vertex); + I_Method0(void, endContour); + I_Method0(void, endTesselation); + I_Method0(osgUtil::Tesselator::PrimList &, getPrimList); + I_Method0(void, reset); + I_Property(const bool, BoundaryOnly); + I_ReadOnlyProperty(osg::Geometry::PrimitiveSetList, Contours); + I_ReadOnlyProperty(osgUtil::Tesselator::PrimList &, PrimList); + I_Property(const osgUtil::Tesselator::TesselationType, TesselationType); + I_Property(const osgUtil::Tesselator::WindingType, WindingType); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tesselator::Prim::VecList); -BEGIN_VALUE_REFLECTOR(osgUtil::Tesselator::Prim) - BaseType(osg::Referenced); - Constructor1(IN, GLenum, mode); +BEGIN_OBJECT_REFLECTOR(osgUtil::Tesselator::Prim) + I_BaseType(osg::Referenced); + I_Constructor1(IN, GLenum, mode); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::Tesselator::Prim >) - Constructor0(); - Constructor1(IN, osgUtil::Tesselator::Prim *, t); - Constructor1(IN, const osg::ref_ptr< osgUtil::Tesselator::Prim > &, rp); - Method0(bool, valid); - Method0(osgUtil::Tesselator::Prim *, get); - Method0(const osgUtil::Tesselator::Prim *, get); - Method0(osgUtil::Tesselator::Prim *, take); - Method0(osgUtil::Tesselator::Prim *, release); - ReadOnlyProperty(osgUtil::Tesselator::Prim *, ); + I_Constructor0(); + I_Constructor1(IN, osgUtil::Tesselator::Prim *, t); + I_Constructor1(IN, const osg::ref_ptr< osgUtil::Tesselator::Prim > &, rp); + I_Method0(bool, valid); + I_Method0(osgUtil::Tesselator::Prim *, get); + I_Method0(const osgUtil::Tesselator::Prim *, get); + I_Method0(osgUtil::Tesselator::Prim *, take); + I_Method0(osgUtil::Tesselator::Prim *, release); + I_ReadOnlyProperty(osgUtil::Tesselator::Prim *, ); END_REFLECTOR STD_VECTOR_REFLECTOR(std::vector< osg::Vec3 * >); diff --git a/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp b/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp index e9b82fb3c..992e8db10 100644 --- a/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp +++ b/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp @@ -14,9 +14,17 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgUtil::TransformAttributeFunctor) - BaseType(osg::Drawable::AttributeFunctor); - Constructor1(IN, const osg::Matrix &, m); - Method3(void, apply, IN, osg::Drawable::AttributeType, type, IN, unsigned int, count, IN, osg::Vec3 *, begin); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgUtil::TransformAttributeFunctor) + I_BaseType(osg::Drawable::AttributeFunctor); + I_Constructor1(IN, const osg::Matrix &, m); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, type, IN, unsigned int, count, IN, osg::Vec3 *, begin); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/TransformCallback.cpp b/src/osgWrappers/osgUtil/TransformCallback.cpp index e1ee45425..2a88eba78 100644 --- a/src/osgWrappers/osgUtil/TransformCallback.cpp +++ b/src/osgWrappers/osgUtil/TransformCallback.cpp @@ -14,10 +14,18 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgUtil::TransformCallback) - BaseType(osg::NodeCallback); - Constructor3(IN, const osg::Vec3 &, pivot, IN, const osg::Vec3 &, axis, IN, float, angularVelocity); - Method1(void, setPause, IN, bool, pause); - WriteOnlyProperty(bool, Pause); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgUtil::TransformCallback) + I_BaseType(osg::NodeCallback); + I_Constructor3(IN, const osg::Vec3 &, pivot, IN, const osg::Vec3 &, axis, IN, float, angularVelocity); + I_Method1(void, setPause, IN, bool, pause); + I_WriteOnlyProperty(bool, Pause); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/TriStripVisitor.cpp b/src/osgWrappers/osgUtil/TriStripVisitor.cpp index 880ac71b7..6dbc7196f 100644 --- a/src/osgWrappers/osgUtil/TriStripVisitor.cpp +++ b/src/osgWrappers/osgUtil/TriStripVisitor.cpp @@ -14,22 +14,30 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgUtil::TriStripVisitor) - BaseType(osgUtil::BaseOptimizerVisitor); - ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); - Method1(void, stripify, IN, osg::Geometry &, drawable); - Method0(void, stripify); - Method1(void, apply, IN, osg::Geode &, geode); - Method1(void, setCacheSize, IN, unsigned int, size); - Method0(unsigned int, getCacheSize); - Method0(const unsigned int, getCacheSize); - Method1(void, setMinStripSize, IN, unsigned int, size); - Method0(unsigned int, getMinStripSize); - Method0(const unsigned int, getMinStripSize); - Method1(void, setGenerateFourPointPrimitivesQuads, IN, bool, flag); - Method0(bool, getGenerateFourPointPrimitivesQuads); - Property(unsigned int, CacheSize); - Property(bool, GenerateFourPointPrimitivesQuads); - Property(unsigned int, MinStripSize); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgUtil::TriStripVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method1(void, stripify, IN, osg::Geometry &, drawable); + I_Method0(void, stripify); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_Method1(void, setCacheSize, IN, unsigned int, size); + I_Method0(unsigned int, getCacheSize); + I_Method0(const unsigned int, getCacheSize); + I_Method1(void, setMinStripSize, IN, unsigned int, size); + I_Method0(unsigned int, getMinStripSize); + I_Method0(const unsigned int, getMinStripSize); + I_Method1(void, setGenerateFourPointPrimitivesQuads, IN, bool, flag); + I_Method0(bool, getGenerateFourPointPrimitivesQuads); + I_Property(unsigned int, CacheSize); + I_Property(bool, GenerateFourPointPrimitivesQuads); + I_Property(unsigned int, MinStripSize); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/UpdateVisitor.cpp b/src/osgWrappers/osgUtil/UpdateVisitor.cpp index c8e70ca6d..32718323e 100644 --- a/src/osgWrappers/osgUtil/UpdateVisitor.cpp +++ b/src/osgWrappers/osgUtil/UpdateVisitor.cpp @@ -21,19 +21,27 @@ #include #include -BEGIN_VALUE_REFLECTOR(osgUtil::UpdateVisitor) - BaseType(osg::NodeVisitor); - Constructor0(); - Method0(void, reset); - Method1(void, apply, IN, osg::Node &, node); - Method1(void, apply, IN, osg::Geode &, node); - Method1(void, apply, IN, osg::Billboard &, node); - Method1(void, apply, IN, osg::LightSource &, node); - Method1(void, apply, IN, osg::Group &, node); - Method1(void, apply, IN, osg::Transform &, node); - Method1(void, apply, IN, osg::Projection &, node); - Method1(void, apply, IN, osg::Switch &, node); - Method1(void, apply, IN, osg::LOD &, node); - Method1(void, apply, IN, osg::OccluderNode &, node); +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgUtil::UpdateVisitor) + I_BaseType(osg::NodeVisitor); + I_Constructor0(); + I_Method0(void, reset); + 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::LightSource &, node); + I_Method1(void, apply, IN, osg::Group &, node); + 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); END_REFLECTOR