diff options
Diffstat (limited to 'public/assets/javascripts/rectangles')
4 files changed, 7 insertions, 7 deletions
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js index 4ad3e2c..29dee41 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js @@ -38,7 +38,7 @@ base.walls = {} base.regions = [] - UidGenerator.setList(base.list) + base.uid = new UidGenerator(base.list) base.init = function(){ Rooms.builder.init() diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index abd14ba..fe5f037 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -40,7 +40,7 @@ var Scenery = new function(){ media && media.destroy() } - base.uid = UidGenerator(base.list) + base.uid = new UidGenerator(base.list) base.forEach = function(f){ return base.values().forEach(f) 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 = [] diff --git a/public/assets/javascripts/rectangles/util/uid.js b/public/assets/javascripts/rectangles/util/uid.js index 50d18c5..0c0b176 100644 --- a/public/assets/javascripts/rectangles/util/uid.js +++ b/public/assets/javascripts/rectangles/util/uid.js @@ -19,10 +19,10 @@ } if ('window' in this) { - window.UidGenerator = new UidGenerator + window.UidGenerator = UidGenerator } else { - module.exports = new UidGenerator + module.exports = UidGenerator } })() |