1 files changed, 148 insertions, 13 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index e5624a0..b976ea2 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -4,12 +4,14 @@
       type: "create-scenery",
       undo: function(state){
         Scenery.remove(state.id)
+        Scenery.resize.hide()
 
         // TODO: watch individual scenery object here
         Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
-        Scenery.deserialize([ state ])
+        var scenery = Scenery.deserialize([ state ])
+        Scenery.resize.show( scenery )
 
         // TODO: watch individual scenery object here
         Minotaur.watch( app.router.editorView.settings )
@@ -19,8 +21,10 @@
       type: "update-scenery",
       undo: function(state){
         var scenery = Scenery.find(state.id)
+        var wall = Walls.find( state.wall_id )
+
         scenery.deserialize(state)
-        scenery.set_wall(Walls.find( state.wall_id ))
+        scenery.set_wall({ wall: wall })
         
         if (editor.permissions.resize) {
           Scenery.resize.show(scenery)
@@ -31,13 +35,15 @@
       },
       redo: function(state){
         var scenery = Scenery.find(state.id)
+        var wall = Walls.find( state.wall_id )
+
         scenery.deserialize(state)
-        scenery.set_wall(Walls.find( state.wall_id ))
+        scenery.set_wall({ wall: wall })
 
         if (editor.permissions.resize) {
           Scenery.resize.show(scenery)
-          Scenery.resize.rotate_dots()
           Scenery.resize.move_dots()
+          Scenery.resize.rotate_dots()
         }
 
         // TODO: watch individual scenery object here
@@ -47,12 +53,14 @@
     {
       type: "destroy-scenery",
       undo: function(state){
-        Scenery.deserialize([ state ])
+        var scenery = Scenery.deserialize([ state ])
+        Scenery.resize.show( scenery )
 
         // TODO: watch individual scenery object here
         Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
+        Scenery.resize.hide()
         Scenery.remove(state.id)
 
         // TODO: watch individual scenery object here
@@ -66,11 +74,11 @@
       type: "create-room",
       undo: function(room){
         Rooms.remove(room)
-        Rooms.clipper.update()
+        Rooms.rebuild()
       },
       redo: function(room){
         Rooms.add(new Room(room))
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
     },
@@ -80,14 +88,14 @@
         var room = Rooms.list[state.id]
         room.rect.assign( state.rect )
         room.height = state.height
-        Rooms.clipper.update()
+        Rooms.rebuild()
         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()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
     },
@@ -95,12 +103,22 @@
       type: "destroy-room",
       undo: function(room){
         Rooms.add(new Room(room))
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
       redo: function(room){
         Rooms.remove(room)
-        Rooms.clipper.update()
+        Rooms.rebuild()
+      },
+    },
+   
+    {
+      type: "update-rooms-height",
+      undo: function(state){
+        var rooms = Rooms.values()
+        rooms.forEach(function(room){
+          room.height = state
+        })
       },
     },
     
@@ -111,7 +129,32 @@
       undo: function(state){
         var wall = Walls.lookup[state.id]
         wall.deserialize(state)
-
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "update-all-wallpaper",
+      undo: function(state){
+        Walls.deserialize(state)
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "choose-preset",
+      undo: function(state){
+        app.controller.colorControl.load(state.colors)
+        Walls.deserialize(state.walls)
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        app.controller.presets.loadByName(state)
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "choose-another-preset",
+      undo: function(state){
+        app.controller.presets.loadByName(state)
         Minotaur.watch( app.router.editorView.settings )
       },
     },
@@ -119,11 +162,103 @@
       type: "update-colors",
       undo: function(state){
         Walls.setColor[ state.mode ]( state.rgb )
-        app.router.editorView.lightControl.setSwatchColor( state.mode, state.rgb )
+        app.router.editorView.colorControl.setSwatchColor( state.mode, state.rgb )
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "randomize-scenery",
+      undo: function(state){
+        state.added.forEach(function(_scenery){
+          Scenery.remove(_scenery.id)
+        })
+        var scenery_list = Scenery.deserialize(state.removed)
+        scenery_list.forEach(function(scenery){
+          scenery.was_randomly_placed = true
+        })
+        Scenery.resize.hide()
 
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        state.removed.forEach(function(_scenery){
+          Scenery.remove(_scenery.id)
+        })
+        var scenery_list = Scenery.deserialize(state.added)
+        scenery_list.forEach(function(scenery){
+          scenery.was_randomly_placed = true
+        })
+
+        // TODO: watch individual scenery object here
         Minotaur.watch( app.router.editorView.settings )
       },
     },
     
+    //
+    {
+      type: "create-sculpture",
+      undo: function(state){
+        Sculpture.remove(state.id)
+        Sculpture.resize.hide()
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        var scenery = Sculpture.deserialize([ state ])
+        Sculpture.resize.show( sculpture )
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "update-sculpture",
+      undo: function(state){
+        var sculpture = Sculpture.find(state.id)
+
+        sculpture.deserialize(state)
+        
+        if (editor.permissions.resize) {
+          Sculpture.resize.show(sculpture)
+        }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        var sculpture = Sculpture.find(state.id)
+
+        sculpture.deserialize(state)
+
+        if (editor.permissions.resize) {
+          Sculpture.resize.show(sculpture)
+          Sculpture.resize.move_dots()
+          Sculpture.resize.rotate_dots()
+        }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "destroy-sculpture",
+      undo: function(state){
+        var sculpture = Sculpture.deserialize([ state ])
+        Sculpture.resize.show( sculpture )
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        Sculpture.resize.hide()
+        Sculpture.remove(state.id)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+
   ])
 })()