Changeset 46

Timestamp:

04/05/08 00:35:57 (8 months ago)

Author:

gak

Message:

 

Location:

muckaround/cython-getting-started-tutorial

Files:

• fast_circles.pyx (added)
• main.py (modified) (2 diffs)
• setup.py (added)
• slow_circles.py (moved) (moved from muckaround/cython-getting-started-tutorial/circles.py) (2 diffs)

muckaround/cython-getting-started-tutorial/main.py

@@ -5 +5 @@
 from pyglet.gl import *
 
-from circles import Circle, Circles
+from fast_circles import Circle, Circles
 
 WIDTH = 800
@@ -26 +26 @@
 
     for a in xrange(100):
-        circles.add(Circle.new(WIDTH, HEIGHT))
+        circles.add()
 
     while not win.has_exit:

muckaround/cython-getting-started-tutorial/slow_circles.py

@@ -13 +13 @@
         self.dy = dy
         self.radius = radius
-
-    @staticmethod
-    def new(max_x, max_y):
-        """Selects a position, movement and a radius and returns a new Circle
-        object with these properties."""
-        rad = random.uniform(5, 10)
-        x = random.uniform(rad, max_x - rad)
-        y = random.uniform(rad, max_y - rad)
-        angle = random.uniform(0, math.pi * 2)
-        speed = random.uniform(1, 50)
-        dx = math.cos(angle) * speed
-        dy = math.sin(angle) * speed
-        return Circle(x, y, dx, dy, rad)
 
     def think(self, dt, max_x, max_y):
@@ -60 +47 @@
         self.max_y = max_y
 
-    def add(self, c):
-        self.circles.append(c)
+    def add(self):
+        rad = random.uniform(5, 10)
+        x = random.uniform(rad, self.max_x - rad)
+        y = random.uniform(rad, self.max_y - rad)
+        angle = random.uniform(0, math.pi * 2)
+        speed = random.uniform(1, 50)
+        dx = math.cos(angle) * speed
+        dy = math.sin(angle) * speed
+        self.circles.append(Circle(x, y, dx, dy, rad))
 
     def think(self, dt):