From da0ddc35e6e6803e4383c02a28201a7c7e4c727e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 2 Jun 2010 12:14:10 +0000 Subject: [PATCH] Updated wrappers to handle the new ref_ptr::ref_ptr(observer_ptr&> constructor. --- .../introspection/OpenThreads/Atomic.cpp | 2 + .../introspection/OpenThreads/Barrier.cpp | 2 + .../introspection/OpenThreads/Block.cpp | 2 + .../introspection/OpenThreads/Condition.cpp | 2 + .../introspection/OpenThreads/Mutex.cpp | 2 + .../OpenThreads/ReadWriteMutex.cpp | 2 + .../OpenThreads/ReentrantMutex.cpp | 2 + .../introspection/OpenThreads/Thread.cpp | 2 + src/osgWrappers/introspection/genwrapper.conf | 6 ++ .../introspection/osg/AlphaFunc.cpp | 2 + .../introspection/osg/AnimationPath.cpp | 2 + .../introspection/osg/ApplicationUsage.cpp | 2 + .../introspection/osg/ArgumentParser.cpp | 2 + src/osgWrappers/introspection/osg/Array.cpp | 2 + .../introspection/osg/ArrayDispatchers.cpp | 2 + .../introspection/osg/AudioStream.cpp | 2 + .../introspection/osg/AutoTransform.cpp | 2 + .../introspection/osg/Billboard.cpp | 2 + .../introspection/osg/BlendColor.cpp | 2 + .../introspection/osg/BlendEquation.cpp | 2 + .../introspection/osg/BlendFunc.cpp | 2 + .../introspection/osg/BufferObject.cpp | 12 ++++ src/osgWrappers/introspection/osg/Camera.cpp | 2 + .../introspection/osg/CameraNode.cpp | 2 + .../introspection/osg/CameraView.cpp | 2 + .../introspection/osg/ClampColor.cpp | 2 + .../introspection/osg/ClearNode.cpp | 2 + .../introspection/osg/ClipNode.cpp | 7 +++ .../introspection/osg/ClipPlane.cpp | 2 + .../osg/ClusterCullingCallback.cpp | 2 + .../osg/CollectOccludersVisitor.cpp | 2 + .../introspection/osg/ColorMask.cpp | 2 + .../introspection/osg/ColorMatrix.cpp | 2 + .../osg/ComputeBoundsVisitor.cpp | 2 + .../osg/ConvexPlanarOccluder.cpp | 2 + .../introspection/osg/ConvexPlanarPolygon.cpp | 2 + .../osg/CoordinateSystemNode.cpp | 2 + src/osgWrappers/introspection/osg/CopyOp.cpp | 2 + .../introspection/osg/CullFace.cpp | 2 + .../introspection/osg/CullSettings.cpp | 2 + .../introspection/osg/CullStack.cpp | 2 + .../introspection/osg/CullingSet.cpp | 7 +++ .../introspection/osg/DeleteHandler.cpp | 2 + src/osgWrappers/introspection/osg/Depth.cpp | 2 + .../introspection/osg/DisplaySettings.cpp | 7 +++ .../introspection/osg/DrawPixels.cpp | 2 + .../introspection/osg/Drawable.cpp | 2 + src/osgWrappers/introspection/osg/Endian.cpp | 2 + src/osgWrappers/introspection/osg/Fog.cpp | 2 + .../introspection/osg/FragmentProgram.cpp | 2 + .../introspection/osg/FrameBufferObject.cpp | 58 ++++++++++--------- .../introspection/osg/FrameStamp.cpp | 2 + .../introspection/osg/FrontFace.cpp | 2 + .../introspection/osg/GL2Extensions.cpp | 2 + .../introspection/osg/GLBeginEndAdapter.cpp | 2 + src/osgWrappers/introspection/osg/Geode.cpp | 7 +++ .../introspection/osg/Geometry.cpp | 7 +++ .../introspection/osg/GraphicsContext.cpp | 5 ++ .../introspection/osg/GraphicsThread.cpp | 2 + src/osgWrappers/introspection/osg/Group.cpp | 7 +++ src/osgWrappers/introspection/osg/Hint.cpp | 2 + src/osgWrappers/introspection/osg/Image.cpp | 2 + .../introspection/osg/ImageSequence.cpp | 7 +++ .../introspection/osg/ImageStream.cpp | 7 +++ src/osgWrappers/introspection/osg/KdTree.cpp | 2 + src/osgWrappers/introspection/osg/LOD.cpp | 2 + src/osgWrappers/introspection/osg/Light.cpp | 2 + .../introspection/osg/LightModel.cpp | 2 + .../introspection/osg/LightSource.cpp | 2 + .../introspection/osg/LineSegment.cpp | 2 + .../introspection/osg/LineStipple.cpp | 2 + .../introspection/osg/LineWidth.cpp | 2 + src/osgWrappers/introspection/osg/LogicOp.cpp | 2 + .../introspection/osg/Material.cpp | 2 + src/osgWrappers/introspection/osg/Matrix.cpp | 2 + .../introspection/osg/MatrixTransform.cpp | 2 + src/osgWrappers/introspection/osg/Matrixd.cpp | 2 + src/osgWrappers/introspection/osg/Matrixf.cpp | 2 + .../introspection/osg/Multisample.cpp | 2 + src/osgWrappers/introspection/osg/Node.cpp | 2 + .../introspection/osg/NodeCallback.cpp | 2 + .../introspection/osg/NodeTrackerCallback.cpp | 2 + .../introspection/osg/NodeVisitor.cpp | 7 +++ src/osgWrappers/introspection/osg/Notify.cpp | 2 + src/osgWrappers/introspection/osg/Object.cpp | 2 + .../introspection/osg/Observer.cpp | 2 + .../introspection/osg/ObserverNodePath.cpp | 2 + .../introspection/osg/OccluderNode.cpp | 2 + .../introspection/osg/OcclusionQueryNode.cpp | 2 + .../introspection/osg/OperationThread.cpp | 2 + .../introspection/osg/PagedLOD.cpp | 2 + src/osgWrappers/introspection/osg/Point.cpp | 2 + .../introspection/osg/PointSprite.cpp | 2 + .../introspection/osg/PolygonMode.cpp | 2 + .../introspection/osg/PolygonOffset.cpp | 2 + .../introspection/osg/PolygonStipple.cpp | 2 + .../introspection/osg/Polytope.cpp | 2 + .../osg/PositionAttitudeTransform.cpp | 2 + .../introspection/osg/PrimitiveSet.cpp | 2 + src/osgWrappers/introspection/osg/Program.cpp | 2 + .../introspection/osg/Projection.cpp | 2 + .../introspection/osg/ProxyNode.cpp | 2 + .../introspection/osg/Referenced.cpp | 2 + .../introspection/osg/RenderInfo.cpp | 2 + src/osgWrappers/introspection/osg/Scissor.cpp | 2 + .../introspection/osg/Sequence.cpp | 2 + .../introspection/osg/ShadeModel.cpp | 2 + src/osgWrappers/introspection/osg/Shader.cpp | 2 + .../osg/ShadowVolumeOccluder.cpp | 2 + src/osgWrappers/introspection/osg/Shape.cpp | 7 +++ .../introspection/osg/ShapeDrawable.cpp | 2 + src/osgWrappers/introspection/osg/State.cpp | 13 +++++ .../introspection/osg/StateAttribute.cpp | 2 + .../osg/StateAttributeCallback.cpp | 2 + .../introspection/osg/StateSet.cpp | 12 ++++ src/osgWrappers/introspection/osg/Stats.cpp | 2 + src/osgWrappers/introspection/osg/Stencil.cpp | 2 + .../introspection/osg/StencilTwoSided.cpp | 2 + src/osgWrappers/introspection/osg/Switch.cpp | 2 + src/osgWrappers/introspection/osg/TexEnv.cpp | 2 + .../introspection/osg/TexEnvCombine.cpp | 2 + .../introspection/osg/TexEnvFilter.cpp | 2 + src/osgWrappers/introspection/osg/TexGen.cpp | 2 + .../introspection/osg/TexGenNode.cpp | 2 + src/osgWrappers/introspection/osg/TexMat.cpp | 2 + src/osgWrappers/introspection/osg/Texture.cpp | 12 ++++ .../introspection/osg/Texture1D.cpp | 2 + .../introspection/osg/Texture2D.cpp | 2 + .../introspection/osg/Texture2DArray.cpp | 2 + .../introspection/osg/Texture3D.cpp | 2 + .../introspection/osg/TextureCubeMap.cpp | 2 + .../introspection/osg/TextureRectangle.cpp | 2 + src/osgWrappers/introspection/osg/Timer.cpp | 2 + .../introspection/osg/TransferFunction.cpp | 2 + .../introspection/osg/Transform.cpp | 2 + src/osgWrappers/introspection/osg/Uniform.cpp | 2 + src/osgWrappers/introspection/osg/Vec2.cpp | 2 + src/osgWrappers/introspection/osg/Vec2s.cpp | 2 + src/osgWrappers/introspection/osg/Vec3.cpp | 2 + src/osgWrappers/introspection/osg/Vec3s.cpp | 2 + src/osgWrappers/introspection/osg/Vec4.cpp | 2 + src/osgWrappers/introspection/osg/Vec4s.cpp | 2 + .../introspection/osg/VertexProgram.cpp | 2 + src/osgWrappers/introspection/osg/View.cpp | 2 + .../introspection/osg/Viewport.cpp | 2 + .../introspection/osgAnimation/Action.cpp | 7 +++ .../osgAnimation/ActionAnimation.cpp | 2 + .../osgAnimation/ActionBlendIn.cpp | 2 + .../osgAnimation/ActionBlendOut.cpp | 2 + .../osgAnimation/ActionCallback.cpp | 2 + .../osgAnimation/ActionStripAnimation.cpp | 2 + .../osgAnimation/ActionVisitor.cpp | 2 + .../introspection/osgAnimation/Animation.cpp | 7 +++ .../osgAnimation/AnimationManagerBase.cpp | 7 +++ .../osgAnimation/AnimationUpdateCallback.cpp | 2 + .../osgAnimation/BasicAnimationManager.cpp | 2 + .../introspection/osgAnimation/Bone.cpp | 7 +++ .../osgAnimation/BoneMapVisitor.cpp | 2 + .../introspection/osgAnimation/Channel.cpp | 7 +++ .../osgAnimation/CubicBezier.cpp | 2 + .../introspection/osgAnimation/EaseMotion.cpp | 7 +++ .../osgAnimation/FrameAction.cpp | 7 +++ .../osgAnimation/Interpolator.cpp | 2 + .../introspection/osgAnimation/Keyframe.cpp | 2 + .../osgAnimation/LinkVisitor.cpp | 2 + .../osgAnimation/MorphGeometry.cpp | 2 + .../osgAnimation/RigGeometry.cpp | 2 + .../osgAnimation/RigTransform.cpp | 2 + .../osgAnimation/RigTransformHardware.cpp | 12 ++++ .../osgAnimation/RigTransformSoftware.cpp | 2 + .../introspection/osgAnimation/Sampler.cpp | 2 + .../introspection/osgAnimation/Skeleton.cpp | 2 + .../osgAnimation/StackedMatrixElement.cpp | 2 + .../osgAnimation/StackedQuaternionElement.cpp | 2 + .../osgAnimation/StackedRotateAxisElement.cpp | 2 + .../osgAnimation/StackedScaleElement.cpp | 2 + .../osgAnimation/StackedTransform.cpp | 2 + .../osgAnimation/StackedTransformElement.cpp | 2 + .../osgAnimation/StackedTranslateElement.cpp | 2 + .../osgAnimation/StatsHandler.cpp | 2 + .../osgAnimation/StatsVisitor.cpp | 2 + .../introspection/osgAnimation/Target.cpp | 2 + .../introspection/osgAnimation/Timeline.cpp | 2 + .../osgAnimation/TimelineAnimationManager.cpp | 2 + .../introspection/osgAnimation/UpdateBone.cpp | 2 + .../osgAnimation/UpdateMaterial.cpp | 2 + .../osgAnimation/UpdateMatrixTransform.cpp | 2 + .../introspection/osgAnimation/Vec3Packed.cpp | 2 + .../osgAnimation/VertexInfluence.cpp | 2 + .../introspection/osgDB/Archive.cpp | 2 + .../introspection/osgDB/AuthenticationMap.cpp | 2 + .../introspection/osgDB/Callbacks.cpp | 2 + .../introspection/osgDB/DatabasePager.cpp | 7 +++ .../introspection/osgDB/DatabaseRevisions.cpp | 7 +++ .../introspection/osgDB/DotOsgWrapper.cpp | 2 + .../introspection/osgDB/DynamicLibrary.cpp | 2 + .../introspection/osgDB/FileCache.cpp | 7 +++ .../introspection/osgDB/FileUtils.cpp | 2 + .../introspection/osgDB/ImageOptions.cpp | 2 + .../introspection/osgDB/ImagePager.cpp | 2 + src/osgWrappers/introspection/osgDB/Input.cpp | 2 + .../introspection/osgDB/ObjectWrapper.cpp | 2 + .../introspection/osgDB/Options.cpp | 2 + .../introspection/osgDB/Output.cpp | 2 + .../introspection/osgDB/ParameterOutput.cpp | 2 + .../introspection/osgDB/PluginQuery.cpp | 7 +++ .../introspection/osgDB/Registry.cpp | 7 +++ .../osgDB/SharedStateManager.cpp | 2 + .../introspection/osgDB/XmlParser.cpp | 7 +++ .../osgFX/AnisotropicLighting.cpp | 2 + .../introspection/osgFX/BumpMapping.cpp | 2 + .../introspection/osgFX/Cartoon.cpp | 2 + .../introspection/osgFX/Effect.cpp | 2 + .../osgFX/MultiTextureControl.cpp | 2 + .../introspection/osgFX/Outline.cpp | 2 + .../introspection/osgFX/Registry.cpp | 2 + .../introspection/osgFX/Scribe.cpp | 2 + .../osgFX/SpecularHighlights.cpp | 2 + .../introspection/osgFX/Technique.cpp | 2 + .../introspection/osgFX/Validator.cpp | 2 + .../osgGA/AnimationPathManipulator.cpp | 2 + .../introspection/osgGA/CameraManipulator.cpp | 2 + .../osgGA/CameraViewSwitchManipulator.cpp | 7 +++ .../introspection/osgGA/DriveManipulator.cpp | 2 + .../introspection/osgGA/EventQueue.cpp | 7 +++ .../introspection/osgGA/EventVisitor.cpp | 2 + .../introspection/osgGA/FlightManipulator.cpp | 2 + .../introspection/osgGA/GUIActionAdapter.cpp | 2 + .../introspection/osgGA/GUIEventAdapter.cpp | 2 + .../introspection/osgGA/GUIEventHandler.cpp | 2 + .../osgGA/KeySwitchMatrixManipulator.cpp | 7 +++ .../osgGA/NodeTrackerManipulator.cpp | 2 + .../osgGA/SphericalManipulator.cpp | 2 + .../osgGA/StateSetManipulator.cpp | 2 + .../osgGA/TerrainManipulator.cpp | 2 + .../osgGA/TrackballManipulator.cpp | 2 + .../introspection/osgGA/UFOManipulator.cpp | 2 + .../osgManipulator/AntiSquish.cpp | 2 + .../introspection/osgManipulator/Command.cpp | 2 + .../osgManipulator/CommandManager.cpp | 7 +++ .../osgManipulator/Constraint.cpp | 2 + .../introspection/osgManipulator/Dragger.cpp | 17 ++++++ .../osgManipulator/Projector.cpp | 2 + .../osgManipulator/RotateCylinderDragger.cpp | 2 + .../osgManipulator/RotateSphereDragger.cpp | 2 + .../osgManipulator/Scale1DDragger.cpp | 2 + .../osgManipulator/Scale2DDragger.cpp | 2 + .../osgManipulator/ScaleAxisDragger.cpp | 2 + .../osgManipulator/Selection.cpp | 2 + .../osgManipulator/TabBoxDragger.cpp | 2 + .../osgManipulator/TabBoxTrackballDragger.cpp | 2 + .../osgManipulator/TabPlaneDragger.cpp | 2 + .../TabPlaneTrackballDragger.cpp | 2 + .../osgManipulator/TrackballDragger.cpp | 2 + .../osgManipulator/Translate1DDragger.cpp | 2 + .../osgManipulator/Translate2DDragger.cpp | 2 + .../osgManipulator/TranslateAxisDragger.cpp | 2 + .../osgManipulator/TranslatePlaneDragger.cpp | 2 + .../osgParticle/AccelOperator.cpp | 2 + .../osgParticle/AngularAccelOperator.cpp | 2 + .../introspection/osgParticle/BoxPlacer.cpp | 2 + .../osgParticle/CenteredPlacer.cpp | 2 + .../osgParticle/ConnectedParticleSystem.cpp | 2 + .../osgParticle/ConstantRateCounter.cpp | 2 + .../introspection/osgParticle/Counter.cpp | 2 + .../introspection/osgParticle/Emitter.cpp | 2 + .../osgParticle/ExplosionDebrisEffect.cpp | 2 + .../osgParticle/ExplosionEffect.cpp | 2 + .../introspection/osgParticle/FireEffect.cpp | 2 + .../osgParticle/ForceOperator.cpp | 2 + .../osgParticle/Interpolator.cpp | 2 + .../osgParticle/LinearInterpolator.cpp | 2 + .../osgParticle/ModularEmitter.cpp | 2 + .../osgParticle/ModularProgram.cpp | 2 + .../osgParticle/MultiSegmentPlacer.cpp | 2 + .../introspection/osgParticle/Operator.cpp | 2 + .../introspection/osgParticle/Particle.cpp | 2 + .../osgParticle/ParticleEffect.cpp | 2 + .../osgParticle/ParticleProcessor.cpp | 2 + .../osgParticle/ParticleSystem.cpp | 2 + .../osgParticle/ParticleSystemUpdater.cpp | 2 + .../introspection/osgParticle/Placer.cpp | 2 + .../introspection/osgParticle/PointPlacer.cpp | 2 + .../osgParticle/PrecipitationEffect.cpp | 2 + .../introspection/osgParticle/Program.cpp | 2 + .../osgParticle/RadialShooter.cpp | 2 + .../osgParticle/RandomRateCounter.cpp | 2 + .../osgParticle/SectorPlacer.cpp | 2 + .../osgParticle/SegmentPlacer.cpp | 2 + .../introspection/osgParticle/Shooter.cpp | 2 + .../introspection/osgParticle/SmokeEffect.cpp | 2 + .../osgParticle/SmokeTrailEffect.cpp | 2 + .../osgParticle/VariableRateCounter.cpp | 2 + .../introspection/osgParticle/range.cpp | 2 + .../osgPresentation/AnimationMaterial.cpp | 7 +++ .../osgPresentation/CompileSlideCallback.cpp | 2 + .../osgPresentation/PickEventHandler.cpp | 2 + .../osgPresentation/SlideEventHandler.cpp | 12 ++++ .../osgPresentation/SlideShowConstructor.cpp | 2 + .../osgShadow/ConvexPolyhedron.cpp | 2 + .../osgShadow/DebugShadowMap.cpp | 2 + .../LightSpacePerspectiveShadowMap.cpp | 2 + .../osgShadow/MinimalCullBoundsShadowMap.cpp | 2 + .../osgShadow/MinimalDrawBoundsShadowMap.cpp | 2 + .../osgShadow/MinimalShadowMap.cpp | 2 + .../osgShadow/OccluderGeometry.cpp | 2 + .../osgShadow/ParallelSplitShadowMap.cpp | 2 + .../introspection/osgShadow/ShadowMap.cpp | 12 ++++ .../osgShadow/ShadowTechnique.cpp | 2 + .../introspection/osgShadow/ShadowTexture.cpp | 2 + .../introspection/osgShadow/ShadowVolume.cpp | 2 + .../introspection/osgShadow/ShadowedScene.cpp | 2 + .../introspection/osgShadow/SoftShadowMap.cpp | 2 + .../osgShadow/StandardShadowMap.cpp | 2 + .../ViewDependentShadowTechnique.cpp | 2 + .../introspection/osgSim/BlinkSequence.cpp | 2 + .../introspection/osgSim/ColorRange.cpp | 2 + .../introspection/osgSim/DOFTransform.cpp | 2 + .../introspection/osgSim/ElevationSlice.cpp | 2 + .../osgSim/GeographicLocation.cpp | 2 + .../osgSim/HeightAboveTerrain.cpp | 2 + .../introspection/osgSim/Impostor.cpp | 7 +++ .../introspection/osgSim/ImpostorSprite.cpp | 2 + .../osgSim/InsertImpostorsVisitor.cpp | 2 + .../introspection/osgSim/LightPoint.cpp | 2 + .../introspection/osgSim/LightPointNode.cpp | 2 + .../introspection/osgSim/LightPointSystem.cpp | 2 + .../introspection/osgSim/LineOfSight.cpp | 2 + .../introspection/osgSim/MultiSwitch.cpp | 2 + .../introspection/osgSim/ObjectRecordData.cpp | 2 + .../introspection/osgSim/OverlayNode.cpp | 2 + .../introspection/osgSim/ScalarBar.cpp | 2 + .../introspection/osgSim/ScalarsToColors.cpp | 2 + .../introspection/osgSim/Sector.cpp | 2 + .../introspection/osgSim/ShapeAttribute.cpp | 2 + .../introspection/osgSim/SphereSegment.cpp | 7 +++ .../introspection/osgSim/VisibilityGroup.cpp | 2 + .../introspection/osgTerrain/Export.cpp | 2 + .../osgTerrain/GeometryTechnique.cpp | 2 + .../introspection/osgTerrain/Layer.cpp | 2 + .../introspection/osgTerrain/Locator.cpp | 2 + .../introspection/osgTerrain/Terrain.cpp | 2 + .../osgTerrain/TerrainTechnique.cpp | 2 + .../introspection/osgTerrain/TerrainTile.cpp | 7 +++ .../osgTerrain/ValidDataOperator.cpp | 2 + .../introspection/osgText/Export.cpp | 2 + .../introspection/osgText/FadeText.cpp | 2 + .../introspection/osgText/Font.cpp | 2 + .../introspection/osgText/Font3D.cpp | 2 + .../introspection/osgText/KerningType.cpp | 2 + .../introspection/osgText/String.cpp | 2 + .../introspection/osgText/Text.cpp | 12 ++++ .../introspection/osgText/Text3D.cpp | 7 +++ .../introspection/osgText/TextBase.cpp | 2 + .../introspection/osgUtil/ConvertVec.cpp | 2 + .../osgUtil/CubeMapGenerator.cpp | 2 + .../introspection/osgUtil/CullVisitor.cpp | 7 +++ .../osgUtil/DelaunayTriangulator.cpp | 7 +++ .../osgUtil/DisplayRequirementsVisitor.cpp | 2 + .../osgUtil/DrawElementTypeSimplifier.cpp | 2 + .../introspection/osgUtil/EdgeCollector.cpp | 27 +++++++++ .../osgUtil/GLObjectsVisitor.cpp | 2 + .../osgUtil/HalfWayMapGenerator.cpp | 2 + .../osgUtil/HighlightMapGenerator.cpp | 2 + .../osgUtil/IncrementalCompileOperation.cpp | 17 ++++++ .../osgUtil/IntersectVisitor.cpp | 2 + .../osgUtil/IntersectionVisitor.cpp | 7 +++ .../osgUtil/LineSegmentIntersector.cpp | 2 + .../osgUtil/OperationArrayFunctor.cpp | 2 + .../introspection/osgUtil/Optimizer.cpp | 2 + .../osgUtil/PlaneIntersector.cpp | 2 + .../osgUtil/PolytopeIntersector.cpp | 2 + .../osgUtil/PositionalStateContainer.cpp | 7 +++ .../osgUtil/ReflectionMapGenerator.cpp | 2 + .../introspection/osgUtil/RenderBin.cpp | 7 +++ .../introspection/osgUtil/RenderStage.cpp | 2 + .../osgUtil/ReversePrimitiveFunctor.cpp | 2 + .../osgUtil/SceneGraphBuilder.cpp | 2 + .../introspection/osgUtil/SceneView.cpp | 2 + .../introspection/osgUtil/ShaderGen.cpp | 2 + .../introspection/osgUtil/Simplifier.cpp | 2 + .../osgUtil/SmoothingVisitor.cpp | 2 + .../introspection/osgUtil/StateGraph.cpp | 12 ++++ .../introspection/osgUtil/Statistics.cpp | 2 + .../osgUtil/TangentSpaceGenerator.cpp | 2 + .../introspection/osgUtil/Tessellator.cpp | 7 +++ .../osgUtil/TransformAttributeFunctor.cpp | 2 + .../osgUtil/TransformCallback.cpp | 2 + .../introspection/osgUtil/TriStripVisitor.cpp | 2 + .../introspection/osgUtil/UpdateVisitor.cpp | 2 + .../osgViewer/CompositeViewer.cpp | 2 + .../osgViewer/GraphicsWindow.cpp | 2 + .../introspection/osgViewer/Renderer.cpp | 2 + .../introspection/osgViewer/Scene.cpp | 2 + .../introspection/osgViewer/View.cpp | 7 +++ .../introspection/osgViewer/Viewer.cpp | 2 + .../osgViewer/ViewerEventHandlers.cpp | 2 + .../api/Carbon/GraphicsHandleCarbon.cpp | 2 + .../api/Cocoa/GraphicsHandleCocoa.cpp | 2 + .../api/Win32/GraphicsHandleWin32.cpp | 2 + .../osgViewer/api/Win32/PixelBufferWin32.cpp | 2 + .../osgViewer/api/X11/GraphicsHandleX11.cpp | 2 + .../osgViewer/api/X11/PixelBufferX11.cpp | 2 + .../introspection/osgVolume/Export.cpp | 2 + .../osgVolume/FixedFunctionTechnique.cpp | 2 + .../introspection/osgVolume/Layer.cpp | 2 + .../introspection/osgVolume/Locator.cpp | 7 +++ .../introspection/osgVolume/Property.cpp | 7 +++ .../osgVolume/RayTracedTechnique.cpp | 2 + .../introspection/osgVolume/Volume.cpp | 2 + .../osgVolume/VolumeTechnique.cpp | 2 + .../introspection/osgVolume/VolumeTile.cpp | 2 + .../introspection/osgWidget/Box.cpp | 2 + .../introspection/osgWidget/Browser.cpp | 7 +++ .../introspection/osgWidget/Canvas.cpp | 2 + .../osgWidget/EventInterface.cpp | 2 + .../introspection/osgWidget/Frame.cpp | 2 + .../introspection/osgWidget/Input.cpp | 2 + .../introspection/osgWidget/Label.cpp | 2 + .../introspection/osgWidget/Lua.cpp | 2 + .../introspection/osgWidget/PdfReader.cpp | 2 + .../introspection/osgWidget/Python.cpp | 2 + .../introspection/osgWidget/ScriptEngine.cpp | 2 + .../osgWidget/StyleInterface.cpp | 2 + .../introspection/osgWidget/StyleManager.cpp | 7 +++ .../introspection/osgWidget/Table.cpp | 2 + .../introspection/osgWidget/Types.cpp | 2 + .../osgWidget/ViewerEventHandlers.cpp | 2 + .../introspection/osgWidget/VncClient.cpp | 2 + .../introspection/osgWidget/Widget.cpp | 2 + .../introspection/osgWidget/Window.cpp | 2 + .../introspection/osgWidget/WindowManager.cpp | 2 + 432 files changed, 1260 insertions(+), 28 deletions(-) diff --git a/src/osgWrappers/introspection/OpenThreads/Atomic.cpp b/src/osgWrappers/introspection/OpenThreads/Atomic.cpp index 610806350..3001dd055 100644 --- a/src/osgWrappers/introspection/OpenThreads/Atomic.cpp +++ b/src/osgWrappers/introspection/OpenThreads/Atomic.cpp @@ -20,3 +20,5 @@ #undef OUT #endif +#include + diff --git a/src/osgWrappers/introspection/OpenThreads/Barrier.cpp b/src/osgWrappers/introspection/OpenThreads/Barrier.cpp index 0b8304eb5..88bb51874 100644 --- a/src/osgWrappers/introspection/OpenThreads/Barrier.cpp +++ b/src/osgWrappers/introspection/OpenThreads/Barrier.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(OpenThreads::Barrier) I_DeclaringFile("OpenThreads/Barrier"); I_ConstructorWithDefaults1(IN, int, numThreads, 0, diff --git a/src/osgWrappers/introspection/OpenThreads/Block.cpp b/src/osgWrappers/introspection/OpenThreads/Block.cpp index 2ca7f3203..7ba6cd1f9 100644 --- a/src/osgWrappers/introspection/OpenThreads/Block.cpp +++ b/src/osgWrappers/introspection/OpenThreads/Block.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(OpenThreads::Block) I_DeclaringFile("OpenThreads/Block"); I_Constructor0(____Block, diff --git a/src/osgWrappers/introspection/OpenThreads/Condition.cpp b/src/osgWrappers/introspection/OpenThreads/Condition.cpp index f17c04a35..b670ace21 100644 --- a/src/osgWrappers/introspection/OpenThreads/Condition.cpp +++ b/src/osgWrappers/introspection/OpenThreads/Condition.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(OpenThreads::Condition) I_DeclaringFile("OpenThreads/Condition"); I_Constructor0(____Condition, diff --git a/src/osgWrappers/introspection/OpenThreads/Mutex.cpp b/src/osgWrappers/introspection/OpenThreads/Mutex.cpp index 682b4799f..391cc9d65 100644 --- a/src/osgWrappers/introspection/OpenThreads/Mutex.cpp +++ b/src/osgWrappers/introspection/OpenThreads/Mutex.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(OpenThreads::Mutex::MutexType) I_DeclaringFile("OpenThreads/Mutex"); I_EnumLabel(OpenThreads::Mutex::MUTEX_NORMAL); diff --git a/src/osgWrappers/introspection/OpenThreads/ReadWriteMutex.cpp b/src/osgWrappers/introspection/OpenThreads/ReadWriteMutex.cpp index 9ecd50e33..6a0108735 100644 --- a/src/osgWrappers/introspection/OpenThreads/ReadWriteMutex.cpp +++ b/src/osgWrappers/introspection/OpenThreads/ReadWriteMutex.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(OpenThreads::ReadWriteMutex) I_DeclaringFile("OpenThreads/ReadWriteMutex"); I_Constructor0(____ReadWriteMutex, diff --git a/src/osgWrappers/introspection/OpenThreads/ReentrantMutex.cpp b/src/osgWrappers/introspection/OpenThreads/ReentrantMutex.cpp index 465190291..0eb16a752 100644 --- a/src/osgWrappers/introspection/OpenThreads/ReentrantMutex.cpp +++ b/src/osgWrappers/introspection/OpenThreads/ReentrantMutex.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(OpenThreads::ReentrantMutex) I_DeclaringFile("OpenThreads/ReentrantMutex"); I_BaseType(OpenThreads::Mutex); diff --git a/src/osgWrappers/introspection/OpenThreads/Thread.cpp b/src/osgWrappers/introspection/OpenThreads/Thread.cpp index ca1249454..8b2c35714 100644 --- a/src/osgWrappers/introspection/OpenThreads/Thread.cpp +++ b/src/osgWrappers/introspection/OpenThreads/Thread.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(OpenThreads::Thread::ThreadPriority) I_DeclaringFile("OpenThreads/Thread"); I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_MAX); diff --git a/src/osgWrappers/introspection/genwrapper.conf b/src/osgWrappers/introspection/genwrapper.conf index c74f36bce..917833171 100644 --- a/src/osgWrappers/introspection/genwrapper.conf +++ b/src/osgWrappers/introspection/genwrapper.conf @@ -84,6 +84,7 @@ suppress reflector "osgShadow::ViewDependentShadowTechnique::META_ViewDependentS suppress reflector "osgShadow::ViewDependentShadowTechnique::getViewDependentData" suppress reflector "osgShadow::ViewDependentShadowTechnique::setViewDependentData" +suppress reflector "osg::observer_ptr" ############################################################################# @@ -136,6 +137,11 @@ configure file /osgUtil\/RenderLeaf/ " end +configure file /.*/ + emit before "#include + " +end + ############################################################################# # Doxygen fails to detect that std::vector is a base class for diff --git a/src/osgWrappers/introspection/osg/AlphaFunc.cpp b/src/osgWrappers/introspection/osg/AlphaFunc.cpp index ee116505a..c5fbc05e3 100644 --- a/src/osgWrappers/introspection/osg/AlphaFunc.cpp +++ b/src/osgWrappers/introspection/osg/AlphaFunc.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::AlphaFunc::ComparisonFunction) I_DeclaringFile("osg/AlphaFunc"); I_EnumLabel(osg::AlphaFunc::NEVER); diff --git a/src/osgWrappers/introspection/osg/AnimationPath.cpp b/src/osgWrappers/introspection/osg/AnimationPath.cpp index cb9b0eebf..bc3604941 100644 --- a/src/osgWrappers/introspection/osg/AnimationPath.cpp +++ b/src/osgWrappers/introspection/osg/AnimationPath.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode) I_DeclaringFile("osg/AnimationPath"); I_EnumLabel(osg::AnimationPath::SWING); diff --git a/src/osgWrappers/introspection/osg/ApplicationUsage.cpp b/src/osgWrappers/introspection/osg/ApplicationUsage.cpp index fc5d1ed09..7aa52dfcd 100644 --- a/src/osgWrappers/introspection/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/introspection/osg/ApplicationUsage.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type) I_DeclaringFile("osg/ApplicationUsage"); I_EnumLabel(osg::ApplicationUsage::NO_HELP); diff --git a/src/osgWrappers/introspection/osg/ArgumentParser.cpp b/src/osgWrappers/introspection/osg/ArgumentParser.cpp index 91fec3a37..92e6f3db4 100644 --- a/src/osgWrappers/introspection/osg/ArgumentParser.cpp +++ b/src/osgWrappers/introspection/osg/ArgumentParser.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::ErrorSeverity) I_DeclaringFile("osg/ArgumentParser"); I_EnumLabel(osg::ArgumentParser::BENIGN); diff --git a/src/osgWrappers/introspection/osg/Array.cpp b/src/osgWrappers/introspection/osg/Array.cpp index fe9d4fb3d..7d049fe55 100644 --- a/src/osgWrappers/introspection/osg/Array.cpp +++ b/src/osgWrappers/introspection/osg/Array.cpp @@ -37,6 +37,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Array::Type) I_DeclaringFile("osg/Array"); I_EnumLabel(osg::Array::ArrayType); diff --git a/src/osgWrappers/introspection/osg/ArrayDispatchers.cpp b/src/osgWrappers/introspection/osg/ArrayDispatchers.cpp index d0845d7d9..cc1fc99cf 100644 --- a/src/osgWrappers/introspection/osg/ArrayDispatchers.cpp +++ b/src/osgWrappers/introspection/osg/ArrayDispatchers.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::ArrayDispatchers) I_DeclaringFile("osg/ArrayDispatchers"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osg/AudioStream.cpp b/src/osgWrappers/introspection/osg/AudioStream.cpp index 8497923b8..660232e30 100644 --- a/src/osgWrappers/introspection/osg/AudioStream.cpp +++ b/src/osgWrappers/introspection/osg/AudioStream.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AudioSink) I_DeclaringFile("osg/AudioStream"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osg/AutoTransform.cpp b/src/osgWrappers/introspection/osg/AutoTransform.cpp index 5d4414eca..5a5caf5c9 100644 --- a/src/osgWrappers/introspection/osg/AutoTransform.cpp +++ b/src/osgWrappers/introspection/osg/AutoTransform.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::AutoTransform::AutoRotateMode) I_DeclaringFile("osg/AutoTransform"); I_EnumLabel(osg::AutoTransform::NO_ROTATION); diff --git a/src/osgWrappers/introspection/osg/Billboard.cpp b/src/osgWrappers/introspection/osg/Billboard.cpp index d24c5f36a..f42181282 100644 --- a/src/osgWrappers/introspection/osg/Billboard.cpp +++ b/src/osgWrappers/introspection/osg/Billboard.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode) I_DeclaringFile("osg/Billboard"); I_EnumLabel(osg::Billboard::POINT_ROT_EYE); diff --git a/src/osgWrappers/introspection/osg/BlendColor.cpp b/src/osgWrappers/introspection/osg/BlendColor.cpp index fa15c052f..6aa30b544 100644 --- a/src/osgWrappers/introspection/osg/BlendColor.cpp +++ b/src/osgWrappers/introspection/osg/BlendColor.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::BlendColor) I_DeclaringFile("osg/BlendColor"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/BlendEquation.cpp b/src/osgWrappers/introspection/osg/BlendEquation.cpp index bea871cfe..e879dab49 100644 --- a/src/osgWrappers/introspection/osg/BlendEquation.cpp +++ b/src/osgWrappers/introspection/osg/BlendEquation.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::BlendEquation::Equation) I_DeclaringFile("osg/BlendEquation"); I_EnumLabel(osg::BlendEquation::RGBA_MIN); diff --git a/src/osgWrappers/introspection/osg/BlendFunc.cpp b/src/osgWrappers/introspection/osg/BlendFunc.cpp index c7e4b5377..10fdb46f6 100644 --- a/src/osgWrappers/introspection/osg/BlendFunc.cpp +++ b/src/osgWrappers/introspection/osg/BlendFunc.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::BlendFunc::BlendFuncMode) I_DeclaringFile("osg/BlendFunc"); I_EnumLabel(osg::BlendFunc::DST_ALPHA); diff --git a/src/osgWrappers/introspection/osg/BufferObject.cpp b/src/osgWrappers/introspection/osg/BufferObject.cpp index 2ea9f89b9..8a010294f 100644 --- a/src/osgWrappers/introspection/osg/BufferObject.cpp +++ b/src/osgWrappers/introspection/osg/BufferObject.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BufferData) I_DeclaringFile("osg/BufferObject"); I_BaseType(osg::Object); @@ -1145,6 +1147,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::GLBufferObject >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::GLBufferObject > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::GLBufferObject *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -1185,6 +1192,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::GLBufferObjectManager >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::GLBufferObjectManager > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::GLBufferObjectManager *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/Camera.cpp b/src/osgWrappers/introspection/osg/Camera.cpp index e6bd98560..230f24c19 100644 --- a/src/osgWrappers/introspection/osg/Camera.cpp +++ b/src/osgWrappers/introspection/osg/Camera.cpp @@ -43,6 +43,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Camera::TransformOrder) I_DeclaringFile("osg/Camera"); I_EnumLabel(osg::Camera::PRE_MULTIPLY); diff --git a/src/osgWrappers/introspection/osg/CameraNode.cpp b/src/osgWrappers/introspection/osg/CameraNode.cpp index 7fb194751..abdc6e919 100644 --- a/src/osgWrappers/introspection/osg/CameraNode.cpp +++ b/src/osgWrappers/introspection/osg/CameraNode.cpp @@ -20,5 +20,7 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Camera, osg::CameraNode) diff --git a/src/osgWrappers/introspection/osg/CameraView.cpp b/src/osgWrappers/introspection/osg/CameraView.cpp index d3ea8ed56..4e80de269 100644 --- a/src/osgWrappers/introspection/osg/CameraView.cpp +++ b/src/osgWrappers/introspection/osg/CameraView.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::CameraView::FieldOfViewMode) I_DeclaringFile("osg/CameraView"); I_EnumLabel(osg::CameraView::UNCONSTRAINED); diff --git a/src/osgWrappers/introspection/osg/ClampColor.cpp b/src/osgWrappers/introspection/osg/ClampColor.cpp index 09f784846..33a493c78 100644 --- a/src/osgWrappers/introspection/osg/ClampColor.cpp +++ b/src/osgWrappers/introspection/osg/ClampColor.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::ClampColor) I_DeclaringFile("osg/ClampColor"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/ClearNode.cpp b/src/osgWrappers/introspection/osg/ClearNode.cpp index fa55b23fe..74c1e07c2 100644 --- a/src/osgWrappers/introspection/osg/ClearNode.cpp +++ b/src/osgWrappers/introspection/osg/ClearNode.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::ClearNode) I_DeclaringFile("osg/ClearNode"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osg/ClipNode.cpp b/src/osgWrappers/introspection/osg/ClipNode.cpp index accd10915..03db5ccd2 100644 --- a/src/osgWrappers/introspection/osg/ClipNode.cpp +++ b/src/osgWrappers/introspection/osg/ClipNode.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::ClipNode::ReferenceFrame) I_DeclaringFile("osg/ClipNode"); I_EnumLabel(osg::ClipNode::RELATIVE_RF); @@ -184,6 +186,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::ClipPlane >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::ClipPlane > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::ClipPlane *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/ClipPlane.cpp b/src/osgWrappers/introspection/osg/ClipPlane.cpp index 08ef90393..d0d91a1d7 100644 --- a/src/osgWrappers/introspection/osg/ClipPlane.cpp +++ b/src/osgWrappers/introspection/osg/ClipPlane.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::ClipPlane) I_DeclaringFile("osg/ClipPlane"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/ClusterCullingCallback.cpp b/src/osgWrappers/introspection/osg/ClusterCullingCallback.cpp index fbfde8a8d..e4a1889d5 100644 --- a/src/osgWrappers/introspection/osg/ClusterCullingCallback.cpp +++ b/src/osgWrappers/introspection/osg/ClusterCullingCallback.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::ClusterCullingCallback) I_DeclaringFile("osg/ClusterCullingCallback"); I_BaseType(osg::Drawable::CullCallback); diff --git a/src/osgWrappers/introspection/osg/CollectOccludersVisitor.cpp b/src/osgWrappers/introspection/osg/CollectOccludersVisitor.cpp index cba3867c9..b684dd1a2 100644 --- a/src/osgWrappers/introspection/osg/CollectOccludersVisitor.cpp +++ b/src/osgWrappers/introspection/osg/CollectOccludersVisitor.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::set< osg::ShadowVolumeOccluder >, osg::CollectOccludersVisitor::ShadowVolumeOccluderSet) BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor) diff --git a/src/osgWrappers/introspection/osg/ColorMask.cpp b/src/osgWrappers/introspection/osg/ColorMask.cpp index cb1ed8107..a9abb31f8 100644 --- a/src/osgWrappers/introspection/osg/ColorMask.cpp +++ b/src/osgWrappers/introspection/osg/ColorMask.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::ColorMask) I_DeclaringFile("osg/ColorMask"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/ColorMatrix.cpp b/src/osgWrappers/introspection/osg/ColorMatrix.cpp index 6de8b9d75..d4364771e 100644 --- a/src/osgWrappers/introspection/osg/ColorMatrix.cpp +++ b/src/osgWrappers/introspection/osg/ColorMatrix.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::ColorMatrix) I_DeclaringFile("osg/ColorMatrix"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/ComputeBoundsVisitor.cpp b/src/osgWrappers/introspection/osg/ComputeBoundsVisitor.cpp index 2364a7181..19d4afa8d 100644 --- a/src/osgWrappers/introspection/osg/ComputeBoundsVisitor.cpp +++ b/src/osgWrappers/introspection/osg/ComputeBoundsVisitor.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::ComputeBoundsVisitor) I_DeclaringFile("osg/ComputeBoundsVisitor"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/introspection/osg/ConvexPlanarOccluder.cpp b/src/osgWrappers/introspection/osg/ConvexPlanarOccluder.cpp index 092f03079..cd098dd6f 100644 --- a/src/osgWrappers/introspection/osg/ConvexPlanarOccluder.cpp +++ b/src/osgWrappers/introspection/osg/ConvexPlanarOccluder.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::ConvexPlanarPolygon >, osg::ConvexPlanarOccluder::HoleList) BEGIN_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder) diff --git a/src/osgWrappers/introspection/osg/ConvexPlanarPolygon.cpp b/src/osgWrappers/introspection/osg/ConvexPlanarPolygon.cpp index cbc51b36c..ed25c631a 100644 --- a/src/osgWrappers/introspection/osg/ConvexPlanarPolygon.cpp +++ b/src/osgWrappers/introspection/osg/ConvexPlanarPolygon.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::ConvexPlanarPolygon::VertexList) BEGIN_VALUE_REFLECTOR(osg::ConvexPlanarPolygon) diff --git a/src/osgWrappers/introspection/osg/CoordinateSystemNode.cpp b/src/osgWrappers/introspection/osg/CoordinateSystemNode.cpp index 4968724f3..e0ed08dfd 100644 --- a/src/osgWrappers/introspection/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/introspection/osg/CoordinateSystemNode.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::CoordinateSystemNode) I_DeclaringFile("osg/CoordinateSystemNode"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osg/CopyOp.cpp b/src/osgWrappers/introspection/osg/CopyOp.cpp index 18dfe9522..261bd27b8 100644 --- a/src/osgWrappers/introspection/osg/CopyOp.cpp +++ b/src/osgWrappers/introspection/osg/CopyOp.cpp @@ -34,6 +34,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) I_DeclaringFile("osg/CopyOp"); I_EnumLabel(osg::CopyOp::SHALLOW_COPY); diff --git a/src/osgWrappers/introspection/osg/CullFace.cpp b/src/osgWrappers/introspection/osg/CullFace.cpp index bef88e5d9..bba6be8dc 100644 --- a/src/osgWrappers/introspection/osg/CullFace.cpp +++ b/src/osgWrappers/introspection/osg/CullFace.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::CullFace::Mode) I_DeclaringFile("osg/CullFace"); I_EnumLabel(osg::CullFace::FRONT); diff --git a/src/osgWrappers/introspection/osg/CullSettings.cpp b/src/osgWrappers/introspection/osg/CullSettings.cpp index d76f0023a..010aded76 100644 --- a/src/osgWrappers/introspection/osg/CullSettings.cpp +++ b/src/osgWrappers/introspection/osg/CullSettings.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::CullSettings::VariablesMask) I_DeclaringFile("osg/CullSettings"); I_EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_MODE); diff --git a/src/osgWrappers/introspection/osg/CullStack.cpp b/src/osgWrappers/introspection/osg/CullStack.cpp index 1d31fe6bd..a3003287d 100644 --- a/src/osgWrappers/introspection/osg/CullStack.cpp +++ b/src/osgWrappers/introspection/osg/CullStack.cpp @@ -29,6 +29,8 @@ #undef OUT #endif +#include + 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/introspection/osg/CullingSet.cpp b/src/osgWrappers/introspection/osg/CullingSet.cpp index 210edac41..8293732e2 100644 --- a/src/osgWrappers/introspection/osg/CullingSet.cpp +++ b/src/osgWrappers/introspection/osg/CullingSet.cpp @@ -30,6 +30,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues) I_DeclaringFile("osg/CullingSet"); I_EnumLabel(osg::CullingSet::NO_CULLING); @@ -242,6 +244,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::StateSet >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::StateSet > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::StateSet *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/DeleteHandler.cpp b/src/osgWrappers/introspection/osg/DeleteHandler.cpp index aed5d1751..f38b8d597 100644 --- a/src/osgWrappers/introspection/osg/DeleteHandler.cpp +++ b/src/osgWrappers/introspection/osg/DeleteHandler.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::pair< int COMMA const osg::Referenced * >, osg::DeleteHandler::FrameNumberObjectPair) TYPE_NAME_ALIAS(std::list< osg::DeleteHandler::FrameNumberObjectPair >, osg::DeleteHandler::ObjectsToDeleteList) diff --git a/src/osgWrappers/introspection/osg/Depth.cpp b/src/osgWrappers/introspection/osg/Depth.cpp index 36c95f665..540a596cc 100644 --- a/src/osgWrappers/introspection/osg/Depth.cpp +++ b/src/osgWrappers/introspection/osg/Depth.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Depth::Function) I_DeclaringFile("osg/Depth"); I_EnumLabel(osg::Depth::NEVER); diff --git a/src/osgWrappers/introspection/osg/DisplaySettings.cpp b/src/osgWrappers/introspection/osg/DisplaySettings.cpp index 9146ef9bd..3cce494a3 100644 --- a/src/osgWrappers/introspection/osg/DisplaySettings.cpp +++ b/src/osgWrappers/introspection/osg/DisplaySettings.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::DisplayType) I_DeclaringFile("osg/DisplaySettings"); I_EnumLabel(osg::DisplaySettings::MONITOR); @@ -606,6 +608,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::DisplaySettings >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::DisplaySettings > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::DisplaySettings *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/DrawPixels.cpp b/src/osgWrappers/introspection/osg/DrawPixels.cpp index 17e16632b..69c3b2309 100644 --- a/src/osgWrappers/introspection/osg/DrawPixels.cpp +++ b/src/osgWrappers/introspection/osg/DrawPixels.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::DrawPixels) I_DeclaringFile("osg/DrawPixels"); I_BaseType(osg::Drawable); diff --git a/src/osgWrappers/introspection/osg/Drawable.cpp b/src/osgWrappers/introspection/osg/Drawable.cpp index 739bade15..ba07c0db4 100644 --- a/src/osgWrappers/introspection/osg/Drawable.cpp +++ b/src/osgWrappers/introspection/osg/Drawable.cpp @@ -38,6 +38,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes) I_DeclaringFile("osg/Drawable"); I_EnumLabel(osg::Drawable::VERTICES); diff --git a/src/osgWrappers/introspection/osg/Endian.cpp b/src/osgWrappers/introspection/osg/Endian.cpp index 76872cf84..3f8d2a786 100644 --- a/src/osgWrappers/introspection/osg/Endian.cpp +++ b/src/osgWrappers/introspection/osg/Endian.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Endian) I_DeclaringFile("osg/Endian"); I_EnumLabel(osg::BigEndian); diff --git a/src/osgWrappers/introspection/osg/Fog.cpp b/src/osgWrappers/introspection/osg/Fog.cpp index ef5ef0ca9..efa5f5f24 100644 --- a/src/osgWrappers/introspection/osg/Fog.cpp +++ b/src/osgWrappers/introspection/osg/Fog.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Fog::Mode) I_DeclaringFile("osg/Fog"); I_EnumLabel(osg::Fog::LINEAR); diff --git a/src/osgWrappers/introspection/osg/FragmentProgram.cpp b/src/osgWrappers/introspection/osg/FragmentProgram.cpp index f7bdcff2e..2f67a6bb4 100644 --- a/src/osgWrappers/introspection/osg/FragmentProgram.cpp +++ b/src/osgWrappers/introspection/osg/FragmentProgram.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::FragmentProgram::LocalParamList) TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::FragmentProgram::MatrixList) diff --git a/src/osgWrappers/introspection/osg/FrameBufferObject.cpp b/src/osgWrappers/introspection/osg/FrameBufferObject.cpp index e544b566a..a2773aec7 100644 --- a/src/osgWrappers/introspection/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/introspection/osg/FrameBufferObject.cpp @@ -33,6 +33,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) I_DeclaringFile("osg/FrameBufferObject"); I_Constructor0(____FrameBufferAttachment, @@ -48,28 +50,28 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) ____FrameBufferAttachment__RenderBuffer_P1, "", ""); - I_ConstructorWithDefaults2(IN, osg::Texture1D *, target, , IN, int, level, 0, - ____FrameBufferAttachment__Texture1D_P1__int, + I_ConstructorWithDefaults2(IN, osg::Texture1D *, target, , IN, unsigned int, level, 0, + ____FrameBufferAttachment__Texture1D_P1__unsigned_int, "", ""); - I_ConstructorWithDefaults2(IN, osg::Texture2D *, target, , IN, int, level, 0, - ____FrameBufferAttachment__Texture2D_P1__int, + I_ConstructorWithDefaults2(IN, osg::Texture2D *, target, , IN, unsigned int, level, 0, + ____FrameBufferAttachment__Texture2D_P1__unsigned_int, "", ""); - I_ConstructorWithDefaults2(IN, osg::Texture2DMultisample *, target, , IN, int, level, 0, - ____FrameBufferAttachment__Texture2DMultisample_P1__int, + I_ConstructorWithDefaults2(IN, osg::Texture2DMultisample *, target, , IN, unsigned int, level, 0, + ____FrameBufferAttachment__Texture2DMultisample_P1__unsigned_int, "", ""); - I_ConstructorWithDefaults3(IN, osg::Texture3D *, target, , IN, int, zoffset, , IN, int, level, 0, - ____FrameBufferAttachment__Texture3D_P1__int__int, + I_ConstructorWithDefaults3(IN, osg::Texture3D *, target, , IN, unsigned int, zoffset, , IN, unsigned int, level, 0, + ____FrameBufferAttachment__Texture3D_P1__unsigned_int__unsigned_int, "", ""); - I_ConstructorWithDefaults3(IN, osg::Texture2DArray *, target, , IN, int, layer, , IN, int, level, 0, - ____FrameBufferAttachment__Texture2DArray_P1__int__int, + I_ConstructorWithDefaults3(IN, osg::Texture2DArray *, target, , IN, unsigned int, layer, , IN, unsigned int, level, 0, + ____FrameBufferAttachment__Texture2DArray_P1__unsigned_int__unsigned_int, "", ""); - I_ConstructorWithDefaults3(IN, osg::TextureCubeMap *, target, , IN, int, face, , IN, int, level, 0, - ____FrameBufferAttachment__TextureCubeMap_P1__int__int, + I_ConstructorWithDefaults3(IN, osg::TextureCubeMap *, target, , IN, unsigned int, face, , IN, unsigned int, level, 0, + ____FrameBufferAttachment__TextureCubeMap_P1__unsigned_int__unsigned_int, "", ""); I_Constructor1(IN, osg::TextureRectangle *, target, @@ -122,28 +124,28 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) __C5_Texture_P1__getTexture, "", ""); - I_Method0(int, getCubeMapFace, + I_Method0(unsigned int, getCubeMapFace, Properties::NON_VIRTUAL, - __int__getCubeMapFace, + __unsigned_int__getCubeMapFace, "", ""); - I_Method0(int, getTextureLevel, + I_Method0(unsigned int, getTextureLevel, Properties::NON_VIRTUAL, - __int__getTextureLevel, + __unsigned_int__getTextureLevel, "", ""); - I_Method0(int, getTexture3DZOffset, + I_Method0(unsigned int, getTexture3DZOffset, Properties::NON_VIRTUAL, - __int__getTexture3DZOffset, + __unsigned_int__getTexture3DZOffset, "", ""); - I_Method0(int, getTextureArrayLayer, + I_Method0(unsigned int, getTextureArrayLayer, Properties::NON_VIRTUAL, - __int__getTextureArrayLayer, + __unsigned_int__getTextureArrayLayer, "", ""); - I_SimpleProperty(int, CubeMapFace, - __int__getCubeMapFace, + I_SimpleProperty(unsigned int, CubeMapFace, + __unsigned_int__getCubeMapFace, 0); I_SimpleProperty(osg::RenderBuffer *, RenderBuffer, __RenderBuffer_P1__getRenderBuffer, @@ -151,14 +153,14 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) I_SimpleProperty(osg::Texture *, Texture, __Texture_P1__getTexture, 0); - I_SimpleProperty(int, Texture3DZOffset, - __int__getTexture3DZOffset, + I_SimpleProperty(unsigned int, Texture3DZOffset, + __unsigned_int__getTexture3DZOffset, 0); - I_SimpleProperty(int, TextureArrayLayer, - __int__getTextureArrayLayer, + I_SimpleProperty(unsigned int, TextureArrayLayer, + __unsigned_int__getTextureArrayLayer, 0); - I_SimpleProperty(int, TextureLevel, - __int__getTextureLevel, + I_SimpleProperty(unsigned int, TextureLevel, + __unsigned_int__getTextureLevel, 0); END_REFLECTOR diff --git a/src/osgWrappers/introspection/osg/FrameStamp.cpp b/src/osgWrappers/introspection/osg/FrameStamp.cpp index 155d497e8..b1b7353d7 100644 --- a/src/osgWrappers/introspection/osg/FrameStamp.cpp +++ b/src/osgWrappers/introspection/osg/FrameStamp.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::FrameStamp) I_DeclaringFile("osg/FrameStamp"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osg/FrontFace.cpp b/src/osgWrappers/introspection/osg/FrontFace.cpp index 434edecee..20c76e065 100644 --- a/src/osgWrappers/introspection/osg/FrontFace.cpp +++ b/src/osgWrappers/introspection/osg/FrontFace.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::FrontFace::Mode) I_DeclaringFile("osg/FrontFace"); I_EnumLabel(osg::FrontFace::CLOCKWISE); diff --git a/src/osgWrappers/introspection/osg/GL2Extensions.cpp b/src/osgWrappers/introspection/osg/GL2Extensions.cpp index 6d4b62609..9f0bdb1e3 100644 --- a/src/osgWrappers/introspection/osg/GL2Extensions.cpp +++ b/src/osgWrappers/introspection/osg/GL2Extensions.cpp @@ -20,3 +20,5 @@ #undef OUT #endif +#include + diff --git a/src/osgWrappers/introspection/osg/GLBeginEndAdapter.cpp b/src/osgWrappers/introspection/osg/GLBeginEndAdapter.cpp index e9009b928..f4b5927a1 100644 --- a/src/osgWrappers/introspection/osg/GLBeginEndAdapter.cpp +++ b/src/osgWrappers/introspection/osg/GLBeginEndAdapter.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::GLBeginEndAdapter::MatrixMode) I_DeclaringFile("osg/GLBeginEndAdapter"); I_EnumLabel(osg::GLBeginEndAdapter::APPLY_LOCAL_MATRICES_TO_VERTICES); diff --git a/src/osgWrappers/introspection/osg/Geode.cpp b/src/osgWrappers/introspection/osg/Geode.cpp index 89da762eb..e17eefb0f 100644 --- a/src/osgWrappers/introspection/osg/Geode.cpp +++ b/src/osgWrappers/introspection/osg/Geode.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Drawable > >, osg::Geode::DrawableList) BEGIN_OBJECT_REFLECTOR(osg::Geode) @@ -198,6 +200,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Drawable >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Drawable > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Drawable *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/Geometry.cpp b/src/osgWrappers/introspection/osg/Geometry.cpp index f7d4b1252..09815806a 100644 --- a/src/osgWrappers/introspection/osg/Geometry.cpp +++ b/src/osgWrappers/introspection/osg/Geometry.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding) I_DeclaringFile("osg/Geometry"); I_EnumLabel(osg::Geometry::BIND_OFF); @@ -975,6 +977,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PrimitiveSet >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::PrimitiveSet > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::PrimitiveSet *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/GraphicsContext.cpp b/src/osgWrappers/introspection/osg/GraphicsContext.cpp index aed6c9e6b..c80c4fd9c 100644 --- a/src/osgWrappers/introspection/osg/GraphicsContext.cpp +++ b/src/osgWrappers/introspection/osg/GraphicsContext.cpp @@ -589,6 +589,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Operation >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Operation > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Operation *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/GraphicsThread.cpp b/src/osgWrappers/introspection/osg/GraphicsThread.cpp index 89795ed9c..ae10c5985 100644 --- a/src/osgWrappers/introspection/osg/GraphicsThread.cpp +++ b/src/osgWrappers/introspection/osg/GraphicsThread.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::BarrierOperation::PreBlockOp) I_DeclaringFile("osg/GraphicsThread"); I_EnumLabel(osg::BarrierOperation::NO_OPERATION); diff --git a/src/osgWrappers/introspection/osg/Group.cpp b/src/osgWrappers/introspection/osg/Group.cpp index 286f5da9b..19e218af2 100644 --- a/src/osgWrappers/introspection/osg/Group.cpp +++ b/src/osgWrappers/introspection/osg/Group.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Group) I_DeclaringFile("osg/Group"); I_BaseType(osg::Node); @@ -202,6 +204,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Node >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Node > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Node *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/Hint.cpp b/src/osgWrappers/introspection/osg/Hint.cpp index c4609858a..1a7bd8d1b 100644 --- a/src/osgWrappers/introspection/osg/Hint.cpp +++ b/src/osgWrappers/introspection/osg/Hint.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Hint) I_DeclaringFile("osg/Hint"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/Image.cpp b/src/osgWrappers/introspection/osg/Image.cpp index 1c277b7d7..92327f436 100644 --- a/src/osgWrappers/introspection/osg/Image.cpp +++ b/src/osgWrappers/introspection/osg/Image.cpp @@ -29,6 +29,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Image::WriteHint) I_DeclaringFile("osg/Image"); I_EnumLabel(osg::Image::NO_PREFERENCE); diff --git a/src/osgWrappers/introspection/osg/ImageSequence.cpp b/src/osgWrappers/introspection/osg/ImageSequence.cpp index b93081658..fb46179c7 100644 --- a/src/osgWrappers/introspection/osg/ImageSequence.cpp +++ b/src/osgWrappers/introspection/osg/ImageSequence.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::ImageSequence::Mode) I_DeclaringFile("osg/ImageSequence"); I_EnumLabel(osg::ImageSequence::PRE_LOAD_ALL_IMAGES); @@ -288,6 +290,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Image >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Image > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Image *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/ImageStream.cpp b/src/osgWrappers/introspection/osg/ImageStream.cpp index 185b2c91d..98147aca1 100644 --- a/src/osgWrappers/introspection/osg/ImageStream.cpp +++ b/src/osgWrappers/introspection/osg/ImageStream.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::ImageStream::StreamStatus) I_DeclaringFile("osg/ImageStream"); I_EnumLabel(osg::ImageStream::INVALID); @@ -222,6 +224,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::AudioStream >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::AudioStream > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::AudioStream *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/KdTree.cpp b/src/osgWrappers/introspection/osg/KdTree.cpp index d5ff3c54f..ecd4c59b3 100644 --- a/src/osgWrappers/introspection/osg/KdTree.cpp +++ b/src/osgWrappers/introspection/osg/KdTree.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::KdTree::LineSegmentIntersection >, osg::KdTree::LineSegmentIntersections) TYPE_NAME_ALIAS(int, osg::KdTree::value_type) diff --git a/src/osgWrappers/introspection/osg/LOD.cpp b/src/osgWrappers/introspection/osg/LOD.cpp index eb1530f84..687210541 100644 --- a/src/osgWrappers/introspection/osg/LOD.cpp +++ b/src/osgWrappers/introspection/osg/LOD.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::LOD::CenterMode) I_DeclaringFile("osg/LOD"); I_EnumLabel(osg::LOD::USE_BOUNDING_SPHERE_CENTER); diff --git a/src/osgWrappers/introspection/osg/Light.cpp b/src/osgWrappers/introspection/osg/Light.cpp index 3a7bbe7df..f3eba5f56 100644 --- a/src/osgWrappers/introspection/osg/Light.cpp +++ b/src/osgWrappers/introspection/osg/Light.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Light) I_DeclaringFile("osg/Light"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/LightModel.cpp b/src/osgWrappers/introspection/osg/LightModel.cpp index 73388fae5..90e7fecdc 100644 --- a/src/osgWrappers/introspection/osg/LightModel.cpp +++ b/src/osgWrappers/introspection/osg/LightModel.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::LightModel::ColorControl) I_DeclaringFile("osg/LightModel"); I_EnumLabel(osg::LightModel::SEPARATE_SPECULAR_COLOR); diff --git a/src/osgWrappers/introspection/osg/LightSource.cpp b/src/osgWrappers/introspection/osg/LightSource.cpp index c4aee9fea..a9e7fa124 100644 --- a/src/osgWrappers/introspection/osg/LightSource.cpp +++ b/src/osgWrappers/introspection/osg/LightSource.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::LightSource::ReferenceFrame) I_DeclaringFile("osg/LightSource"); I_EnumLabel(osg::LightSource::RELATIVE_RF); diff --git a/src/osgWrappers/introspection/osg/LineSegment.cpp b/src/osgWrappers/introspection/osg/LineSegment.cpp index 9519ffbd1..fa3524045 100644 --- a/src/osgWrappers/introspection/osg/LineSegment.cpp +++ b/src/osgWrappers/introspection/osg/LineSegment.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Vec3d, osg::LineSegment::vec_type) TYPE_NAME_ALIAS(osg::LineSegment::vec_type::value_type, osg::LineSegment::value_type) diff --git a/src/osgWrappers/introspection/osg/LineStipple.cpp b/src/osgWrappers/introspection/osg/LineStipple.cpp index 675e0773e..fba1772d7 100644 --- a/src/osgWrappers/introspection/osg/LineStipple.cpp +++ b/src/osgWrappers/introspection/osg/LineStipple.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::LineStipple) I_DeclaringFile("osg/LineStipple"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/LineWidth.cpp b/src/osgWrappers/introspection/osg/LineWidth.cpp index 3023385ef..d9860eb88 100644 --- a/src/osgWrappers/introspection/osg/LineWidth.cpp +++ b/src/osgWrappers/introspection/osg/LineWidth.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::LineWidth) I_DeclaringFile("osg/LineWidth"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/LogicOp.cpp b/src/osgWrappers/introspection/osg/LogicOp.cpp index d72e5ccaa..145d941c1 100644 --- a/src/osgWrappers/introspection/osg/LogicOp.cpp +++ b/src/osgWrappers/introspection/osg/LogicOp.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::LogicOp::Opcode) I_DeclaringFile("osg/LogicOp"); I_EnumLabel(osg::LogicOp::CLEAR); diff --git a/src/osgWrappers/introspection/osg/Material.cpp b/src/osgWrappers/introspection/osg/Material.cpp index f71ac329a..724928eb1 100644 --- a/src/osgWrappers/introspection/osg/Material.cpp +++ b/src/osgWrappers/introspection/osg/Material.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Material::Face) I_DeclaringFile("osg/Material"); I_EnumLabel(osg::Material::FRONT); diff --git a/src/osgWrappers/introspection/osg/Matrix.cpp b/src/osgWrappers/introspection/osg/Matrix.cpp index 5980916f4..94c96315e 100644 --- a/src/osgWrappers/introspection/osg/Matrix.cpp +++ b/src/osgWrappers/introspection/osg/Matrix.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Matrixd, osg::Matrix) TYPE_NAME_ALIAS(osg::RefMatrixd, osg::RefMatrix) diff --git a/src/osgWrappers/introspection/osg/MatrixTransform.cpp b/src/osgWrappers/introspection/osg/MatrixTransform.cpp index f7644fa69..dfff3cb2c 100644 --- a/src/osgWrappers/introspection/osg/MatrixTransform.cpp +++ b/src/osgWrappers/introspection/osg/MatrixTransform.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::MatrixTransform) I_DeclaringFile("osg/MatrixTransform"); I_BaseType(osg::Transform); diff --git a/src/osgWrappers/introspection/osg/Matrixd.cpp b/src/osgWrappers/introspection/osg/Matrixd.cpp index bf7a5d181..d5f6bb910 100644 --- a/src/osgWrappers/introspection/osg/Matrixd.cpp +++ b/src/osgWrappers/introspection/osg/Matrixd.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(double, osg::Matrixd::value_type) BEGIN_VALUE_REFLECTOR(osg::Matrixd) diff --git a/src/osgWrappers/introspection/osg/Matrixf.cpp b/src/osgWrappers/introspection/osg/Matrixf.cpp index 0ca984ecf..ad1171ab7 100644 --- a/src/osgWrappers/introspection/osg/Matrixf.cpp +++ b/src/osgWrappers/introspection/osg/Matrixf.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(float, osg::Matrixf::value_type) BEGIN_VALUE_REFLECTOR(osg::Matrixf) diff --git a/src/osgWrappers/introspection/osg/Multisample.cpp b/src/osgWrappers/introspection/osg/Multisample.cpp index 8f4dc4bfe..5f34e3b16 100644 --- a/src/osgWrappers/introspection/osg/Multisample.cpp +++ b/src/osgWrappers/introspection/osg/Multisample.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Multisample::Mode) I_DeclaringFile("osg/Multisample"); I_EnumLabel(osg::Multisample::FASTEST); diff --git a/src/osgWrappers/introspection/osg/Node.cpp b/src/osgWrappers/introspection/osg/Node.cpp index 6f7f3b25d..0be842f6f 100644 --- a/src/osgWrappers/introspection/osg/Node.cpp +++ b/src/osgWrappers/introspection/osg/Node.cpp @@ -31,6 +31,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::Group * >, osg::Node::ParentList) TYPE_NAME_ALIAS(unsigned int, osg::Node::NodeMask) diff --git a/src/osgWrappers/introspection/osg/NodeCallback.cpp b/src/osgWrappers/introspection/osg/NodeCallback.cpp index 3c74fbdab..b28a67f73 100644 --- a/src/osgWrappers/introspection/osg/NodeCallback.cpp +++ b/src/osgWrappers/introspection/osg/NodeCallback.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::NodeCallback) I_DeclaringFile("osg/NodeCallback"); I_VirtualBaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osg/NodeTrackerCallback.cpp b/src/osgWrappers/introspection/osg/NodeTrackerCallback.cpp index ddb872453..2c61dccb7 100644 --- a/src/osgWrappers/introspection/osg/NodeTrackerCallback.cpp +++ b/src/osgWrappers/introspection/osg/NodeTrackerCallback.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::NodeTrackerCallback) I_DeclaringFile("osg/NodeTrackerCallback"); I_BaseType(osg::NodeCallback); diff --git a/src/osgWrappers/introspection/osg/NodeVisitor.cpp b/src/osgWrappers/introspection/osg/NodeVisitor.cpp index c87533355..91e02efab 100644 --- a/src/osgWrappers/introspection/osg/NodeVisitor.cpp +++ b/src/osgWrappers/introspection/osg/NodeVisitor.cpp @@ -47,6 +47,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osg::NodeAcceptOp) I_DeclaringFile("osg/NodeVisitor"); I_Constructor1(IN, osg::NodeVisitor &, nv, @@ -467,6 +469,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Referenced >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Referenced > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Referenced *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/Notify.cpp b/src/osgWrappers/introspection/osg/Notify.cpp index 5c6f2c797..647f60c62 100644 --- a/src/osgWrappers/introspection/osg/Notify.cpp +++ b/src/osgWrappers/introspection/osg/Notify.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NotifyHandler) I_DeclaringFile("osg/Notify"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osg/Object.cpp b/src/osgWrappers/introspection/osg/Object.cpp index c825b9dba..5381264e6 100644 --- a/src/osgWrappers/introspection/osg/Object.cpp +++ b/src/osgWrappers/introspection/osg/Object.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Object::DataVariance) I_DeclaringFile("osg/Object"); I_EnumLabel(osg::Object::DYNAMIC); diff --git a/src/osgWrappers/introspection/osg/Observer.cpp b/src/osgWrappers/introspection/osg/Observer.cpp index fec2de543..5e6a0f06e 100644 --- a/src/osgWrappers/introspection/osg/Observer.cpp +++ b/src/osgWrappers/introspection/osg/Observer.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::set< osg::Observer * >, osg::ObserverSet::Observers) STD_SET_REFLECTOR(std::set< osg::Observer * >) diff --git a/src/osgWrappers/introspection/osg/ObserverNodePath.cpp b/src/osgWrappers/introspection/osg/ObserverNodePath.cpp index 05fd2aa94..5e32f37ae 100644 --- a/src/osgWrappers/introspection/osg/ObserverNodePath.cpp +++ b/src/osgWrappers/introspection/osg/ObserverNodePath.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osg::ObserverNodePath) I_DeclaringFile("osg/ObserverNodePath"); I_Constructor0(____ObserverNodePath, diff --git a/src/osgWrappers/introspection/osg/OccluderNode.cpp b/src/osgWrappers/introspection/osg/OccluderNode.cpp index 7583a3a19..7f2085bb9 100644 --- a/src/osgWrappers/introspection/osg/OccluderNode.cpp +++ b/src/osgWrappers/introspection/osg/OccluderNode.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::OccluderNode) I_DeclaringFile("osg/OccluderNode"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osg/OcclusionQueryNode.cpp b/src/osgWrappers/introspection/osg/OcclusionQueryNode.cpp index 365abcf45..a64188624 100644 --- a/src/osgWrappers/introspection/osg/OcclusionQueryNode.cpp +++ b/src/osgWrappers/introspection/osg/OcclusionQueryNode.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::OcclusionQueryNode) I_DeclaringFile("osg/OcclusionQueryNode"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osg/OperationThread.cpp b/src/osgWrappers/introspection/osg/OperationThread.cpp index a647b1788..318209a32 100644 --- a/src/osgWrappers/introspection/osg/OperationThread.cpp +++ b/src/osgWrappers/introspection/osg/OperationThread.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Operation) I_DeclaringFile("osg/OperationThread"); I_VirtualBaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osg/PagedLOD.cpp b/src/osgWrappers/introspection/osg/PagedLOD.cpp index ee490a39e..b8e0259f9 100644 --- a/src/osgWrappers/introspection/osg/PagedLOD.cpp +++ b/src/osgWrappers/introspection/osg/PagedLOD.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::PagedLOD::PerRangeData >, osg::PagedLOD::PerRangeDataList) BEGIN_OBJECT_REFLECTOR(osg::PagedLOD) diff --git a/src/osgWrappers/introspection/osg/Point.cpp b/src/osgWrappers/introspection/osg/Point.cpp index 7922d3361..f8e99088a 100644 --- a/src/osgWrappers/introspection/osg/Point.cpp +++ b/src/osgWrappers/introspection/osg/Point.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Point) I_DeclaringFile("osg/Point"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/PointSprite.cpp b/src/osgWrappers/introspection/osg/PointSprite.cpp index c2814269a..f7df4811e 100644 --- a/src/osgWrappers/introspection/osg/PointSprite.cpp +++ b/src/osgWrappers/introspection/osg/PointSprite.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::PointSprite::CoordOriginMode) I_DeclaringFile("osg/PointSprite"); I_EnumLabel(osg::PointSprite::UPPER_LEFT); diff --git a/src/osgWrappers/introspection/osg/PolygonMode.cpp b/src/osgWrappers/introspection/osg/PolygonMode.cpp index af1fda549..381997260 100644 --- a/src/osgWrappers/introspection/osg/PolygonMode.cpp +++ b/src/osgWrappers/introspection/osg/PolygonMode.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::PolygonMode::Mode) I_DeclaringFile("osg/PolygonMode"); I_EnumLabel(osg::PolygonMode::POINT); diff --git a/src/osgWrappers/introspection/osg/PolygonOffset.cpp b/src/osgWrappers/introspection/osg/PolygonOffset.cpp index 36b411ad2..5774a95a1 100644 --- a/src/osgWrappers/introspection/osg/PolygonOffset.cpp +++ b/src/osgWrappers/introspection/osg/PolygonOffset.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset) I_DeclaringFile("osg/PolygonOffset"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/PolygonStipple.cpp b/src/osgWrappers/introspection/osg/PolygonStipple.cpp index 0d20d5acc..0e54dd213 100644 --- a/src/osgWrappers/introspection/osg/PolygonStipple.cpp +++ b/src/osgWrappers/introspection/osg/PolygonStipple.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple) I_DeclaringFile("osg/PolygonStipple"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/Polytope.cpp b/src/osgWrappers/introspection/osg/Polytope.cpp index 0071f53c7..0c79b3bf5 100644 --- a/src/osgWrappers/introspection/osg/Polytope.cpp +++ b/src/osgWrappers/introspection/osg/Polytope.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(unsigned int, osg::Polytope::ClippingMask) TYPE_NAME_ALIAS(std::vector< osg::Plane >, osg::Polytope::PlaneList) diff --git a/src/osgWrappers/introspection/osg/PositionAttitudeTransform.cpp b/src/osgWrappers/introspection/osg/PositionAttitudeTransform.cpp index d4bd0f34d..adc4bda5a 100644 --- a/src/osgWrappers/introspection/osg/PositionAttitudeTransform.cpp +++ b/src/osgWrappers/introspection/osg/PositionAttitudeTransform.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::PositionAttitudeTransform) I_DeclaringFile("osg/PositionAttitudeTransform"); I_BaseType(osg::Transform); diff --git a/src/osgWrappers/introspection/osg/PrimitiveSet.cpp b/src/osgWrappers/introspection/osg/PrimitiveSet.cpp index 21c952791..9c6092ba5 100644 --- a/src/osgWrappers/introspection/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/introspection/osg/PrimitiveSet.cpp @@ -30,6 +30,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::VectorGLsizei, osg::DrawArrayLengths::vector_type) BEGIN_OBJECT_REFLECTOR(osg::DrawArrays) diff --git a/src/osgWrappers/introspection/osg/Program.cpp b/src/osgWrappers/introspection/osg/Program.cpp index 38e103db5..c76411de3 100644 --- a/src/osgWrappers/introspection/osg/Program.cpp +++ b/src/osgWrappers/introspection/osg/Program.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindingList) TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::FragDataBindingList) diff --git a/src/osgWrappers/introspection/osg/Projection.cpp b/src/osgWrappers/introspection/osg/Projection.cpp index 09a5b0798..25375def9 100644 --- a/src/osgWrappers/introspection/osg/Projection.cpp +++ b/src/osgWrappers/introspection/osg/Projection.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Projection) I_DeclaringFile("osg/Projection"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osg/ProxyNode.cpp b/src/osgWrappers/introspection/osg/ProxyNode.cpp index 2e457de1a..bf6f1b154 100644 --- a/src/osgWrappers/introspection/osg/ProxyNode.cpp +++ b/src/osgWrappers/introspection/osg/ProxyNode.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode) I_DeclaringFile("osg/ProxyNode"); I_EnumLabel(osg::ProxyNode::USE_BOUNDING_SPHERE_CENTER); diff --git a/src/osgWrappers/introspection/osg/Referenced.cpp b/src/osgWrappers/introspection/osg/Referenced.cpp index bd95e6e39..33591d9ab 100644 --- a/src/osgWrappers/introspection/osg/Referenced.cpp +++ b/src/osgWrappers/introspection/osg/Referenced.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Referenced) I_DeclaringFile("osg/Referenced"); I_Constructor0(____Referenced, diff --git a/src/osgWrappers/introspection/osg/RenderInfo.cpp b/src/osgWrappers/introspection/osg/RenderInfo.cpp index 88bc427a9..1c00baad0 100644 --- a/src/osgWrappers/introspection/osg/RenderInfo.cpp +++ b/src/osgWrappers/introspection/osg/RenderInfo.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osg::RenderInfo) I_DeclaringFile("osg/RenderInfo"); I_Constructor0(____RenderInfo, diff --git a/src/osgWrappers/introspection/osg/Scissor.cpp b/src/osgWrappers/introspection/osg/Scissor.cpp index 50c8a425e..a25efb76c 100644 --- a/src/osgWrappers/introspection/osg/Scissor.cpp +++ b/src/osgWrappers/introspection/osg/Scissor.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Scissor) I_DeclaringFile("osg/Scissor"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/Sequence.cpp b/src/osgWrappers/introspection/osg/Sequence.cpp index 059be755b..1f3251280 100644 --- a/src/osgWrappers/introspection/osg/Sequence.cpp +++ b/src/osgWrappers/introspection/osg/Sequence.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Sequence::LoopMode) I_DeclaringFile("osg/Sequence"); I_EnumLabel(osg::Sequence::LOOP); diff --git a/src/osgWrappers/introspection/osg/ShadeModel.cpp b/src/osgWrappers/introspection/osg/ShadeModel.cpp index a522dac69..fcd3ceb9c 100644 --- a/src/osgWrappers/introspection/osg/ShadeModel.cpp +++ b/src/osgWrappers/introspection/osg/ShadeModel.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::ShadeModel::Mode) I_DeclaringFile("osg/ShadeModel"); I_EnumLabel(osg::ShadeModel::FLAT); diff --git a/src/osgWrappers/introspection/osg/Shader.cpp b/src/osgWrappers/introspection/osg/Shader.cpp index 77c28a3ba..0462ccbab 100644 --- a/src/osgWrappers/introspection/osg/Shader.cpp +++ b/src/osgWrappers/introspection/osg/Shader.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Shader::Type) I_DeclaringFile("osg/Shader"); I_EnumLabel(osg::Shader::VERTEX); diff --git a/src/osgWrappers/introspection/osg/ShadowVolumeOccluder.cpp b/src/osgWrappers/introspection/osg/ShadowVolumeOccluder.cpp index 46f770e37..29773ccac 100644 --- a/src/osgWrappers/introspection/osg/ShadowVolumeOccluder.cpp +++ b/src/osgWrappers/introspection/osg/ShadowVolumeOccluder.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::Polytope >, osg::ShadowVolumeOccluder::HoleList) BEGIN_VALUE_REFLECTOR(osg::ShadowVolumeOccluder) diff --git a/src/osgWrappers/introspection/osg/Shape.cpp b/src/osgWrappers/introspection/osg/Shape.cpp index e4e48390b..c4948b3b4 100644 --- a/src/osgWrappers/introspection/osg/Shape.cpp +++ b/src/osgWrappers/introspection/osg/Shape.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Box) I_DeclaringFile("osg/Shape"); I_BaseType(osg::Shape); @@ -1295,6 +1297,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Shape >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Shape > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Shape *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/ShapeDrawable.cpp b/src/osgWrappers/introspection/osg/ShapeDrawable.cpp index 2f693f012..36d0388fa 100644 --- a/src/osgWrappers/introspection/osg/ShapeDrawable.cpp +++ b/src/osgWrappers/introspection/osg/ShapeDrawable.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::ShapeDrawable) I_DeclaringFile("osg/ShapeDrawable"); I_BaseType(osg::Drawable); diff --git a/src/osgWrappers/introspection/osg/State.cpp b/src/osgWrappers/introspection/osg/State.cpp index c48944eff..4fe42b5a1 100644 --- a/src/osgWrappers/introspection/osg/State.cpp +++ b/src/osgWrappers/introspection/osg/State.cpp @@ -34,6 +34,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors) I_DeclaringFile("osg/State"); I_EnumLabel(osg::State::NEVER_CHECK_GL_ERRORS); @@ -167,6 +169,11 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __void__applyModelViewMatrix__C5_osg_RefMatrix_P1, "", ""); + I_Method1(void, applyModelViewMatrix, IN, const osg::Matrix &, x, + Properties::NON_VIRTUAL, + __void__applyModelViewMatrix__C5_osg_Matrix_R1, + "", + ""); I_Method0(const osg::Matrix &, getModelViewMatrix, Properties::NON_VIRTUAL, __C5_osg_Matrix_R1__getModelViewMatrix, @@ -928,6 +935,12 @@ BEGIN_OBJECT_REFLECTOR(osg::State) + I_ProtectedMethod0(void, loadModelViewMatrix, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__loadModelViewMatrix, + "", + ""); I_ProtectedMethod0(bool, computeSecondaryColorSupported, Properties::NON_VIRTUAL, Properties::CONST, diff --git a/src/osgWrappers/introspection/osg/StateAttribute.cpp b/src/osgWrappers/introspection/osg/StateAttribute.cpp index 0fb03e589..74a457ada 100644 --- a/src/osgWrappers/introspection/osg/StateAttribute.cpp +++ b/src/osgWrappers/introspection/osg/StateAttribute.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Values) I_DeclaringFile("osg/StateAttribute"); I_EnumLabel(osg::StateAttribute::OFF); diff --git a/src/osgWrappers/introspection/osg/StateAttributeCallback.cpp b/src/osgWrappers/introspection/osg/StateAttributeCallback.cpp index 25fe43e26..891ba51ea 100644 --- a/src/osgWrappers/introspection/osg/StateAttributeCallback.cpp +++ b/src/osgWrappers/introspection/osg/StateAttributeCallback.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::StateAttributeCallback) I_DeclaringFile("osg/StateAttributeCallback"); I_VirtualBaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osg/StateSet.cpp b/src/osgWrappers/introspection/osg/StateSet.cpp index 698d5957a..1b7c8826c 100644 --- a/src/osgWrappers/introspection/osg/StateSet.cpp +++ b/src/osgWrappers/introspection/osg/StateSet.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderingHint) I_DeclaringFile("osg/StateSet"); I_EnumLabel(osg::StateSet::DEFAULT_BIN); @@ -725,6 +727,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::StateAttribute >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::StateAttribute > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::StateAttribute *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -765,6 +772,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Uniform >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Uniform > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Uniform *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/Stats.cpp b/src/osgWrappers/introspection/osg/Stats.cpp index 71d33fc4b..2487df921 100644 --- a/src/osgWrappers/introspection/osg/Stats.cpp +++ b/src/osgWrappers/introspection/osg/Stats.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::map< std::string COMMA double >, osg::Stats::AttributeMap) TYPE_NAME_ALIAS(std::vector< osg::Stats::AttributeMap >, osg::Stats::AttributeMapList) diff --git a/src/osgWrappers/introspection/osg/Stencil.cpp b/src/osgWrappers/introspection/osg/Stencil.cpp index 85fdf3c97..0f8b8e22b 100644 --- a/src/osgWrappers/introspection/osg/Stencil.cpp +++ b/src/osgWrappers/introspection/osg/Stencil.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Stencil::Function) I_DeclaringFile("osg/Stencil"); I_EnumLabel(osg::Stencil::NEVER); diff --git a/src/osgWrappers/introspection/osg/StencilTwoSided.cpp b/src/osgWrappers/introspection/osg/StencilTwoSided.cpp index 66aa31f85..d5bc646a5 100644 --- a/src/osgWrappers/introspection/osg/StencilTwoSided.cpp +++ b/src/osgWrappers/introspection/osg/StencilTwoSided.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::StencilTwoSided::Face) I_DeclaringFile("osg/StencilTwoSided"); I_EnumLabel(osg::StencilTwoSided::FRONT); diff --git a/src/osgWrappers/introspection/osg/Switch.cpp b/src/osgWrappers/introspection/osg/Switch.cpp index 5dca10777..b594a0de8 100644 --- a/src/osgWrappers/introspection/osg/Switch.cpp +++ b/src/osgWrappers/introspection/osg/Switch.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< bool >, osg::Switch::ValueList) BEGIN_OBJECT_REFLECTOR(osg::Switch) diff --git a/src/osgWrappers/introspection/osg/TexEnv.cpp b/src/osgWrappers/introspection/osg/TexEnv.cpp index 1f4e33193..a02c67b4b 100644 --- a/src/osgWrappers/introspection/osg/TexEnv.cpp +++ b/src/osgWrappers/introspection/osg/TexEnv.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::TexEnv::Mode) I_DeclaringFile("osg/TexEnv"); I_EnumLabel(osg::TexEnv::DECAL); diff --git a/src/osgWrappers/introspection/osg/TexEnvCombine.cpp b/src/osgWrappers/introspection/osg/TexEnvCombine.cpp index f541f9002..39f452122 100644 --- a/src/osgWrappers/introspection/osg/TexEnvCombine.cpp +++ b/src/osgWrappers/introspection/osg/TexEnvCombine.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::TexEnvCombine::CombineParam) I_DeclaringFile("osg/TexEnvCombine"); I_EnumLabel(osg::TexEnvCombine::REPLACE); diff --git a/src/osgWrappers/introspection/osg/TexEnvFilter.cpp b/src/osgWrappers/introspection/osg/TexEnvFilter.cpp index 065e20d1e..ba57c4535 100644 --- a/src/osgWrappers/introspection/osg/TexEnvFilter.cpp +++ b/src/osgWrappers/introspection/osg/TexEnvFilter.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::TexEnvFilter) I_DeclaringFile("osg/TexEnvFilter"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/TexGen.cpp b/src/osgWrappers/introspection/osg/TexGen.cpp index dd2a0607a..cb7b8b631 100644 --- a/src/osgWrappers/introspection/osg/TexGen.cpp +++ b/src/osgWrappers/introspection/osg/TexGen.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::TexGen::Mode) I_DeclaringFile("osg/TexGen"); I_EnumLabel(osg::TexGen::OBJECT_LINEAR); diff --git a/src/osgWrappers/introspection/osg/TexGenNode.cpp b/src/osgWrappers/introspection/osg/TexGenNode.cpp index 687e1675d..a268ae295 100644 --- a/src/osgWrappers/introspection/osg/TexGenNode.cpp +++ b/src/osgWrappers/introspection/osg/TexGenNode.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::TexGenNode::ReferenceFrame) I_DeclaringFile("osg/TexGenNode"); I_EnumLabel(osg::TexGenNode::RELATIVE_RF); diff --git a/src/osgWrappers/introspection/osg/TexMat.cpp b/src/osgWrappers/introspection/osg/TexMat.cpp index d2536423f..0059fc883 100644 --- a/src/osgWrappers/introspection/osg/TexMat.cpp +++ b/src/osgWrappers/introspection/osg/TexMat.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::TexMat) I_DeclaringFile("osg/TexMat"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osg/Texture.cpp b/src/osgWrappers/introspection/osg/Texture.cpp index 67868409f..a731c54b2 100644 --- a/src/osgWrappers/introspection/osg/Texture.cpp +++ b/src/osgWrappers/introspection/osg/Texture.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Texture::WrapParameter) I_DeclaringFile("osg/Texture"); I_EnumLabel(osg::Texture::WRAP_S); @@ -1157,6 +1159,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Texture::TextureObject >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Texture::TextureObject > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Texture::TextureObject *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -1197,6 +1204,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Texture::TextureObjectManager >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Texture::TextureObjectManager > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Texture::TextureObjectManager *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osg/Texture1D.cpp b/src/osgWrappers/introspection/osg/Texture1D.cpp index ff38b732c..f47eb5f47 100644 --- a/src/osgWrappers/introspection/osg/Texture1D.cpp +++ b/src/osgWrappers/introspection/osg/Texture1D.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Texture1D) I_DeclaringFile("osg/Texture1D"); I_BaseType(osg::Texture); diff --git a/src/osgWrappers/introspection/osg/Texture2D.cpp b/src/osgWrappers/introspection/osg/Texture2D.cpp index 3e356a103..0db29ec65 100644 --- a/src/osgWrappers/introspection/osg/Texture2D.cpp +++ b/src/osgWrappers/introspection/osg/Texture2D.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Texture2D) I_DeclaringFile("osg/Texture2D"); I_BaseType(osg::Texture); diff --git a/src/osgWrappers/introspection/osg/Texture2DArray.cpp b/src/osgWrappers/introspection/osg/Texture2DArray.cpp index abc77195f..42d66e075 100644 --- a/src/osgWrappers/introspection/osg/Texture2DArray.cpp +++ b/src/osgWrappers/introspection/osg/Texture2DArray.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Texture2DArray) I_DeclaringFile("osg/Texture2DArray"); I_BaseType(osg::Texture); diff --git a/src/osgWrappers/introspection/osg/Texture3D.cpp b/src/osgWrappers/introspection/osg/Texture3D.cpp index 141454846..b18346ae6 100644 --- a/src/osgWrappers/introspection/osg/Texture3D.cpp +++ b/src/osgWrappers/introspection/osg/Texture3D.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::Texture3D) I_DeclaringFile("osg/Texture3D"); I_BaseType(osg::Texture); diff --git a/src/osgWrappers/introspection/osg/TextureCubeMap.cpp b/src/osgWrappers/introspection/osg/TextureCubeMap.cpp index 0549c788a..ef94725b8 100644 --- a/src/osgWrappers/introspection/osg/TextureCubeMap.cpp +++ b/src/osgWrappers/introspection/osg/TextureCubeMap.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::TextureCubeMap::Face) I_DeclaringFile("osg/TextureCubeMap"); I_EnumLabel(osg::TextureCubeMap::POSITIVE_X); diff --git a/src/osgWrappers/introspection/osg/TextureRectangle.cpp b/src/osgWrappers/introspection/osg/TextureRectangle.cpp index c58f33edc..9a1ecf267 100644 --- a/src/osgWrappers/introspection/osg/TextureRectangle.cpp +++ b/src/osgWrappers/introspection/osg/TextureRectangle.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::TextureRectangle) I_DeclaringFile("osg/TextureRectangle"); I_BaseType(osg::Texture); diff --git a/src/osgWrappers/introspection/osg/Timer.cpp b/src/osgWrappers/introspection/osg/Timer.cpp index 80cb53f7b..94b678650 100644 --- a/src/osgWrappers/introspection/osg/Timer.cpp +++ b/src/osgWrappers/introspection/osg/Timer.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osg::ElapsedTime) I_DeclaringFile("osg/Timer"); I_ConstructorWithDefaults2(IN, double *, elapsedTime, , IN, osg::Timer *, timer, 0, diff --git a/src/osgWrappers/introspection/osg/TransferFunction.cpp b/src/osgWrappers/introspection/osg/TransferFunction.cpp index 3311ea2a1..1d931d559 100644 --- a/src/osgWrappers/introspection/osg/TransferFunction.cpp +++ b/src/osgWrappers/introspection/osg/TransferFunction.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osg::TransferFunction) I_DeclaringFile("osg/TransferFunction"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osg/Transform.cpp b/src/osgWrappers/introspection/osg/Transform.cpp index b02dcc71c..0a1ece3a7 100644 --- a/src/osgWrappers/introspection/osg/Transform.cpp +++ b/src/osgWrappers/introspection/osg/Transform.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::Transform::ReferenceFrame) I_DeclaringFile("osg/Transform"); I_EnumLabel(osg::Transform::RELATIVE_RF); diff --git a/src/osgWrappers/introspection/osg/Uniform.cpp b/src/osgWrappers/introspection/osg/Uniform.cpp index 484d4da80..1feaaae2c 100644 --- a/src/osgWrappers/introspection/osg/Uniform.cpp +++ b/src/osgWrappers/introspection/osg/Uniform.cpp @@ -31,6 +31,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osg::Matrix2) I_DeclaringFile("osg/Uniform"); I_Constructor0(____Matrix2, diff --git a/src/osgWrappers/introspection/osg/Vec2.cpp b/src/osgWrappers/introspection/osg/Vec2.cpp index 98d26f6b4..7e4458250 100644 --- a/src/osgWrappers/introspection/osg/Vec2.cpp +++ b/src/osgWrappers/introspection/osg/Vec2.cpp @@ -20,5 +20,7 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Vec2f, osg::Vec2) diff --git a/src/osgWrappers/introspection/osg/Vec2s.cpp b/src/osgWrappers/introspection/osg/Vec2s.cpp index f969cfc5c..8c35df7aa 100644 --- a/src/osgWrappers/introspection/osg/Vec2s.cpp +++ b/src/osgWrappers/introspection/osg/Vec2s.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(short, osg::Vec2s::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec2s) diff --git a/src/osgWrappers/introspection/osg/Vec3.cpp b/src/osgWrappers/introspection/osg/Vec3.cpp index b3dcb02f2..1242eba91 100644 --- a/src/osgWrappers/introspection/osg/Vec3.cpp +++ b/src/osgWrappers/introspection/osg/Vec3.cpp @@ -20,5 +20,7 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Vec3f, osg::Vec3) diff --git a/src/osgWrappers/introspection/osg/Vec3s.cpp b/src/osgWrappers/introspection/osg/Vec3s.cpp index 365f55447..5d0432f52 100644 --- a/src/osgWrappers/introspection/osg/Vec3s.cpp +++ b/src/osgWrappers/introspection/osg/Vec3s.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(short, osg::Vec3s::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec3s) diff --git a/src/osgWrappers/introspection/osg/Vec4.cpp b/src/osgWrappers/introspection/osg/Vec4.cpp index 671ce35e6..b11981493 100644 --- a/src/osgWrappers/introspection/osg/Vec4.cpp +++ b/src/osgWrappers/introspection/osg/Vec4.cpp @@ -20,5 +20,7 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Vec4f, osg::Vec4) diff --git a/src/osgWrappers/introspection/osg/Vec4s.cpp b/src/osgWrappers/introspection/osg/Vec4s.cpp index d04ec6475..9d9fad57d 100644 --- a/src/osgWrappers/introspection/osg/Vec4s.cpp +++ b/src/osgWrappers/introspection/osg/Vec4s.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(short, osg::Vec4s::value_type) BEGIN_VALUE_REFLECTOR(osg::Vec4s) diff --git a/src/osgWrappers/introspection/osg/VertexProgram.cpp b/src/osgWrappers/introspection/osg/VertexProgram.cpp index 273cfe949..782fcf27d 100644 --- a/src/osgWrappers/introspection/osg/VertexProgram.cpp +++ b/src/osgWrappers/introspection/osg/VertexProgram.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::VertexProgram::LocalParamList) TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::VertexProgram::MatrixList) diff --git a/src/osgWrappers/introspection/osg/View.cpp b/src/osgWrappers/introspection/osg/View.cpp index a82dd24ad..d5db7a035 100644 --- a/src/osgWrappers/introspection/osg/View.cpp +++ b/src/osgWrappers/introspection/osg/View.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osg::View::LightingMode) I_DeclaringFile("osg/View"); I_EnumLabel(osg::View::NO_LIGHT); diff --git a/src/osgWrappers/introspection/osg/Viewport.cpp b/src/osgWrappers/introspection/osg/Viewport.cpp index d6ecbb174..715e6e5c8 100644 --- a/src/osgWrappers/introspection/osg/Viewport.cpp +++ b/src/osgWrappers/introspection/osg/Viewport.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(double, osg::Viewport::value_type) BEGIN_OBJECT_REFLECTOR(osg::Viewport) diff --git a/src/osgWrappers/introspection/osgAnimation/Action.cpp b/src/osgWrappers/introspection/osgAnimation/Action.cpp index b391e9431..e29745890 100644 --- a/src/osgWrappers/introspection/osgAnimation/Action.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Action.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::map< unsigned int COMMA osg::ref_ptr< osgAnimation::Action::Callback > >, osgAnimation::Action::FrameCallback) BEGIN_OBJECT_REFLECTOR(osgAnimation::Action) @@ -228,6 +230,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Action::Callback >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgAnimation::Action::Callback > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgAnimation::Action::Callback *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgAnimation/ActionAnimation.cpp b/src/osgWrappers/introspection/osgAnimation/ActionAnimation.cpp index ae208f2a5..4c7a015d6 100644 --- a/src/osgWrappers/introspection/osgAnimation/ActionAnimation.cpp +++ b/src/osgWrappers/introspection/osgAnimation/ActionAnimation.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::ActionAnimation) I_DeclaringFile("osgAnimation/ActionAnimation"); I_BaseType(osgAnimation::Action); diff --git a/src/osgWrappers/introspection/osgAnimation/ActionBlendIn.cpp b/src/osgWrappers/introspection/osgAnimation/ActionBlendIn.cpp index 6354d1acd..f5f168d7e 100644 --- a/src/osgWrappers/introspection/osgAnimation/ActionBlendIn.cpp +++ b/src/osgWrappers/introspection/osgAnimation/ActionBlendIn.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::ActionBlendIn) I_DeclaringFile("osgAnimation/ActionBlendIn"); I_BaseType(osgAnimation::Action); diff --git a/src/osgWrappers/introspection/osgAnimation/ActionBlendOut.cpp b/src/osgWrappers/introspection/osgAnimation/ActionBlendOut.cpp index 35bd004f6..0f52b6482 100644 --- a/src/osgWrappers/introspection/osgAnimation/ActionBlendOut.cpp +++ b/src/osgWrappers/introspection/osgAnimation/ActionBlendOut.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::ActionBlendOut) I_DeclaringFile("osgAnimation/ActionBlendOut"); I_BaseType(osgAnimation::Action); diff --git a/src/osgWrappers/introspection/osgAnimation/ActionCallback.cpp b/src/osgWrappers/introspection/osgAnimation/ActionCallback.cpp index 09475be56..c162fce18 100644 --- a/src/osgWrappers/introspection/osgAnimation/ActionCallback.cpp +++ b/src/osgWrappers/introspection/osgAnimation/ActionCallback.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::RunAction) I_DeclaringFile("osgAnimation/ActionCallback"); I_BaseType(osgAnimation::Action::Callback); diff --git a/src/osgWrappers/introspection/osgAnimation/ActionStripAnimation.cpp b/src/osgWrappers/introspection/osgAnimation/ActionStripAnimation.cpp index 57cf805d5..0cb783509 100644 --- a/src/osgWrappers/introspection/osgAnimation/ActionStripAnimation.cpp +++ b/src/osgWrappers/introspection/osgAnimation/ActionStripAnimation.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::ActionStripAnimation) I_DeclaringFile("osgAnimation/ActionStripAnimation"); I_BaseType(osgAnimation::Action); diff --git a/src/osgWrappers/introspection/osgAnimation/ActionVisitor.cpp b/src/osgWrappers/introspection/osgAnimation/ActionVisitor.cpp index b1670a5fa..5ed714fb9 100644 --- a/src/osgWrappers/introspection/osgAnimation/ActionVisitor.cpp +++ b/src/osgWrappers/introspection/osgAnimation/ActionVisitor.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::ActionVisitor) I_DeclaringFile("osgAnimation/ActionVisitor"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgAnimation/Animation.cpp b/src/osgWrappers/introspection/osgAnimation/Animation.cpp index f95876d53..b99fc8b62 100644 --- a/src/osgWrappers/introspection/osgAnimation/Animation.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Animation.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgAnimation::Animation::PlayMode) I_DeclaringFile("osgAnimation/Animation"); I_EnumLabel(osgAnimation::Animation::ONCE); @@ -178,6 +180,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Animation >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgAnimation::Animation > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgAnimation::Animation *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgAnimation/AnimationManagerBase.cpp b/src/osgWrappers/introspection/osgAnimation/AnimationManagerBase.cpp index 9756f98d5..e6a7cd8c9 100644 --- a/src/osgWrappers/introspection/osgAnimation/AnimationManagerBase.cpp +++ b/src/osgWrappers/introspection/osgAnimation/AnimationManagerBase.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::set< osg::ref_ptr< osgAnimation::Target > >, osgAnimation::AnimationManagerBase::TargetSet) BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationManagerBase) @@ -134,6 +136,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Target >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgAnimation::Target > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgAnimation::Target *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgAnimation/AnimationUpdateCallback.cpp b/src/osgWrappers/introspection/osgAnimation/AnimationUpdateCallback.cpp index e4ef320c6..3941fa498 100644 --- a/src/osgWrappers/introspection/osgAnimation/AnimationUpdateCallback.cpp +++ b/src/osgWrappers/introspection/osgAnimation/AnimationUpdateCallback.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationUpdateCallbackBase) I_DeclaringFile("osgAnimation/AnimationUpdateCallback"); I_VirtualBaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgAnimation/BasicAnimationManager.cpp b/src/osgWrappers/introspection/osgAnimation/BasicAnimationManager.cpp index 99b99d397..b85bb7dff 100644 --- a/src/osgWrappers/introspection/osgAnimation/BasicAnimationManager.cpp +++ b/src/osgWrappers/introspection/osgAnimation/BasicAnimationManager.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::BasicAnimationManager) I_DeclaringFile("osgAnimation/BasicAnimationManager"); I_BaseType(osgAnimation::AnimationManagerBase); diff --git a/src/osgWrappers/introspection/osgAnimation/Bone.cpp b/src/osgWrappers/introspection/osgAnimation/Bone.cpp index bf44eec5d..4d5eaa322 100644 --- a/src/osgWrappers/introspection/osgAnimation/Bone.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Bone.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Matrix, osgAnimation::Bone::MatrixType) BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone) @@ -142,6 +144,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Bone >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgAnimation::Bone > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgAnimation::Bone *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgAnimation/BoneMapVisitor.cpp b/src/osgWrappers/introspection/osgAnimation/BoneMapVisitor.cpp index 43595276c..20b8ef738 100644 --- a/src/osgWrappers/introspection/osgAnimation/BoneMapVisitor.cpp +++ b/src/osgWrappers/introspection/osgAnimation/BoneMapVisitor.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::BoneMapVisitor) I_DeclaringFile("osgAnimation/BoneMapVisitor"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/introspection/osgAnimation/Channel.cpp b/src/osgWrappers/introspection/osgAnimation/Channel.cpp index 561b8ef1a..a35932161 100644 --- a/src/osgWrappers/introspection/osgAnimation/Channel.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Channel.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osg::Referenced); @@ -176,6 +178,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Channel >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgAnimation::Channel > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgAnimation::Channel *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgAnimation/CubicBezier.cpp b/src/osgWrappers/introspection/osgAnimation/CubicBezier.cpp index a4e404fb4..e9a444759 100644 --- a/src/osgWrappers/introspection/osgAnimation/CubicBezier.cpp +++ b/src/osgWrappers/introspection/osgAnimation/CubicBezier.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osgAnimation::TemplateCubicBezier< float >, osgAnimation::FloatCubicBezier) TYPE_NAME_ALIAS(osgAnimation::TemplateCubicBezier< double >, osgAnimation::DoubleCubicBezier) diff --git a/src/osgWrappers/introspection/osgAnimation/EaseMotion.cpp b/src/osgWrappers/introspection/osgAnimation/EaseMotion.cpp index 56da62776..3305dfce0 100644 --- a/src/osgWrappers/introspection/osgAnimation/EaseMotion.cpp +++ b/src/osgWrappers/introspection/osgAnimation/EaseMotion.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgAnimation::Motion > >, osgAnimation::CompositeMotion::MotionList) BEGIN_OBJECT_REFLECTOR(osgAnimation::CompositeMotion) @@ -510,6 +512,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Motion >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgAnimation::Motion > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgAnimation::Motion *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgAnimation/FrameAction.cpp b/src/osgWrappers/introspection/osgAnimation/FrameAction.cpp index b93506cb0..35306fe51 100644 --- a/src/osgWrappers/introspection/osgAnimation/FrameAction.cpp +++ b/src/osgWrappers/introspection/osgAnimation/FrameAction.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::pair< unsigned int COMMA osg::ref_ptr< osgAnimation::Action > >, osgAnimation::FrameAction) BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Action >) @@ -38,6 +40,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Action >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgAnimation::Action > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgAnimation::Action *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgAnimation/Interpolator.cpp b/src/osgWrappers/introspection/osgAnimation/Interpolator.cpp index d4e4a1642..1d581f26b 100644 --- a/src/osgWrappers/introspection/osgAnimation/Interpolator.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Interpolator.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osgAnimation::TemplateStepInterpolator< double COMMA double >, osgAnimation::DoubleStepInterpolator) TYPE_NAME_ALIAS(osgAnimation::TemplateStepInterpolator< float COMMA float >, osgAnimation::FloatStepInterpolator) diff --git a/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp b/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp index 3b42ffead..74256bbbf 100644 --- a/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgAnimation::Keyframe) I_DeclaringFile("osgAnimation/Keyframe"); I_Constructor0(____Keyframe, diff --git a/src/osgWrappers/introspection/osgAnimation/LinkVisitor.cpp b/src/osgWrappers/introspection/osgAnimation/LinkVisitor.cpp index 1aa4366fb..cca9d5463 100644 --- a/src/osgWrappers/introspection/osgAnimation/LinkVisitor.cpp +++ b/src/osgWrappers/introspection/osgAnimation/LinkVisitor.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::LinkVisitor) I_DeclaringFile("osgAnimation/LinkVisitor"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/introspection/osgAnimation/MorphGeometry.cpp b/src/osgWrappers/introspection/osgAnimation/MorphGeometry.cpp index 53376d3a2..38ad214f0 100644 --- a/src/osgWrappers/introspection/osgAnimation/MorphGeometry.cpp +++ b/src/osgWrappers/introspection/osgAnimation/MorphGeometry.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgAnimation::MorphGeometry::Method) I_DeclaringFile("osgAnimation/MorphGeometry"); I_EnumLabel(osgAnimation::MorphGeometry::NORMALIZED); diff --git a/src/osgWrappers/introspection/osgAnimation/RigGeometry.cpp b/src/osgWrappers/introspection/osgAnimation/RigGeometry.cpp index fee53a78d..074afc9e3 100644 --- a/src/osgWrappers/introspection/osgAnimation/RigGeometry.cpp +++ b/src/osgWrappers/introspection/osgAnimation/RigGeometry.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry) I_DeclaringFile("osgAnimation/RigGeometry"); I_BaseType(osg::Geometry); diff --git a/src/osgWrappers/introspection/osgAnimation/RigTransform.cpp b/src/osgWrappers/introspection/osgAnimation/RigTransform.cpp index 8dcd7bdd3..597b967d4 100644 --- a/src/osgWrappers/introspection/osgAnimation/RigTransform.cpp +++ b/src/osgWrappers/introspection/osgAnimation/RigTransform.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::RigTransform) I_DeclaringFile("osgAnimation/RigTransform"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgAnimation/RigTransformHardware.cpp b/src/osgWrappers/introspection/osgAnimation/RigTransformHardware.cpp index c64cc0f76..d2a5078e2 100644 --- a/src/osgWrappers/introspection/osgAnimation/RigTransformHardware.cpp +++ b/src/osgWrappers/introspection/osgAnimation/RigTransformHardware.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Matrix, osgAnimation::RigTransformHardware::MatrixType) TYPE_NAME_ALIAS(osgAnimation::Bone, osgAnimation::RigTransformHardware::BoneType) @@ -162,6 +164,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Vec4Array >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Vec4Array > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Vec4Array *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -202,6 +209,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::RigTransformHardware::BoneType ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgAnimation::RigTransformHardware::BoneType > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgAnimation::RigTransformHardware::BoneType *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgAnimation/RigTransformSoftware.cpp b/src/osgWrappers/introspection/osgAnimation/RigTransformSoftware.cpp index 0f6833570..b90376c92 100644 --- a/src/osgWrappers/introspection/osgAnimation/RigTransformSoftware.cpp +++ b/src/osgWrappers/introspection/osgAnimation/RigTransformSoftware.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osgAnimation::RigTransformSoftware::BoneWeight >, osgAnimation::RigTransformSoftware::BoneWeightList) TYPE_NAME_ALIAS(std::vector< int >, osgAnimation::RigTransformSoftware::VertexList) diff --git a/src/osgWrappers/introspection/osgAnimation/Sampler.cpp b/src/osgWrappers/introspection/osgAnimation/Sampler.cpp index abb7f58e7..4c993571b 100644 --- a/src/osgWrappers/introspection/osgAnimation/Sampler.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Sampler.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Sampler) I_DeclaringFile("osgAnimation/Sampler"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgAnimation/Skeleton.cpp b/src/osgWrappers/introspection/osgAnimation/Skeleton.cpp index e612ebdcf..6a5a3d5b2 100644 --- a/src/osgWrappers/introspection/osgAnimation/Skeleton.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Skeleton.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::Skeleton) I_DeclaringFile("osgAnimation/Skeleton"); I_BaseType(osg::MatrixTransform); diff --git a/src/osgWrappers/introspection/osgAnimation/StackedMatrixElement.cpp b/src/osgWrappers/introspection/osgAnimation/StackedMatrixElement.cpp index 8470e1f6a..2e02b11d9 100644 --- a/src/osgWrappers/introspection/osgAnimation/StackedMatrixElement.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StackedMatrixElement.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::StackedMatrixElement) I_DeclaringFile("osgAnimation/StackedMatrixElement"); I_BaseType(osgAnimation::StackedTransformElement); diff --git a/src/osgWrappers/introspection/osgAnimation/StackedQuaternionElement.cpp b/src/osgWrappers/introspection/osgAnimation/StackedQuaternionElement.cpp index a9d776373..9649587de 100644 --- a/src/osgWrappers/introspection/osgAnimation/StackedQuaternionElement.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StackedQuaternionElement.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::StackedQuaternionElement) I_DeclaringFile("osgAnimation/StackedQuaternionElement"); I_BaseType(osgAnimation::StackedTransformElement); diff --git a/src/osgWrappers/introspection/osgAnimation/StackedRotateAxisElement.cpp b/src/osgWrappers/introspection/osgAnimation/StackedRotateAxisElement.cpp index e2bc0c456..3dbe2ef9b 100644 --- a/src/osgWrappers/introspection/osgAnimation/StackedRotateAxisElement.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StackedRotateAxisElement.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::StackedRotateAxisElement) I_DeclaringFile("osgAnimation/StackedRotateAxisElement"); I_BaseType(osgAnimation::StackedTransformElement); diff --git a/src/osgWrappers/introspection/osgAnimation/StackedScaleElement.cpp b/src/osgWrappers/introspection/osgAnimation/StackedScaleElement.cpp index 5979c0819..dc4ec5e09 100644 --- a/src/osgWrappers/introspection/osgAnimation/StackedScaleElement.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StackedScaleElement.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::StackedScaleElement) I_DeclaringFile("osgAnimation/StackedScaleElement"); I_BaseType(osgAnimation::StackedTransformElement); diff --git a/src/osgWrappers/introspection/osgAnimation/StackedTransform.cpp b/src/osgWrappers/introspection/osgAnimation/StackedTransform.cpp index 48b9dc275..29061e59a 100644 --- a/src/osgWrappers/introspection/osgAnimation/StackedTransform.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StackedTransform.cpp @@ -22,3 +22,5 @@ #undef OUT #endif +#include + diff --git a/src/osgWrappers/introspection/osgAnimation/StackedTransformElement.cpp b/src/osgWrappers/introspection/osgAnimation/StackedTransformElement.cpp index 7e5485559..cd784ac2b 100644 --- a/src/osgWrappers/introspection/osgAnimation/StackedTransformElement.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StackedTransformElement.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::StackedTransformElement) I_DeclaringFile("osgAnimation/StackedTransformElement"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgAnimation/StackedTranslateElement.cpp b/src/osgWrappers/introspection/osgAnimation/StackedTranslateElement.cpp index a03192bfd..13133709c 100644 --- a/src/osgWrappers/introspection/osgAnimation/StackedTranslateElement.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StackedTranslateElement.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::StackedTranslateElement) I_DeclaringFile("osgAnimation/StackedTranslateElement"); I_BaseType(osgAnimation::StackedTransformElement); diff --git a/src/osgWrappers/introspection/osgAnimation/StatsHandler.cpp b/src/osgWrappers/introspection/osgAnimation/StatsHandler.cpp index c7be88826..01d88f1c0 100644 --- a/src/osgWrappers/introspection/osgAnimation/StatsHandler.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StatsHandler.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgAnimation::StatsHandler::StatsType) I_DeclaringFile("osgAnimation/StatsHandler"); I_EnumLabel(osgAnimation::StatsHandler::NO_STATS); diff --git a/src/osgWrappers/introspection/osgAnimation/StatsVisitor.cpp b/src/osgWrappers/introspection/osgAnimation/StatsVisitor.cpp index 72e0129df..65360b7e4 100644 --- a/src/osgWrappers/introspection/osgAnimation/StatsVisitor.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StatsVisitor.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::StatsActionVisitor) I_DeclaringFile("osgAnimation/StatsVisitor"); I_BaseType(osgAnimation::UpdateActionVisitor); diff --git a/src/osgWrappers/introspection/osgAnimation/Target.cpp b/src/osgWrappers/introspection/osgAnimation/Target.cpp index 60c804839..f96c8f1a3 100644 --- a/src/osgWrappers/introspection/osgAnimation/Target.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Target.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::Target) I_DeclaringFile("osgAnimation/Target"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgAnimation/Timeline.cpp b/src/osgWrappers/introspection/osgAnimation/Timeline.cpp index 8cafe5b24..63673fb73 100644 --- a/src/osgWrappers/introspection/osgAnimation/Timeline.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Timeline.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgAnimation::Timeline::TimelineStatus) I_DeclaringFile("osgAnimation/Timeline"); I_EnumLabel(osgAnimation::Timeline::Play); diff --git a/src/osgWrappers/introspection/osgAnimation/TimelineAnimationManager.cpp b/src/osgWrappers/introspection/osgAnimation/TimelineAnimationManager.cpp index f3d3f32dd..935ab9deb 100644 --- a/src/osgWrappers/introspection/osgAnimation/TimelineAnimationManager.cpp +++ b/src/osgWrappers/introspection/osgAnimation/TimelineAnimationManager.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::TimelineAnimationManager) I_DeclaringFile("osgAnimation/TimelineAnimationManager"); I_BaseType(osgAnimation::AnimationManagerBase); diff --git a/src/osgWrappers/introspection/osgAnimation/UpdateBone.cpp b/src/osgWrappers/introspection/osgAnimation/UpdateBone.cpp index 13077c4a6..71708bcbb 100644 --- a/src/osgWrappers/introspection/osgAnimation/UpdateBone.cpp +++ b/src/osgWrappers/introspection/osgAnimation/UpdateBone.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateBone) I_DeclaringFile("osgAnimation/UpdateBone"); I_BaseType(osgAnimation::UpdateMatrixTransform); diff --git a/src/osgWrappers/introspection/osgAnimation/UpdateMaterial.cpp b/src/osgWrappers/introspection/osgAnimation/UpdateMaterial.cpp index 988b5f5da..9ebb56287 100644 --- a/src/osgWrappers/introspection/osgAnimation/UpdateMaterial.cpp +++ b/src/osgWrappers/introspection/osgAnimation/UpdateMaterial.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateMaterial) I_DeclaringFile("osgAnimation/UpdateMaterial"); I_Method0(osg::Object *, cloneType, diff --git a/src/osgWrappers/introspection/osgAnimation/UpdateMatrixTransform.cpp b/src/osgWrappers/introspection/osgAnimation/UpdateMatrixTransform.cpp index e6eed74d3..60f9507d0 100644 --- a/src/osgWrappers/introspection/osgAnimation/UpdateMatrixTransform.cpp +++ b/src/osgWrappers/introspection/osgAnimation/UpdateMatrixTransform.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateMatrixTransform) I_DeclaringFile("osgAnimation/UpdateMatrixTransform"); I_Method0(osg::Object *, cloneType, diff --git a/src/osgWrappers/introspection/osgAnimation/Vec3Packed.cpp b/src/osgWrappers/introspection/osgAnimation/Vec3Packed.cpp index 237578419..f9cebc9a7 100644 --- a/src/osgWrappers/introspection/osgAnimation/Vec3Packed.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Vec3Packed.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgAnimation::Vec3ArrayPacked) I_DeclaringFile("osgAnimation/Vec3Packed"); I_Constructor0(____Vec3ArrayPacked, diff --git a/src/osgWrappers/introspection/osgAnimation/VertexInfluence.cpp b/src/osgWrappers/introspection/osgAnimation/VertexInfluence.cpp index 281ec3f7f..587333207 100644 --- a/src/osgWrappers/introspection/osgAnimation/VertexInfluence.cpp +++ b/src/osgWrappers/introspection/osgAnimation/VertexInfluence.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgAnimation::VertexInfluence) I_DeclaringFile("osgAnimation/VertexInfluence"); I_Constructor0(____VertexInfluence, diff --git a/src/osgWrappers/introspection/osgDB/Archive.cpp b/src/osgWrappers/introspection/osgDB/Archive.cpp index b7cfb78e8..9d725658b 100644 --- a/src/osgWrappers/introspection/osgDB/Archive.cpp +++ b/src/osgWrappers/introspection/osgDB/Archive.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::Archive::FileNameList) BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Archive) diff --git a/src/osgWrappers/introspection/osgDB/AuthenticationMap.cpp b/src/osgWrappers/introspection/osgDB/AuthenticationMap.cpp index ccddec88e..c560de13c 100644 --- a/src/osgWrappers/introspection/osgDB/AuthenticationMap.cpp +++ b/src/osgWrappers/introspection/osgDB/AuthenticationMap.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::AuthenticationDetails::HttpAuthentication) I_DeclaringFile("osgDB/AuthenticationMap"); I_EnumLabel(osgDB::AuthenticationDetails::BASIC); diff --git a/src/osgWrappers/introspection/osgDB/Callbacks.cpp b/src/osgWrappers/introspection/osgDB/Callbacks.cpp index 466744a60..b94fba6c7 100644 --- a/src/osgWrappers/introspection/osgDB/Callbacks.cpp +++ b/src/osgWrappers/introspection/osgDB/Callbacks.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::FileLocationCallback::Location) I_DeclaringFile("osgDB/Callbacks"); I_EnumLabel(osgDB::FileLocationCallback::LOCAL_FILE); diff --git a/src/osgWrappers/introspection/osgDB/DatabasePager.cpp b/src/osgWrappers/introspection/osgDB/DatabasePager.cpp index 4eb7694df..7230d1e6c 100644 --- a/src/osgWrappers/introspection/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/introspection/osgDB/DatabasePager.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::DatabasePager::DrawablePolicy) I_DeclaringFile("osgDB/DatabasePager"); I_EnumLabel(osgDB::DatabasePager::DO_NOT_MODIFY_DRAWABLE_SETTINGS); @@ -596,6 +598,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgDB::DatabasePager >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgDB::DatabasePager > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgDB::DatabasePager *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgDB/DatabaseRevisions.cpp b/src/osgWrappers/introspection/osgDB/DatabaseRevisions.cpp index 426e4f2b4..782d7ce6c 100644 --- a/src/osgWrappers/introspection/osgDB/DatabaseRevisions.cpp +++ b/src/osgWrappers/introspection/osgDB/DatabaseRevisions.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::set< std::string >, osgDB::DatabaseRevision::FileNames) BEGIN_OBJECT_REFLECTOR(osgDB::DatabaseRevision) @@ -320,6 +322,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgDB::DatabaseRevision >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgDB::DatabaseRevision > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgDB::DatabaseRevision *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgDB/DotOsgWrapper.cpp b/src/osgWrappers/introspection/osgDB/DotOsgWrapper.cpp index f038cb3f0..8925859e5 100644 --- a/src/osgWrappers/introspection/osgDB/DotOsgWrapper.cpp +++ b/src/osgWrappers/introspection/osgDB/DotOsgWrapper.cpp @@ -30,6 +30,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::list< std::string >, osgDB::DeprecatedDotOsgWrapperManager::FileNames) BEGIN_OBJECT_REFLECTOR(osgDB::DeprecatedDotOsgWrapperManager) diff --git a/src/osgWrappers/introspection/osgDB/DynamicLibrary.cpp b/src/osgWrappers/introspection/osgDB/DynamicLibrary.cpp index 10dc1d29e..9a4dd1199 100644 --- a/src/osgWrappers/introspection/osgDB/DynamicLibrary.cpp +++ b/src/osgWrappers/introspection/osgDB/DynamicLibrary.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::HANDLE) TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::PROC_ADDRESS) diff --git a/src/osgWrappers/introspection/osgDB/FileCache.cpp b/src/osgWrappers/introspection/osgDB/FileCache.cpp index 68a50122e..0980667ba 100644 --- a/src/osgWrappers/introspection/osgDB/FileCache.cpp +++ b/src/osgWrappers/introspection/osgDB/FileCache.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgDB::DatabaseRevisions > >, osgDB::FileCache::DatabaseRevisionsList) BEGIN_OBJECT_REFLECTOR(osgDB::FileCache) @@ -158,6 +160,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgDB::DatabaseRevisions >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgDB::DatabaseRevisions > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgDB::DatabaseRevisions *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgDB/FileUtils.cpp b/src/osgWrappers/introspection/osgDB/FileUtils.cpp index b48946e08..c7d35955f 100644 --- a/src/osgWrappers/introspection/osgDB/FileUtils.cpp +++ b/src/osgWrappers/introspection/osgDB/FileUtils.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::FileType) I_DeclaringFile("osgDB/FileUtils"); I_EnumLabel(osgDB::FILE_NOT_FOUND); diff --git a/src/osgWrappers/introspection/osgDB/ImageOptions.cpp b/src/osgWrappers/introspection/osgDB/ImageOptions.cpp index ac3a01020..ae116f9b7 100644 --- a/src/osgWrappers/introspection/osgDB/ImageOptions.cpp +++ b/src/osgWrappers/introspection/osgDB/ImageOptions.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::ImageOptions::ImageWindowMode) I_DeclaringFile("osgDB/ImageOptions"); I_EnumLabel(osgDB::ImageOptions::ALL_IMAGE); diff --git a/src/osgWrappers/introspection/osgDB/ImagePager.cpp b/src/osgWrappers/introspection/osgDB/ImagePager.cpp index 833cdcdfd..acaed24fe 100644 --- a/src/osgWrappers/introspection/osgDB/ImagePager.cpp +++ b/src/osgWrappers/introspection/osgDB/ImagePager.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgDB::ImagePager) I_DeclaringFile("osgDB/ImagePager"); I_BaseType(osg::NodeVisitor::ImageRequestHandler); diff --git a/src/osgWrappers/introspection/osgDB/Input.cpp b/src/osgWrappers/introspection/osgDB/Input.cpp index 9c3970be0..8723bcfe2 100644 --- a/src/osgWrappers/introspection/osgDB/Input.cpp +++ b/src/osgWrappers/introspection/osgDB/Input.cpp @@ -35,6 +35,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::Field::FieldType) I_DeclaringFile("osgDB/Input"); I_EnumLabel(osgDB::Field::OPEN_BRACKET); diff --git a/src/osgWrappers/introspection/osgDB/ObjectWrapper.cpp b/src/osgWrappers/introspection/osgDB/ObjectWrapper.cpp index a83f45007..7a9bbfa92 100644 --- a/src/osgWrappers/introspection/osgDB/ObjectWrapper.cpp +++ b/src/osgWrappers/introspection/osgDB/ObjectWrapper.cpp @@ -20,5 +20,7 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::StringList) diff --git a/src/osgWrappers/introspection/osgDB/Options.cpp b/src/osgWrappers/introspection/osgDB/Options.cpp index f1e1456d2..712ccbd31 100644 --- a/src/osgWrappers/introspection/osgDB/Options.cpp +++ b/src/osgWrappers/introspection/osgDB/Options.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::Options::CacheHintOptions) I_DeclaringFile("osgDB/Options"); I_EnumLabel(osgDB::Options::CACHE_NONE); diff --git a/src/osgWrappers/introspection/osgDB/Output.cpp b/src/osgWrappers/introspection/osgDB/Output.cpp index c32050662..9c062602b 100644 --- a/src/osgWrappers/introspection/osgDB/Output.cpp +++ b/src/osgWrappers/introspection/osgDB/Output.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::Output::PathNameHint) I_DeclaringFile("osgDB/Output"); I_EnumLabel(osgDB::Output::AS_IS); diff --git a/src/osgWrappers/introspection/osgDB/ParameterOutput.cpp b/src/osgWrappers/introspection/osgDB/ParameterOutput.cpp index 0230aac5a..c62916d31 100644 --- a/src/osgWrappers/introspection/osgDB/ParameterOutput.cpp +++ b/src/osgWrappers/introspection/osgDB/ParameterOutput.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgDB::ParameterOutput) I_DeclaringFile("osgDB/ParameterOutput"); I_Constructor1(IN, osgDB::Output &, fw, diff --git a/src/osgWrappers/introspection/osgDB/PluginQuery.cpp b/src/osgWrappers/introspection/osgDB/PluginQuery.cpp index 5b18d083c..95502457d 100644 --- a/src/osgWrappers/introspection/osgDB/PluginQuery.cpp +++ b/src/osgWrappers/introspection/osgDB/PluginQuery.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriterInfo) I_DeclaringFile("osgDB/PluginQuery"); I_BaseType(osg::Referenced); @@ -53,6 +55,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgDB::ReaderWriterInfo >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgDB::ReaderWriterInfo > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgDB::ReaderWriterInfo *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgDB/Registry.cpp b/src/osgWrappers/introspection/osgDB/Registry.cpp index 75b61c21f..1cc0c49c9 100644 --- a/src/osgWrappers/introspection/osgDB/Registry.cpp +++ b/src/osgWrappers/introspection/osgDB/Registry.cpp @@ -38,6 +38,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::basic_type_wrapper) I_DeclaringFile("osgDB/Registry"); I_Constructor0(____basic_type_wrapper, @@ -695,6 +697,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgDB::ReaderWriter >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgDB::ReaderWriter > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgDB::ReaderWriter *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgDB/SharedStateManager.cpp b/src/osgWrappers/introspection/osgDB/SharedStateManager.cpp index a4deedb1a..8bae2809e 100644 --- a/src/osgWrappers/introspection/osgDB/SharedStateManager.cpp +++ b/src/osgWrappers/introspection/osgDB/SharedStateManager.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::SharedStateManager::ShareMode) I_DeclaringFile("osgDB/SharedStateManager"); I_EnumLabel(osgDB::SharedStateManager::SHARE_NONE); diff --git a/src/osgWrappers/introspection/osgDB/XmlParser.cpp b/src/osgWrappers/introspection/osgDB/XmlParser.cpp index 6e8dafff6..ac49dab82 100644 --- a/src/osgWrappers/introspection/osgDB/XmlParser.cpp +++ b/src/osgWrappers/introspection/osgDB/XmlParser.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgDB::XmlNode::NodeType) I_DeclaringFile("osgDB/XmlParser"); I_EnumLabel(osgDB::XmlNode::UNASSIGNED); @@ -184,6 +186,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgDB::XmlNode >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgDB::XmlNode > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgDB::XmlNode *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgFX/AnisotropicLighting.cpp b/src/osgWrappers/introspection/osgFX/AnisotropicLighting.cpp index 76dbfb4a9..fe6af0c82 100644 --- a/src/osgWrappers/introspection/osgFX/AnisotropicLighting.cpp +++ b/src/osgWrappers/introspection/osgFX/AnisotropicLighting.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgFX::AnisotropicLighting) I_DeclaringFile("osgFX/AnisotropicLighting"); I_BaseType(osgFX::Effect); diff --git a/src/osgWrappers/introspection/osgFX/BumpMapping.cpp b/src/osgWrappers/introspection/osgFX/BumpMapping.cpp index 8c5ce423e..5b6c9049d 100644 --- a/src/osgWrappers/introspection/osgFX/BumpMapping.cpp +++ b/src/osgWrappers/introspection/osgFX/BumpMapping.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgFX::BumpMapping) I_DeclaringFile("osgFX/BumpMapping"); I_BaseType(osgFX::Effect); diff --git a/src/osgWrappers/introspection/osgFX/Cartoon.cpp b/src/osgWrappers/introspection/osgFX/Cartoon.cpp index 1f3b7cfb2..957982b48 100644 --- a/src/osgWrappers/introspection/osgFX/Cartoon.cpp +++ b/src/osgWrappers/introspection/osgFX/Cartoon.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgFX::Cartoon) I_DeclaringFile("osgFX/Cartoon"); I_BaseType(osgFX::Effect); diff --git a/src/osgWrappers/introspection/osgFX/Effect.cpp b/src/osgWrappers/introspection/osgFX/Effect.cpp index 0b1f5a749..1c73e112b 100644 --- a/src/osgWrappers/introspection/osgFX/Effect.cpp +++ b/src/osgWrappers/introspection/osgFX/Effect.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgFX::Effect::TechniqueSelection) I_DeclaringFile("osgFX/Effect"); I_EnumLabel(osgFX::Effect::AUTO_DETECT); diff --git a/src/osgWrappers/introspection/osgFX/MultiTextureControl.cpp b/src/osgWrappers/introspection/osgFX/MultiTextureControl.cpp index 213c81e9f..2095598c3 100644 --- a/src/osgWrappers/introspection/osgFX/MultiTextureControl.cpp +++ b/src/osgWrappers/introspection/osgFX/MultiTextureControl.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgFX::MultiTextureControl) I_DeclaringFile("osgFX/MultiTextureControl"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osgFX/Outline.cpp b/src/osgWrappers/introspection/osgFX/Outline.cpp index 0115e88f5..361faf150 100644 --- a/src/osgWrappers/introspection/osgFX/Outline.cpp +++ b/src/osgWrappers/introspection/osgFX/Outline.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgFX::Outline) I_DeclaringFile("osgFX/Outline"); I_BaseType(osgFX::Effect); diff --git a/src/osgWrappers/introspection/osgFX/Registry.cpp b/src/osgWrappers/introspection/osgFX/Registry.cpp index 8c5781445..bb9f396b2 100644 --- a/src/osgWrappers/introspection/osgFX/Registry.cpp +++ b/src/osgWrappers/introspection/osgFX/Registry.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ref_ptr< const osgFX::Effect > >, osgFX::Registry::EffectMap) BEGIN_OBJECT_REFLECTOR(osgFX::Registry) diff --git a/src/osgWrappers/introspection/osgFX/Scribe.cpp b/src/osgWrappers/introspection/osgFX/Scribe.cpp index d70cb8134..7b158ce6b 100644 --- a/src/osgWrappers/introspection/osgFX/Scribe.cpp +++ b/src/osgWrappers/introspection/osgFX/Scribe.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgFX::Scribe) I_DeclaringFile("osgFX/Scribe"); I_BaseType(osgFX::Effect); diff --git a/src/osgWrappers/introspection/osgFX/SpecularHighlights.cpp b/src/osgWrappers/introspection/osgFX/SpecularHighlights.cpp index 17417f966..611d5bb2d 100644 --- a/src/osgWrappers/introspection/osgFX/SpecularHighlights.cpp +++ b/src/osgWrappers/introspection/osgFX/SpecularHighlights.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgFX::SpecularHighlights) I_DeclaringFile("osgFX/SpecularHighlights"); I_BaseType(osgFX::Effect); diff --git a/src/osgWrappers/introspection/osgFX/Technique.cpp b/src/osgWrappers/introspection/osgFX/Technique.cpp index b70654c53..13dec4ec5 100644 --- a/src/osgWrappers/introspection/osgFX/Technique.cpp +++ b/src/osgWrappers/introspection/osgFX/Technique.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::Technique) I_DeclaringFile("osgFX/Technique"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgFX/Validator.cpp b/src/osgWrappers/introspection/osgFX/Validator.cpp index 2ebf6cce8..f2c61caca 100644 --- a/src/osgWrappers/introspection/osgFX/Validator.cpp +++ b/src/osgWrappers/introspection/osgFX/Validator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgFX::Validator) I_DeclaringFile("osgFX/Validator"); I_BaseType(osg::StateAttribute); diff --git a/src/osgWrappers/introspection/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/introspection/osgGA/AnimationPathManipulator.cpp index e0cb4dde6..7701e4cd2 100644 --- a/src/osgWrappers/introspection/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/AnimationPathManipulator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgGA::AnimationPathManipulator) I_DeclaringFile("osgGA/AnimationPathManipulator"); I_BaseType(osgGA::CameraManipulator); diff --git a/src/osgWrappers/introspection/osgGA/CameraManipulator.cpp b/src/osgWrappers/introspection/osgGA/CameraManipulator.cpp index e9bce03ab..c0fe6f166 100644 --- a/src/osgWrappers/introspection/osgGA/CameraManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/CameraManipulator.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::CameraManipulator) I_DeclaringFile("osgGA/CameraManipulator"); I_BaseType(osgGA::GUIEventHandler); diff --git a/src/osgWrappers/introspection/osgGA/CameraViewSwitchManipulator.cpp b/src/osgWrappers/introspection/osgGA/CameraViewSwitchManipulator.cpp index ca7f38b4d..a243853df 100644 --- a/src/osgWrappers/introspection/osgGA/CameraViewSwitchManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/CameraViewSwitchManipulator.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::CameraView > >, osgGA::CameraViewSwitchManipulator::CameraViewList) BEGIN_OBJECT_REFLECTOR(osgGA::CameraViewSwitchManipulator) @@ -121,6 +123,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::CameraView >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::CameraView > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::CameraView *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp b/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp index 28f21c3a6..1263247eb 100644 --- a/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgGA::DriveManipulator) I_DeclaringFile("osgGA/DriveManipulator"); I_BaseType(osgGA::CameraManipulator); diff --git a/src/osgWrappers/introspection/osgGA/EventQueue.cpp b/src/osgWrappers/introspection/osgGA/EventQueue.cpp index f1efeef2d..78e9577ea 100644 --- a/src/osgWrappers/introspection/osgGA/EventQueue.cpp +++ b/src/osgWrappers/introspection/osgGA/EventQueue.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >, osgGA::EventQueue::Events) BEGIN_OBJECT_REFLECTOR(osgGA::EventQueue) @@ -309,6 +311,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventAdapter >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgGA::GUIEventAdapter > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgGA::GUIEventAdapter *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgGA/EventVisitor.cpp b/src/osgWrappers/introspection/osgGA/EventVisitor.cpp index c02e61684..e0bf0b559 100644 --- a/src/osgWrappers/introspection/osgGA/EventVisitor.cpp +++ b/src/osgWrappers/introspection/osgGA/EventVisitor.cpp @@ -33,6 +33,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >, osgGA::EventVisitor::EventList) BEGIN_OBJECT_REFLECTOR(osgGA::EventVisitor) diff --git a/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp b/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp index 2b0662e89..e86c043c6 100644 --- a/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgGA::FlightManipulator::YawControlMode) I_DeclaringFile("osgGA/FlightManipulator"); I_EnumLabel(osgGA::FlightManipulator::YAW_AUTOMATICALLY_WHEN_BANKED); diff --git a/src/osgWrappers/introspection/osgGA/GUIActionAdapter.cpp b/src/osgWrappers/introspection/osgGA/GUIActionAdapter.cpp index 1db958408..38d8e174e 100644 --- a/src/osgWrappers/introspection/osgGA/GUIActionAdapter.cpp +++ b/src/osgWrappers/introspection/osgGA/GUIActionAdapter.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::GUIActionAdapter) I_DeclaringFile("osgGA/GUIActionAdapter"); I_Constructor0(____GUIActionAdapter, diff --git a/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp b/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp index 0ce245a82..dbb4a25b7 100644 --- a/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp +++ b/src/osgWrappers/introspection/osgGA/GUIEventAdapter.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::MouseButtonMask) I_DeclaringFile("osgGA/GUIEventAdapter"); I_EnumLabel(osgGA::GUIEventAdapter::LEFT_MOUSE_BUTTON); diff --git a/src/osgWrappers/introspection/osgGA/GUIEventHandler.cpp b/src/osgWrappers/introspection/osgGA/GUIEventHandler.cpp index 41266c7a9..0187e9f54 100644 --- a/src/osgWrappers/introspection/osgGA/GUIEventHandler.cpp +++ b/src/osgWrappers/introspection/osgGA/GUIEventHandler.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventHandler) I_DeclaringFile("osgGA/GUIEventHandler"); I_BaseType(osg::NodeCallback); diff --git a/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp index cbf2925ed..cc1edf7bd 100644 --- a/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::pair< std::string COMMA osg::ref_ptr< osgGA::CameraManipulator > >, osgGA::KeySwitchMatrixManipulator::NamedManipulator) TYPE_NAME_ALIAS(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >, osgGA::KeySwitchMatrixManipulator::KeyManipMap) @@ -238,6 +240,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::CameraManipulator >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgGA::CameraManipulator > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgGA::CameraManipulator *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp index d68532f2a..a66872188 100644 --- a/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::TrackerMode) I_DeclaringFile("osgGA/NodeTrackerManipulator"); I_EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER); diff --git a/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp b/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp index 9cb046d80..9225fd3f7 100644 --- a/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgGA::SphericalManipulator::RotationMode) I_DeclaringFile("osgGA/SphericalManipulator"); I_EnumLabel(osgGA::SphericalManipulator::ELEVATION_HEADING); diff --git a/src/osgWrappers/introspection/osgGA/StateSetManipulator.cpp b/src/osgWrappers/introspection/osgGA/StateSetManipulator.cpp index a87a7435c..31d8fe842 100644 --- a/src/osgWrappers/introspection/osgGA/StateSetManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/StateSetManipulator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgGA::StateSetManipulator) I_DeclaringFile("osgGA/StateSetManipulator"); I_BaseType(osgGA::GUIEventHandler); diff --git a/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp b/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp index d97a41d94..4df56c471 100644 --- a/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgGA::TerrainManipulator::RotationMode) I_DeclaringFile("osgGA/TerrainManipulator"); I_EnumLabel(osgGA::TerrainManipulator::ELEVATION_AZIM_ROLL); diff --git a/src/osgWrappers/introspection/osgGA/TrackballManipulator.cpp b/src/osgWrappers/introspection/osgGA/TrackballManipulator.cpp index 4ce762249..bf77c466e 100644 --- a/src/osgWrappers/introspection/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/TrackballManipulator.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) I_DeclaringFile("osgGA/TrackballManipulator"); I_BaseType(osgGA::OrbitManipulator); diff --git a/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp b/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp index 95d40f59d..ba8344389 100644 --- a/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgGA::UFOManipulator) I_DeclaringFile("osgGA/UFOManipulator"); I_BaseType(osgGA::CameraManipulator); diff --git a/src/osgWrappers/introspection/osgManipulator/AntiSquish.cpp b/src/osgWrappers/introspection/osgManipulator/AntiSquish.cpp index 1608311cb..45d28ce04 100644 --- a/src/osgWrappers/introspection/osgManipulator/AntiSquish.cpp +++ b/src/osgWrappers/introspection/osgManipulator/AntiSquish.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::AntiSquish) I_DeclaringFile("osgManipulator/AntiSquish"); I_BaseType(osg::MatrixTransform); diff --git a/src/osgWrappers/introspection/osgManipulator/Command.cpp b/src/osgWrappers/introspection/osgManipulator/Command.cpp index d6ca64ff1..13f95480f 100644 --- a/src/osgWrappers/introspection/osgManipulator/Command.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Command.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgManipulator::MotionCommand::Stage) I_DeclaringFile("osgManipulator/Command"); I_EnumLabel(osgManipulator::MotionCommand::NONE); diff --git a/src/osgWrappers/introspection/osgManipulator/CommandManager.cpp b/src/osgWrappers/introspection/osgManipulator/CommandManager.cpp index 3f8e7001a..3799e2c54 100644 --- a/src/osgWrappers/introspection/osgManipulator/CommandManager.cpp +++ b/src/osgWrappers/introspection/osgManipulator/CommandManager.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgManipulator::Selection > >, osgManipulator::CommandManager::Selections) BEGIN_OBJECT_REFLECTOR(osgManipulator::CommandManager) @@ -68,6 +70,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::Selection >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgManipulator::Selection > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgManipulator::Selection *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgManipulator/Constraint.cpp b/src/osgWrappers/introspection/osgManipulator/Constraint.cpp index a8897ea25..2801ee6f9 100644 --- a/src/osgWrappers/introspection/osgManipulator/Constraint.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Constraint.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::Constraint) I_DeclaringFile("osgManipulator/Constraint"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgManipulator/Dragger.cpp b/src/osgWrappers/introspection/osgManipulator/Dragger.cpp index 4d2c87e78..49e982e84 100644 --- a/src/osgWrappers/introspection/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Dragger.cpp @@ -31,6 +31,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgManipulator::Dragger > >, osgManipulator::CompositeDragger::DraggerList) BEGIN_OBJECT_REFLECTOR(osgManipulator::CompositeDragger) @@ -560,6 +562,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::Constraint >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgManipulator::Constraint > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgManipulator::Constraint *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -600,6 +607,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::Dragger >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgManipulator::Dragger > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgManipulator::Dragger *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -640,6 +652,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::DraggerCallback >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgManipulator::DraggerCallback > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgManipulator::DraggerCallback *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgManipulator/Projector.cpp b/src/osgWrappers/introspection/osgManipulator/Projector.cpp index a9c3e102f..96616c44a 100644 --- a/src/osgWrappers/introspection/osgManipulator/Projector.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Projector.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderPlaneProjector) I_DeclaringFile("osgManipulator/Projector"); I_BaseType(osgManipulator::CylinderProjector); diff --git a/src/osgWrappers/introspection/osgManipulator/RotateCylinderDragger.cpp b/src/osgWrappers/introspection/osgManipulator/RotateCylinderDragger.cpp index dab254671..0f2aefbb0 100644 --- a/src/osgWrappers/introspection/osgManipulator/RotateCylinderDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/RotateCylinderDragger.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateCylinderDragger) I_DeclaringFile("osgManipulator/RotateCylinderDragger"); I_BaseType(osgManipulator::Dragger); diff --git a/src/osgWrappers/introspection/osgManipulator/RotateSphereDragger.cpp b/src/osgWrappers/introspection/osgManipulator/RotateSphereDragger.cpp index e0055b65b..82c2e57d7 100644 --- a/src/osgWrappers/introspection/osgManipulator/RotateSphereDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/RotateSphereDragger.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateSphereDragger) I_DeclaringFile("osgManipulator/RotateSphereDragger"); I_BaseType(osgManipulator::Dragger); diff --git a/src/osgWrappers/introspection/osgManipulator/Scale1DDragger.cpp b/src/osgWrappers/introspection/osgManipulator/Scale1DDragger.cpp index 9b42657cc..188848f8e 100644 --- a/src/osgWrappers/introspection/osgManipulator/Scale1DDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Scale1DDragger.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgManipulator::Scale1DDragger::ScaleMode) I_DeclaringFile("osgManipulator/Scale1DDragger"); I_EnumLabel(osgManipulator::Scale1DDragger::SCALE_WITH_ORIGIN_AS_PIVOT); diff --git a/src/osgWrappers/introspection/osgManipulator/Scale2DDragger.cpp b/src/osgWrappers/introspection/osgManipulator/Scale2DDragger.cpp index 60f89899a..b7914b50c 100644 --- a/src/osgWrappers/introspection/osgManipulator/Scale2DDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Scale2DDragger.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgManipulator::Scale2DDragger::ScaleMode) I_DeclaringFile("osgManipulator/Scale2DDragger"); I_EnumLabel(osgManipulator::Scale2DDragger::SCALE_WITH_ORIGIN_AS_PIVOT); diff --git a/src/osgWrappers/introspection/osgManipulator/ScaleAxisDragger.cpp b/src/osgWrappers/introspection/osgManipulator/ScaleAxisDragger.cpp index 0c51a201a..d42955f67 100644 --- a/src/osgWrappers/introspection/osgManipulator/ScaleAxisDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/ScaleAxisDragger.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::ScaleAxisDragger) I_DeclaringFile("osgManipulator/ScaleAxisDragger"); I_BaseType(osgManipulator::CompositeDragger); diff --git a/src/osgWrappers/introspection/osgManipulator/Selection.cpp b/src/osgWrappers/introspection/osgManipulator/Selection.cpp index 430c2c72a..cb2f1505c 100644 --- a/src/osgWrappers/introspection/osgManipulator/Selection.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Selection.cpp @@ -20,5 +20,7 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::MatrixTransform, osgManipulator::Selection) diff --git a/src/osgWrappers/introspection/osgManipulator/TabBoxDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TabBoxDragger.cpp index eafc4da53..d429ba0fe 100644 --- a/src/osgWrappers/introspection/osgManipulator/TabBoxDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TabBoxDragger.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::TabBoxDragger) I_DeclaringFile("osgManipulator/TabBoxDragger"); I_BaseType(osgManipulator::CompositeDragger); diff --git a/src/osgWrappers/introspection/osgManipulator/TabBoxTrackballDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TabBoxTrackballDragger.cpp index 745b3f107..f92f16cec 100644 --- a/src/osgWrappers/introspection/osgManipulator/TabBoxTrackballDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TabBoxTrackballDragger.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::TabBoxTrackballDragger) I_DeclaringFile("osgManipulator/TabBoxTrackballDragger"); I_BaseType(osgManipulator::CompositeDragger); diff --git a/src/osgWrappers/introspection/osgManipulator/TabPlaneDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TabPlaneDragger.cpp index 9691295f4..65b0503a3 100644 --- a/src/osgWrappers/introspection/osgManipulator/TabPlaneDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TabPlaneDragger.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneDragger) I_DeclaringFile("osgManipulator/TabPlaneDragger"); I_BaseType(osgManipulator::CompositeDragger); diff --git a/src/osgWrappers/introspection/osgManipulator/TabPlaneTrackballDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TabPlaneTrackballDragger.cpp index 414c0cfd3..8169d1d18 100644 --- a/src/osgWrappers/introspection/osgManipulator/TabPlaneTrackballDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TabPlaneTrackballDragger.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneTrackballDragger) I_DeclaringFile("osgManipulator/TabPlaneTrackballDragger"); I_BaseType(osgManipulator::CompositeDragger); diff --git a/src/osgWrappers/introspection/osgManipulator/TrackballDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TrackballDragger.cpp index 386540f4a..cd5c10c56 100644 --- a/src/osgWrappers/introspection/osgManipulator/TrackballDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TrackballDragger.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::TrackballDragger) I_DeclaringFile("osgManipulator/TrackballDragger"); I_BaseType(osgManipulator::CompositeDragger); diff --git a/src/osgWrappers/introspection/osgManipulator/Translate1DDragger.cpp b/src/osgWrappers/introspection/osgManipulator/Translate1DDragger.cpp index 52ce88924..1bafd3fb3 100644 --- a/src/osgWrappers/introspection/osgManipulator/Translate1DDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Translate1DDragger.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) I_DeclaringFile("osgManipulator/Translate1DDragger"); I_BaseType(osgManipulator::Dragger); diff --git a/src/osgWrappers/introspection/osgManipulator/Translate2DDragger.cpp b/src/osgWrappers/introspection/osgManipulator/Translate2DDragger.cpp index 5022b33ee..686510337 100644 --- a/src/osgWrappers/introspection/osgManipulator/Translate2DDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Translate2DDragger.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate2DDragger) I_DeclaringFile("osgManipulator/Translate2DDragger"); I_BaseType(osgManipulator::Dragger); diff --git a/src/osgWrappers/introspection/osgManipulator/TranslateAxisDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TranslateAxisDragger.cpp index 6048d5ce1..b277ef7ab 100644 --- a/src/osgWrappers/introspection/osgManipulator/TranslateAxisDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TranslateAxisDragger.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateAxisDragger) I_DeclaringFile("osgManipulator/TranslateAxisDragger"); I_BaseType(osgManipulator::CompositeDragger); diff --git a/src/osgWrappers/introspection/osgManipulator/TranslatePlaneDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TranslatePlaneDragger.cpp index ad5452621..010a72bcb 100644 --- a/src/osgWrappers/introspection/osgManipulator/TranslatePlaneDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TranslatePlaneDragger.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslatePlaneDragger) I_DeclaringFile("osgManipulator/TranslatePlaneDragger"); I_BaseType(osgManipulator::CompositeDragger); diff --git a/src/osgWrappers/introspection/osgParticle/AccelOperator.cpp b/src/osgWrappers/introspection/osgParticle/AccelOperator.cpp index 632321bbd..598b52ea0 100644 --- a/src/osgWrappers/introspection/osgParticle/AccelOperator.cpp +++ b/src/osgWrappers/introspection/osgParticle/AccelOperator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::AccelOperator) I_DeclaringFile("osgParticle/AccelOperator"); I_BaseType(osgParticle::Operator); diff --git a/src/osgWrappers/introspection/osgParticle/AngularAccelOperator.cpp b/src/osgWrappers/introspection/osgParticle/AngularAccelOperator.cpp index e10b218b3..8b3a6d649 100644 --- a/src/osgWrappers/introspection/osgParticle/AngularAccelOperator.cpp +++ b/src/osgWrappers/introspection/osgParticle/AngularAccelOperator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::AngularAccelOperator) I_DeclaringFile("osgParticle/AngularAccelOperator"); I_BaseType(osgParticle::Operator); diff --git a/src/osgWrappers/introspection/osgParticle/BoxPlacer.cpp b/src/osgWrappers/introspection/osgParticle/BoxPlacer.cpp index 7b8320094..1aefd8f3a 100644 --- a/src/osgWrappers/introspection/osgParticle/BoxPlacer.cpp +++ b/src/osgWrappers/introspection/osgParticle/BoxPlacer.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::BoxPlacer) I_DeclaringFile("osgParticle/BoxPlacer"); I_BaseType(osgParticle::CenteredPlacer); diff --git a/src/osgWrappers/introspection/osgParticle/CenteredPlacer.cpp b/src/osgWrappers/introspection/osgParticle/CenteredPlacer.cpp index 220e5f8a6..7bf1dbff0 100644 --- a/src/osgWrappers/introspection/osgParticle/CenteredPlacer.cpp +++ b/src/osgWrappers/introspection/osgParticle/CenteredPlacer.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::CenteredPlacer) I_DeclaringFile("osgParticle/CenteredPlacer"); I_BaseType(osgParticle::Placer); diff --git a/src/osgWrappers/introspection/osgParticle/ConnectedParticleSystem.cpp b/src/osgWrappers/introspection/osgParticle/ConnectedParticleSystem.cpp index 6e0927717..b03f5b517 100644 --- a/src/osgWrappers/introspection/osgParticle/ConnectedParticleSystem.cpp +++ b/src/osgWrappers/introspection/osgParticle/ConnectedParticleSystem.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::ConnectedParticleSystem) I_DeclaringFile("osgParticle/ConnectedParticleSystem"); I_BaseType(osgParticle::ParticleSystem); diff --git a/src/osgWrappers/introspection/osgParticle/ConstantRateCounter.cpp b/src/osgWrappers/introspection/osgParticle/ConstantRateCounter.cpp index ca306f9d1..0963c7db8 100644 --- a/src/osgWrappers/introspection/osgParticle/ConstantRateCounter.cpp +++ b/src/osgWrappers/introspection/osgParticle/ConstantRateCounter.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::ConstantRateCounter) I_DeclaringFile("osgParticle/ConstantRateCounter"); I_BaseType(osgParticle::Counter); diff --git a/src/osgWrappers/introspection/osgParticle/Counter.cpp b/src/osgWrappers/introspection/osgParticle/Counter.cpp index 954f1524f..139d41fa9 100644 --- a/src/osgWrappers/introspection/osgParticle/Counter.cpp +++ b/src/osgWrappers/introspection/osgParticle/Counter.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Counter) I_DeclaringFile("osgParticle/Counter"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgParticle/Emitter.cpp b/src/osgWrappers/introspection/osgParticle/Emitter.cpp index f4a5bfba3..9d98beaef 100644 --- a/src/osgWrappers/introspection/osgParticle/Emitter.cpp +++ b/src/osgWrappers/introspection/osgParticle/Emitter.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Emitter) I_DeclaringFile("osgParticle/Emitter"); I_BaseType(osgParticle::ParticleProcessor); diff --git a/src/osgWrappers/introspection/osgParticle/ExplosionDebrisEffect.cpp b/src/osgWrappers/introspection/osgParticle/ExplosionDebrisEffect.cpp index c5e7aefc4..9d83e631e 100644 --- a/src/osgWrappers/introspection/osgParticle/ExplosionDebrisEffect.cpp +++ b/src/osgWrappers/introspection/osgParticle/ExplosionDebrisEffect.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionDebrisEffect) I_DeclaringFile("osgParticle/ExplosionDebrisEffect"); I_BaseType(osgParticle::ParticleEffect); diff --git a/src/osgWrappers/introspection/osgParticle/ExplosionEffect.cpp b/src/osgWrappers/introspection/osgParticle/ExplosionEffect.cpp index 6e4a0e176..ee30383ca 100644 --- a/src/osgWrappers/introspection/osgParticle/ExplosionEffect.cpp +++ b/src/osgWrappers/introspection/osgParticle/ExplosionEffect.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionEffect) I_DeclaringFile("osgParticle/ExplosionEffect"); I_BaseType(osgParticle::ParticleEffect); diff --git a/src/osgWrappers/introspection/osgParticle/FireEffect.cpp b/src/osgWrappers/introspection/osgParticle/FireEffect.cpp index 3c1f500ac..69c6952cc 100644 --- a/src/osgWrappers/introspection/osgParticle/FireEffect.cpp +++ b/src/osgWrappers/introspection/osgParticle/FireEffect.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::FireEffect) I_DeclaringFile("osgParticle/FireEffect"); I_BaseType(osgParticle::ParticleEffect); diff --git a/src/osgWrappers/introspection/osgParticle/ForceOperator.cpp b/src/osgWrappers/introspection/osgParticle/ForceOperator.cpp index ce8d64861..625466374 100644 --- a/src/osgWrappers/introspection/osgParticle/ForceOperator.cpp +++ b/src/osgWrappers/introspection/osgParticle/ForceOperator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::ForceOperator) I_DeclaringFile("osgParticle/ForceOperator"); I_BaseType(osgParticle::Operator); diff --git a/src/osgWrappers/introspection/osgParticle/Interpolator.cpp b/src/osgWrappers/introspection/osgParticle/Interpolator.cpp index b40b50919..fbabc4841 100644 --- a/src/osgWrappers/introspection/osgParticle/Interpolator.cpp +++ b/src/osgWrappers/introspection/osgParticle/Interpolator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Interpolator) I_DeclaringFile("osgParticle/Interpolator"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgParticle/LinearInterpolator.cpp b/src/osgWrappers/introspection/osgParticle/LinearInterpolator.cpp index 852fa9482..dcbe63169 100644 --- a/src/osgWrappers/introspection/osgParticle/LinearInterpolator.cpp +++ b/src/osgWrappers/introspection/osgParticle/LinearInterpolator.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::LinearInterpolator) I_DeclaringFile("osgParticle/LinearInterpolator"); I_BaseType(osgParticle::Interpolator); diff --git a/src/osgWrappers/introspection/osgParticle/ModularEmitter.cpp b/src/osgWrappers/introspection/osgParticle/ModularEmitter.cpp index bb1bf75fc..23b735eb1 100644 --- a/src/osgWrappers/introspection/osgParticle/ModularEmitter.cpp +++ b/src/osgWrappers/introspection/osgParticle/ModularEmitter.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::ModularEmitter) I_DeclaringFile("osgParticle/ModularEmitter"); I_BaseType(osgParticle::Emitter); diff --git a/src/osgWrappers/introspection/osgParticle/ModularProgram.cpp b/src/osgWrappers/introspection/osgParticle/ModularProgram.cpp index 8382c812f..084127b0c 100644 --- a/src/osgWrappers/introspection/osgParticle/ModularProgram.cpp +++ b/src/osgWrappers/introspection/osgParticle/ModularProgram.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::ModularProgram) I_DeclaringFile("osgParticle/ModularProgram"); I_BaseType(osgParticle::Program); diff --git a/src/osgWrappers/introspection/osgParticle/MultiSegmentPlacer.cpp b/src/osgWrappers/introspection/osgParticle/MultiSegmentPlacer.cpp index aae5f2319..391f0cfee 100644 --- a/src/osgWrappers/introspection/osgParticle/MultiSegmentPlacer.cpp +++ b/src/osgWrappers/introspection/osgParticle/MultiSegmentPlacer.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::MultiSegmentPlacer) I_DeclaringFile("osgParticle/MultiSegmentPlacer"); I_BaseType(osgParticle::Placer); diff --git a/src/osgWrappers/introspection/osgParticle/Operator.cpp b/src/osgWrappers/introspection/osgParticle/Operator.cpp index 24c975e20..5f426ede7 100644 --- a/src/osgWrappers/introspection/osgParticle/Operator.cpp +++ b/src/osgWrappers/introspection/osgParticle/Operator.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Operator) I_DeclaringFile("osgParticle/Operator"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgParticle/Particle.cpp b/src/osgWrappers/introspection/osgParticle/Particle.cpp index a027dcb3c..d14f667f2 100644 --- a/src/osgWrappers/introspection/osgParticle/Particle.cpp +++ b/src/osgWrappers/introspection/osgParticle/Particle.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgParticle::Particle::Shape) I_DeclaringFile("osgParticle/Particle"); I_EnumLabel(osgParticle::Particle::POINT); diff --git a/src/osgWrappers/introspection/osgParticle/ParticleEffect.cpp b/src/osgWrappers/introspection/osgParticle/ParticleEffect.cpp index 089d71209..26ba2a0df 100644 --- a/src/osgWrappers/introspection/osgParticle/ParticleEffect.cpp +++ b/src/osgWrappers/introspection/osgParticle/ParticleEffect.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleEffect) I_DeclaringFile("osgParticle/ParticleEffect"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osgParticle/ParticleProcessor.cpp b/src/osgWrappers/introspection/osgParticle/ParticleProcessor.cpp index 3b5a66ccf..b7ceed72e 100644 --- a/src/osgWrappers/introspection/osgParticle/ParticleProcessor.cpp +++ b/src/osgWrappers/introspection/osgParticle/ParticleProcessor.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgParticle::ParticleProcessor::ReferenceFrame) I_DeclaringFile("osgParticle/ParticleProcessor"); I_EnumLabel(osgParticle::ParticleProcessor::RELATIVE_RF); diff --git a/src/osgWrappers/introspection/osgParticle/ParticleSystem.cpp b/src/osgWrappers/introspection/osgParticle/ParticleSystem.cpp index 6affc0968..102556cb9 100644 --- a/src/osgWrappers/introspection/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/introspection/osgParticle/ParticleSystem.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgParticle::ParticleSystem::Alignment) I_DeclaringFile("osgParticle/ParticleSystem"); I_EnumLabel(osgParticle::ParticleSystem::BILLBOARD); diff --git a/src/osgWrappers/introspection/osgParticle/ParticleSystemUpdater.cpp b/src/osgWrappers/introspection/osgParticle/ParticleSystemUpdater.cpp index 61a14f4ed..4e2a4597e 100644 --- a/src/osgWrappers/introspection/osgParticle/ParticleSystemUpdater.cpp +++ b/src/osgWrappers/introspection/osgParticle/ParticleSystemUpdater.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystemUpdater) I_DeclaringFile("osgParticle/ParticleSystemUpdater"); I_BaseType(osg::Node); diff --git a/src/osgWrappers/introspection/osgParticle/Placer.cpp b/src/osgWrappers/introspection/osgParticle/Placer.cpp index 08c2dbb9f..8cf43794a 100644 --- a/src/osgWrappers/introspection/osgParticle/Placer.cpp +++ b/src/osgWrappers/introspection/osgParticle/Placer.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Placer) I_DeclaringFile("osgParticle/Placer"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgParticle/PointPlacer.cpp b/src/osgWrappers/introspection/osgParticle/PointPlacer.cpp index a04235c5b..63c748a00 100644 --- a/src/osgWrappers/introspection/osgParticle/PointPlacer.cpp +++ b/src/osgWrappers/introspection/osgParticle/PointPlacer.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::PointPlacer) I_DeclaringFile("osgParticle/PointPlacer"); I_BaseType(osgParticle::CenteredPlacer); diff --git a/src/osgWrappers/introspection/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/introspection/osgParticle/PrecipitationEffect.cpp index ae3dc0ffc..ce08cf33f 100644 --- a/src/osgWrappers/introspection/osgParticle/PrecipitationEffect.cpp +++ b/src/osgWrappers/introspection/osgParticle/PrecipitationEffect.cpp @@ -30,6 +30,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect) I_DeclaringFile("osgParticle/PrecipitationEffect"); I_BaseType(osg::Node); diff --git a/src/osgWrappers/introspection/osgParticle/Program.cpp b/src/osgWrappers/introspection/osgParticle/Program.cpp index d8653c228..d4cfebdca 100644 --- a/src/osgWrappers/introspection/osgParticle/Program.cpp +++ b/src/osgWrappers/introspection/osgParticle/Program.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Program) I_DeclaringFile("osgParticle/Program"); I_BaseType(osgParticle::ParticleProcessor); diff --git a/src/osgWrappers/introspection/osgParticle/RadialShooter.cpp b/src/osgWrappers/introspection/osgParticle/RadialShooter.cpp index d445cf3f0..8dad4b775 100644 --- a/src/osgWrappers/introspection/osgParticle/RadialShooter.cpp +++ b/src/osgWrappers/introspection/osgParticle/RadialShooter.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::RadialShooter) I_DeclaringFile("osgParticle/RadialShooter"); I_BaseType(osgParticle::Shooter); diff --git a/src/osgWrappers/introspection/osgParticle/RandomRateCounter.cpp b/src/osgWrappers/introspection/osgParticle/RandomRateCounter.cpp index 5ef437b8c..486672740 100644 --- a/src/osgWrappers/introspection/osgParticle/RandomRateCounter.cpp +++ b/src/osgWrappers/introspection/osgParticle/RandomRateCounter.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::RandomRateCounter) I_DeclaringFile("osgParticle/RandomRateCounter"); I_BaseType(osgParticle::VariableRateCounter); diff --git a/src/osgWrappers/introspection/osgParticle/SectorPlacer.cpp b/src/osgWrappers/introspection/osgParticle/SectorPlacer.cpp index e97710619..970bdf39d 100644 --- a/src/osgWrappers/introspection/osgParticle/SectorPlacer.cpp +++ b/src/osgWrappers/introspection/osgParticle/SectorPlacer.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::SectorPlacer) I_DeclaringFile("osgParticle/SectorPlacer"); I_BaseType(osgParticle::CenteredPlacer); diff --git a/src/osgWrappers/introspection/osgParticle/SegmentPlacer.cpp b/src/osgWrappers/introspection/osgParticle/SegmentPlacer.cpp index 63cd26e35..ad72e79da 100644 --- a/src/osgWrappers/introspection/osgParticle/SegmentPlacer.cpp +++ b/src/osgWrappers/introspection/osgParticle/SegmentPlacer.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::SegmentPlacer) I_DeclaringFile("osgParticle/SegmentPlacer"); I_BaseType(osgParticle::Placer); diff --git a/src/osgWrappers/introspection/osgParticle/Shooter.cpp b/src/osgWrappers/introspection/osgParticle/Shooter.cpp index 14b2b88ed..ffe170282 100644 --- a/src/osgWrappers/introspection/osgParticle/Shooter.cpp +++ b/src/osgWrappers/introspection/osgParticle/Shooter.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::Shooter) I_DeclaringFile("osgParticle/Shooter"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgParticle/SmokeEffect.cpp b/src/osgWrappers/introspection/osgParticle/SmokeEffect.cpp index 35a6f52b6..52988cd7f 100644 --- a/src/osgWrappers/introspection/osgParticle/SmokeEffect.cpp +++ b/src/osgWrappers/introspection/osgParticle/SmokeEffect.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::SmokeEffect) I_DeclaringFile("osgParticle/SmokeEffect"); I_BaseType(osgParticle::ParticleEffect); diff --git a/src/osgWrappers/introspection/osgParticle/SmokeTrailEffect.cpp b/src/osgWrappers/introspection/osgParticle/SmokeTrailEffect.cpp index 394309e2e..3c6a160b8 100644 --- a/src/osgWrappers/introspection/osgParticle/SmokeTrailEffect.cpp +++ b/src/osgWrappers/introspection/osgParticle/SmokeTrailEffect.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgParticle::SmokeTrailEffect) I_DeclaringFile("osgParticle/SmokeTrailEffect"); I_BaseType(osgParticle::ParticleEffect); diff --git a/src/osgWrappers/introspection/osgParticle/VariableRateCounter.cpp b/src/osgWrappers/introspection/osgParticle/VariableRateCounter.cpp index 13d4434c6..78f366e66 100644 --- a/src/osgWrappers/introspection/osgParticle/VariableRateCounter.cpp +++ b/src/osgWrappers/introspection/osgParticle/VariableRateCounter.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::VariableRateCounter) I_DeclaringFile("osgParticle/VariableRateCounter"); I_BaseType(osgParticle::Counter); diff --git a/src/osgWrappers/introspection/osgParticle/range.cpp b/src/osgWrappers/introspection/osgParticle/range.cpp index 90dcb2b9b..7e36fcc98 100644 --- a/src/osgWrappers/introspection/osgParticle/range.cpp +++ b/src/osgWrappers/introspection/osgParticle/range.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osgParticle::range< float >, osgParticle::rangef) TYPE_NAME_ALIAS(osgParticle::range< osg::Vec2 >, osgParticle::rangev2) diff --git a/src/osgWrappers/introspection/osgPresentation/AnimationMaterial.cpp b/src/osgWrappers/introspection/osgPresentation/AnimationMaterial.cpp index d84525cb4..46d83344a 100644 --- a/src/osgWrappers/introspection/osgPresentation/AnimationMaterial.cpp +++ b/src/osgWrappers/introspection/osgPresentation/AnimationMaterial.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgPresentation::AnimationMaterial::LoopMode) I_DeclaringFile("osgPresentation/AnimationMaterial"); I_EnumLabel(osgPresentation::AnimationMaterial::SWING); @@ -286,6 +288,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Material >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Material > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Material *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgPresentation/CompileSlideCallback.cpp b/src/osgWrappers/introspection/osgPresentation/CompileSlideCallback.cpp index 0e8f3d5fa..eeee96277 100644 --- a/src/osgWrappers/introspection/osgPresentation/CompileSlideCallback.cpp +++ b/src/osgWrappers/introspection/osgPresentation/CompileSlideCallback.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgPresentation::CompileSlideCallback) I_DeclaringFile("osgPresentation/CompileSlideCallback"); I_BaseType(osg::Camera::DrawCallback); diff --git a/src/osgWrappers/introspection/osgPresentation/PickEventHandler.cpp b/src/osgWrappers/introspection/osgPresentation/PickEventHandler.cpp index 3d69325b5..8eb068b72 100644 --- a/src/osgWrappers/introspection/osgPresentation/PickEventHandler.cpp +++ b/src/osgWrappers/introspection/osgPresentation/PickEventHandler.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgPresentation::PickEventHandler) I_DeclaringFile("osgPresentation/PickEventHandler"); I_BaseType(osgGA::GUIEventHandler); diff --git a/src/osgWrappers/introspection/osgPresentation/SlideEventHandler.cpp b/src/osgWrappers/introspection/osgPresentation/SlideEventHandler.cpp index 3c7481a4f..639aa5626 100644 --- a/src/osgWrappers/introspection/osgPresentation/SlideEventHandler.cpp +++ b/src/osgWrappers/introspection/osgPresentation/SlideEventHandler.cpp @@ -31,6 +31,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::set< osg::ref_ptr< osgPresentation::ObjectOperator > COMMA osgPresentation::dereference_less >, osgPresentation::ActiveOperators::OperatorList) BEGIN_VALUE_REFLECTOR(osgPresentation::ActiveOperators) @@ -597,6 +599,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgPresentation::LayerCallback >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgPresentation::LayerCallback > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgPresentation::LayerCallback *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -637,6 +644,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgPresentation::ObjectOperator >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgPresentation::ObjectOperator > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgPresentation::ObjectOperator *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgPresentation/SlideShowConstructor.cpp b/src/osgWrappers/introspection/osgPresentation/SlideShowConstructor.cpp index 0cb386b65..40619d186 100644 --- a/src/osgWrappers/introspection/osgPresentation/SlideShowConstructor.cpp +++ b/src/osgWrappers/introspection/osgPresentation/SlideShowConstructor.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgPresentation::SlideShowConstructor::CoordinateFrame) I_DeclaringFile("osgPresentation/SlideShowConstructor"); I_EnumLabel(osgPresentation::SlideShowConstructor::SLIDE); diff --git a/src/osgWrappers/introspection/osgShadow/ConvexPolyhedron.cpp b/src/osgWrappers/introspection/osgShadow/ConvexPolyhedron.cpp index 4455e3189..8b336c565 100644 --- a/src/osgWrappers/introspection/osgShadow/ConvexPolyhedron.cpp +++ b/src/osgWrappers/introspection/osgShadow/ConvexPolyhedron.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::Vec3d >, osgShadow::ConvexPolyhedron::Vertices) TYPE_NAME_ALIAS(std::list< osgShadow::ConvexPolyhedron::Face >, osgShadow::ConvexPolyhedron::Faces) diff --git a/src/osgWrappers/introspection/osgShadow/DebugShadowMap.cpp b/src/osgWrappers/introspection/osgShadow/DebugShadowMap.cpp index fca80f90d..9766489d9 100644 --- a/src/osgWrappers/introspection/osgShadow/DebugShadowMap.cpp +++ b/src/osgWrappers/introspection/osgShadow/DebugShadowMap.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osgShadow::DebugShadowMap, osgShadow::DebugShadowMap::ThisClass) TYPE_NAME_ALIAS(osgShadow::ViewDependentShadowTechnique, osgShadow::DebugShadowMap::BaseClass) diff --git a/src/osgWrappers/introspection/osgShadow/LightSpacePerspectiveShadowMap.cpp b/src/osgWrappers/introspection/osgShadow/LightSpacePerspectiveShadowMap.cpp index 27bc40ffa..fda28ce2d 100644 --- a/src/osgWrappers/introspection/osgShadow/LightSpacePerspectiveShadowMap.cpp +++ b/src/osgWrappers/introspection/osgShadow/LightSpacePerspectiveShadowMap.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgShadow::LightSpacePerspectiveShadowMapAlgorithm) I_DeclaringFile("osgShadow/LightSpacePerspectiveShadowMap"); I_Constructor0(____LightSpacePerspectiveShadowMapAlgorithm, diff --git a/src/osgWrappers/introspection/osgShadow/MinimalCullBoundsShadowMap.cpp b/src/osgWrappers/introspection/osgShadow/MinimalCullBoundsShadowMap.cpp index bf25e0cce..b201ee12c 100644 --- a/src/osgWrappers/introspection/osgShadow/MinimalCullBoundsShadowMap.cpp +++ b/src/osgWrappers/introspection/osgShadow/MinimalCullBoundsShadowMap.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osgShadow::MinimalCullBoundsShadowMap, osgShadow::MinimalCullBoundsShadowMap::ThisClass) TYPE_NAME_ALIAS(osgShadow::MinimalShadowMap, osgShadow::MinimalCullBoundsShadowMap::BaseClass) diff --git a/src/osgWrappers/introspection/osgShadow/MinimalDrawBoundsShadowMap.cpp b/src/osgWrappers/introspection/osgShadow/MinimalDrawBoundsShadowMap.cpp index 493243f86..51c0406aa 100644 --- a/src/osgWrappers/introspection/osgShadow/MinimalDrawBoundsShadowMap.cpp +++ b/src/osgWrappers/introspection/osgShadow/MinimalDrawBoundsShadowMap.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osgShadow::MinimalDrawBoundsShadowMap, osgShadow::MinimalDrawBoundsShadowMap::ThisClass) TYPE_NAME_ALIAS(osgShadow::MinimalShadowMap, osgShadow::MinimalDrawBoundsShadowMap::BaseClass) diff --git a/src/osgWrappers/introspection/osgShadow/MinimalShadowMap.cpp b/src/osgWrappers/introspection/osgShadow/MinimalShadowMap.cpp index cd7ce0a30..fb37eb346 100644 --- a/src/osgWrappers/introspection/osgShadow/MinimalShadowMap.cpp +++ b/src/osgWrappers/introspection/osgShadow/MinimalShadowMap.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgShadow::MinimalShadowMap::ShadowReceivingCoarseBoundAccuracy) I_DeclaringFile("osgShadow/MinimalShadowMap"); I_EnumLabel(osgShadow::MinimalShadowMap::EMPTY_BOX); diff --git a/src/osgWrappers/introspection/osgShadow/OccluderGeometry.cpp b/src/osgWrappers/introspection/osgShadow/OccluderGeometry.cpp index f99af8b82..09ae0f456 100644 --- a/src/osgWrappers/introspection/osgShadow/OccluderGeometry.cpp +++ b/src/osgWrappers/introspection/osgShadow/OccluderGeometry.cpp @@ -29,6 +29,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgShadow::OccluderGeometry::Vec3List) TYPE_NAME_ALIAS(std::vector< GLuint >, osgShadow::OccluderGeometry::UIntList) diff --git a/src/osgWrappers/introspection/osgShadow/ParallelSplitShadowMap.cpp b/src/osgWrappers/introspection/osgShadow/ParallelSplitShadowMap.cpp index 7cc272128..5a1bf58a9 100644 --- a/src/osgWrappers/introspection/osgShadow/ParallelSplitShadowMap.cpp +++ b/src/osgWrappers/introspection/osgShadow/ParallelSplitShadowMap.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgShadow::ParallelSplitShadowMap::SplitCalcMode) I_DeclaringFile("osgShadow/ParallelSplitShadowMap"); I_EnumLabel(osgShadow::ParallelSplitShadowMap::SPLIT_LINEAR); diff --git a/src/osgWrappers/introspection/osgShadow/ShadowMap.cpp b/src/osgWrappers/introspection/osgShadow/ShadowMap.cpp index 4e770f77b..1451f6f6d 100644 --- a/src/osgWrappers/introspection/osgShadow/ShadowMap.cpp +++ b/src/osgWrappers/introspection/osgShadow/ShadowMap.cpp @@ -30,6 +30,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Uniform > >, osgShadow::ShadowMap::UniformList) TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Shader > >, osgShadow::ShadowMap::ShaderList) @@ -198,6 +200,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Camera >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Camera > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Camera *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -238,6 +245,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Shader >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Shader > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Shader *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgShadow/ShadowTechnique.cpp b/src/osgWrappers/introspection/osgShadow/ShadowTechnique.cpp index 45af9db74..73988c34a 100644 --- a/src/osgWrappers/introspection/osgShadow/ShadowTechnique.cpp +++ b/src/osgWrappers/introspection/osgShadow/ShadowTechnique.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowTechnique) I_DeclaringFile("osgShadow/ShadowTechnique"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgShadow/ShadowTexture.cpp b/src/osgWrappers/introspection/osgShadow/ShadowTexture.cpp index 803c60085..94452d507 100644 --- a/src/osgWrappers/introspection/osgShadow/ShadowTexture.cpp +++ b/src/osgWrappers/introspection/osgShadow/ShadowTexture.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowTexture) I_DeclaringFile("osgShadow/ShadowTexture"); I_BaseType(osgShadow::ShadowTechnique); diff --git a/src/osgWrappers/introspection/osgShadow/ShadowVolume.cpp b/src/osgWrappers/introspection/osgShadow/ShadowVolume.cpp index 3150301f1..752e1d00f 100644 --- a/src/osgWrappers/introspection/osgShadow/ShadowVolume.cpp +++ b/src/osgWrappers/introspection/osgShadow/ShadowVolume.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowVolume) I_DeclaringFile("osgShadow/ShadowVolume"); I_BaseType(osgShadow::ShadowTechnique); diff --git a/src/osgWrappers/introspection/osgShadow/ShadowedScene.cpp b/src/osgWrappers/introspection/osgShadow/ShadowedScene.cpp index f76077422..14089a765 100644 --- a/src/osgWrappers/introspection/osgShadow/ShadowedScene.cpp +++ b/src/osgWrappers/introspection/osgShadow/ShadowedScene.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowedScene) I_DeclaringFile("osgShadow/ShadowedScene"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osgShadow/SoftShadowMap.cpp b/src/osgWrappers/introspection/osgShadow/SoftShadowMap.cpp index 225ef62db..8ffdf2092 100644 --- a/src/osgWrappers/introspection/osgShadow/SoftShadowMap.cpp +++ b/src/osgWrappers/introspection/osgShadow/SoftShadowMap.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgShadow::SoftShadowMap) I_DeclaringFile("osgShadow/SoftShadowMap"); I_BaseType(osgShadow::ShadowMap); diff --git a/src/osgWrappers/introspection/osgShadow/StandardShadowMap.cpp b/src/osgWrappers/introspection/osgShadow/StandardShadowMap.cpp index dfdf38755..19cc1b027 100644 --- a/src/osgWrappers/introspection/osgShadow/StandardShadowMap.cpp +++ b/src/osgWrappers/introspection/osgShadow/StandardShadowMap.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osgShadow::StandardShadowMap, osgShadow::StandardShadowMap::ThisClass) TYPE_NAME_ALIAS(osgShadow::DebugShadowMap, osgShadow::StandardShadowMap::BaseClass) diff --git a/src/osgWrappers/introspection/osgShadow/ViewDependentShadowTechnique.cpp b/src/osgWrappers/introspection/osgShadow/ViewDependentShadowTechnique.cpp index d64053c43..bbf0d9e23 100644 --- a/src/osgWrappers/introspection/osgShadow/ViewDependentShadowTechnique.cpp +++ b/src/osgWrappers/introspection/osgShadow/ViewDependentShadowTechnique.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgShadow::ViewDependentShadowTechnique) I_DeclaringFile("osgShadow/ViewDependentShadowTechnique"); I_BaseType(osgShadow::ShadowTechnique); diff --git a/src/osgWrappers/introspection/osgSim/BlinkSequence.cpp b/src/osgWrappers/introspection/osgSim/BlinkSequence.cpp index 1dd67e8fe..619e2ed7d 100644 --- a/src/osgWrappers/introspection/osgSim/BlinkSequence.cpp +++ b/src/osgWrappers/introspection/osgSim/BlinkSequence.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::BlinkSequence) I_DeclaringFile("osgSim/BlinkSequence"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgSim/ColorRange.cpp b/src/osgWrappers/introspection/osgSim/ColorRange.cpp index 0aeb49e71..ea29e0575 100644 --- a/src/osgWrappers/introspection/osgSim/ColorRange.cpp +++ b/src/osgWrappers/introspection/osgSim/ColorRange.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::ColorRange) I_DeclaringFile("osgSim/ColorRange"); I_BaseType(osgSim::ScalarsToColors); diff --git a/src/osgWrappers/introspection/osgSim/DOFTransform.cpp b/src/osgWrappers/introspection/osgSim/DOFTransform.cpp index a8da51b14..91122114b 100644 --- a/src/osgWrappers/introspection/osgSim/DOFTransform.cpp +++ b/src/osgWrappers/introspection/osgSim/DOFTransform.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgSim::DOFTransform::MultOrder) I_DeclaringFile("osgSim/DOFTransform"); I_EnumLabel(osgSim::DOFTransform::PRH); diff --git a/src/osgWrappers/introspection/osgSim/ElevationSlice.cpp b/src/osgWrappers/introspection/osgSim/ElevationSlice.cpp index be89aec4d..cd4081232 100644 --- a/src/osgWrappers/introspection/osgSim/ElevationSlice.cpp +++ b/src/osgWrappers/introspection/osgSim/ElevationSlice.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::Vec3d >, osgSim::ElevationSlice::Vec3dList) TYPE_NAME_ALIAS(std::pair< double COMMA double >, osgSim::ElevationSlice::DistanceHeight) diff --git a/src/osgWrappers/introspection/osgSim/GeographicLocation.cpp b/src/osgWrappers/introspection/osgSim/GeographicLocation.cpp index ba36746c4..ece822bed 100644 --- a/src/osgWrappers/introspection/osgSim/GeographicLocation.cpp +++ b/src/osgWrappers/introspection/osgSim/GeographicLocation.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::GeographicLocation) I_DeclaringFile("osgSim/GeographicLocation"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgSim/HeightAboveTerrain.cpp b/src/osgWrappers/introspection/osgSim/HeightAboveTerrain.cpp index 49a70d51d..50995ab60 100644 --- a/src/osgWrappers/introspection/osgSim/HeightAboveTerrain.cpp +++ b/src/osgWrappers/introspection/osgSim/HeightAboveTerrain.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgSim::HeightAboveTerrain) I_DeclaringFile("osgSim/HeightAboveTerrain"); I_Constructor0(____HeightAboveTerrain, diff --git a/src/osgWrappers/introspection/osgSim/Impostor.cpp b/src/osgWrappers/introspection/osgSim/Impostor.cpp index 169261c5b..1d71e4897 100644 --- a/src/osgWrappers/introspection/osgSim/Impostor.cpp +++ b/src/osgWrappers/introspection/osgSim/Impostor.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgSim::ImpostorSprite > >, osgSim::Impostor::ImpostorSpriteList) BEGIN_OBJECT_REFLECTOR(osgSim::Impostor) @@ -142,6 +144,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgSim::ImpostorSprite >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgSim::ImpostorSprite > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgSim::ImpostorSprite *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgSim/ImpostorSprite.cpp b/src/osgWrappers/introspection/osgSim/ImpostorSprite.cpp index 4506a2a4e..bf99f0261 100644 --- a/src/osgWrappers/introspection/osgSim/ImpostorSprite.cpp +++ b/src/osgWrappers/introspection/osgSim/ImpostorSprite.cpp @@ -33,6 +33,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::ImpostorSprite) I_DeclaringFile("osgSim/ImpostorSprite"); I_BaseType(osg::Drawable); diff --git a/src/osgWrappers/introspection/osgSim/InsertImpostorsVisitor.cpp b/src/osgWrappers/introspection/osgSim/InsertImpostorsVisitor.cpp index 3b4500c6f..bed551509 100644 --- a/src/osgWrappers/introspection/osgSim/InsertImpostorsVisitor.cpp +++ b/src/osgWrappers/introspection/osgSim/InsertImpostorsVisitor.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::InsertImpostorsVisitor) I_DeclaringFile("osgSim/InsertImpostorsVisitor"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/introspection/osgSim/LightPoint.cpp b/src/osgWrappers/introspection/osgSim/LightPoint.cpp index d34b68f18..49050c311 100644 --- a/src/osgWrappers/introspection/osgSim/LightPoint.cpp +++ b/src/osgWrappers/introspection/osgSim/LightPoint.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgSim::LightPoint::BlendingMode) I_DeclaringFile("osgSim/LightPoint"); I_EnumLabel(osgSim::LightPoint::ADDITIVE); diff --git a/src/osgWrappers/introspection/osgSim/LightPointNode.cpp b/src/osgWrappers/introspection/osgSim/LightPointNode.cpp index 7025c078f..3b400acf1 100644 --- a/src/osgWrappers/introspection/osgSim/LightPointNode.cpp +++ b/src/osgWrappers/introspection/osgSim/LightPointNode.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osgSim::LightPoint >, osgSim::LightPointNode::LightPointList) BEGIN_OBJECT_REFLECTOR(osgSim::LightPointNode) diff --git a/src/osgWrappers/introspection/osgSim/LightPointSystem.cpp b/src/osgWrappers/introspection/osgSim/LightPointSystem.cpp index 6a49074ed..60288576a 100644 --- a/src/osgWrappers/introspection/osgSim/LightPointSystem.cpp +++ b/src/osgWrappers/introspection/osgSim/LightPointSystem.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgSim::LightPointSystem::AnimationState) I_DeclaringFile("osgSim/LightPointSystem"); I_EnumLabel(osgSim::LightPointSystem::ANIMATION_ON); diff --git a/src/osgWrappers/introspection/osgSim/LineOfSight.cpp b/src/osgWrappers/introspection/osgSim/LineOfSight.cpp index f41992796..fd55eb68b 100644 --- a/src/osgWrappers/introspection/osgSim/LineOfSight.cpp +++ b/src/osgWrappers/introspection/osgSim/LineOfSight.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::DatabaseCacheReadCallback) I_DeclaringFile("osgSim/LineOfSight"); I_BaseType(osgUtil::IntersectionVisitor::ReadCallback); diff --git a/src/osgWrappers/introspection/osgSim/MultiSwitch.cpp b/src/osgWrappers/introspection/osgSim/MultiSwitch.cpp index dcf15b50a..821eeac4e 100644 --- a/src/osgWrappers/introspection/osgSim/MultiSwitch.cpp +++ b/src/osgWrappers/introspection/osgSim/MultiSwitch.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< bool >, osgSim::MultiSwitch::ValueList) TYPE_NAME_ALIAS(std::vector< osgSim::MultiSwitch::ValueList >, osgSim::MultiSwitch::SwitchSetList) diff --git a/src/osgWrappers/introspection/osgSim/ObjectRecordData.cpp b/src/osgWrappers/introspection/osgSim/ObjectRecordData.cpp index ea192d034..59bfd7b0e 100644 --- a/src/osgWrappers/introspection/osgSim/ObjectRecordData.cpp +++ b/src/osgWrappers/introspection/osgSim/ObjectRecordData.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::ObjectRecordData) I_DeclaringFile("osgSim/ObjectRecordData"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgSim/OverlayNode.cpp b/src/osgWrappers/introspection/osgSim/OverlayNode.cpp index 238b3032e..3e48b8224 100644 --- a/src/osgWrappers/introspection/osgSim/OverlayNode.cpp +++ b/src/osgWrappers/introspection/osgSim/OverlayNode.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgSim::OverlayNode::OverlayTechnique) I_DeclaringFile("osgSim/OverlayNode"); I_EnumLabel(osgSim::OverlayNode::OBJECT_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY); diff --git a/src/osgWrappers/introspection/osgSim/ScalarBar.cpp b/src/osgWrappers/introspection/osgSim/ScalarBar.cpp index 96aee224a..07ff1a7eb 100644 --- a/src/osgWrappers/introspection/osgSim/ScalarBar.cpp +++ b/src/osgWrappers/introspection/osgSim/ScalarBar.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgSim::ScalarBar::Orientation) I_DeclaringFile("osgSim/ScalarBar"); I_EnumLabel(osgSim::ScalarBar::HORIZONTAL); diff --git a/src/osgWrappers/introspection/osgSim/ScalarsToColors.cpp b/src/osgWrappers/introspection/osgSim/ScalarsToColors.cpp index d8823dd17..0fdef55ba 100644 --- a/src/osgWrappers/introspection/osgSim/ScalarsToColors.cpp +++ b/src/osgWrappers/introspection/osgSim/ScalarsToColors.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::ScalarsToColors) I_DeclaringFile("osgSim/ScalarsToColors"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgSim/Sector.cpp b/src/osgWrappers/introspection/osgSim/Sector.cpp index 8d14b7cc8..c23e5c6cc 100644 --- a/src/osgWrappers/introspection/osgSim/Sector.cpp +++ b/src/osgWrappers/introspection/osgSim/Sector.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::AzimElevationSector) I_DeclaringFile("osgSim/Sector"); I_BaseType(osgSim::Sector); diff --git a/src/osgWrappers/introspection/osgSim/ShapeAttribute.cpp b/src/osgWrappers/introspection/osgSim/ShapeAttribute.cpp index c4c3e8bda..5a7a15a39 100644 --- a/src/osgWrappers/introspection/osgSim/ShapeAttribute.cpp +++ b/src/osgWrappers/introspection/osgSim/ShapeAttribute.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgSim::ShapeAttribute::Type) I_DeclaringFile("osgSim/ShapeAttribute"); I_EnumLabel(osgSim::ShapeAttribute::UNKNOW); diff --git a/src/osgWrappers/introspection/osgSim/SphereSegment.cpp b/src/osgWrappers/introspection/osgSim/SphereSegment.cpp index 14c7179b9..cc0575135 100644 --- a/src/osgWrappers/introspection/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/introspection/osgSim/SphereSegment.cpp @@ -29,6 +29,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgSim::SphereSegment::DrawMask) I_DeclaringFile("osgSim/SphereSegment"); I_EnumLabel(osgSim::SphereSegment::SURFACE); @@ -257,6 +259,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Vec3Array >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Vec3Array > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Vec3Array *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgSim/VisibilityGroup.cpp b/src/osgWrappers/introspection/osgSim/VisibilityGroup.cpp index 9c2b0655e..6a9983f97 100644 --- a/src/osgWrappers/introspection/osgSim/VisibilityGroup.cpp +++ b/src/osgWrappers/introspection/osgSim/VisibilityGroup.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgSim::VisibilityGroup) I_DeclaringFile("osgSim/VisibilityGroup"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osgTerrain/Export.cpp b/src/osgWrappers/introspection/osgTerrain/Export.cpp index cb84b725c..fbfd53f10 100644 --- a/src/osgWrappers/introspection/osgTerrain/Export.cpp +++ b/src/osgWrappers/introspection/osgTerrain/Export.cpp @@ -20,3 +20,5 @@ #undef OUT #endif +#include + diff --git a/src/osgWrappers/introspection/osgTerrain/GeometryTechnique.cpp b/src/osgWrappers/introspection/osgTerrain/GeometryTechnique.cpp index 2729b0988..2b9de4cfe 100644 --- a/src/osgWrappers/introspection/osgTerrain/GeometryTechnique.cpp +++ b/src/osgWrappers/introspection/osgTerrain/GeometryTechnique.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgTerrain::GeometryTechnique::FilterType) I_DeclaringFile("osgTerrain/GeometryTechnique"); I_EnumLabel(osgTerrain::GeometryTechnique::GAUSSIAN); diff --git a/src/osgWrappers/introspection/osgTerrain/Layer.cpp b/src/osgWrappers/introspection/osgTerrain/Layer.cpp index 128da72b0..36af752d1 100644 --- a/src/osgWrappers/introspection/osgTerrain/Layer.cpp +++ b/src/osgWrappers/introspection/osgTerrain/Layer.cpp @@ -32,6 +32,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgTerrain::CompositeLayer) I_DeclaringFile("osgTerrain/Layer"); I_BaseType(osgTerrain::Layer); diff --git a/src/osgWrappers/introspection/osgTerrain/Locator.cpp b/src/osgWrappers/introspection/osgTerrain/Locator.cpp index ef2f1696d..40cd24cee 100644 --- a/src/osgWrappers/introspection/osgTerrain/Locator.cpp +++ b/src/osgWrappers/introspection/osgTerrain/Locator.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgTerrain::Locator::CoordinateSystemType) I_DeclaringFile("osgTerrain/Locator"); I_EnumLabel(osgTerrain::Locator::GEOCENTRIC); diff --git a/src/osgWrappers/introspection/osgTerrain/Terrain.cpp b/src/osgWrappers/introspection/osgTerrain/Terrain.cpp index 575a8048c..95c98ef57 100644 --- a/src/osgWrappers/introspection/osgTerrain/Terrain.cpp +++ b/src/osgWrappers/introspection/osgTerrain/Terrain.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgTerrain::Terrain) I_DeclaringFile("osgTerrain/Terrain"); I_BaseType(osg::CoordinateSystemNode); diff --git a/src/osgWrappers/introspection/osgTerrain/TerrainTechnique.cpp b/src/osgWrappers/introspection/osgTerrain/TerrainTechnique.cpp index 5f9efbb24..9337fba00 100644 --- a/src/osgWrappers/introspection/osgTerrain/TerrainTechnique.cpp +++ b/src/osgWrappers/introspection/osgTerrain/TerrainTechnique.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique) I_DeclaringFile("osgTerrain/TerrainTechnique"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgTerrain/TerrainTile.cpp b/src/osgWrappers/introspection/osgTerrain/TerrainTile.cpp index 34e9e2e0f..ecd1a089f 100644 --- a/src/osgWrappers/introspection/osgTerrain/TerrainTile.cpp +++ b/src/osgWrappers/introspection/osgTerrain/TerrainTile.cpp @@ -30,6 +30,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgTerrain::TerrainTile::BlendingPolicy) I_DeclaringFile("osgTerrain/TerrainTile"); I_EnumLabel(osgTerrain::TerrainTile::INHERIT); @@ -426,6 +428,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgTerrain::TerrainTile::TileLoadedCallback ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgTerrain::TerrainTile::TileLoadedCallback > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgTerrain::TerrainTile::TileLoadedCallback *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgTerrain/ValidDataOperator.cpp b/src/osgWrappers/introspection/osgTerrain/ValidDataOperator.cpp index 3a4cabe60..00e5a7f7f 100644 --- a/src/osgWrappers/introspection/osgTerrain/ValidDataOperator.cpp +++ b/src/osgWrappers/introspection/osgTerrain/ValidDataOperator.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgTerrain::NoDataValue) I_DeclaringFile("osgTerrain/ValidDataOperator"); I_BaseType(osgTerrain::ValidDataOperator); diff --git a/src/osgWrappers/introspection/osgText/Export.cpp b/src/osgWrappers/introspection/osgText/Export.cpp index bbac5114c..4f9502f9a 100644 --- a/src/osgWrappers/introspection/osgText/Export.cpp +++ b/src/osgWrappers/introspection/osgText/Export.cpp @@ -20,3 +20,5 @@ #undef OUT #endif +#include + diff --git a/src/osgWrappers/introspection/osgText/FadeText.cpp b/src/osgWrappers/introspection/osgText/FadeText.cpp index 942bf89e0..a24fd6c21 100644 --- a/src/osgWrappers/introspection/osgText/FadeText.cpp +++ b/src/osgWrappers/introspection/osgText/FadeText.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgText::FadeText) I_DeclaringFile("osgText/FadeText"); I_BaseType(osgText::Text); diff --git a/src/osgWrappers/introspection/osgText/Font.cpp b/src/osgWrappers/introspection/osgText/Font.cpp index 74c8a1925..c4fc7fd2b 100644 --- a/src/osgWrappers/introspection/osgText/Font.cpp +++ b/src/osgWrappers/introspection/osgText/Font.cpp @@ -29,6 +29,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(OpenThreads::Mutex, osgText::Font::FontMutex) BEGIN_OBJECT_REFLECTOR(osgText::Font) diff --git a/src/osgWrappers/introspection/osgText/Font3D.cpp b/src/osgWrappers/introspection/osgText/Font3D.cpp index 65de3562e..e867dc950 100644 --- a/src/osgWrappers/introspection/osgText/Font3D.cpp +++ b/src/osgWrappers/introspection/osgText/Font3D.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(OpenThreads::Mutex, osgText::Font3D::Font3DMutex) BEGIN_OBJECT_REFLECTOR(osgText::Font3D) diff --git a/src/osgWrappers/introspection/osgText/KerningType.cpp b/src/osgWrappers/introspection/osgText/KerningType.cpp index 343fb87f7..f2db21007 100644 --- a/src/osgWrappers/introspection/osgText/KerningType.cpp +++ b/src/osgWrappers/introspection/osgText/KerningType.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgText::KerningType) I_DeclaringFile("osgText/KerningType"); I_EnumLabel(osgText::KERNING_DEFAULT); diff --git a/src/osgWrappers/introspection/osgText/String.cpp b/src/osgWrappers/introspection/osgText/String.cpp index 3e9831bdb..cf34a096a 100644 --- a/src/osgWrappers/introspection/osgText/String.cpp +++ b/src/osgWrappers/introspection/osgText/String.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgText::String::Encoding) I_DeclaringFile("osgText/String"); I_EnumLabel(osgText::String::ENCODING_UNDEFINED); diff --git a/src/osgWrappers/introspection/osgText/Text.cpp b/src/osgWrappers/introspection/osgText/Text.cpp index 397625b94..3c5c2681b 100644 --- a/src/osgWrappers/introspection/osgText/Text.cpp +++ b/src/osgWrappers/introspection/osgText/Text.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgText::Text::BackdropType) I_DeclaringFile("osgText/Text"); I_EnumLabel(osgText::Text::DROP_SHADOW_BOTTOM_RIGHT); @@ -533,6 +535,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgText::Font >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgText::Font > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgText::Font *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -573,6 +580,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgText::Font::GlyphTexture >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgText::Font::GlyphTexture > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgText::Font::GlyphTexture *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgText/Text3D.cpp b/src/osgWrappers/introspection/osgText/Text3D.cpp index 77869cd87..367626945 100644 --- a/src/osgWrappers/introspection/osgText/Text3D.cpp +++ b/src/osgWrappers/introspection/osgText/Text3D.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgText::Text3D::RenderMode) I_DeclaringFile("osgText/Text3D"); I_EnumLabel(osgText::Text3D::PER_FACE); @@ -218,6 +220,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgText::Font3D >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgText::Font3D > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgText::Font3D *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgText/TextBase.cpp b/src/osgWrappers/introspection/osgText/TextBase.cpp index b81a40123..7da82f07c 100644 --- a/src/osgWrappers/introspection/osgText/TextBase.cpp +++ b/src/osgWrappers/introspection/osgText/TextBase.cpp @@ -29,6 +29,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgText::TextBase::CharacterSizeMode) I_DeclaringFile("osgText/TextBase"); I_EnumLabel(osgText::TextBase::OBJECT_COORDS); diff --git a/src/osgWrappers/introspection/osgUtil/ConvertVec.cpp b/src/osgWrappers/introspection/osgUtil/ConvertVec.cpp index b294ccf4a..9708803e0 100644 --- a/src/osgWrappers/introspection/osgUtil/ConvertVec.cpp +++ b/src/osgWrappers/introspection/osgUtil/ConvertVec.cpp @@ -20,3 +20,5 @@ #undef OUT #endif +#include + diff --git a/src/osgWrappers/introspection/osgUtil/CubeMapGenerator.cpp b/src/osgWrappers/introspection/osgUtil/CubeMapGenerator.cpp index 2bdf2b08f..defb8227e 100644 --- a/src/osgWrappers/introspection/osgUtil/CubeMapGenerator.cpp +++ b/src/osgWrappers/introspection/osgUtil/CubeMapGenerator.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::CubeMapGenerator) I_DeclaringFile("osgUtil/CubeMapGenerator"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgUtil/CullVisitor.cpp b/src/osgWrappers/introspection/osgUtil/CullVisitor.cpp index f1c9fda6c..da841b5eb 100644 --- a/src/osgWrappers/introspection/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/introspection/osgUtil/CullVisitor.cpp @@ -49,6 +49,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Matrix::value_type, osgUtil::CullVisitor::value_type) BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor) @@ -430,6 +432,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::CullVisitor >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::CullVisitor > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::CullVisitor *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgUtil/DelaunayTriangulator.cpp b/src/osgWrappers/introspection/osgUtil/DelaunayTriangulator.cpp index 0bc35261e..74d9db57c 100644 --- a/src/osgWrappers/introspection/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgWrappers/introspection/osgUtil/DelaunayTriangulator.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayConstraint) I_DeclaringFile("osgUtil/DelaunayTriangulator"); I_BaseType(osg::Geometry); @@ -193,6 +195,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::DelaunayConstraint >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::DelaunayConstraint > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::DelaunayConstraint *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgUtil/DisplayRequirementsVisitor.cpp b/src/osgWrappers/introspection/osgUtil/DisplayRequirementsVisitor.cpp index e8e22759c..d4301b933 100644 --- a/src/osgWrappers/introspection/osgUtil/DisplayRequirementsVisitor.cpp +++ b/src/osgWrappers/introspection/osgUtil/DisplayRequirementsVisitor.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::DisplayRequirementsVisitor) I_DeclaringFile("osgUtil/DisplayRequirementsVisitor"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/introspection/osgUtil/DrawElementTypeSimplifier.cpp b/src/osgWrappers/introspection/osgUtil/DrawElementTypeSimplifier.cpp index 03cfd8b56..4d0342d33 100644 --- a/src/osgWrappers/introspection/osgUtil/DrawElementTypeSimplifier.cpp +++ b/src/osgWrappers/introspection/osgUtil/DrawElementTypeSimplifier.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgUtil::DrawElementTypeSimplifier) I_DeclaringFile("osgUtil/DrawElementTypeSimplifier"); I_Constructor0(____DrawElementTypeSimplifier, diff --git a/src/osgWrappers/introspection/osgUtil/EdgeCollector.cpp b/src/osgWrappers/introspection/osgUtil/EdgeCollector.cpp index bd89e0cfe..79ee21f77 100644 --- a/src/osgWrappers/introspection/osgUtil/EdgeCollector.cpp +++ b/src/osgWrappers/introspection/osgUtil/EdgeCollector.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgUtil::dereference_clear) I_DeclaringFile("osgUtil/EdgeCollector"); I_Constructor0(____dereference_clear, @@ -274,6 +276,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::UIntArray >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::UIntArray > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::UIntArray *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -314,6 +321,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::EdgeCollector::Edge >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::EdgeCollector::Edge > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::EdgeCollector::Edge *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -354,6 +366,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::EdgeCollector::Edgeloop >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::EdgeCollector::Edgeloop > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::EdgeCollector::Edgeloop *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -394,6 +411,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::EdgeCollector::Point >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::EdgeCollector::Point > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::EdgeCollector::Point *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -434,6 +456,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::EdgeCollector::Triangle >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::EdgeCollector::Triangle > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::EdgeCollector::Triangle *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/introspection/osgUtil/GLObjectsVisitor.cpp index 7b8d6d0f3..29842fcbd 100644 --- a/src/osgWrappers/introspection/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/introspection/osgUtil/GLObjectsVisitor.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::GLObjectsOperation) I_DeclaringFile("osgUtil/GLObjectsVisitor"); I_BaseType(osg::GraphicsOperation); diff --git a/src/osgWrappers/introspection/osgUtil/HalfWayMapGenerator.cpp b/src/osgWrappers/introspection/osgUtil/HalfWayMapGenerator.cpp index 66740fd2e..828e291b0 100644 --- a/src/osgWrappers/introspection/osgUtil/HalfWayMapGenerator.cpp +++ b/src/osgWrappers/introspection/osgUtil/HalfWayMapGenerator.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::HalfWayMapGenerator) I_DeclaringFile("osgUtil/HalfWayMapGenerator"); I_BaseType(osgUtil::CubeMapGenerator); diff --git a/src/osgWrappers/introspection/osgUtil/HighlightMapGenerator.cpp b/src/osgWrappers/introspection/osgUtil/HighlightMapGenerator.cpp index b7a07b78f..bc372812f 100644 --- a/src/osgWrappers/introspection/osgUtil/HighlightMapGenerator.cpp +++ b/src/osgWrappers/introspection/osgUtil/HighlightMapGenerator.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::HighlightMapGenerator) I_DeclaringFile("osgUtil/HighlightMapGenerator"); I_BaseType(osgUtil::CubeMapGenerator); diff --git a/src/osgWrappers/introspection/osgUtil/IncrementalCompileOperation.cpp b/src/osgWrappers/introspection/osgUtil/IncrementalCompileOperation.cpp index 2db8cfec4..2b9f830d7 100644 --- a/src/osgWrappers/introspection/osgUtil/IncrementalCompileOperation.cpp +++ b/src/osgWrappers/introspection/osgUtil/IncrementalCompileOperation.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgUtil::IncrementalCompileOperation::Contexts) TYPE_NAME_ALIAS(std::set< osg::GraphicsContext * >, osgUtil::IncrementalCompileOperation::ContextSet) @@ -261,6 +263,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Program >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Program > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Program *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -301,6 +308,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Texture >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::Texture > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::Texture *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -341,6 +353,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::IncrementalCompileOperation::Compil ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::IncrementalCompileOperation::CompileSet > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::IncrementalCompileOperation::CompileSet *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgUtil/IntersectVisitor.cpp b/src/osgWrappers/introspection/osgUtil/IntersectVisitor.cpp index 442a2fb9f..4756cc9b8 100644 --- a/src/osgWrappers/introspection/osgUtil/IntersectVisitor.cpp +++ b/src/osgWrappers/introspection/osgUtil/IntersectVisitor.cpp @@ -35,6 +35,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< int >, osgUtil::Hit::VecIndexList) BEGIN_VALUE_REFLECTOR(osgUtil::Hit) diff --git a/src/osgWrappers/introspection/osgUtil/IntersectionVisitor.cpp b/src/osgWrappers/introspection/osgUtil/IntersectionVisitor.cpp index 6bd9fd0ba..90cc6ce63 100644 --- a/src/osgWrappers/introspection/osgUtil/IntersectionVisitor.cpp +++ b/src/osgWrappers/introspection/osgUtil/IntersectionVisitor.cpp @@ -33,6 +33,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgUtil::IntersectionVisitor::LODSelectionMode) I_DeclaringFile("osgUtil/IntersectionVisitor"); I_EnumLabel(osgUtil::IntersectionVisitor::USE_HIGHEST_LEVEL_OF_DETAIL); @@ -511,6 +513,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::Intersector >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::Intersector > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::Intersector *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgUtil/LineSegmentIntersector.cpp b/src/osgWrappers/introspection/osgUtil/LineSegmentIntersector.cpp index cc5558765..c3d9a8b21 100644 --- a/src/osgWrappers/introspection/osgUtil/LineSegmentIntersector.cpp +++ b/src/osgWrappers/introspection/osgUtil/LineSegmentIntersector.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::multiset< osgUtil::LineSegmentIntersector::Intersection >, osgUtil::LineSegmentIntersector::Intersections) BEGIN_OBJECT_REFLECTOR(osgUtil::LineSegmentIntersector) diff --git a/src/osgWrappers/introspection/osgUtil/OperationArrayFunctor.cpp b/src/osgWrappers/introspection/osgUtil/OperationArrayFunctor.cpp index b451ed94a..3c3ebecd1 100644 --- a/src/osgWrappers/introspection/osgUtil/OperationArrayFunctor.cpp +++ b/src/osgWrappers/introspection/osgUtil/OperationArrayFunctor.cpp @@ -20,3 +20,5 @@ #undef OUT #endif +#include + diff --git a/src/osgWrappers/introspection/osgUtil/Optimizer.cpp b/src/osgWrappers/introspection/osgUtil/Optimizer.cpp index 725864d80..25aa5bc6c 100644 --- a/src/osgWrappers/introspection/osgUtil/Optimizer.cpp +++ b/src/osgWrappers/introspection/osgUtil/Optimizer.cpp @@ -39,6 +39,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::BaseOptimizerVisitor) I_DeclaringFile("osgUtil/Optimizer"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/introspection/osgUtil/PlaneIntersector.cpp b/src/osgWrappers/introspection/osgUtil/PlaneIntersector.cpp index 9372f15ad..420d9c770 100644 --- a/src/osgWrappers/introspection/osgUtil/PlaneIntersector.cpp +++ b/src/osgWrappers/introspection/osgUtil/PlaneIntersector.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osgUtil::PlaneIntersector::Intersection >, osgUtil::PlaneIntersector::Intersections) BEGIN_OBJECT_REFLECTOR(osgUtil::PlaneIntersector) diff --git a/src/osgWrappers/introspection/osgUtil/PolytopeIntersector.cpp b/src/osgWrappers/introspection/osgUtil/PolytopeIntersector.cpp index b29084314..04ab74b7c 100644 --- a/src/osgWrappers/introspection/osgUtil/PolytopeIntersector.cpp +++ b/src/osgWrappers/introspection/osgUtil/PolytopeIntersector.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::set< osgUtil::PolytopeIntersector::Intersection >, osgUtil::PolytopeIntersector::Intersections) BEGIN_OBJECT_REFLECTOR(osgUtil::PolytopeIntersector) diff --git a/src/osgWrappers/introspection/osgUtil/PositionalStateContainer.cpp b/src/osgWrappers/introspection/osgUtil/PositionalStateContainer.cpp index 6e727de8d..482b0f26d 100644 --- a/src/osgWrappers/introspection/osgUtil/PositionalStateContainer.cpp +++ b/src/osgWrappers/introspection/osgUtil/PositionalStateContainer.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< const osg::StateAttribute > COMMA osg::ref_ptr< osg::RefMatrix > >, osgUtil::PositionalStateContainer::AttrMatrixPair) TYPE_NAME_ALIAS(std::vector< osgUtil::PositionalStateContainer::AttrMatrixPair >, osgUtil::PositionalStateContainer::AttrMatrixList) @@ -118,6 +120,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::RefMatrix >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osg::RefMatrix > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osg::RefMatrix *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgUtil/ReflectionMapGenerator.cpp b/src/osgWrappers/introspection/osgUtil/ReflectionMapGenerator.cpp index aa657888d..2c7df9de1 100644 --- a/src/osgWrappers/introspection/osgUtil/ReflectionMapGenerator.cpp +++ b/src/osgWrappers/introspection/osgUtil/ReflectionMapGenerator.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::ReflectionMapGenerator) I_DeclaringFile("osgUtil/ReflectionMapGenerator"); I_BaseType(osgUtil::CubeMapGenerator); diff --git a/src/osgWrappers/introspection/osgUtil/RenderBin.cpp b/src/osgWrappers/introspection/osgUtil/RenderBin.cpp index 3a289b015..136f246a0 100644 --- a/src/osgWrappers/introspection/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/introspection/osgUtil/RenderBin.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgUtil::RenderBin::SortMode) I_DeclaringFile("osgUtil/RenderBin"); I_EnumLabel(osgUtil::RenderBin::SORT_BY_STATE); @@ -365,6 +367,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderBin >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::RenderBin > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::RenderBin *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgUtil/RenderStage.cpp b/src/osgWrappers/introspection/osgUtil/RenderStage.cpp index b57d00e46..ea69af1c2 100644 --- a/src/osgWrappers/introspection/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/introspection/osgUtil/RenderStage.cpp @@ -37,6 +37,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) I_DeclaringFile("osgUtil/RenderStage"); I_BaseType(osgUtil::RenderBin); diff --git a/src/osgWrappers/introspection/osgUtil/ReversePrimitiveFunctor.cpp b/src/osgWrappers/introspection/osgUtil/ReversePrimitiveFunctor.cpp index 19ab0743e..ea0f55010 100644 --- a/src/osgWrappers/introspection/osgUtil/ReversePrimitiveFunctor.cpp +++ b/src/osgWrappers/introspection/osgUtil/ReversePrimitiveFunctor.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::ReversePrimitiveFunctor) I_DeclaringFile("osgUtil/ReversePrimitiveFunctor"); I_BaseType(osg::PrimitiveIndexFunctor); diff --git a/src/osgWrappers/introspection/osgUtil/SceneGraphBuilder.cpp b/src/osgWrappers/introspection/osgUtil/SceneGraphBuilder.cpp index ad28dfb71..ce0ed7a50 100644 --- a/src/osgWrappers/introspection/osgUtil/SceneGraphBuilder.cpp +++ b/src/osgWrappers/introspection/osgUtil/SceneGraphBuilder.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgUtil::SceneGraphBuilder) I_DeclaringFile("osgUtil/SceneGraphBuilder"); I_Constructor0(____SceneGraphBuilder, diff --git a/src/osgWrappers/introspection/osgUtil/SceneView.cpp b/src/osgWrappers/introspection/osgUtil/SceneView.cpp index 8cfd91f1d..f7cf2be28 100644 --- a/src/osgWrappers/introspection/osgUtil/SceneView.cpp +++ b/src/osgWrappers/introspection/osgUtil/SceneView.cpp @@ -43,6 +43,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgUtil::SceneView::Options) I_DeclaringFile("osgUtil/SceneView"); I_EnumLabel(osgUtil::SceneView::NO_SCENEVIEW_LIGHT); diff --git a/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp b/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp index 38602ddfa..211ee91c5 100644 --- a/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp +++ b/src/osgWrappers/introspection/osgUtil/ShaderGen.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgUtil::ShaderGenCache::StateMask) I_DeclaringFile("osgUtil/ShaderGen"); I_EnumLabel(osgUtil::ShaderGenCache::BLEND); diff --git a/src/osgWrappers/introspection/osgUtil/Simplifier.cpp b/src/osgWrappers/introspection/osgUtil/Simplifier.cpp index d0ea7f382..c39dbada0 100644 --- a/src/osgWrappers/introspection/osgUtil/Simplifier.cpp +++ b/src/osgWrappers/introspection/osgUtil/Simplifier.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< unsigned int >, osgUtil::Simplifier::IndexList) BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier) diff --git a/src/osgWrappers/introspection/osgUtil/SmoothingVisitor.cpp b/src/osgWrappers/introspection/osgUtil/SmoothingVisitor.cpp index 83826639e..0f88ff11f 100644 --- a/src/osgWrappers/introspection/osgUtil/SmoothingVisitor.cpp +++ b/src/osgWrappers/introspection/osgUtil/SmoothingVisitor.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::SmoothingVisitor) I_DeclaringFile("osgUtil/SmoothingVisitor"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/introspection/osgUtil/StateGraph.cpp b/src/osgWrappers/introspection/osgUtil/StateGraph.cpp index c8588384b..bea7955e4 100644 --- a/src/osgWrappers/introspection/osgUtil/StateGraph.cpp +++ b/src/osgWrappers/introspection/osgUtil/StateGraph.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgUtil::LessDepthSortFunctor) I_DeclaringFile("osgUtil/StateGraph"); I_Constructor0(____LessDepthSortFunctor, @@ -169,6 +171,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderLeaf >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::RenderLeaf > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::RenderLeaf *, get, Properties::NON_VIRTUAL, __T_P1__get, @@ -209,6 +216,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::StateGraph >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::StateGraph > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::StateGraph *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgUtil/Statistics.cpp b/src/osgWrappers/introspection/osgUtil/Statistics.cpp index 1c49f3780..f853ace40 100644 --- a/src/osgWrappers/introspection/osgUtil/Statistics.cpp +++ b/src/osgWrappers/introspection/osgUtil/Statistics.cpp @@ -33,6 +33,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgUtil::Statistics::StatsType) I_DeclaringFile("osgUtil/Statistics"); I_EnumLabel(osgUtil::Statistics::STAT_NONE); diff --git a/src/osgWrappers/introspection/osgUtil/TangentSpaceGenerator.cpp b/src/osgWrappers/introspection/osgUtil/TangentSpaceGenerator.cpp index daf2fd1f8..9f8724e0a 100644 --- a/src/osgWrappers/introspection/osgUtil/TangentSpaceGenerator.cpp +++ b/src/osgWrappers/introspection/osgUtil/TangentSpaceGenerator.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::TangentSpaceGenerator) I_DeclaringFile("osgUtil/TangentSpaceGenerator"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgUtil/Tessellator.cpp b/src/osgWrappers/introspection/osgUtil/Tessellator.cpp index b2c63d3fb..4ab37751e 100644 --- a/src/osgWrappers/introspection/osgUtil/Tessellator.cpp +++ b/src/osgWrappers/introspection/osgUtil/Tessellator.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgUtil::Tessellator::WindingType) I_DeclaringFile("osgUtil/Tessellator"); I_EnumLabel(osgUtil::Tessellator::TESS_WINDING_ODD); @@ -232,6 +234,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::Tessellator::Prim >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgUtil::Tessellator::Prim > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgUtil::Tessellator::Prim *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgUtil/TransformAttributeFunctor.cpp b/src/osgWrappers/introspection/osgUtil/TransformAttributeFunctor.cpp index fb40df376..1adb7fe0b 100644 --- a/src/osgWrappers/introspection/osgUtil/TransformAttributeFunctor.cpp +++ b/src/osgWrappers/introspection/osgUtil/TransformAttributeFunctor.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::TransformAttributeFunctor) I_DeclaringFile("osgUtil/TransformAttributeFunctor"); I_BaseType(osg::Drawable::AttributeFunctor); diff --git a/src/osgWrappers/introspection/osgUtil/TransformCallback.cpp b/src/osgWrappers/introspection/osgUtil/TransformCallback.cpp index f1a115f6b..3028085c0 100644 --- a/src/osgWrappers/introspection/osgUtil/TransformCallback.cpp +++ b/src/osgWrappers/introspection/osgUtil/TransformCallback.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::TransformCallback) I_DeclaringFile("osgUtil/TransformCallback"); I_BaseType(osg::NodeCallback); diff --git a/src/osgWrappers/introspection/osgUtil/TriStripVisitor.cpp b/src/osgWrappers/introspection/osgUtil/TriStripVisitor.cpp index a0e8a0cf9..006613d1d 100644 --- a/src/osgWrappers/introspection/osgUtil/TriStripVisitor.cpp +++ b/src/osgWrappers/introspection/osgUtil/TriStripVisitor.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::TriStripVisitor) I_DeclaringFile("osgUtil/TriStripVisitor"); I_BaseType(osgUtil::BaseOptimizerVisitor); diff --git a/src/osgWrappers/introspection/osgUtil/UpdateVisitor.cpp b/src/osgWrappers/introspection/osgUtil/UpdateVisitor.cpp index 0d38fd220..90cddc248 100644 --- a/src/osgWrappers/introspection/osgUtil/UpdateVisitor.cpp +++ b/src/osgWrappers/introspection/osgUtil/UpdateVisitor.cpp @@ -30,6 +30,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgUtil::UpdateVisitor) I_DeclaringFile("osgUtil/UpdateVisitor"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/introspection/osgViewer/CompositeViewer.cpp b/src/osgWrappers/introspection/osgViewer/CompositeViewer.cpp index 1dbf9212e..6bfb11856 100644 --- a/src/osgWrappers/introspection/osgViewer/CompositeViewer.cpp +++ b/src/osgWrappers/introspection/osgViewer/CompositeViewer.cpp @@ -30,6 +30,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) I_DeclaringFile("osgViewer/CompositeViewer"); I_BaseType(osgViewer::ViewerBase); diff --git a/src/osgWrappers/introspection/osgViewer/GraphicsWindow.cpp b/src/osgWrappers/introspection/osgViewer/GraphicsWindow.cpp index 2509421d6..f1b49dd25 100644 --- a/src/osgWrappers/introspection/osgViewer/GraphicsWindow.cpp +++ b/src/osgWrappers/introspection/osgViewer/GraphicsWindow.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgViewer::GraphicsWindow::MouseCursor) I_DeclaringFile("osgViewer/GraphicsWindow"); I_EnumLabel(osgViewer::GraphicsWindow::InheritCursor); diff --git a/src/osgWrappers/introspection/osgViewer/Renderer.cpp b/src/osgWrappers/introspection/osgViewer/Renderer.cpp index 1a05ebe2e..589cc2422 100644 --- a/src/osgWrappers/introspection/osgViewer/Renderer.cpp +++ b/src/osgWrappers/introspection/osgViewer/Renderer.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::pair< GLuint COMMA int >, osgViewer::OpenGLQuerySupport::QueryFrameNumberPair) TYPE_NAME_ALIAS(std::list< osgViewer::OpenGLQuerySupport::QueryFrameNumberPair >, osgViewer::OpenGLQuerySupport::QueryFrameNumberList) diff --git a/src/osgWrappers/introspection/osgViewer/Scene.cpp b/src/osgWrappers/introspection/osgViewer/Scene.cpp index 8bdd9759f..15e0a05de 100644 --- a/src/osgWrappers/introspection/osgViewer/Scene.cpp +++ b/src/osgWrappers/introspection/osgViewer/Scene.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgViewer::Scene) I_DeclaringFile("osgViewer/Scene"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgViewer/View.cpp b/src/osgWrappers/introspection/osgViewer/View.cpp index 13b84df84..0f415d584 100644 --- a/src/osgWrappers/introspection/osgViewer/View.cpp +++ b/src/osgWrappers/introspection/osgViewer/View.cpp @@ -38,6 +38,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::View::EventHandlers) BEGIN_OBJECT_REFLECTOR(osgViewer::View) @@ -396,6 +398,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgGA::GUIEventHandler > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgGA::GUIEventHandler *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgViewer/Viewer.cpp b/src/osgWrappers/introspection/osgViewer/Viewer.cpp index 0f0d314c8..52e1cf62f 100644 --- a/src/osgWrappers/introspection/osgViewer/Viewer.cpp +++ b/src/osgWrappers/introspection/osgViewer/Viewer.cpp @@ -32,6 +32,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) I_DeclaringFile("osgViewer/Viewer"); I_BaseType(osgViewer::ViewerBase); diff --git a/src/osgWrappers/introspection/osgViewer/ViewerEventHandlers.cpp b/src/osgWrappers/introspection/osgViewer/ViewerEventHandlers.cpp index 4c8b6f120..6bd390eed 100644 --- a/src/osgWrappers/introspection/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgWrappers/introspection/osgViewer/ViewerEventHandlers.cpp @@ -31,6 +31,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgViewer::HelpHandler) I_DeclaringFile("osgViewer/ViewerEventHandlers"); I_BaseType(osgGA::GUIEventHandler); diff --git a/src/osgWrappers/introspection/osgViewer/api/Carbon/GraphicsHandleCarbon.cpp b/src/osgWrappers/introspection/osgViewer/api/Carbon/GraphicsHandleCarbon.cpp index 76fa911e7..00f058e12 100644 --- a/src/osgWrappers/introspection/osgViewer/api/Carbon/GraphicsHandleCarbon.cpp +++ b/src/osgWrappers/introspection/osgViewer/api/Carbon/GraphicsHandleCarbon.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgViewer::GraphicsHandleCarbon) I_DeclaringFile("osgViewer/api/Carbon/GraphicsHandleCarbon"); I_Constructor0(____GraphicsHandleCarbon, diff --git a/src/osgWrappers/introspection/osgViewer/api/Cocoa/GraphicsHandleCocoa.cpp b/src/osgWrappers/introspection/osgViewer/api/Cocoa/GraphicsHandleCocoa.cpp index f85b876ef..ef014d30c 100644 --- a/src/osgWrappers/introspection/osgViewer/api/Cocoa/GraphicsHandleCocoa.cpp +++ b/src/osgWrappers/introspection/osgViewer/api/Cocoa/GraphicsHandleCocoa.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgViewer::GraphicsHandleCocoa) I_DeclaringFile("osgViewer/api/Cocoa/GraphicsHandleCocoa"); I_Constructor0(____GraphicsHandleCocoa, diff --git a/src/osgWrappers/introspection/osgViewer/api/Win32/GraphicsHandleWin32.cpp b/src/osgWrappers/introspection/osgViewer/api/Win32/GraphicsHandleWin32.cpp index 3872b858c..6d7438ed0 100644 --- a/src/osgWrappers/introspection/osgViewer/api/Win32/GraphicsHandleWin32.cpp +++ b/src/osgWrappers/introspection/osgViewer/api/Win32/GraphicsHandleWin32.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgViewer::GraphicsHandleWin32) I_DeclaringFile("osgViewer/api/Win32/GraphicsHandleWin32"); I_Constructor0(____GraphicsHandleWin32, diff --git a/src/osgWrappers/introspection/osgViewer/api/Win32/PixelBufferWin32.cpp b/src/osgWrappers/introspection/osgViewer/api/Win32/PixelBufferWin32.cpp index 3960cd64a..0c85c2cfd 100644 --- a/src/osgWrappers/introspection/osgViewer/api/Win32/PixelBufferWin32.cpp +++ b/src/osgWrappers/introspection/osgViewer/api/Win32/PixelBufferWin32.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgViewer::PixelBufferWin32) I_DeclaringFile("osgViewer/api/Win32/PixelBufferWin32"); I_BaseType(osg::GraphicsContext); diff --git a/src/osgWrappers/introspection/osgViewer/api/X11/GraphicsHandleX11.cpp b/src/osgWrappers/introspection/osgViewer/api/X11/GraphicsHandleX11.cpp index 66dd4d942..0e2c0c251 100644 --- a/src/osgWrappers/introspection/osgViewer/api/X11/GraphicsHandleX11.cpp +++ b/src/osgWrappers/introspection/osgViewer/api/X11/GraphicsHandleX11.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(GLXContext, osgViewer::GraphicsHandleX11::Context) TYPE_NAME_ALIAS(GLXPbuffer, osgViewer::GraphicsHandleX11::Pbuffer) diff --git a/src/osgWrappers/introspection/osgViewer/api/X11/PixelBufferX11.cpp b/src/osgWrappers/introspection/osgViewer/api/X11/PixelBufferX11.cpp index 3cf5748f7..c9e57f7b9 100644 --- a/src/osgWrappers/introspection/osgViewer/api/X11/PixelBufferX11.cpp +++ b/src/osgWrappers/introspection/osgViewer/api/X11/PixelBufferX11.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgViewer::PixelBufferX11) I_DeclaringFile("osgViewer/api/X11/PixelBufferX11"); I_BaseType(osg::GraphicsContext); diff --git a/src/osgWrappers/introspection/osgVolume/Export.cpp b/src/osgWrappers/introspection/osgVolume/Export.cpp index 8d6e72af6..91855904a 100644 --- a/src/osgWrappers/introspection/osgVolume/Export.cpp +++ b/src/osgWrappers/introspection/osgVolume/Export.cpp @@ -20,3 +20,5 @@ #undef OUT #endif +#include + diff --git a/src/osgWrappers/introspection/osgVolume/FixedFunctionTechnique.cpp b/src/osgWrappers/introspection/osgVolume/FixedFunctionTechnique.cpp index 64725a996..504959a19 100644 --- a/src/osgWrappers/introspection/osgVolume/FixedFunctionTechnique.cpp +++ b/src/osgWrappers/introspection/osgVolume/FixedFunctionTechnique.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgVolume::FixedFunctionTechnique) I_DeclaringFile("osgVolume/FixedFunctionTechnique"); I_BaseType(osgVolume::VolumeTechnique); diff --git a/src/osgWrappers/introspection/osgVolume/Layer.cpp b/src/osgWrappers/introspection/osgVolume/Layer.cpp index 11ac87d01..96e4d4fa6 100644 --- a/src/osgWrappers/introspection/osgVolume/Layer.cpp +++ b/src/osgWrappers/introspection/osgVolume/Layer.cpp @@ -30,6 +30,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgVolume::CompositeLayer) I_DeclaringFile("osgVolume/Layer"); I_BaseType(osgVolume::Layer); diff --git a/src/osgWrappers/introspection/osgVolume/Locator.cpp b/src/osgWrappers/introspection/osgVolume/Locator.cpp index 4dce12bce..b4824de0a 100644 --- a/src/osgWrappers/introspection/osgVolume/Locator.cpp +++ b/src/osgWrappers/introspection/osgVolume/Locator.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgVolume::Locator::LocatorCallback > >, osgVolume::Locator::LocatorCallbacks) BEGIN_OBJECT_REFLECTOR(osgVolume::Locator) @@ -196,6 +198,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgVolume::Locator::LocatorCallback >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgVolume::Locator::LocatorCallback > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgVolume::Locator::LocatorCallback *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgVolume/Property.cpp b/src/osgWrappers/introspection/osgVolume/Property.cpp index 1f4befd47..a3938d4f3 100644 --- a/src/osgWrappers/introspection/osgVolume/Property.cpp +++ b/src/osgWrappers/introspection/osgVolume/Property.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgVolume::AlphaFuncProperty) I_DeclaringFile("osgVolume/Property"); I_BaseType(osgVolume::ScalarProperty); @@ -881,6 +883,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgVolume::Property >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgVolume::Property > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgVolume::Property *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgVolume/RayTracedTechnique.cpp b/src/osgWrappers/introspection/osgVolume/RayTracedTechnique.cpp index 70b4c54cb..0bb03661a 100644 --- a/src/osgWrappers/introspection/osgVolume/RayTracedTechnique.cpp +++ b/src/osgWrappers/introspection/osgVolume/RayTracedTechnique.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgVolume::RayTracedTechnique) I_DeclaringFile("osgVolume/RayTracedTechnique"); I_BaseType(osgVolume::VolumeTechnique); diff --git a/src/osgWrappers/introspection/osgVolume/Volume.cpp b/src/osgWrappers/introspection/osgVolume/Volume.cpp index 8cc6af978..e8ae37ae9 100644 --- a/src/osgWrappers/introspection/osgVolume/Volume.cpp +++ b/src/osgWrappers/introspection/osgVolume/Volume.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgVolume::Volume) I_DeclaringFile("osgVolume/Volume"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/introspection/osgVolume/VolumeTechnique.cpp b/src/osgWrappers/introspection/osgVolume/VolumeTechnique.cpp index e2bcd4a9c..a3e7b3a8a 100644 --- a/src/osgWrappers/introspection/osgVolume/VolumeTechnique.cpp +++ b/src/osgWrappers/introspection/osgVolume/VolumeTechnique.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgVolume::VolumeTechnique) I_DeclaringFile("osgVolume/VolumeTechnique"); I_BaseType(osg::Object); diff --git a/src/osgWrappers/introspection/osgVolume/VolumeTile.cpp b/src/osgWrappers/introspection/osgVolume/VolumeTile.cpp index 63a7c5c25..2b23a6504 100644 --- a/src/osgWrappers/introspection/osgVolume/VolumeTile.cpp +++ b/src/osgWrappers/introspection/osgVolume/VolumeTile.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgVolume::TileID) I_DeclaringFile("osgVolume/VolumeTile"); I_Constructor0(____TileID, diff --git a/src/osgWrappers/introspection/osgWidget/Box.cpp b/src/osgWrappers/introspection/osgWidget/Box.cpp index d98925467..0e7d40f40 100644 --- a/src/osgWrappers/introspection/osgWidget/Box.cpp +++ b/src/osgWrappers/introspection/osgWidget/Box.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgWidget::Box::BoxType) I_DeclaringFile("osgWidget/Box"); I_EnumLabel(osgWidget::Box::VERTICAL); diff --git a/src/osgWrappers/introspection/osgWidget/Browser.cpp b/src/osgWrappers/introspection/osgWidget/Browser.cpp index 0acb9f4b1..4885ff6ba 100644 --- a/src/osgWrappers/introspection/osgWidget/Browser.cpp +++ b/src/osgWrappers/introspection/osgWidget/Browser.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::Browser) I_DeclaringFile("osgWidget/Browser"); I_BaseType(osg::Geode); @@ -145,6 +147,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgWidget::BrowserManager >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgWidget::BrowserManager > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgWidget::BrowserManager *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgWidget/Canvas.cpp b/src/osgWrappers/introspection/osgWidget/Canvas.cpp index 027bc17db..e61e9c33e 100644 --- a/src/osgWrappers/introspection/osgWidget/Canvas.cpp +++ b/src/osgWrappers/introspection/osgWidget/Canvas.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::Canvas) I_DeclaringFile("osgWidget/Canvas"); I_BaseType(osgWidget::Window); diff --git a/src/osgWrappers/introspection/osgWidget/EventInterface.cpp b/src/osgWrappers/introspection/osgWidget/EventInterface.cpp index 3f18ef264..55e2082df 100644 --- a/src/osgWrappers/introspection/osgWidget/EventInterface.cpp +++ b/src/osgWrappers/introspection/osgWidget/EventInterface.cpp @@ -23,6 +23,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::Callback) I_DeclaringFile("osgWidget/EventInterface"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgWidget/Frame.cpp b/src/osgWrappers/introspection/osgWidget/Frame.cpp index 517ff46d2..8eba9f3e1 100644 --- a/src/osgWrappers/introspection/osgWidget/Frame.cpp +++ b/src/osgWrappers/introspection/osgWidget/Frame.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgWidget::Frame::CornerType) I_DeclaringFile("osgWidget/Frame"); I_EnumLabel(osgWidget::Frame::CORNER_LOWER_LEFT); diff --git a/src/osgWrappers/introspection/osgWidget/Input.cpp b/src/osgWrappers/introspection/osgWidget/Input.cpp index 4a18dd483..ffe518ad8 100644 --- a/src/osgWrappers/introspection/osgWidget/Input.cpp +++ b/src/osgWrappers/introspection/osgWidget/Input.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::Input) I_DeclaringFile("osgWidget/Input"); I_BaseType(osgWidget::Label); diff --git a/src/osgWrappers/introspection/osgWidget/Label.cpp b/src/osgWrappers/introspection/osgWidget/Label.cpp index 7ab8d22cd..10fa06b14 100644 --- a/src/osgWrappers/introspection/osgWidget/Label.cpp +++ b/src/osgWrappers/introspection/osgWidget/Label.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::Label) I_DeclaringFile("osgWidget/Label"); I_BaseType(osgWidget::Widget); diff --git a/src/osgWrappers/introspection/osgWidget/Lua.cpp b/src/osgWrappers/introspection/osgWidget/Lua.cpp index 7b1e8f55f..65f1d70d6 100644 --- a/src/osgWrappers/introspection/osgWidget/Lua.cpp +++ b/src/osgWrappers/introspection/osgWidget/Lua.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::LuaEngine) I_DeclaringFile("osgWidget/Lua"); I_BaseType(osgWidget::ScriptEngine); diff --git a/src/osgWrappers/introspection/osgWidget/PdfReader.cpp b/src/osgWrappers/introspection/osgWidget/PdfReader.cpp index 47c137436..6d711d3a9 100644 --- a/src/osgWrappers/introspection/osgWidget/PdfReader.cpp +++ b/src/osgWrappers/introspection/osgWidget/PdfReader.cpp @@ -22,6 +22,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgWidget::GeometryHints::AspectRatioPolicy) I_DeclaringFile("osgWidget/PdfReader"); I_EnumLabel(osgWidget::GeometryHints::RESIZE_HEIGHT_TO_MAINTAINCE_ASPECT_RATIO); diff --git a/src/osgWrappers/introspection/osgWidget/Python.cpp b/src/osgWrappers/introspection/osgWidget/Python.cpp index 5fa4ac97d..66e514e25 100644 --- a/src/osgWrappers/introspection/osgWidget/Python.cpp +++ b/src/osgWrappers/introspection/osgWidget/Python.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::PythonEngine) I_DeclaringFile("osgWidget/Python"); I_BaseType(osgWidget::ScriptEngine); diff --git a/src/osgWrappers/introspection/osgWidget/ScriptEngine.cpp b/src/osgWrappers/introspection/osgWidget/ScriptEngine.cpp index 45e2cdf48..329d288c3 100644 --- a/src/osgWrappers/introspection/osgWidget/ScriptEngine.cpp +++ b/src/osgWrappers/introspection/osgWidget/ScriptEngine.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::ScriptEngine) I_DeclaringFile("osgWidget/ScriptEngine"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/introspection/osgWidget/StyleInterface.cpp b/src/osgWrappers/introspection/osgWidget/StyleInterface.cpp index bdefb7a6a..a29c4d376 100644 --- a/src/osgWrappers/introspection/osgWidget/StyleInterface.cpp +++ b/src/osgWrappers/introspection/osgWidget/StyleInterface.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + BEGIN_VALUE_REFLECTOR(osgWidget::StyleInterface) I_DeclaringFile("osgWidget/StyleInterface"); I_Constructor0(____StyleInterface, diff --git a/src/osgWrappers/introspection/osgWidget/StyleManager.cpp b/src/osgWrappers/introspection/osgWidget/StyleManager.cpp index ed32a1ea7..b4dd99223 100644 --- a/src/osgWrappers/introspection/osgWidget/StyleManager.cpp +++ b/src/osgWrappers/introspection/osgWidget/StyleManager.cpp @@ -29,6 +29,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::Style) I_DeclaringFile("osgWidget/StyleManager"); I_BaseType(osg::Object); @@ -231,6 +233,11 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgWidget::Style >) ____ref_ptr__C5_ref_ptr_R1, "", ""); + I_Constructor1(IN, osg::observer_ptr< osgWidget::Style > &, optr, + Properties::NON_EXPLICIT, + ____ref_ptr__observer_ptrT1_T__R1, + "", + ""); I_Method0(osgWidget::Style *, get, Properties::NON_VIRTUAL, __T_P1__get, diff --git a/src/osgWrappers/introspection/osgWidget/Table.cpp b/src/osgWrappers/introspection/osgWidget/Table.cpp index f362bf473..6189d9de1 100644 --- a/src/osgWrappers/introspection/osgWidget/Table.cpp +++ b/src/osgWrappers/introspection/osgWidget/Table.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osgWidget::point_type >, osgWidget::Table::CellSizes) BEGIN_OBJECT_REFLECTOR(osgWidget::Table) diff --git a/src/osgWrappers/introspection/osgWidget/Types.cpp b/src/osgWrappers/introspection/osgWidget/Types.cpp index 6b198a0e9..38e7ea37f 100644 --- a/src/osgWrappers/introspection/osgWidget/Types.cpp +++ b/src/osgWrappers/introspection/osgWidget/Types.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(osg::Vec2Array, osgWidget::TexCoordArray) TYPE_NAME_ALIAS(osg::Vec3Array, osgWidget::PointArray) diff --git a/src/osgWrappers/introspection/osgWidget/ViewerEventHandlers.cpp b/src/osgWrappers/introspection/osgWidget/ViewerEventHandlers.cpp index b8a026b2b..58fdb1b69 100644 --- a/src/osgWrappers/introspection/osgWidget/ViewerEventHandlers.cpp +++ b/src/osgWrappers/introspection/osgWidget/ViewerEventHandlers.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::CameraSwitchHandler) I_DeclaringFile("osgWidget/ViewerEventHandlers"); I_BaseType(osgGA::GUIEventHandler); diff --git a/src/osgWrappers/introspection/osgWidget/VncClient.cpp b/src/osgWrappers/introspection/osgWidget/VncClient.cpp index 416c7c911..fe6ec1f59 100644 --- a/src/osgWrappers/introspection/osgWidget/VncClient.cpp +++ b/src/osgWrappers/introspection/osgWidget/VncClient.cpp @@ -21,6 +21,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::VncClient) I_DeclaringFile("osgWidget/VncClient"); I_BaseType(osg::Geode); diff --git a/src/osgWrappers/introspection/osgWidget/Widget.cpp b/src/osgWrappers/introspection/osgWidget/Widget.cpp index 5bea68f97..0262e3860 100644 --- a/src/osgWrappers/introspection/osgWidget/Widget.cpp +++ b/src/osgWrappers/introspection/osgWidget/Widget.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +#include + BEGIN_OBJECT_REFLECTOR(osgWidget::NotifyWidget) I_DeclaringFile("osgWidget/Widget"); I_BaseType(osgWidget::Widget); diff --git a/src/osgWrappers/introspection/osgWidget/Window.cpp b/src/osgWrappers/introspection/osgWidget/Window.cpp index a1631b128..d19c65384 100644 --- a/src/osgWrappers/introspection/osgWidget/Window.cpp +++ b/src/osgWrappers/introspection/osgWidget/Window.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgWidget::Window::Strata) I_DeclaringFile("osgWidget/Window"); I_EnumLabel(osgWidget::Window::STRATA_NONE); diff --git a/src/osgWrappers/introspection/osgWidget/WindowManager.cpp b/src/osgWrappers/introspection/osgWidget/WindowManager.cpp index 1fa97e3fb..f962f9522 100644 --- a/src/osgWrappers/introspection/osgWidget/WindowManager.cpp +++ b/src/osgWrappers/introspection/osgWidget/WindowManager.cpp @@ -31,6 +31,8 @@ #undef OUT #endif +#include + BEGIN_ENUM_REFLECTOR(osgWidget::WindowManager::WmFlags) I_DeclaringFile("osgWidget/WindowManager"); I_EnumLabel(osgWidget::WindowManager::WM_USE_LUA);