diff options
| author | ryderr <r@okfoc.us> | 2014-10-16 15:28:42 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-16 15:28:42 -0400 |
| commit | e25af0a7106c359faae2f73a7c2295ea93db8341 (patch) | |
| tree | e9ac0bc6690feb702dd5802a95f51481f7b3c878 /public/assets/javascripts/rectangles | |
| parent | a49396746de264667784f52b3f02c0089cd6fd5e (diff) | |
| parent | f8a4bb4609511393c92c618962f990673328d2f0 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/rectangles')
| -rw-r--r-- | public/assets/javascripts/rectangles/_env.js | 4 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/models/floor.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/models/wall.js | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js index ecde3ca..3221bac 100644 --- a/public/assets/javascripts/rectangles/_env.js +++ b/public/assets/javascripts/rectangles/_env.js @@ -10,8 +10,8 @@ environment.init = function(){ "z": 0, "rotationX": 0, // PI/2, "rotationY": PI/2, // PI -// "rotationX": 0, -// "rotationY": PI + // "rotationX": 0, + // "rotationY": PI }) scene.camera.radius = 20 diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js index 9838232..a144ecd 100644 --- a/public/assets/javascripts/rectangles/models/floor.js +++ b/public/assets/javascripts/rectangles/models/floor.js @@ -40,7 +40,7 @@ if (Scenery.nextWallpaper) { var oldState = base.serialize() base.wallpaper(Scenery.nextWallpaper) - Scenery.nextWallpaper = null + // Scenery.nextWallpaper = null UndoStack.push({ type: 'update-wallpaper', diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index 542c99a..eb445a7 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -104,7 +104,7 @@ else if (Scenery.nextWallpaper) { var oldState = base.serialize() base.wallpaper(Scenery.nextWallpaper) - Scenery.nextWallpaper = null + // Scenery.nextWallpaper = null UndoStack.push({ type: 'update-wallpaper', |