diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-07-29 18:02:11 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-07-29 18:02:19 -0400 |
| commit | 1e044ca74467d5ff46292822a274e678bd74a9b3 (patch) | |
| tree | 57482fd23327d24b53c81cb207c2d9ce54d06eaf /public/assets/javascripts/rectangles/models/room.js | |
| parent | d18cb4c622fbb0172b9618d8594953a32ccb88b2 (diff) | |
uid fixestests
Diffstat (limited to 'public/assets/javascripts/rectangles/models/room.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/room.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js index 32549e9..d19ca2f 100644 --- a/public/assets/javascripts/rectangles/models/room.js +++ b/public/assets/javascripts/rectangles/models/room.js @@ -1,16 +1,16 @@ (function(){ - var vec2, Rect, UidGenerator, sort + var vec2, Rect, sort if ('window' in this) { vec2 = window.vec2 Rect = window.Rect - UidGenerator = window.UidGenerator sort = window.sort } else { vec2 = require('./vec2') Rect = require('./rect') UidGenerator = require('../util/uid') + Rooms = { uid: new UidGenerator({}) } sort = require('../util/sort') FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20 TOP = CEILING, BOTTOM = FLOOR @@ -29,7 +29,7 @@ } var Room = function(opt){ - this.id = opt.id || UidGenerator("room_") + this.id = opt.id || Rooms.uid("room_") this.rect = opt.rect this.regions = [] this.walls = [] |