]> code.bitgloo.com Git - clyne/gamedev.git/commitdiff
Z INDEXING
authordrumsetmonkey <abelleisle@roadrunner.com>
Wed, 18 May 2016 12:17:59 +0000 (08:17 -0400)
committerdrumsetmonkey <abelleisle@roadrunner.com>
Wed, 18 May 2016 12:17:59 +0000 (08:17 -0400)
1  2 
brice.dat
include/ui.hpp
src/entities.cpp
src/ui.cpp
src/ui_menu.cpp
src/world.cpp

diff --cc brice.dat
index ea71945339f7a7cd6d35324a11df49578bb93bfc,c7447b6a5034f00615eef4cd81a6b7237facfd15..61d57c2785952fa6cb22f35f6db947ff5ddf91d2
+++ b/brice.dat
@@@ -1,5 -1,5 +1,5 @@@
  2
- canSprint
- 0
  canJump
  0
 -1
+ canSprint
++0
diff --cc include/ui.hpp
Simple merge
Simple merge
diff --cc src/ui.cpp
Simple merge
diff --cc src/ui_menu.cpp
index 25782be487e7118fd31ce1eaab1e3c5f928acf9e,309d16a7eccab0f4f86637ae2abef7a2814ed76d..5faf8a2b3fcee2753da3c21ab2da8e3a36338988
@@@ -154,7 -153,8 +154,8 @@@ namespace ui 
                        glUseProgram(textShader);
                        
                        glBindTexture(GL_TEXTURE_2D, backTex);
-                       drawRect(vec2(offset.x - SCREEN_WIDTH / 2, offset.y - (SCREEN_HEIGHT / 2)), vec2(offset.x + SCREEN_WIDTH / 2, offset.y + (SCREEN_HEIGHT / 2)), -8.5);
+                       drawRect(vec2(offset.x - SCREEN_WIDTH / 2 - 1, offset.y - (SCREEN_HEIGHT / 2)),
 -                               vec2(offset.x + SCREEN_WIDTH / 2, offset.y + (SCREEN_HEIGHT / 2)));
++                               vec2(offset.x + SCREEN_WIDTH / 2, offset.y + (SCREEN_HEIGHT / 2)), -8.5);
  
                        glUseProgram(0);
  
diff --cc src/world.cpp
Simple merge