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

Timestamp:

04/29/16 12:42:28 (9 years ago)

Author:

epyon

Message:

• mass update (will try to do atomic from now)

File:

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

trunk/src/engine/material_manager.cc

@@ -39 +39 @@
 
                 // HACK
-                for ( uint32 i = 0; i < 5; ++i )
+                for ( uint32 i = 0; i < 8; ++i )
                         if ( result->textures[i].is_nil() )
                                 result->textures[i] = m_default;
@@ -59 +59 @@
 bool material_manager::load_resource( nv::lua::table_guard& table, nv::shash64 id )
 {
+        c_file_system fs;
         material* m = new material;
-        m->paths[ TEX_DIFFUSE ]  = table.get_string128( "diffuse" );
-        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" );
+
+        if ( table.is_string( "path" ) )
+        {
+                string128 path = table.get_string128( "path" );
+                for ( uint32 i = 0; i < 5; ++i )
+                        m->paths[i] = path;
+                m->paths[TEX_DIFFUSE].append( "_diffuse.png" );
+                m->paths[TEX_NORMAL].append( "_normal.png" );
+                m->paths[TEX_METALLIC].append( "_metallic.png" );
+                m->paths[TEX_ROUGHNESS].append( "_roughness.png" );
+                m->paths[TEX_EMISSIVE].append( "_emissive.png" );
+                for ( uint32 i = 0; i < 5; ++i )
+                {
+                        if ( !fs.exists( m->paths[i] ) )
+                        {
+                                if ( i != TEX_EMISSIVE )
+                                        NV_LOG_ERROR( "Texture file not found! : ", m->paths[i] );
+                                m->paths[i].clear();
+                        }
+                }
+        }
+        else
+        {
+                m->paths[ TEX_DIFFUSE ]  = table.get_string128( "diffuse" );
+                m->paths[ TEX_NORMAL ]   = table.get_string128( "normal" );
+                m->paths[ TEX_METALLIC]  = table.get_string128( "metallic" );
+                m->paths[ TEX_ROUGHNESS] = table.get_string128( "roughness" );
+                m->paths[ TEX_EMISSIVE ] = table.get_string128( "emissive" );
+        }
         add( id, m );
         return true;
 }
+