Synced with mrdoob's experimental branch.

examples/misc_ubiquity_test.html

@@ -76,8 +76,9 @@
 		<script type="text/javascript" src="../src/renderers/WebGLShaders.js"></script>
 		<script type="text/javascript" src="../src/renderers/WebGLRenderer.js"></script>
 		<script type="text/javascript" src="../src/renderers/SoundRenderer.js"></script>
-		<script type="text/javascript" src="../src/renderers/renderables/RenderableObject.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableVertex.js"></script>
 		<script type="text/javascript" src="../src/renderers/renderables/RenderableFace3.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableObject.js"></script>
 		<script type="text/javascript" src="../src/renderers/renderables/RenderableParticle.js"></script>
 		<script type="text/javascript" src="../src/renderers/renderables/RenderableLine.js"></script>
 		<script type="text/javascript" src="../src/extras/GeometryUtils.js"></script>
@@ -96,7 +97,7 @@
 		<script type="text/javascript" src="../src/extras/geometries/TorusKnot.js"></script>
 		<script type="text/javascript" src="../src/extras/io/Loader.js"></script>
 		<script type="text/javascript" src="../src/extras/objects/MarchingCubes.js"></script>
-		
+
 		<script type="text/javascript" src="obj/Qrcode.js"></script>
 
 		<script type="text/javascript" src="js/RequestAnimationFrame.js"></script>

src/extras/geometries/Cube.js

@@ -181,7 +181,6 @@ var Cube = function ( width, height, depth, segmentsWidth, segmentsHeight, segme
 
 	this.computeCentroids();
 	this.computeFaceNormals();
-	//this.computeVertexNormals();
 
 };
 

src/extras/geometries/Sphere.js

@@ -47,6 +47,8 @@ var Sphere = function ( radius, segmentsWidth, segmentsHeight ) {
 
 	var n1, n2, n3, iVerNum = aVtc.length;
 
+	this.faceVertexUvs[ 0 ] = [];
+
 	for ( j = 0; j < iVerNum; j++ ) {
 
 		var iHorNum = aVtc[ j ].length;

src/renderers/Projector.js

@@ -99,7 +99,7 @@ THREE.Projector = function() {
 		objectMatrix, objectMaterials,
 		objectMatrixRotation,
 		geometry, vertices, vertex, vertexPositionScreen,
-		faces, face, faceVertexNormals, normal, v1, v2, v3, v4;
+		faces, face, faceVertexNormals, faceVertexUvs, normal, v1, v2, v3, v4;
 
 		_face3Count = 0;
 		_lineCount = 0;
@@ -192,19 +192,21 @@ THREE.Projector = function() {
 
 								}
 
-								_face3.z = _face3.centroidScreen.z;
+								faceVertexUvs = geometry.faceVertexUvs[ 0 ][ f ];
 
-								_face3.meshMaterials = objectMaterials;
-								_face3.faceMaterials = face.materials;
+								if ( faceVertexUvs ) {
 
-								if ( object.geometry.faceUvs[ f ] ) {
-
-									_face3.uvs[ 0 ] = object.geometry.faceUvs[ f ][ 0 ];
-									_face3.uvs[ 1 ] = object.geometry.faceUvs[ f ][ 1 ];
-									_face3.uvs[ 2 ] = object.geometry.faceUvs[ f ][ 2 ];
+									_face3.uvs[ 0 ] = faceVertexUvs[ 0 ];
+									_face3.uvs[ 1 ] = faceVertexUvs[ 1 ];
+									_face3.uvs[ 2 ] = faceVertexUvs[ 2 ];
 
 								}
 
+								_face3.meshMaterials = objectMaterials;
+								_face3.faceMaterials = face.materials;
+
+								_face3.z = _face3.centroidScreen.z;
+
 								renderList.push( _face3 );
 
 							}
@@ -425,7 +427,7 @@ THREE.Projector = function() {
 
 		var particle = _particlePool[ _particleCount ] = _particlePool[ _particleCount ] || new THREE.RenderableParticle();
 		_particleCount ++;
-		return partile;
+		return particle;
 
 	}
 

utils/build.py

@@ -144,8 +144,9 @@ CANVAS_FILES = [
 'renderers/Projector.js',
 'renderers/CanvasRenderer.js',
 'renderers/SoundRenderer.js',
-'renderers/renderables/RenderableObject.js',
+'renderers/renderables/RenderableVertex.js',
 'renderers/renderables/RenderableFace3.js',
+'renderers/renderables/RenderableObject.js',
 'renderers/renderables/RenderableParticle.js',
 'renderers/renderables/RenderableLine.js'
 ]
@@ -223,8 +224,9 @@ SVG_FILES = [
 'renderers/Projector.js',
 'renderers/SVGRenderer.js',
 'renderers/SoundRenderer.js',
-'renderers/renderables/RenderableObject.js',
+'renderers/renderables/RenderableVertex.js',
 'renderers/renderables/RenderableFace3.js',
+'renderers/renderables/RenderableObject.js',
 'renderers/renderables/RenderableParticle.js',
 'renderers/renderables/RenderableLine.js'
 ]