summaryrefslogtreecommitdiff
path: root/assets/javascripts/rectangles
diff options
context:
space:
mode:
Diffstat (limited to 'assets/javascripts/rectangles')
-rw-r--r--assets/javascripts/rectangles/engine/builder.js6
-rw-r--r--assets/javascripts/rectangles/engine/mover.js12
-rw-r--r--assets/javascripts/rectangles/models/room.js5
-rw-r--r--assets/javascripts/rectangles/util/colors.js10
-rw-r--r--assets/javascripts/rectangles/util/keys.js4
5 files changed, 29 insertions, 8 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..
diff --git a/assets/javascripts/rectangles/models/room.js b/assets/javascripts/rectangles/models/room.js
index 3c41a1b..a321b7f 100644
--- a/assets/javascripts/rectangles/models/room.js
+++ b/assets/javascripts/rectangles/models/room.js
@@ -77,10 +77,9 @@ window.Room = (function(){
if (side & LEFT_RIGHT) {
els.sort(compare_x)
- console.log(els.map(function(r){ return r.rect+"" }).join("\n"))
}
- else {
- console.log(els.map(function(r){ return r.rect+"" }).join("\n"))
+ else if (side & FRONT_BACK) {
+ els.sort(compare_z)
}
var wall = new_wall(els.shift())
diff --git a/assets/javascripts/rectangles/util/colors.js b/assets/javascripts/rectangles/util/colors.js
index 77473d7..68f0901 100644
--- a/assets/javascripts/rectangles/util/colors.js
+++ b/assets/javascripts/rectangles/util/colors.js
@@ -30,7 +30,15 @@
}
var select = document.querySelector("#palette")
- select.addEventListener("change", function(){ colors = color_palettes[select.value] })
+ select.addEventListener("change", function(){
+ colors = color_palettes[select.value]
+ clipper.rooms.forEach(function(room){
+ room.walls.forEach(function(wall){
+ wall.randomize_colors()
+ })
+ })
+
+ })
window.colors = color_palettes[select.value]
window.palettes = color_palettes
diff --git a/assets/javascripts/rectangles/util/keys.js b/assets/javascripts/rectangles/util/keys.js
index e0ab045..5a5c9d2 100644
--- a/assets/javascripts/rectangles/util/keys.js
+++ b/assets/javascripts/rectangles/util/keys.js
@@ -2,6 +2,7 @@ var keys = (function(){
var base = new function(){}
base.tube = new Tube ()
+ base.debug = false
base.on = function(){
base.tube.on.apply(base.tube, arguments)
@@ -17,7 +18,8 @@ var keys = (function(){
case undefined:
break;
default:
- // console.log(key)
+ if (keys.debug) console.log(key)
+ base.tube(key)
break;
}
})