diff options
| author | Julie Lala <jules@okfoc.us> | 2014-04-28 10:15:00 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-04-28 10:15:00 -0400 |
| commit | f36f9c314a90b056bd6ce889be24158808a13dcc (patch) | |
| tree | 1e02fd1d6402969475f422b7ada0b3958390031b /assets/javascripts/rectangles | |
| parent | a0c68e2f34013952144c82936d84949b306693e8 (diff) | |
adding scenery
Diffstat (limited to 'assets/javascripts/rectangles')
| -rw-r--r-- | assets/javascripts/rectangles/_env.js | 3 | ||||
| -rw-r--r-- | assets/javascripts/rectangles/engine/mover.js | 1 | ||||
| -rw-r--r-- | assets/javascripts/rectangles/engine/scenery.js | 20 | ||||
| -rw-r--r-- | assets/javascripts/rectangles/util/colors.js | 5 |
4 files changed, 27 insertions, 2 deletions
diff --git a/assets/javascripts/rectangles/_env.js b/assets/javascripts/rectangles/_env.js index edec7e4..ce19296 100644 --- a/assets/javascripts/rectangles/_env.js +++ b/assets/javascripts/rectangles/_env.js @@ -19,7 +19,7 @@ environment.init = function(){ // map.center.b = 0 clipper.rooms.push( new Room ({ - rect: new Rect(0,0, 500,500), + rect: new Rect(-500,-500, 500,500), height: 500, })) clipper.rooms.push( new Room ({ @@ -38,6 +38,7 @@ environment.init = function(){ builder.init() clipper.init() mover.init() + scenery.init() window.scene && scene.update() environment.update() } diff --git a/assets/javascripts/rectangles/engine/mover.js b/assets/javascripts/rectangles/engine/mover.js index cac2cca..12edeff 100644 --- a/assets/javascripts/rectangles/engine/mover.js +++ b/assets/javascripts/rectangles/engine/mover.js @@ -13,6 +13,7 @@ var mover = new function(){ app.on("move", base.update) keys.on("backslash", function(){ base.noclip = ! base.noclip + base.room = null app.movements.gravity( ! app.movements.gravity() ) }) } diff --git a/assets/javascripts/rectangles/engine/scenery.js b/assets/javascripts/rectangles/engine/scenery.js new file mode 100644 index 0000000..9bc999f --- /dev/null +++ b/assets/javascripts/rectangles/engine/scenery.js @@ -0,0 +1,20 @@ +var scenery = new function(){ + + var base = this; + + base.init = function(){ + var img = new MX.Image({ + src:"http://i.asdf.us/im/48/_1398690981_jules.gif", + x: 0, + y: 50, + z: 0, + scale: 1.2, + rotationY: 3*PI/4, + }) + scene.add(img) + + } + + return base + +} diff --git a/assets/javascripts/rectangles/util/colors.js b/assets/javascripts/rectangles/util/colors.js index 68f0901..8f0c148 100644 --- a/assets/javascripts/rectangles/util/colors.js +++ b/assets/javascripts/rectangles/util/colors.js @@ -26,7 +26,10 @@ "rgba(128,0,255,0.5)", "rgba(255,0,255,0.5)", "rgba(255,0,128,0.5)", - ] + ], + white: [ + "rgba(0,0,0,0.9)", + ], } var select = document.querySelector("#palette") |
