Changeset 438 for trunk/src/gl/gl_device.cc

Timestamp:

07/23/15 17:29:49 (10 years ago)

Author:

epyon

Message:

• massive amount of std::string removal
• removed slurp, use filesystem::slurp instead
• lua_values const_string support
• several bugfixes
• program_manager and shader loading without std::string/std::stream

File:

• trunk/src/gl/gl_device.cc (modified) (1 diff)

trunk/src/gl/gl_device.cc

@@ -17 +17 @@
 gl_device::gl_device()
 {
-        m_shader_header  = "#version 120\n";
+        m_shader_header.append( "#version 120\n" );
         for ( auto& i : get_uniform_factory() ) 
-                m_shader_header += "uniform "+datatype_to_glsl_type( i.second->get_datatype() )+" "+ std::string( i.first.data(), i.first.size() ) +";\n";
+                m_shader_header.append( "uniform "+datatype_to_glsl_type( i.second->get_datatype() )+" "+ i.first +";\n" );
         for ( auto& i : get_link_uniform_factory() ) 
-                m_shader_header += "uniform sampler2D "+std::string( i.first.data(), i.first.size() ) +";\n";
+                m_shader_header.append( "uniform sampler2D "+i.first +";\n" );
 }