diff options
| author | Julie Lala <jules@okfoc.us> | 2014-04-27 16:20:36 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-04-27 16:20:36 -0400 |
| commit | a0c68e2f34013952144c82936d84949b306693e8 (patch) | |
| tree | df3d96c277c53a51cb3685628e3740f76511021f /assets/javascripts/rectangles/engine | |
| parent | ee4d7acf2740b2ab4b2dd04393297e337ac42dd4 (diff) | |
backslash to noclip, fix colors
Diffstat (limited to 'assets/javascripts/rectangles/engine')
| -rw-r--r-- | assets/javascripts/rectangles/engine/builder.js | 6 | ||||
| -rw-r--r-- | assets/javascripts/rectangles/engine/mover.js | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/assets/javascripts/rectangles/engine/builder.js b/assets/javascripts/rectangles/engine/builder.js index 00bb1c7..67dd922 100644 --- a/assets/javascripts/rectangles/engine/builder.js +++ b/assets/javascripts/rectangles/engine/builder.js @@ -42,8 +42,8 @@ var builder = new function(){ function bind (){ clipper.rooms.forEach(function(room){ - var walls = room.group_mx_walls() - walls.forEach(function(wall){ + room.walls = room.group_mx_walls() + room.walls.forEach(function(wall){ wall.bind() wall.randomize_colors() }) @@ -271,7 +271,7 @@ var builder = new function(){ return el } - function make_wall(room, klass){ + function make_wall(klass){ var el = new MX.Object3D(".face" + (klass || "")) el.width = el.height = el.scaleX = el.scaleY = el.scaleZ = 1 el.z = el.y = el.x = 0 diff --git a/assets/javascripts/rectangles/engine/mover.js b/assets/javascripts/rectangles/engine/mover.js index 8c71feb..cac2cca 100644 --- a/assets/javascripts/rectangles/engine/mover.js +++ b/assets/javascripts/rectangles/engine/mover.js @@ -2,6 +2,7 @@ var mover = new function(){ var base = this base.room = null + base.noclip = false base.init = function(){ base.bind() @@ -10,11 +11,22 @@ var mover = new function(){ base.bind = function(){ app.on("move", base.update) + keys.on("backslash", function(){ + base.noclip = ! base.noclip + app.movements.gravity( ! app.movements.gravity() ) + }) } base.update = function(pos){ var radius = scene.camera.radius + if (base.noclip) { + cam.x = pos.x + cam.y = pos.y + cam.z = pos.z + return + } + cam.y = pos.y // if we were in a room already.. |
