Changes in / [b3b0f3f:010086b] in python-game

File:

• game.py (modified) (6 diffs)

game.py

@@ -11 +11 @@
    #glEnable (GL_BLEND); glBlendFunc (GL_ONE, GL_ONE);
 
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
+   # I should really figure out which attributes in the 2D rendering
+   # break the 3d rendering and reset those back instead of resetting
+   # all attributes
+   glPushAttrib(GL_ALL_ATTRIB_BITS)
    render3d(surface)
+   glPopAttrib()
 
    if showOverlay:
       renderOverlay(overlay, font)
+
+      glPushAttrib(GL_ALL_ATTRIB_BITS)
       projectOverlay(surface, overlay)
+      glPopAttrib()
 
 
@@ -29 +35 @@
 
    pygame.draw.rect(overlay, (0, 128, 255), pygame.Rect(30, 30, 60, 60))
-   pygame.draw.rect(overlay, (128, 255, 0), pygame.Rect(300, 300, 1000, 1000))
-   
    overlay.blit(text, (500, 100))
 
@@ -37 +41 @@
    glPushMatrix()
 
-   glColor3f(1.0, 1.0, 1.0)
+   glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)
 
    glTranslatef(0.0,0.0,-zNear)
@@ -70 +74 @@
 
    glEnd()
-   
-   glDisable(GL_TEXTURE_2D)
 
    glPopMatrix()
@@ -102 +104 @@
    
    glPushMatrix()
-   
-   glColor3f(1.0, 0.0, 0.0)
+
+   glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)
 
    glTranslatef(0.0,0.0,-2*zNear)
+   glColor3f(1.0, 1.0, 1.0)
 
    glBegin(GL_LINES)
@@ -164 +167 @@
 
 zNear = 1.0/math.tan(math.radians(45.0/2))
-
-# not really need here since there are no previous
-# matrix modifications, but keeping it for reference
-#glLoadIdentity()
 gluPerspective(45, (w/h), zNear, 500.0)