diff --git a/Make/makedirdefs b/Make/makedirdefs index a3c909aef..af4e1fee4 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -58,18 +58,18 @@ WRAPPER_DIRS = \ PLUGIN_DIRS = \ 3dc \ - ac3d \ + ac \ bmp \ bsp \ dds \ - directx \ + x \ dw \ dxf \ - ESRIShape \ + shp \ flt \ hdr \ ive \ - lib3ds \ + 3ds \ logo \ lwo \ lws \ diff --git a/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp b/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp index 70325de12..a317e72cf 100644 --- a/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp +++ b/VisualStudio/osgPlugins/ESRIShape/ESRIShape.dsp @@ -156,15 +156,15 @@ LIB32=link.exe -lib # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ESRIShape\ESRIShape.cpp +SOURCE=..\..\..\src\osgPlugins\shp\ESRIShape.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ESRIShape\ESRIShapeParser.cpp +SOURCE=..\..\..\src\osgPlugins\shp\ESRIShapeParser.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ESRIShape\ESRIShapeReaderWriter.cpp +SOURCE=..\..\..\src\osgPlugins\shp\ESRIShapeReaderWriter.cpp # End Source File # End Group # Begin Group "Header Files" @@ -172,11 +172,11 @@ SOURCE=..\..\..\src\osgPlugins\ESRIShape\ESRIShapeReaderWriter.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl;" # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ESRIShape\ESRIShape.h +SOURCE=..\..\..\src\osgPlugins\shp\ESRIShape.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ESRIShape\ESRIShapeParser.h +SOURCE=..\..\..\src\osgPlugins\shp\ESRIShapeParser.h # End Source File # End Group # Begin Group "Resource Files" diff --git a/VisualStudio/osgPlugins/ac3d/ac3d.dsp b/VisualStudio/osgPlugins/ac3d/ac3d.dsp index 036fb298d..cee2fbc8d 100644 --- a/VisualStudio/osgPlugins/ac3d/ac3d.dsp +++ b/VisualStudio/osgPlugins/ac3d/ac3d.dsp @@ -157,15 +157,15 @@ LIB32=link.exe -lib # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ac3d\ac3d.cpp +SOURCE=..\..\..\src\osgPlugins\ac\ac3d.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ac3d\Exception.cpp +SOURCE=..\..\..\src\osgPlugins\ac\Exception.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ac3d\Geode.cpp +SOURCE=..\..\..\src\osgPlugins\ac\Geode.cpp # End Source File # End Group # Begin Group "Header Files" @@ -173,11 +173,11 @@ SOURCE=..\..\..\src\osgPlugins\ac3d\Geode.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ac3d\Exception.h +SOURCE=..\..\..\src\osgPlugins\ac\Exception.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ac3d\Geode.h +SOURCE=..\..\..\src\osgPlugins\ac\Geode.h # End Source File # End Group # Begin Group "Resource Files" diff --git a/VisualStudio/osgPlugins/directx/directx.dsp b/VisualStudio/osgPlugins/directx/directx.dsp index e1e7eb089..320afaf08 100644 --- a/VisualStudio/osgPlugins/directx/directx.dsp +++ b/VisualStudio/osgPlugins/directx/directx.dsp @@ -157,19 +157,19 @@ LIB32=link.exe -lib # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\..\..\src\osgPlugins\directx\directx.cpp +SOURCE=..\..\..\src\osgPlugins\x\directx.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\directx\types.cpp +SOURCE=..\..\..\src\osgPlugins\x\types.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\directx\mesh.cpp +SOURCE=..\..\..\src\osgPlugins\x\mesh.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\directx\ReaderWriterDirectX.cpp +SOURCE=..\..\..\src\osgPlugins\x\ReaderWriterDirectX.cpp # End Source File # End Group # Begin Group "Header Files" @@ -177,15 +177,15 @@ SOURCE=..\..\..\src\osgPlugins\directx\ReaderWriterDirectX.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\directx\directx.h +SOURCE=..\..\..\Src\osgPlugins\x\directx.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\directx\types.h +SOURCE=..\..\..\Src\osgPlugins\x\types.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\directx\mesh.h +SOURCE=..\..\..\Src\osgPlugins\x\mesh.h # End Source File # End Group # Begin Group "Resource Files" diff --git a/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp b/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp index 9a6dafa71..056a401c9 100644 --- a/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp +++ b/VisualStudio/osgPlugins/lib3ds/lib3ds.dsp @@ -157,83 +157,83 @@ LIB32=link.exe -lib # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\atmosphere.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\atmosphere.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\background.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\background.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Camera.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Camera.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Chunk.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Chunk.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Ease.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Ease.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\File.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\File.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Lib3ds_float.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Lib3ds_float.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Light.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Light.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Material.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Material.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Matrix.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Matrix.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Mesh.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Mesh.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Node.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Node.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Quat.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Quat.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\ReaderWriter3DS.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\ReaderWriter3DS.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\readwrite.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\readwrite.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Shadow.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Shadow.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Tcb.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Tcb.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Tracks.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Tracks.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Vector.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Vector.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Viewport.cpp +SOURCE=..\..\..\Src\osgPlugins\3ds\Viewport.cpp # End Source File # End Group # Begin Group "Header Files" @@ -241,87 +241,87 @@ SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Viewport.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\atmosphere.h +SOURCE=..\..\..\Src\osgPlugins\3ds\atmosphere.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\background.h +SOURCE=..\..\..\Src\osgPlugins\3ds\background.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Camera.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Camera.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Chunk.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Chunk.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\chunktable.h +SOURCE=..\..\..\Src\osgPlugins\3ds\chunktable.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Ease.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Ease.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\File.h +SOURCE=..\..\..\Src\osgPlugins\3ds\File.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Lib3ds_float.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Lib3ds_float.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Light.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Light.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Material.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Material.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Matrix.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Matrix.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Mesh.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Mesh.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Node.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Node.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Quat.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Quat.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\readwrite.h +SOURCE=..\..\..\Src\osgPlugins\3ds\readwrite.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Shadow.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Shadow.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Tcb.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Tcb.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Tracks.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Tracks.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Types.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Types.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Vector.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Vector.h # End Source File # Begin Source File -SOURCE=..\..\..\Src\osgPlugins\Lib3ds\Viewport.h +SOURCE=..\..\..\Src\osgPlugins\3ds\Viewport.h # End Source File # End Group # Begin Group "Resource Files" diff --git a/src/osgPlugins/lib3ds/AUTHORS b/src/osgPlugins/3ds/AUTHORS similarity index 100% rename from src/osgPlugins/lib3ds/AUTHORS rename to src/osgPlugins/3ds/AUTHORS diff --git a/src/osgPlugins/lib3ds/GNUmakefile b/src/osgPlugins/3ds/GNUmakefile similarity index 100% rename from src/osgPlugins/lib3ds/GNUmakefile rename to src/osgPlugins/3ds/GNUmakefile diff --git a/src/osgPlugins/lib3ds/README b/src/osgPlugins/3ds/README similarity index 100% rename from src/osgPlugins/lib3ds/README rename to src/osgPlugins/3ds/README diff --git a/src/osgPlugins/lib3ds/ReaderWriter3DS.cpp b/src/osgPlugins/3ds/ReaderWriter3DS.cpp similarity index 100% rename from src/osgPlugins/lib3ds/ReaderWriter3DS.cpp rename to src/osgPlugins/3ds/ReaderWriter3DS.cpp diff --git a/src/osgPlugins/lib3ds/atmosphere.cpp b/src/osgPlugins/3ds/atmosphere.cpp similarity index 100% rename from src/osgPlugins/lib3ds/atmosphere.cpp rename to src/osgPlugins/3ds/atmosphere.cpp diff --git a/src/osgPlugins/lib3ds/atmosphere.h b/src/osgPlugins/3ds/atmosphere.h similarity index 100% rename from src/osgPlugins/lib3ds/atmosphere.h rename to src/osgPlugins/3ds/atmosphere.h diff --git a/src/osgPlugins/lib3ds/background.cpp b/src/osgPlugins/3ds/background.cpp similarity index 100% rename from src/osgPlugins/lib3ds/background.cpp rename to src/osgPlugins/3ds/background.cpp diff --git a/src/osgPlugins/lib3ds/background.h b/src/osgPlugins/3ds/background.h similarity index 100% rename from src/osgPlugins/lib3ds/background.h rename to src/osgPlugins/3ds/background.h diff --git a/src/osgPlugins/lib3ds/camera.cpp b/src/osgPlugins/3ds/camera.cpp similarity index 100% rename from src/osgPlugins/lib3ds/camera.cpp rename to src/osgPlugins/3ds/camera.cpp diff --git a/src/osgPlugins/lib3ds/camera.h b/src/osgPlugins/3ds/camera.h similarity index 100% rename from src/osgPlugins/lib3ds/camera.h rename to src/osgPlugins/3ds/camera.h diff --git a/src/osgPlugins/lib3ds/chunk.cpp b/src/osgPlugins/3ds/chunk.cpp similarity index 100% rename from src/osgPlugins/lib3ds/chunk.cpp rename to src/osgPlugins/3ds/chunk.cpp diff --git a/src/osgPlugins/lib3ds/chunk.h b/src/osgPlugins/3ds/chunk.h similarity index 100% rename from src/osgPlugins/lib3ds/chunk.h rename to src/osgPlugins/3ds/chunk.h diff --git a/src/osgPlugins/lib3ds/chunktable.h b/src/osgPlugins/3ds/chunktable.h similarity index 100% rename from src/osgPlugins/lib3ds/chunktable.h rename to src/osgPlugins/3ds/chunktable.h diff --git a/src/osgPlugins/lib3ds/config.h b/src/osgPlugins/3ds/config.h similarity index 100% rename from src/osgPlugins/lib3ds/config.h rename to src/osgPlugins/3ds/config.h diff --git a/src/osgPlugins/lib3ds/ease.cpp b/src/osgPlugins/3ds/ease.cpp similarity index 100% rename from src/osgPlugins/lib3ds/ease.cpp rename to src/osgPlugins/3ds/ease.cpp diff --git a/src/osgPlugins/lib3ds/ease.h b/src/osgPlugins/3ds/ease.h similarity index 100% rename from src/osgPlugins/lib3ds/ease.h rename to src/osgPlugins/3ds/ease.h diff --git a/src/osgPlugins/lib3ds/file.cpp b/src/osgPlugins/3ds/file.cpp similarity index 100% rename from src/osgPlugins/lib3ds/file.cpp rename to src/osgPlugins/3ds/file.cpp diff --git a/src/osgPlugins/lib3ds/file.h b/src/osgPlugins/3ds/file.h similarity index 100% rename from src/osgPlugins/lib3ds/file.h rename to src/osgPlugins/3ds/file.h diff --git a/src/osgPlugins/lib3ds/lib3ds_float.cpp b/src/osgPlugins/3ds/lib3ds_float.cpp similarity index 100% rename from src/osgPlugins/lib3ds/lib3ds_float.cpp rename to src/osgPlugins/3ds/lib3ds_float.cpp diff --git a/src/osgPlugins/lib3ds/lib3ds_float.h b/src/osgPlugins/3ds/lib3ds_float.h similarity index 100% rename from src/osgPlugins/lib3ds/lib3ds_float.h rename to src/osgPlugins/3ds/lib3ds_float.h diff --git a/src/osgPlugins/lib3ds/light.cpp b/src/osgPlugins/3ds/light.cpp similarity index 100% rename from src/osgPlugins/lib3ds/light.cpp rename to src/osgPlugins/3ds/light.cpp diff --git a/src/osgPlugins/lib3ds/light.h b/src/osgPlugins/3ds/light.h similarity index 100% rename from src/osgPlugins/lib3ds/light.h rename to src/osgPlugins/3ds/light.h diff --git a/src/osgPlugins/lib3ds/material.cpp b/src/osgPlugins/3ds/material.cpp similarity index 100% rename from src/osgPlugins/lib3ds/material.cpp rename to src/osgPlugins/3ds/material.cpp diff --git a/src/osgPlugins/lib3ds/material.h b/src/osgPlugins/3ds/material.h similarity index 100% rename from src/osgPlugins/lib3ds/material.h rename to src/osgPlugins/3ds/material.h diff --git a/src/osgPlugins/lib3ds/matrix.cpp b/src/osgPlugins/3ds/matrix.cpp similarity index 100% rename from src/osgPlugins/lib3ds/matrix.cpp rename to src/osgPlugins/3ds/matrix.cpp diff --git a/src/osgPlugins/lib3ds/matrix.h b/src/osgPlugins/3ds/matrix.h similarity index 100% rename from src/osgPlugins/lib3ds/matrix.h rename to src/osgPlugins/3ds/matrix.h diff --git a/src/osgPlugins/lib3ds/mesh.cpp b/src/osgPlugins/3ds/mesh.cpp similarity index 100% rename from src/osgPlugins/lib3ds/mesh.cpp rename to src/osgPlugins/3ds/mesh.cpp diff --git a/src/osgPlugins/lib3ds/mesh.h b/src/osgPlugins/3ds/mesh.h similarity index 100% rename from src/osgPlugins/lib3ds/mesh.h rename to src/osgPlugins/3ds/mesh.h diff --git a/src/osgPlugins/lib3ds/node.cpp b/src/osgPlugins/3ds/node.cpp similarity index 100% rename from src/osgPlugins/lib3ds/node.cpp rename to src/osgPlugins/3ds/node.cpp diff --git a/src/osgPlugins/lib3ds/node.h b/src/osgPlugins/3ds/node.h similarity index 100% rename from src/osgPlugins/lib3ds/node.h rename to src/osgPlugins/3ds/node.h diff --git a/src/osgPlugins/lib3ds/quat.cpp b/src/osgPlugins/3ds/quat.cpp similarity index 100% rename from src/osgPlugins/lib3ds/quat.cpp rename to src/osgPlugins/3ds/quat.cpp diff --git a/src/osgPlugins/lib3ds/quat.h b/src/osgPlugins/3ds/quat.h similarity index 100% rename from src/osgPlugins/lib3ds/quat.h rename to src/osgPlugins/3ds/quat.h diff --git a/src/osgPlugins/lib3ds/readwrite.cpp b/src/osgPlugins/3ds/readwrite.cpp similarity index 100% rename from src/osgPlugins/lib3ds/readwrite.cpp rename to src/osgPlugins/3ds/readwrite.cpp diff --git a/src/osgPlugins/lib3ds/readwrite.h b/src/osgPlugins/3ds/readwrite.h similarity index 100% rename from src/osgPlugins/lib3ds/readwrite.h rename to src/osgPlugins/3ds/readwrite.h diff --git a/src/osgPlugins/lib3ds/shadow.cpp b/src/osgPlugins/3ds/shadow.cpp similarity index 100% rename from src/osgPlugins/lib3ds/shadow.cpp rename to src/osgPlugins/3ds/shadow.cpp diff --git a/src/osgPlugins/lib3ds/shadow.h b/src/osgPlugins/3ds/shadow.h similarity index 100% rename from src/osgPlugins/lib3ds/shadow.h rename to src/osgPlugins/3ds/shadow.h diff --git a/src/osgPlugins/lib3ds/tcb.cpp b/src/osgPlugins/3ds/tcb.cpp similarity index 100% rename from src/osgPlugins/lib3ds/tcb.cpp rename to src/osgPlugins/3ds/tcb.cpp diff --git a/src/osgPlugins/lib3ds/tcb.h b/src/osgPlugins/3ds/tcb.h similarity index 100% rename from src/osgPlugins/lib3ds/tcb.h rename to src/osgPlugins/3ds/tcb.h diff --git a/src/osgPlugins/lib3ds/tracks.cpp b/src/osgPlugins/3ds/tracks.cpp similarity index 100% rename from src/osgPlugins/lib3ds/tracks.cpp rename to src/osgPlugins/3ds/tracks.cpp diff --git a/src/osgPlugins/lib3ds/tracks.h b/src/osgPlugins/3ds/tracks.h similarity index 100% rename from src/osgPlugins/lib3ds/tracks.h rename to src/osgPlugins/3ds/tracks.h diff --git a/src/osgPlugins/lib3ds/types.h b/src/osgPlugins/3ds/types.h similarity index 100% rename from src/osgPlugins/lib3ds/types.h rename to src/osgPlugins/3ds/types.h diff --git a/src/osgPlugins/lib3ds/vector.cpp b/src/osgPlugins/3ds/vector.cpp similarity index 100% rename from src/osgPlugins/lib3ds/vector.cpp rename to src/osgPlugins/3ds/vector.cpp diff --git a/src/osgPlugins/lib3ds/vector.h b/src/osgPlugins/3ds/vector.h similarity index 100% rename from src/osgPlugins/lib3ds/vector.h rename to src/osgPlugins/3ds/vector.h diff --git a/src/osgPlugins/lib3ds/viewport.cpp b/src/osgPlugins/3ds/viewport.cpp similarity index 100% rename from src/osgPlugins/lib3ds/viewport.cpp rename to src/osgPlugins/3ds/viewport.cpp diff --git a/src/osgPlugins/lib3ds/viewport.h b/src/osgPlugins/3ds/viewport.h similarity index 100% rename from src/osgPlugins/lib3ds/viewport.h rename to src/osgPlugins/3ds/viewport.h diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt index fede6bde0..dfd8f0ba6 100644 --- a/src/osgPlugins/CMakeLists.txt +++ b/src/osgPlugins/CMakeLists.txt @@ -62,7 +62,7 @@ IF (BUILD_OSG_3D_PLUGINS) ADD_OSG_PLUGIN(3dc) #ADD_OSG_PLUGIN(Inventor) #ADD_OSG_PLUGIN(lwo osgFX) - ADD_OSG_PLUGIN(directx) + ADD_OSG_PLUGIN(x) ADD_OSG_PLUGIN(dw) ADD_OSG_PLUGIN(dxf) #ADD_OSG_PLUGIN(flt osgSim) @@ -72,8 +72,8 @@ IF (BUILD_OSG_3D_PLUGINS) #ADD_OSG_PLUGIN(pfb) ADD_OSG_PLUGIN(pic) ADD_OSG_PLUGIN(stl) - ADD_OSG_PLUGIN(lib3ds ) - ADD_OSG_PLUGIN(ac3d) + ADD_OSG_PLUGIN(3ds ) + ADD_OSG_PLUGIN(ac) ENDIF (BUILD_OSG_3D_PLUGINS) IF (BUILD_OSG_OTHER_PLUGINS) @@ -85,7 +85,7 @@ IF (BUILD_OSG_OTHER_PLUGINS) ADD_OSG_PLUGIN(tgz) #ADD_OSG_PLUGIN(txp) #ADD_OSG_PLUGIN(xine) - ADD_OSG_PLUGIN(ESRIShape) + ADD_OSG_PLUGIN(shp) IF(FREETYPE_FOUND) SUBDIRS( freetype ) @@ -101,9 +101,6 @@ ENDIF (BUILD_OSG_OTHER_PLUGINS) # ADD ALL PLUGINS #--------------------------------------------------- -#ADD_OSG_PLUGIN(ESRIShape) - - IF (BUILD_OSG_NET_PLUGINS) ADD_OSG_PLUGIN(net ${OSG_SOCKET_LIBS}) ENDIF (BUILD_OSG_NET_PLUGINS) diff --git a/src/osgPlugins/ac3d/Exception.cpp b/src/osgPlugins/ac/Exception.cpp similarity index 100% rename from src/osgPlugins/ac3d/Exception.cpp rename to src/osgPlugins/ac/Exception.cpp diff --git a/src/osgPlugins/ac3d/Exception.h b/src/osgPlugins/ac/Exception.h similarity index 100% rename from src/osgPlugins/ac3d/Exception.h rename to src/osgPlugins/ac/Exception.h diff --git a/src/osgPlugins/ac3d/GNUmakefile b/src/osgPlugins/ac/GNUmakefile similarity index 100% rename from src/osgPlugins/ac3d/GNUmakefile rename to src/osgPlugins/ac/GNUmakefile diff --git a/src/osgPlugins/ac3d/Geode.cpp b/src/osgPlugins/ac/Geode.cpp similarity index 100% rename from src/osgPlugins/ac3d/Geode.cpp rename to src/osgPlugins/ac/Geode.cpp diff --git a/src/osgPlugins/ac3d/Geode.h b/src/osgPlugins/ac/Geode.h similarity index 100% rename from src/osgPlugins/ac3d/Geode.h rename to src/osgPlugins/ac/Geode.h diff --git a/src/osgPlugins/ac3d/ac3d.cpp b/src/osgPlugins/ac/ac3d.cpp similarity index 100% rename from src/osgPlugins/ac3d/ac3d.cpp rename to src/osgPlugins/ac/ac3d.cpp diff --git a/src/osgPlugins/ESRIShape/ESRIShape.cpp b/src/osgPlugins/shp/ESRIShape.cpp similarity index 100% rename from src/osgPlugins/ESRIShape/ESRIShape.cpp rename to src/osgPlugins/shp/ESRIShape.cpp diff --git a/src/osgPlugins/ESRIShape/ESRIShape.h b/src/osgPlugins/shp/ESRIShape.h similarity index 100% rename from src/osgPlugins/ESRIShape/ESRIShape.h rename to src/osgPlugins/shp/ESRIShape.h diff --git a/src/osgPlugins/ESRIShape/ESRIShapeParser.cpp b/src/osgPlugins/shp/ESRIShapeParser.cpp similarity index 100% rename from src/osgPlugins/ESRIShape/ESRIShapeParser.cpp rename to src/osgPlugins/shp/ESRIShapeParser.cpp diff --git a/src/osgPlugins/ESRIShape/ESRIShapeParser.h b/src/osgPlugins/shp/ESRIShapeParser.h similarity index 100% rename from src/osgPlugins/ESRIShape/ESRIShapeParser.h rename to src/osgPlugins/shp/ESRIShapeParser.h diff --git a/src/osgPlugins/ESRIShape/ESRIShapeReaderWriter.cpp b/src/osgPlugins/shp/ESRIShapeReaderWriter.cpp similarity index 100% rename from src/osgPlugins/ESRIShape/ESRIShapeReaderWriter.cpp rename to src/osgPlugins/shp/ESRIShapeReaderWriter.cpp diff --git a/src/osgPlugins/ESRIShape/GNUmakefile b/src/osgPlugins/shp/GNUmakefile similarity index 100% rename from src/osgPlugins/ESRIShape/GNUmakefile rename to src/osgPlugins/shp/GNUmakefile diff --git a/src/osgPlugins/directx/GNUmakefile b/src/osgPlugins/x/GNUmakefile similarity index 100% rename from src/osgPlugins/directx/GNUmakefile rename to src/osgPlugins/x/GNUmakefile diff --git a/src/osgPlugins/directx/LICENSE b/src/osgPlugins/x/LICENSE similarity index 100% rename from src/osgPlugins/directx/LICENSE rename to src/osgPlugins/x/LICENSE diff --git a/src/osgPlugins/directx/ReaderWriterDirectX.cpp b/src/osgPlugins/x/ReaderWriterDirectX.cpp similarity index 100% rename from src/osgPlugins/directx/ReaderWriterDirectX.cpp rename to src/osgPlugins/x/ReaderWriterDirectX.cpp diff --git a/src/osgPlugins/directx/directx.cpp b/src/osgPlugins/x/directx.cpp similarity index 100% rename from src/osgPlugins/directx/directx.cpp rename to src/osgPlugins/x/directx.cpp diff --git a/src/osgPlugins/directx/directx.h b/src/osgPlugins/x/directx.h similarity index 100% rename from src/osgPlugins/directx/directx.h rename to src/osgPlugins/x/directx.h diff --git a/src/osgPlugins/directx/mesh.cpp b/src/osgPlugins/x/mesh.cpp similarity index 100% rename from src/osgPlugins/directx/mesh.cpp rename to src/osgPlugins/x/mesh.cpp diff --git a/src/osgPlugins/directx/mesh.h b/src/osgPlugins/x/mesh.h similarity index 100% rename from src/osgPlugins/directx/mesh.h rename to src/osgPlugins/x/mesh.h diff --git a/src/osgPlugins/directx/types.cpp b/src/osgPlugins/x/types.cpp similarity index 100% rename from src/osgPlugins/directx/types.cpp rename to src/osgPlugins/x/types.cpp diff --git a/src/osgPlugins/directx/types.h b/src/osgPlugins/x/types.h similarity index 100% rename from src/osgPlugins/directx/types.h rename to src/osgPlugins/x/types.h