Changeset 486 for trunk/src/engine

Timestamp:

02/24/16 18:47:54 (9 years ago)

Author:

epyon

Message:

• mass update once again...

Location:

trunk/src/engine

Files:

• animation.cc (added)
• material_manager.cc (modified) (3 diffs)
• resource_system.cc (modified) (1 diff)

trunk/src/engine/material_manager.cc

@@ -12 +12 @@
 using namespace nv;
 
+
+nv::gpu_material_manager::gpu_material_manager( context* context, material_manager* matmgr, image_manager* imgmgr )
+        : m_context( context )
+        , m_material_manager( matmgr )
+        , m_image_manager( imgmgr )
+{
+        uint8 data[2 * 2 * 3];
+        nv::raw_fill_n( data, 2 * 2 * 3, 0 );
+        m_default = m_context->get_device()->create_texture( ivec2(2,2), nv::image_format( nv::RGB ), nv::sampler(), data );
+}
+
 bool gpu_material_manager::load_resource( const string_view& id )
 {
@@ -20 +31 @@
                 for ( uint32 i = 0; i < size( mat->paths ); ++i )
                         if ( !mat->paths[i].empty() )
+                        {
                                 if ( auto data = m_image_manager->get( mat->paths[i] ).lock() )
                                 {
                                         result->textures[i] = m_context->get_device()->create_texture( &*data, smp );
                                 }
+                        }
+
+                // HACK
+                for ( uint32 i = 0; i < 5; ++i )
+                        if ( result->textures[i].is_nil() )
+                                result->textures[i] = m_default;
+                        
                 add( id, result );
                 return true;
@@ -44 +63 @@
         m->paths[ TEX_SPECULAR ] = table.get_string128( "specular" );
         m->paths[ TEX_NORMAL ]   = table.get_string128( "normal" );
+        m->paths[ TEX_EMISSIVE ] = table.get_string128( "emissive" );
         m->paths[ TEX_GLOSS ]    = table.get_string128( "gloss" );
         add( id, m );

trunk/src/engine/resource_system.cc

@@ -23 +23 @@
 }
 
-void nv::lua_resource_manager_base::load_all()
+void nv::lua_resource_manager_base::load_all( bool do_clear )
 {
-        clear();
+        if ( do_clear ) clear();
         lua::table_guard table( m_lua, get_storage_name() );
         uint32 count = table.get_unsigned( "__counter" );