formula touchups

 - Style.
 - Copyedit.
 - Fix up comments.
 - Rename for clarity.

Author: tildebyte

formula/formula.pyde

@@ -1,53 +1,49 @@
-'''
-A sketch based on (a radical misinterpretation of) the formula from the JS1K
-segment of Steven Wittens' "Making Things With Maths" video. Really,
-everything is mine except the math in `segment.py`.
+'''A sketch inspired by (a radical misinterpretation of) the math from the
+JS1K segment of Steven Wittens' "Making Things With Maths" video. Really,
+everything is mine except the math in `segment.py`. See also
+http://acko.net/blog/js1k-demo-the-making-of
 
 Implemented in Processing.py/Processing 2.1 by Ben Alkov 11-16 Sept 2014.
 '''
 from tentacle import Tentacle
 
 
 time = 0
-Tick = 1 / 100.0  # Bad Python FP.
+Tick = 1 / 100.0  # Boo Python FP.
 SphereRadius = 200
-Tentacles = None
-Colors = [[color(169, 202, 240),  # rgb(169, 202, 240) # blues
+Colors = [[color(169, 202, 240),  # rgb(169, 202, 240)  blues
            color(160, 191, 227),  # rgb(160, 191, 227)
            color(142, 170, 202),  # rgb(142, 170, 202)
            color(115, 137, 163),  # rgb(115, 137, 163)
            color(70, 84, 99)],  # rgb(70, 84, 99)
-          # reds
-          [color(206, 151, 96),  # rgb(206, 151, 96)
+          [color(206, 151, 96),  # rgb(206, 151, 96)  reds
            color(207, 105, 43),  # rgb(207, 105, 43)
            color(193, 87, 37),  # rgb(193, 87, 37)
            color(124, 40, 12),  # rgb(124, 40, 12)
            color(120, 41, 13)],  # rgb(120, 41, 13)
-          # greens
-          [color(115, 146, 34),  # rgb(115, 146, 34)
+          [color(115, 146, 34),  # rgb(115, 146, 34)  greens
            color(104, 135, 23),  # rgb(104, 135, 23)
            color(92, 109, 29),  # rgb(92, 109, 29)
            color(78, 93, 22),  # rgb(78, 93, 22)
            color(63, 76, 16)]  # rgb(63, 76, 16)
          ]
+Tentacles = [Tentacle(i * -100, Colors[i % 3])
+             for i in range(6)]
 
 def setup():
-    global Tentacles
     size(512, 512, OPENGL)
     rectMode(RADIUS)
     ellipseMode(RADIUS)
     strokeWeight(2)
-    Tentacles = [Tentacle(i * -100, Colors[i % 3])
-                 for i in range(6)]
 
 
 def draw():
-    global time, Tentacles
+    global time
     rightHanded()
     fade()
     time += Tick
-    for tentacle in Tentacles:
-        tentacle.update(time, Tick, SphereRadius)
+    for t in Tentacles:
+        t.update(time, Tick, SphereRadius)
 
 
 def rightHanded():

formula/segment.py

@@ -2,27 +2,31 @@ class Segment(object):
     '''A Segment, which encapsulates its own position and color, and can draw
     itself'''
 
-    def __init__(self, index, tickOffset, altitude, lineColor):
-        self.index = index
-        # A "magic" number. 12 just seems to look good.
-        self.tickOffset = tickOffset * 12
+    def __init__(self, id, tickOffset, alti, color):
+        self.id = id
         #  Effectively, the distance between segments.
-        self.altitude = altitude
-        self.lineColor = lineColor
-        self.location = PVector(0.0, 0.0, 0.0)
+        self.alti = alti
+        self.tickOffset = tickOffset
+        self.color = color
+        self.loc = PVector(0.0, 0.0, 0.0)
+        # A magic number. 12 just seems to look good.
+        self.tickOffset *= 12
 
-    def calc(self, time, sphereRadius):
-        # New formula from http://acko.net/blog/js1k-demo-the-making-of
+    def calc(self, time, sRadius):
         # Spherical coords.
-        lon = cos(time + sin(time * 0.31)) * 2 + sin(time * 0.83) * 3 + time * 0.02
-        lat = sin(time * 0.7) - cos(3 + time * 0.23) * 3
+        # New formula from http://acko.net/blog/js1k-demo-the-making-of
+        lon = (cos(time + sin(time * 0.31)) * 2
+               + sin(time * 0.83)
+               * 3 + time * 0.02)
+        lat = (sin(time * 0.7)
+               - cos(3 + time * 0.23) * 3)
         # Convert to cartesian 3D.
         # http://acko.net/blog/js1k-demo-the-making-of
-        self.location.set(cos(lon) * cos(lat) * (sphereRadius + self.altitude),
-                          sin(lon) * cos(lat) * (sphereRadius + self.altitude),
-                          sin(lat) * (sphereRadius + self.altitude))
+        self.loc.set(cos(lon) * cos(lat) * (sRadius + self.alti),
+                     sin(lon) * cos(lat) * (sRadius + self.alti),
+                     sin(lat) * (sRadius + self.alti))
 
     def drawSelf(self, other):
-        stroke(self.lineColor)
-        line(self.location.x, self.location.y, self.location.z,
-             other.location.x, other.location.y, other.location.z)
+        stroke(self.color)
+        line(self.loc.x, self.loc.y, self.loc.z,
+             other.loc.x, other.loc.y, other.loc.z)

formula/tentacle.py

@@ -5,22 +5,21 @@ class Tentacle(object):
     '''A Tentacle made of Segments.
     '''
     # Factor to determine the distance between Segments.
-    AltitudeOffset = 1
+    AltiOffset = 1
 
     def __init__(self, timeOffset, palette):
         self.timeOffset = timeOffset
         self.palette = palette
         self.segments = [Segment(i, i,  # Second `i` is tickOffset.
-                                 Tentacle.AltitudeOffset * i + i,
+                                 (Tentacle.AltiOffset * i) + i,
                                  self.palette[i])
                          for i in range(5)]
 
-    def update(self, time, Tick, sphereRadius):
-        for segment in self.segments:
-            segment.calc((time - self.timeOffset) -
-                         (segment.tickOffset * Tick),
-                         sphereRadius)
+    def update(self, time, Tick, sRadius):
+        for seg in self.segments:
+            seg.calc((time - self.timeOffset) - (seg.tickOffset * Tick),
+                     sRadius)
             # Don't try to draw the last segment.
-            if segment.id is not len(self.segments) - 1:
+            if seg.id != len(self.segments) - 1:
                 # Draw to the next segment.
-                segment.drawSelf(self.segments[segment.id + 1])
+                seg.drawSelf(self.segments[seg.id + 1])