Changeset 433 for trunk/src/engine

Timestamp:

07/21/15 19:40:00 (10 years ago)

Author:

epyon

Message:

• string.hh split into separate files
• string.hh - removed std::string conversions (header still stays though)

Location:

trunk/src/engine

Files:

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

trunk/src/engine/particle_engine.cc

@@ -435 +435 @@
                                         {
                                                 data.affector_count--;
-                                                NV_LOG_WARNING( "Bad data passed to ", sub_type, " affector in particle system!" );
+                                                NV_LOG_WARNING( "Bad data passed to ", string_view( sub_type.c_str(), sub_type.size() ), " affector in particle system!" );
                                         }
                                 }
@@ -441 +441 @@
                                 {
                                         data.affector_count--;
-                                        NV_LOG_WARNING( "Unknown affector type in particle system! (", sub_type, ")" );
+                                        NV_LOG_WARNING( "Unknown affector type in particle system! (", string_view( sub_type.c_str(), sub_type.size() ), ")" );
                                 }
                         }

trunk/src/engine/program_manager.cc

@@ -37 +37 @@
         }
 
-        nv::program program = m_context->get_device()->create_program( string_view( vsource ), string_view( fsource ) );
+        nv::program program = m_context->get_device()->create_program( string_view( vsource.c_str(), vsource.size() ), string_view( fsource.c_str(), fsource.size() ) );
         return add( program );
 }

trunk/src/engine/resource_system.cc

@@ -12 +12 @@
 {
         m_lua = a_lua_state;
-        lua::register_storage( m_lua, get_storage_name(), string_view( "register_" + get_resource_name().to_string() ) );
+        std::string delete_me = "register_" + std::string( get_resource_name().data(), get_resource_name().size() );
+        lua::register_storage( m_lua, get_storage_name(), string_view( delete_me.c_str(), delete_me.size() ) );
 }