From 2f069b4051b6995e99e3d0a3f7948265a4485dbd Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Tue, 26 Apr 2016 14:09:22 -0700
Subject: [PATCH] sort out voxel pics

---
 .../default/assets/images/tools/voxel-add.svg | 139 +++++++++++++-----
 .../default/assets/images/tools/voxels.svg    |  35 +++++
 scripts/default/voxels.js                     |   8 +-
 3 files changed, 143 insertions(+), 39 deletions(-)
 create mode 100644 scripts/default/assets/images/tools/voxels.svg

diff --git a/scripts/default/assets/images/tools/voxel-add.svg b/scripts/default/assets/images/tools/voxel-add.svg
index a0dbd63d45..8e6e2c5b35 100644
--- a/scripts/default/assets/images/tools/voxel-add.svg
+++ b/scripts/default/assets/images/tools/voxel-add.svg
@@ -1,35 +1,104 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
-<style type="text/css">
-	.st0{opacity:0.9;}
-	.st1{fill:#1E1E1E;}
-	.st2{fill:#EAEAEA;}
-</style>
-<g>
-	<g class="st0">
-		<path class="st1" d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"/>
-	</g>
-</g>
-<path class="st2" d="M36.5,9.8l-5.9-3.4c-0.3-0.2-0.7-0.2-1,0l-5.3,3.1l-5.5-3.2c-0.3-0.2-0.7-0.2-1,0L12,9.7
-	c-0.3,0.2-0.5,0.5-0.5,0.8v6.8c0,0.3,0.2,0.7,0.5,0.8l5.4,3.1v6.2c0,0.3,0.2,0.7,0.5,0.8l5.9,3.4c0.2,0.1,0.3,0.1,0.5,0.1
-	s0.3,0,0.5-0.1l5.9-3.4c0.3-0.2,0.5-0.5,0.5-0.8v-6.1l5.4-3.1c0.3-0.2,0.5-0.5,0.5-0.8v-6.8C37,10.3,36.8,10,36.5,9.8z M35.1,15.9
-	L31,13.5V8.8l4.1,2.4V15.9z M30.3,19.7l-5-2.9v-5.6l4.1-2.4v4.7l-2,1.2c-0.4,0.2-0.5,0.7-0.3,1.1c0.2,0.3,0.4,0.4,0.7,0.4
-	c0.1,0,0.3,0,0.4-0.1l2-1.2l4.1,2.4L30.3,19.7z M25.1,23.6V19l4.1,2.4V26L25.1,23.6z M23.3,15.8l-4.1-2.4V8.7l4.1,2.4V15.8z
-	 M13.4,11.1l4.1-2.4v4.7l-2.2,1.3c-0.4,0.2-0.5,0.7-0.3,1.1c0.2,0.3,0.4,0.4,0.7,0.4c0.1,0,0.3,0,0.4-0.1l2.2-1.3l4.1,2.4l-4.1,2.4
-	l-4.9-2.8L13.4,11.1L13.4,11.1z M24.3,29.8L19.4,27v-5.6l4.1-2.4v4.7l-2,1.1c-0.4,0.2-0.5,0.7-0.3,1.1c0.2,0.3,0.4,0.4,0.7,0.4
-	c0.1,0,0.3,0,0.4-0.1l2-1.1l4.1,2.4L24.3,29.8z"/>
-<g>
-	<path class="st2" d="M10.9,35.6l1.7,4.8l1.7-4.8h1.3L13.1,42h-1l-2.5-6.4H10.9z"/>
-	<path class="st2" d="M19,42c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1S16,39.2,16,38.8c0-0.4,0.1-0.8,0.2-1.2
-		s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.7,0.6,1
-		c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7C19.8,41.9,19.4,42,19,42z
-		 M17.2,38.8c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5
-		c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2
-		c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7C17.2,38.2,17.2,38.5,17.2,38.8z"/>
-	<path class="st2" d="M23.6,35.6l1.6,2.4l1.6-2.4h1.3l-2.3,3.2l2.2,3.1h-1.3l-1.5-2.2L23.7,42h-1.3l2.2-3.1l-2.3-3.2h1.3V35.6z"/>
-	<path class="st2" d="M33.4,40.9V42H29v-6.4h4.4v1.1h-3.1v1.5H33v1h-2.7v1.7H33.4z"/>
-	<path class="st2" d="M34.6,42v-6.4h1.2v5.3h3.3V42H34.6z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 50 50.1"
+   enable-background="new 0 0 50 50.1"
+   xml:space="preserve"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="marketplace.svg"><metadata
+     id="metadata27"><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><defs
+     id="defs25"><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 25.05 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="50 : 25.05 : 1"
+       inkscape:persp3d-origin="25 : 16.7 : 1"
+       id="perspective3808" /></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1549"
+     inkscape:window-height="1315"
+     id="namedview23"
+     showgrid="false"
+     inkscape:zoom="9.4211577"
+     inkscape:cx="25.386376"
+     inkscape:cy="24.754328"
+     inkscape:window-x="966"
+     inkscape:window-y="156"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><g
+     opacity="0.9"
+     id="g3"><path
+       fill="#1E1E1E"
+       d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"
+       id="path5" /></g><text
+     xml:space="preserve"
+     style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#cbcbcb;fill-opacity:1;fill-rule:nonzero;stroke:#cbcbcb;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     x="15.709322"
+     y="43.943645"
+     id="text3036"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3038"
+       x="15.709322"
+       y="43.943645"
+       style="stroke-width:1">add</tspan></text>
+<g
+     sodipodi:type="inkscape:box3d"
+     style="fill:#cbcbcb;fill-opacity:1;stroke:#cbcbcb;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="g3810"
+     inkscape:perspectiveID="#perspective3808"
+     inkscape:corner0="0.239626 : 0.017297368 : 0 : 1"
+     inkscape:corner7="-0.11786913 : 0.0068518727 : 0.25 : 1"><path
+       sodipodi:type="inkscape:box3dside"
+       id="path3820"
+       style="fill:#afafde;fill-rule:evenodd;stroke:none"
+       inkscape:box3dsidetype="13"
+       d="m 20.167373,26.258532 8.173093,0.489774 4.782913,-0.375024 -7.949275,-0.317574 z" /><path
+       sodipodi:type="inkscape:box3dside"
+       id="path3812"
+       style="fill:#353564;fill-rule:evenodd;stroke:none"
+       inkscape:box3dsidetype="6"
+       d="m 20.167373,17.832204 0,8.426328 5.006731,-0.202824 0,-7.01216 z" /><path
+       sodipodi:type="inkscape:box3dside"
+       id="path3822"
+       style="fill:#e9e9ff;fill-rule:evenodd;stroke:none"
+       inkscape:box3dsidetype="11"
+       d="m 25.174104,19.043548 7.949275,-1.896669 0,9.226403 -7.949275,-0.317574 z" /><path
+       sodipodi:type="inkscape:box3dside"
+       id="path3814"
+       style="fill:#4d4d9f;fill-rule:evenodd;stroke:none"
+       inkscape:box3dsidetype="5"
+       d="m 20.167373,17.832204 8.173093,-2.925107 4.782913,2.239782 -7.949275,1.896669 z" /><path
+       sodipodi:type="inkscape:box3dside"
+       id="path3818"
+       style="fill:#d7d7ff;fill-rule:evenodd;stroke:none"
+       inkscape:box3dsidetype="14"
+       d="m 28.340466,14.907097 0,11.841209 4.782913,-0.375024 0,-9.226403 z" /><path
+       sodipodi:type="inkscape:box3dside"
+       id="path3816"
+       style="fill:#8686bf;fill-rule:evenodd;stroke:none"
+       inkscape:box3dsidetype="3"
+       d="m 20.167373,17.832204 8.173093,-2.925107 0,11.841209 -8.173093,-0.489774 z" /></g></svg>
\ No newline at end of file
diff --git a/scripts/default/assets/images/tools/voxels.svg b/scripts/default/assets/images/tools/voxels.svg
new file mode 100644
index 0000000000..a0dbd63d45
--- /dev/null
+++ b/scripts/default/assets/images/tools/voxels.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.9;}
+	.st1{fill:#1E1E1E;}
+	.st2{fill:#EAEAEA;}
+</style>
+<g>
+	<g class="st0">
+		<path class="st1" d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"/>
+	</g>
+</g>
+<path class="st2" d="M36.5,9.8l-5.9-3.4c-0.3-0.2-0.7-0.2-1,0l-5.3,3.1l-5.5-3.2c-0.3-0.2-0.7-0.2-1,0L12,9.7
+	c-0.3,0.2-0.5,0.5-0.5,0.8v6.8c0,0.3,0.2,0.7,0.5,0.8l5.4,3.1v6.2c0,0.3,0.2,0.7,0.5,0.8l5.9,3.4c0.2,0.1,0.3,0.1,0.5,0.1
+	s0.3,0,0.5-0.1l5.9-3.4c0.3-0.2,0.5-0.5,0.5-0.8v-6.1l5.4-3.1c0.3-0.2,0.5-0.5,0.5-0.8v-6.8C37,10.3,36.8,10,36.5,9.8z M35.1,15.9
+	L31,13.5V8.8l4.1,2.4V15.9z M30.3,19.7l-5-2.9v-5.6l4.1-2.4v4.7l-2,1.2c-0.4,0.2-0.5,0.7-0.3,1.1c0.2,0.3,0.4,0.4,0.7,0.4
+	c0.1,0,0.3,0,0.4-0.1l2-1.2l4.1,2.4L30.3,19.7z M25.1,23.6V19l4.1,2.4V26L25.1,23.6z M23.3,15.8l-4.1-2.4V8.7l4.1,2.4V15.8z
+	 M13.4,11.1l4.1-2.4v4.7l-2.2,1.3c-0.4,0.2-0.5,0.7-0.3,1.1c0.2,0.3,0.4,0.4,0.7,0.4c0.1,0,0.3,0,0.4-0.1l2.2-1.3l4.1,2.4l-4.1,2.4
+	l-4.9-2.8L13.4,11.1L13.4,11.1z M24.3,29.8L19.4,27v-5.6l4.1-2.4v4.7l-2,1.1c-0.4,0.2-0.5,0.7-0.3,1.1c0.2,0.3,0.4,0.4,0.7,0.4
+	c0.1,0,0.3,0,0.4-0.1l2-1.1l4.1,2.4L24.3,29.8z"/>
+<g>
+	<path class="st2" d="M10.9,35.6l1.7,4.8l1.7-4.8h1.3L13.1,42h-1l-2.5-6.4H10.9z"/>
+	<path class="st2" d="M19,42c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1S16,39.2,16,38.8c0-0.4,0.1-0.8,0.2-1.2
+		s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.7,0.6,1
+		c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7C19.8,41.9,19.4,42,19,42z
+		 M17.2,38.8c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5
+		c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2
+		c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7C17.2,38.2,17.2,38.5,17.2,38.8z"/>
+	<path class="st2" d="M23.6,35.6l1.6,2.4l1.6-2.4h1.3l-2.3,3.2l2.2,3.1h-1.3l-1.5-2.2L23.7,42h-1.3l2.2-3.1l-2.3-3.2h1.3V35.6z"/>
+	<path class="st2" d="M33.4,40.9V42H29v-6.4h4.4v1.1h-3.1v1.5H33v1h-2.7v1.7H33.4z"/>
+	<path class="st2" d="M34.6,42v-6.4h1.2v5.3h3.3V42H34.6z"/>
+</g>
+</svg>
diff --git a/scripts/default/voxels.js b/scripts/default/voxels.js
index 19a31487fe..89cef06523 100644
--- a/scripts/default/voxels.js
+++ b/scripts/default/voxels.js
@@ -2,12 +2,12 @@ var controlHeld = false;
 var shiftHeld = false;
 
 Script.include([
-    "libraries/toolBars.js",
-    "libraries/utils.js",
+    "./libraries/toolBars.js",
+    "../libraries/utils.js",
 ]);
 
 var isActive = false;
-var toolIconUrl = "https://s3-us-west-1.amazonaws.com/hifi-content/seth/production/icons/"
+var toolIconUrl = Script.resolvePath("assets/images/tools/");
 
 var toolHeight = 50;
 var toolWidth = 50;
@@ -44,7 +44,7 @@ var toolBar = (function () {
         });
 
         activeButton = toolBar.addTool({
-            imageURL: "http://s3.amazonaws.com/hifi-public/images/tools/polyvox.svg",
+            imageURL: "voxels.svg",
             width: toolWidth,
             height: toolHeight,
             alpha: onAlpha,