Permalink
Browse files

Animation

  • Loading branch information...
1 parent cb1ab26 commit 3e3e30a6144ab331e939172668982e6691d90ff6 @asivitz committed Jul 16, 2012
Showing with 549 additions and 33 deletions.
  1. +3 −1 ext/Platform.cpp
  2. +518 −30 images/red_anims.json
  3. BIN images/red_anims.png
  4. +10 −2 main.rb
  5. +18 −0 sprites.rb
View
@@ -107,7 +107,7 @@ void Platform::draw()
glBindFramebuffer(GL_FRAMEBUFFER,0);
- bool draw_debug = false;
+ bool draw_debug = true;
glViewport(0, 0, 600, 600);
renderer->draw();
@@ -142,6 +142,8 @@ void Platform::draw()
0,0,0,1};
glUniformMatrix4fv(prog->locationOfUniform("viewMat"), 1, GL_FALSE, renderer->viewMatrix);
glUniformMatrix4fv(prog->locationOfUniform("modelMat"), 1, GL_FALSE, model);
+ glUniform2f(prog->locationOfUniform("loc"), 0.0, 0.0);
+ glUniform2f(prog->locationOfUniform("size"), 1.0, 1.0);
physics->debugDraw();
}
window->display();
Oops, something went wrong.

0 comments on commit 3e3e30a

Please sign in to comment.