diff options
| author | Julie Lala <jules@okfoc.us> | 2014-04-27 04:01:38 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-04-27 04:01:38 -0400 |
| commit | ee4d7acf2740b2ab4b2dd04393297e337ac42dd4 (patch) | |
| tree | 6e9ef7a28e380ab199a018a458bbded8f8201724 | |
| parent | 64cc8f43ee3b69a4ca8d6080c00dae69f72f0f9f (diff) | |
fix
| -rw-r--r-- | assets/javascripts/rectangles/engine/builder.js | 18 | ||||
| -rw-r--r-- | assets/javascripts/rectangles/engine/mover.js | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/assets/javascripts/rectangles/engine/builder.js b/assets/javascripts/rectangles/engine/builder.js index b6728f1..00bb1c7 100644 --- a/assets/javascripts/rectangles/engine/builder.js +++ b/assets/javascripts/rectangles/engine/builder.js @@ -42,7 +42,7 @@ var builder = new function(){ function bind (){ clipper.rooms.forEach(function(room){ - var walls = room.group_walls() + var walls = room.group_mx_walls() walls.forEach(function(wall){ wall.bind() wall.randomize_colors() @@ -77,7 +77,7 @@ var builder = new function(){ el.z = region.y.a el.rect = region el.side = FRONT - room.walls.push(el) + room.mx_walls.push(el) list.push(el) } if (region.sides & BACK) { @@ -90,7 +90,7 @@ var builder = new function(){ el.z = region.y.b el.rect = region el.side = BACK - room.walls.push(el) + room.mx_walls.push(el) list.push(el) } if (region.sides & LEFT) { @@ -103,7 +103,7 @@ var builder = new function(){ el.z = region.y.a + depth/2 el.rect = region el.side = LEFT - room.walls.push(el) + room.mx_walls.push(el) list.push(el) } if (region.sides & RIGHT) { @@ -116,7 +116,7 @@ var builder = new function(){ el.z = region.y.b - depth/2 el.rect = region el.side = RIGHT - room.walls.push(el) + room.mx_walls.push(el) list.push(el) } @@ -150,11 +150,11 @@ var builder = new function(){ if (! intersected) { el = make_floor(room, region) list.push( el ) - room.floor.push(el) + room.mx_floor.push(el) el = make_ceiling(room, region) list.push( el ) - room.ceiling.push(el) + room.mx_ceiling.push(el) } }) @@ -163,11 +163,11 @@ var builder = new function(){ // render floor and ceiling for the entire rectangle el = make_floor(room, room.rect) list.push( el ) - room.floor.push(el) + room.mx_floor.push(el) el = make_ceiling(room, room.rect) list.push( el ) - room.ceiling.push(el) + room.mx_ceiling.push(el) } room.constructed = true diff --git a/assets/javascripts/rectangles/engine/mover.js b/assets/javascripts/rectangles/engine/mover.js index 25809f6..8c71feb 100644 --- a/assets/javascripts/rectangles/engine/mover.js +++ b/assets/javascripts/rectangles/engine/mover.js @@ -59,9 +59,9 @@ var mover = new function(){ // did we actually enter a room? if (intersects.length) { base.room = intersects[0] - base.room.floor.forEach(function(w){ $(w.el).addClass("active") }) - base.room.ceiling.forEach(function(w){ $(w.el).addClass("active") }) - base.room.walls.forEach(function(w){ $(w.el).addClass("active") }) + base.room.mx_floor.forEach(function(w){ $(w.el).addClass("active") }) + base.room.mx_ceiling.forEach(function(w){ $(w.el).addClass("active") }) + base.room.mx_walls.forEach(function(w){ $(w.el).addClass("active") }) } } |
