Changeset 474 for trunk/src

Timestamp:

10/09/15 14:07:43 (10 years ago)

Author:

epyon

Message:

• resource manager updates

Location:

trunk/src/engine

Files:

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

trunk/src/engine/program_manager.cc

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

trunk/src/engine/resource_system.cc

@@ -16 +16 @@
 }
 
-nv::resource_id nv::resource_manager_base::load_resource( const string_view& id )
+nv::res_id nv::resource_manager_base::load_resource( const string_view& id )
 {
         lua::table_guard table( m_lua, lua::path( get_storage_name(), id ) );
-        resource_id rid = load_resource( table );
+        res_id rid = load_resource( table );
         if ( rid != 0 ) m_names[ id ] = rid;
         return rid;
@@ -32 +32 @@
         {
                 lua::table_guard sub_table( table, i+1 );
-                resource_id rid = load_resource( sub_table );
+                res_id rid = load_resource( sub_table );
                 if ( rid != 0 ) m_names[ sub_table.get_string_hash_64("id") ] = rid;
         }
 }
-
-nv::resource_type_id nv::resource_system::register_resource_type( const string_view& /*name*/, resource_manager_base* /*manager*/ )
-{
-        return 0;
-}
-
-nv::resource_type_id nv::resource_system::get_resource_type_id( const string_view& /*name*/ ) const
-{
-        return 0;
-}
-
-void nv::resource_system::initialize( lua::state* /*a_lua_state*/ )
-{
-
-}
-
-nv::resource_system::~resource_system()
-{
-
-}