summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-04-12 03:01:39 -0400
committerJulie Lala <jules@okfoc.us>2014-04-12 03:01:39 -0400
commitad3c9f89e76b1221fb6ee096f0ad7c0c395f000c (patch)
tree1fe1e64ef59a75583f4f479b8049af9388bb6b4c
parentc5f3ae57f3e1694f41409449dce71edc5dde2e6e (diff)
tree
-rw-r--r--rect.js2
-rw-r--r--rectangles.html16
2 files changed, 10 insertions, 8 deletions
diff --git a/rect.js b/rect.js
index 732a344..f1f19e1 100644
--- a/rect.js
+++ b/rect.js
@@ -122,8 +122,6 @@ rect.prototype.split = function(r){
else { // if (r.y.contains(this.y.a) && this.y.contains(r.y.b)) {
y_intervals.push( new vec2( this.y.a, this.y.b ))
}
-if (zz)
-console.log(x_intervals.length, y_intervals.length)
x_intervals.forEach(function(x){
y_intervals.forEach(function(y){
diff --git a/rectangles.html b/rectangles.html
index a68b4c6..71f83c6 100644
--- a/rectangles.html
+++ b/rectangles.html
@@ -18,24 +18,29 @@ body > div {
<select id="palette">
<option>colors</option>
<option>redblue</option>
- <option selected>gray</option>
+ <option>gray</option>
+ <option selected>alpha</option>
</select>
- <span id="intersects"></span>
+ <div id="intersects"></div>
</div>
</body>
<script type="text/javascript" src="assets/javascripts/util.js"></script>
+<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(200,200,200,0.2)",
+ "rgba(0,255,0,0.2)",
],
gray: [
"rgba(0,0,0,0.1)",
@@ -201,14 +206,13 @@ function solve_rects(){
// generate walls from surviving regions
// generate ceiling-walls where ceiling has discontinuity
- document.getElementById("intersects").innerHTML = regions.join("<br>")
-zz=false
-
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){