diff --git a/include/osg/ArgumentParser b/include/osg/ArgumentParser index 314f75ae5..5c0eff506 100644 --- a/include/osg/ArgumentParser +++ b/include/osg/ArgumentParser @@ -29,7 +29,7 @@ class SG_EXPORT ArgumentParser { public: - class Parameter + class SG_EXPORT Parameter { public: enum ParameterType diff --git a/include/osg/ClusterCullingCallback b/include/osg/ClusterCullingCallback index 2b52377a1..9f8cee6c9 100644 --- a/include/osg/ClusterCullingCallback +++ b/include/osg/ClusterCullingCallback @@ -30,7 +30,7 @@ class SG_EXPORT ClusterCullingCallback : public Drawable::CullCallback ClusterCullingCallback(const osg::Vec3& controlPoint, const osg::Vec3& normal, float deviation); ClusterCullingCallback(const osg::Drawable* drawable); - META_Object(osg,ClusterCullingCallback) + META_Object(osg,ClusterCullingCallback); /** Computes the control point, normal, and deviation from the * given drawable contents. */ diff --git a/include/osg/Drawable b/include/osg/Drawable index f9ddd5309..6a430a23c 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -278,7 +278,7 @@ class SG_EXPORT Drawable : public Object UpdateCallback(const UpdateCallback&,const CopyOp&) {} - META_Object(osg,UpdateCallback) + META_Object(osg,UpdateCallback); /** do customized update code.*/ virtual void update(osg::NodeVisitor*, osg::Drawable*) {} @@ -300,7 +300,7 @@ class SG_EXPORT Drawable : public Object CullCallback(const CullCallback&,const CopyOp&) {} - META_Object(osg,CullCallback) + META_Object(osg,CullCallback); /** do customized cull code, return true if drawable should be culled.*/ virtual bool cull(osg::NodeVisitor*, osg::Drawable*, osg::State*) const { return false; } @@ -329,7 +329,7 @@ class SG_EXPORT Drawable : public Object DrawCallback(const DrawCallback&,const CopyOp&) {} - META_Object(osg,DrawCallback) + META_Object(osg,DrawCallback); /** do customized draw code.*/ virtual void drawImplementation(osg::State&,const osg::Drawable*) const {} diff --git a/include/osg/Endian b/include/osg/Endian index ec3652e3b..c02659abb 100644 --- a/include/osg/Endian +++ b/include/osg/Endian @@ -14,6 +14,8 @@ #ifndef OSG_ENDIAN #define OSG_ENDIAN 1 +#include + namespace osg { enum Endian diff --git a/include/osg/Geometry b/include/osg/Geometry index 04de57c3a..33fe649ae 100644 --- a/include/osg/Geometry +++ b/include/osg/Geometry @@ -53,7 +53,7 @@ class SG_EXPORT Geometry : public Drawable BIND_PER_VERTEX }; - struct ArrayData + struct SG_EXPORT ArrayData { ArrayData(): binding(BIND_OFF), @@ -95,7 +95,7 @@ class SG_EXPORT Geometry : public Drawable mutable unsigned int offset; }; - struct Vec3ArrayData + struct SG_EXPORT Vec3ArrayData { Vec3ArrayData(): binding(BIND_OFF), diff --git a/include/osg/NodeCallback b/include/osg/NodeCallback index 21d86d188..2a832cd41 100644 --- a/include/osg/NodeCallback +++ b/include/osg/NodeCallback @@ -33,7 +33,7 @@ class SG_EXPORT NodeCallback : public virtual Object { _nestedCallback(_nestedCallback) {} - META_Object(osg,NodeCallback) + META_Object(osg,NodeCallback); /** Callback method called by the NodeVisitor when visiting a node.*/ diff --git a/include/osg/PagedLOD b/include/osg/PagedLOD index b97097897..e7355452b 100644 --- a/include/osg/PagedLOD +++ b/include/osg/PagedLOD @@ -44,7 +44,7 @@ class SG_EXPORT PagedLOD : public LOD virtual bool removeChild(Node *child); - struct PerRangeData + struct SG_EXPORT PerRangeData { PerRangeData(); PerRangeData(const PerRangeData& prd); diff --git a/include/osg/PointSprite b/include/osg/PointSprite index b13e72a86..dfe877402 100644 --- a/include/osg/PointSprite +++ b/include/osg/PointSprite @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSG_POINT_SPRITE -#define OSG_POINT_SPRITE 1 +#ifndef OSG_POINTSPRITE +#define OSG_POINTSPRITE 1 #include #include diff --git a/include/osg/PositionAttitudeTransform b/include/osg/PositionAttitudeTransform index edf19cffc..0fb6aaded 100644 --- a/include/osg/PositionAttitudeTransform +++ b/include/osg/PositionAttitudeTransform @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSG_POSITIONATTITIDETRANSFORM -#define OSG_POSITIONATTITIDETRANSFORM 1 +#ifndef OSG_POSITIONATTITUDETRANSFORM +#define OSG_POSITIONATTITUDETRANSFORM 1 #include #include diff --git a/include/osg/PrimitiveSet b/include/osg/PrimitiveSet index 0d5a874b5..6869274d8 100644 --- a/include/osg/PrimitiveSet +++ b/include/osg/PrimitiveSet @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSG_PRIMTIVESET -#define OSG_PRIMTIVESET 1 +#ifndef OSG_PRIMITIVESET +#define OSG_PRIMITIVESET 1 #include diff --git a/include/osg/Shape b/include/osg/Shape index fcddfd310..077b03821 100644 --- a/include/osg/Shape +++ b/include/osg/Shape @@ -498,7 +498,7 @@ class SG_EXPORT HeightField : public Shape _borderWidth(mesh._borderWidth), _heights(mesh._heights) {} - META_Shape(osg, HeightField) + META_Shape(osg, HeightField); typedef std::vector HeightList; diff --git a/include/osg/TriangleIndexFunctor b/include/osg/TriangleIndexFunctor index df8db114c..33901fe29 100644 --- a/include/osg/TriangleIndexFunctor +++ b/include/osg/TriangleIndexFunctor @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSG_TRIANGLINDEXEFUNCTOR -#define OSG_TRIANGLINDEXEFUNCTOR 1 +#ifndef OSG_TRIANGLEINDEXFUNCTOR +#define OSG_TRIANGLEINDEXFUNCTOR 1 #include #include diff --git a/include/osg/Version b/include/osg/Version index 4dd47219d..3e6a164dc 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSG_VERSION_ -#define OSG_VERSION_ 1 +#ifndef OSG_VERSION +#define OSG_VERSION 1 #include diff --git a/include/osgDB/DynamicLibrary b/include/osgDB/DynamicLibrary index 0079155b9..c02488826 100644 --- a/include/osgDB/DynamicLibrary +++ b/include/osgDB/DynamicLibrary @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSG_DYNAMICLIBRARY -#define OSG_DYNAMICLIBRARY 1 +#ifndef OSGDB_DYNAMICLIBRARY +#define OSGDB_DYNAMICLIBRARY 1 #include #include diff --git a/include/osgDB/Version b/include/osgDB/Version index e11f253a1..49155ba03 100644 --- a/include/osgDB/Version +++ b/include/osgDB/Version @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSG_VERSION -#define OSG_VERSION 1 +#ifndef OSGDB_VERSION +#define OSGDB_VERSION 1 #include diff --git a/include/osgGA/GUIEventHandler b/include/osgGA/GUIEventHandler index 300942aab..aa6ebaa7b 100644 --- a/include/osgGA/GUIEventHandler +++ b/include/osgGA/GUIEventHandler @@ -56,7 +56,7 @@ public: GUIEventHandler() {} GUIEventHandler(const GUIEventHandler&,const osg::CopyOp&) {} - META_Object(osgGA,GUIEventHandler) + META_Object(osgGA,GUIEventHandler); /** Returns 0 if this GUIEventHandler is not a CompositeGUIEventHandler. */ diff --git a/include/osgGL2/UniformValue b/include/osgGL2/UniformValue index 5db64440c..0101207bb 100644 --- a/include/osgGL2/UniformValue +++ b/include/osgGL2/UniformValue @@ -43,7 +43,7 @@ namespace osgGL2 { * glProgramObjects during the next osgGL2::ProgramObject.apply(). */ -class UniformValue : public osg::Referenced +class OSGGL2_EXPORT UniformValue : public osg::Referenced { public: virtual void apply( Extensions *ext, const GLhandleARB progObj ) const = 0; diff --git a/include/osgSim/LightPointSystem b/include/osgSim/LightPointSystem index ac680c548..32c2b499c 100644 --- a/include/osgSim/LightPointSystem +++ b/include/osgSim/LightPointSystem @@ -37,7 +37,7 @@ class LightPointSystem : public osg::Object osg::Object( lps, copyop ), _intensity( lps._intensity ), _animationState( lps._animationState ) { } - META_Object( osgSim, LightPointSystem ) + META_Object( osgSim, LightPointSystem ); typedef enum { ANIMATION_ON, diff --git a/include/osgSim/Sector b/include/osgSim/Sector index c398ea7b3..ca2c9d82a 100644 --- a/include/osgSim/Sector +++ b/include/osgSim/Sector @@ -137,7 +137,7 @@ class OSGSIM_EXPORT AzimSector : public Sector, public AzimRange AzimSector(float minAzimuth,float maxAzimuth,float fadeAngle=0.0f); - META_Object(osgSim,AzimSector) + META_Object(osgSim,AzimSector); virtual float operator() (const osg::Vec3& eyeLocal) const; @@ -162,7 +162,7 @@ class OSGSIM_EXPORT ElevationSector : public Sector, public ElevationRange ElevationSector(float minElevation,float maxElevation,float fadeAngle=0.0f); - META_Object(osgSim,ElevationSector) + META_Object(osgSim,ElevationSector); virtual float operator() (const osg::Vec3& eyeLocal) const; @@ -193,7 +193,7 @@ class OSGSIM_EXPORT AzimElevationSector : public Sector, public AzimRange, publi AzimElevationSector(float minAzimuth,float maxAzimuth,float minElevation,float maxElevation,float fadeAngle=0.0f); - META_Object(osgSim,AzimElevationSector) + META_Object(osgSim,AzimElevationSector); virtual float operator() (const osg::Vec3& eyeLocal) const; @@ -221,7 +221,7 @@ class OSGSIM_EXPORT ConeSector : public Sector ConeSector(const osg::Vec3& axis,float angle,float fadeangle=0.0f); - META_Object(osgSim,ConeSector) + META_Object(osgSim,ConeSector); void setAxis(const osg::Vec3& axis); @@ -275,7 +275,7 @@ class OSGSIM_EXPORT DirectionalSector : public Sector DirectionalSector(const osg::Vec3& direction,float horizLobeAngle, float vertLobeAngle, float lobeRollAngle, float fadeAngle=0.0f); - META_Object(osgSim,DirectionalSector) + META_Object(osgSim,DirectionalSector); void setDirection(const osg::Vec3& direction); diff --git a/include/osgSim/SphereSegment b/include/osgSim/SphereSegment index 4771f62e8..7804f6e4b 100644 --- a/include/osgSim/SphereSegment +++ b/include/osgSim/SphereSegment @@ -225,7 +225,7 @@ public: /** Set color of all components. */ void setAllColors(const osg::Vec4& c); - META_Node(osgSim, SphereSegment) + META_Node(osgSim, SphereSegment); private: diff --git a/include/osgSim/VisibilityGroup b/include/osgSim/VisibilityGroup index fa57dded8..2bac85438 100644 --- a/include/osgSim/VisibilityGroup +++ b/include/osgSim/VisibilityGroup @@ -31,7 +31,7 @@ class OSGSIM_EXPORT VisibilityGroup : public osg::Group /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ VisibilityGroup(const VisibilityGroup&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - META_Node(osgSim, VisibilityGroup) + META_Node(osgSim, VisibilityGroup); virtual void traverse(osg::NodeVisitor& nv); diff --git a/include/osgText/Font b/include/osgText/Font index e06c2def2..dc4dbf1fc 100644 --- a/include/osgText/Font +++ b/include/osgText/Font @@ -228,7 +228,6 @@ public: public: Glyph(); - virtual ~Glyph(); unsigned int getGlyphCode() const; @@ -268,6 +267,8 @@ public: protected: + virtual ~Glyph(); + Font* _font; unsigned int _glyphCode; diff --git a/include/osgUtil/Simplifier b/include/osgUtil/Simplifier index 6494a1dde..a835ed745 100644 --- a/include/osgUtil/Simplifier +++ b/include/osgUtil/Simplifier @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSGUTIL_SIMPLIYFIER -#define OSGUTIL_SIMPLIYFIER 1 +#ifndef OSGUTIL_SIMPLIFIER +#define OSGUTIL_SIMPLIFIER 1 #include #include