Changeset 474 for trunk

Timestamp:

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

Author:

epyon

Message:

• resource manager updates

Location:

trunk

Files:

• nv/core/resource.hh (added)
• nv/engine/program_manager.hh (modified) (1 diff)
• nv/engine/resource_system.hh (modified) (8 diffs)
• src/engine/program_manager.cc (modified) (2 diffs)
• src/engine/resource_system.cc (modified) (2 diffs)

trunk/nv/engine/program_manager.hh

@@ -27 +27 @@
                 virtual string_view get_resource_name() const { return "program"; }
         protected:
-                virtual resource_id load_resource( lua::table_guard& table );
+                virtual res_id load_resource( lua::table_guard& table );
                 string_buffer load_source( lua::table_guard& table, const string_view& append );
-                virtual void release( program p );
+                virtual void release( program* p );
         private:
                 context* m_context;

trunk/nv/engine/resource_system.hh

@@ -16 +16 @@
 #include <nv/common.hh>
 #include <nv/interface/context.hh>
+#include <nv/core/resource.hh>
 #include <nv/lua/lua_state.hh>
 #include <nv/stl/hash_store.hh>
@@ -23 +24 @@
 {
 
-        typedef uint32 resource_id;
-        typedef uint32 resource_type_id;
+        typedef uint32 res_id;
+        typedef uint32 res_type_id;
 
         class resource_system;
 
-        class resource_manager_base
+        class resource_manager_base : public resource_handler
         {
         public: 
@@ -37 +38 @@
                 virtual void clear() { m_names.clear(); }
                 void load_all();
-                resource_id load_resource( const string_view& id );
+                res_id load_resource( const string_view& id );
                 virtual ~resource_manager_base() {}
         protected:
-                virtual resource_id load_resource( lua::table_guard& table ) = 0;
+                virtual res_id load_resource( lua::table_guard& table ) = 0;
+
+//              virtual const void* lock( resource_id id, resource_type_id );
+                virtual void unlock( resource_id, resource_type_id ) {};
+                virtual void release( resource_id, resource_type_id ) {};
 
                 lua::state* m_lua;
-                hash_store< shash64, resource_id > m_names;
+                hash_store< shash64, res_id > m_names;
         };
 
@@ -50 +55 @@
         {
         public:
-                resource_manager() { m_data.push_back(T()); }
-                T get_resource( resource_id id )
+                resource_manager() { m_data.push_back(nullptr); }
+                T* get_resource( res_id id )
                 {
-                        return ( id < m_data.size() ? m_data[ id ] : T() );
+                        return ( id < m_data.size() ? m_data[ id ] : nullptr );
                 }
-                T get_resource( const string_view& id )
+                T* get_resource( const string_view& id )
                 {
                         auto m = m_names.find( id );
@@ -64 +69 @@
                         return get_resource( load_resource( id ) );
                 }
+                resource< T > get( const string_view& id )
+                {
+                        auto m = m_names.find( id );
+                        if ( m != m_names.end() )
+                        {
+                                return create< T >( id );
+                        }
+                        else
+                        {
+                                if ( get_resource( id ) != nullptr )
+                                {
+                                        return create< T >( id );
+                                }
+                        }
+//                      NV_ASSERT( false, "resource_manager.get failed!" );
+                        return resource<T>();
+                }
                 virtual void clear()
                 {
@@ -70 +92 @@
                                 release( m_data[i] );
                         m_data.clear();
-                        m_data.push_back( T() );
+                        m_data.push_back( nullptr );
                 }
+
                 virtual ~resource_manager() 
                 {
@@ -77 +100 @@
                 }
         protected:
-                virtual void release( T ) {}
+                virtual const void* lock( resource_id id, resource_type_id )
+                {
+                        auto m = m_names.find( id );
+                        if ( m != m_names.end() )
+                        {
+                                return m_data[m->second];
+                        }
+                        return nullptr;
+                }
 
-                resource_id add( T resource )
+                virtual void release( T* ) {}
+
+                res_id add( T* resource )
                 {
                         m_data.push_back( resource );
@@ -85 +118 @@
                 }
 
-                vector< T > m_data;
+                vector< T* > m_data;
         };
-
-
-        class resource_system
-        {
-        public:
-                explicit resource_system() : m_lua_state( nullptr ) { m_managers.push_back(nullptr); }
-                resource_type_id register_resource_type( const string_view& name, resource_manager_base* manager );
-                resource_type_id get_resource_type_id( const string_view& name ) const;
-                void initialize( lua::state* a_lua_state );
-                virtual ~resource_system();
-        protected:
-                vector< resource_manager_base* >     m_managers;
-                hash_store< shash64, resource_id > m_manager_names;
-                lua::state* m_lua_state; 
-        };
-
+        
 }
 

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()
-{
-
-}