Factor trig lookups into util.py.

Author: tildebyte

Whitney Artport - (Software) Structures/#003/B/Interpretation/Number_003_B_Ngan/Number_003_B_Ngan.pyde

@@ -15,28 +15,26 @@ from circle import Circle
 from grid import Grid
 
 
-grid = None
+SketchWidth = 500
+SketchHeight = 500
+grid = Grid(TAU - PI / 3, SketchWidth, SketchHeight)
 NumCircles = 10
 circles = []
 counter = 0
-CirclePosition = 250
 Radius = 40
 
 
 def setup():
-    global grid
-    size(500, 500)
-    # Init here because of sketch `width` & `height` being undefined prior to
-    # this point.
-    grid = Grid(TAU - PI / 3, 20, 3)
+    size(SketchWidth, SketchHeight)
 
 
 def draw():
     global counter
     background(50)
     stroke(255, 255, 255, 50)
     if frameCount % 5 == 0 and counter < NumCircles:
-        circles.append(Circle(CirclePosition, CirclePosition, Radius, counter))
+        circles.append(Circle(SketchWidth / 2, SketchHeight / 2,
+                              Radius, counter))
         counter += 1
     grid.update()
     for circle in circles:

Whitney Artport - (Software) Structures/#003/B/Interpretation/Number_003_B_Ngan/circle.py

@@ -1,8 +1,8 @@
-class Circle(object):
-    TableLength = int((TAU * 100) + 1)  # 628 - a full circle.
-    sintable = [sin(i * 0.01) for i in range(TableLength)]
-    costable = [cos(i * 0.01) for i in range(TableLength)]
+from util import getFunc
+from grid import Grid
+
 
+class Circle(object):
     def __init__(self, locX, locY, radius, index):
         self.x = locX
         self.y = locY
@@ -19,14 +19,14 @@ def __init__(self, locX, locY, radius, index):
         self.iny = 0
 
     def getGrid(self, grid):
-        sx = ceil((self.x - self.radius - grid.margin) / grid.gap)
-        sy = ceil((self.y - self.radius - grid.margin) / grid.gap)
-        numx = floor(self.diameter / grid.gap)
-        numy = floor(self.diameter / grid.gap)
+        sx = ceil((self.x - self.radius - Grid.MarginX) / Grid.GapX)
+        sy = ceil((self.y - self.radius - Grid.MarginY) / Grid.GapY)
+        numx = floor(self.diameter / Grid.GapX)
+        numy = floor(self.diameter / Grid.GapY)
         for i in range(sx, sx + numx):
-            if 0 <= i < grid.fieldSize:
+            if 0 <= i < grid.fieldHeight:
                 for k in range(sy, sy + numy):
-                    if 0 <= k < grid.fieldSize:
+                    if 0 <= k < grid.fieldWidth:
                         if self.over:
                             x, y = grid.getLocation(i, k)
                             if (dist(self.x, self.y, x, y)
@@ -39,17 +39,17 @@ def getGrid(self, grid):
         self.over = False
 
     def move(self, circles):
-        angle = (Circle.getFunc('sin', self.speeds[0])
-                 - Circle.getFunc('cos', self.speeds[1]))
+        angle = (getFunc('sin', self.speeds[0])
+                 - getFunc('cos', self.speeds[1]))
         self.speeds[0] += self.accels[0]
         self.speeds[1] += self.accels[1]
         self.speeds[2] += self.accels[2]
         if angle < 0:
             angle += TAU
         elif angle >= TAU:
             angle -= TAU
-        self.x += Circle.getFunc('sin', angle)
-        self.y += Circle.getFunc('cos', angle)
+        self.x += getFunc('sin', angle)
+        self.y += getFunc('cos', angle)
         self.checkBounds()
         self.checkOverlap(circles)
 
@@ -85,22 +85,10 @@ def checkOverlap(self, circles):
 
 
     def repel(self, angle):
-        self.x += Circle.getFunc('cos', angle) * 0.1
-        self.y += Circle.getFunc('sin', angle) * 0.1
+        self.x += getFunc('cos', angle) * 0.1
+        self.y += getFunc('sin', angle) * 0.1
 
     def setState(self, intersectX, intersectY):
         self.inx = intersectX
         self.iny = intersectY
         self.over = True
-
-    @staticmethod
-    def getFunc(func, val):
-        if val < 0:
-            val += TAU
-        if val >= TAU:
-            val -= TAU
-        val = min(TAU, max(0, val))  # 6.27
-        if func == 'sin':
-            return Circle.sintable[floor(val * 100)]
-        elif func == 'cos':
-            return Circle.costable[floor(val * 100)]

Whitney Artport - (Software) Structures/#003/B/Interpretation/Number_003_B_Ngan/grid.py

@@ -1,25 +1,30 @@
-from circle import Circle
+from util import getFunc
 
 
 class Grid(object):
     '''A grid of values, capable of drawing a vector indicating direction.'''
-    def __init__(self, value, margin, gap):
+    MarginX = 20
+    MarginY = 20
+    GapX = 3
+    GapY = 3
+    MarginX2 = MarginX * 2
+    MarginY2 = MarginY * 2
+    def __init__(self, value, SketchWidth, SketchHeight):
         self.value = value
-        self.margin = margin
-        self.marginSq = self.margin * 2
-        self.gap = gap
-        self.fieldSize = (width - self.marginSq) / self.gap
+        self.fieldWidth = (SketchWidth - Grid.MarginX2) / Grid.GapX
+        self.fieldHeight = (SketchHeight - Grid.MarginY2) / Grid.GapY
         self.field = [[self.value
-                       for _ in range(self.fieldSize)]
-                      for _ in range(self.fieldSize)]
+                       for _ in range(self.fieldHeight)]
+                      for _ in range(self.fieldWidth)]
 
     def update(self):
         for i in range(len(self.field)):
             for k in range(len(self.field[0])):
                 x, y = self.getLocation(i, k)
                 line(x, y,
-                     x + 10 * Circle.getFunc('cos', self.field[i][k]),
-                     y + 10 * Circle.getFunc('sin', self.field[i][k]))
+                     x + 10 * getFunc('cos', self.field[i][k]),
+                     y + 10 * getFunc('sin', self.field[i][k]))
 
-    def getLocation(self, x, y):
-        return x * self.gap + self.margin, y * self.gap + self.margin
+    @staticmethod
+    def getLocation(x, y):
+        return x * Grid.GapX + Grid.MarginX, y * Grid.GapY + Grid.MarginY

Whitney Artport - (Software) Structures/#003/B/Interpretation/Number_003_B_Ngan/util.py

@@ -0,0 +1,15 @@
+TableLength = int((TAU * 100) + 1)  # 628 - a full circle.
+sintable = [sin(i * 0.01) for i in range(TableLength)]
+costable = [cos(i * 0.01) for i in range(TableLength)]
+
+
+def getFunc(func, val):
+    if val < 0:
+        val += TAU
+    if val >= TAU:
+        val -= TAU
+    val = min(TAU, max(0, val))  # 6.27
+    if func == 'sin':
+        return sintable[floor(val * 100)]
+    elif func == 'cos':
+        return costable[floor(val * 100)]