Renamed SG_LIBRARY and SG_EXPORT macro's to OSG_LIBRARY and OSG_EXPORT

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

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 :
     

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:
 

include/osg/ApplicationUsage

@@ -22,7 +22,7 @@
 
 namespace osg {
 
-class SG_EXPORT ApplicationUsage
+class OSG_EXPORT ApplicationUsage
 {
     public:
         

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

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<T>
         virtual ~TemplateArray() {}
 };
 
-class SG_EXPORT IndexArray : public Array
+class OSG_EXPORT IndexArray : public Array
 {
 
     public:

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();

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:
 

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();

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();

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 :
 

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:
     

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:
         

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:
 

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 :
         

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:

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 :
 

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:
 

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:
 

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 :
     

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 :
     

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:

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:

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:
 

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:

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 :
     

include/osg/CullSettings

@@ -23,7 +23,7 @@ namespace osg {
 class ArgumentParser;
 class ApplicationUsage;
 
-class SG_EXPORT CullSettings
+class OSG_EXPORT CullSettings
 {
     public:
 

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:

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:

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 :
     

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:

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:
 

include/osg/Drawable

@@ -78,7 +78,7 @@ class NodeVisitor;
  *  <tt>Geode</tt>s, 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();

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.

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 :
 

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();

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:
 

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 :
     

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);
 
 
 }

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 <tt>Drawable</tt>s.
 */
-class SG_EXPORT Geode : public Node
+class OSG_EXPORT Geode : public Node
 {
     public:
 

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).

include/osg/Group

@@ -25,7 +25,7 @@ typedef std::vector< ref_ptr<Node> > 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 :
 

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);
 
 }
 

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();

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();

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:
     

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 :
     

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 :
 

include/osg/LightModel

@@ -19,7 +19,7 @@
 
 namespace osg {
 
-class SG_EXPORT LightModel : public StateAttribute
+class OSG_EXPORT LightModel : public StateAttribute
 {
     public :
 

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:
     

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:
 

include/osg/LineStipple

@@ -18,7 +18,7 @@
 
 namespace osg {
 
-class SG_EXPORT LineStipple : public StateAttribute
+class OSG_EXPORT LineStipple : public StateAttribute
 {
     public :
 

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 :
 

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 :
 

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 :
 

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 :
 

include/osg/Matrixd

@@ -23,7 +23,7 @@ namespace osg {
 
 class Matrixf;
 
-class SG_EXPORT Matrixd
+class OSG_EXPORT Matrixd
 {
     public:
     

include/osg/Matrixf

@@ -23,7 +23,7 @@ namespace osg {
 
 class Matrixf;
 
-class SG_EXPORT Matrixf
+class OSG_EXPORT Matrixf
 {
     public:
     

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();

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:
 

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 :
     

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:
 

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!"<<endl;
   */
   
-extern SG_EXPORT std::ostream& notify(const NotifySeverity severity);
+extern OSG_EXPORT std::ostream& notify(const NotifySeverity severity);
 
 inline std::ostream& notify(void) { return notify(osg::INFO); }
 

include/osg/Object

@@ -36,7 +36,7 @@ namespace osg {
     cloning and reference counting.
     Based on GOF Composite, Prototype and Template Method patterns.
 */
-class SG_EXPORT Object : public Referenced
+class OSG_EXPORT Object : public Referenced
 {
     public:
 

include/osg/OccluderNode

@@ -24,7 +24,7 @@ namespace osg {
     differently at different times, for instance a OccluderNode could be used 
     to represent the different states of a traffic light.
 */
-class SG_EXPORT OccluderNode : public Group
+class OSG_EXPORT OccluderNode : public Group
 {
     public :
         

include/osg/PagedLOD

@@ -20,7 +20,7 @@ namespace osg {
 
 /** PagedLOD.
 */
-class SG_EXPORT PagedLOD : public LOD
+class OSG_EXPORT PagedLOD : public LOD
 {
     public :
     
@@ -53,7 +53,7 @@ class SG_EXPORT PagedLOD : public LOD
         inline const std::string& getDatabasePath() const { return _databasePath; }
 
         
-        struct SG_EXPORT PerRangeData
+        struct OSG_EXPORT PerRangeData
         {
             PerRangeData();
             PerRangeData(const PerRangeData& prd);

include/osg/Plane

@@ -26,7 +26,7 @@
 namespace osg {
 
 /** A plane class. It can be used to represent an infinite plane.*/
-class SG_EXPORT Plane
+class OSG_EXPORT Plane
 {
 
     public:

include/osg/Point

@@ -20,7 +20,7 @@
 namespace osg {
 
 /** Point - encapsulates the OpenGL point smoothing and size state.*/
-class SG_EXPORT Point : public StateAttribute
+class OSG_EXPORT Point : public StateAttribute
 {
     public :
 

include/osg/PointSprite

@@ -25,7 +25,7 @@
 namespace osg {
 
 /** PointSprite base class which encapsulates enabling of point sprites .*/
-class SG_EXPORT PointSprite : public osg::StateAttribute {
+class OSG_EXPORT PointSprite : public osg::StateAttribute {
 public:
 
 	PointSprite() {}

include/osg/PolygonMode

@@ -21,7 +21,7 @@ namespace osg {
 
 /** State Class for setting OpenGL's polygon culling mode.
 */     
-class SG_EXPORT PolygonMode : public StateAttribute
+class OSG_EXPORT PolygonMode : public StateAttribute
 {
     public :
     

include/osg/PolygonOffset

@@ -19,7 +19,7 @@
 namespace osg {
 
 /** PolygonOffset - encapsulates the OpenGL glPolygonOffset state.*/
-class SG_EXPORT PolygonOffset : public StateAttribute
+class OSG_EXPORT PolygonOffset : public StateAttribute
 {
     public :
 

include/osg/PolygonStipple

@@ -20,7 +20,7 @@
 namespace osg
 {
 
-class SG_EXPORT PolygonStipple : public StateAttribute
+class OSG_EXPORT PolygonStipple : public StateAttribute
 {
     public :
 

include/osg/Polytope

@@ -22,7 +22,7 @@ namespace osg {
 
 /** A Polytope class for representing convex clipping volumes made up of a set of planes.
   * When adding planes, their normals should point inwards (into the volume) */
-class SG_EXPORT Polytope
+class OSG_EXPORT Polytope
 {
 
     public:

include/osg/PositionAttitudeTransform

@@ -25,7 +25,7 @@ namespace osg {
 /** PositionAttitudeTransform - is a Transform. Sets the coordinate transform
     via a Vec3 position and Quat attitude.
 */
-class SG_EXPORT PositionAttitudeTransform : public Transform
+class OSG_EXPORT PositionAttitudeTransform : public Transform
 {
     public :
         PositionAttitudeTransform();

include/osg/PrimitiveSet

@@ -233,7 +233,7 @@ class PrimitiveSet : public Object
         unsigned int    _modifiedCount;
 };
 
-class SG_EXPORT DrawArrays : public PrimitiveSet
+class OSG_EXPORT DrawArrays : public PrimitiveSet
 {
     public:
 
@@ -289,7 +289,7 @@ class SG_EXPORT DrawArrays : public PrimitiveSet
         GLsizei _count;
 };
 
-class SG_EXPORT DrawArrayLengths : public PrimitiveSet, public VectorSizei
+class OSG_EXPORT DrawArrayLengths : public PrimitiveSet, public VectorSizei
 {
     public:
 
@@ -362,7 +362,7 @@ class SG_EXPORT DrawArrayLengths : public PrimitiveSet, public VectorSizei
         GLint   _first;
 };
 
-class SG_EXPORT DrawElementsUByte : public PrimitiveSet, public VectorUByte
+class OSG_EXPORT DrawElementsUByte : public PrimitiveSet, public VectorUByte
 {
     public:
 
@@ -409,7 +409,7 @@ class SG_EXPORT DrawElementsUByte : public PrimitiveSet, public VectorUByte
 };
 
 
-class SG_EXPORT DrawElementsUShort : public PrimitiveSet, public VectorUShort
+class OSG_EXPORT DrawElementsUShort : public PrimitiveSet, public VectorUShort
 {
     public:
 
@@ -460,7 +460,7 @@ class SG_EXPORT DrawElementsUShort : public PrimitiveSet, public VectorUShort
         virtual ~DrawElementsUShort();
 };
 
-class SG_EXPORT DrawElementsUInt : public PrimitiveSet, public VectorUInt
+class OSG_EXPORT DrawElementsUInt : public PrimitiveSet, public VectorUInt
 {
     public:
 

include/osg/Program

@@ -34,7 +34,7 @@ namespace osg {
 class State;
 class Shader;
 
-class SG_EXPORT GL2Extensions : public osg::Referenced
+class OSG_EXPORT GL2Extensions : public osg::Referenced
 {
     public:
 	GL2Extensions();
@@ -299,7 +299,7 @@ class SG_EXPORT GL2Extensions : public osg::Referenced
   * configuration.
   */
 
-class SG_EXPORT Program : public osg::StateAttribute
+class OSG_EXPORT Program : public osg::StateAttribute
 {
     public:
         Program();

include/osg/Projection

@@ -21,7 +21,7 @@ namespace osg {
 
 /** Projection nodes set up the frustum/orthographic projection used when rendering the scene.
 */
-class SG_EXPORT Projection : public Group
+class OSG_EXPORT Projection : public Group
 {
     public :
 

include/osg/ProxyNode

@@ -20,7 +20,7 @@ namespace osg {
 
 /** ProxyNode.
 */
-class SG_EXPORT ProxyNode : public Group
+class OSG_EXPORT ProxyNode : public Group
 {
     public :
     

include/osg/Quat

@@ -26,7 +26,7 @@ class Matrixf;
 class Matrixd;
 
 /** A quaternion class. It can be used to represent an orientation in 3D space.*/
-class SG_EXPORT Quat
+class OSG_EXPORT Quat
 {
 
     public:

include/osg/Referenced

@@ -22,6 +22,7 @@
 //#define OSG_JAVA_BUILD
 
 #include <osg/Export>
+
 #ifdef OSG_JAVA_BUILD
 #include <NoodleGlue/Bridgable.h>
 #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 

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 :
         

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 :
     

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:
 

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:

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:
     

include/osg/ShapeDrawable

@@ -125,7 +125,7 @@ class TessellationHints : public Object
  *  of code.
  *  @todo \c ShapeDrawable currently doesn't render <tt>InfinitePlane</tt>s.
  */
-class SG_EXPORT ShapeDrawable : public Drawable
+class OSG_EXPORT ShapeDrawable : public Drawable
 {
     public:
 

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 :
 

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 :
     

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 :
 

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 :
     

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 :
         

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 :
 

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 :
 

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);

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 :
     

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:

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 :
 

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();

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;

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;