From 1e044ca74467d5ff46292822a274e678bd74a9b3 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 29 Jul 2014 18:02:11 -0400 Subject: uid fixes --- public/assets/javascripts/rectangles/models/room.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'public/assets/javascripts/rectangles/models/room.js') 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 = [] -- cgit v1.2.3-70-g09d2