Changeset 505 for trunk/src/engine/material_manager.cc

Timestamp:

07/12/16 20:22:23 (9 years ago)

Author:

epyon

Message:

• several STL updates
• several minor fixes

File:

• trunk/src/engine/material_manager.cc (modified) (3 diffs)

trunk/src/engine/material_manager.cc

@@ -14 +14 @@
 
 nv::gpu_material_manager::gpu_material_manager( context* context, material_manager* matmgr, image_manager* imgmgr )
-        : m_context( context )
-        , m_material_manager( matmgr )
+        : dependant_resource_manager( matmgr ), m_context( context )
         , m_image_manager( imgmgr )
 {
@@ -23 +22 @@
 }
 
-bool gpu_material_manager::load_resource( const string_view& id )
+nv::resource< nv::gpu_material > nv::gpu_material_manager::create_resource( resource< material > m )
 {
-        if ( auto mat = m_material_manager->get( id ).lock() )
+        resource_id id = m.id();
+        if ( auto mat = m.lock() )
         {
                 gpu_material* result = new gpu_material;
@@ -39 +39 @@
 
                 // HACK
-                for ( uint32 i = 0; i < 8; ++i )
-                        if ( result->textures[i].is_nil() )
-                                result->textures[i] = m_default;
-                        
-                add( id, result );
-                return true;
+                for ( uint32 i = 0; i < 8; ++i )
+                        if ( result->textures[i].is_nil() )
+                                result->textures[i] = m_default;
+
+                return add( id, result );
         }
-        return false;
+        return resource< nv::gpu_material >();
 }