undo stack for undo/redo

2 files changed, 46 insertions, 9 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 016a8ad..4b5f784 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -30,6 +30,7 @@ Map.UI.Editor = function(map){
 	//
 	
 	function down (e, cursor){
+	  var room
 		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
 		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
 
@@ -52,8 +53,17 @@ Map.UI.Editor = function(map){
 
 		if (intersects.length && base.permissions.destroy) {
 			base.mouse.down = false
-			Rooms.remove(intersects[0])
-			app.tube("builder-destroy-room", intersects[0])
+			
+			room = intersects[0]
+
+      UndoStack.push({
+        type: "destroy-room",
+        prev: room.clone(),
+        next: { id: room.id },
+      })
+
+			Rooms.remove(room)
+			app.tube("builder-destroy-room", room)
 			return
 		}
 		else if (intersects.length) {
@@ -151,6 +161,13 @@ Map.UI.Editor = function(map){
 				cursor.x.abs().quantize(1)
 				cursor.y.abs().quantize(1)
 				var room = Rooms.add_with_rect( cursor )
+
+        UndoStack.push({
+          type: "create-room",
+          prev: { id: room.id },
+          next: room.clone()
+        })
+        
 				app.tube("builder-pick-room", room)
 			}
 		}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index fb221f5..b10a101 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -25,24 +25,44 @@
 		// 
 		
 		{
-			type: "create-rectangle",
-      undo: function(state){
+			type: "create-room",
+      undo: function(room){
+        Rooms.remove(room)
+        Rooms.clipper.update()
       },
-      redo: function(state){
+      redo: function(room){
+        Rooms.add(room)
+        Rooms.clipper.update()
+				app.tube("builder-pick-room", room)
       },
 		},
 		{
-			type: "update-rectangle",
+			type: "update-room",
       undo: function(state){
+        var room = Rooms.list[state.id]
+        room.rect.assign( state.rect )
+        room.height = state.height
+        Rooms.clipper.update()
+				app.tube("builder-pick-room", room)
       },
       redo: function(state){
+        var room = Rooms.list[state.id]
+        room.rect.assign( state.rect )
+        room.height = state.height
+        Rooms.clipper.update()
+				app.tube("builder-pick-room", room)
       },
 		},
 		{
-			type: "destroy-rectangle",
-      undo: function(state){
+			type: "destroy-room",
+      undo: function(room){
+        Rooms.add(room)
+        Rooms.clipper.update()
+				app.tube("builder-pick-room", room)
       },
-      redo: function(state){
+      redo: function(room){
+        Rooms.remove(room)
+        Rooms.clipper.update()
       },
 		},