From 2d20fbe954289fc6c2b71d06533027c4544ff424 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sat, 8 Oct 2011 18:23:44 +0800
Subject: [PATCH 01/23] Views for CombinedCamera

---
 examples/canvas_camera_orthographic2.html | 50 +++++++++++++++-------
 src/extras/cameras/CombinedCamera.js      | 51 +++++++++++++++++++++++
 2 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/examples/canvas_camera_orthographic2.html b/examples/canvas_camera_orthographic2.html
index acc1457d..08d3f581 100644
--- a/examples/canvas_camera_orthographic2.html
+++ b/examples/canvas_camera_orthographic2.html
@@ -26,6 +26,40 @@
 		<script src="js/RequestAnimationFrame.js"></script>
 		<script src="js/Stats.js"></script>
 
+		<div style="position: absolute; top: 10px; width: 100%; text-align: center; ">
+			<a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - Combo Camera<br>
+			View: <a href="#" onclick="setOrthographic();return false;"> Orthographic</a> | 
+				<a href="#" onclick="setPerspective();return false;">Perspective</a><br>
+			Lens: <a href="#" onclick="setLens(12);return false;">12mm</a> | 
+				<a href="#" onclick="setLens(16);return false;">16mm</a> | 
+				<a href="#" onclick="setLens(24);return false;">24mm</a> | 
+				<a href="#" onclick="setLens(35);return false;">35mm</a> | 
+				<a href="#" onclick="setLens(50);return false;">50mm</a> | 
+				<a href="#" onclick="setLens(60);return false;">60mm</a> | 
+				<a href="#" onclick="setLens(85);return false;">85mm</a> | 
+				<a href="#" onclick="setLens(105);return false;">105mm</a><br>
+			Fov: <a href="#" onclick="setFov(30);return false;">30°</a> | 
+				<a href="#" onclick="setFov(50);return false;">50°</a> | 
+				<a href="#" onclick="setFov(70);return false;">70°</a> | 
+				<a href="#" onclick="setFov(100);return false;">100°</a><br>
+			Zoom: 0.5x |
+					1x |
+					2x |
+					
+				<br/>
+			Views: <a href="#" onclick="camera.toTopView();return false;">Top view</a> |
+				<a href="#" onclick="camera.toBottomView();return false;">Bottom view</a> |
+				<a href="#" onclick="camera.toLeftView();return false;">Left view</a> |
+				<a href="#" onclick="camera.toRightView();return false;">Right view</a> |
+				<a href="#" onclick="camera.toFrontView();return false;">Front view</a> |
+				<a href="#" onclick="camera.toBackView();return false;">Back view</a> |
+				
+				<br/>
+			<div id="fov"></div>
+		</div>
+			
+
+
 		<script>
 
 			var container, stats;
@@ -64,21 +98,7 @@
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				var info = document.createElement( 'div' );
-				info.style.position = 'absolute';
-				info.style.top = '10px';
-				info.style.width = '100%';
-				info.style.textAlign = 'center';
-				info.innerHTML = '<a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - Combo Camera' +
-				'<br/>View: <a href="#" onclick="setOrthographic();return false;"> Orthographic</a> | <a href="#" onclick="setPerspective();return false;">Perspective</a>' +
-				'<br/>Lens: <a href="#" onclick="setLens(12);return false;">12mm</a> | <a href="#" onclick="setLens(16);return false;">16mm</a> | <a href="#" onclick="setLens(24);return false;">24mm</a> | ' +
-				'<a href="#" onclick="setLens(35);return false;">35mm</a> | <a href="#" onclick="setLens(50);return false;">50mm</a> | <a href="#" onclick="setLens(60);return false;">60mm</a> |' +
-				' <a href="#" onclick="setLens(85);return false;">85mm</a> | <a href="#" onclick="setLens(105);return false;">105mm</a>' +
-				'<br/>Fov: <a href="#" onclick="setFov(30);return false;">30&deg;</a> | <a href="#" onclick="setFov(50);return false;">50&deg;</a> | <a href="#" onclick="setFov(70);return false;">70&deg;</a> | <a href="#" onclick="setFov(100);return false;">100&deg;</a> <br/><div id="fov"/>';
-				container.appendChild( info );
-
-
-				camera = new THREE.CombinedCamera( window.innerWidth, window.innerHeight, 70, 1, 1000, -1000, 1000, 1000 );
+				camera = new THREE.CombinedCamera( window.innerWidth /2, window.innerHeight/2, 70, 1, 1000, -1000, 1000, 1000 );
 
 				camera.position.x = 200;
 				camera.position.y = 100;
diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index d977e0e5..724ce356 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -27,6 +27,9 @@ THREE.CombinedCamera.prototype.toPerspective = function () {
 	this.near = this.cameraP.near;
 	this.far = this.cameraP.far;
 	this.projectionMatrix = this.cameraP.projectionMatrix;
+	
+	this.isPersepective = true;
+	this.isOrthographics = false;
 
 };
 
@@ -35,6 +38,9 @@ THREE.CombinedCamera.prototype.toOrthographic = function () {
 	this.near = this.cameraO.near;
 	this.far = this.cameraO.far;
 	this.projectionMatrix = this.cameraO.projectionMatrix;
+	
+	this.isPersepective = false;
+	this.isOrthographics = true;
 
 };
 
@@ -61,3 +67,48 @@ THREE.CombinedCamera.prototype.setLens = function(focalLength, framesize) {
 
 	return fov;
 };
+
+THREE.CombinedCamera.prototype.toFrontView = function() {
+	this.rotation.x = 0;
+	this.rotation.y = 0;
+	this.rotation.z = 0;
+	
+	//TODO: Better way to disable camera.lookAt()?
+	this.rotationAutoUpdate = false;
+};
+
+THREE.CombinedCamera.prototype.toBackView = function() {
+	this.rotation.x = 0;
+	this.rotation.y = Math.PI;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+	
+THREE.CombinedCamera.prototype.toLeftView = function() {
+	this.rotation.x = 0;
+	this.rotation.y = - Math.PI / 2;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+
+THREE.CombinedCamera.prototype.toRightView = function() {
+	this.rotation.x = 0;
+	this.rotation.y = Math.PI / 2;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+
+THREE.CombinedCamera.prototype.toTopView = function() {
+	this.rotation.x = - Math.PI / 2;
+	this.rotation.y = 0;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+
+THREE.CombinedCamera.prototype.toBottomView = function() {
+	this.rotation.x = Math.PI / 2;
+	this.rotation.y = 0;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+

From a2c8a2e0b485e7f1281fd6d0c2e1204602d5d181 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 9 Oct 2011 00:09:37 +0800
Subject: [PATCH 02/23] added zoom + 6 views for CombinedCamera

---
 examples/canvas_camera_orthographic2.html |  6 +--
 src/extras/cameras/CombinedCamera.js      | 50 +++++++++++++++++++----
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/examples/canvas_camera_orthographic2.html b/examples/canvas_camera_orthographic2.html
index 08d3f581..6ffe12f9 100644
--- a/examples/canvas_camera_orthographic2.html
+++ b/examples/canvas_camera_orthographic2.html
@@ -42,9 +42,9 @@
 				<a href="#" onclick="setFov(50);return false;">50°</a> | 
 				<a href="#" onclick="setFov(70);return false;">70°</a> | 
 				<a href="#" onclick="setFov(100);return false;">100°</a><br>
-			Zoom: 0.5x |
-					1x |
-					2x |
+			Zoom: <a href="#" onclick="camera.setZoom(0.5);return false;">0.5x</a> |
+					<a href="#" onclick="camera.setZoom(1);return false;">1x</a> |
+					<a href="#" onclick="camera.setZoom(2);return false;">2x</a> |
 					
 				<br/>
 			Views: <a href="#" onclick="camera.toTopView();return false;">Top view</a> |
diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index 724ce356..0989a8bc 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -11,11 +11,23 @@ THREE.CombinedCamera = function ( width, height, fov, near, far, orthonear, orth
 
 	THREE.Camera.call( this );
 
+	this.fov = fov;
+	
+	this.left = -width / 2;
+	this.right = width / 2
+	this.top = height / 2;
+	this.bottom = -height / 2;
+	
 	// We could also handle the projectionMatrix internally, but just wanted to test nested camera objects
 	this.cameraO = new THREE.OrthographicCamera( width / - 2, width / 2, height / 2, height / - 2, 	orthonear, orthofar );
 	this.cameraP = new THREE.PerspectiveCamera( fov, width/height, near, far );
+	console.log(this.cameraO);
 
+	this.zoom = 1;
+	
 	this.toPerspective();
+	
+	
 
 };
 
@@ -26,28 +38,36 @@ THREE.CombinedCamera.prototype.toPerspective = function () {
 
 	this.near = this.cameraP.near;
 	this.far = this.cameraP.far;
+	this.cameraP.fov =  this.fov / this.zoom ;
+	this.cameraP.updateProjectionMatrix();
 	this.projectionMatrix = this.cameraP.projectionMatrix;
 	
-	this.isPersepective = true;
-	this.isOrthographics = false;
+	this.inPersepectiveMode = true;
+	this.inOrthographicMode = false;
 
 };
 
 THREE.CombinedCamera.prototype.toOrthographic = function () {
 
+	this.cameraO.left = this.left / this.zoom;
+	this.cameraO.right = this.right / this.zoom;
+	this.cameraO.top = this.top / this.zoom;
+	this.cameraO.bottom = this.bottom / this.zoom;
+	
+	this.cameraO.updateProjectionMatrix();
+
 	this.near = this.cameraO.near;
 	this.far = this.cameraO.far;
 	this.projectionMatrix = this.cameraO.projectionMatrix;
 	
-	this.isPersepective = false;
-	this.isOrthographics = true;
+	this.inPersepectiveMode = false;
+	this.inOrthographicMode = true;
 
 };
 
-THREE.CombinedCamera.prototype.setFov = function(fov) {
-
-	this.cameraP.fov = fov;
-	this.cameraP.updateProjectionMatrix();
+THREE.CombinedCamera.prototype.setFov = function(fov) {	
+	this.fov = fov;
+	
 	this.toPerspective();
 
 };
@@ -68,6 +88,20 @@ THREE.CombinedCamera.prototype.setLens = function(focalLength, framesize) {
 	return fov;
 };
 
+
+THREE.CombinedCamera.prototype.setZoom = function(zoom) {
+
+	this.zoom = zoom;
+	
+	if (this.inPersepectiveMode) {
+		this.toPerspective();
+	} else {
+		this.toOrthographic();
+	}
+	
+
+};
+
 THREE.CombinedCamera.prototype.toFrontView = function() {
 	this.rotation.x = 0;
 	this.rotation.y = 0;

From ef1a6785d2189372543b9f02b480e9118c94d618 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 9 Oct 2011 10:38:22 +0800
Subject: [PATCH 03/23] Combined Camera now tries to use Perspective\'s average
 viewing frustrum for switching to Orthographic view

---
 examples/canvas_camera_orthographic2.html |  2 +-
 src/extras/cameras/CombinedCamera.js      | 44 ++++++++++++++++++++---
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/examples/canvas_camera_orthographic2.html b/examples/canvas_camera_orthographic2.html
index 6ffe12f9..e935a894 100644
--- a/examples/canvas_camera_orthographic2.html
+++ b/examples/canvas_camera_orthographic2.html
@@ -53,7 +53,7 @@
 				<a href="#" onclick="camera.toRightView();return false;">Right view</a> |
 				<a href="#" onclick="camera.toFrontView();return false;">Front view</a> |
 				<a href="#" onclick="camera.toBackView();return false;">Back view</a> |
-				
+				<a href="#" onclick="camera.rotationAutoUpdate = true;return false;">Look at Scene</a>
 				<br/>
 			<div id="fov"></div>
 		</div>
diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index 0989a8bc..198a25b2 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -21,13 +21,16 @@ THREE.CombinedCamera = function ( width, height, fov, near, far, orthonear, orth
 	// We could also handle the projectionMatrix internally, but just wanted to test nested camera objects
 	this.cameraO = new THREE.OrthographicCamera( width / - 2, width / 2, height / 2, height / - 2, 	orthonear, orthofar );
 	this.cameraP = new THREE.PerspectiveCamera( fov, width/height, near, far );
-	console.log(this.cameraO);
 
 	this.zoom = 1;
 	
 	this.toPerspective();
 	
 	
+	var aspect = width/height;
+	
+	
+
 
 };
 
@@ -49,10 +52,41 @@ THREE.CombinedCamera.prototype.toPerspective = function () {
 
 THREE.CombinedCamera.prototype.toOrthographic = function () {
 
-	this.cameraO.left = this.left / this.zoom;
-	this.cameraO.right = this.right / this.zoom;
-	this.cameraO.top = this.top / this.zoom;
-	this.cameraO.bottom = this.bottom / this.zoom;
+	// Orthographic from Perspective
+	var fov = this.fov / this.zoom;
+	var aspect = this.cameraP.aspect;
+	var near = this.cameraP.near;
+	var far = this.cameraP.far;
+	
+	
+	var nearHalfHeight = Math.tan( fov / 2 ) * near;
+	var nearPlaneHeight = 2 * nearHalfHeight;
+	var nearPlaneWidth = nearPlaneHeight * aspect;
+	var nearHalfWidth = nearPlaneWidth / 2;
+	
+	var farHalfHeight = Math.tan( fov / 2 ) * far;
+	var farPlaneHeight = 2 * farHalfHeight;
+	var farPlaneWidth = farPlaneHeight * aspect;
+	var farHalfWidth = farPlaneWidth / 2;
+	
+	var averageHalfWidth = Math.abs(nearHalfWidth + farHalfWidth) / 2;
+	var averageHalfHeight = Math.abs(nearHalfHeight + farHalfHeight) / 2;
+	
+	
+	this.cameraO.left = -averageHalfWidth;
+	this.cameraO.right = averageHalfWidth;
+	this.cameraO.top = averageHalfHeight;
+	this.cameraO.bottom = -averageHalfHeight;
+	
+	// this.cameraO.left = -farHalfWidth;
+	// this.cameraO.right = farHalfWidth;
+	// this.cameraO.top = farHalfHeight;
+	// this.cameraO.bottom = -farHalfHeight;
+
+	// this.cameraO.left = this.left / this.zoom;
+	// this.cameraO.right = this.right / this.zoom;
+	// this.cameraO.top = this.top / this.zoom;
+	// this.cameraO.bottom = this.bottom / this.zoom;
 	
 	this.cameraO.updateProjectionMatrix();
 

From 785ac754e885ba37520c70b6a4b55cc6c6ed977c Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 9 Oct 2011 10:53:24 +0800
Subject: [PATCH 04/23] Adding WaltHead back to subdivision example

---
 examples/webgl_geometry_subdivison.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/examples/webgl_geometry_subdivison.html b/examples/webgl_geometry_subdivison.html
index 2e9b4b07..a728a5b6 100644
--- a/examples/webgl_geometry_subdivison.html
+++ b/examples/webgl_geometry_subdivison.html
@@ -72,6 +72,15 @@
 				materials.push( [ new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, wireframe: false } ) ] );
 
 			}
+			
+			var loader = new THREE.JSONLoader();
+			loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
+
+				THREE.WaltHead = function() {
+					return geometry;
+				};
+
+			} );
 
 			var geometriesParams = [
 
@@ -87,7 +96,8 @@
 										font: "helvetiker"
 
 									}]},
-				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] }
+				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] },
+				{type: 'WaltHead', args: [ ], scale: 6 }
 
 			];
 

From 0f48597f9709b8b673e179ee62062adc030fc1b4 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Mon, 10 Oct 2011 11:19:58 +0800
Subject: [PATCH 05/23] cleaner way of doing perspective->orthographic

---
 src/extras/cameras/CombinedCamera.js | 29 +++++++++++++---------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index 198a25b2..a399062d 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -53,30 +53,27 @@ THREE.CombinedCamera.prototype.toPerspective = function () {
 THREE.CombinedCamera.prototype.toOrthographic = function () {
 
 	// Orthographic from Perspective
-	var fov = this.fov / this.zoom;
+	var fov = this.fov;
 	var aspect = this.cameraP.aspect;
 	var near = this.cameraP.near;
 	var far = this.cameraP.far;
 	
 	
-	var nearHalfHeight = Math.tan( fov / 2 ) * near;
-	var nearPlaneHeight = 2 * nearHalfHeight;
-	var nearPlaneWidth = nearPlaneHeight * aspect;
-	var nearHalfWidth = nearPlaneWidth / 2;
+	// Just pretend we want the mid plane of the viewing frustum
+	var hyperfocus = ( near + far ) / 2; 
 	
-	var farHalfHeight = Math.tan( fov / 2 ) * far;
-	var farPlaneHeight = 2 * farHalfHeight;
-	var farPlaneWidth = farPlaneHeight * aspect;
-	var farHalfWidth = farPlaneWidth / 2;
+	var halfHeight = Math.tan( fov / 2 ) * hyperfocus;
+	var planeHeight = 2 * halfHeight;
+	var planeWidth = planeHeight * aspect;
+	var halfWidth = planeWidth / 2;
 	
-	var averageHalfWidth = Math.abs(nearHalfWidth + farHalfWidth) / 2;
-	var averageHalfHeight = Math.abs(nearHalfHeight + farHalfHeight) / 2;
+	halfHeight /= this.zoom;
+	halfWidth /= this.zoom;
 	
-	
-	this.cameraO.left = -averageHalfWidth;
-	this.cameraO.right = averageHalfWidth;
-	this.cameraO.top = averageHalfHeight;
-	this.cameraO.bottom = -averageHalfHeight;
+	this.cameraO.left = -halfWidth;
+	this.cameraO.right = halfWidth;
+	this.cameraO.top = halfHeight;
+	this.cameraO.bottom = -halfHeight;
 	
 	// this.cameraO.left = -farHalfWidth;
 	// this.cameraO.right = farHalfWidth;

From ed3cb6613cd63e9c5a5a33235d8e4d5a6e492a9d Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Mon, 10 Oct 2011 22:52:57 +0800
Subject: [PATCH 06/23] Update Subdivision model loading

---
 examples/webgl_geometry_subdivison.html | 33 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/examples/webgl_geometry_subdivison.html b/examples/webgl_geometry_subdivison.html
index a728a5b6..75c907c1 100644
--- a/examples/webgl_geometry_subdivison.html
+++ b/examples/webgl_geometry_subdivison.html
@@ -73,14 +73,7 @@
 
 			}
 			
-			var loader = new THREE.JSONLoader();
-			loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
-
-				THREE.WaltHead = function() {
-					return geometry;
-				};
-
-			} );
+			
 
 			var geometriesParams = [
 
@@ -96,10 +89,24 @@
 										font: "helvetiker"
 
 									}]},
-				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] },
-				{type: 'WaltHead', args: [ ], scale: 6 }
+				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] }
+				
 
 			];
+			
+			if (location.protocol !== "file:") {
+				var loader = new THREE.JSONLoader();
+				loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
+			
+					geometriesParams.push({type: 'WaltHead', args: [ ], scale: 6 });
+				
+					THREE.WaltHead = function() {
+						return geometry;
+					};
+			
+				} );
+			
+			}
 
 
 			var info;
@@ -398,7 +405,11 @@
 
 				group.rotation.x = cube.rotation.x += ( targetXRotation - cube.rotation.x ) * 0.05;
 				group.rotation.y = cube.rotation.y += ( targetYRotation - cube.rotation.y ) * 0.05;
-
+				
+				cube.updateMatrixWorld();
+				group.updateMatrixWorld();
+				
+				
 				renderer.render( scene, camera );
 
 			}

From 36089d0251634a325b4c5f16e4d85d673e442622 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Tue, 11 Oct 2011 00:09:24 +0800
Subject: [PATCH 07/23] Fixed sharp corners for Subdivision Modifier

---
 src/extras/modifiers/SubdivisionModifier.js | 186 ++++++++++++++------
 1 file changed, 129 insertions(+), 57 deletions(-)

diff --git a/src/extras/modifiers/SubdivisionModifier.js b/src/extras/modifiers/SubdivisionModifier.js
index 151d78c0..5ee7de5b 100644
--- a/src/extras/modifiers/SubdivisionModifier.js
+++ b/src/extras/modifiers/SubdivisionModifier.js
@@ -11,6 +11,15 @@
  *	Readings: 
  *		http://en.wikipedia.org/wiki/Catmull%E2%80%93Clark_subdivision_surface
  *		http://www.rorydriscoll.com/2008/08/01/catmull-clark-subdivision-the-basics/
+ *		http://xrt.wikidot.com/blog:31
+ *		"Subdivision Surfaces in Character Animation"
+ *
+ *	Supports:
+ *		Closed and Open geometries.
+ *
+ *	TODO: 
+ *		crease vertex and "semi-sharp" features
+ *		selective subdivision
  */
 
 THREE.SubdivisionModifier = function( subdivisions ) {
@@ -186,6 +195,8 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		
 	var facePoints = [], edgePoints = {};
 	
+	var sharpEdges = {}, sharpVertices = [], sharpFaces = [];
+	
 	var uvForVertices = [];
 	
 	// Step 1
@@ -253,6 +264,80 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 	var edgeCount = 0;
 	var originalVerticesLength = originalPoints.length;
 	var edgeVertex, edgeVertexA, edgeVertexB;
+	
+	////
+	
+	var vertexEdgeMap = {};
+	var vertexFaceMap = {};
+	
+	var addVertexEdgeMap = function(vertex, edge) {
+		if (vertexEdgeMap[vertex]===undefined) {
+			vertexEdgeMap[vertex] = [];
+		}
+		
+		vertexEdgeMap[vertex].push(edge);
+	};
+	
+	var addVertexFaceMap = function(vertex, face, edge) {
+		if (vertexFaceMap[vertex]===undefined) {
+			vertexFaceMap[vertex] = {};
+		}
+		
+		//vertexFaceMap[vertex][face] = edge;
+		vertexFaceMap[vertex][face] = null;
+	};
+	
+	// Prepares vertexEdgeMap and vertexFaceMap
+	for (i in vfMap) { // This is for every edge
+		edge = vfMap[i];
+		
+		edgeVertex = i.split('_');
+		edgeVertexA = edgeVertex[0];
+		edgeVertexB = edgeVertex[1];
+		
+		// Maps an edgeVertex to connecting edges
+		addVertexEdgeMap(edgeVertexA, [edgeVertexA, edgeVertexB] );
+		addVertexEdgeMap(edgeVertexB, [edgeVertexA, edgeVertexB] );
+		
+		
+		// faceIndexA = edge[0]; // face index a
+		// faceIndexB = edge[1]; // face index b
+		// 
+		// // Add connecting faces for edge
+		// addVertexFaceMap(edgeVertexA, faceIndexA);
+		// addVertexFaceMap(edgeVertexB, faceIndexA);
+		// 
+		// 
+		// if (faceIndexB) {
+		// 	addVertexFaceMap(edgeVertexA, faceIndexB);
+		// 	addVertexFaceMap(edgeVertexB, faceIndexB);
+		// } else {
+		// 	addVertexFaceMap(edgeVertexA, faceIndexA);
+		// 	addVertexFaceMap(edgeVertexB, faceIndexA);
+		// }
+		
+		for (j=0,jl=edge.length;j<jl;j++) {
+			face = edge[j];
+			
+			addVertexFaceMap(edgeVertexA, face, i);
+			addVertexFaceMap(edgeVertexB, face, i);
+		}
+		
+		if (edge.length < 2) {
+			// edge is "sharp";
+			sharpEdges[i] = true;
+			sharpVertices[edgeVertexA] = true;
+			sharpVertices[edgeVertexB] = true;
+			
+		}
+		
+	}
+	
+	
+	
+	//console.log('vertexEdgeMap',vertexEdgeMap, 'vertexFaceMap', vertexFaceMap);
+	
+	
 	for (i in vfMap) {
 		edge = vfMap[i];
 		
@@ -268,14 +353,17 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		
 		//console.log(i, faceIndexB,facePoints[faceIndexB]);
 		
-		if (edge.length!=2) {
+		if (sharpEdges[i]) {
 			//console.log('warning, ', i, 'edge has only 1 connecting face', edge);
 			
+			// For a sharp edge, average the edge end points.
 			avg.addSelf(originalPoints[edgeVertexA].position);
 			avg.addSelf(originalPoints[edgeVertexB].position);
 			
 			avg.multiplyScalar(0.5);
 			
+			sharpVertices[newPoints.length] = true;
+			
 		} else {
 		
 			avg.addSelf(facePoints[faceIndexA]);
@@ -289,6 +377,7 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		}
 		
 		edgePoints[i] = originalVerticesLength + originalFaces.length + edgeCount;
+		//console.log(edgePoints[i], newPoints.length);
 		
 		newPoints.push( new THREE.Vertex(avg) );
 	
@@ -318,6 +407,14 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 	
 	var hashAB, hashBC, hashCD, hashDA, hashCA;
 	
+	var abc123 = ['123', '12', '2', '23'];
+	var bca123 = ['123', '23', '3', '31'];
+	var cab123 = ['123', '31', '1', '12'];
+	var abc1234 = ['1234', '12', '2', '23'];
+	var bcd1234 = ['1234', '23', '3', '34'];
+	var cda1234 = ['1234', '34', '4', '41'];
+	var dab1234 = ['1234', '41', '1', '12'];
+	
 	
 	for (i=0, il = facePoints.length; i<il ;i++) { // for every face
 		facePt = facePoints[i];
@@ -332,9 +429,9 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 			hashBC = edge_hash( face.b, face.c );
 			hashCA = edge_hash( face.c, face.a );
 			
-			f4( currentVerticeIndex, edgePoints[hashAB], face.b, edgePoints[hashBC], face, ['123', '12', '2', '23'] );
-			f4( currentVerticeIndex, edgePoints[hashBC], face.c, edgePoints[hashCA], face, ['123', '23', '3', '31'] );
-			f4( currentVerticeIndex, edgePoints[hashCA], face.a, edgePoints[hashAB], face, ['123', '31', '1', '12'] );
+			f4( currentVerticeIndex, edgePoints[hashAB], face.b, edgePoints[hashBC], face, abc123 );
+			f4( currentVerticeIndex, edgePoints[hashBC], face.c, edgePoints[hashCA], face, bca123 );
+			f4( currentVerticeIndex, edgePoints[hashCA], face.a, edgePoints[hashAB], face, cab123 );
 			
 		} else if ( face instanceof THREE.Face4 ) {
 			// create 4 face4s
@@ -344,10 +441,10 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 			hashCD = edge_hash( face.c, face.d );
 			hashDA = edge_hash( face.d, face.a );
 			
-			f4( currentVerticeIndex, edgePoints[hashAB], face.b, edgePoints[hashBC], face, ['1234', '12', '2', '23']  );
-			f4( currentVerticeIndex, edgePoints[hashBC], face.c, edgePoints[hashCD], face, ['1234', '23', '3', '34']  );
-			f4( currentVerticeIndex, edgePoints[hashCD], face.d, edgePoints[hashDA], face, ['1234', '34', '4', '41']  );
-			f4( currentVerticeIndex, edgePoints[hashDA], face.a, edgePoints[hashAB], face, ['1234', '41', '1', '12']  );
+			f4( currentVerticeIndex, edgePoints[hashAB], face.b, edgePoints[hashBC], face, abc1234 );
+			f4( currentVerticeIndex, edgePoints[hashBC], face.c, edgePoints[hashCD], face, bcd1234 );
+			f4( currentVerticeIndex, edgePoints[hashCD], face.d, edgePoints[hashDA], face, cda1234 );
+			f4( currentVerticeIndex, edgePoints[hashDA], face.a, edgePoints[hashAB], face, dab1234  );
 
 				
 		} else {
@@ -367,53 +464,7 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 	//		and take the average R of all n edge midpoints for edges touching P, 
 	//		where each edge midpoint is the average of its two endpoint vertices. 
 	//	Move each original point to the point
-	
-	
-	
-	var vertexEdgeMap = {};
-	var vertexFaceMap = {};
-	
-	var addVertexEdgeMap = function(vertex, edge) {
-		if (vertexEdgeMap[vertex]===undefined) {
-			vertexEdgeMap[vertex] = [];
-		}
-		
-		vertexEdgeMap[vertex].push(edge);
-	};
-	
-	var addVertexFaceMap = function(vertex, face) {
-		if (vertexFaceMap[vertex]===undefined) {
-			vertexFaceMap[vertex] = {};
-		}
-		
-		vertexFaceMap[vertex][face] = null;
-	};
-	
-	// Prepares vertexEdgeMap and vertexFaceMap
-	for (i in vfMap) { // This is for every edge
-		edge = vfMap[i];
-		
-		edgeVertex = i.split('_');
-		edgeVertexA = edgeVertex[0];
-		edgeVertexB = edgeVertex[1];
-		
-		addVertexEdgeMap(edgeVertexA, [edgeVertexA, edgeVertexB] );
-		addVertexEdgeMap(edgeVertexB, [edgeVertexA, edgeVertexB] );
-		
-		faceIndexA = edge[0]; // face index a
-		faceIndexB = edge[1]; // face index b
-		
-		addVertexFaceMap(edgeVertexA, faceIndexA);
-		if (faceIndexB) addVertexFaceMap(edgeVertexA, faceIndexB);
-		else addVertexFaceMap(edgeVertexA, faceIndexA);
-		
-		addVertexFaceMap(edgeVertexB, faceIndexA);
-		if (faceIndexB) addVertexFaceMap(edgeVertexB, faceIndexB);
-		else addVertexFaceMap(edgeVertexB, faceIndexA);
-		
-	}
-	
-	//console.log('vertexEdgeMap',vertexEdgeMap, 'vertexFaceMap', vertexFaceMap);
+
 	
 	var F = new THREE.Vector3();
 	var R = new THREE.Vector3();
@@ -430,15 +481,36 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		
 		var f =0;
 		for (j in vertexFaceMap[i]) {
-			
 			F.addSelf(facePoints[j]);
 			f++;
 		}
 		
-		F.divideScalar(f);
+		var sharpEdgeCount = 0;
 		
 		n = vertexEdgeMap[i].length;
 		
+		for (j=0;j<n;j++) {
+			if (
+				sharpEdges[
+					edge_hash(vertexEdgeMap[i][j][0],vertexEdgeMap[i][j][1])
+				]) {
+					sharpEdgeCount++;
+				}
+		}
+		
+		if ( sharpEdgeCount==2 ) {
+			continue;
+			// Do not move vertex if there's 2 connecting sharp edges.
+		}
+		
+		if (sharpEdgeCount>2) {
+			
+		}
+		
+		F.divideScalar(f);
+		
+		
+		
 		for (j=0; j<n;j++) {
 			edge = vertexEdgeMap[i][j];
 			var midPt = originalPoints[edge[0]].position.clone().addSelf(originalPoints[edge[1]].position).divideScalar(2);

From 01d8572207d3a624b747652e717ef4db0431bc3e Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Tue, 11 Oct 2011 00:12:59 +0800
Subject: [PATCH 08/23] fix subdivision example

---
 examples/webgl_geometry_subdivison.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/webgl_geometry_subdivison.html b/examples/webgl_geometry_subdivison.html
index 75c907c1..97b55b70 100644
--- a/examples/webgl_geometry_subdivison.html
+++ b/examples/webgl_geometry_subdivison.html
@@ -406,10 +406,6 @@
 				group.rotation.x = cube.rotation.x += ( targetXRotation - cube.rotation.x ) * 0.05;
 				group.rotation.y = cube.rotation.y += ( targetYRotation - cube.rotation.y ) * 0.05;
 				
-				cube.updateMatrixWorld();
-				group.updateMatrixWorld();
-				
-				
 				renderer.render( scene, camera );
 
 			}

From 4e97d195b0fac50b839b2d6a59676a9a2807346f Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Fri, 14 Oct 2011 01:37:14 +0800
Subject: [PATCH 09/23] Added ScaleGeometry and added Monkey Head + more
 geometries to examples

---
 examples/webgl_geometry_subdivison.html     | 45 ++++++++++++++++-----
 src/extras/modifiers/ScaleModifier.js       | 28 +++++++++++++
 src/extras/modifiers/SubdivisionModifier.js |  2 +-
 utils/build.py                              |  1 +
 4 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 src/extras/modifiers/ScaleModifier.js

diff --git a/examples/webgl_geometry_subdivison.html b/examples/webgl_geometry_subdivison.html
index 97b55b70..cc1d072f 100644
--- a/examples/webgl_geometry_subdivison.html
+++ b/examples/webgl_geometry_subdivison.html
@@ -25,6 +25,7 @@
 		<script src="../src/extras/geometries/CylinderGeometry.js"></script>
 		<script src="../src/extras/geometries/TorusGeometry.js"></script>
 		<script src="../src/extras/modifiers/SubdivisionModifier.js"></script>
+		<script src="../src/extras/modifiers/ScaleModifier.js"></script>
 
 		<script src="fonts/helvetiker_regular.typeface.js"></script>
 
@@ -79,9 +80,17 @@
 
 				{type: 'CubeGeometry', args: [ 200, 200, 200, 2, 2, 2, materials ] },
 				{type: 'TorusGeometry', args: [ 100, 60, 4, 8, Math.PI*2 ] },
-				{type: 'SphereGeometry', args: [ 100, 3, 3 ] },
-				{type: 'IcosahedronGeometry', args: [ 1 ], scale: 200 },
+				{type: 'TorusKnotGeometry', args: [  ], scale:0.25, meshScale:4 },
+				{type: 'SphereGeometry', args: [ 100, 3, 3 ], meshScale:2 },
+				{type: 'IcosahedronGeometry', args: [ 1 ], scale: 100, meshScale:2 },
 				{type: 'CylinderGeometry', args: [ 25, 75, 200, 8, 3 ]} ,
+				{type: 'OctahedronGeometry', args: [200, 0], meshScale:2 },
+				{type: 'LatheGeometry', args: [ [
+					new THREE.Vector3(0,0,0), 
+					new THREE.Vector3(0,50,50),
+					new THREE.Vector3(0,0,100), 
+					new THREE.Vector3(0,50,150),
+					new THREE.Vector3(0,0,200) ] ]},
 				{type: 'TextGeometry', args: ['&', {
 										size: 200,
 										height: 50,
@@ -91,17 +100,27 @@
 									}]},
 				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] }
 				
-
 			];
 			
 			if (location.protocol !== "file:") {
 				var loader = new THREE.JSONLoader();
 				loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
 			
-					geometriesParams.push({type: 'WaltHead', args: [ ], scale: 6 });
+					geometriesParams.push({type: 'WaltHead', args: [ ], meshScale: 6 });
 				
 					THREE.WaltHead = function() {
-						return geometry;
+						return THREE.GeometryUtils.clone(geometry);
+					};
+			
+				});
+				
+				var loader2 = new THREE.JSONLoader();
+				loader2.load( 'obj/Suzanne.js', function ( geometry ) {
+					
+					geometriesParams.push({type: 'Suzanne', args: [ ], scale: 100, meshScale:2 });
+				
+					THREE.Suzanne = function() {
+						return THREE.GeometryUtils.clone(geometry);
 					};
 			
 				} );
@@ -155,6 +174,12 @@
 				var params = geometriesParams[ geometryIndex ];
 
 				geometry = createSomething( THREE[ params.type ], params.args );
+				
+				// Scale Geometry
+				if (params.scale) {
+					var scaler = new THREE.ScaleModifier( new THREE.Vector3(params.scale,params.scale,params.scale));
+					scaler.modify(geometry);
+				}
 
 				// Cloning original geometry for debuging
 
@@ -274,11 +299,11 @@
 
 				cube = new THREE.Mesh( smooth, meshmaterials ); 
 
-				var toscale =  params.scale ? params.scale : 1;
-
-				cube.scale.x = toscale;
-				cube.scale.y = toscale;
-				cube.scale.z = toscale;
+				var meshScale =  params.meshScale ? params.meshScale : 1;
+				
+				cube.scale.x = meshScale;
+				cube.scale.y = meshScale;
+				cube.scale.z = meshScale;
 
 				scene.add( cube );
 
diff --git a/src/extras/modifiers/ScaleModifier.js b/src/extras/modifiers/ScaleModifier.js
new file mode 100644
index 00000000..d4af5793
--- /dev/null
+++ b/src/extras/modifiers/ScaleModifier.js
@@ -0,0 +1,28 @@
+/*
+ *	@author zz85 / http://twitter.com/blurspline
+ *
+ *	Scales a geometry by vector
+ */
+
+// Scale from 0,0,0 with (x,y,z)
+THREE.ScaleModifier = function( scale /*Vector3*/ ) {
+	this.scale = scale;
+};
+
+THREE.ScaleModifier.prototype.constructor = THREE.ScaleModifier;
+
+THREE.ScaleModifier.prototype.modify = function ( geometry ) {
+	var i,il;
+	var scale = this.scale, v;
+	for (i=0,il=geometry.vertices.length;i<il;i++) {
+	
+		v = geometry.vertices[i].position;
+		v.multiplySelf(scale);
+	
+	}
+
+	geometry.computeCentroids();
+	geometry.computeFaceNormals();
+	geometry.computeVertexNormals();
+
+};
\ No newline at end of file
diff --git a/src/extras/modifiers/SubdivisionModifier.js b/src/extras/modifiers/SubdivisionModifier.js
index 5ee7de5b..027351b7 100644
--- a/src/extras/modifiers/SubdivisionModifier.js
+++ b/src/extras/modifiers/SubdivisionModifier.js
@@ -504,7 +504,7 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		}
 		
 		if (sharpEdgeCount>2) {
-			
+			// TODO
 		}
 		
 		F.divideScalar(f);
diff --git a/utils/build.py b/utils/build.py
index 432906a7..aa53f2a1 100644
--- a/utils/build.py
+++ b/utils/build.py
@@ -117,6 +117,7 @@ EXTRAS_FILES = [
 'extras/geometries/TorusGeometry.js',
 'extras/geometries/TorusKnotGeometry.js',
 'extras/modifiers/SubdivisionModifier.js',
+'extras/modifiers/ScaleModifier.js',
 'extras/loaders/Loader.js',
 'extras/loaders/BinaryLoader.js',
 'extras/loaders/ColladaLoader.js',

From 60c103648e8933db79074f31de1a53cdefb53ddf Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 23 Oct 2011 00:42:58 +0800
Subject: [PATCH 10/23] CombinedCamera decouples setFov from perspective mode
 now

---
 src/extras/cameras/CombinedCamera.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index a399062d..1c5c3df2 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -99,7 +99,11 @@ THREE.CombinedCamera.prototype.toOrthographic = function () {
 THREE.CombinedCamera.prototype.setFov = function(fov) {	
 	this.fov = fov;
 	
-	this.toPerspective();
+	if (this.inPersepectiveMode) {
+		this.toPerspective();
+	} else {
+		this.toOrthographic();
+	}
 
 };
 

From 588c2b0a9fe0aeaf60531ba61cc4e02db1f329f9 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 23 Oct 2011 01:11:58 +0800
Subject: [PATCH 11/23] ScaleModifier uses geometry.applyMatrix

---
 src/extras/modifiers/ScaleModifier.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/extras/modifiers/ScaleModifier.js b/src/extras/modifiers/ScaleModifier.js
index d4af5793..5d759959 100644
--- a/src/extras/modifiers/ScaleModifier.js
+++ b/src/extras/modifiers/ScaleModifier.js
@@ -12,17 +12,7 @@ THREE.ScaleModifier = function( scale /*Vector3*/ ) {
 THREE.ScaleModifier.prototype.constructor = THREE.ScaleModifier;
 
 THREE.ScaleModifier.prototype.modify = function ( geometry ) {
-	var i,il;
-	var scale = this.scale, v;
-	for (i=0,il=geometry.vertices.length;i<il;i++) {
 	
-		v = geometry.vertices[i].position;
-		v.multiplySelf(scale);
+	geometry.applyMatrix( new THREE.Matrix4().setScale( this.scale.x, this.scale.y, this.scale.z ) );
 	
-	}
-
-	geometry.computeCentroids();
-	geometry.computeFaceNormals();
-	geometry.computeVertexNormals();
-
 };
\ No newline at end of file

From 056daa25c620338309ee5ff4722dab2d1af9cc0b Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sat, 8 Oct 2011 18:23:44 +0800
Subject: [PATCH 12/23] Views for CombinedCamera

---
 examples/canvas_camera_orthographic2.html | 50 +++++++++++++++-------
 src/extras/cameras/CombinedCamera.js      | 51 +++++++++++++++++++++++
 2 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/examples/canvas_camera_orthographic2.html b/examples/canvas_camera_orthographic2.html
index acc1457d..08d3f581 100644
--- a/examples/canvas_camera_orthographic2.html
+++ b/examples/canvas_camera_orthographic2.html
@@ -26,6 +26,40 @@
 		<script src="js/RequestAnimationFrame.js"></script>
 		<script src="js/Stats.js"></script>
 
+		<div style="position: absolute; top: 10px; width: 100%; text-align: center; ">
+			<a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - Combo Camera<br>
+			View: <a href="#" onclick="setOrthographic();return false;"> Orthographic</a> | 
+				<a href="#" onclick="setPerspective();return false;">Perspective</a><br>
+			Lens: <a href="#" onclick="setLens(12);return false;">12mm</a> | 
+				<a href="#" onclick="setLens(16);return false;">16mm</a> | 
+				<a href="#" onclick="setLens(24);return false;">24mm</a> | 
+				<a href="#" onclick="setLens(35);return false;">35mm</a> | 
+				<a href="#" onclick="setLens(50);return false;">50mm</a> | 
+				<a href="#" onclick="setLens(60);return false;">60mm</a> | 
+				<a href="#" onclick="setLens(85);return false;">85mm</a> | 
+				<a href="#" onclick="setLens(105);return false;">105mm</a><br>
+			Fov: <a href="#" onclick="setFov(30);return false;">30°</a> | 
+				<a href="#" onclick="setFov(50);return false;">50°</a> | 
+				<a href="#" onclick="setFov(70);return false;">70°</a> | 
+				<a href="#" onclick="setFov(100);return false;">100°</a><br>
+			Zoom: 0.5x |
+					1x |
+					2x |
+					
+				<br/>
+			Views: <a href="#" onclick="camera.toTopView();return false;">Top view</a> |
+				<a href="#" onclick="camera.toBottomView();return false;">Bottom view</a> |
+				<a href="#" onclick="camera.toLeftView();return false;">Left view</a> |
+				<a href="#" onclick="camera.toRightView();return false;">Right view</a> |
+				<a href="#" onclick="camera.toFrontView();return false;">Front view</a> |
+				<a href="#" onclick="camera.toBackView();return false;">Back view</a> |
+				
+				<br/>
+			<div id="fov"></div>
+		</div>
+			
+
+
 		<script>
 
 			var container, stats;
@@ -64,21 +98,7 @@
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 
-				var info = document.createElement( 'div' );
-				info.style.position = 'absolute';
-				info.style.top = '10px';
-				info.style.width = '100%';
-				info.style.textAlign = 'center';
-				info.innerHTML = '<a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - Combo Camera' +
-				'<br/>View: <a href="#" onclick="setOrthographic();return false;"> Orthographic</a> | <a href="#" onclick="setPerspective();return false;">Perspective</a>' +
-				'<br/>Lens: <a href="#" onclick="setLens(12);return false;">12mm</a> | <a href="#" onclick="setLens(16);return false;">16mm</a> | <a href="#" onclick="setLens(24);return false;">24mm</a> | ' +
-				'<a href="#" onclick="setLens(35);return false;">35mm</a> | <a href="#" onclick="setLens(50);return false;">50mm</a> | <a href="#" onclick="setLens(60);return false;">60mm</a> |' +
-				' <a href="#" onclick="setLens(85);return false;">85mm</a> | <a href="#" onclick="setLens(105);return false;">105mm</a>' +
-				'<br/>Fov: <a href="#" onclick="setFov(30);return false;">30&deg;</a> | <a href="#" onclick="setFov(50);return false;">50&deg;</a> | <a href="#" onclick="setFov(70);return false;">70&deg;</a> | <a href="#" onclick="setFov(100);return false;">100&deg;</a> <br/><div id="fov"/>';
-				container.appendChild( info );
-
-
-				camera = new THREE.CombinedCamera( window.innerWidth, window.innerHeight, 70, 1, 1000, -1000, 1000, 1000 );
+				camera = new THREE.CombinedCamera( window.innerWidth /2, window.innerHeight/2, 70, 1, 1000, -1000, 1000, 1000 );
 
 				camera.position.x = 200;
 				camera.position.y = 100;
diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index d977e0e5..724ce356 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -27,6 +27,9 @@ THREE.CombinedCamera.prototype.toPerspective = function () {
 	this.near = this.cameraP.near;
 	this.far = this.cameraP.far;
 	this.projectionMatrix = this.cameraP.projectionMatrix;
+	
+	this.isPersepective = true;
+	this.isOrthographics = false;
 
 };
 
@@ -35,6 +38,9 @@ THREE.CombinedCamera.prototype.toOrthographic = function () {
 	this.near = this.cameraO.near;
 	this.far = this.cameraO.far;
 	this.projectionMatrix = this.cameraO.projectionMatrix;
+	
+	this.isPersepective = false;
+	this.isOrthographics = true;
 
 };
 
@@ -61,3 +67,48 @@ THREE.CombinedCamera.prototype.setLens = function(focalLength, framesize) {
 
 	return fov;
 };
+
+THREE.CombinedCamera.prototype.toFrontView = function() {
+	this.rotation.x = 0;
+	this.rotation.y = 0;
+	this.rotation.z = 0;
+	
+	//TODO: Better way to disable camera.lookAt()?
+	this.rotationAutoUpdate = false;
+};
+
+THREE.CombinedCamera.prototype.toBackView = function() {
+	this.rotation.x = 0;
+	this.rotation.y = Math.PI;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+	
+THREE.CombinedCamera.prototype.toLeftView = function() {
+	this.rotation.x = 0;
+	this.rotation.y = - Math.PI / 2;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+
+THREE.CombinedCamera.prototype.toRightView = function() {
+	this.rotation.x = 0;
+	this.rotation.y = Math.PI / 2;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+
+THREE.CombinedCamera.prototype.toTopView = function() {
+	this.rotation.x = - Math.PI / 2;
+	this.rotation.y = 0;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+
+THREE.CombinedCamera.prototype.toBottomView = function() {
+	this.rotation.x = Math.PI / 2;
+	this.rotation.y = 0;
+	this.rotation.z = 0;
+	this.rotationAutoUpdate = false;
+};
+

From fdc911b6fa33166021abc2ab6e4ca83db263fcf7 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 9 Oct 2011 00:09:37 +0800
Subject: [PATCH 13/23] added zoom + 6 views for CombinedCamera

---
 examples/canvas_camera_orthographic2.html |  6 +--
 src/extras/cameras/CombinedCamera.js      | 50 +++++++++++++++++++----
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/examples/canvas_camera_orthographic2.html b/examples/canvas_camera_orthographic2.html
index 08d3f581..6ffe12f9 100644
--- a/examples/canvas_camera_orthographic2.html
+++ b/examples/canvas_camera_orthographic2.html
@@ -42,9 +42,9 @@
 				<a href="#" onclick="setFov(50);return false;">50°</a> | 
 				<a href="#" onclick="setFov(70);return false;">70°</a> | 
 				<a href="#" onclick="setFov(100);return false;">100°</a><br>
-			Zoom: 0.5x |
-					1x |
-					2x |
+			Zoom: <a href="#" onclick="camera.setZoom(0.5);return false;">0.5x</a> |
+					<a href="#" onclick="camera.setZoom(1);return false;">1x</a> |
+					<a href="#" onclick="camera.setZoom(2);return false;">2x</a> |
 					
 				<br/>
 			Views: <a href="#" onclick="camera.toTopView();return false;">Top view</a> |
diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index 724ce356..0989a8bc 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -11,11 +11,23 @@ THREE.CombinedCamera = function ( width, height, fov, near, far, orthonear, orth
 
 	THREE.Camera.call( this );
 
+	this.fov = fov;
+	
+	this.left = -width / 2;
+	this.right = width / 2
+	this.top = height / 2;
+	this.bottom = -height / 2;
+	
 	// We could also handle the projectionMatrix internally, but just wanted to test nested camera objects
 	this.cameraO = new THREE.OrthographicCamera( width / - 2, width / 2, height / 2, height / - 2, 	orthonear, orthofar );
 	this.cameraP = new THREE.PerspectiveCamera( fov, width/height, near, far );
+	console.log(this.cameraO);
 
+	this.zoom = 1;
+	
 	this.toPerspective();
+	
+	
 
 };
 
@@ -26,28 +38,36 @@ THREE.CombinedCamera.prototype.toPerspective = function () {
 
 	this.near = this.cameraP.near;
 	this.far = this.cameraP.far;
+	this.cameraP.fov =  this.fov / this.zoom ;
+	this.cameraP.updateProjectionMatrix();
 	this.projectionMatrix = this.cameraP.projectionMatrix;
 	
-	this.isPersepective = true;
-	this.isOrthographics = false;
+	this.inPersepectiveMode = true;
+	this.inOrthographicMode = false;
 
 };
 
 THREE.CombinedCamera.prototype.toOrthographic = function () {
 
+	this.cameraO.left = this.left / this.zoom;
+	this.cameraO.right = this.right / this.zoom;
+	this.cameraO.top = this.top / this.zoom;
+	this.cameraO.bottom = this.bottom / this.zoom;
+	
+	this.cameraO.updateProjectionMatrix();
+
 	this.near = this.cameraO.near;
 	this.far = this.cameraO.far;
 	this.projectionMatrix = this.cameraO.projectionMatrix;
 	
-	this.isPersepective = false;
-	this.isOrthographics = true;
+	this.inPersepectiveMode = false;
+	this.inOrthographicMode = true;
 
 };
 
-THREE.CombinedCamera.prototype.setFov = function(fov) {
-
-	this.cameraP.fov = fov;
-	this.cameraP.updateProjectionMatrix();
+THREE.CombinedCamera.prototype.setFov = function(fov) {	
+	this.fov = fov;
+	
 	this.toPerspective();
 
 };
@@ -68,6 +88,20 @@ THREE.CombinedCamera.prototype.setLens = function(focalLength, framesize) {
 	return fov;
 };
 
+
+THREE.CombinedCamera.prototype.setZoom = function(zoom) {
+
+	this.zoom = zoom;
+	
+	if (this.inPersepectiveMode) {
+		this.toPerspective();
+	} else {
+		this.toOrthographic();
+	}
+	
+
+};
+
 THREE.CombinedCamera.prototype.toFrontView = function() {
 	this.rotation.x = 0;
 	this.rotation.y = 0;

From a92ee99dab90026d03334053cec80c01f8dc27c3 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 9 Oct 2011 10:38:22 +0800
Subject: [PATCH 14/23] Combined Camera now tries to use Perspective\'s average
 viewing frustrum for switching to Orthographic view

---
 examples/canvas_camera_orthographic2.html |  2 +-
 src/extras/cameras/CombinedCamera.js      | 44 ++++++++++++++++++++---
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/examples/canvas_camera_orthographic2.html b/examples/canvas_camera_orthographic2.html
index 6ffe12f9..e935a894 100644
--- a/examples/canvas_camera_orthographic2.html
+++ b/examples/canvas_camera_orthographic2.html
@@ -53,7 +53,7 @@
 				<a href="#" onclick="camera.toRightView();return false;">Right view</a> |
 				<a href="#" onclick="camera.toFrontView();return false;">Front view</a> |
 				<a href="#" onclick="camera.toBackView();return false;">Back view</a> |
-				
+				<a href="#" onclick="camera.rotationAutoUpdate = true;return false;">Look at Scene</a>
 				<br/>
 			<div id="fov"></div>
 		</div>
diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index 0989a8bc..198a25b2 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -21,13 +21,16 @@ THREE.CombinedCamera = function ( width, height, fov, near, far, orthonear, orth
 	// We could also handle the projectionMatrix internally, but just wanted to test nested camera objects
 	this.cameraO = new THREE.OrthographicCamera( width / - 2, width / 2, height / 2, height / - 2, 	orthonear, orthofar );
 	this.cameraP = new THREE.PerspectiveCamera( fov, width/height, near, far );
-	console.log(this.cameraO);
 
 	this.zoom = 1;
 	
 	this.toPerspective();
 	
 	
+	var aspect = width/height;
+	
+	
+
 
 };
 
@@ -49,10 +52,41 @@ THREE.CombinedCamera.prototype.toPerspective = function () {
 
 THREE.CombinedCamera.prototype.toOrthographic = function () {
 
-	this.cameraO.left = this.left / this.zoom;
-	this.cameraO.right = this.right / this.zoom;
-	this.cameraO.top = this.top / this.zoom;
-	this.cameraO.bottom = this.bottom / this.zoom;
+	// Orthographic from Perspective
+	var fov = this.fov / this.zoom;
+	var aspect = this.cameraP.aspect;
+	var near = this.cameraP.near;
+	var far = this.cameraP.far;
+	
+	
+	var nearHalfHeight = Math.tan( fov / 2 ) * near;
+	var nearPlaneHeight = 2 * nearHalfHeight;
+	var nearPlaneWidth = nearPlaneHeight * aspect;
+	var nearHalfWidth = nearPlaneWidth / 2;
+	
+	var farHalfHeight = Math.tan( fov / 2 ) * far;
+	var farPlaneHeight = 2 * farHalfHeight;
+	var farPlaneWidth = farPlaneHeight * aspect;
+	var farHalfWidth = farPlaneWidth / 2;
+	
+	var averageHalfWidth = Math.abs(nearHalfWidth + farHalfWidth) / 2;
+	var averageHalfHeight = Math.abs(nearHalfHeight + farHalfHeight) / 2;
+	
+	
+	this.cameraO.left = -averageHalfWidth;
+	this.cameraO.right = averageHalfWidth;
+	this.cameraO.top = averageHalfHeight;
+	this.cameraO.bottom = -averageHalfHeight;
+	
+	// this.cameraO.left = -farHalfWidth;
+	// this.cameraO.right = farHalfWidth;
+	// this.cameraO.top = farHalfHeight;
+	// this.cameraO.bottom = -farHalfHeight;
+
+	// this.cameraO.left = this.left / this.zoom;
+	// this.cameraO.right = this.right / this.zoom;
+	// this.cameraO.top = this.top / this.zoom;
+	// this.cameraO.bottom = this.bottom / this.zoom;
 	
 	this.cameraO.updateProjectionMatrix();
 

From cfc77699d301d1dffb1dbd18b3f76b9daa9bf41f Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 9 Oct 2011 10:53:24 +0800
Subject: [PATCH 15/23] Adding WaltHead back to subdivision example

---
 examples/webgl_geometry_subdivison.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/examples/webgl_geometry_subdivison.html b/examples/webgl_geometry_subdivison.html
index 2e9b4b07..a728a5b6 100644
--- a/examples/webgl_geometry_subdivison.html
+++ b/examples/webgl_geometry_subdivison.html
@@ -72,6 +72,15 @@
 				materials.push( [ new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, wireframe: false } ) ] );
 
 			}
+			
+			var loader = new THREE.JSONLoader();
+			loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
+
+				THREE.WaltHead = function() {
+					return geometry;
+				};
+
+			} );
 
 			var geometriesParams = [
 
@@ -87,7 +96,8 @@
 										font: "helvetiker"
 
 									}]},
-				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] }
+				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] },
+				{type: 'WaltHead', args: [ ], scale: 6 }
 
 			];
 

From 435cdb9ff70024a5dcda99cf8320197f3681148a Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Mon, 10 Oct 2011 11:19:58 +0800
Subject: [PATCH 16/23] cleaner way of doing perspective->orthographic

---
 src/extras/cameras/CombinedCamera.js | 29 +++++++++++++---------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index 198a25b2..a399062d 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -53,30 +53,27 @@ THREE.CombinedCamera.prototype.toPerspective = function () {
 THREE.CombinedCamera.prototype.toOrthographic = function () {
 
 	// Orthographic from Perspective
-	var fov = this.fov / this.zoom;
+	var fov = this.fov;
 	var aspect = this.cameraP.aspect;
 	var near = this.cameraP.near;
 	var far = this.cameraP.far;
 	
 	
-	var nearHalfHeight = Math.tan( fov / 2 ) * near;
-	var nearPlaneHeight = 2 * nearHalfHeight;
-	var nearPlaneWidth = nearPlaneHeight * aspect;
-	var nearHalfWidth = nearPlaneWidth / 2;
+	// Just pretend we want the mid plane of the viewing frustum
+	var hyperfocus = ( near + far ) / 2; 
 	
-	var farHalfHeight = Math.tan( fov / 2 ) * far;
-	var farPlaneHeight = 2 * farHalfHeight;
-	var farPlaneWidth = farPlaneHeight * aspect;
-	var farHalfWidth = farPlaneWidth / 2;
+	var halfHeight = Math.tan( fov / 2 ) * hyperfocus;
+	var planeHeight = 2 * halfHeight;
+	var planeWidth = planeHeight * aspect;
+	var halfWidth = planeWidth / 2;
 	
-	var averageHalfWidth = Math.abs(nearHalfWidth + farHalfWidth) / 2;
-	var averageHalfHeight = Math.abs(nearHalfHeight + farHalfHeight) / 2;
+	halfHeight /= this.zoom;
+	halfWidth /= this.zoom;
 	
-	
-	this.cameraO.left = -averageHalfWidth;
-	this.cameraO.right = averageHalfWidth;
-	this.cameraO.top = averageHalfHeight;
-	this.cameraO.bottom = -averageHalfHeight;
+	this.cameraO.left = -halfWidth;
+	this.cameraO.right = halfWidth;
+	this.cameraO.top = halfHeight;
+	this.cameraO.bottom = -halfHeight;
 	
 	// this.cameraO.left = -farHalfWidth;
 	// this.cameraO.right = farHalfWidth;

From ed7fcf7cb357e4bdb3ea3e886ee3886bb77b8851 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Mon, 10 Oct 2011 22:52:57 +0800
Subject: [PATCH 17/23] Update Subdivision model loading

---
 examples/webgl_geometry_subdivison.html | 33 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/examples/webgl_geometry_subdivison.html b/examples/webgl_geometry_subdivison.html
index a728a5b6..75c907c1 100644
--- a/examples/webgl_geometry_subdivison.html
+++ b/examples/webgl_geometry_subdivison.html
@@ -73,14 +73,7 @@
 
 			}
 			
-			var loader = new THREE.JSONLoader();
-			loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
-
-				THREE.WaltHead = function() {
-					return geometry;
-				};
-
-			} );
+			
 
 			var geometriesParams = [
 
@@ -96,10 +89,24 @@
 										font: "helvetiker"
 
 									}]},
-				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] },
-				{type: 'WaltHead', args: [ ], scale: 6 }
+				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] }
+				
 
 			];
+			
+			if (location.protocol !== "file:") {
+				var loader = new THREE.JSONLoader();
+				loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
+			
+					geometriesParams.push({type: 'WaltHead', args: [ ], scale: 6 });
+				
+					THREE.WaltHead = function() {
+						return geometry;
+					};
+			
+				} );
+			
+			}
 
 
 			var info;
@@ -398,7 +405,11 @@
 
 				group.rotation.x = cube.rotation.x += ( targetXRotation - cube.rotation.x ) * 0.05;
 				group.rotation.y = cube.rotation.y += ( targetYRotation - cube.rotation.y ) * 0.05;
-
+				
+				cube.updateMatrixWorld();
+				group.updateMatrixWorld();
+				
+				
 				renderer.render( scene, camera );
 
 			}

From 522fa70a22811dd5efc056bae4458dfafbfb54fd Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Tue, 11 Oct 2011 00:09:24 +0800
Subject: [PATCH 18/23] Fixed sharp corners for Subdivision Modifier

---
 src/extras/modifiers/SubdivisionModifier.js | 186 ++++++++++++++------
 1 file changed, 129 insertions(+), 57 deletions(-)

diff --git a/src/extras/modifiers/SubdivisionModifier.js b/src/extras/modifiers/SubdivisionModifier.js
index 151d78c0..5ee7de5b 100644
--- a/src/extras/modifiers/SubdivisionModifier.js
+++ b/src/extras/modifiers/SubdivisionModifier.js
@@ -11,6 +11,15 @@
  *	Readings: 
  *		http://en.wikipedia.org/wiki/Catmull%E2%80%93Clark_subdivision_surface
  *		http://www.rorydriscoll.com/2008/08/01/catmull-clark-subdivision-the-basics/
+ *		http://xrt.wikidot.com/blog:31
+ *		"Subdivision Surfaces in Character Animation"
+ *
+ *	Supports:
+ *		Closed and Open geometries.
+ *
+ *	TODO: 
+ *		crease vertex and "semi-sharp" features
+ *		selective subdivision
  */
 
 THREE.SubdivisionModifier = function( subdivisions ) {
@@ -186,6 +195,8 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		
 	var facePoints = [], edgePoints = {};
 	
+	var sharpEdges = {}, sharpVertices = [], sharpFaces = [];
+	
 	var uvForVertices = [];
 	
 	// Step 1
@@ -253,6 +264,80 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 	var edgeCount = 0;
 	var originalVerticesLength = originalPoints.length;
 	var edgeVertex, edgeVertexA, edgeVertexB;
+	
+	////
+	
+	var vertexEdgeMap = {};
+	var vertexFaceMap = {};
+	
+	var addVertexEdgeMap = function(vertex, edge) {
+		if (vertexEdgeMap[vertex]===undefined) {
+			vertexEdgeMap[vertex] = [];
+		}
+		
+		vertexEdgeMap[vertex].push(edge);
+	};
+	
+	var addVertexFaceMap = function(vertex, face, edge) {
+		if (vertexFaceMap[vertex]===undefined) {
+			vertexFaceMap[vertex] = {};
+		}
+		
+		//vertexFaceMap[vertex][face] = edge;
+		vertexFaceMap[vertex][face] = null;
+	};
+	
+	// Prepares vertexEdgeMap and vertexFaceMap
+	for (i in vfMap) { // This is for every edge
+		edge = vfMap[i];
+		
+		edgeVertex = i.split('_');
+		edgeVertexA = edgeVertex[0];
+		edgeVertexB = edgeVertex[1];
+		
+		// Maps an edgeVertex to connecting edges
+		addVertexEdgeMap(edgeVertexA, [edgeVertexA, edgeVertexB] );
+		addVertexEdgeMap(edgeVertexB, [edgeVertexA, edgeVertexB] );
+		
+		
+		// faceIndexA = edge[0]; // face index a
+		// faceIndexB = edge[1]; // face index b
+		// 
+		// // Add connecting faces for edge
+		// addVertexFaceMap(edgeVertexA, faceIndexA);
+		// addVertexFaceMap(edgeVertexB, faceIndexA);
+		// 
+		// 
+		// if (faceIndexB) {
+		// 	addVertexFaceMap(edgeVertexA, faceIndexB);
+		// 	addVertexFaceMap(edgeVertexB, faceIndexB);
+		// } else {
+		// 	addVertexFaceMap(edgeVertexA, faceIndexA);
+		// 	addVertexFaceMap(edgeVertexB, faceIndexA);
+		// }
+		
+		for (j=0,jl=edge.length;j<jl;j++) {
+			face = edge[j];
+			
+			addVertexFaceMap(edgeVertexA, face, i);
+			addVertexFaceMap(edgeVertexB, face, i);
+		}
+		
+		if (edge.length < 2) {
+			// edge is "sharp";
+			sharpEdges[i] = true;
+			sharpVertices[edgeVertexA] = true;
+			sharpVertices[edgeVertexB] = true;
+			
+		}
+		
+	}
+	
+	
+	
+	//console.log('vertexEdgeMap',vertexEdgeMap, 'vertexFaceMap', vertexFaceMap);
+	
+	
 	for (i in vfMap) {
 		edge = vfMap[i];
 		
@@ -268,14 +353,17 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		
 		//console.log(i, faceIndexB,facePoints[faceIndexB]);
 		
-		if (edge.length!=2) {
+		if (sharpEdges[i]) {
 			//console.log('warning, ', i, 'edge has only 1 connecting face', edge);
 			
+			// For a sharp edge, average the edge end points.
 			avg.addSelf(originalPoints[edgeVertexA].position);
 			avg.addSelf(originalPoints[edgeVertexB].position);
 			
 			avg.multiplyScalar(0.5);
 			
+			sharpVertices[newPoints.length] = true;
+			
 		} else {
 		
 			avg.addSelf(facePoints[faceIndexA]);
@@ -289,6 +377,7 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		}
 		
 		edgePoints[i] = originalVerticesLength + originalFaces.length + edgeCount;
+		//console.log(edgePoints[i], newPoints.length);
 		
 		newPoints.push( new THREE.Vertex(avg) );
 	
@@ -318,6 +407,14 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 	
 	var hashAB, hashBC, hashCD, hashDA, hashCA;
 	
+	var abc123 = ['123', '12', '2', '23'];
+	var bca123 = ['123', '23', '3', '31'];
+	var cab123 = ['123', '31', '1', '12'];
+	var abc1234 = ['1234', '12', '2', '23'];
+	var bcd1234 = ['1234', '23', '3', '34'];
+	var cda1234 = ['1234', '34', '4', '41'];
+	var dab1234 = ['1234', '41', '1', '12'];
+	
 	
 	for (i=0, il = facePoints.length; i<il ;i++) { // for every face
 		facePt = facePoints[i];
@@ -332,9 +429,9 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 			hashBC = edge_hash( face.b, face.c );
 			hashCA = edge_hash( face.c, face.a );
 			
-			f4( currentVerticeIndex, edgePoints[hashAB], face.b, edgePoints[hashBC], face, ['123', '12', '2', '23'] );
-			f4( currentVerticeIndex, edgePoints[hashBC], face.c, edgePoints[hashCA], face, ['123', '23', '3', '31'] );
-			f4( currentVerticeIndex, edgePoints[hashCA], face.a, edgePoints[hashAB], face, ['123', '31', '1', '12'] );
+			f4( currentVerticeIndex, edgePoints[hashAB], face.b, edgePoints[hashBC], face, abc123 );
+			f4( currentVerticeIndex, edgePoints[hashBC], face.c, edgePoints[hashCA], face, bca123 );
+			f4( currentVerticeIndex, edgePoints[hashCA], face.a, edgePoints[hashAB], face, cab123 );
 			
 		} else if ( face instanceof THREE.Face4 ) {
 			// create 4 face4s
@@ -344,10 +441,10 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 			hashCD = edge_hash( face.c, face.d );
 			hashDA = edge_hash( face.d, face.a );
 			
-			f4( currentVerticeIndex, edgePoints[hashAB], face.b, edgePoints[hashBC], face, ['1234', '12', '2', '23']  );
-			f4( currentVerticeIndex, edgePoints[hashBC], face.c, edgePoints[hashCD], face, ['1234', '23', '3', '34']  );
-			f4( currentVerticeIndex, edgePoints[hashCD], face.d, edgePoints[hashDA], face, ['1234', '34', '4', '41']  );
-			f4( currentVerticeIndex, edgePoints[hashDA], face.a, edgePoints[hashAB], face, ['1234', '41', '1', '12']  );
+			f4( currentVerticeIndex, edgePoints[hashAB], face.b, edgePoints[hashBC], face, abc1234 );
+			f4( currentVerticeIndex, edgePoints[hashBC], face.c, edgePoints[hashCD], face, bcd1234 );
+			f4( currentVerticeIndex, edgePoints[hashCD], face.d, edgePoints[hashDA], face, cda1234 );
+			f4( currentVerticeIndex, edgePoints[hashDA], face.a, edgePoints[hashAB], face, dab1234  );
 
 				
 		} else {
@@ -367,53 +464,7 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 	//		and take the average R of all n edge midpoints for edges touching P, 
 	//		where each edge midpoint is the average of its two endpoint vertices. 
 	//	Move each original point to the point
-	
-	
-	
-	var vertexEdgeMap = {};
-	var vertexFaceMap = {};
-	
-	var addVertexEdgeMap = function(vertex, edge) {
-		if (vertexEdgeMap[vertex]===undefined) {
-			vertexEdgeMap[vertex] = [];
-		}
-		
-		vertexEdgeMap[vertex].push(edge);
-	};
-	
-	var addVertexFaceMap = function(vertex, face) {
-		if (vertexFaceMap[vertex]===undefined) {
-			vertexFaceMap[vertex] = {};
-		}
-		
-		vertexFaceMap[vertex][face] = null;
-	};
-	
-	// Prepares vertexEdgeMap and vertexFaceMap
-	for (i in vfMap) { // This is for every edge
-		edge = vfMap[i];
-		
-		edgeVertex = i.split('_');
-		edgeVertexA = edgeVertex[0];
-		edgeVertexB = edgeVertex[1];
-		
-		addVertexEdgeMap(edgeVertexA, [edgeVertexA, edgeVertexB] );
-		addVertexEdgeMap(edgeVertexB, [edgeVertexA, edgeVertexB] );
-		
-		faceIndexA = edge[0]; // face index a
-		faceIndexB = edge[1]; // face index b
-		
-		addVertexFaceMap(edgeVertexA, faceIndexA);
-		if (faceIndexB) addVertexFaceMap(edgeVertexA, faceIndexB);
-		else addVertexFaceMap(edgeVertexA, faceIndexA);
-		
-		addVertexFaceMap(edgeVertexB, faceIndexA);
-		if (faceIndexB) addVertexFaceMap(edgeVertexB, faceIndexB);
-		else addVertexFaceMap(edgeVertexB, faceIndexA);
-		
-	}
-	
-	//console.log('vertexEdgeMap',vertexEdgeMap, 'vertexFaceMap', vertexFaceMap);
+
 	
 	var F = new THREE.Vector3();
 	var R = new THREE.Vector3();
@@ -430,15 +481,36 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		
 		var f =0;
 		for (j in vertexFaceMap[i]) {
-			
 			F.addSelf(facePoints[j]);
 			f++;
 		}
 		
-		F.divideScalar(f);
+		var sharpEdgeCount = 0;
 		
 		n = vertexEdgeMap[i].length;
 		
+		for (j=0;j<n;j++) {
+			if (
+				sharpEdges[
+					edge_hash(vertexEdgeMap[i][j][0],vertexEdgeMap[i][j][1])
+				]) {
+					sharpEdgeCount++;
+				}
+		}
+		
+		if ( sharpEdgeCount==2 ) {
+			continue;
+			// Do not move vertex if there's 2 connecting sharp edges.
+		}
+		
+		if (sharpEdgeCount>2) {
+			
+		}
+		
+		F.divideScalar(f);
+		
+		
+		
 		for (j=0; j<n;j++) {
 			edge = vertexEdgeMap[i][j];
 			var midPt = originalPoints[edge[0]].position.clone().addSelf(originalPoints[edge[1]].position).divideScalar(2);

From 24dcc76bf73d0af5cc25ce2586b44e1301ce0e91 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Tue, 11 Oct 2011 00:12:59 +0800
Subject: [PATCH 19/23] fix subdivision example

---
 examples/webgl_geometry_subdivison.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/webgl_geometry_subdivison.html b/examples/webgl_geometry_subdivison.html
index 75c907c1..97b55b70 100644
--- a/examples/webgl_geometry_subdivison.html
+++ b/examples/webgl_geometry_subdivison.html
@@ -406,10 +406,6 @@
 				group.rotation.x = cube.rotation.x += ( targetXRotation - cube.rotation.x ) * 0.05;
 				group.rotation.y = cube.rotation.y += ( targetYRotation - cube.rotation.y ) * 0.05;
 				
-				cube.updateMatrixWorld();
-				group.updateMatrixWorld();
-				
-				
 				renderer.render( scene, camera );
 
 			}

From e17dc71d5b4fd8eac8b313c3c219864c841569ae Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Fri, 14 Oct 2011 01:37:14 +0800
Subject: [PATCH 20/23] Added ScaleGeometry and added Monkey Head + more
 geometries to examples

---
 examples/webgl_geometry_subdivison.html     | 45 ++++++++++++++++-----
 src/extras/modifiers/ScaleModifier.js       | 28 +++++++++++++
 src/extras/modifiers/SubdivisionModifier.js |  2 +-
 utils/build.py                              |  1 +
 4 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 src/extras/modifiers/ScaleModifier.js

diff --git a/examples/webgl_geometry_subdivison.html b/examples/webgl_geometry_subdivison.html
index 97b55b70..cc1d072f 100644
--- a/examples/webgl_geometry_subdivison.html
+++ b/examples/webgl_geometry_subdivison.html
@@ -25,6 +25,7 @@
 		<script src="../src/extras/geometries/CylinderGeometry.js"></script>
 		<script src="../src/extras/geometries/TorusGeometry.js"></script>
 		<script src="../src/extras/modifiers/SubdivisionModifier.js"></script>
+		<script src="../src/extras/modifiers/ScaleModifier.js"></script>
 
 		<script src="fonts/helvetiker_regular.typeface.js"></script>
 
@@ -79,9 +80,17 @@
 
 				{type: 'CubeGeometry', args: [ 200, 200, 200, 2, 2, 2, materials ] },
 				{type: 'TorusGeometry', args: [ 100, 60, 4, 8, Math.PI*2 ] },
-				{type: 'SphereGeometry', args: [ 100, 3, 3 ] },
-				{type: 'IcosahedronGeometry', args: [ 1 ], scale: 200 },
+				{type: 'TorusKnotGeometry', args: [  ], scale:0.25, meshScale:4 },
+				{type: 'SphereGeometry', args: [ 100, 3, 3 ], meshScale:2 },
+				{type: 'IcosahedronGeometry', args: [ 1 ], scale: 100, meshScale:2 },
 				{type: 'CylinderGeometry', args: [ 25, 75, 200, 8, 3 ]} ,
+				{type: 'OctahedronGeometry', args: [200, 0], meshScale:2 },
+				{type: 'LatheGeometry', args: [ [
+					new THREE.Vector3(0,0,0), 
+					new THREE.Vector3(0,50,50),
+					new THREE.Vector3(0,0,100), 
+					new THREE.Vector3(0,50,150),
+					new THREE.Vector3(0,0,200) ] ]},
 				{type: 'TextGeometry', args: ['&', {
 										size: 200,
 										height: 50,
@@ -91,17 +100,27 @@
 									}]},
 				{type: 'PlaneGeometry', args: [ 200, 200, 4, 4 ] }
 				
-
 			];
 			
 			if (location.protocol !== "file:") {
 				var loader = new THREE.JSONLoader();
 				loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
 			
-					geometriesParams.push({type: 'WaltHead', args: [ ], scale: 6 });
+					geometriesParams.push({type: 'WaltHead', args: [ ], meshScale: 6 });
 				
 					THREE.WaltHead = function() {
-						return geometry;
+						return THREE.GeometryUtils.clone(geometry);
+					};
+			
+				});
+				
+				var loader2 = new THREE.JSONLoader();
+				loader2.load( 'obj/Suzanne.js', function ( geometry ) {
+					
+					geometriesParams.push({type: 'Suzanne', args: [ ], scale: 100, meshScale:2 });
+				
+					THREE.Suzanne = function() {
+						return THREE.GeometryUtils.clone(geometry);
 					};
 			
 				} );
@@ -155,6 +174,12 @@
 				var params = geometriesParams[ geometryIndex ];
 
 				geometry = createSomething( THREE[ params.type ], params.args );
+				
+				// Scale Geometry
+				if (params.scale) {
+					var scaler = new THREE.ScaleModifier( new THREE.Vector3(params.scale,params.scale,params.scale));
+					scaler.modify(geometry);
+				}
 
 				// Cloning original geometry for debuging
 
@@ -274,11 +299,11 @@
 
 				cube = new THREE.Mesh( smooth, meshmaterials ); 
 
-				var toscale =  params.scale ? params.scale : 1;
-
-				cube.scale.x = toscale;
-				cube.scale.y = toscale;
-				cube.scale.z = toscale;
+				var meshScale =  params.meshScale ? params.meshScale : 1;
+				
+				cube.scale.x = meshScale;
+				cube.scale.y = meshScale;
+				cube.scale.z = meshScale;
 
 				scene.add( cube );
 
diff --git a/src/extras/modifiers/ScaleModifier.js b/src/extras/modifiers/ScaleModifier.js
new file mode 100644
index 00000000..d4af5793
--- /dev/null
+++ b/src/extras/modifiers/ScaleModifier.js
@@ -0,0 +1,28 @@
+/*
+ *	@author zz85 / http://twitter.com/blurspline
+ *
+ *	Scales a geometry by vector
+ */
+
+// Scale from 0,0,0 with (x,y,z)
+THREE.ScaleModifier = function( scale /*Vector3*/ ) {
+	this.scale = scale;
+};
+
+THREE.ScaleModifier.prototype.constructor = THREE.ScaleModifier;
+
+THREE.ScaleModifier.prototype.modify = function ( geometry ) {
+	var i,il;
+	var scale = this.scale, v;
+	for (i=0,il=geometry.vertices.length;i<il;i++) {
+	
+		v = geometry.vertices[i].position;
+		v.multiplySelf(scale);
+	
+	}
+
+	geometry.computeCentroids();
+	geometry.computeFaceNormals();
+	geometry.computeVertexNormals();
+
+};
\ No newline at end of file
diff --git a/src/extras/modifiers/SubdivisionModifier.js b/src/extras/modifiers/SubdivisionModifier.js
index 5ee7de5b..027351b7 100644
--- a/src/extras/modifiers/SubdivisionModifier.js
+++ b/src/extras/modifiers/SubdivisionModifier.js
@@ -504,7 +504,7 @@ THREE.SubdivisionModifier.prototype.smooth = function ( oldGeometry ) {
 		}
 		
 		if (sharpEdgeCount>2) {
-			
+			// TODO
 		}
 		
 		F.divideScalar(f);
diff --git a/utils/build.py b/utils/build.py
index 432906a7..aa53f2a1 100644
--- a/utils/build.py
+++ b/utils/build.py
@@ -117,6 +117,7 @@ EXTRAS_FILES = [
 'extras/geometries/TorusGeometry.js',
 'extras/geometries/TorusKnotGeometry.js',
 'extras/modifiers/SubdivisionModifier.js',
+'extras/modifiers/ScaleModifier.js',
 'extras/loaders/Loader.js',
 'extras/loaders/BinaryLoader.js',
 'extras/loaders/ColladaLoader.js',

From 973e6156e8804000e808f9c9064c68801a327b81 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 23 Oct 2011 00:42:58 +0800
Subject: [PATCH 21/23] CombinedCamera decouples setFov from perspective mode
 now

---
 src/extras/cameras/CombinedCamera.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/extras/cameras/CombinedCamera.js b/src/extras/cameras/CombinedCamera.js
index a399062d..1c5c3df2 100644
--- a/src/extras/cameras/CombinedCamera.js
+++ b/src/extras/cameras/CombinedCamera.js
@@ -99,7 +99,11 @@ THREE.CombinedCamera.prototype.toOrthographic = function () {
 THREE.CombinedCamera.prototype.setFov = function(fov) {	
 	this.fov = fov;
 	
-	this.toPerspective();
+	if (this.inPersepectiveMode) {
+		this.toPerspective();
+	} else {
+		this.toOrthographic();
+	}
 
 };
 

From 0a444b9d8affcad8e6d929060236070728960d39 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Sun, 23 Oct 2011 01:11:58 +0800
Subject: [PATCH 22/23] ScaleModifier uses geometry.applyMatrix

---
 src/extras/modifiers/ScaleModifier.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/extras/modifiers/ScaleModifier.js b/src/extras/modifiers/ScaleModifier.js
index d4af5793..5d759959 100644
--- a/src/extras/modifiers/ScaleModifier.js
+++ b/src/extras/modifiers/ScaleModifier.js
@@ -12,17 +12,7 @@ THREE.ScaleModifier = function( scale /*Vector3*/ ) {
 THREE.ScaleModifier.prototype.constructor = THREE.ScaleModifier;
 
 THREE.ScaleModifier.prototype.modify = function ( geometry ) {
-	var i,il;
-	var scale = this.scale, v;
-	for (i=0,il=geometry.vertices.length;i<il;i++) {
 	
-		v = geometry.vertices[i].position;
-		v.multiplySelf(scale);
+	geometry.applyMatrix( new THREE.Matrix4().setScale( this.scale.x, this.scale.y, this.scale.z ) );
 	
-	}
-
-	geometry.computeCentroids();
-	geometry.computeFaceNormals();
-	geometry.computeVertexNormals();
-
 };
\ No newline at end of file

From f39c58b79bedd0c4a74344471658be899f94ff27 Mon Sep 17 00:00:00 2001
From: zz85 <zz85nus@gmail.com>
Date: Mon, 24 Oct 2011 10:42:35 +0800
Subject: [PATCH 23/23] Replace THREE.ScaleModifier with geometry.applyMatrix

---
 examples/webgl_geometry_subdivison.html |  4 +---
 src/extras/modifiers/ScaleModifier.js   | 18 ------------------
 utils/build.py                          |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 src/extras/modifiers/ScaleModifier.js

diff --git a/examples/webgl_geometry_subdivison.html b/examples/webgl_geometry_subdivison.html
index cc1d072f..38407f0a 100644
--- a/examples/webgl_geometry_subdivison.html
+++ b/examples/webgl_geometry_subdivison.html
@@ -25,7 +25,6 @@
 		<script src="../src/extras/geometries/CylinderGeometry.js"></script>
 		<script src="../src/extras/geometries/TorusGeometry.js"></script>
 		<script src="../src/extras/modifiers/SubdivisionModifier.js"></script>
-		<script src="../src/extras/modifiers/ScaleModifier.js"></script>
 
 		<script src="fonts/helvetiker_regular.typeface.js"></script>
 
@@ -177,8 +176,7 @@
 				
 				// Scale Geometry
 				if (params.scale) {
-					var scaler = new THREE.ScaleModifier( new THREE.Vector3(params.scale,params.scale,params.scale));
-					scaler.modify(geometry);
+					geometry.applyMatrix( new THREE.Matrix4().setScale( params.scale, params.scale, params.scale ) );
 				}
 
 				// Cloning original geometry for debuging
diff --git a/src/extras/modifiers/ScaleModifier.js b/src/extras/modifiers/ScaleModifier.js
deleted file mode 100644
index 5d759959..00000000
--- a/src/extras/modifiers/ScaleModifier.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *	@author zz85 / http://twitter.com/blurspline
- *
- *	Scales a geometry by vector
- */
-
-// Scale from 0,0,0 with (x,y,z)
-THREE.ScaleModifier = function( scale /*Vector3*/ ) {
-	this.scale = scale;
-};
-
-THREE.ScaleModifier.prototype.constructor = THREE.ScaleModifier;
-
-THREE.ScaleModifier.prototype.modify = function ( geometry ) {
-	
-	geometry.applyMatrix( new THREE.Matrix4().setScale( this.scale.x, this.scale.y, this.scale.z ) );
-	
-};
\ No newline at end of file
diff --git a/utils/build.py b/utils/build.py
index aa53f2a1..432906a7 100644
--- a/utils/build.py
+++ b/utils/build.py
@@ -117,7 +117,6 @@ EXTRAS_FILES = [
 'extras/geometries/TorusGeometry.js',
 'extras/geometries/TorusKnotGeometry.js',
 'extras/modifiers/SubdivisionModifier.js',
-'extras/modifiers/ScaleModifier.js',
 'extras/loaders/Loader.js',
 'extras/loaders/BinaryLoader.js',
 'extras/loaders/ColladaLoader.js',