Store DirectGeometry in geometry.__directGeometry by now. Handle *needsUpdate.

src/core/BufferGeometry.js

@@ -170,9 +170,13 @@ THREE.BufferGeometry.prototype = {
 
 		} else if ( object instanceof THREE.Mesh ) {
 
-			if ( geometry instanceof THREE.Geometry ) {
+			if ( geometry instanceof THREE.DirectGeometry ) {
 
-				geometry = new THREE.DirectGeometry().fromGeometry( geometry, material );
+				this.fromDirectGeometry( geometry );
+
+			} else if ( geometry instanceof THREE.Geometry ) {
+
+				this.fromGeometry( geometry );
 
 			}
 
@@ -216,8 +220,6 @@ THREE.BufferGeometry.prototype = {
 
 			}
 
-			this.fromDirectGeometry( geometry );
-
 		}
 
 		return this;
@@ -226,9 +228,18 @@ THREE.BufferGeometry.prototype = {
 
 	updateFromObject: function ( object ) {
 
-		var geometry = object.geometry;
+		var geometry;
+
+		if ( object instanceof THREE.PointCloud || object instanceof THREE.Line ) {
+
+			geometry = object.geometry;
+
+		} else if ( object instanceof THREE.Mesh ) {
+
+			geometry = object.geometry.__directGeometry.updateFromGeometry( object.geometry );
+
+		}
 
-		/*
 		if ( geometry.verticesNeedUpdate === true ) {
 
 			var attribute = this.attributes.position;
@@ -244,6 +255,21 @@ THREE.BufferGeometry.prototype = {
 
 		}
 
+		if ( geometry.normalsNeedUpdate === true ) {
+
+			var attribute = this.attributes.normal;
+
+			if ( attribute !== undefined ) {
+
+				attribute.copyVector3sArray( geometry.normals );
+				attribute.needsUpdate = true;
+
+			}
+
+			geometry.normalsNeedUpdate = false;
+
+		}
+
 		if ( geometry.colorsNeedUpdate === true ) {
 
 			var attribute = this.attributes.color;
@@ -258,7 +284,6 @@ THREE.BufferGeometry.prototype = {
 			geometry.colorsNeedUpdate = false;
 
 		}
-		*/
 
 		return this;
 
@@ -266,7 +291,9 @@ THREE.BufferGeometry.prototype = {
 
 	fromGeometry: function ( geometry, material ) {
 
-		return this.fromDirectGeometry( new THREE.DirectGeometry().fromGeometry( geometry, material ) );
+		geometry.__directGeometry = new THREE.DirectGeometry().fromGeometry( geometry, material );
+
+		return this.fromDirectGeometry( geometry.__directGeometry );
 
 	},
 

src/core/DirectGeometry.js

@@ -58,17 +58,17 @@ THREE.DirectGeometry.prototype = {
 
 		material = material || { 'vertexColors': THREE.NoColors };
 
-		var vertices = geometry.vertices;
 		var faces = geometry.faces;
+		var vertices = geometry.vertices;
 		var faceVertexUvs = geometry.faceVertexUvs;
 		var materialVertexColors = material.vertexColors;
 
 		var hasFaceVertexUv = faceVertexUvs[ 0 ] && faceVertexUvs[ 0 ].length > 0;
 		var hasFaceVertexUv2 = faceVertexUvs[ 1 ] && faceVertexUvs[ 1 ].length > 0;
 
-		for ( var i = 0, j = 0; i < faces.length; i ++ ) {
+		for ( var i = 0, i3 = 0; i < faces.length; i ++, i3 += 3 ) {
 
-			this.indices.push( new THREE.Index( j ++, j ++, j ++ ) );
+			this.indices.push( new THREE.Index( i3, i3 + 1, i3 + 2 ) );
 
 			var face = faces[ i ];
 
@@ -179,57 +179,76 @@ THREE.DirectGeometry.prototype = {
 		return this;
 
 		/*
-		this.vertices = geometry.vertices;
-		this.faces = geometry.faces;
+		if ( geometry.morphTargets ) this.morphTargets = geometry.morphTargets.slice( 0 );
+		if ( geometry.morphColors ) this.morphColors = geometry.morphColors.slice( 0 );
+		if ( geometry.morphNormals ) this.morphNormals = geometry.morphNormals.slice( 0 );
+
+		if ( geometry.skinIndices ) this.skinIndices = geometry.skinIndices.slice( 0 );
+		if ( geometry.skinWeights ) this.skinWeights = geometry.skinWeights.slice( 0 );
+
+		return this;
+		*/
+
+	},
+
+	updateFromGeometry: function ( geometry, material ) {
 
 		var faces = geometry.faces;
-		var faceVertexUvs = geometry.faceVertexUvs[ 0 ];
+		var vertices = geometry.vertices;
 
-		for ( var i = 0, il = faces.length; i < il; i ++ ) {
+		for ( var i = 0, i3 = 0; i < faces.length; i ++, i3 += 3 ) {
 
 			var face = faces[ i ];
-			var indices = [ face.a, face.b, face.c ];
 
-			var vertexNormals = face.vertexNormals;
-			var vertexColors = face.vertexColors;
-			var vertexUvs = faceVertexUvs[ i ];
+			var a = vertices[ face.a ];
+			var b = vertices[ face.b ];
+			var c = vertices[ face.c ];
 
-			for ( var j = 0, jl = vertexNormals.length; j < jl; j ++ ) {
+			if ( geometry.verticesNeedUpdate ) {
 
-				this.normals[ indices[ j ] ] = vertexNormals[ j ];
+				this.vertices[ i3     ].copy( a );
+				this.vertices[ i3 + 1 ].copy( b );
+				this.vertices[ i3 + 2 ].copy( c );
 
 			}
 
-			for ( var j = 0, jl = vertexColors.length; j < jl; j ++ ) {
+			if ( geometry.normalsNeedUpdate ) {
 
-				this.colors[ indices[ j ] ] = vertexColors[ j ];
+				var vertexNormals = face.vertexNormals;
 
-			}
+				if ( vertexNormals.length === 3 ) {
 
-			if ( vertexUvs === undefined ) {
+					this.normals[ i3     ].copy( vertexNormals[ 0 ] );
+					this.normals[ i3 + 1 ].copy( vertexNormals[ 1 ] );
+					this.normals[ i3 + 2 ].copy( vertexNormals[ 2 ] );
 
-				console.warn( 'THREE.DirectGeometry.fromGeometry(): Missing vertexUVs', i );
-				vertexUvs = [ new THREE.Vector2(), new THREE.Vector2(), new THREE.Vector2() ];
+				} else {
 
-			}
+					var normal = face.normal;
 
-			for ( var j = 0, jl = vertexUvs.length; j < jl; j ++ ) {
+					this.normals[ i3     ].copy( normal );
+					this.normals[ i3 + 1 ].copy( normal );
+					this.normals[ i3 + 2 ].copy( normal );
 
-				this.uvs[ indices[ j ] ] = vertexUvs[ j ];
+				}
 
 			}
 
 		}
 
-		if ( geometry.morphTargets ) this.morphTargets = geometry.morphTargets.slice( 0 );
-		if ( geometry.morphColors ) this.morphColors = geometry.morphColors.slice( 0 );
-		if ( geometry.morphNormals ) this.morphNormals = geometry.morphNormals.slice( 0 );
+		// TODO: normals, colors, uvs
 
-		if ( geometry.skinIndices ) this.skinIndices = geometry.skinIndices.slice( 0 );
-		if ( geometry.skinWeights ) this.skinWeights = geometry.skinWeights.slice( 0 );
+		this.verticesNeedUpdate = geometry.verticesNeedUpdate;
+		this.normalsNeedUpdate = geometry.normalsNeedUpdate;
+		this.colorsNeedUpdate = geometry.colorsNeedUpdate;
+		this.uvsNeedUpdate = geometry.uvsNeedUpdate;
+
+		geometry.verticesNeedUpdate = false;
+		geometry.normalsNeedUpdate = false;
+		geometry.colorsNeedUpdate = false;
+		geometry.uvsNeedUpdate = false;
 
 		return this;
-		*/
 
 	},
 

src/extras/helpers/SkeletonHelper.js

@@ -9,7 +9,7 @@ THREE.SkeletonHelper = function ( object ) {
 
 	this.bones = this.getBoneList( object );
 
-	var geometry = new THREE.DirectGeometry();
+	var geometry = new THREE.Geometry();
 
 	for ( var i = 0; i < this.bones.length; i ++ ) {