summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/engine
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-06-20 18:15:41 -0400
committerJules Laplace <jules@okfoc.us>2014-06-20 18:15:41 -0400
commita61602ba2a76fa23c816454a8bd5e24c12d6899c (patch)
tree96d64a857e258d44b9b4460cf88b874370faac24 /public/assets/javascripts/rectangles/engine
parentd2c13b2974057a1b61509ca7ece25f2fde8d3000 (diff)
layouts toolbar toggles working
Diffstat (limited to 'public/assets/javascripts/rectangles/engine')
-rw-r--r--public/assets/javascripts/rectangles/engine/map/ui_editor.js18
-rw-r--r--public/assets/javascripts/rectangles/engine/rooms/_rooms.js1
2 files changed, 16 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 262272b..ea7a356 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -20,6 +20,13 @@ Map.UI.Editor = function(map){
update: mousewheel,
})
+ base.permissions = new Permissions({
+ create: true,
+ move: true,
+ resize: true,
+ destroy: false,
+ })
+
//
function down (e, cursor){
@@ -43,12 +50,17 @@ Map.UI.Editor = function(map){
return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
})
- if (intersects.length) {
+ if (intersects.length && base.permissions.destroy) {
+ base.mouse.down = false
+ Rooms.remove(intersects[0])
+ return
+ }
+ else if (intersects.length && (base.permissions.move || base.permissions.resize)) {
base.dragging = intersects[0]
- base.resizing = base.dragging.rect.nearEdge(cursor.x.a, cursor.y.a, resize_margin / map.zoom)
+ base.resizing = base.permissions.resize && base.dragging.rect.nearEdge(cursor.x.a, cursor.y.a, resize_margin / map.zoom)
base.dragging.rect.translation.sides = base.resizing
}
- else {
+ else if (base.permissions.create) {
base.creating = true
}
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 0186e9a..48931e9 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -30,6 +30,7 @@ var Rooms = new function(){
base.remove = function(room){
delete base.list[room.id]
+ Rooms.clipper.update()
}
base.removeAll = function(){