From 78280fa1ed2a277bcdfc628636ad57e0285ca97a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 19 Jan 2010 13:31:06 +0000 Subject: [PATCH] Replaced osgDB::RegisterDotOsgWrapperProxy usage with REGISTER_DOTOSGWRAPPER proxy to aid static linking --- .../deprecated-dotosg/osg/AnimationPath.cpp | 2 +- .../deprecated-dotosg/osg/TransferFunction.cpp | 2 +- .../deprecated-dotosg/osgFX/IO_AnisotropicLighting.cpp | 2 +- .../deprecated-dotosg/osgFX/IO_BumpMapping.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgFX/IO_Cartoon.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgFX/IO_Effect.cpp | 2 +- .../deprecated-dotosg/osgFX/IO_MultiTextureControl.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgFX/IO_Outline.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgFX/IO_Scribe.cpp | 2 +- .../deprecated-dotosg/osgFX/IO_SpecularHighlights.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_AccelOperator.cpp | 2 +- .../osgParticle/IO_AngularAccelOperator.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_BoxPlacer.cpp | 2 +- .../osgParticle/IO_CenteredPlacer.cpp | 2 +- .../osgParticle/IO_ConnectedParticleSystem.cpp | 2 +- .../osgParticle/IO_ConstantRateCounter.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_Emitter.cpp | 2 +- .../osgParticle/IO_ExplosionDebrisEffect.cpp | 2 +- .../osgParticle/IO_ExplosionEffect.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_FireEffect.cpp | 2 +- .../osgParticle/IO_FluidFrictionOperator.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_FluidProgram.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_ForceOperator.cpp | 2 +- .../osgParticle/IO_LinearInterpolator.cpp | 2 +- .../osgParticle/IO_ModularEmitter.cpp | 2 +- .../osgParticle/IO_ModularProgram.cpp | 2 +- .../osgParticle/IO_MultiSegmentPlacer.cpp | 2 +- .../osgParticle/IO_ParticleEffect.cpp | 2 +- .../osgParticle/IO_ParticleProcessor.cpp | 2 +- .../osgParticle/IO_ParticleSystem.cpp | 2 +- .../osgParticle/IO_ParticleSystemUpdater.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_PointPlacer.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_Program.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_RadialShooter.cpp | 2 +- .../osgParticle/IO_RandomRateCounter.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_SectorPlacer.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_SegmentPlacer.cpp | 2 +- .../deprecated-dotosg/osgParticle/IO_SmokeEffect.cpp | 2 +- .../osgParticle/IO_SmokeTrailEffect.cpp | 2 +- .../osgParticle/IO_VariableRateCounter.cpp | 2 +- .../deprecated-dotosg/osgShadow/ShadowMap.cpp | 2 +- .../deprecated-dotosg/osgShadow/ShadowTechnique.cpp | 2 +- .../deprecated-dotosg/osgShadow/ShadowTexture.cpp | 2 +- .../deprecated-dotosg/osgShadow/ShadowVolume.cpp | 2 +- .../deprecated-dotosg/osgShadow/ShadowedScene.cpp | 2 +- .../deprecated-dotosg/osgSim/IO_BlinkSequence.cpp | 4 ++-- .../deprecated-dotosg/osgSim/IO_DOFTransform.cpp | 2 +- .../deprecated-dotosg/osgSim/IO_Impostor.cpp | 2 +- .../deprecated-dotosg/osgSim/IO_LightPointNode.cpp | 2 +- .../deprecated-dotosg/osgSim/IO_MultiSwitch.cpp | 2 +- .../deprecated-dotosg/osgSim/IO_ObjectRecordData.cpp | 2 +- .../deprecated-dotosg/osgSim/IO_OverlayNode.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgSim/IO_Sector.cpp | 10 +++++----- .../deprecated-dotosg/osgSim/IO_ShapeAttribute.cpp | 2 +- .../deprecated-dotosg/osgSim/IO_VisibilityGroup.cpp | 2 +- .../deprecated-dotosg/osgTerrain/CompositeLayer.cpp | 2 +- .../deprecated-dotosg/osgTerrain/GeometryTechnique.cpp | 2 +- .../deprecated-dotosg/osgTerrain/HeightFieldLayer.cpp | 2 +- .../deprecated-dotosg/osgTerrain/ImageLayer.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgTerrain/Layer.cpp | 2 +- .../deprecated-dotosg/osgTerrain/Locator.cpp | 2 +- .../deprecated-dotosg/osgTerrain/SwitchLayer.cpp | 2 +- .../deprecated-dotosg/osgTerrain/TerrainTile.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgText/IO_Text.cpp | 2 +- .../deprecated-dotosg/osgText/IO_Text3D.cpp | 2 +- .../deprecated-dotosg/osgText/IO_TextBase.cpp | 2 +- .../deprecated-dotosg/osgViewer/CompositeViewer.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgViewer/View.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgViewer/Viewer.cpp | 2 +- .../deprecated-dotosg/osgVolume/CompositeProperty.cpp | 2 +- .../osgVolume/FixedFunctionTechnique.cpp | 2 +- .../deprecated-dotosg/osgVolume/ImageLayer.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgVolume/Layer.cpp | 2 +- .../deprecated-dotosg/osgVolume/Locator.cpp | 2 +- .../deprecated-dotosg/osgVolume/Property.cpp | 6 +++--- .../osgVolume/PropertyAdjustmentCallback.cpp | 2 +- .../deprecated-dotosg/osgVolume/RayTracedTechnique.cpp | 2 +- .../deprecated-dotosg/osgVolume/ScalarProperty.cpp | 10 +++++----- .../deprecated-dotosg/osgVolume/SwitchProperty.cpp | 2 +- .../osgVolume/TransferFunctionProperty.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgVolume/Volume.cpp | 2 +- .../deprecated-dotosg/osgVolume/VolumeTile.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osgWidget/Box.cpp | 6 ++++-- .../deprecated-dotosg/osgWidget/EmbeddedWindow.cpp | 3 ++- src/osgWrappers/deprecated-dotosg/osgWidget/Frame.cpp | 3 ++- src/osgWrappers/deprecated-dotosg/osgWidget/Input.cpp | 3 ++- src/osgWrappers/deprecated-dotosg/osgWidget/Label.cpp | 3 ++- src/osgWrappers/deprecated-dotosg/osgWidget/Table.cpp | 3 ++- src/osgWrappers/deprecated-dotosg/osgWidget/Widget.cpp | 9 ++++++--- .../deprecated-dotosg/osgWidget/WindowManager.cpp | 3 ++- 90 files changed, 115 insertions(+), 104 deletions(-) diff --git a/src/osgWrappers/deprecated-dotosg/osg/AnimationPath.cpp b/src/osgWrappers/deprecated-dotosg/osg/AnimationPath.cpp index 5af82eaba..f473e846d 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/AnimationPath.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/AnimationPath.cpp @@ -154,7 +154,7 @@ bool AnimationPathCallback_writeLocalData(const osg::Object &obj, osgDB::Output // register the read and write functions with the osgDB::Registry. -osgDB::RegisterDotOsgWrapperProxy AnimationPathCallback_Proxy +REGISTER_DOTOSGWRAPPER(AnimationPathCallback_Proxy) ( new osg::AnimationPathCallback, "AnimationPathCallback", diff --git a/src/osgWrappers/deprecated-dotosg/osg/TransferFunction.cpp b/src/osgWrappers/deprecated-dotosg/osg/TransferFunction.cpp index 43726f802..b0c7dd423 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/TransferFunction.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/TransferFunction.cpp @@ -16,7 +16,7 @@ bool TransferFunction1D_readLocalData(osg::Object &obj, osgDB::Input &fr); bool TransferFunction1D_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy TransferFunction1D_Proxy +REGISTER_DOTOSGWRAPPER(TransferFunction1D_Proxy) ( new osg::TransferFunction1D, "TransferFunction1D", diff --git a/src/osgWrappers/deprecated-dotosg/osgFX/IO_AnisotropicLighting.cpp b/src/osgWrappers/deprecated-dotosg/osgFX/IO_AnisotropicLighting.cpp index b4800000b..06ac43e55 100644 --- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_AnisotropicLighting.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_AnisotropicLighting.cpp @@ -7,7 +7,7 @@ bool AnisotropicLighting_readLocalData(osg::Object &obj, osgDB::Input &fr); bool AnisotropicLighting_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy AnisotropicLighting_Proxy +REGISTER_DOTOSGWRAPPER(AnisotropicLighting_Proxy) ( new osgFX::AnisotropicLighting, "osgFX::AnisotropicLighting", diff --git a/src/osgWrappers/deprecated-dotosg/osgFX/IO_BumpMapping.cpp b/src/osgWrappers/deprecated-dotosg/osgFX/IO_BumpMapping.cpp index 64e0036cc..98f085b96 100644 --- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_BumpMapping.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_BumpMapping.cpp @@ -7,7 +7,7 @@ bool BumpMapping_readLocalData(osg::Object &obj, osgDB::Input &fr); bool BumpMapping_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy BumpMapping_Proxy +REGISTER_DOTOSGWRAPPER(BumpMapping_Proxy) ( new osgFX::BumpMapping, "osgFX::BumpMapping", diff --git a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Cartoon.cpp b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Cartoon.cpp index 85160c153..ca1a4a6d1 100644 --- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Cartoon.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Cartoon.cpp @@ -8,7 +8,7 @@ bool Cartoon_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Cartoon_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Cartoon_Proxy +REGISTER_DOTOSGWRAPPER(Cartoon_Proxy) ( new osgFX::Cartoon, "osgFX::Cartoon", diff --git a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Effect.cpp b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Effect.cpp index a1185dc65..dd2f6ea59 100644 --- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Effect.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Effect.cpp @@ -7,7 +7,7 @@ bool Effect_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Effect_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Effect_Proxy +REGISTER_DOTOSGWRAPPER(Effect_Proxy) ( 0, "osgFX::Effect", diff --git a/src/osgWrappers/deprecated-dotosg/osgFX/IO_MultiTextureControl.cpp b/src/osgWrappers/deprecated-dotosg/osgFX/IO_MultiTextureControl.cpp index ea3904bac..aae9b9034 100644 --- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_MultiTextureControl.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_MultiTextureControl.cpp @@ -7,7 +7,7 @@ bool MultiTextureControl_readLocalData(osg::Object &obj, osgDB::Input &fr); bool MultiTextureControl_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy MultiTextureControl_Proxy +REGISTER_DOTOSGWRAPPER(MultiTextureControl_Proxy) ( new osgFX::MultiTextureControl, "osgFX::MultiTextureControl", diff --git a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Outline.cpp b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Outline.cpp index 55c918097..036b253cd 100644 --- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Outline.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Outline.cpp @@ -31,7 +31,7 @@ bool Outline_readLocalData(osg::Object& obj, osgDB::Input& fr); bool Outline_writeLocalData(const osg::Object& obj, osgDB::Output& fw); -osgDB::RegisterDotOsgWrapperProxy Outline_Proxy +REGISTER_DOTOSGWRAPPER(Outline_Proxy) ( new osgFX::Outline, "osgFX::Outline", diff --git a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Scribe.cpp b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Scribe.cpp index 1ff05f426..918a9254c 100644 --- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_Scribe.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_Scribe.cpp @@ -8,7 +8,7 @@ bool Scribe_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Scribe_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Scribe_Proxy +REGISTER_DOTOSGWRAPPER(Scribe_Proxy) ( new osgFX::Scribe, "osgFX::Scribe", diff --git a/src/osgWrappers/deprecated-dotosg/osgFX/IO_SpecularHighlights.cpp b/src/osgWrappers/deprecated-dotosg/osgFX/IO_SpecularHighlights.cpp index 1d9f286b1..417c4f2e8 100644 --- a/src/osgWrappers/deprecated-dotosg/osgFX/IO_SpecularHighlights.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgFX/IO_SpecularHighlights.cpp @@ -8,7 +8,7 @@ bool SpecularHighlights_readLocalData(osg::Object &obj, osgDB::Input &fr); bool SpecularHighlights_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy SpecularHighlights_Proxy +REGISTER_DOTOSGWRAPPER(SpecularHighlights_Proxy) ( new osgFX::SpecularHighlights, "osgFX::SpecularHighlights", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AccelOperator.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AccelOperator.cpp index 85596501f..748a3c926 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AccelOperator.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AccelOperator.cpp @@ -12,7 +12,7 @@ bool AccelOperator_readLocalData(osg::Object &obj, osgDB::Input &fr); bool AccelOperator_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy AccelOperator_Proxy +REGISTER_DOTOSGWRAPPER(AccelOperator_Proxy) ( new osgParticle::AccelOperator, "AccelOperator", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AngularAccelOperator.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AngularAccelOperator.cpp index 5332baa24..900f46b6c 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AngularAccelOperator.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_AngularAccelOperator.cpp @@ -12,7 +12,7 @@ bool AngularAccelOperator_readLocalData(osg::Object &obj, osgDB::Input &fr); bool AngularAccelOperator_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy AngularAccelOperator_Proxy +REGISTER_DOTOSGWRAPPER(AngularAccelOperator_Proxy) ( new osgParticle::AngularAccelOperator, "AngularAccelOperator", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_BoxPlacer.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_BoxPlacer.cpp index 06f281b00..d62b535b6 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_BoxPlacer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_BoxPlacer.cpp @@ -10,7 +10,7 @@ bool BoxPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool BoxPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy BoxPlacer_Proxy +REGISTER_DOTOSGWRAPPER(BoxPlacer_Proxy) ( new osgParticle::BoxPlacer, "BoxPlacer", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_CenteredPlacer.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_CenteredPlacer.cpp index 498dc06e6..20349f042 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_CenteredPlacer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_CenteredPlacer.cpp @@ -12,7 +12,7 @@ bool CenteredPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool CenteredPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy CenteredPlacer_Proxy +REGISTER_DOTOSGWRAPPER(CenteredPlacer_Proxy) ( 0, "CenteredPlacer", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConnectedParticleSystem.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConnectedParticleSystem.cpp index 9b5741051..eab6b2dfc 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConnectedParticleSystem.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConnectedParticleSystem.cpp @@ -16,7 +16,7 @@ extern void write_particle(const osgParticle::Particle &P, osgDB::Output &fw); bool ConnectedParticleSystem_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ConnectedParticleSystem_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ConnectedParticleSystem_Proxy +REGISTER_DOTOSGWRAPPER(ConnectedParticleSystem_Proxy) ( new osgParticle::ConnectedParticleSystem, "ConnectedParticleSystem", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConstantRateCounter.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConstantRateCounter.cpp index e5fd5e5a6..38bb178a5 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConstantRateCounter.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ConstantRateCounter.cpp @@ -9,7 +9,7 @@ bool ConstantRateCounter_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ConstantRateCounter_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ConstantRateCounter_Proxy +REGISTER_DOTOSGWRAPPER(ConstantRateCounter_Proxy) ( new osgParticle::ConstantRateCounter, "ConstantRateCounter", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Emitter.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Emitter.cpp index c197acd9d..756bf5dee 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Emitter.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Emitter.cpp @@ -13,7 +13,7 @@ extern void write_particle(const osgParticle::Particle &P, osgDB::Output &fw); bool Emitter_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Emitter_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Emitter_Proxy +REGISTER_DOTOSGWRAPPER(Emitter_Proxy) ( 0, "Emitter", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionDebrisEffect.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionDebrisEffect.cpp index 36ab1623e..9b1fc3092 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionDebrisEffect.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionDebrisEffect.cpp @@ -8,7 +8,7 @@ bool ExplosionDebrisEffect_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ExplosionDebrisEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ExplosionDebrisEffect_Proxy +REGISTER_DOTOSGWRAPPER(ExplosionDebrisEffect_Proxy) ( new osgParticle::ExplosionDebrisEffect(false), "ExplosionDebrisEffect", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionEffect.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionEffect.cpp index df6f8af3d..955d05c6e 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionEffect.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ExplosionEffect.cpp @@ -8,7 +8,7 @@ bool ExplosionEffect_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ExplosionEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ExplosionEffect_Proxy +REGISTER_DOTOSGWRAPPER(ExplosionEffect_Proxy) ( new osgParticle::ExplosionEffect(false), "ExplosionEffect", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FireEffect.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FireEffect.cpp index ce06f0ce2..502e3d1b5 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FireEffect.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FireEffect.cpp @@ -8,7 +8,7 @@ bool FireEffect_readLocalData(osg::Object &obj, osgDB::Input &fr); bool FireEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy FireEffect_Proxy +REGISTER_DOTOSGWRAPPER(FireEffect_Proxy) ( new osgParticle::FireEffect(false), "FireEffect", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidFrictionOperator.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidFrictionOperator.cpp index 4044fabad..c4938eb52 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidFrictionOperator.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidFrictionOperator.cpp @@ -12,7 +12,7 @@ bool FluidFrictionOperator_readLocalData(osg::Object &obj, osgDB::Input &fr); bool FluidFrictionOperator_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy FluidFrictionOperator_Proxy +REGISTER_DOTOSGWRAPPER(FluidFrictionOperator_Proxy) ( new osgParticle::FluidFrictionOperator, "FluidFrictionOperator", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidProgram.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidProgram.cpp index 50b84f39d..04fb2dadd 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidProgram.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_FluidProgram.cpp @@ -14,7 +14,7 @@ bool FluidProgram_readLocalData(osg::Object &obj, osgDB::Input &fr); bool FluidProgram_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy FluidProgram_Proxy +REGISTER_DOTOSGWRAPPER(FluidProgram_Proxy) ( new osgParticle::FluidProgram, "FluidProgram", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ForceOperator.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ForceOperator.cpp index 5827a393c..a2b53d9bb 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ForceOperator.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ForceOperator.cpp @@ -12,7 +12,7 @@ bool ForceOperator_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ForceOperator_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ForceOperator_Proxy +REGISTER_DOTOSGWRAPPER(ForceOperator_Proxy) ( new osgParticle::ForceOperator, "ForceOperator", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_LinearInterpolator.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_LinearInterpolator.cpp index b96426718..98cc879af 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_LinearInterpolator.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_LinearInterpolator.cpp @@ -8,7 +8,7 @@ bool LinearInterpolator_readLocalData(osg::Object &obj, osgDB::Input &fr); bool LinearInterpolator_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy LinearInterpolator_Proxy +REGISTER_DOTOSGWRAPPER(LinearInterpolator_Proxy) ( new osgParticle::LinearInterpolator, "LinearInterpolator", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularEmitter.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularEmitter.cpp index d986b1100..ee2691719 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularEmitter.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularEmitter.cpp @@ -11,7 +11,7 @@ bool ModularEmitter_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ModularEmitter_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ModularEmitter_Proxy +REGISTER_DOTOSGWRAPPER(ModularEmitter_Proxy) ( new osgParticle::ModularEmitter, "ModularEmitter", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularProgram.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularProgram.cpp index 43e727eb1..7d8cac5ce 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularProgram.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ModularProgram.cpp @@ -11,7 +11,7 @@ bool ModularProgram_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ModularProgram_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ModularProgram_Proxy +REGISTER_DOTOSGWRAPPER(ModularProgram_Proxy) ( new osgParticle::ModularProgram, "ModularProgram", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_MultiSegmentPlacer.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_MultiSegmentPlacer.cpp index 42f4c5273..a6a19d8c3 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_MultiSegmentPlacer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_MultiSegmentPlacer.cpp @@ -12,7 +12,7 @@ bool MultiSegmentPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool MultiSegmentPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy MultiSegmentPlacer_Proxy +REGISTER_DOTOSGWRAPPER(MultiSegmentPlacer_Proxy) ( new osgParticle::MultiSegmentPlacer, "MultiSegmentPlacer", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp index 82f9656ec..edf895afc 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp @@ -10,7 +10,7 @@ bool ParticleEffect_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ParticleEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ParticleEffect_Proxy +REGISTER_DOTOSGWRAPPER(ParticleEffect_Proxy) ( 0, "ParticleEffect", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleProcessor.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleProcessor.cpp index f8db65080..6d8ce9526 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleProcessor.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleProcessor.cpp @@ -16,7 +16,7 @@ extern void write_particle(const osgParticle::Particle &P, osgDB::Output &fw); bool ParticleProcessor_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ParticleProcessor_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ParticleProcessor_Proxy +REGISTER_DOTOSGWRAPPER(ParticleProcessor_Proxy) ( 0, "ParticleProcessor", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystem.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystem.cpp index 869176fcc..7867c3e12 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystem.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystem.cpp @@ -16,7 +16,7 @@ extern void write_particle(const osgParticle::Particle &P, osgDB::Output &fw); bool ParticleSystem_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ParticleSystem_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ParticleSystem_Proxy +REGISTER_DOTOSGWRAPPER(ParticleSystem_Proxy) ( new osgParticle::ParticleSystem, "ParticleSystem", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystemUpdater.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystemUpdater.cpp index cb8faaa34..71f7fdf35 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystemUpdater.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleSystemUpdater.cpp @@ -9,7 +9,7 @@ bool PSU_readLocalData(osg::Object &obj, osgDB::Input &fr); bool PSU_writeLocalData(const osg::Object &obj, osgDB::Output &fr); -osgDB::RegisterDotOsgWrapperProxy PSU_Proxy +REGISTER_DOTOSGWRAPPER(PSU_Proxy) ( new osgParticle::ParticleSystemUpdater, "ParticleSystemUpdater", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_PointPlacer.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_PointPlacer.cpp index 9ddde42ba..bbbb61d60 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_PointPlacer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_PointPlacer.cpp @@ -8,7 +8,7 @@ bool PointPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool PointPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy PointPlacer_Proxy +REGISTER_DOTOSGWRAPPER(PointPlacer_Proxy) ( new osgParticle::PointPlacer, "PointPlacer", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Program.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Program.cpp index c304d5d92..c0a2cdc40 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Program.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_Program.cpp @@ -8,7 +8,7 @@ bool IOProgram_readLocalData(osg::Object &obj, osgDB::Input &fr); bool IOProgram_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy g_IOProgramProxy +REGISTER_DOTOSGWRAPPER(g_IOProgramProxy) ( 0, "osgParticle::Program", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RadialShooter.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RadialShooter.cpp index 75c7e899d..ef826b87e 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RadialShooter.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RadialShooter.cpp @@ -9,7 +9,7 @@ bool RadialShooter_readLocalData(osg::Object &obj, osgDB::Input &fr); bool RadialShooter_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy RadialShooter_Proxy +REGISTER_DOTOSGWRAPPER(RadialShooter_Proxy) ( new osgParticle::RadialShooter, "RadialShooter", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RandomRateCounter.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RandomRateCounter.cpp index bc1c6b477..2f005e337 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RandomRateCounter.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_RandomRateCounter.cpp @@ -10,7 +10,7 @@ bool RandomRateCounter_readLocalData(osg::Object &obj, osgDB::Input &fr); bool RandomRateCounter_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy RandomRateCounter_Proxy +REGISTER_DOTOSGWRAPPER(RandomRateCounter_Proxy) ( new osgParticle::RandomRateCounter, "RandomRateCounter", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SectorPlacer.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SectorPlacer.cpp index 8580ad571..a88a6b7bb 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SectorPlacer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SectorPlacer.cpp @@ -10,7 +10,7 @@ bool SectorPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool SectorPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy SectorPlacer_Proxy +REGISTER_DOTOSGWRAPPER(SectorPlacer_Proxy) ( new osgParticle::SectorPlacer, "SectorPlacer", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SegmentPlacer.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SegmentPlacer.cpp index c52889af9..4052fe9bd 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SegmentPlacer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SegmentPlacer.cpp @@ -12,7 +12,7 @@ bool SegmentPlacer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool SegmentPlacer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy SegmentPlacer_Proxy +REGISTER_DOTOSGWRAPPER(SegmentPlacer_Proxy) ( new osgParticle::SegmentPlacer, "SegmentPlacer", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeEffect.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeEffect.cpp index 755ea7dbb..676ace37b 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeEffect.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeEffect.cpp @@ -8,7 +8,7 @@ bool SmokeEffect_readLocalData(osg::Object &obj, osgDB::Input &fr); bool SmokeEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy SmokeEffect_Proxy +REGISTER_DOTOSGWRAPPER(SmokeEffect_Proxy) ( new osgParticle::SmokeEffect(false), "SmokeEffect", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeTrailEffect.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeTrailEffect.cpp index c243baf59..648ea0141 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeTrailEffect.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_SmokeTrailEffect.cpp @@ -8,7 +8,7 @@ bool SmokeTrailEffect_readLocalData(osg::Object &obj, osgDB::Input &fr); bool SmokeTrailEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy SmokeTrailEffect_Proxy +REGISTER_DOTOSGWRAPPER(SmokeTrailEffect_Proxy) ( new osgParticle::SmokeTrailEffect(false), "SmokeTrailEffect", diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_VariableRateCounter.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_VariableRateCounter.cpp index 09e5ebfa0..0214fa018 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_VariableRateCounter.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_VariableRateCounter.cpp @@ -10,7 +10,7 @@ bool VariableRateCounter_readLocalData(osg::Object &obj, osgDB::Input &fr); bool VariableRateCounter_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy VariableRateCounter_Proxy +REGISTER_DOTOSGWRAPPER(VariableRateCounter_Proxy) ( 0, "VariableRateCounter", diff --git a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowMap.cpp b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowMap.cpp index 56bca7f83..51f1f25b0 100644 --- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowMap.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowMap.cpp @@ -15,7 +15,7 @@ bool ShadowMap_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ShadowMap_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ShadowMap_Proxy +REGISTER_DOTOSGWRAPPER(ShadowMap_Proxy) ( new osgShadow::ShadowMap, "ShadowMap", diff --git a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTechnique.cpp b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTechnique.cpp index 121d7cf2a..6ac09604f 100644 --- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTechnique.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTechnique.cpp @@ -15,7 +15,7 @@ bool ShadowTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ShadowTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ShadowTechnique_Proxy +REGISTER_DOTOSGWRAPPER(ShadowTechnique_Proxy) ( new osgShadow::ShadowTechnique, "ShadowTechnique", diff --git a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTexture.cpp b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTexture.cpp index f00dcda14..8e09a0014 100644 --- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTexture.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowTexture.cpp @@ -15,7 +15,7 @@ bool ShadowTexture_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ShadowTexture_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ShadowTexture_Proxy +REGISTER_DOTOSGWRAPPER(ShadowTexture_Proxy) ( new osgShadow::ShadowTexture, "ShadowTexture", diff --git a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowVolume.cpp b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowVolume.cpp index 33e2c1c8c..32ac2d550 100644 --- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowVolume.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowVolume.cpp @@ -15,7 +15,7 @@ bool ShadowVolume_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ShadowVolume_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ShadowVolume_Proxy +REGISTER_DOTOSGWRAPPER(ShadowVolume_Proxy) ( new osgShadow::ShadowVolume, "ShadowVolume", diff --git a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowedScene.cpp b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowedScene.cpp index 97f197785..d5bc81c8d 100644 --- a/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowedScene.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgShadow/ShadowedScene.cpp @@ -15,7 +15,7 @@ bool ShadowedScene_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ShadowedScene_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ShadowedScene_Proxy +REGISTER_DOTOSGWRAPPER(ShadowedScene_Proxy) ( new osgShadow::ShadowedScene, "ShadowedScene", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_BlinkSequence.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_BlinkSequence.cpp index dff0961e7..10ef2ec3f 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_BlinkSequence.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_BlinkSequence.cpp @@ -14,7 +14,7 @@ using namespace osgSim; bool BlinkSequence_readLocalData(osg::Object &obj, osgDB::Input &fr); bool BlinkSequence_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy BlinkSequence_Proxy +REGISTER_DOTOSGWRAPPER(BlinkSequence_Proxy) ( new BlinkSequence, "BlinkSequence", @@ -87,7 +87,7 @@ bool BlinkSequence_writeLocalData(const osg::Object &obj, osgDB::Output &fw) bool BlinkSequence_SequenceGroup_readLocalData(osg::Object &obj, osgDB::Input &fr); bool BlinkSequence_SequenceGroup_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy BlinkSequence_SequenceGroup_Proxy +REGISTER_DOTOSGWRAPPER(BlinkSequence_SequenceGroup_Proxy) ( new SequenceGroup, "SequenceGroup", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_DOFTransform.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_DOFTransform.cpp index 80b449c74..d810487cf 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_DOFTransform.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_DOFTransform.cpp @@ -15,7 +15,7 @@ bool DOFTransform_readLocalData(Object& obj, Input& fr); bool DOFTransform_writeLocalData(const Object& obj, Output& fw); // register the read and write functions with the osgDB::Registry. -RegisterDotOsgWrapperProxy g_DOFTransformProxy +REGISTER_DOTOSGWRAPPER(g_DOFTransformProxy) ( new osgSim::DOFTransform, "DOFTransform", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_Impostor.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_Impostor.cpp index 31501aad7..2dde41c6f 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_Impostor.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_Impostor.cpp @@ -12,7 +12,7 @@ bool Impostor_readLocalData(osg::Object& obj, Input& fr); bool Impostor_writeLocalData(const osg::Object& obj, Output& fw); // register the read and write functions with the osgDB::Registry. -RegisterDotOsgWrapperProxy g_ImpostorProxy +REGISTER_DOTOSGWRAPPER(g_ImpostorProxy) ( new osgSim::Impostor, "Impostor", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_LightPointNode.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_LightPointNode.cpp index 0677b605b..dbd1a11e8 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_LightPointNode.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_LightPointNode.cpp @@ -17,7 +17,7 @@ using namespace osgSim; bool LightPointNode_readLocalData(osg::Object &obj, osgDB::Input &fr); bool LightPointNode_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy LightPointNode_Proxy +REGISTER_DOTOSGWRAPPER(LightPointNode_Proxy) ( new LightPointNode, "LightPointNode", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_MultiSwitch.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_MultiSwitch.cpp index 9764bc4e3..1e3bc1e03 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_MultiSwitch.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_MultiSwitch.cpp @@ -13,7 +13,7 @@ bool MultiSwitch_readLocalData(Object& obj, Input& fr); bool MultiSwitch_writeLocalData(const Object& obj, Output& fw); // register the read and write functions with the osgDB::Registry. -RegisterDotOsgWrapperProxy g_simSwitchProxy +REGISTER_DOTOSGWRAPPER(g_simSwitchProxy) ( new osgSim::MultiSwitch, "MultiSwitch", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_ObjectRecordData.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_ObjectRecordData.cpp index f65f03688..468e8b811 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_ObjectRecordData.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_ObjectRecordData.cpp @@ -14,7 +14,7 @@ bool ObjectRecordData_readLocalData( osg::Object &obj, osgDB::Input &fr ); bool ObjectRecordData_writeLocalData( const osg::Object &obj, osgDB::Output &fw ); -osgDB::RegisterDotOsgWrapperProxy ObjectRecordData_Proxy +REGISTER_DOTOSGWRAPPER(ObjectRecordData_Proxy) ( new osgSim::ObjectRecordData, "ObjectRecordData", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_OverlayNode.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_OverlayNode.cpp index 23a839cea..35ba563b0 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_OverlayNode.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_OverlayNode.cpp @@ -14,7 +14,7 @@ bool OverlayNode_readLocalData(Object& obj, Input& fr); bool OverlayNode_writeLocalData(const Object& obj, Output& fw); // register the read and write functions with the osgDB::Registry. -RegisterDotOsgWrapperProxy g_OverlayNodeProxy +REGISTER_DOTOSGWRAPPER(g_OverlayNodeProxy) ( new OverlayNode, "OverlayNode", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_Sector.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_Sector.cpp index 8c88740dd..2c0973131 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_Sector.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_Sector.cpp @@ -12,7 +12,7 @@ bool AzimSector_readLocalData(osg::Object &obj, osgDB::Input &fr); bool AzimSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy AzimSector_Proxy +REGISTER_DOTOSGWRAPPER(AzimSector_Proxy) ( new osgSim::AzimSector, "AzimSector", @@ -57,7 +57,7 @@ bool AzimSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw) bool ElevationSector_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ElevationSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ElevationSector_Proxy +REGISTER_DOTOSGWRAPPER(ElevationSector_Proxy) ( new osgSim::ElevationSector, "ElevationSector", @@ -106,7 +106,7 @@ bool ElevationSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw) bool AzimElevationSector_readLocalData(osg::Object &obj, osgDB::Input &fr); bool AzimElevationSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy AzimElevationSector_Proxy +REGISTER_DOTOSGWRAPPER(AzimElevationSector_Proxy) ( new osgSim::AzimElevationSector, "AzimElevationSector", @@ -170,7 +170,7 @@ bool AzimElevationSector_writeLocalData(const osg::Object &obj, osgDB::Output &f bool ConeSector_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ConeSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ConeSector_Proxy +REGISTER_DOTOSGWRAPPER(ConeSector_Proxy) ( new osgSim::ConeSector, "ConeSector", @@ -227,7 +227,7 @@ bool ConeSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw) bool DirectionalSector_readLocalData(osg::Object &obj, osgDB::Input &fr); bool DirectionalSector_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy DirectionalSector_Proxy +REGISTER_DOTOSGWRAPPER(DirectionalSector_Proxy) ( new osgSim::DirectionalSector, "DirectionalSector", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_ShapeAttribute.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_ShapeAttribute.cpp index 5ceaf3858..260b722dd 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_ShapeAttribute.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_ShapeAttribute.cpp @@ -13,7 +13,7 @@ using namespace osgSim; bool ShapeAttributeList_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ShapeAttributeList_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ShapeAttributeList_Proxy +REGISTER_DOTOSGWRAPPER(ShapeAttributeList_Proxy) ( new ShapeAttributeList, "ShapeAttributeList", diff --git a/src/osgWrappers/deprecated-dotosg/osgSim/IO_VisibilityGroup.cpp b/src/osgWrappers/deprecated-dotosg/osgSim/IO_VisibilityGroup.cpp index 7e37c4af8..3d55f484a 100644 --- a/src/osgWrappers/deprecated-dotosg/osgSim/IO_VisibilityGroup.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgSim/IO_VisibilityGroup.cpp @@ -13,7 +13,7 @@ bool VisibilityGroup_readLocalData(Object& obj, Input& fr); bool VisibilityGroup_writeLocalData(const Object& obj, Output& fw); // register the read and write functions with the osgDB::Registry. -RegisterDotOsgWrapperProxy g_VisibilityGroupProxy +REGISTER_DOTOSGWRAPPER(g_VisibilityGroupProxy) ( new VisibilityGroup, "VisibilityGroup", diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp index 350d5fcbc..f43ff39ed 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp @@ -29,7 +29,7 @@ bool CompositeLayer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool CompositeLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy CompositeLayer_Proxy +REGISTER_DOTOSGWRAPPER(CompositeLayer_Proxy) ( new osgTerrain::CompositeLayer, "CompositeLayer", diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/GeometryTechnique.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/GeometryTechnique.cpp index c24bc904f..0f9347fe0 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/GeometryTechnique.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/GeometryTechnique.cpp @@ -16,7 +16,7 @@ bool GeometryTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr); bool GeometryTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy GeometryTechnique_Proxy +REGISTER_DOTOSGWRAPPER(GeometryTechnique_Proxy) ( new osgTerrain::GeometryTechnique, "GeometryTechnique", diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/HeightFieldLayer.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/HeightFieldLayer.cpp index 8f57e67c5..8f36b10bf 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/HeightFieldLayer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/HeightFieldLayer.cpp @@ -16,7 +16,7 @@ bool HeightFieldLayer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool HeightFieldLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy HeightFieldLayer_Proxy +REGISTER_DOTOSGWRAPPER(HeightFieldLayer_Proxy) ( new osgTerrain::HeightFieldLayer, "HeightFieldLayer", diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/ImageLayer.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/ImageLayer.cpp index 40d60212f..80d2e16ee 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/ImageLayer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/ImageLayer.cpp @@ -19,7 +19,7 @@ bool ImageLayer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ImageLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ImageLayer_Proxy +REGISTER_DOTOSGWRAPPER(ImageLayer_Proxy) ( new osgTerrain::ImageLayer, "ImageLayer", diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/Layer.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/Layer.cpp index 451e68e30..c7de0f615 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/Layer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/Layer.cpp @@ -20,7 +20,7 @@ bool Layer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); bool Layer_matchFilterStr(const char* str, osg::Texture::FilterMode& filter); const char* Layer_getFilterStr(osg::Texture::FilterMode filter); -osgDB::RegisterDotOsgWrapperProxy Layer_Proxy +REGISTER_DOTOSGWRAPPER(Layer_Proxy) ( new osgTerrain::Layer, "Layer", diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/Locator.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/Locator.cpp index aab97d09a..c428bbeed 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/Locator.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/Locator.cpp @@ -16,7 +16,7 @@ bool Locator_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Locator_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Locator_Proxy +REGISTER_DOTOSGWRAPPER(Locator_Proxy) ( new osgTerrain::Locator, "Locator", diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/SwitchLayer.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/SwitchLayer.cpp index 413df7b1e..42f767f42 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/SwitchLayer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/SwitchLayer.cpp @@ -29,7 +29,7 @@ bool SwitchLayer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool SwitchLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy SwitchLayer_Proxy +REGISTER_DOTOSGWRAPPER(SwitchLayer_Proxy) ( new osgTerrain::SwitchLayer, "SwitchLayer", diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp index edc16e51c..13d8264c7 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp @@ -16,7 +16,7 @@ bool TerrainTile_readLocalData(osg::Object &obj, osgDB::Input &fr); bool TerrainTile_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy TerrainTile_Proxy +REGISTER_DOTOSGWRAPPER(TerrainTile_Proxy) ( new osgTerrain::TerrainTile, "TerrainTile", diff --git a/src/osgWrappers/deprecated-dotosg/osgText/IO_Text.cpp b/src/osgWrappers/deprecated-dotosg/osgText/IO_Text.cpp index cdc749fd0..e830a2578 100644 --- a/src/osgWrappers/deprecated-dotosg/osgText/IO_Text.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgText/IO_Text.cpp @@ -16,7 +16,7 @@ bool Text_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Text_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Text_Proxy +REGISTER_DOTOSGWRAPPER(Text_Proxy) ( new osgText::Text, "Text", diff --git a/src/osgWrappers/deprecated-dotosg/osgText/IO_Text3D.cpp b/src/osgWrappers/deprecated-dotosg/osgText/IO_Text3D.cpp index f2821f8b4..b6606a74c 100644 --- a/src/osgWrappers/deprecated-dotosg/osgText/IO_Text3D.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgText/IO_Text3D.cpp @@ -16,7 +16,7 @@ bool Text3D_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Text3D_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Text3D_Proxy +REGISTER_DOTOSGWRAPPER(Text3D_Proxy) ( new osgText::Text3D, "Text3D", diff --git a/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp b/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp index d18380ac1..b74025d5d 100644 --- a/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp @@ -16,7 +16,7 @@ bool TextBase_readLocalData(osg::Object &obj, osgDB::Input &fr); bool TextBase_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy TextBase_Proxy +REGISTER_DOTOSGWRAPPER(TextBase_Proxy) ( /*new osgText::Text*/NULL, "TextBase", diff --git a/src/osgWrappers/deprecated-dotosg/osgViewer/CompositeViewer.cpp b/src/osgWrappers/deprecated-dotosg/osgViewer/CompositeViewer.cpp index 7acff7a74..da8577601 100644 --- a/src/osgWrappers/deprecated-dotosg/osgViewer/CompositeViewer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgViewer/CompositeViewer.cpp @@ -11,7 +11,7 @@ bool CompositeViewer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool CompositeViewer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy CompositeViewer_Proxy +REGISTER_DOTOSGWRAPPER(CompositeViewer_Proxy) ( new osgViewer::CompositeViewer, "CompositeViewer", diff --git a/src/osgWrappers/deprecated-dotosg/osgViewer/View.cpp b/src/osgWrappers/deprecated-dotosg/osgViewer/View.cpp index 2f68bfb5b..4f5bc4b53 100644 --- a/src/osgWrappers/deprecated-dotosg/osgViewer/View.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgViewer/View.cpp @@ -12,7 +12,7 @@ bool View_readLocalData(osg::Object &obj, osgDB::Input &fr); bool View_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy View_Proxy +REGISTER_DOTOSGWRAPPER(View_Proxy) ( new osgViewer::View, "View", diff --git a/src/osgWrappers/deprecated-dotosg/osgViewer/Viewer.cpp b/src/osgWrappers/deprecated-dotosg/osgViewer/Viewer.cpp index 28cc2ff37..cae0c4b79 100644 --- a/src/osgWrappers/deprecated-dotosg/osgViewer/Viewer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgViewer/Viewer.cpp @@ -11,7 +11,7 @@ bool Viewer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Viewer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Viewer_Proxy +REGISTER_DOTOSGWRAPPER(Viewer_Proxy) ( new osgViewer::Viewer, "Viewer", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/CompositeProperty.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/CompositeProperty.cpp index f11f08759..05d4034aa 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/CompositeProperty.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/CompositeProperty.cpp @@ -16,7 +16,7 @@ bool CompositeProperty_readLocalData(osg::Object &obj, osgDB::Input &fr); bool CompositeProperty_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy CompositeProperty_Proxy +REGISTER_DOTOSGWRAPPER(CompositeProperty_Proxy) ( new osgVolume::CompositeProperty, "CompositeProperty", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/FixedFunctionTechnique.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/FixedFunctionTechnique.cpp index 83a4f4c04..38a67069c 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/FixedFunctionTechnique.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/FixedFunctionTechnique.cpp @@ -16,7 +16,7 @@ bool FixedFunctionTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr); bool FixedFunctionTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy FixedFunctionTechnique_Proxy +REGISTER_DOTOSGWRAPPER(FixedFunctionTechnique_Proxy) ( new osgVolume::FixedFunctionTechnique, "FixedFunctionTechnique", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/ImageLayer.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/ImageLayer.cpp index ade7a2c5a..bba4d63ab 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/ImageLayer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/ImageLayer.cpp @@ -20,7 +20,7 @@ bool ImageLayer_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ImageLayer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ImageLayer_Proxy +REGISTER_DOTOSGWRAPPER(ImageLayer_Proxy) ( new osgVolume::ImageLayer, "ImageLayer", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/Layer.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/Layer.cpp index c8ef34b15..442e53493 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/Layer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/Layer.cpp @@ -20,7 +20,7 @@ bool Layer_writeLocalData(const osg::Object &obj, osgDB::Output &fw); bool Layer_matchFilterStr(const char* str, osg::Texture::FilterMode& filter); const char* Layer_getFilterStr(osg::Texture::FilterMode filter); -osgDB::RegisterDotOsgWrapperProxy Layer_Proxy +REGISTER_DOTOSGWRAPPER(Layer_Proxy) ( new osgVolume::Layer, "Layer", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/Locator.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/Locator.cpp index 59cdaa196..9f486a88d 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/Locator.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/Locator.cpp @@ -16,7 +16,7 @@ bool Locator_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Locator_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Locator_Proxy +REGISTER_DOTOSGWRAPPER(Locator_Proxy) ( new osgVolume::Locator, "Locator", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/Property.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/Property.cpp index 83d83ef45..f578cda48 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/Property.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/Property.cpp @@ -16,7 +16,7 @@ bool Property_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Property_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Property_Proxy +REGISTER_DOTOSGWRAPPER(Property_Proxy) ( new osgVolume::Property, "Property", @@ -25,7 +25,7 @@ osgDB::RegisterDotOsgWrapperProxy Property_Proxy Property_writeLocalData ); -osgDB::RegisterDotOsgWrapperProxy MaximumImageProjectionProperty_Proxy +REGISTER_DOTOSGWRAPPER(MaximumImageProjectionProperty_Proxy) ( new osgVolume::MaximumIntensityProjectionProperty, "MaximumIntensityProjectionProperty", @@ -34,7 +34,7 @@ osgDB::RegisterDotOsgWrapperProxy MaximumImageProjectionProperty_Proxy Property_writeLocalData ); -osgDB::RegisterDotOsgWrapperProxy LightingProperty_Proxy +REGISTER_DOTOSGWRAPPER(LightingProperty_Proxy) ( new osgVolume::LightingProperty, "LightingProperty", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp index 226f54771..1526a8704 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp @@ -16,7 +16,7 @@ bool PropertyAdjustmentCallback_readLocalData(osg::Object &obj, osgDB::Input &fr); bool PropertyAdjustmentCallback_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy PropertyAdjustmentCallback_Proxy +REGISTER_DOTOSGWRAPPER(PropertyAdjustmentCallback_Proxy) ( new osgVolume::PropertyAdjustmentCallback, "PropertyAdjustmentCallback", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/RayTracedTechnique.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/RayTracedTechnique.cpp index 49dda53e0..8e57efc3e 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/RayTracedTechnique.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/RayTracedTechnique.cpp @@ -16,7 +16,7 @@ bool RayTracedTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr); bool RayTracedTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy RayTracedTechnique_Proxy +REGISTER_DOTOSGWRAPPER(RayTracedTechnique_Proxy) ( new osgVolume::RayTracedTechnique, "RayTracedTechnique", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/ScalarProperty.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/ScalarProperty.cpp index c60c73173..ee231c0ca 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/ScalarProperty.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/ScalarProperty.cpp @@ -16,7 +16,7 @@ bool ScalarProperty_readLocalData(osg::Object &obj, osgDB::Input &fr); bool ScalarProperty_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy ScalarProperty_Proxy +REGISTER_DOTOSGWRAPPER(ScalarProperty_Proxy) ( 0, "ScalarProperty", @@ -25,7 +25,7 @@ osgDB::RegisterDotOsgWrapperProxy ScalarProperty_Proxy ScalarProperty_writeLocalData ); -osgDB::RegisterDotOsgWrapperProxy IsoSurfaceProperty_Proxy +REGISTER_DOTOSGWRAPPER(IsoSurfaceProperty_Proxy) ( new osgVolume::IsoSurfaceProperty, "IsoSurfaceProperty", @@ -34,7 +34,7 @@ osgDB::RegisterDotOsgWrapperProxy IsoSurfaceProperty_Proxy ScalarProperty_writeLocalData ); -osgDB::RegisterDotOsgWrapperProxy AlphaFuncProperty_Proxy +REGISTER_DOTOSGWRAPPER(AlphaFuncProperty_Proxy) ( new osgVolume::AlphaFuncProperty, "AlphaFuncProperty", @@ -43,7 +43,7 @@ osgDB::RegisterDotOsgWrapperProxy AlphaFuncProperty_Proxy ScalarProperty_writeLocalData ); -osgDB::RegisterDotOsgWrapperProxy SampleDensityProperty_Proxy +REGISTER_DOTOSGWRAPPER(SampleDensityProperty_Proxy) ( new osgVolume::SampleDensityProperty, "SampleDensityProperty", @@ -52,7 +52,7 @@ osgDB::RegisterDotOsgWrapperProxy SampleDensityProperty_Proxy ScalarProperty_writeLocalData ); -osgDB::RegisterDotOsgWrapperProxy TransparencyProperty_Proxy +REGISTER_DOTOSGWRAPPER(TransparencyProperty_Proxy) ( new osgVolume::TransparencyProperty, "TransparencyProperty", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/SwitchProperty.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/SwitchProperty.cpp index 9ced92312..123d1d8ae 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/SwitchProperty.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/SwitchProperty.cpp @@ -16,7 +16,7 @@ bool SwitchProperty_readLocalData(osg::Object &obj, osgDB::Input &fr); bool SwitchProperty_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy SwitchProperty_Proxy +REGISTER_DOTOSGWRAPPER(SwitchProperty_Proxy) ( new osgVolume::SwitchProperty, "SwitchProperty", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/TransferFunctionProperty.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/TransferFunctionProperty.cpp index 841ced270..747448ebc 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/TransferFunctionProperty.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/TransferFunctionProperty.cpp @@ -16,7 +16,7 @@ bool TransferFunctionProperty_readLocalData(osg::Object &obj, osgDB::Input &fr); bool TransferFunctionProperty_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy TransferFunctionProperty_Proxy +REGISTER_DOTOSGWRAPPER(TransferFunctionProperty_Proxy) ( new osgVolume::TransferFunctionProperty, "TransferFunctionProperty", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/Volume.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/Volume.cpp index f54651d58..e5aec191d 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/Volume.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/Volume.cpp @@ -16,7 +16,7 @@ bool Volume_readLocalData(osg::Object &obj, osgDB::Input &fr); bool Volume_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Volume_Proxy +REGISTER_DOTOSGWRAPPER(Volume_Proxy) ( new osgVolume::Volume, "Volume", diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/VolumeTile.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/VolumeTile.cpp index ab5ac17ae..be3fceef7 100644 --- a/src/osgWrappers/deprecated-dotosg/osgVolume/VolumeTile.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgVolume/VolumeTile.cpp @@ -16,7 +16,7 @@ bool VolumeTile_readLocalData(osg::Object &obj, osgDB::Input &fr); bool VolumeTile_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy VolumeTile_Proxy +REGISTER_DOTOSGWRAPPER(VolumeTile_Proxy) ( new osgVolume::VolumeTile, "VolumeTile", diff --git a/src/osgWrappers/deprecated-dotosg/osgWidget/Box.cpp b/src/osgWrappers/deprecated-dotosg/osgWidget/Box.cpp index 366e72158..24d87f289 100644 --- a/src/osgWrappers/deprecated-dotosg/osgWidget/Box.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Box.cpp @@ -97,7 +97,8 @@ bool Model_writeData(const osg::Object& obj, osgDB::Output& fw) { return true; } -osgDB::RegisterDotOsgWrapperProxy g_ModelProxy( +REGISTER_DOTOSGWRAPPER(g_ModelProxy) +( new osgCal::Model, "Model", "Object Node Model", @@ -106,7 +107,8 @@ osgDB::RegisterDotOsgWrapperProxy g_ModelProxy( ); */ -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_BoxProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_BoxProxy) +( new osgWidget::Box("unset"), "osgWidget::Box", "Object Node Group Transform MatrixTransform osgWidget::Box", diff --git a/src/osgWrappers/deprecated-dotosg/osgWidget/EmbeddedWindow.cpp b/src/osgWrappers/deprecated-dotosg/osgWidget/EmbeddedWindow.cpp index d528d1757..b17183657 100644 --- a/src/osgWrappers/deprecated-dotosg/osgWidget/EmbeddedWindow.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgWidget/EmbeddedWindow.cpp @@ -23,7 +23,8 @@ bool osgWidget_EmbeddedWindow_writeData(const osg::Object& /*obj*/, osgDB::Outpu return true; } -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_EmbeddedWindowProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_EmbeddedWindowProxy) +( new osgWidget::Window::EmbeddedWindow("unset"), "osgWidget::Window::EmbeddedWindow", "Object Drawable Geometry osgWidget::Widget osgWidget::Window::EmbeddedWindow", diff --git a/src/osgWrappers/deprecated-dotosg/osgWidget/Frame.cpp b/src/osgWrappers/deprecated-dotosg/osgWidget/Frame.cpp index 75753d4ce..8a0ccbda2 100644 --- a/src/osgWrappers/deprecated-dotosg/osgWidget/Frame.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Frame.cpp @@ -23,7 +23,8 @@ bool osgWidget_Frame_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) return true; } -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_FrameProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_FrameProxy) +( new osgWidget::Frame("unset"), "osgWidget::Frame", "Object Node Group Transform MatrixTransform osgWidget::Table osgWidget::Frame", diff --git a/src/osgWrappers/deprecated-dotosg/osgWidget/Input.cpp b/src/osgWrappers/deprecated-dotosg/osgWidget/Input.cpp index e1dc333ef..d7edc52cd 100644 --- a/src/osgWrappers/deprecated-dotosg/osgWidget/Input.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Input.cpp @@ -23,7 +23,8 @@ bool osgWidget_Input_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) return true; } -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_InputProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_InputProxy) +( new osgWidget::Input("unset"), "osgWidget::Input", "Object Drawable Geometry osgWidget::Widget osgWidget::Input", diff --git a/src/osgWrappers/deprecated-dotosg/osgWidget/Label.cpp b/src/osgWrappers/deprecated-dotosg/osgWidget/Label.cpp index 0ea9ced0d..10bf5bc15 100644 --- a/src/osgWrappers/deprecated-dotosg/osgWidget/Label.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Label.cpp @@ -23,7 +23,8 @@ bool osgWidget_Label_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) return true; } -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_LabelProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_LabelProxy) +( new osgWidget::Label("unset"), "osgWidget::Label", "Object Drawable Geometry osgWidget::Widget osgWidget::Label", diff --git a/src/osgWrappers/deprecated-dotosg/osgWidget/Table.cpp b/src/osgWrappers/deprecated-dotosg/osgWidget/Table.cpp index 1c687dcdb..461cfe44a 100644 --- a/src/osgWrappers/deprecated-dotosg/osgWidget/Table.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Table.cpp @@ -22,7 +22,8 @@ bool osgWidget_Table_writeData(const osg::Object& /*obj*/, osgDB::Output& fw) return true; } -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_TableProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_TableProxy) +( new osgWidget::Table("unset"), "osgWidget::Table", "Object Node Group Transform MatrixTransform osgWidget::Table", diff --git a/src/osgWrappers/deprecated-dotosg/osgWidget/Widget.cpp b/src/osgWrappers/deprecated-dotosg/osgWidget/Widget.cpp index 31704977d..62906e913 100644 --- a/src/osgWrappers/deprecated-dotosg/osgWidget/Widget.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgWidget/Widget.cpp @@ -56,7 +56,8 @@ bool osgWidget_NullWidget_writeData(const osg::Object& /*obj*/, osgDB::Output& f return true; } -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_WidgetProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_WidgetProxy) +( new osgWidget::Widget("unset"), "osgWidget::Widget", "Object Drawable Geometry osgWidget::Widget", @@ -64,7 +65,8 @@ osgDB::RegisterDotOsgWrapperProxy g_osgWidget_WidgetProxy( &osgWidget_Widget_writeData ); -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_NotifyWidgetProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_NotifyWidgetProxy) +( new osgWidget::NotifyWidget("unset"), "osgWidget::NotifyWidget", "Object Drawable Geometry osgWidget::Widget osgWidget::NotifyWidget", @@ -72,7 +74,8 @@ osgDB::RegisterDotOsgWrapperProxy g_osgWidget_NotifyWidgetProxy( &osgWidget_NotifyWidget_writeData ); -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_NullWidgetProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_NullWidgetProxy) +( new osgWidget::Widget("unset"), "osgWidget::NullWidget", "Object Drawable Geometry osgWidget::Widget osgWidget::NullWidget", diff --git a/src/osgWrappers/deprecated-dotosg/osgWidget/WindowManager.cpp b/src/osgWrappers/deprecated-dotosg/osgWidget/WindowManager.cpp index 4f3fac108..689bf5493 100644 --- a/src/osgWrappers/deprecated-dotosg/osgWidget/WindowManager.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgWidget/WindowManager.cpp @@ -23,7 +23,8 @@ bool osgWidget_WindowManager_writeData(const osg::Object& /*obj*/, osgDB::Output return true; } -osgDB::RegisterDotOsgWrapperProxy g_osgWidget_WindowManagerProxy( +REGISTER_DOTOSGWRAPPER(g_osgWidget_WindowManagerProxy) +( new osgWidget::WindowManager(), "osgWidget::WindowManager", "Object Node Group Switch osgWidget::WindowManager",