From ec12a1091b6ff4930ce51a2f329dcbb664398b8c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 12 May 2005 20:06:39 +0000 Subject: [PATCH] Updated wrappers. --- src/osgWrappers/osg/Billboard.cpp | 2 ++ src/osgWrappers/osg/BoundingSphere.cpp | 2 ++ src/osgWrappers/osg/ClipNode.cpp | 2 ++ src/osgWrappers/osg/DrawPixels.cpp | 2 ++ src/osgWrappers/osg/Drawable.cpp | 20 +++++++++++++++++ src/osgWrappers/osg/Geode.cpp | 2 ++ src/osgWrappers/osg/LOD.cpp | 2 ++ src/osgWrappers/osg/LightSource.cpp | 2 ++ src/osgWrappers/osg/Node.cpp | 22 ++++++++++++++++++- src/osgWrappers/osg/OccluderNode.cpp | 2 ++ src/osgWrappers/osg/ProxyNode.cpp | 2 ++ src/osgWrappers/osg/ShapeDrawable.cpp | 2 ++ src/osgWrappers/osg/Switch.cpp | 2 ++ src/osgWrappers/osg/Transform.cpp | 2 ++ src/osgWrappers/osgGA/UFOManipulator.cpp | 8 +++---- .../osgParticle/ParticleProcessor.cpp | 2 ++ .../osgParticle/ParticleSystem.cpp | 1 + .../osgParticle/ParticleSystemUpdater.cpp | 2 ++ src/osgWrappers/osgSim/Impostor.cpp | 2 ++ src/osgWrappers/osgSim/ImpostorSprite.cpp | 2 ++ src/osgWrappers/osgSim/LightPointNode.cpp | 2 ++ src/osgWrappers/osgText/Text.cpp | 2 ++ 22 files changed, 82 insertions(+), 5 deletions(-) diff --git a/src/osgWrappers/osg/Billboard.cpp b/src/osgWrappers/osg/Billboard.cpp index d0c8cc49c..0a2cf83ce 100644 --- a/src/osgWrappers/osg/Billboard.cpp +++ b/src/osgWrappers/osg/Billboard.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -50,6 +51,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Billboard) Method2(bool, addDrawable, IN, osg::Drawable *, gset, IN, const osg::Vec3 &, pos); Method1(bool, removeDrawable, IN, osg::Drawable *, gset); Method3(bool, computeMatrix, IN, osg::Matrix &, modelview, IN, const osg::Vec3 &, eye_local, IN, const osg::Vec3 &, pos_local); + Method0(osg::BoundingSphere, computeBound); Property(const osg::Vec3 &, Axis); Property(osg::Billboard::Mode, Mode); Property(const osg::Vec3 &, Normal); diff --git a/src/osgWrappers/osg/BoundingSphere.cpp b/src/osgWrappers/osg/BoundingSphere.cpp index 5ae80216f..d73601039 100644 --- a/src/osgWrappers/osg/BoundingSphere.cpp +++ b/src/osgWrappers/osg/BoundingSphere.cpp @@ -16,6 +16,8 @@ BEGIN_VALUE_REFLECTOR(osg::BoundingSphere) Constructor0(); Constructor2(IN, const osg::Vec3 &, center, IN, float, radius); + Constructor1(IN, const osg::BoundingSphere &, bs); + Constructor1(IN, const osg::BoundingBox &, bb); Method0(void, init); Method0(bool, valid); Method2(void, set, IN, const osg::Vec3 &, center, IN, float, radius); diff --git a/src/osgWrappers/osg/ClipNode.cpp b/src/osgWrappers/osg/ClipNode.cpp index f09dca274..8ec415528 100644 --- a/src/osgWrappers/osg/ClipNode.cpp +++ b/src/osgWrappers/osg/ClipNode.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -42,6 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClipNode) Method0(const osg::ClipNode::ClipPlaneList &, getClipPlaneList); Method2(void, setStateSetModes, IN, osg::StateSet &, x, IN, osg::StateAttribute::GLModeValue, x); MethodWithDefaults1(void, setLocalStateSetModes, IN, osg::StateAttribute::GLModeValue, x, osg::StateAttribute::ON); + Method0(osg::BoundingSphere, computeBound); ArrayProperty_GA(osg::ClipPlane *, ClipPlane, ClipPlanes, unsigned int, bool); ReadOnlyProperty(osg::ClipNode::ClipPlaneList &, ClipPlaneList); WriteOnlyProperty(osg::StateAttribute::GLModeValue, LocalStateSetModes); diff --git a/src/osgWrappers/osg/DrawPixels.cpp b/src/osgWrappers/osg/DrawPixels.cpp index aceda69f2..6c4baad71 100644 --- a/src/osgWrappers/osg/DrawPixels.cpp +++ b/src/osgWrappers/osg/DrawPixels.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -36,6 +37,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DrawPixels) Method4(void, setSubImageDimensions, IN, unsigned int, offsetX, IN, unsigned int, offsetY, IN, unsigned int, width, IN, unsigned int, height); Method4(void, getSubImageDimensions, IN, unsigned int &, offsetX, IN, unsigned int &, offsetY, IN, unsigned int &, width, IN, unsigned int &, height); Method1(void, drawImplementation, IN, osg::State &, state); + Method0(osg::BoundingBox, computeBound); Property(osg::Image *, Image); Property(const osg::Vec3 &, Position); Property(bool, UseSubImage); diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index be4ca7273..3633db3dc 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -67,8 +67,14 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) Method0(osg::StateSet *, getStateSet); Method0(const osg::StateSet *, getStateSet); Method0(osg::StateSet *, getOrCreateStateSet); + Method1(void, setInitialBound, IN, const osg::BoundingBox &, bbox); + Method0(const osg::BoundingBox &, getInitialBound); Method0(void, dirtyBound); Method0(const osg::BoundingBox &, getBound); + Method0(osg::BoundingBox, computeBound); + Method1(void, setComputeBoundingBoxCallback, IN, osg::Drawable::ComputeBoundingBoxCallback *, callback); + Method0(osg::Drawable::ComputeBoundingBoxCallback *, getComputeBoundingBoxCallback); + Method0(const osg::Drawable::ComputeBoundingBoxCallback *, getComputeBoundingBoxCallback); Method1(void, setShape, IN, osg::Shape *, shape); Method0(osg::Shape *, getShape); Method0(const osg::Shape *, getShape); @@ -107,10 +113,12 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) Method1(bool, supports, IN, const osg::PrimitiveIndexFunctor &, x); Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, x); ReadOnlyProperty(const osg::BoundingBox &, Bound); + Property(osg::Drawable::ComputeBoundingBoxCallback *, ComputeBoundingBoxCallback); Property(osg::Drawable::CullCallback *, CullCallback); Property(osg::Drawable::DrawCallback *, DrawCallback); Property(osg::Drawable::EventCallback *, EventCallback); ReadOnlyProperty(unsigned int, GLObjectSizeHint); + Property(const osg::BoundingBox &, InitialBound); ArrayProperty_G(osg::Node *, Parent, Parents, unsigned int, void); ReadOnlyProperty(osg::Drawable::ParentList, Parents); Property(osg::Shape *, Shape); @@ -136,6 +144,18 @@ BEGIN_VALUE_REFLECTOR(osg::Drawable::AttributeFunctor) Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::UByte4 *, x); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) + BaseType(osg::Object); + Constructor0(); + Constructor2(IN, const osg::Drawable::ComputeBoundingBoxCallback &, x, IN, const osg::CopyOp &, x); + Method0(osg::Object *, cloneType); + Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + Method0(const char *, libraryName); + Method0(const char *, className); + Method1(osg::BoundingBox, computeBound, IN, const osg::Drawable &, x); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osg::Drawable::ConstAttributeFunctor) Constructor0(); Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, const unsigned, int, IN, const GLbyte *, x); diff --git a/src/osgWrappers/osg/Geode.cpp b/src/osgWrappers/osg/Geode.cpp index 6f902317a..13ba73ffd 100644 --- a/src/osgWrappers/osg/Geode.cpp +++ b/src/osgWrappers/osg/Geode.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -41,6 +42,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Geode) Method1(unsigned int, getDrawableIndex, IN, const osg::Drawable *, drawable); Method1(void, compileDrawables, IN, osg::State &, state); Method0(const osg::BoundingBox &, getBoundingBox); + Method0(osg::BoundingSphere, computeBound); MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); ReadOnlyProperty(const osg::BoundingBox &, BoundingBox); ArrayProperty_GSA(osg::Drawable *, Drawable, Drawables, unsigned int, bool); diff --git a/src/osgWrappers/osg/LOD.cpp b/src/osgWrappers/osg/LOD.cpp index a0b3eedf5..7fbe2a22d 100644 --- a/src/osgWrappers/osg/LOD.cpp +++ b/src/osgWrappers/osg/LOD.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -58,6 +59,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LOD) Method0(unsigned int, getNumRanges); Method1(void, setRangeList, IN, const osg::LOD::RangeList &, rangeList); Method0(const osg::LOD::RangeList &, getRangeList); + Method0(osg::BoundingSphere, computeBound); Property(const osg::Vec3 &, Center); Property(osg::LOD::CenterMode, CenterMode); Property(float, Radius); diff --git a/src/osgWrappers/osg/LightSource.cpp b/src/osgWrappers/osg/LightSource.cpp index db149c222..09874b852 100644 --- a/src/osgWrappers/osg/LightSource.cpp +++ b/src/osgWrappers/osg/LightSource.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -39,6 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LightSource) Method0(const osg::Light *, getLight); Method2(void, setStateSetModes, IN, osg::StateSet &, x, IN, osg::StateAttribute::GLModeValue, x); MethodWithDefaults1(void, setLocalStateSetModes, IN, osg::StateAttribute::GLModeValue, value, osg::StateAttribute::ON); + Method0(osg::BoundingSphere, computeBound); Property(osg::Light *, Light); WriteOnlyProperty(osg::StateAttribute::GLModeValue, LocalStateSetModes); Property(osg::LightSource::ReferenceFrame, ReferenceFrame); diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index 92ee7939e..5abb599cb 100644 --- a/src/osgWrappers/osg/Node.cpp +++ b/src/osgWrappers/osg/Node.cpp @@ -80,15 +80,23 @@ BEGIN_OBJECT_REFLECTOR(osg::Node) Method0(osg::StateSet *, getOrCreateStateSet); Method0(osg::StateSet *, getStateSet); Method0(const osg::StateSet *, getStateSet); - Method0(const osg::BoundingSphere &, getBound); + Method1(void, setInitialBound, IN, const osg::BoundingSphere &, bsphere); + Method0(const osg::BoundingSphere &, getInitialBound); Method0(void, dirtyBound); + Method0(const osg::BoundingSphere &, getBound); + Method0(osg::BoundingSphere, computeBound); + Method1(void, setComputeBoundingSphereCallback, IN, osg::Node::ComputeBoundingSphereCallback *, callback); + Method0(osg::Node::ComputeBoundingSphereCallback *, getComputeBoundingSphereCallback); + Method0(const osg::Node::ComputeBoundingSphereCallback *, getComputeBoundingSphereCallback); MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); ReadOnlyProperty(const osg::BoundingSphere &, Bound); + Property(osg::Node::ComputeBoundingSphereCallback *, ComputeBoundingSphereCallback); Property(osg::NodeCallback *, CullCallback); Property(bool, CullingActive); ArrayProperty_GA(const std::string &, Description, Descriptions, unsigned int, void); Property(const osg::Node::DescriptionList &, Descriptions); Property(osg::NodeCallback *, EventCallback); + Property(const osg::BoundingSphere &, InitialBound); Property(const std::string &, Name); Property(osg::Node::NodeMask, NodeMask); ArrayProperty_G(osg::Group *, Parent, Parents, unsigned int, void); @@ -97,6 +105,18 @@ BEGIN_OBJECT_REFLECTOR(osg::Node) Property(osg::NodeCallback *, UpdateCallback); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) + BaseType(osg::Object); + Constructor0(); + Constructor2(IN, const osg::Node::ComputeBoundingSphereCallback &, x, IN, const osg::CopyOp &, x); + Method0(osg::Object *, cloneType); + Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + Method0(const char *, libraryName); + Method0(const char *, className); + Method1(osg::BoundingSphere, computeBound, IN, const osg::Node &, x); +END_REFLECTOR + TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::NodePath); STD_VECTOR_REFLECTOR(std::vector< osg::Group * >); diff --git a/src/osgWrappers/osg/OccluderNode.cpp b/src/osgWrappers/osg/OccluderNode.cpp index 4316e7d8f..21a0f4c9a 100644 --- a/src/osgWrappers/osg/OccluderNode.cpp +++ b/src/osgWrappers/osg/OccluderNode.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -28,6 +29,7 @@ BEGIN_OBJECT_REFLECTOR(osg::OccluderNode) Method1(void, setOccluder, IN, osg::ConvexPlanarOccluder *, occluder); Method0(osg::ConvexPlanarOccluder *, getOccluder); Method0(const osg::ConvexPlanarOccluder *, getOccluder); + Method0(osg::BoundingSphere, computeBound); Property(osg::ConvexPlanarOccluder *, Occluder); END_REFLECTOR diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index d301c52ab..848fccc33 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -48,6 +49,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) Method0(const osg::Vec3 &, getCenter); Method1(void, setRadius, IN, float, radius); Method0(float, getRadius); + Method0(osg::BoundingSphere, computeBound); Property(const osg::Vec3 &, Center); Property(osg::ProxyNode::CenterMode, CenterMode); Property(const std::string &, DatabasePath); diff --git a/src/osgWrappers/osg/ShapeDrawable.cpp b/src/osgWrappers/osg/ShapeDrawable.cpp index d6615a1eb..c017fdb85 100644 --- a/src/osgWrappers/osg/ShapeDrawable.cpp +++ b/src/osgWrappers/osg/ShapeDrawable.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -39,6 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ShapeDrawable) Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); Method1(bool, supports, IN, osg::PrimitiveFunctor &, x); Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); + Method0(osg::BoundingBox, computeBound); Property(const osg::Vec4 &, Color); Property(osg::TessellationHints *, TessellationHints); END_REFLECTOR diff --git a/src/osgWrappers/osg/Switch.cpp b/src/osgWrappers/osg/Switch.cpp index 9044dc27c..a45c2a2f7 100644 --- a/src/osgWrappers/osg/Switch.cpp +++ b/src/osgWrappers/osg/Switch.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -44,6 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Switch) Method1(bool, setSingleChildOn, IN, unsigned int, pos); Method1(void, setValueList, IN, const osg::Switch::ValueList &, values); Method0(const osg::Switch::ValueList &, getValueList); + Method0(osg::BoundingSphere, computeBound); IndexedProperty1(bool, ChildValue, const osg::Node *, child); Property(bool, NewChildDefaultValue); WriteOnlyPropertyWithReturnType(unsigned int, SingleChildOn, bool); diff --git a/src/osgWrappers/osg/Transform.cpp b/src/osgWrappers/osg/Transform.cpp index 6c35edd75..3b133aeec 100644 --- a/src/osgWrappers/osg/Transform.cpp +++ b/src/osgWrappers/osg/Transform.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -42,6 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Transform) Method0(osg::Transform::ReferenceFrame, getReferenceFrame); Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, x); + Method0(osg::BoundingSphere, computeBound); Property(osg::Transform::ReferenceFrame, ReferenceFrame); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/UFOManipulator.cpp b/src/osgWrappers/osgGA/UFOManipulator.cpp index f7a76e15f..1fb9d53ed 100644 --- a/src/osgWrappers/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/osgGA/UFOManipulator.cpp @@ -17,6 +17,10 @@ #include #include +BEGIN_VALUE_REFLECTOR(UFOManipulator) + Constructor0(); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgGA::UFOManipulator) BaseType(osgGA::MatrixManipulator); Constructor0(); @@ -42,7 +46,3 @@ BEGIN_VALUE_REFLECTOR(osgGA::UFOManipulator) Property(osg::Node *, Node); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(UFOManipulator) - Constructor0(); -END_REFLECTOR - diff --git a/src/osgWrappers/osgParticle/ParticleProcessor.cpp b/src/osgWrappers/osgParticle/ParticleProcessor.cpp index 7257b264a..ec0c5c7dd 100644 --- a/src/osgWrappers/osgParticle/ParticleProcessor.cpp +++ b/src/osgWrappers/osgParticle/ParticleProcessor.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -55,6 +56,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleProcessor) Method1(osg::Vec3, rotateLocalToWorld, IN, const osg::Vec3 &, P); Method1(osg::Vec3, transformWorldToLocal, IN, const osg::Vec3 &, P); Method1(osg::Vec3, rotateWorldToLocal, IN, const osg::Vec3 &, P); + Method0(osg::BoundingSphere, computeBound); Property(double, CurrentTime); WriteOnlyProperty(bool, Enabled); WriteOnlyProperty(bool, Endless); diff --git a/src/osgWrappers/osgParticle/ParticleSystem.cpp b/src/osgWrappers/osgParticle/ParticleSystem.cpp index 8b2a1d721..b759e8892 100644 --- a/src/osgWrappers/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp @@ -62,6 +62,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystem) Method1(void, setLevelOfDetail, IN, int, v); Method1(void, update, IN, double, dt); Method1(void, drawImplementation, IN, osg::State &, state); + Method0(osg::BoundingBox, computeBound); Property(const osg::Vec3 &, AlignVectorX); Property(const osg::Vec3 &, AlignVectorY); Property(const osg::BoundingBox &, DefaultBoundingBox); diff --git a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp index b4d369476..861d6d9ce 100644 --- a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -36,6 +37,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystemUpdater) Method1(bool, containsParticleSystem, IN, const osgParticle::ParticleSystem *, ps); Method1(unsigned int, getParticleSystemIndex, IN, const osgParticle::ParticleSystem *, ps); Method1(void, traverse, IN, osg::NodeVisitor &, nv); + Method0(osg::BoundingSphere, computeBound); ArrayProperty_GSA(osgParticle::ParticleSystem *, ParticleSystem, ParticleSystems, unsigned int, bool); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/Impostor.cpp b/src/osgWrappers/osgSim/Impostor.cpp index acec1cd99..9f6d4f2c5 100644 --- a/src/osgWrappers/osgSim/Impostor.cpp +++ b/src/osgWrappers/osgSim/Impostor.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -36,6 +37,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::Impostor) Method2(void, addImpostorSprite, IN, unsigned int, contextID, IN, osgSim::ImpostorSprite *, is); Method1(osgSim::Impostor::ImpostorSpriteList &, getImpostorSpriteList, IN, unsigned int, contexID); Method1(const osgSim::Impostor::ImpostorSpriteList &, getImpostorSpriteList, IN, unsigned int, contexID); + Method0(osg::BoundingSphere, computeBound); Property(float, ImpostorThreshold); WriteOnlyProperty(float, ImpostorThresholdToBound); END_REFLECTOR diff --git a/src/osgWrappers/osgSim/ImpostorSprite.cpp b/src/osgWrappers/osgSim/ImpostorSprite.cpp index 779caca8e..8279ff50e 100644 --- a/src/osgWrappers/osgSim/ImpostorSprite.cpp +++ b/src/osgWrappers/osgSim/ImpostorSprite.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -56,6 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ImpostorSprite) Method1(void, accept, IN, osg::Drawable::ConstAttributeFunctor &, af); Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); Method1(void, accept, IN, osg::PrimitiveFunctor &, pf); + Method0(osg::BoundingBox, computeBound); ReadOnlyProperty(osg::Vec3 *, ControlCoords); ReadOnlyProperty(osg::Vec3 *, Coords); Property(int, LastFrameUsed); diff --git a/src/osgWrappers/osgSim/LightPointNode.cpp b/src/osgWrappers/osgSim/LightPointNode.cpp index 2ea18730c..0344fa497 100644 --- a/src/osgWrappers/osgSim/LightPointNode.cpp +++ b/src/osgWrappers/osgSim/LightPointNode.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -45,6 +46,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::LightPointNode) Method0(float, getMaxVisibleDistance2); Method1(void, setLightPointSystem, IN, osgSim::LightPointSystem *, lps); Method0(osgSim::LightPointSystem *, getLightPointSystem); + Method0(osg::BoundingSphere, computeBound); ArrayProperty_GA(const osgSim::LightPoint &, LightPoint, LightPoints, unsigned int, unsigned int); Property(const osgSim::LightPointNode::LightPointList &, LightPointList); Property(osgSim::LightPointSystem *, LightPointSystem); diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index 3c837e02e..eb7022962 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -125,6 +126,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text) MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); Method1(const osgText::Text::GlyphQuads *, getGlyphQuads, IN, osg::StateSet *, stateSet); Method0(const osgText::Text::TextureGlyphQuadMap &, getTextureGlyphQuadMap); + Method0(osg::BoundingBox, computeBound); Property(osgText::Text::AlignmentType, Alignment); Property(bool, AutoRotateToScreen); WriteOnlyProperty(osgText::Text::AxisAlignment, AxisAlignment);