Changeset 433 for trunk/src/gui

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/gui

Files:

• gui_environment.cc (modified) (1 diff)
• gui_gfx_renderer.cc (modified) (4 diffs)
• gui_renderer.cc (modified) (1 diff)
• gui_style.cc (modified) (1 diff)

trunk/src/gui/gui_environment.cc

@@ -30 +30 @@
 }
 
-void nv::gui::environment::load_style( const std::string& filename )
+void nv::gui::environment::load_style( const string_view& filename )
 {
         m_renderer->load_style( filename );

trunk/src/gui/gui_gfx_renderer.cc

@@ -187 +187 @@
 }
 
-nv::size_t gfx_renderer::load_font( const std::string& filename, nv::size_t size )
-{
-        std::string id_name( filename );
+nv::size_t gfx_renderer::load_font( const string_view& filename, nv::size_t size )
+{
+        std::string id_name( filename.data(), filename.size() );
         char buffer[8]; size_t len = nv::sint32_to_buffer( sint32( size ), buffer );
         id_name.append( std::string( buffer, len ) );
-        auto i = m_font_names.find( id_name );
+        string_view id( id_name.c_str(), id_name.size() );
+        auto i = m_font_names.find( id );
         if ( i != m_font_names.end() )
         {
@@ -198 +199 @@
         }
         size_t result = m_fonts.size();
-        texture_font* f = new texture_font( &m_atlas, filename.c_str(), static_cast<float>( size ) );
+        texture_font* f = new texture_font( &m_atlas, filename.data(), static_cast<float>( size ) );
         f->load_glyphs( "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ " );
         m_fonts.push_back( f );
         m_reupload = true;
-        m_font_names[id_name] = result;
+        m_font_names[ id ] = result;
         return result;
 }
 
-nv::size_t gfx_renderer::load_image( const std::string& filename )
+nv::size_t gfx_renderer::load_image( const string_view& filename )
 {
         auto i = m_image_names.find( filename );
@@ -253 +254 @@
                 if ( m_style.get( e, "skin", selector, path ) )
                 {
-                        size_t image_id = load_image( path );
+                        size_t image_id = load_image( string_view( path.c_str(), path.size() ) );
                         const image_info* image = get_image( image_id );
                         if ( image )
@@ -318 +319 @@
                         if ( m_style.get( e, "text_color", selector, color ) && m_style.get( e, "text_font", selector, path ) && m_style.get( e, "text_size", selector, border ) )
                         {
-                                size_t font_id = load_font( path, size_t( border ) );
+                                size_t font_id = load_font( string_view( path.c_str(), path.size() ), size_t( border ) );
                                 texture_font* font = get_font( font_id );
                                 position p = abs.ul + position( 0, border );

trunk/src/gui/gui_renderer.cc

@@ -7 +7 @@
 #include "nv/gui/gui_renderer.hh"
 
-void nv::gui::renderer::load_style( const std::string& filename )
+void nv::gui::renderer::load_style( const string_view& filename )
 {
         m_style.load_style( filename );

trunk/src/gui/gui_style.cc

@@ -16 +16 @@
 }
 
-void style::load_style( const std::string& filename )
+void style::load_style( const string_view& filename )
 {
         m_lua.do_file( filename );