From a4eb980bcb2cce616abfb6300e1b80d8323899e4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 18:34:58 -0400
Subject: trackin stuff

---
 public/assets/javascripts/rectangles/engine/rooms/mover.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 7195fcc..5c7b4af 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -65,9 +65,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
-			base.room.mx_floor.forEach(function(w){ $(w.el).addClass("active") })
- 			base.room.mx_ceiling.forEach(function(w){ $(w.el).addClass("active") })
-			base.room.mx_walls.forEach(function(w){ $(w.el).addClass("active") })
+      app.tube("change-room", { room: base.room })
 		}
 
 	}
-- 
cgit v1.2.3-70-g09d2


From 0ec3787487db41dd5f5b904b70f61fac3b7da491 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 9 Oct 2014 23:16:50 -0400
Subject: some css, set bg to white when noclipping into void

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js |  2 +-
 public/assets/javascripts/rectangles/engine/rooms/mover.js  | 13 ++++---------
 public/assets/stylesheets/app.css                           |  3 +++
 public/assets/stylesheets/staff.css                         |  9 ++++++---
 server/lib/views/index.js                                   |  4 ++--
 views/docs.ejs                                              |  2 --
 views/home.ejs                                              |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 71ddde9..7ff472d 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -137,7 +137,7 @@
 
         $("#header").toggleClass("black", luminance < 128)
         $("body").css("background-color", rgbColor)
-        
+                
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 5c7b4af..98f80c5 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -21,13 +21,6 @@ Rooms.mover = new function(){
 	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..
@@ -42,14 +35,15 @@ Rooms.mover = new function(){
 			// check if we've breached one of the walls.. clamp position if so
 			var collision = base.room.collidesDisc(pos.x, pos.z, radius)
 
-			if (collision) {
+			if (collision && ! base.noclip) {
 				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
 				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
 				return
 			}
 
 			// in this case, we appear to have left the room..
-			$(".face.active").removeClass("active")
+			// $(".face.active").removeClass("active")
+			$("body").css("background-color", "transparent")
 			base.room = null
 		}
 
@@ -65,6 +59,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
+			$("body").css("background-color", rgb_string( Walls.colors.wall ))
       app.tube("change-room", { room: base.room })
 		}
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6aab60c..a15ea39 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -482,6 +482,9 @@ iframe.embed {
 	width: 100%;
 	border-top: 1px solid;
 }
+.page h1:nth-child(2) {
+	margin-top: 40px;
+}
 
 .page p {
 	margin: 20px;
diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css
index aa21f9b..c75a9b1 100644
--- a/public/assets/stylesheets/staff.css
+++ b/public/assets/stylesheets/staff.css
@@ -28,15 +28,16 @@ nav {
   text-align: left;
 }
 nav a {
-  padding-left: 20px;
+  margin-left: 20px;
 }
 hr {
   border: 1px solid #bbb;
-  margin: 5px auto 10px;
+  margin: 10px auto 10px;
+  background: transparent;
 }
 .body {
   width: 80%;
-  margin: 0 auto;
+  margin: 40px auto;
 }
 .json {
   display: none;
@@ -63,6 +64,8 @@ hr {
 .staff {
   font-size: 15px;
 }
+.staff .body a {
+}
 .staff .editLinks a {
   color: #00f;
 }
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 1b547ef..fe2c988 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -86,7 +86,7 @@ views.home = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
@@ -151,7 +151,7 @@ views.profile = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
diff --git a/views/docs.ejs b/views/docs.ejs
index 5662133..665190d 100644
--- a/views/docs.ejs
+++ b/views/docs.ejs
@@ -8,8 +8,6 @@
 <div class="rapper page docs">
 	[[ include partials/header ]]
 
-	<br clear="all">
-	
 	[[ if (! isNew) { ]]
 		<h1>[[- doc.displayName ]]</h1>
 
diff --git a/views/home.ejs b/views/home.ejs
index e02ab0c..16b00e7 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -10,7 +10,7 @@
 	</script>
 </head>
 <body class="loading">
-	<div class="rapper page">
+	<div class="rapper page home">
 	[[ include partials/header ]]
 
 	<div class="hero" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
-- 
cgit v1.2.3-70-g09d2


From 527a65ca570891ff473dbdac36d41b1be60196f1 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Tue, 14 Oct 2014 19:16:45 -0400
Subject: load more on media drawer and some other stuff

---
 .../javascripts/mx/extensions/mx.movements.js      |  3 +-
 .../javascripts/rectangles/engine/map/draw.js      |  6 +--
 .../javascripts/rectangles/engine/rooms/_walls.js  | 19 +++++----
 .../javascripts/rectangles/engine/rooms/mover.js   |  2 +
 .../javascripts/rectangles/util/constants.js       |  3 +-
 public/assets/javascripts/rectangles/util/wheel.js |  6 ++-
 .../assets/javascripts/ui/builder/BuilderInfo.js   |  2 +-
 .../assets/javascripts/ui/editor/EditorSettings.js |  1 +
 public/assets/javascripts/ui/editor/EditorView.js  |  1 +
 public/assets/javascripts/ui/editor/MediaUpload.js |  4 +-
 public/assets/javascripts/ui/editor/MediaViewer.js | 33 +++++++++++----
 public/assets/javascripts/ui/editor/TextEditor.js  |  5 +--
 public/assets/stylesheets/app.css                  | 49 +++++++++++++---------
 server/lib/api/media.js                            | 13 ++++--
 server/lib/api/projects.js                         |  2 +
 server/lib/schemas/Project.js                      |  1 +
 views/controls/editor/media-drawer.ejs             | 28 +++++++------
 17 files changed, 116 insertions(+), 62 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 2b7e671..268a1c7 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -223,8 +223,7 @@ MX.Movements = function (cam) {
 		},
 		
 		mousewheel: function (e, deltaY, deltaX) {
-			console.log(deltaX != 0 && deltaY != 0)
-			cam.rotationY += -deltaX / 20
+			cam.rotationY += deltaX / 20
 
 			pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
 			pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 7eb6e7c..eceda3c 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -177,11 +177,11 @@ Map.Draw = function(map, opt){
 		ctx.lineWidth = 1/map.zoom
 		
 		var sides = map.sides()
-		var quant = sides.clone().quantize(200)
-		for (var x = quant.x.a - 200; x <= quant.x.b; x += 200) {
+		var quant = sides.clone().quantize(MAP_GRID_SIZE)
+		for (var x = quant.x.a - MAP_GRID_SIZE; x <= quant.x.b; x += MAP_GRID_SIZE) {
 			line(x, sides.y.a, x, sides.y.b)
 		}
-		for (var y = quant.y.a - 200; y <= quant.y.b; y += 200) {
+		for (var y = quant.y.a - MAP_GRID_SIZE; y <= quant.y.b; y += MAP_GRID_SIZE) {
 			line(sides.x.a, y, sides.x.b, y)
 		}
 	}
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 0da3b9a..119a659 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -134,19 +134,24 @@
       })
 		}
 		
+		base.luminance = function(rgb){
+			rgb = rgb || Walls.colors.wall
+			var rgb_max = Math.max.apply(0, rgb)
+			var rgb_min = Math.min.apply(255, rgb)
+			return (rgb_max + rgb_min ) / 2
+		}
+		
     base.setColor = {
     
       wall: function(rgb){
         var rgbaColor = rgba_string(rgb, app.defaults.wallOpacity)
         var rgbColor = rgb_string(rgb)
+        				
+				if (Rooms.mover.room) {
+					$("#header").toggleClass("black", base.luminance() < 100)
+					$("body").css("background-color", rgbColor)
+				}
         
-        var rgb_max = Math.max.apply(0, rgb)
-        var rgb_min = Math.min.apply(255, rgb)
-        var luminance = (rgb_max + rgb_min ) / 2
-
-        $("#header").toggleClass("black", luminance < 128)
-        $("body").css("background-color", rgbColor)
-                
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 98f80c5..a2d2223 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -43,6 +43,7 @@ Rooms.mover = new function(){
 
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
+			$("#header").removeClass("black")
 			$("body").css("background-color", "transparent")
 			base.room = null
 		}
@@ -59,6 +60,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
+			$("#header").toggleClass("black", Walls.luminance() < 100)
 			$("body").css("background-color", rgb_string( Walls.colors.wall ))
       app.tube("change-room", { room: base.room })
 		}
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index a38325e..3bc314c 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -21,7 +21,8 @@ var height_min = 200,
 		side_max = 5000,
 		resize_margin = 8,
 		cursor_amp = 1.5,
-		DEFAULT_PICTURE_WIDTH = 400
+		DEFAULT_PICTURE_WIDTH = 350,
+		MAP_GRID_SIZE = 360          // 10 feet
 
 var painting_distance_from_wall = 10,
 		dot_distance_from_picture = 3
diff --git a/public/assets/javascripts/rectangles/util/wheel.js b/public/assets/javascripts/rectangles/util/wheel.js
index 64aaa64..712d470 100644
--- a/public/assets/javascripts/rectangles/util/wheel.js
+++ b/public/assets/javascripts/rectangles/util/wheel.js
@@ -38,7 +38,11 @@ function wheel (opt) {
 		var deltaX = 0, deltaY = 0;
 		
 		// WebKit
-		if ( event.wheelDeltaY ) {
+		if ( event.deltaY ) {
+			deltaY -= event.deltaY * opt.ratio
+			deltaX -= event.deltaX * opt.ratio
+		}
+		else if ( event.wheelDeltaY ) {
 			deltaY -= event.wheelDeltaY * opt.ratio
 			deltaX -= event.wheelDeltaX * opt.ratio
 		}
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 196eca6..67834e7 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -34,7 +34,7 @@ var BuilderInfo = View.extend({
 	},
 	
 	load: function(data){
-		this.$viewHeight.unitVal( data.viewHeight || app.defaults.viewHeight )
+		this.$viewHeight.unitVal( window.viewHeight = data.viewHeight || app.defaults.viewHeight )
 		this.$units.val( "ft" )
 		this.$unitName.html( "ft" )
 	},
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 89040e1..e2cb53c 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -148,6 +148,7 @@ var EditorSettings = FormView.extend({
 		fd.append( "name", this.$name.val() )
 		fd.append( "description", this.$description.val() )
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
+		fd.append( "viewHeight", window.viewHeight )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
  		fd.append( "walls", JSON.stringify( Walls.serialize() ) )
  		fd.append( "colors", JSON.stringify( Walls.colors ) )
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 6aff601..ccd6c63 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -41,6 +41,7 @@ var EditorView = View.extend({
 		$("#map").hide()
 
 		this.settings.load(data)
+		this.info.load(data)
 	},
 	
 	readyLayout: function(data){
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index fddfefc..9799f99 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -55,9 +55,7 @@ var MediaUpload = UploadView.extend({
 	
 	add: function(media){
 		console.log(media)
-		this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia)
-    this.parent.mediaViewer.$deleteMedia.show()
-    this.parent.mediaViewer.$noMedia.hide()
+		this.parent.mediaViewer.addUploadedMedia(media)
 	},
 	
 	beforeUpload: function(){
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index c18fb49..2e76bec 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -4,23 +4,29 @@ var MediaViewer = ModalView.extend({
 	destroyAction: "/api/media/destroy",
 	usesFileUpload: true,
 	loaded: false,
-	
+	perPage: 12,
+	offset: 0,
+
 	events: {
 	  'mousedown': "stopPropagation",
 		'click .foundToggle': "foundToggle",
 		'click .userToggle': "userToggle",
 		'click #deleteMedia': "deleteArmed",
 		'click .mediaContainer': "pick",
+		'click .viewMore': "load",
 	},
 	
 	initialize: function(opt){
 		this.__super__.initialize.call(this)
 		this.parent = opt.parent
 		this.$myMedia = this.$(".myMedia")
+		this.$myMediaContainer = this.$(".myMedia > .container")
 		this.$userToggle = this.$(".userToggle")
 		this.$foundMedia = this.$(".foundMedia")
+		this.$foundMediaContainer = this.$(".foundMedia > .container")
 		this.$foundToggle = this.$(".foundToggle")
 		this.$deleteMedia = this.$("#deleteMedia")
+		this.$viewMore = this.$(".viewMore")
 		this.$noMedia = this.$(".noMedia")
   },
 
@@ -55,7 +61,7 @@ var MediaViewer = ModalView.extend({
 	},
 
 	load: function(){
-		$.get("/api/media/user", this.populate.bind(this))
+		$.get("/api/media/user", { offset: this.offset, limit: this.perPage }, this.populate.bind(this))
 	},
 	
 	loadTrending: function(){
@@ -85,7 +91,7 @@ var MediaViewer = ModalView.extend({
           width: img.naturalWidth,
           height: img.naturalHeight,
         }
-        this.add(media, this.$foundMedia)
+        this.add(media, this.$foundMediaContainer)
 		  }.bind(this)
 		  img.src = url
 		  if (img.complete && ! loaded) { img.onload() }
@@ -100,22 +106,34 @@ var MediaViewer = ModalView.extend({
   },
 
 	populate: function(data){
-		this.loaded = true
 		if (data && data.length) {
+			if (data.length < this.perPage) {
+				this.$viewMore.hide()
+			}
 		  data.forEach(function(media){
-		    this.add(media, this.$myMedia)
+		    this.add(media, this.$myMediaContainer)
+		    this.offset += 1
 		  }.bind(this))
 		  this.$noMedia.hide()
       this.$deleteMedia.show()
 		}
 		else {
+			this.$viewMore.hide()
 		  this.$noMedia.show()
 		  this.$deleteMedia.hide()
 		}
+		this.loaded = true
 		this.__super__.show.call(this)
 	},
 	
-	add: function(media, $container){
+	addUploadedMedia: function(media){
+    this.parent.mediaViewer.$deleteMedia.show()
+    this.parent.mediaViewer.$noMedia.hide()
+    this.add(media, this.$myMedia, true) // prepend
+		this.offset += 1
+	},
+	
+	add: function(media, $container, prepend){
 		var image = new Image ()
 		var $span = $("<span>")
 		$span.addClass("mediaContainer")
@@ -142,7 +160,8 @@ var MediaViewer = ModalView.extend({
 		$span.data("media", media)
 		$span.append(image)
 
-		$container.prepend($span)
+		if (prepend) $container.prepend($span)
+		else $container.append($span)
 	},
 
 	deleteIsArmed: false,
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index c8879b3..b559ba5 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -28,16 +28,15 @@ var TextEditor = FormView.extend({
 	},
 
   toggle: function(state){
-    $("#keyhint").fadeOut(200)
-    
     this.$el.toggleClass("active", state)
     if (state) {
+			$("#keyhint").fadeOut(200)
       Scenery.nextMedia = {
         type: 'text',
         width: 600,
         height: 450,
         scale: 0.5,
-        font: { family: 'Lato', size: 12, align: 'left' },
+        font: { family: 'Lato', size: 24, align: 'left', color: "#000" },
       }
       this.createMode(true)
     }
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 849c994..eec671a 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -414,6 +414,17 @@ iframe.embed {
 	border-top: 1px solid black;
 }
 
+.mediaDrawer .viewMore {
+	clear: both;
+	float: none;
+	text-decoration: none;
+	font-size: 22px;
+	display: block;
+	text-align: center;
+	padding: 40px;
+	border: 0;
+	border-top: 1px solid black;
+}
 
 .holder {
 	display: table-cell;
@@ -2152,7 +2163,7 @@ form li textarea {
 	right: 20px;
 	top: 20px;
 	z-index: 20;
-	background: #f9f9f9;
+	background: white;
 	width: 75px;
 	color: black;
 	border: 1px solid black;
@@ -2511,22 +2522,22 @@ a[data-role="forgot-password"] {
 	padding: 50px 0;
 	}
 	.page .viewMore.btn {
-	text-decoration: none;
-	font-size: 18px;
-	padding: 18px 0;
-}
-.footer a, .footer span {
-margin: 9px;
-}
-#keyhint {
-	display:none;
-}
-.projectList .projectItem {
-	width:100%;
-	margin: 20px 0;
-}
-.projectList .room {
-width: 100%;
-height: 260px;
-}
+		text-decoration: none;
+		font-size: 18px;
+		padding: 18px 0;
+	}
+	.footer a, .footer span {
+	margin: 9px;
+	}
+	#keyhint {
+		display:none;
+	}
+	.projectList .projectItem {
+		width:100%;
+		margin: 20px 0;
+	}
+	.projectList .room {
+	width: 100%;
+	height: 260px;
+	}
 }
\ No newline at end of file
diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 1eb08c1..643ba92 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -10,13 +10,20 @@ var _ = require('lodash'),
 var media = {
 
 	user: function(req, res){
+	  var offset = Number(req.query.offset) || 0
+	  var limit = Math.min( Number(req.query.limit), 50 ) || 20
 	  var query = { user_id: req.user._id }
 	  if (req.query.tag) {
 	    query.tag = req.query.tag
 	  }
-		Media.find(query, function(err, media){
-			res.json(media || [])
-		})
+	  console.log(offset, limit)
+		Media.find(query)
+			.sort({'created_at': -1})
+			.skip(offset)
+			.limit(limit)
+		  .exec(function(err, media){
+				res.json(media || [])
+			})
 	},
 	
 	create: function(req, res){
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index 47e0458..e357285 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -36,6 +36,7 @@ var projects = {
 		data.name = util.sanitize(data.name)
 		data.slug = util.slugify(data.name) + "-" + (+new Date)
 		data.description = util.sanitize(data.description)
+		data.viewHeight = Number(data.viewHeight || 0)
 		data.rooms = JSON.parse(data.rooms)
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
@@ -94,6 +95,7 @@ var projects = {
           data.slug = util.slugify(data.name) + "-" + (+new Date)
         }
         data.description = util.sanitize(data.description)
+        data.viewHeight = Number(data.viewHeight || 0)
         data.updated_at = new Date ()
 
 				_.extend(doc, data)
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index dd50da6..f7b8de0 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -32,6 +32,7 @@ var ProjectSchema = new mongoose.Schema({
 	media: [mongoose.Schema.Types.Mixed],
 	colors: mongoose.Schema.Types.Mixed,
 	startPosition: mongoose.Schema.Types.Mixed,
+	viewHeight: { type: Number },
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },
 	updated_at: { type: Date },
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index d800426..5cc659e 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -1,14 +1,3 @@
-<span class="fileUpload">
-	<input type="hidden" name="_csrf" value="[[- token ]]">
-	<form>
-		<span class="ion-ios7-upload-outline upload-icon"></span><br>
-		Upload File
-		<input type="file" accept="image/*" class="file" multiple>
-	</form>
-	<small>~ or ~</small><br>
-	<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
-</span>
-
 <div class="ants">
 	<div class="leftborder"></div>
 	<img class="floatingImg">
@@ -16,13 +5,28 @@
 
 <div class="mediaDrawer fixed animate mediaViewer">
 	<span class="close">X</span>
+
 	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
 
 	<div class="myMedia">
 	  <div class="noMedia">You have no media yet.  Upload some!</div>
+	  <span class="container"></span>
+		<a href="#" class="viewMore btn">view more</a>
 	</div>
+
+	<span class="fileUpload">
+		<input type="hidden" name="_csrf" value="[[- token ]]">
+		<form>
+			<span class="ion-ios7-upload-outline upload-icon"></span><br>
+			Upload File
+			<input type="file" accept="image/*" class="file" multiple>
+		</form>
+		<small>~ or ~</small><br>
+		<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
+	</span>
 	
 	<div class="foundMedia">
-	</div>
+	  <span class="container"></span>
+ 	</div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From d50fa94e9b758270b15dfeb5100063c6d876d64c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 15 Oct 2014 12:04:00 -0400
Subject: cursor that follows mouse

---
 .../javascripts/mx/extensions/mx.movements.js      | 14 ++++----
 .../javascripts/rectangles/engine/rooms/_walls.js  |  2 +-
 .../javascripts/rectangles/engine/rooms/mover.js   |  3 +-
 public/assets/javascripts/ui/editor/EditorView.js  |  1 +
 public/assets/javascripts/ui/editor/HelpCursor.js  | 38 ++++++++++++++++++++++
 public/assets/javascripts/ui/editor/MediaViewer.js | 33 ++++++++++++++-----
 public/assets/stylesheets/app.css                  | 18 +++++++---
 views/controls/editor/media-drawer.ejs             | 13 +++++++-
 views/controls/editor/settings.ejs                 |  2 ++
 views/partials/scripts.ejs                         |  1 +
 10 files changed, 104 insertions(+), 21 deletions(-)
 create mode 100644 public/assets/javascripts/ui/editor/HelpCursor.js

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 5ba5d69..b158625 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -226,12 +226,14 @@ MX.Movements = function (cam) {
 		},
 		
 		mousewheel: function (e, deltaY, deltaX) {
-			cam.rotationY += deltaX / 20
-
-			pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
-			pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
-
-			app.tube("move", pos)
+		  if (e.shiftKey) {
+        cam.rotationY -= deltaY / 150
+      }
+      else {
+        pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
+        pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
+        app.tube("move", pos)
+      }
 		},
 
 		update: function () {
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 119a659..f2348f0 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -135,7 +135,7 @@
 		}
 		
 		base.luminance = function(rgb){
-			rgb = rgb || Walls.colors.wall
+			rgb = rgb || Walls.colors.ceiling
 			var rgb_max = Math.max.apply(0, rgb)
 			var rgb_min = Math.min.apply(255, rgb)
 			return (rgb_max + rgb_min ) / 2
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index a2d2223..dd63db2 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -11,7 +11,8 @@ Rooms.mover = new function(){
 	
 	base.bind = function(){
 		app.on("move", base.update)
-		keys.on("backslash", function(){
+		keys.on("backslash", function(e){
+		  if ( ! (e.ctrlKey || e.metaKey) ) return
 			base.noclip = ! base.noclip
 			base.room = null
 			app.movements.gravity( ! base.noclip )
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index ccd6c63..05d1bec 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -9,6 +9,7 @@ var EditorView = View.extend({
 	},
 	
 	initialize: function(){
+	  this.cursor = new HelpCursor ({ parent: this })
 		this.toolbar = new EditorToolbar ({ parent: this })
 		this.settings = new EditorSettings ({ parent: this })
 		this.info = new BuilderInfo ({ parent: this })
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
new file mode 100644
index 0000000..842e871
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -0,0 +1,38 @@
+
+var HelpCursor = View.extend({
+	el: "#helpCursor",
+	
+	messages: {
+	  start: "Welcome to Vvalls!",
+	  move: "Use the up and down keys to move around. Use left and right to pivot. WASD works too.",
+	},
+	shown: {},
+
+  initialize: function(){
+    $(window).mousemove(function(e){
+      this.el.style.left = e.pageX + "px"
+      this.el.style.top = e.pageY + "px"
+    }.bind(this))
+    this.show("start")
+  },
+
+  show: function(name){
+    if (name) this.showMessage(name)
+    this.$el.show()
+  },
+
+  hide: function(){
+    this.$el.hide()
+  },
+
+  showMessage: function(name){
+    if (+(this.shown[name] || 0) < 2) {
+      this.$el.html(this.messages[name])
+      this.shown[name] = (+this.shown[name] || 0) + 1
+    }
+    else {
+      this.$el.html("")
+    }
+  },
+
+})
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 10819af..b270be5 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -20,29 +20,46 @@ var MediaViewer = ModalView.extend({
 	initialize: function(opt){
 		this.__super__.initialize.call(this)
 		this.parent = opt.parent
+
 		this.$myMedia = this.$(".myMedia")
 		this.$myMediaContainer = this.$(".myMedia > .container")
 		this.$userToggle = this.$(".userToggle")
+
 		this.$foundMedia = this.$(".foundMedia")
 		this.$foundMediaContainer = this.$(".foundMedia > .container")
 		this.$foundToggle = this.$(".foundToggle")
+
+		this.$wallpaperMedia = this.$(".wallpaperMedia")
+		this.$wallpaperMediaContainer = this.$(".wallpaperMedia > .container")
+		this.$wallpaperToggle = this.$(".wallpaperToggle")
+
 		this.$deleteMedia = this.$("#deleteMedia")
 		this.$viewMore = this.$(".viewMore")
 		this.$noMedia = this.$(".noMedia")
   },
 
+	wallpaperToggle: function(){
+    this.$wallpaperMedia.addClass("active")
+    this.$foundMedia.addClass("inactive")
+    this.$myMedia.addClass("inactive")
+    this.$("a").removeClass("active")
+    this.$foundToggle.addClass("active")
+	},
+	
 	foundToggle: function(){
-    this.$foundMedia.addClass("active");
-    this.$myMedia.addClass("inactive");
-    this.$("a").removeClass("active");
-    this.$foundToggle.addClass("active");
+    this.$wallpaperMedia.removeClass("active")
+    this.$foundMedia.addClass("active")
+    this.$myMedia.addClass("inactive")
+    this.$("a").removeClass("active")
+    this.$foundToggle.addClass("active")
 	},
 	
 	userToggle: function(){
-    this.$foundMedia.removeClass("active");
-    this.$myMedia.removeClass("inactive");
-    this.$("a").removeClass("active");
-    this.$userToggle.addClass("active");
+    this.$wallpaperMedia.removeClass("active")
+    this.$foundMedia.removeClass("active")
+    this.$myMedia.removeClass("inactive")
+    this.$("a").removeClass("active")
+    this.$userToggle.addClass("active")
 	},
 
 	show: function(){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index cf98170..0140dc6 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -901,7 +901,7 @@ border-left: 1px solid black;
 
 .face {
 	background-color: #fff;
-	transition: 0.1s background-color ease;
+	transition: 0.1s background-color ease, 0.05s background-color ease;
 }
 .front { background-color: #fff; }
 .back  { background-color: #fff; }
@@ -1271,7 +1271,7 @@ border-left: 1px solid black;
 .noMedia {
   margin: 40px;
 }
-.foundMedia {
+.foundMedia, .wallpaperMedia {
   position:absolute;
   top:0;
   left:0;
@@ -1282,8 +1282,7 @@ border-left: 1px solid black;
   padding-top:40px;
   width: 100%;
 }
-
-.foundMedia.active {
+.foundMedia.active, .wallpaperMedia.active {
   -webkit-transform: translateX(0%);
   transform: translateX(0%);
 }
@@ -1718,6 +1717,17 @@ input[type="range"]::-webkit-slider-thumb {
 	cursor: pointer;
 }
 
+#helpCursor {
+  position: fixed;
+  max-width: 200px;
+  font-size: 13px;
+  color: black;
+  background: #fff;
+  margin: 8px 0 0 8px;
+  padding: 4px;
+  font-weight: 500;
+  z-index: 22;
+}
 
 .settings.info {
   right: auto;
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 7996f84..d1e2c99 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -6,7 +6,13 @@
 <span class="close" id="fixed_close">X</span>
 
 <div class="mediaDrawer fixed animate mediaViewer">
-	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
+	<h2>
+	  <a href="#" class="userToggle active">Your Media</a>
+	  – <a href="#" class="foundToggle">Found Media</a>
+<!--
+	  – <a href="#" class="wallpaperToggle">Wallpaper</a>
+ -->
+	</h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
 
 	<div class="myMedia">
@@ -29,4 +35,9 @@
 	<div class="foundMedia">
 	  <span class="container"></span>
  	</div>
+ 	
+ 	<div class="wallpaperMedia">
+	  <span class="container"></span>
+ 	</div>
+ 	
 </div>
\ No newline at end of file
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index 7c40a75..8443abb 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -1,3 +1,5 @@
+<span id="helpCursor"></span>
+
 <div class="vvbox settings" id="editorSettings">
 	<h4>Room Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 07ee7a5..05f4b58 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -102,6 +102,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorToolbar.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/HelpCursor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/LightControl.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/Collaborators.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
-- 
cgit v1.2.3-70-g09d2


From c13532ec95c2d410354f7d342df70fd68dd78272 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 16 Oct 2014 02:21:46 -0400
Subject: matrix mode

---
 .../javascripts/rectangles/engine/rooms/_walls.js  | 31 ++++++++++++++++-
 .../javascripts/rectangles/engine/rooms/mover.js   |  8 ++---
 .../assets/javascripts/rectangles/models/wall.js   |  4 +--
 .../assets/javascripts/ui/editor/ColorControl.js   | 21 ++++++++----
 public/assets/javascripts/ui/editor/Presets.js     | 39 ++++++++++++++++++++--
 public/assets/stylesheets/app.css                  | 22 +++++++-----
 views/controls/editor/presets.ejs                  | 12 -------
 7 files changed, 101 insertions(+), 36 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index f2348f0..5c16ce6 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -140,6 +140,36 @@
 			var rgb_min = Math.min.apply(255, rgb)
 			return (rgb_max + rgb_min ) / 2
 		}
+    
+    base.setBodyColor = function(){
+  		$("#header").toggleClass("black", Walls.luminance() < 100)
+			$("body").css("background-color", rgb_string( Walls.colors.wall ))
+		}
+		base.clearBodyColor = function(){
+			$("#header").removeClass("black")
+			$("body").css("background-color", "transparent")
+		}
+		
+		base.setWallpaper = {
+			wall: function(background){
+				var img = new Image ()
+				img.onload = function(){
+					Walls.list.forEach(function(wall){
+						wall.wallpaper(background, img)
+					})
+				}.bind(this)
+				img.src = background.src
+				img.complete && img.onload()
+			}
+		}
+		
+		base.clearWallpaper = {
+			wall: function(){
+				Walls.list.forEach(function(wall){
+					wall.wallpaper("none")
+				})
+			}
+		}
 		
     base.setColor = {
     
@@ -181,7 +211,6 @@
           room.setCeilingColor(rgbColor)
         })
       },
-  
     }
   }
 
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index dd63db2..fae2ce6 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -44,8 +44,7 @@ Rooms.mover = new function(){
 
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
-			$("#header").removeClass("black")
-			$("body").css("background-color", "transparent")
+			Walls.clearBodyColor()
 			base.room = null
 		}
 
@@ -61,8 +60,9 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
-			$("#header").toggleClass("black", Walls.luminance() < 100)
-			$("body").css("background-color", rgb_string( Walls.colors.wall ))
+			if (! base.noclip) {
+				Walls.setBodyColor()
+			}
       app.tube("change-room", { room: base.room })
 		}
 
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 2ee88d9..542c99a 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -213,7 +213,7 @@
 		this.$walls.css("background-color", color)
 	}
 	
-	Wall.prototype.wallpaper = function(background){
+	Wall.prototype.wallpaper = function(background, img){
 	  if (! background) {
 	    background = { src: "none" }
 	  }
@@ -235,7 +235,7 @@
 		  return
 		}
 		
-		var img = new Image ()
+		img = img || new Image ()
 		img.onload = function(){
 		  this.backgroundImage = img
 		  this.wallpaperLoad(this.background.src)
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js
index 26358f1..61a7ef6 100644
--- a/public/assets/javascripts/ui/editor/ColorControl.js
+++ b/public/assets/javascripts/ui/editor/ColorControl.js
@@ -4,9 +4,10 @@ var ColorControl = View.extend({
   
   events: {
     "mousedown": "stopPropagation",
-    "click .color-swatches span": "select",
     "mousedown #brightness-control": "beginBrightness",
     "input #brightness-control": "updateBrightness",
+    "click .color-swatches span": "setSurface",
+    "click .colors span": "setHue",
   },
 
 	colors: [
@@ -48,16 +49,15 @@ var ColorControl = View.extend({
     	$swatch.css("background-color","rgb(" + color + ")")
     	$swatch.data('color', color)
     	this.$colors.append($swatch)
-    }.bind(this))
-    
+    }.bind(this))    
   },
 
   modes: [ "wall", "outline", "floor", "ceiling" ],
 
   load: function(data){
     this.modes.forEach(function(mode){
-      Walls.setColor[mode](data[mode])
-      this.$swatch[ mode ].css("background-color", rgb_string(data[mode]))
+			Walls.setColor[mode](data[mode])
+			this.$swatch[ mode ].css("background-color", rgb_string(data[mode]))
     }.bind(this))
     this.setMode("wall")
   },
@@ -134,11 +134,20 @@ var ColorControl = View.extend({
     this.$brightnessControl.val( this.labColor[0] )
   },
   
-  select: function(e){
+  setSurface: function(e){
     var mode = $('.swatch', e.currentTarget).data('mode')
     this.setMode(mode)
   },
   
+  setHue: function(e){
+  	var color = $(e.currentTarget).data('color')
+
+    this.labColor = this.colorPicker.load(color)
+    this.$brightnessControl.val( this.labColor[0] )
+
+    this.pick(color, this.labColor)
+  },
+  
   beginBrightness: function(){
     this.begin()
     $(window).one("mouseup", this.finalize.bind(this))
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index a3dc610..c34c826 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -19,8 +19,9 @@ var Presets = View.extend({
       outline: [0,0,0],
       floor: [109,116,106],
       ceiling: [159,163,157],
+      background: [109,116,106],
     },
-    pfunk: {
+    "p.funk": {
       wall: [255,63,78],
       outline: [255,246,0],
       floor: [255,255,0],
@@ -32,10 +33,24 @@ var Presets = View.extend({
       floor: [0,0,0],
       ceiling: [0,0,0],
     },
+    matrix: {
+    	wall: { src: "http://bibleway.biz/images/Matrix1.gif", scale: 4.0, color: [0,0,0] },
+    	outline: [0,0,0],
+      floor: [10,15,10],
+      ceiling: [0,0,0],
+    },
   },
   
   initialize: function(opt){
     this.parent = opt.parent
+
+		this.$presets = this.$(".presets")
+  	_.keys(this.presets).forEach(function(name){
+			var $swatch = $("<span>")
+			$swatch.html(capitalize(name))
+			$swatch.data('preset', name)
+			this.$presets.append($swatch)
+  	}.bind(this))
   },
 
   toggle: function(state){
@@ -54,9 +69,9 @@ var Presets = View.extend({
   selectPreset: function(e){
     var preset = $(e.currentTarget).data('preset')
     if (! this.presets[preset]) return
-    this.parent.colorControl.load(this.presets[preset])
     this.$(".active").removeClass('active')
     $(e.currentTarget).addClass('active')
+    this.load(this.presets[preset])
   },
   
   selectColor: function(e){
@@ -64,4 +79,24 @@ var Presets = View.extend({
     console.log(preset)
   },
   
+  lastPreset: {wall:[1],outline:[1],floor:[1],ceiling:[1]},
+  load: function(preset){
+    this.parent.colorControl.modes.forEach(function(mode){
+    	if (! preset[mode].length) {
+    		Walls.setWallpaper[mode](preset[mode])
+				Walls.setColor[mode](preset[mode].color)
+			}
+			else {
+				if (! this.lastPreset[mode].length) {
+					Walls.clearWallpaper[mode]()
+				}
+				Walls.setColor[mode](preset[mode])
+				this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(preset[mode]))
+    	}
+    }.bind(this))
+    this.parent.colorControl.setMode(preset.wall.color ? "wall" : "floor")
+    Walls.setBodyColor()
+    this.lastPreset = preset
+  },
+  
 })
\ No newline at end of file
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d7999b9..bd2d42c 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1445,12 +1445,12 @@ border-left: 1px solid black;
 .wallpaper, #presets {
   right: 80px;
   margin-top: 77px;
-  width: 172px;
+  width: 202px;
   -webkit-transition: -webkit-transform 0.1s ease-in-out;
   -webkit-transform: translateX(400px);
   transition: transform 0.1s ease-in-out;
   transform: translateX(400px);
-	padding: 5px 5px 9px 5px;
+	padding: 10px 12px 12px 12px;
 }
 
 #presets {
@@ -1467,6 +1467,7 @@ border-left: 1px solid black;
   display: inline-block;
   border: 1px solid;
   background-size: contain;
+  margin: 0 2px 4px 2px;
   -webkit-transition: -webkit-transform 0.1s ease-in-out;
   line-height: 0;
   vertical-align: text-bottom;
@@ -1486,7 +1487,7 @@ border-left: 1px solid black;
 }
 
 .vvbox .colors {
-  max-width: 170px;
+  max-width: 155px;
 	margin-bottom: 5px;
 }
 .vvbox .colors span {
@@ -1585,7 +1586,7 @@ border-left: 1px solid black;
 .colorcontrol {
   margin-top: 8%;
   right: 80px;
-  padding: 13px 20px 20px 20px;
+  padding: 10px 12px 12px 12px;
   -webkit-transform: translateX(400px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
   transform: translateX(400px);
@@ -1607,8 +1608,8 @@ input[type=range] {
   -moz-appearance: none;
   cursor: pointer;
   background-color: black;
-  width: 180px;
-  height:3px;
+  width: 155px;
+  height: 3px;
 }
 input[type="range"]::-webkit-slider-thumb {
   -webkit-appearance: none;
@@ -1702,8 +1703,7 @@ input[type="range"]::-webkit-slider-thumb {
 	margin-bottom:5px;
 }
 .color-swatches span.active, .color-swatches span.active:hover{
-	background:#000;
-	color:white;
+	background: #fff;
 }
 .color-swatches span:nth-child(3){
 	clear:left;
@@ -1711,10 +1711,14 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches span:hover {
 	background:#eee;
 }
+.color-swatches span.active label,
+.color-swatches span:hover label {
+	border-bottom: 1px solid;
+}
 
 .color-swatches label {
 	position: relative;
-	padding-left: 5px;
+	margin-left: 5px;
 	display: inline-block;
 	cursor: pointer;
 }
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index 8dd1986..04b1cf1 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -1,17 +1,5 @@
 <div class="vvbox" id="presets">
   <h4>Preset Styles</h4>
   <div class="presets">
-    <span data-preset="inverse">
-      Inverse
-    </span>
-    <span data-preset="shaded">
-      Shaded
-    </span>
-    <span data-preset="wireframe">
-      Wireframe
-    </span>
-    <span data-preset="pfunk">
-      P.Funk
-    </span>
   </div>
 </div>
-- 
cgit v1.2.3-70-g09d2


From de6fa5bf0e7f0a55341d05f5a5b1dfb19330aeb0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 29 Oct 2014 18:25:12 -0400
Subject: stub in fixes to mover

---
 .../javascripts/rectangles/engine/rooms/mover.js   | 38 +++++++++++++++++++++-
 .../assets/javascripts/rectangles/models/room.js   |  6 ++--
 public/assets/javascripts/ui/reader/MediaPlayer.js |  2 +-
 server/lib/views/index.js                          |  6 ++--
 4 files changed, 44 insertions(+), 8 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index fae2ce6..121ecec 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -34,7 +34,43 @@ Rooms.mover = new function(){
 			}
 
 			// check if we've breached one of the walls.. clamp position if so
-			var collision = base.room.collidesDisc(pos.x, pos.z, radius)
+			var collision = base.room.collidesDisc(cam, pos, radius)
+
+/*
+      var dz = new vec2( cam.z, pos.z )
+      dz.normalize()
+
+      var dx = new vec2( cam.x, pos.x )
+      dx.normalize()
+
+			Walls.list.forEach(function(wall){
+			  switch (wall.side) {
+			    case FRONT:
+			      break
+			    case BACK:
+			      break
+			    case LEFT:
+			      if (cam.x >= wall.edge + radius && wall.edge + radius >= pos.x && (wall.vec.intersects(dz) ) {
+			        // intersects the wall.. next check if it intersects any of the surface frames
+			        wall.surface.faces.some(function(face, i){
+			          // if we can pass through the wall at this point, we do not need to clamp
+			          if (face.y.a === 0 && face.x.intersects(dz)) {
+			            dz.a = pos.z = face.x.clamp(pos.z)
+			            dz.b = cam.z
+			            dz.normalize()
+			            return true
+			          }
+			        })
+			      }
+			      break
+			    case RIGHT:
+			      if (cam.x <= wall.edge - radius && wall.edge - radius <= pos.x && (wall.vec.contains(cam.z) || wall.vec.contains(pos.z)) ) {
+			        // intersects
+			      }
+			      break
+			  }
+      })
+*/
 
 			if (collision && ! base.noclip) {
 				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index b0344a1..26bf055 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -122,7 +122,8 @@
 		return collision
 	}
 
-	Room.prototype.collidesDisc = function(x,y,radius){
+	Room.prototype.collidesDisc = function(src, dest, radius){
+	  var x = dest.x, y = dest.z
 		var collision = 0, wall_collision, contains_x, contains_y
 		this.regions.forEach(function(r){
 			if (! r.sides) return
@@ -152,9 +153,6 @@
 			if (contains_y) {
 				collision |= wall_collision & LEFT_RIGHT
 			}
-//    if (bitcount(wall_collision) > 1) {
-//  				collision |= wall_collision
-// 		}
 		})
 		return collision
 	}
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 7f73e1b..e40c6ff 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -44,7 +44,7 @@ var MediaPlayer = FormView.extend({
 			this.unbind()
 		}
 		if (media.type == "image") {
-			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length) || (media.title == filenameFromUrl(media.url)) ) {
+			if ( ! media.description && (! media.title || media.title == filenameFromUrl(media.url)) ) {
 				this.hide()
 				return
 			}
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 0b5a1fe..7ffadb9 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -38,10 +38,12 @@ var views = module.exports = {
 		}
 		else if (req.isOwner || req.isCollaborator || req.isStaff) {
 			res.locals.opt.editing = true
-			res.render('editor')
+			res.render('editor', {
+        ogUrl: "http://vvalls.com/project/" + req.project.slug + "/",
+			})
 		}
 		else {
-			views.reader(req, res)
+			res.redirect("/project/" + req.project.slug + "/")
 		}
 	},
 
-- 
cgit v1.2.3-70-g09d2


From c0fe6750cc0462adbc2165ac7f8c9cf1e0aea925 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 30 Oct 2014 17:59:44 -0400
Subject: intersection test

---
 .../javascripts/rectangles/engine/rooms/mover.js   |  95 ++++++++++----
 .../assets/javascripts/vendor/canvasutilities.js   | 145 +++++++++++++++++++++
 public/assets/test/intersect.html                  | 132 +++++++++++++++++++
 3 files changed, 348 insertions(+), 24 deletions(-)
 create mode 100644 public/assets/javascripts/vendor/canvasutilities.js
 create mode 100644 public/assets/test/intersect.html

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 121ecec..8ce00fe 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -36,6 +36,18 @@ Rooms.mover = new function(){
 			// check if we've breached one of the walls.. clamp position if so
 			var collision = base.room.collidesDisc(cam, pos, radius)
 
+			if (collision && ! base.noclip) {
+				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
+				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
+				return
+			}
+
+			// in this case, we appear to have left the room..
+			// $(".face.active").removeClass("active")
+			Walls.clearBodyColor()
+			base.room = null
+		}
+
 /*
       var dz = new vec2( cam.z, pos.z )
       dz.normalize()
@@ -43,47 +55,82 @@ Rooms.mover = new function(){
       var dx = new vec2( cam.x, pos.x )
       dx.normalize()
 
+      // first check if the cam-pos movement intersects the wall.
+      // next check if it intersects any of the surface frames
+      // if we can pass through the wall at this point, we do not need to clamp.
+      // otherwise, get the distance along the cam-pos vector where we would hit the wall and clamp to it.
 			Walls.list.forEach(function(wall){
+			  var t = -1
 			  switch (wall.side) {
 			    case FRONT:
+			      if (cam.z >= wall.edge + radius && wall.edge + radius >= pos.z && wall.vec.intersects(dx) ) {
+			        t = check_intersection( front_back_intersection, cam, pos, dx, wall, radius )
+			      }
 			      break
 			    case BACK:
+			      // console.log(cam.z|0, wall.edge-radius, pos.z|0, wall.vec.intersects(dx))
+			      if (cam.z <= wall.edge - radius && wall.edge - radius <= pos.z && wall.vec.intersects(dx) ) {
+			        t = check_intersection( front_back_intersection, cam, pos, dx, wall, -radius )
+			        console.log(t)
+			      }
 			      break
 			    case LEFT:
-			      if (cam.x >= wall.edge + radius && wall.edge + radius >= pos.x && (wall.vec.intersects(dz) ) {
-			        // intersects the wall.. next check if it intersects any of the surface frames
-			        wall.surface.faces.some(function(face, i){
-			          // if we can pass through the wall at this point, we do not need to clamp
-			          if (face.y.a === 0 && face.x.intersects(dz)) {
-			            dz.a = pos.z = face.x.clamp(pos.z)
-			            dz.b = cam.z
-			            dz.normalize()
-			            return true
-			          }
-			        })
+			      if (cam.x >= wall.edge + radius && wall.edge + radius >= pos.x && wall.vec.intersects(dz) ) {
+			        t = check_intersection( left_right_intersection, cam, pos, dz, wall, radius )
 			      }
 			      break
 			    case RIGHT:
-			      if (cam.x <= wall.edge - radius && wall.edge - radius <= pos.x && (wall.vec.contains(cam.z) || wall.vec.contains(pos.z)) ) {
-			        // intersects
+			      if (cam.x <= wall.edge - radius && wall.edge - radius <= pos.x && wall.vec.intersects(dz) ) {
+			        t = check_intersection( left_right_intersection, cam, pos, dz, wall, -radius )
 			      }
 			      break
 			  }
+        if (0 <= t && t <= 1) {
+          pos.x = cam.x + (pos.x - cam.x) * t
+          pos.z = cam.z + (pos.z - cam.z) * t
+
+          dz = new vec2( cam.z, pos.z )
+          dz.normalize()
+
+          dx = new vec2( cam.x, pos.x )
+          dx.normalize()
+        }
       })
-*/
 
-			if (collision && ! base.noclip) {
-				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
-				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
-				return
-			}
+    function check_intersection(intersection_function, cam, pos, cam_pos_vector, wall, radius) {
+      var t = -1
+      wall.surface.faces.some(function(face, i){
+        if (face.y.a == 0 && face.x.intersects(cam_pos_vector)) {
+          t = intersection_function( cam, pos, wall, face, radius )
+          console.log(">>", t)
+          if (0 <= t && t <= 1) {
+            return true
+          }
+          else {
+            t = -1
+          }
+        }
+        return false
+      })
+      return t
+    }
+		function left_right_intersection (cam, pos, wall, face, radius) {
+      var perp_n = (face.x.a - face.x.b) * (wall.edge - cam.z + radius)
+      var perp_d = (face.x.a - face.x.b) * (pos.z - cam.z)
+      if (perp_d == 0) return Infinity
+      return perp_n / perp_d
+    }
+		function front_back_intersection (cam, pos, wall, face, radius) {
+		  // va.vx*vb.vy - va.vy*vb.vx
+      var perp_n = (face.x.b - face.x.a) * (wall.edge - cam.x + radius)
+      var perp_d = (face.x.b - face.x.a) * (pos.x - cam.x)
 
-			// in this case, we appear to have left the room..
-			// $(".face.active").removeClass("active")
-			Walls.clearBodyColor()
-			base.room = null
-		}
+      console.log((pos.x - cam.x), wall.edge - cam.x, radius)
 
+      if (perp_d == 0) return Infinity
+      return perp_n / perp_d
+    }
+*/
 		// collision test failed, so update position
 		cam.x = pos.x
 		cam.z = pos.z
diff --git a/public/assets/javascripts/vendor/canvasutilities.js b/public/assets/javascripts/vendor/canvasutilities.js
new file mode 100644
index 0000000..011ebb0
--- /dev/null
+++ b/public/assets/javascripts/vendor/canvasutilities.js
@@ -0,0 +1,145 @@
+var drawArrow = function(ctx, x1, y1, x2, y2, style, which, angle, d) {
+  'use strict';
+  // Ceason pointed to a problem when x1 or y1 were a string, and concatenation
+  // would happen instead of addition
+  if (typeof(x1) == 'string') x1 = parseInt(x1);
+  if (typeof(y1) == 'string') y1 = parseInt(y1);
+  if (typeof(x2) == 'string') x2 = parseInt(x2);
+  if (typeof(y2) == 'string') y2 = parseInt(y2);
+  style = typeof(style) != 'undefined' ? style : 3;
+  which = typeof(which) != 'undefined' ? which : 1; // end point gets arrow
+  angle = typeof(angle) != 'undefined' ? angle : Math.PI / 8;
+  d = typeof(d) != 'undefined' ? d : 10;
+  // default to using drawHead to draw the head, but if the style
+  // argument is a function, use it instead
+  var toDrawHead = typeof(style) != 'function' ? drawHead : style;
+
+  // For ends with arrow we actually want to stop before we get to the arrow
+  // so that wide lines won't put a flat end on the arrow.
+  //
+  var dist = Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1));
+  var ratio = (dist - d / 3) / dist;
+  var tox, toy, fromx, fromy;
+  if (which & 1) {
+    tox = Math.round(x1 + (x2 - x1) * ratio);
+    toy = Math.round(y1 + (y2 - y1) * ratio);
+  } else {
+    tox = x2;
+    toy = y2;
+  }
+  if (which & 2) {
+    fromx = x1 + (x2 - x1) * (1 - ratio);
+    fromy = y1 + (y2 - y1) * (1 - ratio);
+  } else {
+    fromx = x1;
+    fromy = y1;
+  }
+
+  // Draw the shaft of the arrow
+  ctx.beginPath();
+  ctx.moveTo(fromx, fromy);
+  ctx.lineTo(tox, toy);
+  ctx.stroke();
+
+  // calculate the angle of the line
+  var lineangle = Math.atan2(y2 - y1, x2 - x1);
+  // h is the line length of a side of the arrow head
+  var h = Math.abs(d / Math.cos(angle));
+
+  if (which & 1) { // handle far end arrow head
+    var angle1 = lineangle + Math.PI + angle;
+    var topx = x2 + Math.cos(angle1) * h;
+    var topy = y2 + Math.sin(angle1) * h;
+    var angle2 = lineangle + Math.PI - angle;
+    var botx = x2 + Math.cos(angle2) * h;
+    var boty = y2 + Math.sin(angle2) * h;
+    toDrawHead(ctx, topx, topy, x2, y2, botx, boty, style);
+  }
+  if (which & 2) { // handle near end arrow head
+    var angle1 = lineangle + angle;
+    var topx = x1 + Math.cos(angle1) * h;
+    var topy = y1 + Math.sin(angle1) * h;
+    var angle2 = lineangle - angle;
+    var botx = x1 + Math.cos(angle2) * h;
+    var boty = y1 + Math.sin(angle2) * h;
+    toDrawHead(ctx, topx, topy, x1, y1, botx, boty, style);
+  }
+}
+
+var drawHead = function(ctx, x0, y0, x1, y1, x2, y2, style) {
+  'use strict';
+  if (typeof(x0) == 'string') x0 = parseInt(x0);
+  if (typeof(y0) == 'string') y0 = parseInt(y0);
+  if (typeof(x1) == 'string') x1 = parseInt(x1);
+  if (typeof(y1) == 'string') y1 = parseInt(y1);
+  if (typeof(x2) == 'string') x2 = parseInt(x2);
+  if (typeof(y2) == 'string') y2 = parseInt(y2);
+  var radius = 3;
+  var twoPI = 2 * Math.PI;
+
+  // all cases do this.
+  ctx.save();
+  ctx.beginPath();
+  ctx.moveTo(x0, y0);
+  ctx.lineTo(x1, y1);
+  ctx.lineTo(x2, y2);
+  switch (style) {
+    case 0:
+      // curved filled, add the bottom as an arcTo curve and fill
+      var backdist = Math.sqrt(((x2 - x0) * (x2 - x0)) + ((y2 - y0) * (y2 - y0)));
+      ctx.arcTo(x1, y1, x0, y0, .55 * backdist);
+      ctx.fill();
+      break;
+    case 1:
+      // straight filled, add the bottom as a line and fill.
+      ctx.beginPath();
+      ctx.moveTo(x0, y0);
+      ctx.lineTo(x1, y1);
+      ctx.lineTo(x2, y2);
+      ctx.lineTo(x0, y0);
+      ctx.fill();
+      break;
+    case 2:
+      // unfilled head, just stroke.
+      ctx.stroke();
+      break;
+    case 3:
+      //filled head, add the bottom as a quadraticCurveTo curve and fill
+      var cpx = (x0 + x1 + x2) / 3;
+      var cpy = (y0 + y1 + y2) / 3;
+      ctx.quadraticCurveTo(cpx, cpy, x0, y0);
+      ctx.fill();
+      break;
+    case 4:
+      //filled head, add the bottom as a bezierCurveTo curve and fill
+      var cp1x, cp1y, cp2x, cp2y, backdist;
+      var shiftamt = 5;
+      if (x2 == x0) {
+        // Avoid a divide by zero if x2==x0
+        backdist = y2 - y0;
+        cp1x = (x1 + x0) / 2;
+        cp2x = (x1 + x0) / 2;
+        cp1y = y1 + backdist / shiftamt;
+        cp2y = y1 - backdist / shiftamt;
+      } else {
+        backdist = Math.sqrt(((x2 - x0) * (x2 - x0)) + ((y2 - y0) * (y2 - y0)));
+        var xback = (x0 + x2) / 2;
+        var yback = (y0 + y2) / 2;
+        var xmid = (xback + x1) / 2;
+        var ymid = (yback + y1) / 2;
+
+        var m = (y2 - y0) / (x2 - x0);
+        var dx = (backdist / (2 * Math.sqrt(m * m + 1))) / shiftamt;
+        var dy = m * dx;
+        cp1x = xmid - dx;
+        cp1y = ymid - dy;
+        cp2x = xmid + dx;
+        cp2y = ymid + dy;
+      }
+
+      ctx.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x0, y0);
+      ctx.fill();
+      break;
+  }
+  ctx.restore();
+}
diff --git a/public/assets/test/intersect.html b/public/assets/test/intersect.html
new file mode 100644
index 0000000..3f6d110
--- /dev/null
+++ b/public/assets/test/intersect.html
@@ -0,0 +1,132 @@
+<canvas id="canvas"></canvas>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
+<script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/models/vec2.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/vendor/canvasutilities.js"></script>
+<script>
+
+var ctx = canvas.getContext('2d')
+
+var w = canvas.width = 600
+var h = canvas.height = 400
+
+var vec_a = new Rect( 100, 120, 50, 100 )
+var vec_b = new Rect( 20, 200, 120, 120 )
+var vecs = [ vec_a, vec_b ]
+var points = [ vec_a.x, vec_a.y, vec_b.x, vec_b.y ]
+var r = 4
+
+var vec_c = new Rect()
+vec_c.x = vec_a.x
+vec_c.y = vec_b.x
+
+var intersect = new vec2 ()
+
+var dragging = false, dragging_a, dragging_b
+var delta = new vec2( 0, 0 )
+
+var mymouse = new mouse({
+  el: canvas,
+  down: function(e, cursor){
+    points.some(function(p){
+      if (-cursor.x.a > p.a - r && -cursor.x.a < p.a + r &&
+           cursor.y.a > p.b - r &&  cursor.y.a < p.b + r) {
+        dragging_a = p.a
+        dragging_b = p.b
+        dragging = p
+        return true
+      }
+    })
+  },
+  drag: function(e, cursor){
+    if (! dragging) return
+    delta = cursor.delta()
+    delta.a = - delta.a
+    dragging.a = dragging_a + delta.a
+    dragging.b = dragging_b + delta.b
+  },
+  up: function(e, cursor, new_cursor){
+    delta.zero()
+    dragging.dragging = false
+    dragging = false
+  },
+})
+
+function draw () {
+  ctx.fillStyle = "#fff"
+  ctx.fillRect(0,0,w,h)
+  
+  ctx.fillStyle = "#bbb"
+  points.forEach(drawPoint)
+  
+  drawLine(vec_a.x, vec_a.y, "#f00")
+  drawLine(vec_b.x, vec_b.y, "#00f")
+  drawLine(vec_a.x, vec_b.x, "#080")
+
+  var t = perp(vec_c, vec_b) / ( perp(vec_a, vec_b) || 0.0000001 )
+  intersect.a = vec_a.x.a + ( vec_a.y.a - vec_a.x.a ) * t
+  intersect.b = vec_a.x.b + ( vec_a.y.b - vec_a.x.b ) * t
+  
+  var collinear = is_collinear( intersect.b, vec_b )
+  var long_enough_to_intersect = 0 <= t && t <= 1
+  
+  if (long_enough_to_intersect && collinear) {
+    ctx.fillStyle = "#f00"
+  }
+  else if (is_on_line) {
+    ctx.fillStyle = "#0f0"
+  }
+  else {
+    ctx.fillStyle = "#000"
+  }
+  
+  drawPoint(intersect)
+}
+function drawLine (pa, pb, color) {
+  ctx.fillStyle = color
+  ctx.strokeStyle = color
+  var x1 = pa.a
+  var y1 = pa.b
+  var x2 = pb.a
+  var y2 = pb.b
+  drawArrow(ctx, x1, y1, x2, y2)
+}
+function drawPoint (p) {
+  var x = p.a - r
+  var y = p.b - r
+  ctx.fillRect(x, y, r*2, r*2)
+}
+function perp (va, vb) {
+	return (va.y.a - va.x.a) * (vb.y.b - vb.x.b) - (va.y.b - va.x.b) * (vb.y.a - vb.x.a)
+}
+function is_collinear (n, vec) {
+  var on_x, on_y
+  
+  if (vec.x.a < vec.y.a) {
+    on_x = vec.x.a <= n && n <= vec.y.a
+  }
+  else {
+    on_x = vec.x.a >= n && n >= vec.y.a
+  }
+  
+  if (vec.x.b < vec.y.b) {
+    on_y = vec.x.b <= n && n <= vec.y.b
+  }
+  else {
+    on_y = vec.x.b >= n && n >= vec.y.b
+  }
+  
+  return !! (on_x && on_y)
+}
+
+function animate(){
+  requestAnimationFrame(animate)
+  draw()
+}
+animate()
+
+</script>
-- 
cgit v1.2.3-70-g09d2


From a61ad3cea5b7a76777d594d1a6d960943a0e776f Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Fri, 31 Oct 2014 22:38:27 -0400
Subject: correctly intercepting walls in mover

---
 .../javascripts/rectangles/engine/rooms/mover.js   | 188 +++++++++++----------
 public/assets/test/intersect3.html                 |  10 +-
 2 files changed, 105 insertions(+), 93 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 8ce00fe..69e821f 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -4,6 +4,14 @@ Rooms.mover = new function(){
 	base.room = null
 	base.noclip = false
 
+	var cursor = base.cursor = new Rect (0,0,0,0)
+	var wall_vec = new Rect (0,0,0,0)
+	var intersect = new vec2(0,0)
+
+	var origins = new Rect()
+	origins.x = cursor.x
+	origins.y = wall_vec.x
+
 	base.init = function(){
 		base.bind()
 		base.update(scene.camera)
@@ -33,6 +41,14 @@ Rooms.mover = new function(){
 				return
 			}
 
+			var intersect = base.intersect(pos)
+			
+			if (intersect && ! base.noclip) {
+				cam.x = intersect.a
+				cam.z = intersect.b
+				return
+			}
+/*
 			// check if we've breached one of the walls.. clamp position if so
 			var collision = base.room.collidesDisc(cam, pos, radius)
 
@@ -41,96 +57,13 @@ Rooms.mover = new function(){
 				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
 				return
 			}
-
+*/
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
 			Walls.clearBodyColor()
 			base.room = null
 		}
 
-/*
-      var dz = new vec2( cam.z, pos.z )
-      dz.normalize()
-
-      var dx = new vec2( cam.x, pos.x )
-      dx.normalize()
-
-      // first check if the cam-pos movement intersects the wall.
-      // next check if it intersects any of the surface frames
-      // if we can pass through the wall at this point, we do not need to clamp.
-      // otherwise, get the distance along the cam-pos vector where we would hit the wall and clamp to it.
-			Walls.list.forEach(function(wall){
-			  var t = -1
-			  switch (wall.side) {
-			    case FRONT:
-			      if (cam.z >= wall.edge + radius && wall.edge + radius >= pos.z && wall.vec.intersects(dx) ) {
-			        t = check_intersection( front_back_intersection, cam, pos, dx, wall, radius )
-			      }
-			      break
-			    case BACK:
-			      // console.log(cam.z|0, wall.edge-radius, pos.z|0, wall.vec.intersects(dx))
-			      if (cam.z <= wall.edge - radius && wall.edge - radius <= pos.z && wall.vec.intersects(dx) ) {
-			        t = check_intersection( front_back_intersection, cam, pos, dx, wall, -radius )
-			        console.log(t)
-			      }
-			      break
-			    case LEFT:
-			      if (cam.x >= wall.edge + radius && wall.edge + radius >= pos.x && wall.vec.intersects(dz) ) {
-			        t = check_intersection( left_right_intersection, cam, pos, dz, wall, radius )
-			      }
-			      break
-			    case RIGHT:
-			      if (cam.x <= wall.edge - radius && wall.edge - radius <= pos.x && wall.vec.intersects(dz) ) {
-			        t = check_intersection( left_right_intersection, cam, pos, dz, wall, -radius )
-			      }
-			      break
-			  }
-        if (0 <= t && t <= 1) {
-          pos.x = cam.x + (pos.x - cam.x) * t
-          pos.z = cam.z + (pos.z - cam.z) * t
-
-          dz = new vec2( cam.z, pos.z )
-          dz.normalize()
-
-          dx = new vec2( cam.x, pos.x )
-          dx.normalize()
-        }
-      })
-
-    function check_intersection(intersection_function, cam, pos, cam_pos_vector, wall, radius) {
-      var t = -1
-      wall.surface.faces.some(function(face, i){
-        if (face.y.a == 0 && face.x.intersects(cam_pos_vector)) {
-          t = intersection_function( cam, pos, wall, face, radius )
-          console.log(">>", t)
-          if (0 <= t && t <= 1) {
-            return true
-          }
-          else {
-            t = -1
-          }
-        }
-        return false
-      })
-      return t
-    }
-		function left_right_intersection (cam, pos, wall, face, radius) {
-      var perp_n = (face.x.a - face.x.b) * (wall.edge - cam.z + radius)
-      var perp_d = (face.x.a - face.x.b) * (pos.z - cam.z)
-      if (perp_d == 0) return Infinity
-      return perp_n / perp_d
-    }
-		function front_back_intersection (cam, pos, wall, face, radius) {
-		  // va.vx*vb.vy - va.vy*vb.vx
-      var perp_n = (face.x.b - face.x.a) * (wall.edge - cam.x + radius)
-      var perp_d = (face.x.b - face.x.a) * (pos.x - cam.x)
-
-      console.log((pos.x - cam.x), wall.edge - cam.x, radius)
-
-      if (perp_d == 0) return Infinity
-      return perp_n / perp_d
-    }
-*/
 		// collision test failed, so update position
 		cam.x = pos.x
 		cam.z = pos.z
@@ -148,7 +81,92 @@ Rooms.mover = new function(){
 			}
       app.tube("change-room", { room: base.room })
 		}
-
 	}
+	base.intersect = function(pos){
+		var closest_intersect, t, min_t = 1
+		
+		cursor.x.a = cam.x
+		cursor.x.b = cam.z
+		cursor.y.a = pos.x
+		cursor.y.b = pos.z
+
+		var a = angle(cursor)
+		cursor.y.a += scene.camera.radius * cos(a)
+		cursor.y.b += scene.camera.radius * sin(a)
+
+		Walls.list.forEach(function(wall, i){
+			var actually_intersects, intersecting_face
+
+			if (wall.side & LEFT_RIGHT) {
+				wall_vec.x.a = wall.edge
+				wall_vec.x.b = wall.vec.a
+				wall_vec.y.a = wall.edge
+				wall_vec.y.b = wall.vec.b
+			}
+			else {
+				wall_vec.x.a = wall.vec.a
+				wall_vec.x.b = wall.edge
+				wall_vec.y.a = wall.vec.b
+				wall_vec.y.b = wall.edge
+			}
 
+			t = perp(origins, wall_vec) / ( perp(cursor, wall_vec) || 0.0000001 )
+			
+			if ( min_t < t || t < 0 || 1 < t ) return
+
+			intersect.a = cursor.x.a + ( cursor.y.a - cursor.x.a ) * t
+			intersect.b = cursor.x.b + ( cursor.y.b - cursor.x.b ) * t
+
+			if ( ! is_collinear( intersect, wall_vec ) ) return
+
+			if (wall.side & LEFT_RIGHT) {
+				intersecting_face = wall.surface.face_for_x(intersect.b)
+			}
+			else {
+				intersecting_face = wall.surface.face_for_x(intersect.a)
+			}
+			
+			actually_intersects = !! (intersecting_face && intersecting_face.y.a == 0)
+			if (actually_intersects) {
+				closest_intersect = intersect.clone()
+				min_t = t
+			}
+		})
+
+		if (min_t < 1) {
+			var a = angle(cursor)
+			closest_intersect.a -= scene.camera.radius * cos(a)
+			closest_intersect.b -= scene.camera.radius * sin(a)
+		}
+		return closest_intersect
+	}
+	function angle (va) {
+		return atan2(va.y.b - va.x.b, va.y.a - va.x.a)
+	}
+	function dot (va, vb) {
+		return (va.y.a - va.x.a) * (vb.y.a - vb.x.a) + (va.y.b - va.x.b) * (vb.y.b - vb.x.b)
+	}
+	function perp (va, vb) {
+		return (va.y.a - va.x.a) * (vb.y.b - vb.x.b) - (va.y.b - va.x.b) * (vb.y.a - vb.x.a)
+	}
+	function is_collinear (p, vec) {
+		var on_x, on_y
+		var pa = round(p.a), pb = round(p.b)
+			
+		if (vec.x.a < vec.y.a) {
+			on_x = vec.x.a <= pa && pa <= vec.y.a
+		}
+		else {
+			on_x = vec.x.a >= pa && pa >= vec.y.a
+		}
+	
+		if (vec.x.b < vec.y.b) {
+			on_y = vec.x.b <= pb && pb <= vec.y.b
+		}
+		else {
+			on_y = vec.x.b >= pb && pb >= vec.y.b
+		}
+		
+		return !! (on_x && on_y)
+	}
 }
diff --git a/public/assets/test/intersect3.html b/public/assets/test/intersect3.html
index e897e8a..1e2a1a4 100644
--- a/public/assets/test/intersect3.html
+++ b/public/assets/test/intersect3.html
@@ -167,12 +167,12 @@ function draw () {
     }
     
     drawPoint(intersect)
-    if (actually_intersects && intersecting_face && t < min_t) {
+    if (actually_intersects && t < min_t) {
     	min_t = t
       hud.innerHTML += t + "<br>"
       var clone = intersect.clone()
       clone.t = t
-    	closest_face = intersecting_face
+    	closest_intersect = intersecting_face
     	closest_intersect = clone
     }
   })
@@ -185,12 +185,6 @@ function draw () {
 		ctx.fillStyle = "#00f"
 		drawPoint(closest_intersect)
 		drawLine(cursor.x, closest_intersect, "#00f")
-  	// closest_face.vec
-  	
-    // get the closest intersect, i.e. the one with smallest t value
-    // get the angle of the cursor
-    // move the desired position to pos - 20px
-
   }
 }
 function drawLine (pa, pb, color, headless) {
-- 
cgit v1.2.3-70-g09d2


From 6b9cf0e41c4e0c09a715e59c162380b5fad42cba Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 3 Nov 2014 12:44:23 -0500
Subject: different collision algo for mobile movement

---
 .../javascripts/rectangles/engine/rooms/mover.js   | 179 +++++++++++++++------
 public/assets/test/intersect3.html                 |  19 ++-
 2 files changed, 147 insertions(+), 51 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 69e821f..5682be8 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -5,6 +5,7 @@ Rooms.mover = new function(){
 	base.noclip = false
 
 	var cursor = base.cursor = new Rect (0,0,0,0)
+	var cursor_copy = new Rect (0,0,0,0)
 	var wall_vec = new Rect (0,0,0,0)
 	var intersect = new vec2(0,0)
 
@@ -28,6 +29,7 @@ Rooms.mover = new function(){
 	}
 	
 	base.update = function(pos){
+    var intersect, collision, distance
 		var radius = scene.camera.radius
 		
 		cam.y = pos.y
@@ -41,23 +43,38 @@ Rooms.mover = new function(){
 				return
 			}
 
-			var intersect = base.intersect(pos)
+      distance = sqrt(pow(cam.x-pos.x, 2), pow(cam.z-pos.z, 2))
+      
+			// check if we've breached one of the walls.. clamp position if so.
+			// there are two algorithms for this now, ridiculously..
+			// - the first one is smoother, best for keyboard use
+			// but if the distance travelled is greater than the min. distance from the wall,
+			// then there is a possibility of ejection from the room. so is bad for phone/mousewheel.
 			
-			if (intersect && ! base.noclip) {
-				cam.x = intersect.a
-				cam.z = intersect.b
-				return
+			// - the second one determines fortuitously if we have breached any of the walls
+			// however it can get jumpy if you run into a wall.. thus it is best for devices like phone or mousewheel
+			// the benefit is you will never leave the room.
+			if (base.noclip) {
+			  // in no-clip mode we walk through walls.
 			}
-/*
-			// check if we've breached one of the walls.. clamp position if so
-			var collision = base.room.collidesDisc(cam, pos, radius)
+      else if (distance < radius) {
+        collision = base.room.collidesDisc(cam, pos, radius)
+
+        if (collision) {
+          cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
+          cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
+          return
+        }
+      }
+      else {
+        intersect = base.intersect(pos)
+        if (intersect) {
+          cam.x = intersect.a
+          cam.z = intersect.b
+          return
+        }
+      }
 
-			if (collision && ! base.noclip) {
-				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
-				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
-				return
-			}
-*/
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
 			Walls.clearBodyColor()
@@ -83,39 +100,30 @@ Rooms.mover = new function(){
 		}
 	}
 	base.intersect = function(pos){
-		var closest_intersect, t, min_t = 1
-		
-		cursor.x.a = cam.x
-		cursor.x.b = cam.z
-		cursor.y.a = pos.x
-		cursor.y.b = pos.z
+		var closest_intersect, closest_wall, new_t, wall_t, t, min_t = 1
 
-		var a = angle(cursor)
-		cursor.y.a += scene.camera.radius * cos(a)
-		cursor.y.b += scene.camera.radius * sin(a)
+		cursor_copy.x.a = cursor.x.a = cam.x
+		cursor_copy.x.b = cursor.x.b = cam.z
+		cursor_copy.y.a = cursor.y.a = pos.x
+		cursor_copy.y.b = cursor.y.b = pos.z
+
+    cursor_copy.extend_ends(scene.camera.radius)
+
+		origins.x = cursor_copy.x
+    origins.y = wall_vec.x
 
 		Walls.list.forEach(function(wall, i){
-			var actually_intersects, intersecting_face
+			var actually_intersects = false, intersecting_face
+
+      wall.get_points(wall_vec)
 
-			if (wall.side & LEFT_RIGHT) {
-				wall_vec.x.a = wall.edge
-				wall_vec.x.b = wall.vec.a
-				wall_vec.y.a = wall.edge
-				wall_vec.y.b = wall.vec.b
-			}
-			else {
-				wall_vec.x.a = wall.vec.a
-				wall_vec.x.b = wall.edge
-				wall_vec.y.a = wall.vec.b
-				wall_vec.y.b = wall.edge
-			}
 
-			t = perp(origins, wall_vec) / ( perp(cursor, wall_vec) || 0.0000001 )
+      t = perp(origins, wall_vec) / ( perp(cursor_copy, wall_vec) || 0.0000001 )
 			
 			if ( min_t < t || t < 0 || 1 < t ) return
 
-			intersect.a = cursor.x.a + ( cursor.y.a - cursor.x.a ) * t
-			intersect.b = cursor.x.b + ( cursor.y.b - cursor.x.b ) * t
+      intersect.a = cursor_copy.x.a + ( cursor_copy.y.a - cursor_copy.x.a ) * t
+      intersect.b = cursor_copy.x.b + ( cursor_copy.y.b - cursor_copy.x.b ) * t
 
 			if ( ! is_collinear( intersect, wall_vec ) ) return
 
@@ -128,24 +136,76 @@ Rooms.mover = new function(){
 			
 			actually_intersects = !! (intersecting_face && intersecting_face.y.a == 0)
 			if (actually_intersects) {
-				closest_intersect = intersect.clone()
+        closest_intersect = intersect.clone()
+        closest_wall = wall_vec.clone()
 				min_t = t
 			}
 		})
 
-		if (min_t < 1) {
-			var a = angle(cursor)
-			closest_intersect.a -= scene.camera.radius * cos(a)
-			closest_intersect.b -= scene.camera.radius * sin(a)
+		if (closest_intersect) {
+
+      var aw, len, dd
+      aw = angle(closest_wall)
+      wall_vec.assign(closest_wall)
+      wall_vec.x.a -= scene.camera.radius * sin(aw)
+      wall_vec.x.b += scene.camera.radius * cos(aw)
+      wall_vec.y.a -= scene.camera.radius * sin(aw)
+      wall_vec.y.b += scene.camera.radius * cos(aw)
+
+      origins.x = cursor.x
+      origins.y = wall_vec.x
+
+      new_t = perp(origins, wall_vec) / ( perp(cursor, wall_vec) || 0.0000001 )
+      wall_t = perp(origins, cursor) / ( perp(wall_vec, cursor) || 0.0000001 )
+
+      intersect.a = cursor.x.a + ( cursor.y.a - cursor.x.a ) * new_t
+      intersect.b = cursor.x.b + ( cursor.y.b - cursor.x.b ) * new_t
+    
+      // here compare len to the length of the wall in the direction we are travelling		
+      dd = dot2(diff(closest_wall), diff(cursor))
+      len = sqrt(dot(wall_vec, wall_vec))
+
+      if (dd > 0) {
+        len *= 1-abs(wall_t)
+      }
+      else {
+        len *= abs(wall_t)
+        aw += PI
+      }
+    
+      len = clamp(len, 0, (1-min_t) * sqrt(dot(cursor, cursor)))
+
+      intersect.a += len * cos(aw)
+      intersect.b += len * sin(aw)
+
+      wall_vec.normalize()
+      intersect.a = clamp(intersect.a, wall_vec.x.a, wall_vec.y.a)
+      intersect.b = clamp(intersect.b, wall_vec.x.b, wall_vec.y.b)
+
+      return intersect
+		}
+		else {
+		  return cursor.y
 		}
-		return closest_intersect
 	}
+  function diff (v) {
+    return new vec2(v.y.a - v.x.a, v.y.b - v.x.b)
+  }
 	function angle (va) {
 		return atan2(va.y.b - va.x.b, va.y.a - va.x.a)
 	}
-	function dot (va, vb) {
-		return (va.y.a - va.x.a) * (vb.y.a - vb.x.a) + (va.y.b - va.x.b) * (vb.y.b - vb.x.b)
-	}
+  function angle2 (pa, pb) {
+    return atan2(pb.b - pa.b, pb.a - pa.a)
+  }
+  function normal (va) {
+    return atan2(va.x.a - va.y.a, va.y.b - va.x.b)
+  }
+  function dot (va, vb) {
+    return (va.y.a - va.x.a) * (vb.y.a - vb.x.a) + (va.y.b - va.x.b) * (vb.y.b - vb.x.b)
+  }
+  function dot2 (pa, pb) {
+    return pa.a * pb.a + pa.b * pb.b
+  }
 	function perp (va, vb) {
 		return (va.y.a - va.x.a) * (vb.y.b - vb.x.b) - (va.y.b - va.x.b) * (vb.y.a - vb.x.a)
 	}
@@ -169,4 +229,27 @@ Rooms.mover = new function(){
 		
 		return !! (on_x && on_y)
 	}
+  cursor_copy.extend_ends = function(n){
+    var a = angle(this)
+    this.x.a -= n*cos(a)
+    this.x.b -= n*sin(a)
+    this.y.a += n*cos(a)
+    this.y.b += n*sin(a)
+    return this
+  }
+  wall_vec.normalize = function(){
+    var carry
+    if (this.x.a > this.y.a) {
+      console.log("SWAP X")
+      carry = this.x.a
+      this.x.a = this.y.a
+      this.y.a = carry
+    }
+    if (this.x.b > this.y.b) {
+      console.log("SWAP Y")
+      carry = this.x.b
+      this.x.b = this.y.b
+      this.y.b = carry
+    }
+  }
 }
diff --git a/public/assets/test/intersect3.html b/public/assets/test/intersect3.html
index ed81346..5440a76 100644
--- a/public/assets/test/intersect3.html
+++ b/public/assets/test/intersect3.html
@@ -217,8 +217,9 @@ function draw (time) {
 		end_of_ray.a += len * cos(aw)
 		end_of_ray.b += len * sin(aw)
 		
-// 		end_of_ray.a = clamp(end_of_ray.a, wall_vec.x.a, wall_vec.y.a)
-// 		end_of_ray.b = clamp(end_of_ray.b, wall_vec.x.b, wall_vec.y.b)
+		wall_vec.normalize()
+		end_of_ray.a = clamp(end_of_ray.a, wall_vec.x.a, wall_vec.y.a)
+		end_of_ray.b = clamp(end_of_ray.b, wall_vec.x.b, wall_vec.y.b)
 		
 		drawPoint(end_of_ray)
 		drawLine(closest_intersect2, end_of_ray, "#00f")
@@ -295,7 +296,19 @@ cursor.extend_ends = function(n){
 	clone.y.b += n*sin(a)
 	return clone
 }
-
+wall_vec.normalize = function(){
+  var carry
+  if (this.x.a > this.y.a) {
+    carry = this.x.a
+    this.x.a = this.y.a
+    this.y.a = carry
+  }
+  if (this.x.b > this.y.b) {
+    carry = this.x.b
+    this.x.b = this.y.b
+    this.y.b = carry
+  }
+}
 function animate(time){
   requestAnimationFrame(animate)
   draw(time)
-- 
cgit v1.2.3-70-g09d2


From 7e20e81927b4d52de2f54c0923c65869f4c253ee Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 3 Nov 2014 13:16:05 -0500
Subject: z

---
 public/assets/javascripts/rectangles/engine/rooms/mover.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/mover.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 5682be8..ac27aba 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -117,7 +117,6 @@ Rooms.mover = new function(){
 
       wall.get_points(wall_vec)
 
-
       t = perp(origins, wall_vec) / ( perp(cursor_copy, wall_vec) || 0.0000001 )
 			
 			if ( min_t < t || t < 0 || 1 < t ) return
@@ -240,13 +239,13 @@ Rooms.mover = new function(){
   wall_vec.normalize = function(){
     var carry
     if (this.x.a > this.y.a) {
-      console.log("SWAP X")
+//       console.log("SWAP X")
       carry = this.x.a
       this.x.a = this.y.a
       this.y.a = carry
     }
     if (this.x.b > this.y.b) {
-      console.log("SWAP Y")
+//       console.log("SWAP Y")
       carry = this.x.b
       this.x.b = this.y.b
       this.y.b = carry
-- 
cgit v1.2.3-70-g09d2