Changeset 727


Ignore:
Timestamp:
Jun 18, 2014, 7:04:22 AM (8 years ago)
Author:
Sam Hocevar
Message:

build: sync with newer Lol Engine changes.

Location:
abuse/branches/lol
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • abuse/branches/lol/configure.ac

    r651 r727  
    127127have_opengl=no
    128128AC_TRY_COMPILE([
    129     #ifdef WIN32
     129    #if defined(_WIN32)
    130130    #include <windows.h>
    131131    #elif defined(__APPLE__) && defined(__MACH__)
  • abuse/branches/lol/src/game.cpp

    r724 r727  
    23082308    }
    23092309
    2310     virtual void TickDraw(float seconds)
    2311     {
    2312         Entity::TickDraw(seconds);
     2310    virtual void TickDraw(float seconds, Scene &scene)
     2311    {
     2312        Entity::TickDraw(seconds, scene);
    23132313
    23142314        /* Initialise GPU data */
     
    23462346
    23472347        m_shader->Bind();
    2348         m_shader->SetUniform(m_palette_uni, m_palette->GetTexture(), 0);
    2349         m_shader->SetUniform(m_screen_uni, m_screen->GetTexture(), 1);
     2348        m_shader->SetUniform(m_palette_uni, m_palette->GetTextureUniform(), 0);
     2349        m_shader->SetUniform(m_screen_uni, m_screen->GetTextureUniform(), 1);
    23502350        m_vdecl->SetStream(m_vbo, m_coord);
    23512351        m_vdecl->Bind();
Note: See TracChangeset for help on using the changeset viewer.