Changeset 53

Show
Ignore:
Timestamp:
09/05/06 17:09:42 (2 years ago)
Author:
allenb
Message:

Move another drawable from the system library to the drawable library. I hope this is correct.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGDrawable.fcd

    r2 r53  
    44        name="Drawable" 
    55        parent="NodeCore" 
    6         library="System" 
     6        library="Drawable" 
    77        pointerfieldtypes="both" 
    88        structure="abstract" 

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGDrawable.h

    r2 r53  
    5151 */ 
    5252 
    53 class OSG_SYSTEM_DLLMAPPING Drawable : public DrawableBase 
     53class OSG_DRAWABLE_DLLMAPPING Drawable : public DrawableBase 
    5454{ 
    5555  private: 

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGDrawableBase.cpp

    r2 r53  
    228228namespace 
    229229{ 
    230     static Char8 cvsid_cpp       [] = "@(#)$Id: OSGDrawableBase.cpp,v 1.3.4.8 2006/08/01 08:48:56 vossg Exp $"; 
     230    static Char8 cvsid_cpp       [] = "@(#)$Id: $"; 
    231231    static Char8 cvsid_hpp       [] = OSGDRAWABLEBASE_HEADER_CVSID; 
    232232    static Char8 cvsid_inl       [] = OSGDRAWABLEBASE_INLINE_CVSID; 

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGDrawableBase.h

    r2 r53  
    6060 
    6161#include "OSGConfig.h" 
    62 #include "OSGSystemDef.h" 
     62#include "OSGDrawableDef.h" 
    6363 
    6464#include "OSGBaseTypes.h" 
    …… 
    7575//! \brief Drawable Base Class. 
    7676 
    77 class OSG_SYSTEM_DLLMAPPING DrawableBase : public NodeCore 
     77class OSG_DRAWABLE_DLLMAPPING DrawableBase : public NodeCore 
    7878{ 
    7979  public: 
    …… 
    256256OSG_END_NAMESPACE 
    257257 
    258 #define OSGDRAWABLEBASE_HEADER_CVSID "@(#)$Id: OSGDrawableBase.h,v 1.3.4.10 2006/08/01 08:48:56 vossg Exp $" 
     258#define OSGDRAWABLEBASE_HEADER_CVSID "@(#)$Id: $" 
    259259 
    260260#endif /* _OSGDRAWABLEBASE_H_ */ 

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGDrawableBase.inl

    r2 r53  
    126126OSG_END_NAMESPACE 
    127127 
    128 #define OSGDRAWABLEBASE_INLINE_CVSID "@(#)$Id: OSGDrawableBase.inl,v 1.3.4.7 2006/08/01 08:48:56 vossg Exp $" 
     128#define OSGDRAWABLEBASE_INLINE_CVSID "@(#)$Id: $" 
    129129 

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGDrawableFields.h

    r2 r53  
    5656 
    5757#include "OSGConfig.h" 
    58 #include "OSGSystemDef.h" 
     58#include "OSGDrawableDef.h" 
    5959 
    6060#include "OSGNodeCoreFields.h" 
    …… 
    9393 
    9494#if !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3) 
    95 /*! \ingroup GrpSystemFieldTraits 
     95/*! \ingroup GrpDrawableFieldTraits 
    9696 */ 
    9797#if !defined(OSG_DOC_DEV_TRAITS) 
    …… 
    113113    enum                        { StringConvertable = 0x00 }; 
    114114 
    115     static OSG_SYSTEM_DLLMAPPING  
     115    static OSG_DRAWABLE_DLLMAPPING  
    116116                     DataType &getType (void); 
    117117 
    …… 
    130130 
    131131#if !defined(OSG_DO_DOC) || defined(OSG_DOC_FIELD_TYPEDEFS) 
    132 /*! \ingroup GrpSystemFieldSingle */ 
     132/*! \ingroup GrpDrawableFieldSingle */ 
    133133 
    134134typedef SFieldAdaptor<DrawablePtr, SFFieldContainerPtr> SFDrawablePtr; 
    …… 
    136136 
    137137#ifndef OSG_COMPILEDRAWABLEINST 
    138 OSG_FIELD_DLLEXPORT_DECL1(SField, DrawablePtr, OSG_SYSTEM_DLLTMPLMAPPING) 
     138OSG_FIELD_DLLEXPORT_DECL1(SField, DrawablePtr, OSG_DRAWABLE_DLLTMPLMAPPING) 
    139139#endif 
    140140 
    141141#if !defined(OSG_DO_DOC) || defined(OSG_DOC_FIELD_TYPEDEFS) 
    142 /*! \ingroup GrpSystemFieldMulti */ 
     142/*! \ingroup GrpDrawableFieldMulti */ 
    143143 
    144144typedef MFieldAdaptor<DrawablePtr, MFFieldContainerPtr> MFDrawablePtr; 
    …… 
    146146 
    147147#ifndef OSG_COMPILEDRAWABLEINST 
    148 OSG_FIELD_DLLEXPORT_DECL1(MField, DrawablePtr, OSG_SYSTEM_DLLTMPLMAPPING) 
     148OSG_FIELD_DLLEXPORT_DECL1(MField, DrawablePtr, OSG_DRAWABLE_DLLTMPLMAPPING) 
    149149#endif 
    150150 
    151151OSG_END_NAMESPACE 
    152152 
    153 #define OSGDRAWABLEFIELDS_HEADER_CVSID "@(#)$Id: OSGDrawableFields.h,v 1.4.4.9 2006/08/01 08:48:56 vossg Exp $" 
     153#define OSGDRAWABLEFIELDS_HEADER_CVSID "@(#)$Id: $" 
    154154 
    155155#endif /* _OSGDRAWABLEFIELDS_H_ */