Changeset 361 for trunk

Timestamp:

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

Author:

epyon

Message:

• more string_ref changes

Location:

trunk

Files:

• nv/gl/gl_device.hh (modified) (2 diffs)
• nv/interface/device.hh (modified) (1 diff)
• nv/lua/lua_state.hh (modified) (1 diff)
• src/engine/particle_engine.cc (modified) (4 diffs)
• src/engine/program_manager.cc (modified) (2 diffs)
• src/engine/resource_system.cc (modified) (1 diff)
• src/gl/gl_device.cc (modified) (4 diffs)
• src/lua/lua_state.cc (modified) (1 diff)

trunk/nv/gl/gl_device.hh

@@ -40 +40 @@
 
                 gl_device();
-                virtual image_data* create_image_data( const std::string& filename ); // temporary
+                virtual image_data* create_image_data( string_ref filename ); // temporary
                 virtual image_data* create_image_data( const uint8* data, uint32 size ); // temporary
 
-                virtual program create_program( const string& vs_source, const string& fs_source );
+                virtual program create_program( string_ref vs_source, string_ref fs_source );
                 virtual buffer create_buffer( buffer_type type, buffer_hint hint, size_t size, const void* source = nullptr );
                 virtual texture create_texture( texture_type type, ivec2 size, image_format aformat, sampler asampler, void* data = nullptr );
@@ -62 +62 @@
         
         private:
-                bool compile( gl_program_info* p, const string& vertex_program, const string& fragment_program );
+                bool compile( gl_program_info* p, string_ref vertex_program, string_ref fragment_program );
+                bool compile( uint32 sh_type, string_ref shader_code, unsigned& glid );
                 void update_uniforms( gl_program_info* p );
                 void load_attributes( gl_program_info* p );
                 void load_uniforms( gl_program_info* p );
-                bool compile( uint32 sh_type, const std::string& shader_code, unsigned& glid );
                 std::string m_shader_header;
                 handle_store< gl_texture_info, texture >         m_textures;

trunk/nv/interface/device.hh

@@ -156 +156 @@
                         initialize_engine_uniforms();
                 }
-                virtual program create_program( const string& vs_source, const string& fs_source ) = 0;
+                virtual program create_program( string_ref vs_source, string_ref fs_source ) = 0;
                 virtual buffer create_buffer( buffer_type type, buffer_hint hint, size_t size, const void* source = nullptr ) = 0;
                 virtual texture create_texture( texture_type type, ivec2 size, image_format aformat, sampler asampler, void* data = nullptr ) = 0;
                 // TODO: remove?
                 virtual texture create_texture( ivec2 size, image_format aformat, sampler asampler, void* data = nullptr ) { return create_texture( TEXTURE_2D, size, aformat, asampler, data ); }
-                virtual image_data* create_image_data( const std::string& filename ) = 0; // temporary
+                virtual image_data* create_image_data( string_ref filename ) = 0; // temporary
                 virtual image_data* create_image_data( const uint8* data, uint32 size ) = 0; // temporary
                 virtual void release( texture ) = 0;

trunk/nv/lua/lua_state.hh

@@ -296 +296 @@
                         size_t get_size();
                         bool has_field( string_ref element );
-                        std::string get_string( string_ref element, string_ref defval = string_ref() );
+                        std::string get_std_string( string_ref element, string_ref defval = string_ref() );
+                        const_string get_string( string_ref element, string_ref defval = string_ref() );
                         char get_char( string_ref element, char defval = ' ' );
                         int get_integer( string_ref element, int defval = 0 );

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;
         }
 }

trunk/src/gl/gl_device.cc

@@ -22 +22 @@
 }
 
-program gl_device::create_program( const string& vs_source, const string& fs_source )
+program gl_device::create_program( string_ref vs_source, string_ref fs_source )
 {
         program result = m_programs.create();
@@ -35 +35 @@
 // this is a temporary function that will be removed once we find a way to 
 // pass binary file data around
-image_data* gl_device::create_image_data( const std::string& filename )
+image_data* gl_device::create_image_data( string_ref filename )
 {
         load_sdl_image_library();
-        SDL_Surface* image = IMG_Load( filename.c_str() );
+        SDL_Surface* image = IMG_Load( filename.data() );
         if (!image)
         {
-                NV_LOG( LOG_ERROR, "Image file " << filename.c_str() << " not found!" );
+                NV_LOG( LOG_ERROR, "Image file " << filename << " not found!" );
                 return nullptr;
         }
@@ -254 +254 @@
 }
 
-bool nv::gl_device::compile( gl_program_info* p, const string& vertex_program, const string& fragment_program )
+bool nv::gl_device::compile( gl_program_info* p, string_ref vertex_program, string_ref fragment_program )
 {
         if (!compile( GL_VERTEX_SHADER,   vertex_program, p->glidv ))   { return false; }
@@ -397 +397 @@
 }
 
-bool nv::gl_device::compile( uint32 sh_type, const std::string& shader_code, unsigned& glid )
+bool nv::gl_device::compile( uint32 sh_type, string_ref shader_code, unsigned& glid )
 {
         glid = glCreateShader( sh_type );
 
-        const char* pc = shader_code.c_str();
-
-        glShaderSource( glid,   1, &pc, 0 );
+        const char* pc = shader_code.data();
+        int l = shader_code.length();
+
+        glShaderSource( glid, 1, &pc, &l );
         glCompileShader( glid );
 

trunk/src/lua/lua_state.cc

@@ -179 +179 @@
 }
 
-string lua::table_guard::get_string( string_ref element, string_ref defval /*= string_ref() */ )
-{
-        lua_getfield( m_state, -1, element.data() );
-        string result( ( lua_type( m_state, -1 ) == LUA_TSTRING ) ? lua_tostring( m_state, -1 ) : defval.to_string() );
-        lua_pop( m_state, 1 );
-        return result;
+string lua::table_guard::get_std_string( string_ref element, string_ref defval /*= string_ref() */ )
+{
+        lua_getfield( m_state, -1, element.data() );
+        size_t l = 0;
+        const char* str = nullptr;
+        if ( lua_type( m_state, -1 ) == LUA_TSTRING )
+        {
+                str = lua_tolstring( m_state, -1, &l );
+        }
+        else
+        {
+                l = defval.size();
+                str = defval.data();
+        }
+        std::string result( str, l );
+        lua_pop( m_state, 1 );
+        return result;
+}
+
+const_string lua::table_guard::get_string( string_ref element, string_ref defval /*= string_ref() */ )
+{
+        lua_getfield( m_state, -1, element.data() );
+        size_t l = 0;
+        const char* str = nullptr;
+        if ( lua_type( m_state, -1 ) == LUA_TSTRING )
+        {
+                str = lua_tolstring( m_state, -1, &l );
+        }
+        else
+        {
+                l = defval.size();
+                str = defval.data();
+        }
+        const_string result( str, l );
+        lua_pop( m_state, 1 );
+        return result;
 }