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

Timestamp:

01/24/17 17:55:00 (8 years ago)

Author:

epyon

Message:

• temporary_proxy implemented
• table_guard now uses temporary_proxy as main read functionality

File:

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

trunk/src/engine/material_manager.cc

@@ -61 +61 @@
         material* m = new material;
 
-        if ( table.is_string( "path" ) )
+        if ( table["path"].is_string() )
         {
-                m->id = table.get_string128( "id" );
-                string128 path = table.get_string128( "path" );
+                m->id = table["id"].get_string128();
+                string128 path = table["path"].get_string128();
                 for ( uint32 i = 0; i < 5; ++i )
                         m->paths[i] = path;
@@ -85 +85 @@
         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" );
+                m->paths[ TEX_DIFFUSE  ] = table[ "diffuse"   ].get_string128();
+                m->paths[ TEX_NORMAL   ] = table[ "normal"    ].get_string128();
+                m->paths[ TEX_METALLIC ] = table[ "metallic"  ].get_string128();
+                m->paths[ TEX_ROUGHNESS] = table[ "roughness" ].get_string128();
+                m->paths[ TEX_EMISSIVE ] = table[ "emissive"  ].get_string128();
         }
         add( id, m );