From: Simon Cross <hodgestar@gmail.com>
Date: Sun, 4 Sep 2016 20:42:31 +0000 (+0200)
Subject: Merge branch 'master' of ctpug.org.za:tabakrolletjie
X-Git-Tag: tabakrolletjie-v1.0.0~244
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=d4c6abebe81ab103a61c3d7269e982d9ed8a939a;hp=7f10fb40bd02b5048d2086b85e48282662a59be0;p=tabakrolletjie.git

Merge branch 'master' of ctpug.org.za:tabakrolletjie
---

diff --git a/sources/bitmap/sources.txt b/sources/bitmap/sources.txt
new file mode 100644
index 0000000..7cb1aa5
--- /dev/null
+++ b/sources/bitmap/sources.txt
@@ -0,0 +1,8 @@
+Soil texture:
+https://commons.wikimedia.org/wiki/File:2008-08-12_Mulch.jpg
+
+Stone texture:
+https://commons.wikimedia.org/wiki/File:Galets.jpg
+
+Shrub texture:
+https://commons.wikimedia.org/wiki/File:Gew%C3%B6hnlicher_Buchsbaum,_Buxus_sempervirens_.JPG
diff --git a/sources/vector/lamp.svg b/sources/vector/lamp.svg
new file mode 100644
index 0000000..c08734e
--- /dev/null
+++ b/sources/vector/lamp.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100mm"
+   height="100mm"
+   viewBox="0 0 354.33071 354.33071"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="lamp.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="123.25557"
+     inkscape:cy="182.65552"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1264"
+     inkscape:window-height="720"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4423"
+       units="mm"
+       spacingx="3.543307"
+       spacingy="3.543307" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-698.0315)">
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4554"
+       cx="177.16536"
+       cy="875.19684"
+       r="141.73228" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4558"
+       cx="177.16536"
+       cy="875.19684"
+       rx="106.29922"
+       ry="106.29919" />
+  </g>
+</svg>
diff --git a/sources/vector/laser.svg b/sources/vector/laser.svg
new file mode 100644
index 0000000..8afdd9e
--- /dev/null
+++ b/sources/vector/laser.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100mm"
+   height="100mm"
+   viewBox="0 0 354.33071 354.33071"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="laser.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="123.25557"
+     inkscape:cy="182.29837"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1264"
+     inkscape:window-height="720"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4423"
+       units="mm"
+       spacingx="3.543307"
+       spacingy="3.543307" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-698.0315)">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 88.582677,733.46457 c 70.866143,-17.71653 106.299213,-17.71653 177.165353,0 l 0,283.46453 c -70.86614,17.7166 -106.29921,17.7166 -177.165353,0 z"
+       id="path4597"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 88.582677,822.04725 c 70.866143,-17.71654 106.299213,-17.71654 177.165353,0 l 0,35.43307 c -35.43307,-17.71654 -141.73228,-17.71654 -177.165353,0 z"
+       id="path4599"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
diff --git a/sources/vector/spotlight.svg b/sources/vector/spotlight.svg
new file mode 100644
index 0000000..4f0d58b
--- /dev/null
+++ b/sources/vector/spotlight.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100mm"
+   height="100mm"
+   viewBox="0 0 354.33071 354.33071"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="spotlight.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="123.25557"
+     inkscape:cy="182.29837"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1264"
+     inkscape:window-height="720"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4423"
+       units="mm"
+       spacingx="3.543307"
+       spacingy="3.543307" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-698.0315)">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 35.433071,733.46457 c 88.582679,-17.71653 194.881889,-17.71653 283.464569,0 0,124.01575 -35.43307,248.0315 -141.73229,248.0315 -106.299208,0 -141.732279,-124.01575 -141.732279,-248.0315 z"
+       id="path4529"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 17.716535,822.04725 c 0,-17.71654 35.433071,-17.71654 35.433071,0 0,141.73228 35.433071,177.16535 124.015744,177.16535 88.58268,0 124.01575,-35.43307 124.01575,-177.16535 0,-17.71654 35.43307,-17.71654 35.43307,0 0,141.73228 -35.43307,212.59845 -159.44882,212.59845 -124.015744,0 -159.448815,-70.86617 -159.448815,-212.59845 z"
+       id="path4533"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsccsc" />
+  </g>
+</svg>
diff --git a/tabakrolletjie/images/16/mouldA.png b/tabakrolletjie/images/16/mouldA.png
new file mode 100644
index 0000000..61763a3
Binary files /dev/null and b/tabakrolletjie/images/16/mouldA.png differ
diff --git a/tabakrolletjie/images/16/mouldB.png b/tabakrolletjie/images/16/mouldB.png
new file mode 100644
index 0000000..7713750
Binary files /dev/null and b/tabakrolletjie/images/16/mouldB.png differ
diff --git a/tabakrolletjie/images/16/mouldC.png b/tabakrolletjie/images/16/mouldC.png
new file mode 100644
index 0000000..469a420
Binary files /dev/null and b/tabakrolletjie/images/16/mouldC.png differ
diff --git a/tabakrolletjie/images/32/eyeball.png b/tabakrolletjie/images/32/eyeball.png
new file mode 100644
index 0000000..68693a3
Binary files /dev/null and b/tabakrolletjie/images/32/eyeball.png differ
diff --git a/tabakrolletjie/images/32/mouldA.png b/tabakrolletjie/images/32/mouldA.png
new file mode 100644
index 0000000..5c1a60c
Binary files /dev/null and b/tabakrolletjie/images/32/mouldA.png differ
diff --git a/tabakrolletjie/images/32/mouldB.png b/tabakrolletjie/images/32/mouldB.png
new file mode 100644
index 0000000..8e7321c
Binary files /dev/null and b/tabakrolletjie/images/32/mouldB.png differ
diff --git a/tabakrolletjie/images/32/mouldC.png b/tabakrolletjie/images/32/mouldC.png
new file mode 100644
index 0000000..bc8cab3
Binary files /dev/null and b/tabakrolletjie/images/32/mouldC.png differ
diff --git a/tabakrolletjie/images/32/seed.png b/tabakrolletjie/images/32/seed.png
new file mode 100644
index 0000000..2f11b22
Binary files /dev/null and b/tabakrolletjie/images/32/seed.png differ
diff --git a/tabakrolletjie/images/32/turnip1.png b/tabakrolletjie/images/32/turnip1.png
new file mode 100644
index 0000000..6df8e84
Binary files /dev/null and b/tabakrolletjie/images/32/turnip1.png differ
diff --git a/tabakrolletjie/images/32/turnip2.png b/tabakrolletjie/images/32/turnip2.png
new file mode 100644
index 0000000..4a88a8a
Binary files /dev/null and b/tabakrolletjie/images/32/turnip2.png differ
diff --git a/tabakrolletjie/images/32/turnip3.png b/tabakrolletjie/images/32/turnip3.png
new file mode 100644
index 0000000..1153012
Binary files /dev/null and b/tabakrolletjie/images/32/turnip3.png differ
diff --git a/tabakrolletjie/images/64/lamp.png b/tabakrolletjie/images/64/lamp.png
new file mode 100644
index 0000000..ae2443c
Binary files /dev/null and b/tabakrolletjie/images/64/lamp.png differ
diff --git a/tabakrolletjie/images/64/laser.png b/tabakrolletjie/images/64/laser.png
new file mode 100644
index 0000000..2ba3633
Binary files /dev/null and b/tabakrolletjie/images/64/laser.png differ
diff --git a/tabakrolletjie/images/64/mouldA.png b/tabakrolletjie/images/64/mouldA.png
new file mode 100644
index 0000000..9766f23
Binary files /dev/null and b/tabakrolletjie/images/64/mouldA.png differ
diff --git a/tabakrolletjie/images/64/mouldB.png b/tabakrolletjie/images/64/mouldB.png
new file mode 100644
index 0000000..d786c91
Binary files /dev/null and b/tabakrolletjie/images/64/mouldB.png differ
diff --git a/tabakrolletjie/images/64/mouldC.png b/tabakrolletjie/images/64/mouldC.png
new file mode 100644
index 0000000..92ffc98
Binary files /dev/null and b/tabakrolletjie/images/64/mouldC.png differ
diff --git a/tabakrolletjie/images/64/spotlight.png b/tabakrolletjie/images/64/spotlight.png
new file mode 100644
index 0000000..5d54037
Binary files /dev/null and b/tabakrolletjie/images/64/spotlight.png differ
diff --git a/tabakrolletjie/images/Makefile b/tabakrolletjie/images/Makefile
new file mode 100644
index 0000000..5b3827c
--- /dev/null
+++ b/tabakrolletjie/images/Makefile
@@ -0,0 +1,29 @@
+VPATH=../../sources/vector
+
+TURNIP=seed turnip1 turnip2 turnip3
+MOULD_BODY=mouldA mouldB mouldC
+MOULD=eyeball
+LIGHT=spotlight lamp laser
+
+IMG16=$(MOULD_BODY)
+IMG32=$(TURNIP) $(MOULD_BODY) $(MOULD)
+IMG64=$(MOULD_BODY) $(LIGHT)
+
+PNG16=$(patsubst %, 16/%.png, $(IMG16))
+PNG32=$(patsubst %, 32/%.png, $(IMG32))
+PNG64=$(patsubst %, 64/%.png, $(IMG64))
+
+all: $(PNG16) $(PNG32) $(PNG64)
+
+16/%.png: %.svg
+	@mkdir -p `dirname $@`
+	@inkscape -z -e $@ -w 16 -h 16 $<
+	
+32/%.png: %.svg
+	@mkdir -p `dirname $@`
+	@inkscape -z -e $@ -w 32 -h 32 $<
+	
+64/%.png: %.svg
+	@mkdir -p `dirname $@`
+	@inkscape -z -e $@ -w 64 -h 64 $<
+
diff --git a/tabakrolletjie/images/textures/shrub.png b/tabakrolletjie/images/textures/shrub.png
new file mode 100644
index 0000000..5b8ec36
Binary files /dev/null and b/tabakrolletjie/images/textures/shrub.png differ
diff --git a/tabakrolletjie/images/textures/soil.png b/tabakrolletjie/images/textures/soil.png
new file mode 100644
index 0000000..c873f7f
Binary files /dev/null and b/tabakrolletjie/images/textures/soil.png differ
diff --git a/tabakrolletjie/images/textures/stone.png b/tabakrolletjie/images/textures/stone.png
new file mode 100644
index 0000000..94f4a88
Binary files /dev/null and b/tabakrolletjie/images/textures/stone.png differ