Changeset 364 for trunk/src

Timestamp:

05/15/15 12:52:52 (10 years ago)

Author:

epyon

Message:

• fixed compilation on clang
• cleared all clang warnings (except fix_me's)

Location:

trunk/src

Files:

• engine/resource_system.cc (modified) (1 diff)
• gl/gl_context.cc (modified) (1 diff)
• gl/gl_device.cc (modified) (2 diffs)
• gui/gui_ascii_renderer.cc (modified) (3 diffs)
• gui/gui_gfx_renderer.cc (modified) (2 diffs)
• lua/lua_handle.cc (modified) (3 diffs)

trunk/src/engine/resource_system.cc

@@ -12 +12 @@
 {
         m_lua = a_lua_state;
-        std::string constructor_name( get_resource_name() );
-        constructor_name = "register_"+constructor_name;
-        int correct = 0;
-        lua::register_storage( m_lua, get_storage_name(), constructor_name );
+        lua::register_storage( m_lua, get_storage_name(), "register_" + get_resource_name().to_string() );
 }
 

trunk/src/gl/gl_context.cc

@@ -734 +734 @@
                 if ( slots[i] > OUTPUT_7 ) buffers[i] = 0;
         }
-        glDrawBuffers( count, buffers );
+        glDrawBuffers( (GLsizei)count, buffers );
 }
 

trunk/src/gl/gl_device.cc

@@ -56 +56 @@
 {
         load_sdl_image_library();
-        SDL_Surface* image = IMG_LoadTyped_RW( SDL_RWFromMem( (void*)data, size ), 1, "tga" );
+        SDL_Surface* image = IMG_LoadTyped_RW( SDL_RWFromMem( (void*)data, (int)size ), 1, "png" );
         if ( !image )
         {
@@ -402 +402 @@
 
         const char* pc = shader_code.data();
-        int l = shader_code.length();
+        int l = (int)shader_code.length();
 
         glShaderSource( glid, 1, &pc, &l );

trunk/src/gui/gui_ascii_renderer.cc

@@ -80 +80 @@
                 for ( int x = 0; x < abs.get_width(); ++x )
                 {
-                        m_terminal->print( position( abs.ul.y, abs.ul.x + x ), er->border_color, er->border_chars[0] );
-                        m_terminal->print( position( abs.lr.y, abs.ul.x + x ), er->border_color, er->border_chars[1] );
+                        m_terminal->print( position( abs.ul.y, abs.ul.x + x ), er->border_color, (unsigned char)er->border_chars[0] );
+                        m_terminal->print( position( abs.lr.y, abs.ul.x + x ), er->border_color, (unsigned char)er->border_chars[1] );
                 }
 
                 for ( int y = 0; y < abs.get_height(); ++y )
                 {
-                        m_terminal->print( position( abs.ul.y + y, abs.ul.x ), er->border_color, er->border_chars[2] );
-                        m_terminal->print( position( abs.ul.y + y, abs.lr.x ), er->border_color, er->border_chars[3] );
+                        m_terminal->print( position( abs.ul.y + y, abs.ul.x ), er->border_color, (unsigned char)er->border_chars[2] );
+                        m_terminal->print( position( abs.ul.y + y, abs.lr.x ), er->border_color, (unsigned char)er->border_chars[3] );
                 }
 
-                m_terminal->print( abs.ul,   er->border_color, er->border_chars[4] );
-                m_terminal->print( abs.ur(), er->border_color, er->border_chars[5] );
-                m_terminal->print( abs.ll(), er->border_color, er->border_chars[6] );
-                m_terminal->print( abs.lr,   er->border_color, er->border_chars[7] );
+                m_terminal->print( abs.ul,   er->border_color, (unsigned char)er->border_chars[4] );
+                m_terminal->print( abs.ur(), er->border_color, (unsigned char)er->border_chars[5] );
+                m_terminal->print( abs.ll(), er->border_color, (unsigned char)er->border_chars[6] );
+                m_terminal->print( abs.lr,   er->border_color, (unsigned char)er->border_chars[7] );
         }
         if ( !e->m_text.empty() )
@@ -100 +100 @@
                 for ( char c : e->m_text )
                 {
-                        m_terminal->print( p, er->text_color, c );
+                        m_terminal->print( p, er->text_color, (unsigned char)c );
                         ++p.x;
                 }
@@ -111 +111 @@
 }
 
-void nv::gui::ascii_renderer::on_hover_change( element* e, bool hover )
+void nv::gui::ascii_renderer::on_hover_change( element* e, bool /*hover*/ )
 {
         // TODO: FIX
+        int fix_me;
         NV_LOG( nv::LOG_DEBUG, "on_hover_change" );
         e->m_flags[DIRTY] = true;
 }
 
-void nv::gui::ascii_renderer::on_select_change( element* e, bool select )
+void nv::gui::ascii_renderer::on_select_change( element* e, bool /*select*/ )
 {
         // TODO: FIX
+        int fix_me;
         NV_LOG( nv::LOG_DEBUG, "on_select_change" );
         e->m_flags[DIRTY] = true;

trunk/src/gui/gui_gfx_renderer.cc

@@ -266 +266 @@
                                 vec2 tsize32 = ( image->t2 - image->t1 ) * ( 2.0f / 3.0f );
                                 vec2 tsizex = vec2( tsize.x, 0.0f );
-                                vec2 tsizey = vec2( 0.0f, tsize.y );
+                                //vec2 tsizey = vec2( 0.0f, tsize.y );
                                 vec2 tsize3x = vec2( tsize3.x, 0.0f );
                                 vec2 tsize3y = vec2( 0.0f, tsize3.y );
@@ -343 +343 @@
 }
 
-void gfx_renderer::on_hover_change( element* e, bool hover )
+void gfx_renderer::on_hover_change( element* e, bool /*hover*/ )
 {
         // TODO: FIX
+        int fix_me;
         NV_LOG( nv::LOG_DEBUG, "on_hover_change" );
         e->m_flags[DIRTY] = true;
 }
 
-void gfx_renderer::on_select_change( element* e, bool select )
+void gfx_renderer::on_select_change( element* e, bool /*select*/ )
 {
         // TODO: FIX
+        int fix_me;
         NV_LOG( nv::LOG_DEBUG, "on_select_change" );
         e->m_flags[DIRTY] = true;

trunk/src/lua/lua_handle.cc

@@ -15 +15 @@
         NV_LUA_STACK_ASSERT( L, +1 );
         lua_rawgeti( L, LUA_REGISTRYINDEX, pseudoindex ); // table
-        lua_rawgeti( L, -1, index );                      // table, entry
+        lua_rawgeti( L, -1, (int)index );                 // table, entry
         if ( !lua_istable( L, -1 ) )
         {
@@ -57 +57 @@
         lua_rawgeti( L, LUA_REGISTRYINDEX, pseudoindex );
         lua_insert( L, -2 );
-        lua_rawseti( L, -2, index );
+        lua_rawseti( L, -2, (int)index );
         lua_pop( L, 1 );
 }
@@ -66 +66 @@
         lua_rawgeti( L, LUA_REGISTRYINDEX, pseudoindex ); // table
         lua_pushinteger( L, 0 );
-        lua_rawseti( L, -2, index );
+        lua_rawseti( L, -2, (int)index );
         lua_pop( L, 1 );
 }