1 files changed, 19 insertions, 50 deletions
diff --git a/public/drawing.html b/public/drawing.html
index 8c377b0..4fa7a10 100644
--- a/public/drawing.html
+++ b/public/drawing.html
@@ -4,62 +4,31 @@
 <title>Palette Test</title>
 <script type="text/javascript" src="/js/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="/js/canvasquery.js"></script>
-<script type="text/javascript" src="/js/point.js"></script>
-<script type="text/javascript" src="/js/color.js"></script>
 <script type="text/javascript" src="/js/util.js"></script>
+<script type="text/javascript" src="/js/color.js"></script>
+<script type="text/javascript" src="/js/point.js"></script>
+<script type="text/javascript" src="/js/palette.js"></script>
+<script type="text/javascript" src="/js/draw2.js"></script>
+<style type="text/css">
+#drawing {
+	position: relative;
+}
+#drawing canvas {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+</style>
 </head>
 <body>
 <img src="/img/palette.gif" id="palette">
+<div id="color_picker"></div>
+<div id="drawing">
+	<canvas id="surface"></canvas>
+	<canvas id="workspace"></canvas>
+</div>
 </body>
 <script type="text/javascript">
-
-$("#palette").load(function(){
-	console.log("hello");
-	var offset = $("#palette").offset();
-	var paletteImg = $("#palette")[0];
-	var palette = cq(paletteImg);
-	var pattern, mask;
-	var color = new Color( 0, 0, 0 );
-
-	// $("body").append(palette.canvas);
-
-	$("#palette").click(function(e){
-		// they are all 8x8
-		// the first one starts at (15, 5), next one is 16 pixels down or to the right
-		// there are 16 rows and 6 columns, so 92 patterns total
-		var point = new Point(e, offset);
-		click(point);
-	});
-	var click = function(point) {
-		point.subtract({ x: 15, y: 5 });
-		point.quantize( 18, 16 );
-		point.add({ x: 15, y: 5 });
-
-		pattern = palette.clone().crop( point.x, point.y, 8, 8 );
-		mask = pattern.colorToMask("#fff");
-		pattern.applyMask(mask);
-		patternURI = pattern.clone().blend( color.toString(), "screen", 1.0 ).canvas.toDataURL("image/png");
-		document.body.style.backgroundImage = 'url(' + patternURI + ')';
-	}
-
-	var random = function(){
-		var point = new Point(paletteImg.width, paletteImg.height).scale( Math.random(), Math.random() ).floor();
-		click(point);
-	}
-	random();
-
-	for (var i in colors) {
-		var swatch = colors[i].swatch();
-		document.body.appendChild(swatch);
-		swatch.onclick = function(){
-			color = $(this).data("color");
-			p = cq(paletteImg);
-			patternURI = pattern.clone().blend( color.toString(), "screen", 1.0 ).canvas.toDataURL("image/png");
-			document.body.style.backgroundImage = 'url(' + patternURI + ')';
-		}
-	}
-
-});
 </script>
 </html>