v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more fixes.

pull/1043/head
Kim Kulling 2016-10-18 14:02:58 +02:00
parent 084a6f6415
commit a54e42cb5a
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
code/IOStreamBuffer.h
View File

@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <assimp/types.h> #include <assimp/types.h>
#include <iostream>
namespace Assimp { namespace Assimp {
class IOStream; class IOStream;
@ -91,31 +91,33 @@ public:
return m_filesize; return m_filesize;
} }
bool readNextBlock() {
std::cout << "readNextBlock()\n";
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;
return true;
}
bool getNextLine( std::vector<T> &buffer ) { bool getNextLine( std::vector<T> &buffer ) {
buffer.resize( m_cacheSize ); buffer.resize( m_cacheSize );
::memset( &buffer[ 0 ], ' ', 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; if ( m_cachePos == m_cacheSize || 0 == m_filePos ) {
readNextBlock();
}
size_t i = 0;
while ( !IsLineEnd( m_cache[ m_cachePos ] ) ) { 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 ]; buffer[ i ] = m_cache[ m_cachePos ];
m_cachePos++; m_cachePos++;
i++; i++;
if ( m_cachePos >= m_cacheSize ) {
readNextBlock();
}
} }
buffer[ i ]='\n'; buffer[ i ]='\n';
m_cachePos++; m_cachePos++;