From d268cf46faf8de3879184c89b557ba8590037da4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 11 Apr 2005 17:14:17 +0000 Subject: [PATCH] Renamed SG_LIBRARY and SG_EXPORT macro's to OSG_LIBRARY and OSG_EXPORT --- VisualStudio/osg/osg.dsp | 4 ++-- include/osg/AlphaFunc | 2 +- include/osg/AnimationPath | 4 ++-- include/osg/ApplicationUsage | 2 +- include/osg/ArgumentParser | 4 ++-- include/osg/Array | 4 ++-- include/osg/AutoTransform | 2 +- include/osg/Billboard | 2 +- include/osg/BlendColor | 4 ++-- include/osg/BlendEquation | 4 ++-- include/osg/BlendFunc | 2 +- include/osg/BoundingBox | 2 +- include/osg/BoundingSphere | 2 +- include/osg/BufferObject | 6 +++--- include/osg/ClearNode | 2 +- include/osg/ClipNode | 2 +- include/osg/ClipPlane | 2 +- include/osg/ClusterCullingCallback | 2 +- include/osg/CollectOccludersVisitor | 2 +- include/osg/ColorMask | 2 +- include/osg/ColorMatrix | 2 +- include/osg/ConvexPlanarOccluder | 2 +- include/osg/ConvexPlanarPolygon | 2 +- include/osg/CoordinateSystemNode | 2 +- include/osg/CopyOp | 2 +- include/osg/CullFace | 2 +- include/osg/CullSettings | 2 +- include/osg/CullStack | 2 +- include/osg/CullingSet | 2 +- include/osg/Depth | 2 +- include/osg/DisplaySettings | 2 +- include/osg/DrawPixels | 2 +- include/osg/Drawable | 4 ++-- include/osg/Export | 12 +++++------ include/osg/Fog | 2 +- include/osg/FragmentProgram | 4 ++-- include/osg/FrameStamp | 2 +- include/osg/FrontFace | 2 +- include/osg/GLExtensions | 8 ++++---- include/osg/Geode | 2 +- include/osg/Geometry | 8 ++++---- include/osg/Group | 2 +- include/osg/Image | 6 +++--- include/osg/ImageStream | 2 +- include/osg/Impostor | 2 +- include/osg/ImpostorSprite | 4 ++-- include/osg/LOD | 2 +- include/osg/Light | 2 +- include/osg/LightModel | 2 +- include/osg/LightSource | 2 +- include/osg/LineSegment | 2 +- include/osg/LineStipple | 2 +- include/osg/LineWidth | 2 +- include/osg/LogicOp | 2 +- include/osg/Material | 2 +- include/osg/MatrixTransform | 2 +- include/osg/Matrixd | 2 +- include/osg/Matrixf | 2 +- include/osg/Multisample | 4 ++-- include/osg/Node | 2 +- include/osg/NodeCallback | 2 +- include/osg/NodeVisitor | 2 +- include/osg/Notify | 8 ++++---- include/osg/Object | 2 +- include/osg/OccluderNode | 2 +- include/osg/PagedLOD | 4 ++-- include/osg/Plane | 2 +- include/osg/Point | 2 +- include/osg/PointSprite | 2 +- include/osg/PolygonMode | 2 +- include/osg/PolygonOffset | 2 +- include/osg/PolygonStipple | 2 +- include/osg/Polytope | 2 +- include/osg/PositionAttitudeTransform | 2 +- include/osg/PrimitiveSet | 10 +++++----- include/osg/Program | 4 ++-- include/osg/Projection | 2 +- include/osg/ProxyNode | 2 +- include/osg/Quat | 2 +- include/osg/Referenced | 5 +++-- include/osg/Sequence | 2 +- include/osg/ShadeModel | 2 +- include/osg/Shader | 2 +- include/osg/ShadowVolumeOccluder | 2 +- include/osg/Shape | 4 ++-- include/osg/ShapeDrawable | 2 +- include/osg/State | 2 +- include/osg/StateAttribute | 2 +- include/osg/StateSet | 2 +- include/osg/Stencil | 2 +- include/osg/Switch | 2 +- include/osg/TexEnv | 2 +- include/osg/TexEnvCombine | 2 +- include/osg/TexEnvFilter | 2 +- include/osg/TexGen | 2 +- include/osg/TexGenNode | 2 +- include/osg/TexMat | 2 +- include/osg/Texture | 4 ++-- include/osg/Texture1D | 4 ++-- include/osg/Texture2D | 4 ++-- include/osg/Texture3D | 6 +++--- include/osg/TextureCubeMap | 6 +++--- include/osg/TextureRectangle | 2 +- include/osg/Timer | 2 +- include/osg/Transform | 10 +++++----- include/osg/Uniform | 2 +- include/osg/UnitTestFramework | 20 +++++++++---------- include/osg/Version | 4 ++-- include/osg/VertexProgram | 4 ++-- include/osg/Viewport | 2 +- src/osg/GNUmakefile | 2 +- src/osg/Texture.cpp | 2 +- src/osgPlugins/mpeg/MpegImageStream.h | 2 +- .../quicktime/QuicktimeImageStream.h | 2 +- 114 files changed, 173 insertions(+), 172 deletions(-) diff --git a/VisualStudio/osg/osg.dsp b/VisualStudio/osg/osg.dsp index 682eb94fd..f08e23787 100755 --- a/VisualStudio/osg/osg.dsp +++ b/VisualStudio/osg/osg.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SG_LIBRARY" /YX /FD /Zm200 /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSG_LIBRARY" /YX /FD /Zm200 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_WINDOWS" /D "SG_LIBRARY" /D "WIN32" /D "_DEBUG" /YX /FD /GZ /Zm200 /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /vd0 /GR /GX /Zi /Od /I "../../include" /I "../../../OpenThreads/include" /I "../../../Producer/include" /I "../../../3rdParty/include" /D "_WINDOWS" /D "OSG_LIBRARY" /D "WIN32" /D "_DEBUG" /YX /FD /GZ /Zm200 /c # SUBTRACT CPP /X # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 diff --git a/include/osg/AlphaFunc b/include/osg/AlphaFunc index 00b862f74..8352ff6c6 100644 --- a/include/osg/AlphaFunc +++ b/include/osg/AlphaFunc @@ -20,7 +20,7 @@ namespace osg { /** Encapsulates OpenGL glAlphaFunc. */ -class SG_EXPORT AlphaFunc : public StateAttribute +class OSG_EXPORT AlphaFunc : public StateAttribute { public : diff --git a/include/osg/AnimationPath b/include/osg/AnimationPath index eb777369f..fce9afa7a 100644 --- a/include/osg/AnimationPath +++ b/include/osg/AnimationPath @@ -30,7 +30,7 @@ namespace osg { * AnimationPathCallback can be attached directly to Transform nodes to * move subgraphs around the scene. */ -class SG_EXPORT AnimationPath : public virtual osg::Object +class OSG_EXPORT AnimationPath : public virtual osg::Object { public: @@ -201,7 +201,7 @@ class SG_EXPORT AnimationPath : public virtual osg::Object }; -class SG_EXPORT AnimationPathCallback : public NodeCallback +class OSG_EXPORT AnimationPathCallback : public NodeCallback { public: diff --git a/include/osg/ApplicationUsage b/include/osg/ApplicationUsage index 1bea7882f..e0fbc5eae 100644 --- a/include/osg/ApplicationUsage +++ b/include/osg/ApplicationUsage @@ -22,7 +22,7 @@ namespace osg { -class SG_EXPORT ApplicationUsage +class OSG_EXPORT ApplicationUsage { public: diff --git a/include/osg/ArgumentParser b/include/osg/ArgumentParser index 00ab776de..f73258f65 100644 --- a/include/osg/ArgumentParser +++ b/include/osg/ArgumentParser @@ -25,11 +25,11 @@ namespace osg { // forward declare class ApplicationUsage; -class SG_EXPORT ArgumentParser +class OSG_EXPORT ArgumentParser { public: - class SG_EXPORT Parameter + class OSG_EXPORT Parameter { public: enum ParameterType diff --git a/include/osg/Array b/include/osg/Array index e3c433287..ffff3c1a8 100644 --- a/include/osg/Array +++ b/include/osg/Array @@ -32,7 +32,7 @@ class ConstArrayVisitor; class ValueVisitor; class ConstValueVisitor; -class SG_EXPORT Array : public Object +class OSG_EXPORT Array : public Object { public: @@ -164,7 +164,7 @@ class TemplateArray : public Array, public std::vector virtual ~TemplateArray() {} }; -class SG_EXPORT IndexArray : public Array +class OSG_EXPORT IndexArray : public Array { public: diff --git a/include/osg/AutoTransform b/include/osg/AutoTransform index 7dfd62d59..0f75cbcb2 100644 --- a/include/osg/AutoTransform +++ b/include/osg/AutoTransform @@ -23,7 +23,7 @@ namespace osg { /** AutoTransform is a derived form of Transform that automatically * scales or rotates to keep its children aligned with screen coordinates. */ -class SG_EXPORT AutoTransform : public Transform +class OSG_EXPORT AutoTransform : public Transform { public : AutoTransform(); diff --git a/include/osg/Billboard b/include/osg/Billboard index 61036f795..0eaf989c1 100644 --- a/include/osg/Billboard +++ b/include/osg/Billboard @@ -23,7 +23,7 @@ namespace osg { * children to face the eye point. Typical uses incllude trees and * particle explosions, */ -class SG_EXPORT Billboard : public Geode +class OSG_EXPORT Billboard : public Geode { public: diff --git a/include/osg/BlendColor b/include/osg/BlendColor index 45e79cd1e..ca76af767 100644 --- a/include/osg/BlendColor +++ b/include/osg/BlendColor @@ -24,7 +24,7 @@ namespace osg { /** Encapsulates OpenGL blend/transparency state. */ -class SG_EXPORT BlendColor : public StateAttribute +class OSG_EXPORT BlendColor : public StateAttribute { public : @@ -67,7 +67,7 @@ class SG_EXPORT BlendColor : public StateAttribute /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convinience wrappers for * calling extension functions. */ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); diff --git a/include/osg/BlendEquation b/include/osg/BlendEquation index e111e8d44..9bf2e2f4f 100644 --- a/include/osg/BlendEquation +++ b/include/osg/BlendEquation @@ -37,7 +37,7 @@ namespace osg { /** Encapsulates OpenGL BlendEquation state. */ -class SG_EXPORT BlendEquation : public StateAttribute +class OSG_EXPORT BlendEquation : public StateAttribute { public : @@ -94,7 +94,7 @@ class SG_EXPORT BlendEquation : public StateAttribute /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convinience wrappers for * calling extension functions. */ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); diff --git a/include/osg/BlendFunc b/include/osg/BlendFunc index 05ed879bb..fee8f9831 100644 --- a/include/osg/BlendFunc +++ b/include/osg/BlendFunc @@ -30,7 +30,7 @@ namespace osg { /** Encapsulates OpenGL blend/transparency state. */ -class SG_EXPORT BlendFunc : public StateAttribute +class OSG_EXPORT BlendFunc : public StateAttribute { public : diff --git a/include/osg/BoundingBox b/include/osg/BoundingBox index 2ca88b6c7..f535b451f 100644 --- a/include/osg/BoundingBox +++ b/include/osg/BoundingBox @@ -26,7 +26,7 @@ class BoundingSphere; * Bounds leaf objects in a scene such as osg::Drawable objects. Used for frustum * culling etc. */ -class SG_EXPORT BoundingBox +class OSG_EXPORT BoundingBox { public: diff --git a/include/osg/BoundingSphere b/include/osg/BoundingSphere index c2f47c0a5..335b78e6e 100644 --- a/include/osg/BoundingSphere +++ b/include/osg/BoundingSphere @@ -27,7 +27,7 @@ class BoundingBox; * culling but generally will not cull as aggressively because it encloses a * greater volume. */ -class SG_EXPORT BoundingSphere +class OSG_EXPORT BoundingSphere { public: diff --git a/include/osg/BufferObject b/include/osg/BufferObject index 79ba92f00..c1d6578e4 100644 --- a/include/osg/BufferObject +++ b/include/osg/BufferObject @@ -80,7 +80,7 @@ namespace osg class State; -class SG_EXPORT BufferObject : public Object +class OSG_EXPORT BufferObject : public Object { public: @@ -141,7 +141,7 @@ class SG_EXPORT BufferObject : public Object /** Extensions class which encapsulates the querying of extensions and * associated function pointers, and provide convenience wrappers to * check for the extensions or use the associated functions.*/ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); @@ -226,7 +226,7 @@ class SG_EXPORT BufferObject : public Object }; class Image; -class SG_EXPORT PixelBufferObject : public BufferObject +class OSG_EXPORT PixelBufferObject : public BufferObject { public: diff --git a/include/osg/ClearNode b/include/osg/ClearNode index 8315f7161..b3e12365d 100644 --- a/include/osg/ClearNode +++ b/include/osg/ClearNode @@ -27,7 +27,7 @@ namespace osg { * children in render bin -1 to ensure that children are rendered prior to * the rest of the scene graph. */ -class SG_EXPORT ClearNode : public Group +class OSG_EXPORT ClearNode : public Group { public : diff --git a/include/osg/ClipNode b/include/osg/ClipNode index e214c98da..aace896a3 100644 --- a/include/osg/ClipNode +++ b/include/osg/ClipNode @@ -20,7 +20,7 @@ namespace osg { /** Node for defining the position of ClipPlanes in the scene.*/ -class SG_EXPORT ClipNode : public Group +class OSG_EXPORT ClipNode : public Group { public: diff --git a/include/osg/ClipPlane b/include/osg/ClipPlane index 4db9f54e6..9f390b3c3 100644 --- a/include/osg/ClipPlane +++ b/include/osg/ClipPlane @@ -22,7 +22,7 @@ namespace osg { /** Encapsulates OpenGL glClipPlane(). */ -class SG_EXPORT ClipPlane : public StateAttribute +class OSG_EXPORT ClipPlane : public StateAttribute { public : diff --git a/include/osg/ClusterCullingCallback b/include/osg/ClusterCullingCallback index a5e64ca8d..51f68bd9e 100644 --- a/include/osg/ClusterCullingCallback +++ b/include/osg/ClusterCullingCallback @@ -22,7 +22,7 @@ namespace osg { /** Implements cluster culling to cull back facing drawables. Derived from * Drawable::CullCallback. */ -class SG_EXPORT ClusterCullingCallback : public Drawable::CullCallback, public NodeCallback +class OSG_EXPORT ClusterCullingCallback : public Drawable::CullCallback, public NodeCallback { public: diff --git a/include/osg/CollectOccludersVisitor b/include/osg/CollectOccludersVisitor index ecefd9eb1..f50eb42d8 100644 --- a/include/osg/CollectOccludersVisitor +++ b/include/osg/CollectOccludersVisitor @@ -21,7 +21,7 @@ namespace osg { -class SG_EXPORT CollectOccludersVisitor : public osg::NodeVisitor, public osg::CullStack +class OSG_EXPORT CollectOccludersVisitor : public osg::NodeVisitor, public osg::CullStack { public: diff --git a/include/osg/ColorMask b/include/osg/ColorMask index 1f1ec88b1..b3c474fae 100644 --- a/include/osg/ColorMask +++ b/include/osg/ColorMask @@ -21,7 +21,7 @@ namespace osg { /** Encapsulates OpenGL glColorMaskFunc/Op/Mask functions. */ -class SG_EXPORT ColorMask : public StateAttribute +class OSG_EXPORT ColorMask : public StateAttribute { public : diff --git a/include/osg/ColorMatrix b/include/osg/ColorMatrix index c5b9e5bb7..e2f764788 100644 --- a/include/osg/ColorMatrix +++ b/include/osg/ColorMatrix @@ -20,7 +20,7 @@ namespace osg { /** Encapsulates OpenGL color matrix functionality. */ -class SG_EXPORT ColorMatrix : public StateAttribute +class OSG_EXPORT ColorMatrix : public StateAttribute { public : diff --git a/include/osg/ConvexPlanarOccluder b/include/osg/ConvexPlanarOccluder index f0db47fb3..6f4049017 100644 --- a/include/osg/ConvexPlanarOccluder +++ b/include/osg/ConvexPlanarOccluder @@ -23,7 +23,7 @@ class OccluderVolume; /** A class for representing convex clipping volumes made up of several ConvexPlanarPolygon. * When adding polygons, their normals should point inwards (into the volume) */ -class SG_EXPORT ConvexPlanarOccluder : public Object +class OSG_EXPORT ConvexPlanarOccluder : public Object { public: diff --git a/include/osg/ConvexPlanarPolygon b/include/osg/ConvexPlanarPolygon index dc0a56d25..3618246d7 100644 --- a/include/osg/ConvexPlanarPolygon +++ b/include/osg/ConvexPlanarPolygon @@ -25,7 +25,7 @@ class BoundingSphere; /** A class for representing components of convex clipping volumes. * ConvexPlanarPolygon normals should point inwards (into the volume) */ -class SG_EXPORT ConvexPlanarPolygon +class OSG_EXPORT ConvexPlanarPolygon { public: diff --git a/include/osg/CoordinateSystemNode b/include/osg/CoordinateSystemNode index b0e1aaac9..ee4f474f3 100644 --- a/include/osg/CoordinateSystemNode +++ b/include/osg/CoordinateSystemNode @@ -80,7 +80,7 @@ typedef Matrixd CoordinateFrame; /** CoordinateSystem encapsulate the coordinate system that is associated with objects in a scene. For an overview of common earth bases coordinate systems see http://www.colorado.edu/geography/gcraft/notes/coordsys/coordsys_f.html */ -class SG_EXPORT CoordinateSystemNode : public Group +class OSG_EXPORT CoordinateSystemNode : public Group { public: diff --git a/include/osg/CopyOp b/include/osg/CopyOp index b104b7fc0..a7de484f0 100644 --- a/include/osg/CopyOp +++ b/include/osg/CopyOp @@ -33,7 +33,7 @@ class Shape; /** Copy Op(erator) used to control whether shallow or deep copy is used * during copy construction and clone operation.*/ -class SG_EXPORT CopyOp +class OSG_EXPORT CopyOp { public: diff --git a/include/osg/CullFace b/include/osg/CullFace index 968194ac2..d36fca3a6 100644 --- a/include/osg/CullFace +++ b/include/osg/CullFace @@ -21,7 +21,7 @@ namespace osg { /** Class to globally enable/disable OpenGL's polygon culling mode. */ -class SG_EXPORT CullFace : public StateAttribute +class OSG_EXPORT CullFace : public StateAttribute { public : diff --git a/include/osg/CullSettings b/include/osg/CullSettings index 10c4e9445..7a8a1fa4e 100644 --- a/include/osg/CullSettings +++ b/include/osg/CullSettings @@ -23,7 +23,7 @@ namespace osg { class ArgumentParser; class ApplicationUsage; -class SG_EXPORT CullSettings +class OSG_EXPORT CullSettings { public: diff --git a/include/osg/CullStack b/include/osg/CullStack index 8b55b7c7c..e510b1104 100644 --- a/include/osg/CullStack +++ b/include/osg/CullStack @@ -23,7 +23,7 @@ namespace osg { /** A CullStack class which accumulates the current project, modelview matrices and the CullingSet. */ -class SG_EXPORT CullStack : public osg::CullSettings +class OSG_EXPORT CullStack : public osg::CullSettings { public: diff --git a/include/osg/CullingSet b/include/osg/CullingSet index d8f0fedca..eff9aeee1 100644 --- a/include/osg/CullingSet +++ b/include/osg/CullingSet @@ -24,7 +24,7 @@ namespace osg { #define COMPILE_WITH_SHADOW_OCCLUSION_CULLING /** A CullingSet class which contains a frustum and a list of occluders. */ -class SG_EXPORT CullingSet : public Referenced +class OSG_EXPORT CullingSet : public Referenced { public: diff --git a/include/osg/Depth b/include/osg/Depth index 5304416fa..29b5b2510 100644 --- a/include/osg/Depth +++ b/include/osg/Depth @@ -20,7 +20,7 @@ namespace osg { /** Encapsulate OpenGL glDepthFunc/Mask/Range functions. */ -class SG_EXPORT Depth : public StateAttribute +class OSG_EXPORT Depth : public StateAttribute { public : diff --git a/include/osg/DisplaySettings b/include/osg/DisplaySettings index a1a1f76db..7d3c4b96a 100644 --- a/include/osg/DisplaySettings +++ b/include/osg/DisplaySettings @@ -27,7 +27,7 @@ class ApplicationUsage; /** DisplaySettings class for encapsulating what visuals are required and * have been set up, and the status of stereo viewing.*/ -class SG_EXPORT DisplaySettings : public osg::Referenced +class OSG_EXPORT DisplaySettings : public osg::Referenced { public: diff --git a/include/osg/DrawPixels b/include/osg/DrawPixels index 110d95ea1..3846f42b7 100644 --- a/include/osg/DrawPixels +++ b/include/osg/DrawPixels @@ -22,7 +22,7 @@ namespace osg { /** DrawPixels is an osg::Drawable subclass which encapsulates the drawing of * images using glDrawPixels.*/ -class SG_EXPORT DrawPixels : public Drawable +class OSG_EXPORT DrawPixels : public Drawable { public: diff --git a/include/osg/Drawable b/include/osg/Drawable index e4e2cde70..1e793cc7e 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -78,7 +78,7 @@ class NodeVisitor; * Geodes, so that the same geometry (loaded to memory just once) can * be used in different parts of the scene graph. */ -class SG_EXPORT Drawable : public Object +class OSG_EXPORT Drawable : public Object { public: @@ -489,7 +489,7 @@ class SG_EXPORT Drawable : public Object /** Extensions class which encapsulates the querying of extensions and * associated function pointers, and provide convenience wrappers to * check for the extensions or use the associated functions.*/ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); diff --git a/include/osg/Export b/include/osg/Export index 6d1bb1422..9ee626c83 100644 --- a/include/osg/Export +++ b/include/osg/Export @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSG_EXPORT -#define OSG_EXPORT 1 +#ifndef OSG_EXPORT_ +#define OSG_EXPORT_ 1 // define USE_DEPRECATED_API is used to include in API which is being fazed out // if you can compile your apps with this turned off you are @@ -30,13 +30,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef SG_LIBRARY - # define SG_EXPORT __declspec(dllexport) + # ifdef OSG_LIBRARY + # define OSG_EXPORT __declspec(dllexport) # else - # define SG_EXPORT __declspec(dllimport) + # define OSG_EXPORT __declspec(dllimport) # endif /* SG_LIBRARY */ #else - # define SG_EXPORT + # define OSG_EXPORT #endif // set up define for whether member templates are supported by VisualStudio compilers. diff --git a/include/osg/Fog b/include/osg/Fog index a718fe211..6c5253f9d 100644 --- a/include/osg/Fog +++ b/include/osg/Fog @@ -28,7 +28,7 @@ namespace osg { /** Fog - encapsulates OpenGL fog state. */ -class SG_EXPORT Fog : public StateAttribute +class OSG_EXPORT Fog : public StateAttribute { public : diff --git a/include/osg/FragmentProgram b/include/osg/FragmentProgram index f5e6a4e5a..dbb491192 100644 --- a/include/osg/FragmentProgram +++ b/include/osg/FragmentProgram @@ -112,7 +112,7 @@ namespace osg { /** FragmentProgram - encapsulates the OpenGL ARB fragment program state.*/ -class SG_EXPORT FragmentProgram : public StateAttribute +class OSG_EXPORT FragmentProgram : public StateAttribute { public: @@ -228,7 +228,7 @@ class SG_EXPORT FragmentProgram : public StateAttribute /** Extensions class which encapsulates the querying of extensions and * associated function pointers, and provide convenience wrappers to * check for the extensions or use the associated functions.*/ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); diff --git a/include/osg/FrameStamp b/include/osg/FrameStamp index 8a21fedaf..5f01a88fa 100644 --- a/include/osg/FrameStamp +++ b/include/osg/FrameStamp @@ -31,7 +31,7 @@ namespace osg * and other machines when using a graphics cluster. Note the calendar * time can be an artificial simulation time or capture the real time * of day etc.*/ -class SG_EXPORT FrameStamp : public Referenced +class OSG_EXPORT FrameStamp : public Referenced { public: diff --git a/include/osg/FrontFace b/include/osg/FrontFace index ba2c1b739..97127ed04 100644 --- a/include/osg/FrontFace +++ b/include/osg/FrontFace @@ -21,7 +21,7 @@ namespace osg { /** Class to specify the orientation of front-facing polygons. */ -class SG_EXPORT FrontFace : public StateAttribute +class OSG_EXPORT FrontFace : public StateAttribute { public : diff --git a/include/osg/GLExtensions b/include/osg/GLExtensions index 630ce2090..bed423f75 100644 --- a/include/osg/GLExtensions +++ b/include/osg/GLExtensions @@ -37,7 +37,7 @@ namespace osg { * Note: Must only be called within a valid OpenGL context, * undefined behavior may occur otherwise. */ -extern SG_EXPORT bool isGLExtensionSupported(const char *extension); +extern OSG_EXPORT bool isGLExtensionSupported(const char *extension); /** Return the address of the specified OpenGL function. * Return NULL if function not supported by OpenGL library. @@ -88,10 +88,10 @@ inline void* getGLExtensionFuncPtr(const char *funcName) * The default setting of GLExtensionDisableString is obtained from the OSG_GL_EXTENSION_DISABLE * environmental variable. */ -extern SG_EXPORT void setGLExtensionDisableString(const std::string& disableString); +extern OSG_EXPORT void setGLExtensionDisableString(const std::string& disableString); /** Get the list of extensions that are disabled for various OpenGL renderers. */ -extern SG_EXPORT std::string& getGLExtensionDisableString(); +extern OSG_EXPORT std::string& getGLExtensionDisableString(); @@ -111,7 +111,7 @@ inline void* getGLExtensionFuncPtr(const char *funcName,const char *fallbackFunc * Note: Must only be called within a valid OpenGL context, * undefined behavior may occur otherwise. */ -extern SG_EXPORT bool isGLUExtensionSupported(const char *extension); +extern OSG_EXPORT bool isGLUExtensionSupported(const char *extension); } diff --git a/include/osg/Geode b/include/osg/Geode index 89dc81fa2..391a78e74 100644 --- a/include/osg/Geode +++ b/include/osg/Geode @@ -25,7 +25,7 @@ namespace osg { * are represented by objects from the \c Drawable class, so a \c Geode is a * \c Node whose purpose is grouping Drawables. */ -class SG_EXPORT Geode : public Node +class OSG_EXPORT Geode : public Node { public: diff --git a/include/osg/Geometry b/include/osg/Geometry index 2db726100..5ad328ea7 100644 --- a/include/osg/Geometry +++ b/include/osg/Geometry @@ -24,7 +24,7 @@ namespace osg { -class SG_EXPORT Geometry : public Drawable +class OSG_EXPORT Geometry : public Drawable { public: @@ -53,7 +53,7 @@ class SG_EXPORT Geometry : public Drawable BIND_PER_VERTEX }; - struct SG_EXPORT ArrayData + struct OSG_EXPORT ArrayData { ArrayData(): binding(BIND_OFF), @@ -95,7 +95,7 @@ class SG_EXPORT Geometry : public Drawable mutable unsigned int offset; }; - struct SG_EXPORT Vec3ArrayData + struct OSG_EXPORT Vec3ArrayData { Vec3ArrayData(): binding(BIND_OFF), @@ -396,7 +396,7 @@ class SG_EXPORT Geometry : public Drawable /** Convenience function to be used for creating quad geometry with texture coords. * Tex coords go from left bottom (l,b) to right top (r,t). */ -extern SG_EXPORT Geometry* createTexturedQuadGeometry(const Vec3& corner,const Vec3& widthVec,const Vec3& heightVec, float l, float b, float r, float t); +extern OSG_EXPORT Geometry* createTexturedQuadGeometry(const Vec3& corner,const Vec3& widthVec,const Vec3& heightVec, float l, float b, float r, float t); /** Convenience function to be used for creating quad geometry with texture coords. * Tex coords go from bottom left (0,0) to top right (s,t). diff --git a/include/osg/Group b/include/osg/Group index d88058084..cf5fb7743 100644 --- a/include/osg/Group +++ b/include/osg/Group @@ -25,7 +25,7 @@ typedef std::vector< ref_ptr > NodeList; * Children are reference counted. This allows children to be shared * with memory management handled automatically via osg::Referenced. */ -class SG_EXPORT Group : public Node +class OSG_EXPORT Group : public Node { public : diff --git a/include/osg/Image b/include/osg/Image index 5aeea2814..61b811aa3 100644 --- a/include/osg/Image +++ b/include/osg/Image @@ -49,7 +49,7 @@ namespace osg { /** Image class for encapsulating the storage texture image data. */ -class SG_EXPORT Image : public Object +class OSG_EXPORT Image : public Object { public : @@ -296,12 +296,12 @@ class Geode; * to return for readNode(). * Use the image's s and t values to scale the dimensions of the image. */ -extern SG_EXPORT Geode* createGeodeForImage(Image* image); +extern OSG_EXPORT Geode* createGeodeForImage(Image* image); /** Convenience function to be used by image loaders to generate a valid geode * to return for readNode(). * Use the specified s and t values to scale the dimensions of the image. */ -extern SG_EXPORT Geode* createGeodeForImage(Image* image,float s,float t); +extern OSG_EXPORT Geode* createGeodeForImage(Image* image,float s,float t); } diff --git a/include/osg/ImageStream b/include/osg/ImageStream index 5f6f396eb..336950e1d 100644 --- a/include/osg/ImageStream +++ b/include/osg/ImageStream @@ -21,7 +21,7 @@ namespace osg { /** * Image Stream class. */ -class SG_EXPORT ImageStream : public Image +class OSG_EXPORT ImageStream : public Image { public: ImageStream(); diff --git a/include/osg/Impostor b/include/osg/Impostor index 5f17ba50d..b298591cb 100644 --- a/include/osg/Impostor +++ b/include/osg/Impostor @@ -58,7 +58,7 @@ namespace osg { * 4) Shrinking of the ImpostorSprite size to more closely fit the underlying * geometry. */ -class SG_EXPORT Impostor : public LOD +class OSG_EXPORT Impostor : public LOD { public : Impostor(); diff --git a/include/osg/ImpostorSprite b/include/osg/ImpostorSprite index ab38f49e1..f6edb9160 100644 --- a/include/osg/ImpostorSprite +++ b/include/osg/ImpostorSprite @@ -33,7 +33,7 @@ class ImpostorSpriteManager; * automatically generated by the osgUtil::CullVisitor so it not * necessary to deal with it directly. */ -class SG_EXPORT ImpostorSprite : public Drawable +class OSG_EXPORT ImpostorSprite : public Drawable { public: @@ -182,7 +182,7 @@ class SG_EXPORT ImpostorSprite : public Drawable }; /** Helper class for managing the reuse of ImpostorSprite resources. */ -class SG_EXPORT ImpostorSpriteManager : public Referenced +class OSG_EXPORT ImpostorSpriteManager : public Referenced { public: diff --git a/include/osg/LOD b/include/osg/LOD index 97d50c732..abff8d44a 100644 --- a/include/osg/LOD +++ b/include/osg/LOD @@ -32,7 +32,7 @@ namespace osg { is insufficient then the children m through to n will be ignored, only 0..m-1 will be used during rendering. */ -class SG_EXPORT LOD : public Group +class OSG_EXPORT LOD : public Group { public : diff --git a/include/osg/Light b/include/osg/Light index e64fe6cd2..1e26db211 100644 --- a/include/osg/Light +++ b/include/osg/Light @@ -21,7 +21,7 @@ namespace osg { /** Light state class which encapsulates OpenGL glLight() functionality. */ -class SG_EXPORT Light : public StateAttribute +class OSG_EXPORT Light : public StateAttribute { public : diff --git a/include/osg/LightModel b/include/osg/LightModel index 06b9ce2eb..4b019d7f4 100644 --- a/include/osg/LightModel +++ b/include/osg/LightModel @@ -19,7 +19,7 @@ namespace osg { -class SG_EXPORT LightModel : public StateAttribute +class OSG_EXPORT LightModel : public StateAttribute { public : diff --git a/include/osg/LightSource b/include/osg/LightSource index cafa90c25..c7164d56f 100644 --- a/include/osg/LightSource +++ b/include/osg/LightSource @@ -21,7 +21,7 @@ namespace osg { /** Leaf Node for defining a light in the scene. */ -class SG_EXPORT LightSource : public Group +class OSG_EXPORT LightSource : public Group { public: diff --git a/include/osg/LineSegment b/include/osg/LineSegment index 60ae6ad3a..800922fb4 100644 --- a/include/osg/LineSegment +++ b/include/osg/LineSegment @@ -21,7 +21,7 @@ namespace osg { /** LineSegment class for representing a line segment. */ -class SG_EXPORT LineSegment : public Referenced +class OSG_EXPORT LineSegment : public Referenced { public: diff --git a/include/osg/LineStipple b/include/osg/LineStipple index 469e2d693..25e29413c 100644 --- a/include/osg/LineStipple +++ b/include/osg/LineStipple @@ -18,7 +18,7 @@ namespace osg { -class SG_EXPORT LineStipple : public StateAttribute +class OSG_EXPORT LineStipple : public StateAttribute { public : diff --git a/include/osg/LineWidth b/include/osg/LineWidth index 2f35fa774..61dc926d8 100644 --- a/include/osg/LineWidth +++ b/include/osg/LineWidth @@ -19,7 +19,7 @@ namespace osg { /** LineWidth - encapsulates the OpenGL glLineWidth for setting the width of lines in pixels. */ -class SG_EXPORT LineWidth : public StateAttribute +class OSG_EXPORT LineWidth : public StateAttribute { public : diff --git a/include/osg/LogicOp b/include/osg/LogicOp index 6aa28c95f..01a8f71b7 100644 --- a/include/osg/LogicOp +++ b/include/osg/LogicOp @@ -19,7 +19,7 @@ namespace osg { /** Encapsulates OpenGL LogicOp state. */ -class SG_EXPORT LogicOp : public StateAttribute +class OSG_EXPORT LogicOp : public StateAttribute { public : diff --git a/include/osg/Material b/include/osg/Material index 185b21628..be87d5457 100644 --- a/include/osg/Material +++ b/include/osg/Material @@ -19,7 +19,7 @@ namespace osg { /** Material - encapsulates OpenGL glMaterial state.*/ -class SG_EXPORT Material : public StateAttribute +class OSG_EXPORT Material : public StateAttribute { public : diff --git a/include/osg/MatrixTransform b/include/osg/MatrixTransform index 711f6f0fd..55a657f8b 100644 --- a/include/osg/MatrixTransform +++ b/include/osg/MatrixTransform @@ -23,7 +23,7 @@ namespace osg { * which represents a 4x4 transformation of its children from local coordinates * into the Transform's parent coordinates. */ -class SG_EXPORT MatrixTransform : public Transform +class OSG_EXPORT MatrixTransform : public Transform { public : diff --git a/include/osg/Matrixd b/include/osg/Matrixd index bdd88cbb5..c478fa979 100644 --- a/include/osg/Matrixd +++ b/include/osg/Matrixd @@ -23,7 +23,7 @@ namespace osg { class Matrixf; -class SG_EXPORT Matrixd +class OSG_EXPORT Matrixd { public: diff --git a/include/osg/Matrixf b/include/osg/Matrixf index 079d87fef..cfd9e5231 100644 --- a/include/osg/Matrixf +++ b/include/osg/Matrixf @@ -23,7 +23,7 @@ namespace osg { class Matrixf; -class SG_EXPORT Matrixf +class OSG_EXPORT Matrixf { public: diff --git a/include/osg/Multisample b/include/osg/Multisample index 0768774d5..5f0e09c9b 100644 --- a/include/osg/Multisample +++ b/include/osg/Multisample @@ -39,7 +39,7 @@ namespace osg { /** Multisample - encapsulates the OpenGL Multisample state.*/ -class SG_EXPORT Multisample : public StateAttribute +class OSG_EXPORT Multisample : public StateAttribute { public : @@ -96,7 +96,7 @@ class SG_EXPORT Multisample : public StateAttribute /** Extensions class which encapsulates the querying of extensions and * associated function pointers, and provide convenience wrappers to * check for the extensions or use the associated functions.*/ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); diff --git a/include/osg/Node b/include/osg/Node index cf5891792..183dc3764 100644 --- a/include/osg/Node +++ b/include/osg/Node @@ -44,7 +44,7 @@ class Transform; /** Base class for all internal nodes in the scene graph. Provides interface for most common node operations (Composite Pattern). */ -class SG_EXPORT Node : public Object +class OSG_EXPORT Node : public Object { public: diff --git a/include/osg/NodeCallback b/include/osg/NodeCallback index fdc286471..60c9f9277 100644 --- a/include/osg/NodeCallback +++ b/include/osg/NodeCallback @@ -22,7 +22,7 @@ namespace osg { class Node; class NodeVisitor; -class SG_EXPORT NodeCallback : public virtual Object { +class OSG_EXPORT NodeCallback : public virtual Object { public : diff --git a/include/osg/NodeVisitor b/include/osg/NodeVisitor index c1d254c91..17181b9b5 100644 --- a/include/osg/NodeVisitor +++ b/include/osg/NodeVisitor @@ -53,7 +53,7 @@ class CoordinateSystemNode; myVisitor.apply(*root). The later method will bypass the double dispatch and the appropriate NodeVisitor::apply(..) method will not be called. */ -class SG_EXPORT NodeVisitor : public virtual Referenced +class OSG_EXPORT NodeVisitor : public virtual Referenced { public: diff --git a/include/osg/Notify b/include/osg/Notify index 124a5b8ca..885bb3a8e 100644 --- a/include/osg/Notify +++ b/include/osg/Notify @@ -39,13 +39,13 @@ enum NotifySeverity { /** set the notify level, overriding the default or the value set by * the environmental variable OSGNOTIFYLEVEL. */ -extern SG_EXPORT void setNotifyLevel(NotifySeverity severity); +extern OSG_EXPORT void setNotifyLevel(NotifySeverity severity); /** get the notify level. */ -extern SG_EXPORT NotifySeverity getNotifyLevel(); +extern OSG_EXPORT NotifySeverity getNotifyLevel(); /** initialize notify level. */ -extern SG_EXPORT bool initNotifyLevel(); +extern OSG_EXPORT bool initNotifyLevel(); /** notify messaging function for providing fatal through to verbose * debugging messages. Level of messages sent to the console can @@ -62,7 +62,7 @@ extern SG_EXPORT bool initNotifyLevel(); * stream (like cout) i.e osg::notify(osg::DEBUG) << "Hello Bugs!"< + #ifdef OSG_JAVA_BUILD #include #else @@ -36,7 +37,7 @@ namespace osg { class DeleteHandler; /** Base class from providing referencing counted objects.*/ -class SG_EXPORT Referenced +class OSG_EXPORT Referenced { public: @@ -169,7 +170,7 @@ inline void Referenced::unref() const /** Java wrappers use the CBridgable base-class for referencing * and garbage collection. */ -class SG_EXPORT Referenced : public NoodleGlue::CBridgable +class OSG_EXPORT Referenced : public NoodleGlue::CBridgable { public: /** Method not used in NoodleGlue referencing diff --git a/include/osg/Sequence b/include/osg/Sequence index 25edb5c85..ce66740fa 100644 --- a/include/osg/Sequence +++ b/include/osg/Sequence @@ -21,7 +21,7 @@ namespace osg { /** Sequence is a Group node which allows automatic, time based switching between children. */ -class SG_EXPORT Sequence : public Group +class OSG_EXPORT Sequence : public Group { public : diff --git a/include/osg/ShadeModel b/include/osg/ShadeModel index ed6ff8a4c..9a3c9cf57 100644 --- a/include/osg/ShadeModel +++ b/include/osg/ShadeModel @@ -21,7 +21,7 @@ namespace osg { /** Class which encapsulates glShadeModel(..). */ -class SG_EXPORT ShadeModel : public StateAttribute +class OSG_EXPORT ShadeModel : public StateAttribute { public : diff --git a/include/osg/Shader b/include/osg/Shader index 7752bcfea..19a05fced 100644 --- a/include/osg/Shader +++ b/include/osg/Shader @@ -35,7 +35,7 @@ namespace osg { * configuration. */ -class SG_EXPORT Shader : public osg::Object +class OSG_EXPORT Shader : public osg::Object { public: diff --git a/include/osg/ShadowVolumeOccluder b/include/osg/ShadowVolumeOccluder index 6e569b88e..76fa5bfa1 100644 --- a/include/osg/ShadowVolumeOccluder +++ b/include/osg/ShadowVolumeOccluder @@ -23,7 +23,7 @@ namespace osg { class CullStack; /** ShadowVolumeOccluder is a helper class for implementating shadow occlusion culling. */ -class SG_EXPORT ShadowVolumeOccluder +class OSG_EXPORT ShadowVolumeOccluder { public: diff --git a/include/osg/Shape b/include/osg/Shape index efdfc7046..13da89f09 100644 --- a/include/osg/Shape +++ b/include/osg/Shape @@ -45,7 +45,7 @@ class ConstShapeVisitor; * Shapes are used to either for culling and collision detection or * to define the geometric shape of procedurally generate Geometry. */ -class SG_EXPORT Shape : public Object +class OSG_EXPORT Shape : public Object { public: @@ -474,7 +474,7 @@ class ConvexHull : public TriangleMesh ~ConvexHull() {} }; -class SG_EXPORT HeightField : public Shape +class OSG_EXPORT HeightField : public Shape { public: diff --git a/include/osg/ShapeDrawable b/include/osg/ShapeDrawable index cc60a105d..138d6842a 100644 --- a/include/osg/ShapeDrawable +++ b/include/osg/ShapeDrawable @@ -125,7 +125,7 @@ class TessellationHints : public Object * of code. * @todo \c ShapeDrawable currently doesn't render InfinitePlanes. */ -class SG_EXPORT ShapeDrawable : public Drawable +class OSG_EXPORT ShapeDrawable : public Drawable { public: diff --git a/include/osg/State b/include/osg/State index 0a8642571..24708d019 100644 --- a/include/osg/State +++ b/include/osg/State @@ -77,7 +77,7 @@ namespace osg { * which typically stall the graphics pipeline (see, for instance, * \c captureCurrentState() and \c getModelViewMatrix()). */ -class SG_EXPORT State : public Referenced +class OSG_EXPORT State : public Referenced { public : diff --git a/include/osg/StateAttribute b/include/osg/StateAttribute index 99d0d0b52..41d1a110f 100644 --- a/include/osg/StateAttribute +++ b/include/osg/StateAttribute @@ -67,7 +67,7 @@ class StateSet; /** Base class for state attributes. */ -class SG_EXPORT StateAttribute : public Object +class OSG_EXPORT StateAttribute : public Object { public : diff --git a/include/osg/StateSet b/include/osg/StateSet index b7cf690c6..ca0eeff21 100644 --- a/include/osg/StateSet +++ b/include/osg/StateSet @@ -42,7 +42,7 @@ namespace osg { * Indeed, this practice is recommended whenever possible, * as this minimizes expensive state changes in the graphics pipeline. */ -class SG_EXPORT StateSet : public Object +class OSG_EXPORT StateSet : public Object { public : diff --git a/include/osg/Stencil b/include/osg/Stencil index 5198ec198..bd4e46be0 100644 --- a/include/osg/Stencil +++ b/include/osg/Stencil @@ -20,7 +20,7 @@ namespace osg { /** Encapsulate OpenGL glStencilFunc/Op/Mask functions. */ -class SG_EXPORT Stencil : public StateAttribute +class OSG_EXPORT Stencil : public StateAttribute { public : diff --git a/include/osg/Switch b/include/osg/Switch index a18a8e4f5..43dc90525 100644 --- a/include/osg/Switch +++ b/include/osg/Switch @@ -23,7 +23,7 @@ namespace osg { * differently at different times, for instance a switch could be used * to represent the different states of a traffic light. */ -class SG_EXPORT Switch : public Group +class OSG_EXPORT Switch : public Group { public : diff --git a/include/osg/TexEnv b/include/osg/TexEnv index 18e0f1a84..d35a1b472 100644 --- a/include/osg/TexEnv +++ b/include/osg/TexEnv @@ -22,7 +22,7 @@ namespace osg { /** TexEnv encapsulates the OpenGL glTexEnv (texture environment) state. */ -class SG_EXPORT TexEnv : public StateAttribute +class OSG_EXPORT TexEnv : public StateAttribute { public : diff --git a/include/osg/TexEnvCombine b/include/osg/TexEnvCombine index f9bdc323a..8a03e4d4c 100644 --- a/include/osg/TexEnvCombine +++ b/include/osg/TexEnvCombine @@ -59,7 +59,7 @@ namespace osg { /** TexEnvCombine encapsulates the OpenGL glTexEnvCombine (texture * environment) state. */ -class SG_EXPORT TexEnvCombine : public StateAttribute +class OSG_EXPORT TexEnvCombine : public StateAttribute { public : diff --git a/include/osg/TexEnvFilter b/include/osg/TexEnvFilter index 58d32a49b..c9e4ab064 100644 --- a/include/osg/TexEnvFilter +++ b/include/osg/TexEnvFilter @@ -26,7 +26,7 @@ namespace osg { /** TexEnvFilter - encapsulates the OpenGL glTexEnv (GL_TEXTURE_FILTER_CONTROL) state.*/ -class SG_EXPORT TexEnvFilter : public StateAttribute +class OSG_EXPORT TexEnvFilter : public StateAttribute { public: TexEnvFilter(float lodBias = 0.0f); diff --git a/include/osg/TexGen b/include/osg/TexGen index 5ce7f4361..ef39fd941 100644 --- a/include/osg/TexGen +++ b/include/osg/TexGen @@ -29,7 +29,7 @@ namespace osg { /** TexGen encapsulates the OpenGL glTexGen (texture coordinate generation) * state.*/ -class SG_EXPORT TexGen : public StateAttribute +class OSG_EXPORT TexGen : public StateAttribute { public : diff --git a/include/osg/TexGenNode b/include/osg/TexGenNode index 60a8d25a1..e0d00927f 100644 --- a/include/osg/TexGenNode +++ b/include/osg/TexGenNode @@ -20,7 +20,7 @@ namespace osg { /** Node for defining the position of TexGen in the scene. */ -class SG_EXPORT TexGenNode : public Group +class OSG_EXPORT TexGenNode : public Group { public: diff --git a/include/osg/TexMat b/include/osg/TexMat index 368e1803b..bea12d1b4 100644 --- a/include/osg/TexMat +++ b/include/osg/TexMat @@ -21,7 +21,7 @@ namespace osg { /** A texture matrix state class that encapsulates OpenGL texture matrix * functionality. */ -class SG_EXPORT TexMat : public StateAttribute +class OSG_EXPORT TexMat : public StateAttribute { public : diff --git a/include/osg/Texture b/include/osg/Texture index afda0228c..62d301494 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -184,7 +184,7 @@ namespace osg { /** Texture pure virtual base class that encapsulates OpenGl texture * functionality common to the various types of OSG textures. */ -class SG_EXPORT Texture : public osg::StateAttribute +class OSG_EXPORT Texture : public osg::StateAttribute { public : @@ -411,7 +411,7 @@ class SG_EXPORT Texture : public osg::StateAttribute /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convinience wrappers for * calling extension functions. */ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); diff --git a/include/osg/Texture1D b/include/osg/Texture1D index e12e219a4..63df0297a 100644 --- a/include/osg/Texture1D +++ b/include/osg/Texture1D @@ -23,7 +23,7 @@ namespace osg { /** Encapsulates OpenGl 1D texture functionality. Doesn't support cube maps, * so ignore \a face parameters. */ -class SG_EXPORT Texture1D : public Texture +class OSG_EXPORT Texture1D : public Texture { public : @@ -87,7 +87,7 @@ class SG_EXPORT Texture1D : public Texture } - class SG_EXPORT SubloadCallback : public Referenced + class OSG_EXPORT SubloadCallback : public Referenced { public: virtual void load(const Texture1D& texture,State& state) const = 0; diff --git a/include/osg/Texture2D b/include/osg/Texture2D index 46eb6db11..40d210972 100644 --- a/include/osg/Texture2D +++ b/include/osg/Texture2D @@ -21,7 +21,7 @@ namespace osg { /** Encapsulates OpenGl 2D texture functionality. Doesn't support cube maps, * so ignore \a face parameters. */ -class SG_EXPORT Texture2D : public Texture +class OSG_EXPORT Texture2D : public Texture { public : @@ -95,7 +95,7 @@ class SG_EXPORT Texture2D : public Texture } - class SG_EXPORT SubloadCallback : public Referenced + class OSG_EXPORT SubloadCallback : public Referenced { public: virtual void load(const Texture2D& texture,State& state) const = 0; diff --git a/include/osg/Texture3D b/include/osg/Texture3D index ecc606015..95d973d7b 100644 --- a/include/osg/Texture3D +++ b/include/osg/Texture3D @@ -21,7 +21,7 @@ namespace osg { /** Encapsulates OpenGl 2D texture functionality. Doesn't support cube maps, * so ignore \a face parameters. */ -class SG_EXPORT Texture3D : public Texture +class OSG_EXPORT Texture3D : public Texture { public : @@ -89,7 +89,7 @@ class SG_EXPORT Texture3D : public Texture } - class SG_EXPORT SubloadCallback : public Referenced + class OSG_EXPORT SubloadCallback : public Referenced { public: virtual void load(const Texture3D& texture,State& state) const = 0; @@ -130,7 +130,7 @@ class SG_EXPORT Texture3D : public Texture /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convinience wrappers for * calling extension functions. */ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); diff --git a/include/osg/TextureCubeMap b/include/osg/TextureCubeMap index 73ef2c1be..b34366465 100644 --- a/include/osg/TextureCubeMap +++ b/include/osg/TextureCubeMap @@ -23,7 +23,7 @@ namespace osg { /** TextureCubeMap state class which encapsulates OpenGL texture cubemap functionality. */ -class SG_EXPORT TextureCubeMap : public Texture +class OSG_EXPORT TextureCubeMap : public Texture { public : @@ -88,7 +88,7 @@ class SG_EXPORT TextureCubeMap : public Texture } - class SG_EXPORT SubloadCallback : public Referenced + class OSG_EXPORT SubloadCallback : public Referenced { public: virtual void load(const TextureCubeMap& texture,State& state) const = 0; @@ -120,7 +120,7 @@ class SG_EXPORT TextureCubeMap : public Texture * associated function pointers, and provides convinience wrappers to * check for the extensions or use the associated functions. */ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); diff --git a/include/osg/TextureRectangle b/include/osg/TextureRectangle index f4110c8aa..07d6bd4ae 100644 --- a/include/osg/TextureRectangle +++ b/include/osg/TextureRectangle @@ -27,7 +27,7 @@ namespace osg { /** Texture state class which encapsulates OpenGL texture functionality. */ -class SG_EXPORT TextureRectangle : public Texture +class OSG_EXPORT TextureRectangle : public Texture { public : diff --git a/include/osg/Timer b/include/osg/Timer index a952d4ffc..17ac9ebc0 100644 --- a/include/osg/Timer +++ b/include/osg/Timer @@ -25,7 +25,7 @@ namespace osg { #endif /** Time stamper. */ -class SG_EXPORT Timer { +class OSG_EXPORT Timer { public: diff --git a/include/osg/Transform b/include/osg/Transform index 1b11c190f..22ef77fbc 100644 --- a/include/osg/Transform +++ b/include/osg/Transform @@ -28,24 +28,24 @@ namespace osg { /** Compute the matrix which transforms objects in local coords to world coords, * by accumulating the Transform local to world matrices along the specified node path. */ -extern SG_EXPORT Matrix computeLocalToWorld(const NodePath& nodePath); +extern OSG_EXPORT Matrix computeLocalToWorld(const NodePath& nodePath); /** Compute the matrix which transforms objects in world coords to local coords, * by accumulating the Transform world to local matrices along the specified node path. */ -extern SG_EXPORT Matrix computeWorldToLocal(const NodePath& nodePath); +extern OSG_EXPORT Matrix computeWorldToLocal(const NodePath& nodePath); /** Compute the matrix which transforms objects in local coords to eye coords, * by accumulating the Transform local to world matrices along the specified node path * and multipling by the supplied initial camera modelview. */ -extern SG_EXPORT Matrix computeLocalToEye(const Matrix& modelview, const NodePath& nodePath); +extern OSG_EXPORT Matrix computeLocalToEye(const Matrix& modelview, const NodePath& nodePath); /** Compute the matrix which transforms objects in eye coords to local coords, * by accumulating the Transform world to local matrices along the specified node path * and multipling by the inverse of the supplied initialial camera modelview. */ -extern SG_EXPORT Matrix computeEyeToLocal(const Matrix& modelview, const NodePath& nodePath); +extern OSG_EXPORT Matrix computeEyeToLocal(const Matrix& modelview, const NodePath& nodePath); /** A Transform is a group node for which all children are transformed by @@ -67,7 +67,7 @@ extern SG_EXPORT Matrix computeEyeToLocal(const Matrix& modelview, const NodePat * the appropriate mode to ON via * stateset->setMode(GL_NORMALIZE, osg::StateAttribute::ON); */ -class SG_EXPORT Transform : public Group +class OSG_EXPORT Transform : public Group { public : diff --git a/include/osg/Uniform b/include/osg/Uniform index 140fffa36..6297a088d 100644 --- a/include/osg/Uniform +++ b/include/osg/Uniform @@ -129,7 +129,7 @@ namespace osg { class GL2Extensions; -class SG_EXPORT Uniform : public Object +class OSG_EXPORT Uniform : public Object { public: enum Type { diff --git a/include/osg/UnitTestFramework b/include/osg/UnitTestFramework index 33f15b409..b979e6bbc 100644 --- a/include/osg/UnitTestFramework +++ b/include/osg/UnitTestFramework @@ -43,7 +43,7 @@ class for our graph of test cases, and defines the basic interface for all Test components. It is a referent, and may be pointed to by an osg::ref_ptr. */ -class SG_EXPORT Test: public osg::Referenced +class OSG_EXPORT Test: public osg::Referenced { public: @@ -70,7 +70,7 @@ as an output stream for verbose output during the running of tests. \todo Improve the output stream code by providing a filtering stream. */ -class SG_EXPORT TestContext +class OSG_EXPORT TestContext { public: @@ -97,7 +97,7 @@ private: #ifndef DOXYGEN_SHOULD_SKIP_THIS - class SG_EXPORT TraceStream{ + class OSG_EXPORT TraceStream{ public: TraceStream(std::ostream& o=osg::notify(osg::NOTICE), TraceLevel tl=Results); @@ -247,7 +247,7 @@ class TestCase_ : public TestCase A TestSuite is the \em composite component of the Composite pattern, and allows aggregation of Tests into hierarchies. */ -class SG_EXPORT TestSuite : public Test +class OSG_EXPORT TestSuite : public Test { public: @@ -275,7 +275,7 @@ class SG_EXPORT TestSuite : public Test TestGraph is a singleton providing central access to the tree of tests; primarily, it provides access to the root suite. */ -class SG_EXPORT TestGraph +class OSG_EXPORT TestGraph { public: @@ -336,7 +336,7 @@ class SG_EXPORT TestGraph Maintains a string that when accessed in the "visit" member, returns the current qualified TestSuite path. */ -class SG_EXPORT TestQualifier : public TestVisitor +class OSG_EXPORT TestQualifier : public TestVisitor { enum { SEPCHAR = '.' }; @@ -360,7 +360,7 @@ class SG_EXPORT TestQualifier : public TestVisitor QualifiedTestPrinter prints to standard output a list of fully qualified tests. */ -class SG_EXPORT QualifiedTestPrinter : public TestQualifier +class OSG_EXPORT QualifiedTestPrinter : public TestQualifier { public: @@ -375,7 +375,7 @@ its result, and a textual description of any problems. \todo Consider adding accessor methods if necessary, to get the details stored in the TestRecord. */ -class SG_EXPORT TestRecord +class OSG_EXPORT TestRecord { public: @@ -419,7 +419,7 @@ given test run. \todo Add support for printing the test report in various formats: e.g. text, XML, CSV */ -class SG_EXPORT TestReport +class OSG_EXPORT TestReport { public: @@ -445,7 +445,7 @@ test graph. \todo Consider an accessor method to get at the TestReport if necessary. */ -class SG_EXPORT TestRunner : public TestQualifier +class OSG_EXPORT TestRunner : public TestQualifier { public: diff --git a/include/osg/Version b/include/osg/Version index 3e6a164dc..2dc4e2805 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -34,10 +34,10 @@ extern "C" { [AC_MSG_ERROR(OpenSceneGraph library not found. See http://www.openscenegraph.org)],) \endverbatim */ -extern SG_EXPORT const char* osgGetVersion(); +extern OSG_EXPORT const char* osgGetVersion(); /** The osgGetLibraryName() method returns the library name in human-friendly form. */ -extern SG_EXPORT const char* osgGetLibraryName(); +extern OSG_EXPORT const char* osgGetLibraryName(); } diff --git a/include/osg/VertexProgram b/include/osg/VertexProgram index d6ceef634..63235c7a5 100644 --- a/include/osg/VertexProgram +++ b/include/osg/VertexProgram @@ -112,7 +112,7 @@ namespace osg { /** VertexProgram - encapsulates the OpenGL ARB vertex program state. */ -class SG_EXPORT VertexProgram : public StateAttribute +class OSG_EXPORT VertexProgram : public StateAttribute { public: @@ -231,7 +231,7 @@ class SG_EXPORT VertexProgram : public StateAttribute * associated function pointers, and provide convenience wrappers to * check for the extensions or use the associated functions. */ - class SG_EXPORT Extensions : public osg::Referenced + class OSG_EXPORT Extensions : public osg::Referenced { public: Extensions(); diff --git a/include/osg/Viewport b/include/osg/Viewport index 184e40a18..d573d979e 100644 --- a/include/osg/Viewport +++ b/include/osg/Viewport @@ -20,7 +20,7 @@ namespace osg { /** Encapsulate OpenGL glViewport. */ -class SG_EXPORT Viewport : public StateAttribute +class OSG_EXPORT Viewport : public StateAttribute { public : Viewport(); diff --git a/src/osg/GNUmakefile b/src/osg/GNUmakefile index a539b823b..dfcf4fb65 100644 --- a/src/osg/GNUmakefile +++ b/src/osg/GNUmakefile @@ -110,7 +110,7 @@ CXXFILES =\ VertexProgram.cpp\ Viewport.cpp\ -DEF += -DSG_LIBRARY +DEF += -DOSG_LIBRARY LIBS += $(GL_LIBS) $(OTHER_LIBS) diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 3f1dabf90..4ef2ae315 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -57,7 +57,7 @@ unsigned int Texture::getMinimumNumberOfTextureObjectsToRetainInCache() return s_minimumNumberOfTextureObjectsToRetainInCache; } -class SG_EXPORT TextureObjectManager : public osg::Referenced +class TextureObjectManager : public osg::Referenced { public: diff --git a/src/osgPlugins/mpeg/MpegImageStream.h b/src/osgPlugins/mpeg/MpegImageStream.h index bada97862..194070428 100644 --- a/src/osgPlugins/mpeg/MpegImageStream.h +++ b/src/osgPlugins/mpeg/MpegImageStream.h @@ -41,7 +41,7 @@ namespace osg { /** * MPEG1/2 Image Stream class. */ - class SG_EXPORT MpegImageStream : public osg::ImageStream, public OpenThreads::Thread + class MpegImageStream : public osg::ImageStream, public OpenThreads::Thread { public: MpegImageStream(const char* fileName = NULL); diff --git a/src/osgPlugins/quicktime/QuicktimeImageStream.h b/src/osgPlugins/quicktime/QuicktimeImageStream.h index b0b164ca3..20227548a 100644 --- a/src/osgPlugins/quicktime/QuicktimeImageStream.h +++ b/src/osgPlugins/quicktime/QuicktimeImageStream.h @@ -39,7 +39,7 @@ namespace osg { /** * Quicktime Image Stream class. */ - class SG_EXPORT QuicktimeImageStream : public osg::ImageStream, public OpenThreads::Thread + class QuicktimeImageStream : public osg::ImageStream, public OpenThreads::Thread { public: QuicktimeImageStream(std::string fileName = "");