Changeset 2480


Ignore:
Timestamp:
Feb 24, 2013, 6:39:40 PM (6 years ago)
Author:
sam
Message:

build: fix a few compiler warnings here and there.

Location:
trunk/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/easymesh/easymesh.cpp

    r2476 r2480  
    421421
    422422//-----------------------------------------------------------------------------
    423 void EasyMesh::Render(mat4 const &model, float damage)
     423void EasyMesh::Render(mat4 const &model)
    424424{
    425425    m_gpu_data.RenderMeshData(model);
     
    872872void EasyMesh::ComputeTexCoord(float uv_scale, int uv_offset)
    873873{
     874    UNUSED(uv_scale, uv_offset);
    874875#if 0
    875876    VertexDictionnary vert_dict;
     
    21502151        {
    21512152            int d = n / 3;
    2152             int m = d % 6;
     2153            int e = d % 6;
    21532154            AddVertex(p[d]);
    21542155            if (n % 3 == 0) //Top-Bottom logic
     
    21662167                SetCurVertTexCoord2(tmp * vec2(.25f) + add);
    21672168            }
    2168             else if (m == 0 || m == 1) //inner Logic
     2169            else if (e == 0 || e == 1) //inner Logic
    21692170            {
    21702171                SetCurVertTexCoord(uv[d]);
     
    21732174            else //Cog logic
    21742175            {
    2175                 if (m == 2 && n % 3 == 2)
     2176                if (e == 2 && n % 3 == 2)
    21762177                {
    21772178                    SetCurVertTexCoord(vec2(1.f, (d == 2)?(0.f):(1.f)) * CogUV[0] + CogUV[1]);
  • trunk/src/easymesh/easymesh.h

    r2457 r2480  
    526526    void MeshConvert(GpuShaderData* new_gpu_sdata);
    527527    void MeshConvert(Shader* ProvidedShader = NULL);
    528     void Render(mat4 const &model, float damage = 0.f);
     528    void Render(mat4 const &model);
    529529
    530530private:
  • trunk/src/gpu/framebuffer.cpp

    r2216 r2480  
    210210#else
    211211#   if GL_VERSION_1_1 || GL_ES_VERSION_2_0
    212     glBindFramebuffer(GL_FRAMEBUFFER, NULL);
    213 #   else
    214     glBindFramebufferOES(GL_FRAMEBUFFER_OES, NULL);
     212    glBindFramebuffer(GL_FRAMEBUFFER, 0);
     213#   else
     214    glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
    215215#   endif
    216216#endif
  • trunk/src/image/codec/dummy-image.cpp

    r2183 r2480  
    4343bool DummyImageData::Open(char const *path)
    4444{
     45    UNUSED(path);
     46
    4547    size = ivec2(256);
    4648    format = Image::FORMAT_RGBA;
  • trunk/src/image/image.cpp

    r2183 r2480  
    5656Image::Image(char const *path)
    5757{
    58     static bool unused = RegisterAllLoaders();
     58    static bool init = RegisterAllLoaders();
     59    UNUSED(init);
    5960
    6061    data = ImageLoader::Load(path);
  • trunk/src/mesh/mesh.cpp

    r2216 r2480  
    4545void SubMesh::Render(mat4 const &model)
    4646{
     47    /* FIXME: TODO */
    4748}
    4849
  • trunk/src/video.cpp

    r2379 r2480  
    240240void Video::SetDebugRenderMode(DebugRenderMode d)
    241241{
    242     if (d == DebugRenderMode::Max)
    243         return;
    244 
    245242    switch(d)
    246243    {
     
    290287            break;
    291288        }
     289        default:
     290            return; /* Unknown render mode */
    292291    }
    293292    VideoData::render_mode = d;
Note: See TracChangeset for help on using the changeset viewer.