diff options
| author | ryderr <r@okfoc.us> | 2014-09-29 17:07:25 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-09-29 17:07:25 -0400 |
| commit | 275732a4e9310746e82f025ac05670af1107bc63 (patch) | |
| tree | 9752764dd2efa9d38e085fc9c4d43fe79a5809c3 /public/assets/javascripts/rectangles | |
| parent | a18a6f0d2fa629fc25004b516c960b794de2ec52 (diff) | |
| parent | adba61c0fa7231372864e742b9775ba0531ad046 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/rectangles')
3 files changed, 11 insertions, 1 deletions
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js index cb3e980..6f96275 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js @@ -109,6 +109,14 @@ }) Rooms.clipper.update() } + + base.report = function(){ + var data = [] + base.rooms.forEach(function(room){ + data.push( room.report() ) + }) + return data + } base.sorted_by_position = function(){ return sort.rooms_by_position( base.values() ) diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js index f2f395b..f9eb9b7 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js @@ -87,7 +87,7 @@ wall.deserialize( wall_data ) }) }, - + base.setColor = { wall: function(rgb){ diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js index ba510e1..663d29d 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js +++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js @@ -20,6 +20,8 @@ Surface = require('../../models/surface') sort = require('../../util/sort') _ = require('lodash') + MX = require('../../../../../../test/mocks/mx.js') + scene = MX.Scene FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20 PI = Math.PI HALF_PI = PI/2 |