From 20c91d3dae488c653428a465eadeb237eeb8862b Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Tue, 15 Apr 2014 20:16:55 -0400
Subject: whoooops merge

---
 rectangles.html | 241 +-------------------------------------------------------
 1 file changed, 1 insertion(+), 240 deletions(-)

diff --git a/rectangles.html b/rectangles.html
index b415b62..d7971e2 100644
--- a/rectangles.html
+++ b/rectangles.html
@@ -42,251 +42,13 @@ body > div {
 			<div id="intersects"></div>
 		</div>
 	</div>
-	
+
 </body>
 <script src="assets/javascripts/vendor/jquery.min.js"></script>
 <script type="text/javascript" src="assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="assets/javascripts/vendor/polyfill.js"></script>
 <script type="text/javascript" src="assets/javascripts/util.js"></script>
-<<<<<<< HEAD
-<script type="text/javascript" src="tree.js"></script>
-<script type="text/javascript" src="rect.js"></script>
-<script type="text/javascript" src="vec2.js"></script>
-<script type="text/javascript">
-
-(function(){
-	var color_palettes = {
-		alpha: [
-			"rgba(0,0,0,0.1)",
-		],
-		redblue: [
-			"rgba(0,0,0,0.2)",
-			"rgba(255,0,0,0.2)",
-			"rgba(0,0,255,0.2)",
-			"rgba(0,255,0,0.2)",
-		],
-		gray: [
-			"rgba(0,0,0,0.1)",
-			"rgba(0,0,0,0.2)",
-			"rgba(0,0,0,0.3)",
-			"rgba(0,0,0,0.4)",
-		],
-		colors: [
-			"rgba(255,0,0,0.5)",
-			"rgba(255,128,0,0.5)",
-			"rgba(128,255,0,0.5)",
-			"rgba(0,255,0,0.5)",
-			"rgba(0,255,128,0.5)",
-			"rgba(0,128,255,0.5)",
-			"rgba(0,0,255,0.5)",
-			"rgba(128,0,255,0.5)",
-			"rgba(255,0,255,0.5)",
-			"rgba(255,0,128,0.5)",
-		]
-	}
-
-	var select = document.querySelector("#palette")
-	select.addEventListener("change", function(){ colors = color_palettes[select.value] })
-
-	window.colors = color_palettes[select.value]
-})()
-
-var canvas = document.createElement("canvas")
-var ctx = canvas.getContext("2d")
-var w = canvas.width = 500
-var h = canvas.height = 500
-document.querySelector("#map").appendChild(canvas)
-
-var rects = [
-	new rect(100,100, 300,300),
-	new rect(200,200, 400,400),
-]
-
-var creating = false, dragging = false
-var mouse = new rect(0,0,0,0)
-canvas.addEventListener("mousedown", function(e){
-	var x = e.pageX, y = e.pageY
-	mouse = new rect (x,y)
-	if (e.shiftKey) {
-		mouse.quantize(10)
-	}
-
-	var intersects = rects.filter(function(r){ return r.contains(x,y) })
-	console.log(intersects)
-	
-	if (intersects.length){
-		dragging = intersects[0]
-	}
-	else {
-		creating = true
-	}
-	if (e.shiftKey && dragging) {
-		dragging.quantize(10)
-	}
-})
-canvas.addEventListener("mousemove", function(e){
-	var x, y
-	if (e.shiftKey) {
-		x = quantize( e.pageX, 10 )
-		y = quantize( e.pageY, 10 )
-	}
-	else {
-		x = e.pageX
-		y = e.pageY
-	}
-
-	mouse.x.b = x
-	mouse.y.b = y
-	
-	if (dragging) {
-		dragging.translation.a = mouse.x.magnitude()
-		dragging.translation.b = mouse.y.magnitude()
-	}
-	else if (creating) {
-		mouse.x.b = x
-		mouse.y.b = y
-	}
-	else {
-		mouse.x.a = mouse.x.b
-		mouse.y.a = mouse.y.b
-	}
-})
-document.addEventListener("mouseup", function(e){
-	if (creating) {
-		if (mouse.height() != 0 && mouse.width() != 0) {
-			rects.push(mouse.translate())
-		}
-	}
-	if (dragging) {
-		dragging.translate()
-	}
-	mouse = new rect(e.pageX, e.pageY)
-	creating = dragging = false
-})
-
-function animate(){
-	requestAnimationFrame(animate)
-	ctx.fillStyle = "#fff"
-	ctx.fillRect(0,0,w,h)
-	
-	solve_rects()
-	draw_ruler()
-	draw_rects()
-	draw_mouse()
-}
-animate()
-
-function draw_ruler(){
-	ctx.strokeStyle = "rgba(80,80,80,0.5)"
-	ctx.lineWidth = 1
-	var len = 5
-	for (var i = 0.5; i < w; i += 10) {
-		line(i, 0, i, len)
-		line(0, i, len, i)
-	}
-}
-
-function line (x,y,a,b,translation){
-	if (translation) {
-		x += translation.a
-		a += translation.a
-		y += translation.b
-		b += translation.b
-	}
-	ctx.beginPath()
-	ctx.moveTo(x,y)
-	ctx.lineTo(a,b)
-	ctx.stroke()
-}
-
-function solve_rects(){
-	rects = sort_rects()
-
-	for (var i = 0; i < rects.length; i++) {
-		rects[i].reset()
-	}
-	regions = []
-
-	var left, right
-	for (var i = 0; i < rects.length; i++) {
-		left = rects[i]
-		for (var j = i+1; j < rects.length; j++) {
-			right = rects[j]
-			if (left.intersects(right)) {
-				left.clipTo(right)
-				right.clipTo(left)
-			}
-			if (left.x.b < right.x.a) {
-				break
-			}
-		}
-	}
-	for (var i = 0; i < rects.length; i++) {
-		regions = regions.concat(rects[i].regions)
-	}
-	// handle when two walls are coplanar
-	// generate floor and ceiling for some regions
-	// generate walls from surviving regions
-	// generate ceiling-walls where ceiling has discontinuity
-
-	regions = regions.filter(function(r){ return !!r })
-	for (var i = 0; i < regions.length; i++) {
-		ctx.fillStyle = colors[i % colors.length]
-		regions[i] && regions[i].fill()
-	}
-
-	document.getElementById("intersects").innerHTML = regions.join("<br>")
-}
-function sort_rects(){
-	return rects.sort(function(a,b){
-		if (a.x.a <= b.x.a) {
-			return -1
-		}
-		if (a.x.a > b.x.a) {
-			return 1
-		}
-		if (a.y.a < b.y.a) {
-			return -1
-		}
-		if (a.y.a > b.y.a) {
-			return 1
-		}
-		return 0
-	})
-}
-function draw_regions(){
-}
-function draw_rects(){
-	ctx.strokeStyle = "rgba(80,80,80,0.5)"
-	ctx.lineWidth = 1
-	// ctx.setLineDash([randint(5)+2,randint(2)+2]);
-	ctx.setLineDash([1,1]);
-
-	for (var i = 0; i < rects.length; i++) {
-		ctx.fillStyle = "rgba(0,200,220,0.2)"
-//		rects[i].fill()
-// 			line(rect.x, 0, rect.x, rect.y)
-// 			line(0, rect.y, rect.x, rect.y)
-	}
-}
-function draw_mouse(){
-	ctx.fillStyle = "rgba(255,0,0,0.4)";
-	ctx.beginPath();
-	ctx.arc(mouse.x.b, mouse.y.b, 5, 0, 2*Math.PI, false);
-	ctx.fill();
-
-	if (mouse.width() != 0 && mouse.height() != 0) {
-		if (dragging) {
-			mouse.stroke()
-		}
-		else {
-			ctx.fillStyle = "rgba(255,255,0,0.5)"
-			mouse.clone().translate().fill()
-		}
-	}
-}
-=======
 <script type="text/javascript" src="assets/javascripts/rectangles/_env.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/colors.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/debug.js"></script>
@@ -304,6 +66,5 @@ function draw_mouse(){
 <script src="assets/javascripts/mx/extensions/mx.movements.js"></script>
 <script src="assets/javascripts/mx/primitives/mx.scaleBox.js"></script>
 <script src="assets/javascripts/app.js"></script>
->>>>>>> 9c3c0151cb2b0a824f184501ea2672ef9e87a993
 
 </html>
-- 
cgit v1.2.3-70-g09d2