port to pygamev0.2.0

1 files changed, 37 insertions, 52 deletions

diff --git a/window.py b/window.py
index 5387930..bba0213 100644
--- a/window.py
+++ b/window.py
@@ -1,7 +1,6 @@
+import pygame
+from pygame.locals import *
 from OpenGL.GL import *
-from OpenGL.GLUT import *
-from OpenGL.GLU import *
-from time import time
 from queue import Queue
 
 from renderer import ImageRenderer, TransitionMix
@@ -9,6 +8,7 @@ from manager import PixMan
 
 class PixDisplay:
     def __init__(self, textures):
+        self.screen = None
         self.last_time = 0
         self.start_time = 0
         self.image_time = 0
@@ -39,16 +39,6 @@ class PixDisplay:
         self.textures = textures
         self.current_texture_index = 0
 
-    @property
-    def max_framerate(self):
-        #return int(1000/int(1000/self.frame_time))
-        return self.frame_time
-
-    @max_framerate.setter
-    def max_framerate(self, max_fps):
-        self._max_fps = max_fps  # This is just for the getter since otherwise e.g. int(1000/int(1000/60)) would round to 62
-        self.frame_time = int(1000 / max_fps)  # In ms
-
     def increment_texture_index(self, increment):
         self.transition_reverse = increment < 0
 
@@ -66,10 +56,9 @@ class PixDisplay:
     # Main display function
     def display(self):
         # Calculate timings
-        current_time = time()
-        alive_time = current_time - self.start_time
-        delta_time = current_time - self.last_time
-        self.last_time = current_time
+        alive_time = pygame.time.get_ticks() / 1000
+        delta_time = alive_time - self.last_time
+        self.last_time = alive_time
 
         if not self.tex or not self.tex.initialized or not self.tex.id:
             if self.textures.asset_count > 0:
@@ -78,7 +67,7 @@ class PixDisplay:
             if not self.tex or not self.tex.id:
                 glClearColor(0.0, 0.0, 0.0, 1.0)
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
-                glutSwapBuffers()
+                pygame.display.flip()
                 return
 
         # Run queue events
@@ -92,7 +81,7 @@ class PixDisplay:
 
         # Get window size
         old_win_w, old_win_h = self.win_w, self.win_h
-        self.win_w, self.win_h = glutGet(GLUT_WINDOW_WIDTH), glutGet(GLUT_WINDOW_HEIGHT)
+        self.win_w, self.win_h = self.screen.get_size()
 
         # Draw static image except during a transition
         if self.image_time < self.image_duration:
@@ -115,42 +104,20 @@ class PixDisplay:
             self.image_time = 0
             self.auto_transition = True
 
-    # Limit framerate
-    def timer(self, value):
-        glutPostRedisplay()
-        glutTimerFunc(self.frame_time, self.timer, 0)  # Schedule next frame
-
     def seek(self, increment):
         self.auto_transition = False
         self.increment_texture_index(increment)
         self.image_time = self.image_duration
 
-    def handle_special_key(self, key, x, y):
-        if   key == GLUT_KEY_LEFT:
-            self.seek(-1)
-        elif key == GLUT_KEY_RIGHT:
-            self.seek(1)
-
-    def handle_visibility_change(self, state):
-        if state == GLUT_VISIBLE:
-            self._force_redraw = True
-            glutPostRedisplay()
-
     # Initialization and main loop
-    def main(self, glut_args):
+    def main(self):
         # Initialize the window
-        glutInit(glut_args)
-        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB)
-        glutCreateWindow("Image Viewer with Fade Transition")
-        glEnable(GL_TEXTURE_2D)
-
-        self.renderer = ImageRenderer()
-        self.renderer.set_transition(TransitionMix)
-        self.image_time = 0
-        self.start_time = time()
-        self.last_time  = time()
+        pygame.init()
+        self.screen = pygame.display.set_mode((0, 0), DOUBLEBUF | OPENGL | FULLSCREEN)  # TODO different display mode options
+        pygame.mouse.set_visible(False)
 
         # Set up the OpenGL viewport and projection
+        glEnable(GL_TEXTURE_2D)
         glMatrixMode(GL_PROJECTION)
         glLoadIdentity()
         glOrtho(-1, 1, -1, 1, -1, 1)
@@ -160,10 +127,28 @@ class PixDisplay:
         glEnable(GL_BLEND)
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
 
-        # Run display
-        glutDisplayFunc(self.display)
-        glutTimerFunc(self.frame_time, self.timer, 0)
-        glutVisibilityFunc(self.handle_visibility_change)  # Redraw in case framebuffer gets destroyed when window is obscured
-        glutSpecialFunc(self.handle_special_key)
-        glutMainLoop()
+        # Setup renderer and slide timing
+        self.renderer = ImageRenderer()
+        self.renderer.set_transition(TransitionMix)
+        self.image_time = 0
+        self.last_time  = 0
 
+        # Run display
+        clock = pygame.time.Clock()
+        while True:
+            for event in pygame.event.get():
+                if event.type == QUIT:
+                    pygame.quit()
+                    return
+                elif event.type == KEYDOWN:
+                    # Quit with escape or ctrl+q
+                    if event.key == pygame.K_ESCAPE or event.key == pygame.K_q and event.mod & pygame.KMOD_CTRL:
+                        pygame.quit()
+                        return
+                    # Seek with left/right arrow
+                    elif event.key == pygame.K_LEFT:
+                        self.seek(-1)
+                    elif event.key == pygame.K_RIGHT:
+                        self.seek(+1)
+            self.display()
+            clock.tick(self.max_framerate)