diff options
Diffstat (limited to 'public/assets/javascripts/rectangles')
3 files changed, 11 insertions, 7 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index 0a3187c..3fe6b66 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -45,7 +45,6 @@ var Scenery = new function(){ var scenery = base.media.map(function(media){ return media.serialize() }) - console.log(scenery) return scenery } diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index d0a2045..b2a5b12 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -40,8 +40,8 @@ window.Wall = (function(){ mousemove: function(e){ }, mousedown: function(){ - base.randomize_colors() - console.log(sidesToString(base.side)) + // base.randomize_colors() + // console.log(sidesToString(base.side)) if (Scenery.nextMedia) { Scenery.addNextToWall(base) } @@ -58,6 +58,7 @@ window.Wall = (function(){ return new Rect( new vec2( coord.a + halfWidth, coord.b - halfWidth ), new vec2( halfHeight, Rooms.list[this.room].height - halfHeight ) ) } + Wall.prototype.fits = function(img, scale){ if (this.side & FRONT_BACK && this.rect.x.length() < img.width * scale) { return false @@ -118,7 +119,7 @@ window.Wall = (function(){ } Wall.prototype.randomize_colors = function(){ - var color = choice(window.colors) + var color = window.grayColors[ this.side | this.half_side ] this.siblings().forEach(function(w){ w.color(color) }) } diff --git a/public/assets/javascripts/rectangles/util/colors.js b/public/assets/javascripts/rectangles/util/colors.js index 58553b1..c590072 100644 --- a/public/assets/javascripts/rectangles/util/colors.js +++ b/public/assets/javascripts/rectangles/util/colors.js @@ -16,10 +16,10 @@ "rgba(0,0,0,0.4)", ], bone: [ - "hsla(0,0%,90%,0.95)", - "hsla(0,0%,80%,0.95)", + "hsla(0,0%,91%,0.95)", + "hsla(0,0%,88%,0.95)", "hsla(0,0%,85%,0.95)", - "hsla(0,0%,75%,0.95)", + "hsla(0,0%,82%,0.95)", ], colors: [ "rgba(255,0,0,0.5)", @@ -53,5 +53,9 @@ }) window.colors = color_palettes[select ? select.value : 'bone'] + window.grayColors = {} + _.zip([FRONT, LEFT, BACK, RIGHT], color_palettes.bone).map(function(pair){ + window.grayColors[pair[0]] = pair[1] + }) window.palettes = color_palettes })() |