Changeset 539 for trunk/src/engine/resource_system.cc

Timestamp:

01/24/17 17:55:00 (8 years ago)

Author:

epyon

Message:

• temporary_proxy implemented
• table_guard now uses temporary_proxy as main read functionality

File:

• trunk/src/engine/resource_system.cc (modified) (2 diffs)

trunk/src/engine/resource_system.cc

@@ -27 +27 @@
         if ( do_clear ) clear();
         lua::table_guard table( m_lua, get_storage_name() );
-        uint32 count = table.get_unsigned( "__counter" );
+        uint32 count = table["__counter"].get_uint32();
         for ( auto i : range( count ) )
         {
                 lua::table_guard sub_table( table, i + 1 );
-                load_resource( sub_table, sub_table.get_string_hash_64( "id" ) );
+                shash64 id = sub_table["id"].get_shash64();
+                load_resource( sub_table, id );
         }
 }
@@ -39 +40 @@
         m_id_hash.clear();
         lua::table_guard table( m_lua, get_storage_name() );
-        uint32 count = table.get_unsigned( "__counter" );
+        uint32 count = table["__counter"].get_uint32();
         for ( auto i : range( count ) )
         {
                 lua::table_guard sub_table( table, i + 1 );
-                string64 id = sub_table.get_string64( "id" );
+                string64 id = sub_table["id"].get_string64();
                 NV_ASSERT( m_id_hash.find( id ) == m_id_hash.end(), "HASH COLLISION" );
                 m_id_hash[id] = id;