From b8b208d219cf782c39d054ad741724c6995a0b62 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 12 Aug 2014 18:49:01 -0400 Subject: undo stuff working on rooms editor --- public/assets/javascripts/rectangles/models/rect.js | 4 ++-- public/assets/javascripts/rectangles/models/room.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'public/assets/javascripts/rectangles/models') diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js index 0642a65..3f94740 100644 --- a/public/assets/javascripts/rectangles/models/rect.js +++ b/public/assets/javascripts/rectangles/models/rect.js @@ -40,8 +40,8 @@ return new Rect( this.x.clone(), this.y.clone() ) } Rect.prototype.assign = function(r) { - this.x.copy(r.x) - this.y.copy(r.y) + this.x.assign(r.x) + this.y.assign(r.y) } Rect.prototype.center = function(){ return new vec2(this.x.midpoint(), this.y.midpoint()) diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js index 6c0e1bb..aa18f6d 100644 --- a/public/assets/javascripts/rectangles/models/room.js +++ b/public/assets/javascripts/rectangles/models/room.js @@ -40,12 +40,12 @@ this.focused = false } - Room.prototype.clone = function(){ - return new Room ({ + Room.prototype.copy = function(){ + return { id: this.id, rect: this.rect.clone(), height: this.height, - }) + } } Room.prototype.toString = function(){ -- cgit v1.2.3-70-g09d2