Changeset 539 for trunk/src/engine/program_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/program_manager.cc (modified) (3 diffs)

trunk/src/engine/program_manager.cc

@@ -18 +18 @@
 bool nv::program_manager::load_resource( lua::table_guard& table, shash64 id )
 {
-        NV_LOG_DEBUG( table.get_string("id") );
+        NV_LOG_DEBUG( table["id"].get_string() );
         string_buffer vsource;
         string_buffer fsource;
         string_buffer header( m_shader_head );
-        if ( table.is_table("common") )
+        if ( table["common"].is_table() )
         {
                 lua::table_guard common( table, "common" );
@@ -61 +61 @@
         c_file_system fs;
         string_buffer out( append );
-        if ( table.is_string( "files" ) )
+        if ( table["files"].is_string() )
         {
-                out.append( file_to_string( table.get_string( "files" ) ) );
+                out.append( file_to_string( table["files"].get_string() ) );
         }
-        else if ( table.is_table( "files" ) )
+        else if ( table["files"].is_table() )
         {
                 lua::table_guard inctable( table, "files" );
@@ -77 +77 @@
         }
 
-        if ( table.is_string( "file" ) )
+        if ( table["file"].is_string() )
         {
-                const_string data = file_to_string( table.get_string( "file" ) );
+                const_string data = file_to_string( table["file"].get_string() );
                 out.append( "#line 1\n" + data );
         }
 
-        if ( table.is_string( "source" ) )
+        if ( table["source"].is_string() )
         {
-                out.append( table.get_string( "source" ) );
+                out.append( table["source"].get_string() );
         }
         return out;