drawing seems to work?

.gitignore

@@ -13,3 +13,5 @@ cosmicai-test-*
 *.obj
 *.lst
 *.swp
+cosmicai
+*.svg

source/app.d

@@ -1,10 +1,18 @@
 module app;
 
-import comsicai.blocks;
+import cosmic.base;
+import cosmic.blocks;
+import cosmic.drawing;
 import std.stdio;
 
 void main()
 {
     auto board = new Board;
-    board
+    foreach (i, type; BlockType.playable)
+    {
+        board[Pos(cast(int)i, 0)].type = type;
+    }
+    auto svg = new SvgSink();
+    board.draw(svg);
+    svg.write("board.svg");
 }

source/cosmic/ai.d

@@ -0,0 +1 @@
+module cosmic.ai;

source/cosmic/base.d

@@ -0,0 +1,46 @@
+module cosmic.base;
+
+enum WIDTH = 21;
+enum HEIGHT = 11;
+
+struct Pos
+{
+    int x, y;
+    int opCmp(Pos other) inout
+    {
+        if (x != other.x)
+        {
+            return x - other.x;
+        }
+        return y - other.y;
+    }
+
+    Pos opBinary(string op)(inout Pos other) inout if (op == "+" || op == "-")
+    {
+        return Pos(
+                mixin("this.x " ~ op ~ " other.x"),
+                mixin("this.y " ~ op ~ " other.y"));
+    }
+}
+
+struct Point
+{
+    double x, y;
+
+    Point rotate(real radians) inout
+    {
+        import std.math : atan2, cos, sin;
+        auto angle = atan2(y, x);
+        angle += radians;
+        auto magnitude = (x^^2 + y^^2) ^^ 0.5;
+        return Point(cos(angle) * magnitude, sin(angle) * magnitude);
+    }
+
+    Point opBinary(string op)(inout Point other) inout if (op == "+" || op == "-")
+    {
+        return Point(
+                mixin("this.x " ~ op ~ " other.x"),
+                mixin("this.y " ~ op ~ " other.y"));
+    }
+}
+

source/cosmicai/blocks.d → source/cosmic/blocks.d

@@ -1,12 +1,13 @@
-module cosmicai.blocks;
+module cosmic.blocks;
+
+import cosmic.base;
+import cosmic.drawing;
 
 import std.math, std.format;
 
 final class Board
 {
-    enum WIDTH = 21;
-    enum HEIGHT = 11;
-    BlockType[HEIGHT][WIDTH] grid;
+    Block[HEIGHT][WIDTH] grid;
     Pos startA, startB;
 
     this()
@@ -15,7 +16,7 @@ final class Board
         {
             foreach (y; 0..HEIGHT)
             {
-                grid[x][y] = Block(null, false, false, Pos(x, y));
+                grid[x][y] = Block(null, Access.none, Pos(x, y));
             }
         }
 
@@ -52,7 +53,7 @@ final class Board
 
         while (!queue.empty)
         {
-            auto p = queue.removeAny;
+            auto p = this[queue.removeAny];
             assert(p.type !is null);
             foreach (offset; p.type.downstreamOffsets)
             {
@@ -63,7 +64,7 @@ final class Board
                 }
                 seen[t] = true;
                 auto bt = this[t];
-                if (bt.type !is null && bt.access & access == Access.none)
+                if (bt.type !is null && (bt.access & access) == Access.none)
                 {
                     queue.insert(t);
                 }
@@ -75,6 +76,41 @@ final class Board
     {
         return grid[pos.x][pos.y];
     }
+
+    void draw(SvgSink sink)
+    {
+        foreach (x; 0..WIDTH)
+        {
+            foreach (y; 0..HEIGHT)
+            {
+                this[Pos(x, y)].draw(sink);
+            }
+        }
+    }
+}
+
+@("Access for a fresh board")
+unittest
+{
+    auto board = new Board;
+    assert(board[board.startA].access == Access.a);
+    assert(board[board.startB].access == Access.b);
+
+    // Some random points around that should be empty
+    assert(board[Pos(1, 1)].access == Access.none);
+    assert(board[Pos(20, 10)].access == Access.none);
+    assert(board[Pos(0, 0)].access == Access.none);
+
+    // The neighborhood near the start positions
+    foreach (dx; -1 .. 2)
+    {
+        foreach (dy; -1 .. 2)
+        {
+            assert(board[Pos(board.startA.x + dx, board.startA.y + dy)].access == Access.a);
+            assert(board[Pos(board.startB.x + dx, board.startB.y + dy)].access == Access.b);
+        }
+    }
+    assert(board[Pos(0, 0)].access == Access.none);
 }
 
 enum Access
@@ -91,42 +127,30 @@ struct Block
     Access access;
     Pos pos;
 
-    void draw(SvgSink sink, Board board)
+    void draw(SvgSink sink)
     {
         string color;
         final switch (access) with (Access)
         {
             case none:
-                color = board.colorBg;
+                color = sink.colorBg;
                 break;
             case both:
-                color = board.colorBoth;
+                color = sink.colorBoth;
                 break;
             case a:
-                color = board.colorA;
+                color = sink.colorA;
                 break;
             case b:
-                color = board.colorB;
+                color = sink.colorB;
                 break;
         }
         auto center = sink.center(pos);
         auto scale = Point(sink.halfScale, sink.halfScale);
-        auto left = center - scale, right = center + scale;
-        sink.put(format(`<rect x1=%s y1=%s x2=%s y2=%s fill="%s" stroke="#CAD0D1" stroke-width="%s" />`,
-                    left.x, left.y, right.x, right.y, color, sink.thinStroke));
-    }
-}
-
-struct Pos
-{
-    int x, y;
-    int opCmp(Pos other)
-    {
-        if (x != other.x)
-        {
-            return x - other.x;
-        }
-        return y - other.y;
+        auto left = center - Point(sink.halfScale, sink.halfScale);
+        sink.put(format(`<rect x="%s" y="%s" width="%s" height="%s" fill="%s" stroke="#CAD0D1" stroke-width="%s" />`,
+                    left.x, left.y, sink.scale, sink.scale, color, sink.thinStroke));
+        if (type !is null) type.draw(sink, pos);
     }
 }
 
@@ -143,8 +167,9 @@ abstract class BlockType
     static BlockType oplus;
     static BlockType star;
     static BlockType ostar;
+    static BlockType source;
 
-    static BlockType[] all;
+    static BlockType[] playable;
 
     static this()
     {
@@ -154,8 +179,9 @@ abstract class BlockType
         oplus = new BlockOPlus();
         star = new BlockStar();
         ostar = new BlockOStar();
+        source = new BlockSource;
 
-        all = [
+        playable = [
             x, ox, plus, oplus, star, ostar,
             new Arrow(Pos(-1, -1)),
             new Arrow(Pos(-1,  0)),
@@ -169,57 +195,6 @@ abstract class BlockType
     }
 }
 
-struct Point
-{
-    double x, y;
-
-    Point rotate(real radians)
-    {
-        return this;
-    }
-
-    Point opBinary(string op)(Point other) if (op == "+" || op == "-")
-    {
-        return Point(
-                mixin("this.x " ~ op ~ " other.x"),
-                mixin("this.y " ~ op ~ " other.y"));
-    }
-}
-
-class SvgSink
-{
-    this(double scale)
-    {
-        this.scale = scale;
-        ap.reserve(1024 * 10);
-        ap.put(format(`<svg viewBox="0 0 %s %s" xmlns="http://www.w3.org/2000/svg">`));
-    }
-
-    Appender!string ap;
-
-    void put(string s)
-    {
-        ap.put(s);
-        ap.put("\n");
-    }
-
-    void write(string filename)
-    {
-        ap.put(`</svg>`);
-        import std.stdio: toFile;
-        ap.data.toFile(filename);
-    }
-
-    Point center(Pos p)
-    {
-        return Point(2 * halfScale * p.x + halfScale, 2 * halfScale * p.y + halfScale);
-    }
-
-    double halfScale() { return 20; }
-    double strokeWidth() { return 1; }
-    double thinStroke() { return 0.1; }
-}
-
 class BlockMine : BlockType
 {
     override const(Pos[]) downstreamOffsets() { return null; }
@@ -333,7 +308,7 @@ class BlockStar : BlockType
 
 class BlockOStar : BlockType
 {
-    private static immutable Pos[] offsets = [
+    static immutable Pos[] offsets = [
         Pos(-2,  0),
         Pos( 2,  0),
         Pos( 0, -2),
@@ -370,13 +345,14 @@ class Arrow : BlockType
 
     override void draw(SvgSink sink, Pos pos)
     {
-        auto scale = sink.halfScale;
+        auto scale = (toward.x == 0 || toward.y == 0) ? sink.halfScale : sink.angleScale;
+        scale *= sink.drawablePortion;
         auto center = sink.center(pos);
         auto xstart = scale * -toward.x + center.x;
         auto ystart = scale * -toward.y + center.y;
         auto xend = scale * toward.x + center.x;
         auto yend = scale * toward.y + center.y;
-        sink.put(format(`<line x1=%s y1=%s x2=%s y2=%s stroke="black" stroke-width="%s" />`,
+        sink.put(format(`<line x1="%s" y1="%s" x2="%s" y2="%s" stroke="black" stroke-width="%s" />`,
                 xstart, ystart, xend, yend, sink.strokeWidth));
 
         // Now the head. This requires a bit of math.
@@ -390,46 +366,58 @@ class Arrow : BlockType
         auto wing1 = wingCore.rotate(PI / 4) + center;
         auto wing2 = wingCore.rotate(PI / -4) + center;
         sink.put(format(`<path d="M %s %s L %s %s L %s %s" stroke="black" stroke-width="%s" />`,
-                wing1.x, wing1.y, xend, yend, wing2.x, wing2.y));
+                wing1.x, wing1.y, xend, yend, wing2.x, wing2.y, sink.strokeWidth));
     }
 }
 
 class BlockSource : BlockType
 {
+    override void draw(SvgSink sink, Pos pos)
+    {
+        // A half-sized circle
+        auto scale = sink.halfScale;
+        auto center = sink.center(pos);
+        sink.put(format(`<circle cx="%s" cy="%s" r="%s" stroke="black" stroke-width="%s" fill="none" />`,
+                    center.x, center.y, scale * 0.5, sink.strokeWidth));
+    }
+    override const(Pos[]) downstreamOffsets()
+    {
+        return BlockOStar.offsets;
+    }
 }
 
 void drawPlus(SvgSink sink, Pos pos)
 {
-    auto scale = sink.halfScale;
+    auto scale = sink.halfScale * sink.drawablePortion;
     auto center = sink.center(pos);
     auto x1 = center.x - scale;
     auto x2 = center.x + scale;
     auto y1 = center.y - scale;
     auto y2 = center.y + scale;
-    sink.put(format(`<line x1=%s y1=%s x2=%s y2=%s stroke="black" stroke-width="%s" />`,
+    sink.put(format(`<line x1="%s" y1="%s" x2="%s" y2="%s" stroke="black" stroke-width="%s" />`,
                 x1, center.y, x2, center.y, sink.strokeWidth));
-    sink.put(format(`<line x1=%s y1=%s x2=%s y2=%s stroke="black" stroke-width="%s" />`,
+    sink.put(format(`<line x1="%s" y1="%s" x2="%s" y2="%s" stroke="black" stroke-width="%s" />`,
                 center.x, y2, center.x, y1, sink.strokeWidth));
 }
 
 void drawX(SvgSink sink, Pos pos)
 {
-    auto scale = sink.halfScale;
+    auto scale = sink.angleScale * sink.drawablePortion;
     auto center = sink.center(pos);
     auto x1 = center.x - scale;
     auto x2 = center.x + scale;
     auto y1 = center.y - scale;
     auto y2 = center.y + scale;
-    sink.put(format(`<line x1=%s y1=%s x2=%s y2=%s stroke="black" stroke-width="%s" />`,
+    sink.put(format(`<line x1="%s" y1="%s" x2="%s" y2="%s" stroke="black" stroke-width="%s" />`,
                 x1, y1, x2, y2, sink.strokeWidth));
-    sink.put(format(`<line x1=%s y1=%s x2=%s y2=%s stroke="black" stroke-width="%s" />`,
+    sink.put(format(`<line x1="%s" y1="%s" x2="%s" y2="%s" stroke="black" stroke-width="%s" />`,
                 x1, y2, x2, y1, sink.strokeWidth));
 }
 
 void drawCircle(SvgSink sink, Pos pos)
 {
-    auto scale = sink.halfScale;
+    auto scale = sink.halfScale * sink.drawablePortion;
     auto center = sink.center(pos);
-    sink.put(format(`<circle cx=%s cy=%s r=%s stroke="black" stroke-width="%s" />`,
+    sink.put(format(`<circle cx="%s" cy="%s" r="%s" stroke="black" stroke-width="%s" fill="none" />`,
                 center.x, center.y, scale, sink.strokeWidth));
 }

source/cosmic/drawing.d

@@ -0,0 +1,70 @@
+module cosmic.drawing;
+
+import cosmic.base;
+import cosmic.drawing;
+
+class SvgSink
+{
+    import std.array : Appender;
+
+    this()
+    {
+        this(new Theme);
+    }
+
+    this(Theme theme)
+    {
+        this.theme = theme;
+        ap.reserve(1024 * 10);
+
+        import std.format : format;
+        ap.put(format(`<svg viewBox="0 0 %s %s" xmlns="http://www.w3.org/2000/svg">`,
+                    theme.halfScale * WIDTH * 2,
+                    theme.halfScale * HEIGHT * 2));
+        ap.put("\n\t");
+    }
+
+    Appender!string ap;
+
+    void put(string s)
+    {
+        ap.put(s);
+        ap.put("\n\t");
+    }
+
+    void write(string filename)
+    {
+        ap.put("\n");
+        ap.put(`</svg>`);
+        import std.stdio: toFile;
+        ap.data.toFile(filename);
+    }
+
+    Point center(Pos p)
+    {
+        return Point(2 * halfScale * p.x + halfScale, 2 * halfScale * p.y + halfScale);
+    }
+
+
+    Theme theme = new Theme;
+    alias theme this;
+}
+
+
+class Theme
+{
+    double scale = 40;
+    double halfScale() @property pure { return scale / 2; }
+    double angleScale() @property pure { return (scale / 2) / (2 ^^ 0.5); }
+
+    double drawablePortion = 0.8;
+
+    double strokeWidth = 4;
+    double thinStroke = 1;
+
+    string colorA = "#ff0000",
+           colorB = "#0000ff",
+           colorBoth = "#ff00ff",
+           colorBg = "#E3EAEA",
+           colorGrid = "#CAD0D1";
+}

source/cosmic/random.d

@@ -0,0 +1 @@
+module cosmic.random;

source/cosmicai/ai.d

@@ -1 +0,0 @@
-module cosmicai.ai;