diff options
Diffstat (limited to 'public/assets/javascripts/rectangles')
7 files changed, 39 insertions, 7 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js index 9a557b9..f9334e6 100644 --- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js +++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js @@ -38,7 +38,6 @@ Map.UI.Editor = function(map){ cursor.quantize(1/map.zoom) map.center.a = cursor.x.a map.center.b = -cursor.y.a - console.log(map.center+"") cursor.x.b = cursor.x.a cursor.y.b = cursor.y.a base.mouse.down = false 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..82ccb87 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js @@ -87,7 +87,21 @@ wall.deserialize( wall_data ) }) }, - + + base.paint = function(){ + var wallColor = rgba_string(Walls.colors.wall, app.defaults.wallOpacity) + var outlineColor = rgb_string(Walls.colors.outline) + var floorColor = rgb_string(Walls.colors.floor) + var ceilingColor = rgb_string(Walls.colors.ceiling) + Walls.forEach(function(wall){ + wall.outline(wallColor, outlineColor) + }) + Rooms.forEach(function(room){ + room.setFloorColor(floorColor) + room.setCeilingColor(ceilingColor) + }) + } + base.setColor = { wall: function(rgb){ diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js index f0935d4..6a89158 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/builder.js +++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js @@ -44,9 +44,10 @@ base.clear() base.build() Rooms.grouper.build() + app.tube("rooms-built") } } - + base.build = function (){ Rooms.regions.forEach(function(region){ this.build_walls(region).forEach(function(el){ 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 diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js index e8bc7f7..ef25d8d 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js +++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js @@ -10,14 +10,20 @@ Scenery.types.video = Scenery.types.base.extend(function(base){ this.build() this.bind() - + if (opt.data) { + if (opt.wall) { + var position = opt.wall.mxToPosition(opt.data.position) + opt.index = opt.wall.surface.index_for_x( position.a, 0 ) + } + this.set_wall(opt) this.deserialize(opt.data) } else { - this.recenter() + this.set_wall(opt) + this.bounds && this.recenter() } - }, + }, build: function(){ switch (this.media.type) { diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js index e6a37e0..0fcc766 100644 --- a/public/assets/javascripts/rectangles/util/minotaur.js +++ b/public/assets/javascripts/rectangles/util/minotaur.js @@ -53,7 +53,9 @@ } base.hide = function () { - base.$el.removeClass() + setTimeout(function(){ + base.$el.removeClass() + }, 500) } base.init(); |