Add snapcraft packaging and command-line options.

mxgmn · Oct 5, 2016 · 935338b · 935338b
1 parent 3b8cf7f
commit 935338b
Show file tree

Hide file tree

Showing 106 changed files with 196 additions and 13 deletions.
diff --git a/1 Chess 0.bmp b/1 Chess 0.bmp
diff --git a/1 Chess 1.bmp b/1 Chess 1.bmp
diff --git a/10 Office 0.bmp b/10 Office 0.bmp
diff --git a/10 Office 1.bmp b/10 Office 1.bmp
diff --git a/11 Paths 0.bmp b/11 Paths 0.bmp
diff --git a/11 Paths 1.bmp b/11 Paths 1.bmp
diff --git a/12 Platformer 0.bmp b/12 Platformer 0.bmp
diff --git a/12 Platformer 1.bmp b/12 Platformer 1.bmp
diff --git a/13 Platformer 0.bmp b/13 Platformer 0.bmp
diff --git a/13 Platformer 1.bmp b/13 Platformer 1.bmp
diff --git a/14 Red Maze 0.bmp b/14 Red Maze 0.bmp
diff --git a/14 Red Maze 1.bmp b/14 Red Maze 1.bmp
diff --git a/15 Rooms 0.bmp b/15 Rooms 0.bmp
diff --git a/15 Rooms 1.bmp b/15 Rooms 1.bmp
diff --git a/15 Rooms 2.bmp b/15 Rooms 2.bmp
diff --git a/16 Rule 126 0.bmp b/16 Rule 126 0.bmp
diff --git a/16 Rule 126 1.bmp b/16 Rule 126 1.bmp
diff --git a/17 Simple Knot 0.bmp b/17 Simple Knot 0.bmp
diff --git a/17 Simple Knot 1.bmp b/17 Simple Knot 1.bmp
diff --git a/18 Simple Maze 0.bmp b/18 Simple Maze 0.bmp
diff --git a/18 Simple Maze 1.bmp b/18 Simple Maze 1.bmp
diff --git a/19 Simple Wall 0.bmp b/19 Simple Wall 0.bmp
diff --git a/19 Simple Wall 1.bmp b/19 Simple Wall 1.bmp
diff --git a/20 Simple Wall 0.bmp b/20 Simple Wall 0.bmp
diff --git a/20 Simple Wall 1.bmp b/20 Simple Wall 1.bmp
diff --git a/21 Simple Wall 0.bmp b/21 Simple Wall 0.bmp
diff --git a/21 Simple Wall 1.bmp b/21 Simple Wall 1.bmp
diff --git a/22 Simple Wall 0.bmp b/22 Simple Wall 0.bmp
diff --git a/22 Simple Wall 1.bmp b/22 Simple Wall 1.bmp
diff --git a/23 Trick Knot 0.bmp b/23 Trick Knot 0.bmp
diff --git a/23 Trick Knot 1.bmp b/23 Trick Knot 1.bmp
diff --git a/24 Village 0.bmp b/24 Village 0.bmp
diff --git a/24 Village 1.bmp b/24 Village 1.bmp
diff --git a/25 Water 0.bmp b/25 Water 0.bmp
diff --git a/25 Water 1.bmp b/25 Water 1.bmp
diff --git a/26 Summer 0.bmp b/26 Summer 0.bmp
diff --git a/26 Summer 1.bmp b/26 Summer 1.bmp
diff --git a/27 Castle 0.bmp b/27 Castle 0.bmp
diff --git a/27 Castle 1.bmp b/27 Castle 1.bmp
diff --git a/28 Circuit 0.bmp b/28 Circuit 0.bmp
diff --git a/28 Circuit 1.bmp b/28 Circuit 1.bmp
diff --git a/29 Knots 0.bmp b/29 Knots 0.bmp
diff --git a/29 Knots 1.bmp b/29 Knots 1.bmp
diff --git a/3 City 0.bmp b/3 City 0.bmp
diff --git a/3 City 1.bmp b/3 City 1.bmp
diff --git a/30 Knots 0.bmp b/30 Knots 0.bmp
diff --git a/30 Knots 1.bmp b/30 Knots 1.bmp
diff --git a/31 Knots 0.bmp b/31 Knots 0.bmp
diff --git a/31 Knots 1.bmp b/31 Knots 1.bmp
diff --git a/32 Knots 0.bmp b/32 Knots 0.bmp
diff --git a/32 Knots 1.bmp b/32 Knots 1.bmp
diff --git a/33 Knots 0.bmp b/33 Knots 0.bmp
diff --git a/33 Knots 1.bmp b/33 Knots 1.bmp
diff --git a/34 Knots 0.bmp b/34 Knots 0.bmp
diff --git a/34 Knots 1.bmp b/34 Knots 1.bmp
diff --git a/35 Knots 0.bmp b/35 Knots 0.bmp
diff --git a/35 Knots 1.bmp b/35 Knots 1.bmp
diff --git a/36 Knots 0.bmp b/36 Knots 0.bmp
diff --git a/36 Knots 1.bmp b/36 Knots 1.bmp
diff --git a/37 Knots 0.bmp b/37 Knots 0.bmp
diff --git a/37 Knots 1.bmp b/37 Knots 1.bmp
diff --git a/38 Knots 0.bmp b/38 Knots 0.bmp
diff --git a/38 Knots 1.bmp b/38 Knots 1.bmp
diff --git a/39 Rooms 0.bmp b/39 Rooms 0.bmp
diff --git a/39 Rooms 1.bmp b/39 Rooms 1.bmp
diff --git a/4 Flowers 0.bmp b/4 Flowers 0.bmp
diff --git a/4 Flowers 1.bmp b/4 Flowers 1.bmp
diff --git a/40 Circles 0.bmp b/40 Circles 0.bmp
diff --git a/40 Circles 1.bmp b/40 Circles 1.bmp
diff --git a/41 Circles 0.bmp b/41 Circles 0.bmp
diff --git a/41 Circles 1.bmp b/41 Circles 1.bmp
diff --git a/42 Circles 0.bmp b/42 Circles 0.bmp
diff --git a/42 Circles 1.bmp b/42 Circles 1.bmp
diff --git a/43 Circles 0.bmp b/43 Circles 0.bmp
diff --git a/43 Circles 1.bmp b/43 Circles 1.bmp
diff --git a/44 Village 0.bmp b/44 Village 0.bmp
diff --git a/44 Village 1.bmp b/44 Village 1.bmp
diff --git a/45 Summer 0.bmp b/45 Summer 0.bmp
diff --git a/45 Summer 1.bmp b/45 Summer 1.bmp
diff --git a/46 3Bricks 0.bmp b/46 3Bricks 0.bmp
diff --git a/46 3Bricks 1.bmp b/46 3Bricks 1.bmp
diff --git a/5 Hogs 0.bmp b/5 Hogs 0.bmp
diff --git a/5 Hogs 1.bmp b/5 Hogs 1.bmp
diff --git a/6 Hogs 0.bmp b/6 Hogs 0.bmp
diff --git a/6 Hogs 1.bmp b/6 Hogs 1.bmp
diff --git a/7 Knot 0.bmp b/7 Knot 0.bmp
diff --git a/7 Knot 1.bmp b/7 Knot 1.bmp
diff --git a/8 Less Rooms 0.bmp b/8 Less Rooms 0.bmp
diff --git a/8 Less Rooms 1.bmp b/8 Less Rooms 1.bmp
diff --git a/9 Mountains 0.bmp b/9 Mountains 0.bmp
diff --git a/9 Mountains 1.bmp b/9 Mountains 1.bmp
diff --git a/Main.cs b/Main.cs
@@ -9,13 +9,122 @@ The above copyright notice and this permission notice shall be included in all c
 using System;
 using System.Xml;
 
+using NDesk.Options;
+
 static class Program
 {
-	static void Main()
+	static void Main(string[] args)
 	{
+		bool showHelp = false;
+		string samplesFrom = "";
+		string inputPath = "";
+		string outputFile = "out.png";
+
+		string modelName = "overlapping";
+		bool periodic = false;
+		int width = 48;
+		int height = 48;
+		int limit = 0;
+
+		int overlapN = 2;
+		int overlapSymmetry = 8;
+		int overlapGround = 0;
+		bool overlapPeriodicInput = true;
+
+		string tiledSubset = default(string);
+		bool tiledBlack = false;
+
+		var p = new OptionSet() {
+			{ "samples-from=", "Process samples from XML {FILE}. All other options ignored.",
+				v => samplesFrom = v },
+			{ "i|input=", "Input {PATH}: PNG image for --model=overlapping; directory containing data.xml for --model=simpletiled",
+				v => inputPath = v },
+			{ "o|output=", "Output {FILE}, default=" + $"{outputFile}",
+				v => outputFile = v },
+			{ "w|width=", "Tiled image width {INT} when --model=simpletiled, default=" + $"{width}",
+				(int v) => width = v },
+			{ "h|height=", "Tiled image height {INT} when --model=simpletiled, default=" + $"{height}",
+				(int v) => height = v },
+			{ "m|model=", "Model {TYPE}: `overlapping` (default) or `simpletiled`. Required.",
+				v => modelName = v },
+			{ "n=", "{N} parameter, when --model=overlapping, default=" + $"{overlapN}",
+				(int v) => overlapN  = v },
+			{ "limit=", "Model limit {INT}, default="+ $"{limit}",
+				(int v) => limit  = v },
+			{ "p|periodic", "Periodic, default false",
+				v => periodic = v != null },
+			{ "symmetry=", "Symmetry {INT}, when --model=overlapping, default=" + $"{overlapSymmetry}",
+				(int v) => overlapSymmetry = v },
+			{ "ground=", "Ground {INT}, when --model=overlapping, default=" + $"{overlapGround}",
+				(int v) => overlapGround = v },
+			{ "pi|periodicInput=", "Periodic input {BOOL}, when --model=overlapping, default=" + $"{overlapPeriodicInput}",
+				(bool v) => overlapPeriodicInput = v },
+			{ "subset=", "Subset {NAME} in data.xml, when --model=simpletiled",
+				v => tiledSubset = v },
+			{ "black=", "Black, when --model=simpletiled, default false",
+				v => tiledBlack = v != null },
+			{ "help", "Display help and exit",
+				v => showHelp = v != null },
+		};
+		try {
+			p.Parse(args);
+		}
+		catch (OptionException e) {
+			Console.Write("wfc: ");
+			Console.Write(e.Message);
+			Console.WriteLine("Try `wfc --help` for more information.");
+			return;
+		}
+
+		if (showHelp) {
+			ShowHelp(p);
+			return;
+		}
+
+		if (samplesFrom != "") {
+			processSamplesFrom(samplesFrom);
+			return;
+		}
+
+		if (inputPath == "") {
+			Console.WriteLine("wfc: missing input");
+			ShowHelp(p);
+			return;
+		}
+
+		Random random = new Random();
+		Model model;
+
+		if (modelName == "overlapping") {
+			model = new OverlappingModel(
+				inputPath, overlapN, width, height, overlapPeriodicInput, periodic, overlapSymmetry, overlapGround);
+		} else if (modelName == "simpletiled") {
+			model = new SimpleTiledModel(
+				inputPath, tiledSubset, width, height, periodic, tiledBlack);
+		} else {
+			Console.WriteLine("wfc: unsupported model type: " + modelName);
+			ShowHelp(p);
+			return;
+		}
+
+		for (int k = 0; k < 10; k++)
+		{
+			int seed = random.Next();
+			bool finished = model.Run(seed, limit);
+			if (finished)
+			{
+				Console.WriteLine("DONE");
+				model.Graphics().Save($"{outputFile}");
+				break;
+			}
+			else Console.WriteLine("CONTRADICTION");
+		}
+	}
+
+	static void processSamplesFrom(string samplesFrom) {
 		Random random = new Random();
 		var xdoc = new XmlDocument();
-		xdoc.Load("samples.xml");
+		xdoc.Load(samplesFrom);
 
 		int counter = 1;
 		foreach (XmlNode xnode in xdoc.FirstChild.ChildNodes)
@@ -26,11 +135,16 @@ static void Main()
 			string name = xnode.Get<string>("name");
 			Console.WriteLine($"< {name}");
 
-			if (xnode.Name == "overlapping") model = new OverlappingModel(name, xnode.Get("N", 2), xnode.Get("width", 48), xnode.Get("height", 48), 
-				xnode.Get("periodicInput", true), xnode.Get("periodic", false), xnode.Get("symmetry", 8), xnode.Get("ground", 0));
-			else if (xnode.Name == "simpletiled") model = new SimpleTiledModel(name, xnode.Get<string>("subset"), 
-				xnode.Get("width", 10), xnode.Get("height", 10), xnode.Get("periodic", false), xnode.Get("black", false));
-			else continue;
+			if (xnode.Name == "overlapping") {
+				string inputPath = $"samples/{name}.png";
+				model = new OverlappingModel(inputPath, xnode.Get("N", 2), xnode.Get("width", 48), xnode.Get("height", 48), 
+					xnode.Get("periodicInput", true), xnode.Get("periodic", false),
+					xnode.Get("symmetry", 8), xnode.Get("foundation", 0));
+			} else if (xnode.Name == "simpletiled") {
+				string inputPath = $"samples/{name}";
+				model = new SimpleTiledModel(inputPath, xnode.Get<string>("subset"), 
+					xnode.Get("width", 10), xnode.Get("height", 10), xnode.Get("periodic", false), xnode.Get("black", false));
+			} else continue;
 
 			for (int i = 0; i < xnode.Get("screenshots", 2); i++)
 			{
@@ -52,4 +166,13 @@ static void Main()
 			counter++;
 		}
 	}
+
+	static void ShowHelp (OptionSet p)
+	{
+		Console.WriteLine ("Usage: wfc [OPTIONS]");
+		Console.WriteLine ("Bitmap & tilemap generation from a single example with the help of ideas from quantum mechanics.");
+		Console.WriteLine ();
+		Console.WriteLine ("Options:");
+		p.WriteOptionDescriptions (Console.Out);
+	}
 }
diff --git a/Makefile b/Makefile
@@ -0,0 +1,19 @@
+
+CSC=mcs
+
+.PHONY: all
+all: wfc.exe
+
+install: wfc.exe
+	cp wfc.exe $(DESTDIR)/wfc.exe
+
+wfc.exe: Options.cs
+	$(CSC) /debug /d:NDESK_OPTIONS /reference:System.Drawing.dll *.cs /out:$@
+
+Options.cs:
+	cp `pkg-config --variable=Sources mono-options` .
+
+.PHONY: clean
+clean:
+	$(RM) wfc.exe Options.cs
+
diff --git a/OverlappingModel.cs b/OverlappingModel.cs
@@ -20,14 +20,14 @@ class OverlappingModel : Model
 	List<Color> colors;
 	int ground;
 
-	public OverlappingModel(string name, int N, int width, int height, bool periodicInput, bool periodicOutput, int symmetry, int ground)
+	public OverlappingModel(string inputPath, int N, int width, int height, bool periodicInput, bool periodicOutput, int symmetry, int ground)
 	{
 		this.N = N;
 		FMX = width;
 		FMY = height;
 		periodic = periodicOutput;
 
-		var bitmap = new Bitmap($"samples/{name}.png");
+		var bitmap = new Bitmap(inputPath);
 		int SMX = bitmap.Width, SMY = bitmap.Height;
 		byte[,] sample = new byte[SMX, SMY];
 		colors = new List<Color>();

diff --git a/SimpleTiledModel.cs b/SimpleTiledModel.cs
@@ -20,15 +20,15 @@ class SimpleTiledModel : Model
 	int tilesize;
 	bool black;
 
-	public SimpleTiledModel(string name, string subsetName, int width, int height, bool periodic, bool black)
+	public SimpleTiledModel(string inputPath, string subsetName, int width, int height, bool periodic, bool black)
 	{
 		FMX = width;
 		FMY = height;
 		this.periodic = periodic;
 		this.black = black;
 
 		var xdoc = new XmlDocument();
-		xdoc.Load($"samples/{name}/data.xml");
+		xdoc.Load($"{inputPath}/data.xml");
 		XmlNode xnode = xdoc.FirstChild;
 		tilesize = xnode.Get("size", 16);
 		bool unique = xnode.Get("unique", false);
@@ -124,13 +124,13 @@ public SimpleTiledModel(string name, string subsetName, int width, int height, b
 			{
 				for (int t = 0; t < cardinality; t++)
 				{
-					Bitmap bitmap = new Bitmap($"samples/{name}/{tilename} {t}.png");
+					Bitmap bitmap = new Bitmap($"{inputPath}/{tilename} {t}.png");
 					tiles.Add(tile((x, y) => bitmap.GetPixel(x, y)));
 				}
 			}
 			else
 			{
-				Bitmap bitmap = new Bitmap($"samples/{name}/{tilename}.png");
+				Bitmap bitmap = new Bitmap($"{inputPath}/{tilename}.png");
 				tiles.Add(tile((x, y) => bitmap.GetPixel(x, y)));
 				for (int t = 1; t < cardinality; t++) tiles.Add(rotate(tiles[T + t - 1]));
 			}

diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -0,0 +1,30 @@
+name: wfc
+version: 0
+summary: This program generates bitmaps that are locally similar to the input bitmap.
+description: |
+  Bitmap & tilemap generation from a single example with the help of ideas from
+  quantum mechanics.
+
+grade: stable # must be 'stable' to release into candidate/stable channels
+confinement: strict # use 'strict' once you have the right plugs and slots
+
+apps:
+  wfc:
+    command: wfc-wrapper
+    plugs:
+      - home
+
+parts:
+  build-wfc:
+    plugin: make
+    source: .
+    build-packages: [mono-devel]
+    stage-packages: [mono-runtime, libmono-system-core4.0-cil, libmono-system-drawing4.0-cil]
+  copy-wfc:
+    plugin: dump
+    source: .
+    snap:
+      - wfc-wrapper
+      - wfc.exe
+      - usr/lib/mono/*/*
+      - usr/bin/mono
diff --git a/summer.png b/summer.png
diff --git a/test-1.png b/test-1.png
diff --git a/test-2.png b/test-2.png
diff --git a/test.png b/test.png
diff --git a/test2.png b/test2.png
diff --git a/test3.png b/test3.png
diff --git a/test4.png b/test4.png
diff --git a/wfc-cmars_0_amd64.snap b/wfc-cmars_0_amd64.snap
diff --git a/wfc-wrapper b/wfc-wrapper
@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+export MONO_PATH=${SNAP}/usr/lib/mono/4.5
+export HOME=${SNAP_USER_DATA}
+
+if [ ! -e "${HOME}/.mono/config" ]; then
+	mkdir -p ${HOME}/.mono
+	cp ${SNAP}/etc/mono/config ${HOME}/.mono/config
+fi
+
+exec ${SNAP}/usr/bin/mono ${SNAP}/wfc.exe "$@"
diff --git a/wfc_0_amd64.snap b/wfc_0_amd64.snap