diff --git a/src/osgPlugins/bsp/ReaderWriterQ3BSP.cpp b/src/osgPlugins/bsp/ReaderWriterQ3BSP.cpp index a30eb72fa..bb68873ea 100644 --- a/src/osgPlugins/bsp/ReaderWriterQ3BSP.cpp +++ b/src/osgPlugins/bsp/ReaderWriterQ3BSP.cpp @@ -19,9 +19,6 @@ #include "BSPLoad.h" - - - class ReaderWriterQ3BSP: public osgDB::ReaderWriter { public: @@ -42,7 +39,7 @@ public: private: osg::Geode* convertFromBSP(BSPLoad& aLoadData,const osgDB::ReaderWriter::Options* options) const; osg::Geometry* createMeshFace(const BSP_LOAD_FACE& aLoadFace,const std::vector& aTextureArray, - osg::Vec3Array& aVertexArray,std::vector& aIndices, + osg::Vec3Array& aVertexArray,std::vector& aIndices, osg::Vec2Array& aTextureDecalCoords,osg::Vec2Array& aTextureLMapCoords ) const; osg::Geometry* createPolygonFace(const BSP_LOAD_FACE& aLoadFace,const std::vector& aTextureArray,const std::vector& aTextureLMapArray, @@ -164,7 +161,7 @@ protected: int m_tesselation; std::vector m_vertices; - std::vector m_indices; + std::vector m_indices; //arrays for multi_draw_arrays std::vector m_trianglesPerRow; @@ -356,11 +353,8 @@ osg::Geode* ReaderWriterQ3BSP::convertFromBSP(BSPLoad& aLoadData,const osgDB::Re - - - osg::Geometry* ReaderWriterQ3BSP::createMeshFace( const BSP_LOAD_FACE& aLoadFace,const std::vector& aTextureArray, - osg::Vec3Array& aVertexArray,std::vector& aIndices, + osg::Vec3Array& aVertexArray,std::vector& aIndices, osg::Vec2Array& aTextureDecalCoords,osg::Vec2Array& aTextureLMapCoords ) const { @@ -538,10 +532,10 @@ bool ReaderWriterQ3BSP::loadLightMaps(const BSPLoad& aLoadData,std::vectorsetImage(1,1,1,GL_RGBA8,GL_RGB,GL_UNSIGNED_BYTE,data,osg::Image::USE_NEW_DELETE); @@ -559,15 +553,6 @@ bool ReaderWriterQ3BSP::loadLightMaps(const BSPLoad& aLoadData,std::vector