Finished refactoring

Author: dorianbrown

examples/20181028-143633-372201-e28dbae-1a67244.png

@@ -1,13 +1,14 @@
-#!/usr/bin/env pypy3
+#!/usr/bin/env python
 import numpy as np
 
 from src.draw import Canvas
+from matplotlib import cm
 
 small_conf = {
-    "width": 2000,
-    "height": 2000,
+    "width": 4000,
+    "height": 4000,
     "bg": (0, 0, 0),
-    "fg": (255, 255, 255, 0.1)
+    "fg": (255, 255, 255, 0.25)
 }
 
 
@@ -22,24 +23,28 @@ def acc_vec(pos, mass):
 with Canvas(**small_conf) as c:
 
     # Initial particle conditions
-    n = 5000
+    n = 2000
     # pos = np.random.multivariate_normal([500, 500], [[1000, 250], [250, 1000]], n)
-    pos = np.random.uniform(0, 2000, (n, 2))
+    pos = np.random.uniform(0, 4000, (n, 2))
     mass = np.ones(n)*500
     # Add radial initial velocity
     vel = np.zeros((n, 2), dtype=np.float)
-    dt = 0.25
+    dt = 0.5
 
     while pos.size > 1:
         acc = acc_vec(pos, mass)
         vel += acc*dt
         pos_new = pos + vel*dt
 
-        for old, new in zip(pos, pos_new):
-            c.draw_line(old, new)
+        for old, new, v in zip(pos, pos_new, np.linalg.norm(vel, axis=1)):
+            alpha = min(1, 1 / v)
+            color = (*cm.viridis(v/10)[:3], alpha)
+            c.draw_line(old, new, rgba=color, width=4)
 
-        # Remove points no longer on canvas
-        remove_idx = c.get_oob(pos_new)
+        # Remove points we don't want to draw
+        oob_idx = c.get_oob(pos_new)
+        # too_fast_idx = np.linalg.norm(vel, axis=1) > 8
+        remove_idx = oob_idx # | too_fast_idx
 
         pos = pos_new[~remove_idx]
         mass = mass[~remove_idx]

examples/20181029-084709-284654-399c3fa-055e00d.png

@@ -1,4 +1,4 @@
-import cairo as cr
+import cairocffi as cr
 import logging
 from math import sqrt
 from time import time
@@ -24,6 +24,7 @@ def __enter__(self):
         self.surface = cr.ImageSurface(cr.FORMAT_ARGB32, self.width, self.height)
         # Set background color
         self.ctx = cr.Context(self.surface)
+        self.ctx.set_antialias(cr.ANTIALIAS_FAST)
         self.ctx.save()
         self.set_color(self.bg)
         self.ctx.paint()