From f36f9c314a90b056bd6ce889be24158808a13dcc Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Mon, 28 Apr 2014 10:15:00 -0400
Subject: adding scenery

---
 assets/javascripts/mx/mx.js                     |  3 +--
 assets/javascripts/rectangles/_env.js           |  3 ++-
 assets/javascripts/rectangles/engine/mover.js   |  1 +
 assets/javascripts/rectangles/engine/scenery.js | 20 ++++++++++++++++++++
 assets/javascripts/rectangles/util/colors.js    |  5 ++++-
 rectangles-canvas-only.html                     |  4 ++--
 rectangles-stone.html                           |  1 +
 rectangles.html                                 |  7 ++++---
 8 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 assets/javascripts/rectangles/engine/scenery.js

diff --git a/assets/javascripts/mx/mx.js b/assets/javascripts/mx/mx.js
index 79423df..df9abe7 100644
--- a/assets/javascripts/mx/mx.js
+++ b/assets/javascripts/mx/mx.js
@@ -138,7 +138,7 @@ var MX = MX || (function (undefined) {
     // ========================================================================
 
     function Object3D (el) {
-console.log(el)
+
         this.setupDomElement(el)
         this.setCSSTransformStyle('preserve-3d')
         this.el.classList.add('mx-object3d')
@@ -222,7 +222,6 @@ console.log(el)
                 if (classes) {
                     var i = classes.length
                     while (i--) {
-                    console.log(classes[i].slice(1))
                         this.el.classList.add(classes[i].slice(1))
                     }
                 }
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")
diff --git a/rectangles-canvas-only.html b/rectangles-canvas-only.html
index 4cb030b..30ec81f 100644
--- a/rectangles-canvas-only.html
+++ b/rectangles-canvas-only.html
@@ -64,14 +64,14 @@ body > div {
 <script type="text/javascript" src="assets/javascripts/rectangles/models/vec2.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/engine/builder.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/engine/clipper.js"></script>
+<script type="text/javascript" src="assets/javascripts/rectangles/engine/mover.js"></script>
+<script type="text/javascript" src="assets/javascripts/rectangles/engine/scenery.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/_map.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/ui.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/draw.js"></script>
 
 <script type="text/javascript" src="assets/javascripts/rectangles/map/ui.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/draw.js"></script>
-<script type="text/javascript" src="assets/javascripts/rectangles/engine/builder.js"></script>
-<script type="text/javascript" src="assets/javascripts/rectangles/engine/clipper.js"></script>
 
 <script>
 	environment.init()
diff --git a/rectangles-stone.html b/rectangles-stone.html
index 16fd49f..8c970ce 100644
--- a/rectangles-stone.html
+++ b/rectangles-stone.html
@@ -69,6 +69,7 @@ body > div {
 <script type="text/javascript" src="assets/javascripts/rectangles/engine/builder.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/engine/clipper.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/engine/mover.js"></script>
+<script type="text/javascript" src="assets/javascripts/rectangles/engine/scenery.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/_map.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/ui.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/draw.js"></script>
diff --git a/rectangles.html b/rectangles.html
index 19f9e2f..8050133 100644
--- a/rectangles.html
+++ b/rectangles.html
@@ -56,7 +56,8 @@ body > div {
 				<option>colors</option>
 				<option>redblue</option>
 				<option>gray</option>
-				<option selected>alpha</option>
+				<option>alpha</option>
+				<option selected>white</option>
 			</select>
 			<div id="intersects"></div>
 		</div>
@@ -84,15 +85,15 @@ body > div {
 <script type="text/javascript" src="assets/javascripts/rectangles/engine/builder.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/engine/clipper.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/engine/mover.js"></script>
+<script type="text/javascript" src="assets/javascripts/rectangles/engine/scenery.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/_map.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/ui.js"></script>
 <script type="text/javascript" src="assets/javascripts/rectangles/map/draw.js"></script>
 
 <script src="assets/javascripts/mx/mx.js"></script>
-<script src="assets/javascripts/mx/mx.quaternion.js"></script>
 <script src="assets/javascripts/mx/extensions/mx.scene.js"></script>
 <script src="assets/javascripts/mx/extensions/mx.movements.js"></script>
-<script src="assets/javascripts/mx/primitives/mx.scaleBox.js"></script>
+<script src="assets/javascripts/mx/primitives/mx.image.js"></script>
 <script src="assets/javascripts/app.js"></script>
 
 </html>
-- 
cgit v1.2.3-70-g09d2