Changeset a7d1e5e in python-game

Timestamp:

Apr 4, 2017, 1:36:04 AM (8 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

master

Children:

a7f54e3, c56629f

Parents:

3511899 (diff), cb405de (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) (7 diffs)

game.py

@@ -8 +8 @@
 [w, h] = [0, 0]
 
-def render(surface, overlay, font, state):
-   #surface.fill((0, 0, 0))
-
+def render(surface, overlay, font, showOverlay):
    #glEnable (GL_BLEND); glBlendFunc (GL_ONE, GL_ONE);
 
-   if state:
+   # 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(GL_ALL_ATTRIB_BITS)
+
+   if showOverlay:
       renderOverlay(overlay, font)
+
+      glPushAttrib(GL_ALL_ATTRIB_BITS)
       projectOverlay(surface, overlay)
-   else:
-      render3d(surface)
+      glPopAttrib(GL_ALL_ATTRIB_BITS)
 
 
@@ -24 +30 @@
    #pygame.draw.circle(overlay, (255, 0, 0), (int(w/2), int(h/2)), 540)
    #overlay.set_colorkey((255,0,0))
+   overlay.fill((0, 0, 0, 255))
 
    text = font.render("2D drawing", True, (0, 128, 0))
@@ -33 +40 @@
    
    glPushMatrix()
+
+   glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)
+
    glTranslatef(0.0,0.0,-zNear)
 
@@ -42 +52 @@
 
    glBindTexture(GL_TEXTURE_2D, glGenTextures(1))
-   # maybe use GL_RGBA here instead
-   #glPixelStorei(GL_UNPACK_ALIGNMENT,1)
-   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, textureData)
+   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, textureData)
 
    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)
@@ -146 +154 @@
    gameDisplay = pygame.display.set_mode((w, h), pygame.FULLSCREEN|pygame.DOUBLEBUF|pygame.OPENGL)
 
-overlay = pygame.Surface((w, h))
+# Look into pygame.HWSURFACE for hardware-accelerated surfaces
+overlay = pygame.Surface((w, h), pygame.SRCALPHA)
 
 pygame.display.set_caption('Space Game')
@@ -155 +164 @@
 
 running = True
-state = False
+showOverlay = False
 
 zNear = 1.0/math.tan(math.radians(45.0/2))
@@ -175 +184 @@
             running = False
          elif event.key == pygame.K_SPACE:
-            state = not state
+            showOverlay = not showOverlay
 
-      #print(event)
-
-   render(gameDisplay, overlay, font, state)
+   render(gameDisplay, overlay, font, showOverlay)
 
    pygame.display.flip()