Changeset b3b0f3f in python-game

Timestamp:

Apr 5, 2017, 2:34:24 AM (8 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

114fd09

Parents:

010086b (diff), b2d384b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​http://medievaltech.com/git/python-game

File:

• game.py (modified) (6 diffs)

game.py

@@ -11 +11 @@
    #glEnable (GL_BLEND); glBlendFunc (GL_ONE, GL_ONE);
 
-   # 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)
+   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
    render3d(surface)
-   glPopAttrib()
 
    if showOverlay:
       renderOverlay(overlay, font)
-
-      glPushAttrib(GL_ALL_ATTRIB_BITS)
       projectOverlay(surface, overlay)
-      glPopAttrib()
 
 
@@ -35 +29 @@
 
    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))
 
@@ -41 +37 @@
    glPushMatrix()
 
-   glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)
+   glColor3f(1.0, 1.0, 1.0)
 
    glTranslatef(0.0,0.0,-zNear)
@@ -74 +70 @@
 
    glEnd()
+   
+   glDisable(GL_TEXTURE_2D)
 
    glPopMatrix()
@@ -104 +102 @@
    
    glPushMatrix()
-
-   glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)
+   
+   glColor3f(1.0, 0.0, 0.0)
 
    glTranslatef(0.0,0.0,-2*zNear)
-   glColor3f(1.0, 1.0, 1.0)
 
    glBegin(GL_LINES)
@@ -167 +164 @@
 
 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)