Changeset 477 for trunk/src/engine

Timestamp:

10/23/15 19:35:39 (10 years ago)

Author:

epyon

Message:

• resource handling rewrite
• skeletal_mesh/mesh_data updates

Location:

trunk/src/engine

Files:

• program_manager.cc (modified) (2 diffs)
• resource_system.cc (modified) (3 diffs)

trunk/src/engine/program_manager.cc

@@ -16 +16 @@
 }
 
-nv::res_id nv::program_manager::load_resource( lua::table_guard& table )
+bool nv::program_manager::load_resource( lua::table_guard& table, shash64 id )
 {
         NV_LOG_DEBUG( table.get_string("id") );
@@ -36 +36 @@
         }
 
-        nv::program* program = new nv::program( m_context->get_device()->create_program( vsource, fsource ) );
-        return add( program );
+        add( m_context->get_device()->create_program( vsource, fsource ), id );
+        return true;
 }
 
-void nv::program_manager::release( program* p )
+void nv::program_manager::release( program p )
 {
-        m_context->get_device()->release( *p );
-        delete p;
+        m_context->get_device()->release( p );
 }
 

trunk/src/engine/resource_system.cc

@@ -9 +9 @@
 #include "nv/lua/lua_nova.hh"
 
-void nv::resource_manager_base::initialize( lua::state* a_lua_state )
+void nv::lua_resource_manager_base::initialize( lua::state* a_lua_state )
 {
         m_lua = a_lua_state;
@@ -16 +16 @@
 }
 
-nv::res_id nv::resource_manager_base::load_resource( const string_view& id )
+bool nv::lua_resource_manager_base::load_resource( const string_view& id )
 {
         lua::table_guard table( m_lua, lua::path( get_storage_name(), id ) );
-        res_id rid = load_resource( table );
-        if ( rid != 0 ) m_names[ id ] = rid;
-        return rid;
+        load_resource( table, id );
+        return true;
 }
 
-void nv::resource_manager_base::load_all()
+void nv::lua_resource_manager_base::load_all()
 {
         clear();
@@ -31 +30 @@
         for ( auto i : range( count ) )
         {
-                lua::table_guard sub_table( table, i+1 );
-                res_id rid = load_resource( sub_table );
-                if ( rid != 0 ) m_names[ sub_table.get_string_hash_64("id") ] = rid;
+                lua::table_guard sub_table( table, i + 1 );
+                load_resource( sub_table, sub_table.get_string_hash_64( "id" ) );
         }
 }
+