Changeset 48

Timestamp:

04/05/08 01:16:08 (8 months ago)

Author:

gak

Message:

 

Location:

muckaround

Files:

• blobworld/source/game.py (modified) (2 diffs)
• blobworld/source/level.py (modified) (3 diffs)
• blobworld/source/video.py (modified) (1 diff)
• blobworld/test.py (modified) (2 diffs)
• cython-game-optimise-tutorial (moved) (moved from muckaround/cython-getting-started-tutorial)
• cython-game-optimise-tutorial/fast_circles.pyx (copied) (copied from muckaround/cython-getting-started-tutorial/fast_circles.pyx)
• cython-game-optimise-tutorial/main.py (copied) (copied from muckaround/cython-getting-started-tutorial/main.py)
• cython-game-optimise-tutorial/setup.py (copied) (copied from muckaround/cython-getting-started-tutorial/setup.py)
• cython-game-optimise-tutorial/slow_circles.py (copied) (copied from muckaround/cython-getting-started-tutorial/slow_circles.py)
• cython-getting-started-tutorial/circles.py (deleted)

muckaround/blobworld/source/game.py

@@ -14 +14 @@
         self.video = Video()
         self.video.init()
+        self.video.window.on_mouse_press = self.on_mouse_press
 
     def think(self, dt):
@@ -21 +22 @@
     def input(self):
         self.video.window.dispatch_events()
-        x, y = self.video.window._mouse_x, self.video.window._mouse_y
+
+    def on_mouse_press(self, x, y, button, modifiers):
+        self.level.add_blob((x, y), 10)
 
     def render(self):

muckaround/blobworld/source/level.py

@@ -4 +4 @@
 from pyglet.gl import *
 
+from blobs import Blob
 
 class Level(object):
@@ -9 +10 @@
     def __init__(self, game):
         self.game = game
+        self.blobs = []
 
     def think(self, dt):
-        pass
+        for b in self.blobs:
+            b.think(dt)
+
+    def add_blob(self, pos, radius):
+        b = Blob(pos, radius)
+        self.blobs.append(b)
 
 
@@ -25 +32 @@
         glLoadIdentity()
 
+        for b in self.blobs:
+            b.render()
+

muckaround/blobworld/source/video.py

@@ -15 +15 @@
         glMatrixMode(GL_PROJECTION)
         glLoadIdentity()
-        glOrtho(0, 800, 600, 0, -1.0, 1.0)
-#        glOrtho(0, 800, 0, 600, -1.0, 1.0)
+#        glOrtho(0, 800, 600, 0, -1.0, 1.0)
+        glOrtho(0, 800, 0, 600, -1.0, 1.0)
         glMatrixMode(GL_MODELVIEW)
 

muckaround/blobworld/test.py

@@ -14 +14 @@
     game.level = LevelRenderable(game)
 
+    last_think = time.time()
     t = time.time()
+    fr = 1. / 30
     frames = 0
+
+    for a in xrange(100):
+        game.level.add_blob((random.random() * 640, random.random() * 480), 1)
+
     while not game.video.window.has_exit:
-        game.think(1)
+        while last_think + fr <= time.time():
+            game.think(fr)
+            last_think += fr
         game.input()
         game.render()
@@ -24 +32 @@
         if frames % 100 == 0:
             print frames / (time.time() - t)
+            t = time.time()
+            frames = 0
+
 
 if __name__ == '__main__':