Changeset 382 for trunk/src/engine

Timestamp:

06/01/15 20:39:35 (10 years ago)

Author:

epyon

Message:

• massive C++11 update (upgrade to MSVC 2015)
• array/dynamic_array - fully based on memory containers (will be moved) (in progress)

Location:

trunk/src/engine

Files:

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

trunk/src/engine/particle_engine.cc

@@ -368 +368 @@
                                 {
                                         edata.emmiter_func = nv_particle_emmiter_point;
-                                        NV_LOG_WARNING( "Unknown emmiter type in particle system! (", sub_type, ")" );
+                                        NV_LOG_WARNING( "Unknown emmiter type in particle system! (", sub_type.c_str(), ")" );
                                 }
 

trunk/src/engine/program_manager.cc

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

trunk/src/engine/resource_system.cc

@@ -12 +12 @@
 {
         m_lua = a_lua_state;
-        lua::register_storage( m_lua, get_storage_name(), "register_" + get_resource_name().to_string() );
+        lua::register_storage( m_lua, get_storage_name(), string_ref( "register_" + get_resource_name().to_string() ) );
 }