Changeset 441

Timestamp:

07/24/15 11:13:32 (10 years ago)

Author:

epyon

Message:

• md5 support moved to legacy code
• more std::string removal
• minor fixes in algorithm

Location:

trunk

Files:

• legacy/md5_loader.cc (moved) (moved from trunk/src/formats/md5_loader.cc)
• legacy/md5_loader.hh (moved) (moved from trunk/nv/formats/md5_loader.hh)
• legacy/md5_test (moved) (moved from trunk/tests/md5_test)
• nv/base/capi.hh (modified) (2 diffs)
• nv/gfx/skeletal_mesh.hh (modified) (1 diff)
• nv/lua/lua_raw.hh (modified) (1 diff)
• nv/stl/algorithm/raw.hh (modified) (4 diffs)
• nv/stl/string/short_string.hh (modified) (2 diffs)
• src/lua/lua_map_tile.cc (modified) (2 diffs)
• src/lua/lua_raw.cc (modified) (1 diff)

trunk/nv/base/capi.hh

@@ -102 +102 @@
         inline void* nvmemcpy( void *dest, const void *src, size_t count )
         {
+                if ( dest == src ) return dest;
                 return NV_CAPI_CALL( memcpy )( dest, src, count );
         }
@@ -107 +108 @@
         inline void* nvmemmove( void *dest, const void *src, size_t count )
         {
+                if ( dest == src ) return dest;
                 return NV_CAPI_CALL( memmove )( dest, src, count );
         }

trunk/nv/gfx/skeletal_mesh.hh

@@ -11 +11 @@
 #include <nv/interface/context.hh>
 #include <nv/interface/animated_mesh.hh>
-#include <nv/formats/md5_loader.hh>
 #include <nv/formats/nmd_loader.hh>
+#include <nv/stl/array.hh>
 
 namespace nv
 {
+        
+        // TODO: remove or make generic
+        struct md5_vtx_pnt
+        {
+                vec3 position;
+                vec3 normal;
+                vec3 tangent;
+        };
+
+        // TODO: remove or make generic
+        struct md5_key_t
+        {
+                transform tform;
+        };
+
+        // TODO: remove or make generic
+        struct md5_vtx_t
+        {
+                vec2 texcoord;
+        };
+
+        // TODO: remove or make generic
+        struct md5_vtx_pntiw
+        {
+                vec3  position;
+                vec3  normal;
+                vec3  tangent;
+                ivec4 boneindex;
+                vec4  boneweight;
+        };
+
+
         class skeletal_mesh : public animated_mesh
         {

trunk/nv/lua/lua_raw.hh

@@ -29 +29 @@
 }
 
-// TODO: this is not thread safe!
-nv::string_view nlua_typecontent( lua_State* L, int idx );
+nv::string64 nlua_typecontent( lua_State* L, int idx );
 void nlua_shallowmerge( lua_State *L, int index );
 void nlua_shallowcopy( lua_State *L, int index );

trunk/nv/stl/algorithm/raw.hh

@@ -34 +34 @@
         T* raw_copy( const T* first, const T* last, T* out )
         {
-                NV_ASSERT_DEBUG( last - first > 0, "raw_copy range fail!" );
+                NV_ASSERT_DEBUG( last - first >= 0, "raw_copy range fail!" );
                 return static_cast<T*>( nvmemcpy( out, first, detail::byte_distance( first, last ) ) ) + ( last - first );
         }
@@ -47 +47 @@
         T* raw_alias_copy( const T* first, const T* last, T* out )
         {
-                NV_ASSERT_DEBUG( last - first > 0, "raw_alias_copy range fail!" );
+                NV_ASSERT_DEBUG( last - first >= 0, "raw_alias_copy range fail!" );
                 return static_cast<T*>( nvmemmove( out, first, detail::byte_distance( first, last ) ) ) + ( last - first );
         }
@@ -60 +60 @@
         T* raw_zero( T* first, T* last )
         {
-                NV_ASSERT_DEBUG( last - first > 0, "raw_zero range fail!" );
+                NV_ASSERT_DEBUG( last - first >= 0, "raw_zero range fail!" );
                 return static_cast<T*>( nvmemset( first, 0, detail::byte_distance( first, last ) ) ) + ( last - first );
         }
@@ -73 +73 @@
         T* raw_fill( T* first, T* last, unsigned char value )
         {
-                NV_ASSERT_DEBUG( last - first > 0, "raw_fill range fail!" );
+                NV_ASSERT_DEBUG( last - first >= 0, "raw_fill range fail!" );
                 return static_cast<T*>( nvmemset( first, value, detail::byte_distance( first, last ) ) ) + ( last - first );
         }

trunk/nv/stl/string/short_string.hh

@@ -145 +145 @@
                 }
 
+                iterator erase( iterator position )
+                {
+                        iterator result = Storage::erase( position );
+                        this->data()[this->size()] = 0;
+                        return result;
+                }
+
+                iterator erase( iterator first, iterator last )
+                {
+                        iterator result = Storage::erase( first, last );
+                        this->data()[this->size()] = 0;
+                        return result;
+                }
+
         protected:
 
@@ -163 +177 @@
                 using Storage::assign;
                 using Storage::insert;
-                using Storage::erase;
                 using Storage::pop_back;
                 using Storage::push_back;

trunk/src/lua/lua_map_tile.cc

@@ -17 +17 @@
 #include "nv/lua/lua_raw.hh"
 
-// TODO: REMOVE
-#include <string>
-
 static const char* NLUA_MAP_TILE_METATABLE = "map_tile";
 
@@ -58 +55 @@
         nv::map_area* map_area = nv::lua::detail::to_map_area( L, 3 );
         lua_settop( L, 2 );
-        nv::string_view lts = nv::trimmed( lua_tostring( L, 1 ) );
-        std::string code( lts.data(), lts.size() );
-        std::string chars( " \r\t" );
+        nv::string_buffer code( nv::trimmed( lua_tostring( L, 1 ) ) );
+        nv::string_view chars( " \r\t" );
         code.erase( nv::remove_if( code.begin(), code.end(),
                 [&chars] ( const char& c )
         {
-                return chars.find( c ) != std::string::npos;
+                return chars.find( c ) != nv::string_view::npos;
         } ), code.end() );
 

trunk/src/lua/lua_raw.cc

@@ -7 +7 @@
 #include "nv/lua/lua_raw.hh"
 
-nv::string_view nlua_typecontent( lua_State* L, int idx )
+nv::string64 nlua_typecontent( lua_State* L, int idx )
 {
         int type = lua_type( L, idx );
         switch ( type )
         {
-        case LUA_TNONE          : return "NONE"; 
-        case LUA_TNIL               : return "NIL"; 
-        case LUA_TBOOLEAN               : return lua_toboolean( L, idx ) == 0 ? "false" : "true"; 
-        //case LUA_TLIGHTUSERDATA       : return std::to_string( nv::uint64( lua_touserdata( L, idx ) ) ); 
-        //case LUA_TNUMBER              : return std::to_string( lua_tonumber( L, idx ) ); 
-        // TODO: copy to buffer?
-        case LUA_TSTRING                : return nlua_tostringview( L, idx ); 
-        case LUA_TTABLE             : return "TABLE"; 
-        case LUA_TFUNCTION              : return "FUNCTION"; 
-//      case LUA_TUSERDATA              : return std::to_string( nv::uint64( lua_touserdata( L, idx ) ) ); 
-        case LUA_TTHREAD                : return "THREAD"; 
+        case LUA_TNONE          : return nv::string64( "NONE" );
+        case LUA_TNIL               : return nv::string64( "NIL" );
+        case LUA_TBOOLEAN               : return nv::string64( lua_toboolean( L, idx ) == 0 ? "false" : "true" );
+        case LUA_TSTRING                : return nv::string64( nlua_tostringview( L, idx ) );
+        case LUA_TTABLE             : return nv::string64( "TABLE" );
+        case LUA_TFUNCTION              : return nv::string64( "FUNCTION" );
+        case LUA_TTHREAD                : return nv::string64( "THREAD" );
         default : break; 
         }
-        static char buffer_data[64];
-        nv::array_ref< char > buffer( buffer_data, 64 );
         if ( type == LUA_TLIGHTUSERDATA || type == LUA_TUSERDATA )
         {
+                nv::string64 buffer;
                 size_t l = nv::uint64_to_buffer( buffer, nv::uint64( lua_touserdata( L, idx ) ) );
-                return nv::string_view( buffer.data(), l );
+                return buffer;
         }
         else if ( type == LUA_TNUMBER )
         {
+                nv::string64 buffer;
                 size_t l = nv::f64_to_buffer( buffer, lua_tonumber( L, idx ) );
-                return nv::string_view( buffer.data(), l );
-        }
-        return "UNKNOWN!";
+                return buffer;
+        }
+        return nv::string64( "UNKNOWN!" );
 }