Changeset 10972

Show
Ignore:
Timestamp:
01/19/10 13:26:37 (3 years ago)
Author:
robert
Message:

Refactored the old style .osg plugin support so that the DotOsgWrappers? are placed in their own dedicated plugins found in src/osgWrappers/deprecated_osg

Location:
OpenSceneGraph/trunk/src
Files:
1 added
102 removed
9 modified
3 copied
11 moved

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgDB/Registry.cpp

    r10768 r10972  
    913913             
    914914            // otherwise try the osgdb_ plugin library. 
    915             std::string pluginLibraryName = createLibraryNameForExtension(libraryName); 
     915            std::string pluginLibraryName = createLibraryNameForExtension(std::string("deprecated_")+libraryName); 
     916            if (loadLibrary(pluginLibraryName)==LOADED) return readObjectOfType(btw,fr); 
     917 
     918            // otherwise try the osgdb_ plugin library. 
     919            pluginLibraryName = createLibraryNameForExtension(libraryName); 
    916920            if (loadLibrary(pluginLibraryName)==LOADED) return readObjectOfType(btw,fr); 
    917921        } 

  • OpenSceneGraph/trunk/src/osgPlugins/CMakeLists.txt

    r10850 r10972  
    3737#  NodeKit/Psudo loader plugins 
    3838# 
    39 ADD_SUBDIRECTORY(osgAnimation) 
    40 ADD_SUBDIRECTORY(osgFX) 
    41 ADD_SUBDIRECTORY(osgParticle) 
    42 ADD_SUBDIRECTORY(osgSim) 
    43 ADD_SUBDIRECTORY(osgText) 
    44 ADD_SUBDIRECTORY(osgViewer) 
    45 ADD_SUBDIRECTORY(osgShadow) 
    46 ADD_SUBDIRECTORY(osgTerrain) 
    47 ADD_SUBDIRECTORY(osgVolume) 
    48 ADD_SUBDIRECTORY(osgWidget) 
    4939ADD_SUBDIRECTORY(osga) 
    5040ADD_SUBDIRECTORY(rot) 
    … …  
    5343ADD_SUBDIRECTORY(normals) 
    5444ADD_SUBDIRECTORY(revisions) 
     45ADD_SUBDIRECTORY(view) 
     46ADD_SUBDIRECTORY(shadow) 
     47ADD_SUBDIRECTORY(terrain) 
    5548 
    5649############################################################ 

  • OpenSceneGraph/trunk/src/osgPlugins/osg/CMakeLists.txt

    r9998 r10972  
    11SET(TARGET_SRC 
    2     AlphaFunc.cpp 
    3     AnimationPath.cpp 
    4     AutoTransform.cpp 
    5     Billboard.cpp 
    6     BlendColor.cpp 
    7     BlendEquation.cpp 
    8     BlendFunc.cpp 
    9     Box.cpp 
    10     Camera.cpp 
    11     CameraView.cpp 
    12     Capsule.cpp 
    13     ClearNode.cpp 
    14     ClipNode.cpp 
    15     ClipPlane.cpp 
    16     ClusterCullingCallback.cpp 
    17     ColorMask.cpp 
    18     ColorMatrix.cpp 
    19     CompositeShape.cpp 
    20     Cone.cpp 
    21     ConvexPlanarOccluder.cpp 
    22     CoordinateSystemNode.cpp 
    23     Cylinder.cpp 
    24     CullFace.cpp 
    25     Depth.cpp 
    26     Drawable.cpp 
    27     EllipsoidModel.cpp 
    28     Fog.cpp 
    29     FragmentProgram.cpp 
    30     FrontFace.cpp 
    31     Geode.cpp 
    32     Geometry.cpp 
    33     Group.cpp 
    34     HeightField.cpp 
    35     Image.cpp 
    36     ImageSequence.cpp 
    37     Light.cpp 
    38     LightModel.cpp 
    39     LightSource.cpp 
    40     LineStipple.cpp 
    41     LineWidth.cpp 
    42     LOD.cpp 
    43     Material.cpp 
    44     Matrix.cpp 
    45     MatrixTransform.cpp 
    46     NodeCallback.cpp 
    47     Node.cpp 
    48     Object.cpp 
    49     OccluderNode.cpp 
    50     OcclusionQueryNode.cpp 
    51     PagedLOD.cpp 
    52     Point.cpp 
    53     PointSprite.cpp 
    54     PolygonMode.cpp 
    55     PolygonOffset.cpp 
    56     PositionAttitudeTransform.cpp 
    57     Program.cpp 
    58     Projection.cpp 
    59     ProxyNode.cpp 
    602    ReaderWriterOSG.cpp 
    61     Scissor.cpp 
    62     Sequence.cpp 
    63     ShadeModel.cpp 
    64     Shader.cpp 
    65     ShapeDrawable.cpp 
    66     Sphere.cpp 
    67     StateAttribute.cpp 
    68     StateSet.cpp 
    69     Stencil.cpp 
    70     Switch.cpp 
    71     TessellationHints.cpp 
    72     TexEnvCombine.cpp 
    73     TexEnv.cpp 
    74     TexEnvFilter.cpp 
    75     TexGen.cpp 
    76     TexGenNode.cpp 
    77     TexMat.cpp 
    78     Texture1D.cpp 
    79     Texture2D.cpp 
    80     Texture3D.cpp 
    81     Texture.cpp 
    82     TextureCubeMap.cpp 
    83     TextureRectangle.cpp 
    84     TransferFunction.cpp 
    85     Transform.cpp 
    86     Uniform.cpp 
    87     VertexProgram.cpp 
    88     Viewport.cpp 
    893) 
    90 SET(TARGET_H Matrix.h ) 
    914 
    925#### end var setup  ### 

  • OpenSceneGraph/trunk/src/osgPlugins/osg/ReaderWriterOSG.cpp

    r10330 r10972  
    44#include <osg/Group> 
    55#include <osg/Notify> 
     6#include <osg/Version> 
    67 
    78#include <osgDB/FileNameUtils> 
    … …  
    1516using namespace osgDB; 
    1617 
     18 
     19#if 0 
    1720// pull in symbols from individual .o's to enable the static build to work 
    1821USE_DOTOSGWRAPPER(AlphaFunc) 
    … …  
    100103USE_DOTOSGWRAPPER(VertexProgram) 
    101104USE_DOTOSGWRAPPER(Viewport) 
     105#endif 
    102106 
    103107class OSGReaderWriter : public ReaderWriter 
    … …  
    107111        OSGReaderWriter() 
    108112        { 
     113 
    109114            supportsExtension("osg","OpenSceneGraph Ascii file format"); 
    110115            supportsExtension("osgs","Psuedo OpenSceneGraph file loaded, with file encoded in filename string"); 
    … …  
    113118            supportsOption("includeExternalReferences","Export option"); 
    114119            supportsOption("writeExternalReferenceFiles","Export option"); 
     120 
     121            std::string filename = osgDB::Registry::instance()->createLibraryNameForExtension("deprecated_osg"); 
     122            if (osgDB::Registry::instance()->loadLibrary(filename)==osgDB::Registry::LOADED) 
     123            { 
     124                osg::notify(osg::NOTICE)<<"Constructor OSGReaderWriter - loaded OK"<<std::endl; 
     125            } 
     126            else 
     127            { 
     128                osg::notify(osg::NOTICE)<<"Constructor OSGReaderWriter - failed to load"<<std::endl; 
     129            } 
     130 
    115131        } 
    116132     

  • OpenSceneGraph/trunk/src/osgPlugins/shadow/CMakeLists.txt

    r7237 r10972  
    1  
    21SET(TARGET_SRC  
    32    ReaderWriterOsgShadow.cpp 
    4     ShadowedScene.cpp 
    5     ShadowMap.cpp 
    6     ShadowTechnique.cpp 
    7     ShadowTexture.cpp 
    8     ShadowVolume.cpp 
    93) 
    104SET(TARGET_ADDED_LIBRARIES osgShadow ) 

  • OpenSceneGraph/trunk/src/osgPlugins/shadow/ReaderWriterOsgShadow.cpp

  • OpenSceneGraph/trunk/src/osgPlugins/terrain

  • OpenSceneGraph/trunk/src/osgPlugins/terrain/CMakeLists.txt

    r9998 r10972  
    11SET(TARGET_SRC  
    2     Locator.cpp 
    3     ImageLayer.cpp 
    4     HeightFieldLayer.cpp 
    5     CompositeLayer.cpp 
    6     SwitchLayer.cpp 
    7     Layer.cpp 
    8     Terrain.cpp 
    9     TerrainTile.cpp 
    10     GeometryTechnique.cpp 
    112    ReaderWriterOsgTerrain.cpp 
    123) 

  • OpenSceneGraph/trunk/src/osgPlugins/view

  • OpenSceneGraph/trunk/src/osgPlugins/view/CMakeLists.txt

    r7447 r10972  
    11 
    22SET(TARGET_SRC  
    3     View.cpp  
    4     Viewer.cpp  
    5     CompositeViewer.cpp  
    6     ReaderWriterOsgViewer.cpp  
     3    ReaderWriterOsgViewer.cpp 
    74) 
    85SET(TARGET_ADDED_LIBRARIES osgViewer ) 

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgAnimation

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgFX

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgParticle

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgShadow

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgShadow/CMakeLists.txt

    r7237 r10972  
    11 
    22SET(TARGET_SRC  
    3     ReaderWriterOsgShadow.cpp 
    43    ShadowedScene.cpp 
    54    ShadowMap.cpp 

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgSim

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgTerrain

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgTerrain/CMakeLists.txt

    r9998 r10972  
    99    TerrainTile.cpp 
    1010    GeometryTechnique.cpp 
    11     ReaderWriterOsgTerrain.cpp 
    1211) 
    1312 

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgText

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgViewer

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgViewer/CMakeLists.txt

    r7447 r10972  
    44    Viewer.cpp  
    55    CompositeViewer.cpp  
    6     ReaderWriterOsgViewer.cpp  
    76) 
    87SET(TARGET_ADDED_LIBRARIES osgViewer ) 

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgVolume

  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgWidget