Changes in / [cb405de:7145e24] in python-game

File:

• game.py (modified) (7 diffs)

game.py

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