Changeset 138 for trunk/src

Timestamp:

06/29/13 19:02:04 (12 years ago)

Author:

epyon

Message:

• io/std_stream - PROPER std_stream implementation
• io/std_stream - got rid of memmove
• formats/obj_loader - no copy on read, properly streamed

Location:

trunk/src

Files:

• formats/obj_loader.cc (modified) (2 diffs)
• io/std_stream.cc (modified) (4 diffs)

trunk/src/formats/obj_loader.cc

@@ -6 +6 @@
 
 #include "nv/formats/obj_loader.hh"
+#include "nv/io/std_stream.hh"
 #include <sstream>
 
@@ -187 +188 @@
         m_mesh = new mesh();
         mesh_obj_reader reader( m_mesh );
-        size_t size = source.size();
-        char* data  = new char[ size ];
-        source.read( data, 1, size );
-        std::string cache( data, size );
-        std::istringstream sstream( cache );
+        std_stream sstream( &source );
         reader.read_stream( sstream );
         m_size = reader.size;

trunk/src/io/std_stream.cc

@@ -9 +9 @@
 #include "nv/io/std_stream.hh"
 #include <algorithm>
-#include <cstring> // TODO: remove, see below
 
 using namespace nv;
 
-std_stream::std_stream( stream* source, bool owner /*= false*/, std::size_t bsize /*= 256*/, std::size_t put_back /*= 8 */ )
+std_streambuf::std_streambuf( stream* source, bool owner /*= false*/, std::size_t bsize /*= 256*/, std::size_t put_back /*= 8 */ )
         : m_stream( source )
         , m_owner( owner )
@@ -23 +22 @@
 }
 
-std_stream::~std_stream()
+std_streambuf::~std_streambuf()
 {
         if ( m_owner )
@@ -31 +30 @@
 }
 
-std_stream::int_type std_stream::underflow()
+std_streambuf::int_type std_streambuf::underflow()
 {
         if (gptr() < egptr())
@@ -45 +44 @@
         {
                 // Make arrangements for putback characters
-                // TODO: std::copy( egptr() - m_put_back, egptr(), base ); instead?
-                std::memmove(base, egptr() - m_put_back, m_put_back);
+                std::copy( egptr() - m_put_back, egptr(), base ); 
                 start += m_put_back;
         }