瀏覽代碼

New streaming interface: fix build.

Kim Kulling 9 年之前
父節點
當前提交
949a27a743
共有 2 個文件被更改,包括 4 次插入5 次删除
  1. 1 1
      code/IOStreamBuffer.h
  2. 3 4
      code/ObjFileParser.cpp

+ 1 - 1
code/IOStreamBuffer.h

@@ -69,7 +69,7 @@ private:
 
 
 template<class T>
 template<class T>
 inline
 inline
-IOStreamBuffer<T>::IOStreamBuffer( size_t cache = 4096 * 4096 )
+IOStreamBuffer<T>::IOStreamBuffer( size_t cache )
     : m_stream( nullptr )
     : m_stream( nullptr )
     , m_filesize( 0 )
     , m_filesize( 0 )
     , m_cacheSize( cache )
     , m_cacheSize( cache )

+ 3 - 4
code/ObjFileParser.cpp

@@ -38,8 +38,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 ---------------------------------------------------------------------------
 */
 */
-
-
 #ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER
 #ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER
 
 
 #include "ObjFileParser.h"
 #include "ObjFileParser.h"
@@ -54,14 +52,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Importer.hpp>
 #include <assimp/Importer.hpp>
 #include <cstdlib>
 #include <cstdlib>
 
 
-
 namespace Assimp {
 namespace Assimp {
 
 
 const std::string ObjFileParser::DEFAULT_MATERIAL = AI_DEFAULT_MATERIAL_NAME;
 const std::string ObjFileParser::DEFAULT_MATERIAL = AI_DEFAULT_MATERIAL_NAME;
 
 
 // -------------------------------------------------------------------
 // -------------------------------------------------------------------
 //  Constructor with loaded data and directories.
 //  Constructor with loaded data and directories.
-ObjFileParser::ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::string &modelName, IOSystem *io, ProgressHandler* progress, const std::string &originalObjFileName) :
+ObjFileParser::ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::string &modelName, 
+                              IOSystem *io, ProgressHandler* progress,
+                              const std::string &originalObjFileName) :
     m_DataIt(),
     m_DataIt(),
     m_DataItEnd(),
     m_DataItEnd(),
     m_pModel(NULL),
     m_pModel(NULL),