Changeset 727 for abuse/branches/lol/src/game.cppTweet

Timestamp:

Jun 18, 2014, 7:04:22 AM (9 years ago)

Author:

Sam Hocevar

Message:

build: sync with newer Lol Engine changes.

File:

• abuse/branches/lol/src/game.cpp (modified) (2 diffs)

abuse/branches/lol/src/game.cpp

@@ -2308 +2308 @@
     }
 
-    virtual void TickDraw(float seconds)
-    {
-        Entity::TickDraw(seconds);
+    virtual void TickDraw(float seconds, Scene &scene)
+    {
+        Entity::TickDraw(seconds, scene);
 
         /* Initialise GPU data */
@@ -2346 +2346 @@
 
         m_shader->Bind();
-        m_shader->SetUniform(m_palette_uni, m_palette->GetTexture(), 0);
-        m_shader->SetUniform(m_screen_uni, m_screen->GetTexture(), 1);
+        m_shader->SetUniform(m_palette_uni, m_palette->GetTextureUniform(), 0);
+        m_shader->SetUniform(m_screen_uni, m_screen->GetTextureUniform(), 1);
         m_vdecl->SetStream(m_vbo, m_coord);
         m_vdecl->Bind();