Changeset 361 for trunk/src/engine

Timestamp:

05/15/15 12:01:41 (10 years ago)

Author:

epyon

Message:

• more string_ref changes

Location:

trunk/src/engine

Files:

• particle_engine.cc (modified) (4 diffs)
• program_manager.cc (modified) (2 diffs)
• resource_system.cc (modified) (1 diff)

trunk/src/engine/particle_engine.cc

@@ -300 +300 @@
 void nv::particle_engine::load( lua::table_guard& table )
 {
-        std::string id = table.get_string( "id" );
+        std::string id = table.get_std_string( "id" );
         if ( id == "" )
         {
@@ -317 +317 @@
         data.affector_count  = 0;
 
-        std::string orientation = table.get_string( "orientation", "point" );
+        const_string orientation = table.get_string( "orientation", "point" );
         if ( orientation == "point" )                     { data.orientation = particle_orientation::POINT; }
         else if ( orientation == "oriented" )             { data.orientation = particle_orientation::ORIENTED; }
@@ -329 +329 @@
         }
 
-        std::string origin = table.get_string( "origin", "center" );
+        const_string origin = table.get_string( "origin", "center" );
         if      ( origin == "center" )        { data.origin = particle_origin::CENTER; }
         else if ( origin == "top_left" )      { data.origin = particle_origin::TOP_LEFT; }
@@ -353 +353 @@
         {
                 lua::table_guard element( table, i+1 );
-                std::string type     = element.get_string("type");
-                std::string sub_type = element.get_string("sub_type");
+                const_string type     = element.get_string("type");
+                std::string sub_type = element.get_std_string("sub_type");
                 if ( type == "emmiter" )
                 {

trunk/src/engine/program_manager.cc

@@ -49 +49 @@
         if ( table.is_string( "files" ) )
         {
-                out += nv::slurp( table.get_string( "files" ) );
+                out += nv::slurp( table.get_std_string( "files" ) );
         }
         else if ( table.is_table( "files" ) )
@@ -65 +65 @@
         if ( table.is_string( "file" ) )
         {
-                out += "#line 1\n"+nv::slurp( table.get_string( "file" ) );
+                out += "#line 1\n" + nv::slurp( table.get_std_string( "file" ) );
         }
 
         if ( table.is_string( "source" ) )
         {
-                out += table.get_string( "source" );
+                out += table.get_std_string( "source" );
         }
 }

trunk/src/engine/resource_system.cc

@@ -35 +35 @@
                 lua::table_guard sub_table( table, i+1 );
                 resource_id rid = load_resource( sub_table );
-                if ( rid != 0 ) m_names[ sub_table.get_string("id") ] = rid;
+                if ( rid != 0 ) m_names[ sub_table.get_std_string("id") ] = rid;
         }
 }