Obj-Streaming: add new io-stream for line-wise cached reading + first

bugfixes.

diff --git a/code/IOStreamBuffer.h b/code/IOStreamBuffer.h
new file mode 100644 (file)
index 0000000..c748235
--- /dev/null
+++ b/code/IOStreamBuffer.h
@@ -0,0 +1,135 @@
+#pragma once
+
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2016, assimp team
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
+following conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------
+*/
+
+#include <assimp/types.h>
+
+namespace Assimp {
+
+class IOStream;
+
+template<class T>
+class IOStreamBuffer {
+public:
+    IOStreamBuffer( size_t cache = 4096 )
+    : m_stream( nullptr )
+    , m_filesize( 0 )
+    , m_cacheSize( cache )
+    , m_cachePos( 0 )
+    , m_filePos( 0 ) {
+        m_cache.resize( cache );
+        std::fill( m_cache.begin(), m_cache.end(), '\0' );
+    }
+
+    ~IOStreamBuffer() {
+    }
+
+    bool open( IOStream *stream ) {
+        if ( nullptr == stream ) {
+            return false;
+        }
+
+        m_stream = stream;
+        m_filesize = m_stream->FileSize();
+        if ( m_filesize == 0 ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    bool close() {
+        if ( nullptr == m_stream ) {
+            return false;
+        }
+
+        m_stream = nullptr;
+        m_filesize =0;
+
+        return true;
+    }
+
+    size_t size() const {
+        return m_filesize;
+    }
+
+    bool getNextLine( std::vector<T> &buffer ) {
+        buffer.resize( m_cacheSize );
+        ::memset( &buffer[ 0 ], ' ', m_cacheSize );
+        if ( 0 == m_filePos ) {
+            size_t readLen = m_stream->Read( &m_cache[ 0 ], sizeof( T ), m_cacheSize );
+            if ( readLen == 0 ) {
+                return false;
+            }
+            m_filePos += m_cacheSize;
+        }
+
+        size_t i=0;
+        while ( !IsLineEnd( m_cache[ m_cachePos ] ) ) {
+            if ( m_cachePos + 1 == m_cacheSize ) {
+                m_stream->Seek(m_filePos, aiOrigin_CUR );
+                size_t readLen = m_stream->Read( &m_cache[ 0 ], sizeof( T ), m_cacheSize );
+                if ( readLen == 0 ) {
+                    return false;
+                }
+                m_filePos += m_cacheSize;
+                m_cachePos = 0;
+            }
+            buffer[ i ] = m_cache[ m_cachePos ];
+            m_cachePos++;
+            i++;
+        }
+        buffer[ i ]='\n';
+        m_cachePos++;
+
+        return true;
+    }
+
+private:
+    IOStream *m_stream;
+    size_t m_filesize;
+    size_t m_cacheSize;
+    std::vector<T> m_cache;
+    size_t m_cachePos;
+    size_t m_filePos;
+};
+
+} // !ns Assimp

diff --git a/code/ObjTools.h b/code/ObjTools.h
index 8abf60e..e58bf0c 100644 (file)
--- a/code/ObjTools.h
+++ b/code/ObjTools.h
@@ -142,15 +142,15 @@ inline char_t getName( char_t it, char_t end, std::string &name )
     }
 
     char *pStart = &( *it );
-    while( !isEndOfBuffer( it, end ) && !IsLineEnd( *it ) ) {
+    while( !isEndOfBuffer( it, end ) && !IsLineEnd( *it ) && !IsSpaceOrNewLine( *it ) ) {
         ++it;
     }
 
-    while( isEndOfBuffer( it, end ) || IsLineEnd( *it ) || IsSpaceOrNewLine( *it ) ) {
+    /*while( isEndOfBuffer( it, end ) || IsLineEnd( *it ) || IsSpaceOrNewLine( *it ) ) {
         --it;
     }
     ++it;
-
+    */
     // Get name
     // if there is no name, and the previous char is a separator, come back to start
     while (&(*it) < pStart) {

diff --git a/test/unit/utIOStreamBuffer.cpp b/test/unit/utIOStreamBuffer.cpp
new file mode 100644 (file)
index 0000000..9d8d6ad
--- /dev/null
+++ b/test/unit/utIOStreamBuffer.cpp
@@ -0,0 +1,63 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2016, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+
+#include "UnitTestPCH.h"
+#include "IOStreamBuffer.h"
+
+class IOStreamBufferTest : public ::testing::Test {
+    // empty
+};
+
+using namespace Assimp;
+
+TEST_F( IOStreamBufferTest, creationTest ) {
+    bool ok( true );
+    try {
+        IOStreamBuffer<char> myBuffer;
+    } catch ( ... ) {
+        ok = false;
+    }
+    EXPECT_TRUE( ok );
+}
+
+TEST_F( IOStreamBufferTest, readlineTest ) {
+
+}
\ No newline at end of file