Added computeDataVariance method into osg::Object and implementations in Drawable and StateSet,

and calling of osgUtil::StaticObjectDetectionVisitor in osgViewer::Viewer
2007-02-14 11:24:42 +00:00
parent 5dcb7af6a4
commit 89c99a88fa
256 changed files with 503 additions and 393 deletions
--- a/src/osgWrappers/osgParticle/AccelOperator.cpp
+++ b/src/osgWrappers/osgParticle/AccelOperator.cpp
@@ -25,7 +25,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::AccelOperator)
+BEGIN_OBJECT_REFLECTOR(osgParticle::AccelOperator)
 	I_BaseType(osgParticle::Operator);
 	I_Constructor0(____AccelOperator,
 	               "",
--- a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp
+++ b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp
@@ -25,7 +25,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::AngularAccelOperator)
+BEGIN_OBJECT_REFLECTOR(osgParticle::AngularAccelOperator)
 	I_BaseType(osgParticle::Operator);
 	I_Constructor0(____AngularAccelOperator,
 	               "",
--- a/src/osgWrappers/osgParticle/BoxPlacer.cpp
+++ b/src/osgWrappers/osgParticle/BoxPlacer.cpp
@@ -25,7 +25,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::BoxPlacer)
+BEGIN_OBJECT_REFLECTOR(osgParticle::BoxPlacer)
 	I_BaseType(osgParticle::CenteredPlacer);
 	I_Constructor0(____BoxPlacer,
 	               "",
--- a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp
+++ b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp
@@ -24,7 +24,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ConnectedParticleSystem)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ConnectedParticleSystem)
 	I_BaseType(osgParticle::ParticleSystem);
 	I_Constructor0(____ConnectedParticleSystem,
 	               "",
--- a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp
+++ b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp
@@ -22,7 +22,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ConstantRateCounter)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ConstantRateCounter)
 	I_BaseType(osgParticle::Counter);
 	I_Constructor0(____ConstantRateCounter,
 	               "",
--- a/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp
+++ b/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp
@@ -26,7 +26,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ExplosionDebrisEffect)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionDebrisEffect)
 	I_BaseType(osgParticle::ParticleEffect);
 	I_ConstructorWithDefaults1(IN, bool, automaticSetup, true,
 	                           Properties::EXPLICIT,
--- a/src/osgWrappers/osgParticle/ExplosionEffect.cpp
+++ b/src/osgWrappers/osgParticle/ExplosionEffect.cpp
@@ -26,7 +26,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ExplosionEffect)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionEffect)
 	I_BaseType(osgParticle::ParticleEffect);
 	I_ConstructorWithDefaults1(IN, bool, automaticSetup, true,
 	                           Properties::EXPLICIT,
--- a/src/osgWrappers/osgParticle/FireEffect.cpp
+++ b/src/osgWrappers/osgParticle/FireEffect.cpp
@@ -26,7 +26,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::FireEffect)
+BEGIN_OBJECT_REFLECTOR(osgParticle::FireEffect)
 	I_BaseType(osgParticle::ParticleEffect);
 	I_ConstructorWithDefaults1(IN, bool, automaticSetup, true,
 	                           Properties::EXPLICIT,
--- a/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp
+++ b/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp
@@ -25,7 +25,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::FluidFrictionOperator)
+BEGIN_OBJECT_REFLECTOR(osgParticle::FluidFrictionOperator)
 	I_BaseType(osgParticle::Operator);
 	I_Constructor0(____FluidFrictionOperator,
 	               "",
--- a/src/osgWrappers/osgParticle/FluidProgram.cpp
+++ b/src/osgWrappers/osgParticle/FluidProgram.cpp
@@ -24,7 +24,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::FluidProgram)
+BEGIN_OBJECT_REFLECTOR(osgParticle::FluidProgram)
 	I_BaseType(osgParticle::Program);
 	I_Constructor0(____FluidProgram,
 	               "",
--- a/src/osgWrappers/osgParticle/ForceOperator.cpp
+++ b/src/osgWrappers/osgParticle/ForceOperator.cpp
@@ -25,7 +25,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ForceOperator)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ForceOperator)
 	I_BaseType(osgParticle::Operator);
 	I_Constructor0(____ForceOperator,
 	               "",
--- a/src/osgWrappers/osgParticle/LinearInterpolator.cpp
+++ b/src/osgWrappers/osgParticle/LinearInterpolator.cpp
@@ -22,7 +22,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::LinearInterpolator)
+BEGIN_OBJECT_REFLECTOR(osgParticle::LinearInterpolator)
 	I_BaseType(osgParticle::Interpolator);
 	I_Constructor0(____LinearInterpolator,
 	               "",
--- a/src/osgWrappers/osgParticle/ModularEmitter.cpp
+++ b/src/osgWrappers/osgParticle/ModularEmitter.cpp
@@ -26,7 +26,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ModularEmitter)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ModularEmitter)
 	I_BaseType(osgParticle::Emitter);
 	I_Constructor0(____ModularEmitter,
 	               "",
--- a/src/osgWrappers/osgParticle/ModularProgram.cpp
+++ b/src/osgWrappers/osgParticle/ModularProgram.cpp
@@ -24,7 +24,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ModularProgram)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ModularProgram)
 	I_BaseType(osgParticle::Program);
 	I_Constructor0(____ModularProgram,
 	               "",
--- a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp
+++ b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp
@@ -24,7 +24,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::MultiSegmentPlacer)
+BEGIN_OBJECT_REFLECTOR(osgParticle::MultiSegmentPlacer)
 	I_BaseType(osgParticle::Placer);
 	I_Constructor0(____MultiSegmentPlacer,
 	               "",
--- a/src/osgWrappers/osgParticle/ParticleSystem.cpp
+++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp
@@ -32,7 +32,7 @@ BEGIN_ENUM_REFLECTOR(osgParticle::ParticleSystem::Alignment)
 	I_EnumLabel(osgParticle::ParticleSystem::FIXED);
 END_REFLECTOR

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleSystem)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystem)
 	I_BaseType(osg::Drawable);
 	I_Constructor0(____ParticleSystem,
 	               "",
--- a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp
+++ b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp
@@ -25,7 +25,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleSystemUpdater)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystemUpdater)
 	I_BaseType(osg::Node);
 	I_Constructor0(____ParticleSystemUpdater,
 	               "",
--- a/src/osgWrappers/osgParticle/PointPlacer.cpp
+++ b/src/osgWrappers/osgParticle/PointPlacer.cpp
@@ -24,7 +24,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::PointPlacer)
+BEGIN_OBJECT_REFLECTOR(osgParticle::PointPlacer)
 	I_BaseType(osgParticle::CenteredPlacer);
 	I_Constructor0(____PointPlacer,
 	               "",
--- a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp
+++ b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp
@@ -30,7 +30,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect)
+BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect)
 	I_BaseType(osg::Node);
 	I_Constructor0(____PrecipitationEffect,
 	               "",
@@ -274,7 +274,7 @@ END_REFLECTOR

 TYPE_NAME_ALIAS(std::map< osgParticle::PrecipitationEffect::PrecipitationDrawable::Cell COMMA  osgParticle::PrecipitationEffect::PrecipitationDrawable::DepthMatrixStartTime >, osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap);

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable)
+BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable)
 	I_BaseType(osg::Drawable);
 	I_Constructor0(____PrecipitationDrawable,
 	               "",
--- a/src/osgWrappers/osgParticle/RadialShooter.cpp
+++ b/src/osgWrappers/osgParticle/RadialShooter.cpp
@@ -25,7 +25,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::RadialShooter)
+BEGIN_OBJECT_REFLECTOR(osgParticle::RadialShooter)
 	I_BaseType(osgParticle::Shooter);
 	I_Constructor0(____RadialShooter,
 	               "",
--- a/src/osgWrappers/osgParticle/RandomRateCounter.cpp
+++ b/src/osgWrappers/osgParticle/RandomRateCounter.cpp
@@ -22,7 +22,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::RandomRateCounter)
+BEGIN_OBJECT_REFLECTOR(osgParticle::RandomRateCounter)
 	I_BaseType(osgParticle::VariableRateCounter);
 	I_Constructor0(____RandomRateCounter,
 	               "",
--- a/src/osgWrappers/osgParticle/SectorPlacer.cpp
+++ b/src/osgWrappers/osgParticle/SectorPlacer.cpp
@@ -25,7 +25,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::SectorPlacer)
+BEGIN_OBJECT_REFLECTOR(osgParticle::SectorPlacer)
 	I_BaseType(osgParticle::CenteredPlacer);
 	I_Constructor0(____SectorPlacer,
 	               "",
--- a/src/osgWrappers/osgParticle/SegmentPlacer.cpp
+++ b/src/osgWrappers/osgParticle/SegmentPlacer.cpp
@@ -24,7 +24,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::SegmentPlacer)
+BEGIN_OBJECT_REFLECTOR(osgParticle::SegmentPlacer)
 	I_BaseType(osgParticle::Placer);
 	I_Constructor0(____SegmentPlacer,
 	               "",
--- a/src/osgWrappers/osgParticle/SmokeEffect.cpp
+++ b/src/osgWrappers/osgParticle/SmokeEffect.cpp
@@ -26,7 +26,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::SmokeEffect)
+BEGIN_OBJECT_REFLECTOR(osgParticle::SmokeEffect)
 	I_BaseType(osgParticle::ParticleEffect);
 	I_ConstructorWithDefaults1(IN, bool, automaticSetup, true,
 	                           Properties::EXPLICIT,
--- a/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp
+++ b/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp
@@ -26,7 +26,7 @@
 #undef OUT
 #endif

-BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::SmokeTrailEffect)
+BEGIN_OBJECT_REFLECTOR(osgParticle::SmokeTrailEffect)
 	I_BaseType(osgParticle::ParticleEffect);
 	I_ConstructorWithDefaults1(IN, bool, automaticSetup, true,
 	                           Properties::EXPLICIT,