Changeset 279

Timestamp:

07/08/14 16:10:36 (11 years ago)

Author:

epyon

Message:

• const correctness for stream::write
• string_table and string_table_creator

Location:

trunk

Files:

• nv/interface/stream.hh (modified) (1 diff)
• nv/io/c_stream.hh (modified) (1 diff)
• nv/io/string_table.hh (added)
• src/formats/assimp_loader.cc (modified) (1 diff)
• src/io/c_stream.cc (modified) (1 diff)

trunk/nv/interface/stream.hh

@@ -32 +32 @@
                 virtual ~stream() {}
                 virtual size_t read( void* buffer, size_t size, size_t count ) = 0;
-                virtual size_t write( void* buffer, size_t size, size_t count ) = 0;
+                virtual size_t write( const void* buffer, size_t size, size_t count ) = 0;
                 virtual bool seek( long offset, origin orig ) = 0;
                 virtual size_t tell() = 0;

trunk/nv/io/c_stream.hh

@@ -29 +29 @@
                 virtual ~c_stream();
                 virtual size_t read( void* buffer, size_t size, size_t count );
-                virtual size_t write( void* buffer, size_t size, size_t count );
+                virtual size_t write( const void* buffer, size_t size, size_t count );
                 virtual bool seek( long offset, origin orig );
                 virtual size_t tell();

trunk/src/formats/assimp_loader.cc

@@ -391 +391 @@
         a_data.parent_id = parent_id;
         a_data.bone_id = -1;
+        // This value is ignored by the create_transformed_keys, but needed by create_direct_keys!
+        // TODO: find a common solution!
+        //       This is bad because create_transformed_keys never uses node-transformations for
+        //       node's without keys
         a_data.transform = nv::assimp_mat4_cast( node->mTransformation );
 

trunk/src/io/c_stream.cc

@@ -40 +40 @@
 }
 
-size_t c_stream::write( void* buffer, size_t size, size_t count )
+size_t c_stream::write( const void* buffer, size_t size, size_t count )
 {
         NV_ASSERT( buffer != nullptr && size != 0 && count != 0, "Bad parameter passed to write!" );