From a91321725a3a2db451055ee7d5e4a40576b83c5c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 10 Jun 2014 13:37:27 -0400 Subject: rename map stuff so we can use alternate drawing ui --- public/assets/javascripts/rectangles/_env.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'public/assets/javascripts/rectangles/_env.js') diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js index 09d1532..334e461 100644 --- a/public/assets/javascripts/rectangles/_env.js +++ b/public/assets/javascripts/rectangles/_env.js @@ -1,6 +1,8 @@ - var environment = new function(){} environment.init = function(){ + + map = new Map () + if (window.scene) { scene.camera.move({ "x": 0, -- cgit v1.2.3-70-g09d2 From a5ba8d536afe5c96c6e01763296de2a407f81aa8 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 10 Jun 2014 15:45:32 -0400 Subject: switch to using a lookup for rooms --- public/assets/javascripts/mx/mx.js | 2 +- .../javascripts/mx/primitives/mx.boxDimensions.js | 2 +- .../javascripts/mx/primitives/mx.scaleBox.js | 2 +- public/assets/javascripts/rectangles/_env.js | 6 ++--- .../javascripts/rectangles/engine/rooms/_rooms.js | 30 ++++++++++++++++------ .../javascripts/rectangles/engine/rooms/clipper.js | 8 +++--- .../assets/javascripts/rectangles/models/room.js | 2 +- public/assets/stylesheets/app.css | 4 +-- views/controls/builder/toolbar.ejs | 18 +++++++------ 9 files changed, 45 insertions(+), 29 deletions(-) (limited to 'public/assets/javascripts/rectangles/_env.js') diff --git a/public/assets/javascripts/mx/mx.js b/public/assets/javascripts/mx/mx.js index df9abe7..496aec0 100644 --- a/public/assets/javascripts/mx/mx.js +++ b/public/assets/javascripts/mx/mx.js @@ -472,7 +472,7 @@ var MX = MX || (function (undefined) { }, __toString: function(params, func){ - this.id = this.id || guid() + this.id = this.id || _.uniqueId() var list = [], obj = {}, type = this.type || "Object3d", diff --git a/public/assets/javascripts/mx/primitives/mx.boxDimensions.js b/public/assets/javascripts/mx/primitives/mx.boxDimensions.js index f3edb13..1d457ae 100644 --- a/public/assets/javascripts/mx/primitives/mx.boxDimensions.js +++ b/public/assets/javascripts/mx/primitives/mx.boxDimensions.js @@ -7,7 +7,7 @@ MX.BoxDimensions = MX.Object3D.extend({ this.type = "BoxDimensions" - var id = this.id = opt.id || guid() + var id = this.id = opt.id || _.uniqueId() this.x = opt.x || 0 this.y = opt.y || 0 this.z = opt.z || 0 diff --git a/public/assets/javascripts/mx/primitives/mx.scaleBox.js b/public/assets/javascripts/mx/primitives/mx.scaleBox.js index 77f45e9..f635345 100644 --- a/public/assets/javascripts/mx/primitives/mx.scaleBox.js +++ b/public/assets/javascripts/mx/primitives/mx.scaleBox.js @@ -7,7 +7,7 @@ MX.ScaleBox = MX.Object3D.extend({ this.type = "ScaleBox" - var id = this.id = opt.id || guid() + var id = this.id = opt.id || _.uniqueId() this.x = opt.x || 0 this.y = opt.y || 0 this.z = opt.z || 0 diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js index 334e461..86aebdc 100644 --- a/public/assets/javascripts/rectangles/_env.js +++ b/public/assets/javascripts/rectangles/_env.js @@ -22,15 +22,15 @@ environment.init = function(){ map.center.a = 0 map.center.b = 0 - Rooms.list.push( new Room ({ + Rooms.add( new Room ({ rect: new Rect(-500,-500, 500,500), height: 500, })) - Rooms.list.push( new Room ({ + Rooms.add( new Room ({ rect: new Rect(600,0, 1100,500), height: 500, })) - Rooms.list.push( new Room ({ + Rooms.add( new Room ({ rect: new Rect(450,150, 650,350), height: 300, })) diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js index 411a093..efde370 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js @@ -2,7 +2,7 @@ var Rooms = new function(){ var base = this - base.list = [] + base.list = {} base.regions = [] base.init = function(){ @@ -12,30 +12,44 @@ var Rooms = new function(){ } base.filter = function(f){ - return base.list.filter(f) + return _.values(base.list).filter(f) + } + + base.add = function(room){ + base.list[room.id] = room } base.add_with_rect = function(rect){ var room = new Room({ - id: base.list.length, rect: rect, height: quantize(randrange(300,800), 50), }) - base.list.push(room) + base.add(room) + } + + base.remove = function(room){ + delete base.list[room.id] + } + + base.count = function(){ + return this.values().length } base.forEach = function(f){ - return base.list.forEach(f) + return base.values().forEach(f) + } + base.values = function(){ + return _.values(base.list) } base.sorted_by_position = function(){ - return sort_rooms_by_position( base.list ) + return sort_rooms_by_position( base.values() ) } base.sorted_by_height = function(){ - return sort_rooms_by_height( base.list ) + return sort_rooms_by_height( base.values() ) } base.sorted_by_area = function(){ - return sort_rooms_by_area( base.list ) + return sort_rooms_by_area( base.values() ) } } diff --git a/public/assets/javascripts/rectangles/engine/rooms/clipper.js b/public/assets/javascripts/rectangles/engine/rooms/clipper.js index 8989ba8..0854013 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/clipper.js +++ b/public/assets/javascripts/rectangles/engine/rooms/clipper.js @@ -20,7 +20,7 @@ Rooms.clipper = new function(){ // Given a set of overlapping rooms, clip any intersections, then cull any duplicate polygons base.solve_rects = function(){ - if (Rooms.list.length == 0) return + if (Rooms.count() == 0) return base.reset_rects() base.clip_rects() @@ -31,9 +31,9 @@ Rooms.clipper = new function(){ // Reset the clipping/culling states of each of the rooms base.reset_rects = function(){ - for (var i = 0; i < Rooms.list.length; i++) { - Rooms.list[i].reset() - } + Rooms.forEach(function(room){ + room.reset() + }) } // Compare each room to the rooms it overlaps, and subdivide diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js index 731411c..256889d 100644 --- a/public/assets/javascripts/rectangles/models/room.js +++ b/public/assets/javascripts/rectangles/models/room.js @@ -1,7 +1,7 @@ window.Room = (function(){ var Room = function(opt){ - this.id = opt.id || Rooms.list.length + this.id = opt.id || _.uniqueId("room") this.rect = opt.rect this.regions = [] this.walls = [] diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index fdec567..55e8d37 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -656,7 +656,7 @@ h5{ } .menu span.inuse:before { -content: "\e736"!important; + content: "\e736" !important; } .menu span:hover:after{ @@ -673,7 +673,7 @@ content: "\e736"!important; font-size: 13px; } -.menu span.icon-close:hover:after{ +.menu span.inuse:hover:after{ content:""; opacity:0; } diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs index 400a008..cb6dd60 100644 --- a/views/controls/builder/toolbar.ejs +++ b/views/controls/builder/toolbar.ejs @@ -2,26 +2,28 @@ - - + + Date: Tue, 10 Jun 2014 16:34:52 -0400 Subject: serialization functions --- public/assets/javascripts/rectangles/_env.js | 24 ++++++------- .../javascripts/rectangles/engine/map/draw.js | 2 ++ .../javascripts/rectangles/engine/rooms/_rooms.js | 42 +++++++++++++++++++++- .../assets/javascripts/rectangles/models/rect.js | 3 ++ .../assets/javascripts/rectangles/models/room.js | 12 +++++-- .../assets/javascripts/rectangles/models/vec2.js | 3 ++ .../javascripts/ui/builder/BuilderSettings.js | 5 +++ 7 files changed, 76 insertions(+), 15 deletions(-) (limited to 'public/assets/javascripts/rectangles/_env.js') diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js index 86aebdc..46b43a9 100644 --- a/public/assets/javascripts/rectangles/_env.js +++ b/public/assets/javascripts/rectangles/_env.js @@ -22,18 +22,18 @@ environment.init = function(){ map.center.a = 0 map.center.b = 0 - Rooms.add( new Room ({ - rect: new Rect(-500,-500, 500,500), - height: 500, - })) - Rooms.add( new Room ({ - rect: new Rect(600,0, 1100,500), - height: 500, - })) - Rooms.add( new Room ({ - rect: new Rect(450,150, 650,350), - height: 300, - })) +// Rooms.add( new Room ({ +// rect: new Rect(-500,-500, 500,500), +// height: 500, +// })) +// Rooms.add( new Room ({ +// rect: new Rect(600,0, 1100,500), +// height: 500, +// })) +// Rooms.add( new Room ({ +// rect: new Rect(450,150, 650,350), +// height: 300, +// })) app.movements.gravity(true) diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js index f4cb1d2..75e8ad1 100644 --- a/public/assets/javascripts/rectangles/engine/map/draw.js +++ b/public/assets/javascripts/rectangles/engine/map/draw.js @@ -41,6 +41,8 @@ var MapDraw = function(map){ for (var i = 0; i < regions.length; i++) { if (regions[i].dupe) continue ctx.fillStyle = colors[i % colors.length] + ctx.strokeStyle = "#000" + ctx.lineWidth = (1 / map.zoom) fill_region(regions[i]) stroke_sides(regions[i]) } diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js index efde370..ce1fae7 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js @@ -22,7 +22,7 @@ var Rooms = new function(){ base.add_with_rect = function(rect){ var room = new Room({ rect: rect, - height: quantize(randrange(300,800), 50), + height: 500 // quantize(randrange(300,800), 50), }) base.add(room) } @@ -38,9 +38,49 @@ var Rooms = new function(){ base.forEach = function(f){ return base.values().forEach(f) } + base.map = function(f){ + return base.values().map(f) + } + base.values = function(){ return _.values(base.list) } + + base.serialize = function(){ + var rooms = base.map(function(room){ + return room.serialize() + }) + var rooms_data = { rooms: rooms } + return rooms_data + } + + base.deserialize = function(rooms_data){ + rooms_data.rooms.forEach(function(data){ + var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1]) + var room = new Room({ + id: data.id, + rect: rect, + height: data.height + }) + base.add(room) + }) + } + + base.uid = (function(){ + var id = 0 + return function(s){ + s = s || "" + var ss + while (1) { + ss = s + (id++) + if (! (ss in base.list)) { + console.log(ss) + return ss + } + } + } + })() + base.sorted_by_position = function(){ return sort_rooms_by_position( base.values() ) diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js index 7a2ac6f..cb14e66 100644 --- a/public/assets/javascripts/rectangles/models/rect.js +++ b/public/assets/javascripts/rectangles/models/rect.js @@ -94,6 +94,9 @@ window.Rect = (function(){ var s = "[" + this.x.toString() + " " + this.y.toString() + "] " + sides return s } + Rect.prototype.serialize = function(){ + return { x: this.x.serialize(), y: this.y.serialize() } + } Rect.prototype.quantize = function(n){ this.x.quantize(n) this.y.quantize(n) diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js index 256889d..d0478b3 100644 --- a/public/assets/javascripts/rectangles/models/room.js +++ b/public/assets/javascripts/rectangles/models/room.js @@ -1,7 +1,7 @@ window.Room = (function(){ var Room = function(opt){ - this.id = opt.id || _.uniqueId("room") + this.id = opt.id || Rooms.uid("room_") this.rect = opt.rect this.regions = [] this.walls = [] @@ -15,7 +15,15 @@ window.Room = (function(){ Room.prototype.toString = function(){ return this.rect.toString() } - + + Room.prototype.serialize = function(){ + return { + id: this.id, + rect: this.rect.serialize(), + height: ~~this.height, + } + } + Room.prototype.reset = function(){ var copy = this.rect.clone() copy.id = this.id diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js index 9b0447c..e56a010 100644 --- a/public/assets/javascripts/rectangles/models/vec2.js +++ b/public/assets/javascripts/rectangles/models/vec2.js @@ -91,6 +91,9 @@ vec2.prototype.intersection = function(v){ vec2.prototype.toString = function(){ return "[" + ~~this.a + " " + ~~this.b + "]" } +vec2.prototype.serialize = function(){ + return [ ~~this.a, ~~this.b ] +} vec2.prototype.quantize = function(n){ n = n || 10 this.a = quantize(this.a, n) diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js index ff8a71b..004c1c4 100644 --- a/public/assets/javascripts/ui/builder/BuilderSettings.js +++ b/public/assets/javascripts/ui/builder/BuilderSettings.js @@ -10,6 +10,11 @@ var BuilderSettings = View.extend({ toggle: function(){ this.$el.toggleClass("active") + }, + + save: function(){ + var data = Rooms.serialize() + console.log(data) } }) -- cgit v1.2.3-70-g09d2