Merge branch 'dev-geometry-experiment' of https://github.com/jbaicoianu/three.js into dev

src/core/Geometry99.js

@@ -0,0 +1,179 @@
+
+THREE.Geometry99 = function ( ) {
+
+	THREE.BufferGeometry.call( this );
+
+};
+
+THREE.Geometry99.prototype = Object.create( THREE.BufferGeometry.prototype );
+
+Object.defineProperties(THREE.Geometry99.prototype, {
+	vertices: { 
+		enumerable: true, 
+		get: function() { return this.createVertexProxies(); } 
+	},
+	faces: {
+		enumerable: true,  
+		get: function() { return this.createFaceProxies() } 
+	},
+	faceVertexUvs: {
+		enumerable: true,  
+		get: function() { return this.createUvProxies() } 
+	},
+	// TODO - fill in additional proxies:
+	// - colors
+	// - morphColors
+	// - morphNormals
+	// - morphTargets
+	// - skinIndex
+	// - skinWeights
+});
+
+THREE.Geometry99.prototype.createVertexProxies = function() {
+
+	// Replace the prototype getter with a local array property
+
+	Object.defineProperty( this, "vertices", { value: [] } );
+
+	// If the attribute buffer has already been populated, set up proxy objects
+
+	this.populateProxyFromBuffer(this.vertices, "position", THREE.TypedVector3, 3);
+
+	// Return a reference to the newly-created array
+
+	return this.vertices;
+
+}
+
+THREE.Geometry99.prototype.createFaceProxies = function() {
+
+	// Replace the prototype getter with a local array property
+
+	Object.defineProperty( this, "faces", { value: [] } );
+
+	// If the attribute buffer has already been populated, set up proxy objects
+
+	if ( this.attributes.index ) {
+
+		var indexarray = this.attributes[ 'index' ].array;
+		var size = 3;
+		var attr = this.faces;
+
+		var normalarray = false;
+		if (this.attributes[ 'normal' ]) {
+			normalarray = this.attributes[ 'normal' ].array;
+		}
+
+		for ( var i = 0, l = indexarray.length / size; i < l; i ++ ) {
+
+			var o = i * size;
+
+			// Generate faceVertexNormals
+			var vertexNormals;
+			if (normalarray) {
+
+				vertexNormals = [
+					new THREE.TypedVector3(normalarray, indexarray[o] * 3),
+					new THREE.TypedVector3(normalarray, indexarray[o+1] * 3),
+					new THREE.TypedVector3(normalarray, indexarray[o+2] * 3),
+				]
+
+			}
+
+			// TODO - do BufferGeometries support face normals?
+
+			var face = new THREE.TypedFace3( indexarray, i * size, vertexNormals );
+
+			attr.push(face);
+
+		}
+
+	} else {
+
+		// TODO - should be able to generate Face data even for non-indexed geometries
+
+	}
+
+	// Return a reference to the newly-created array
+
+	return this.faces;
+
+}
+THREE.Geometry99.prototype.createUvProxies = function() {
+
+	// Replace the prototype getter with a local array property
+
+	Object.defineProperty( this, "faceVertexUvs", { value: [[]] } );
+
+	// If the attribute buffer has already been populated, set up proxy objects
+
+	if ( this.attributes.uv ) {
+
+		var faces = this.faces;
+		var uvarray = this.attributes.uv.array;
+
+		for (var i = 0, l = faces.length; i < l; i++) {
+			var f = faces[i];
+
+			this.faceVertexUvs[0][i] = [];
+			this.faceVertexUvs[0][i][0] = new THREE.TypedVector2(uvarray, f.a * 2);
+			this.faceVertexUvs[0][i][1] = new THREE.TypedVector2(uvarray, f.b * 2);
+			this.faceVertexUvs[0][i][2] = new THREE.TypedVector2(uvarray, f.c * 2);
+
+		}
+	
+	}
+
+	// Return a reference to the newly-created array
+
+	return this.faceVertexUvs;
+
+}
+THREE.Geometry99.prototype.populateProxyFromBuffer = function(attr, buffername, proxytype, itemsize, offset, count) {
+
+	if ( this.attributes[ buffername ] ) {
+
+		var array = this.attributes[ buffername ].array;
+		var size = itemsize || this.attributes[ buffername ].itemSize;
+		var start = offset || 0;
+		var count = count || (array.length / size - start);
+
+		for ( var i = start, l = start + count; i < l; i ++ ) {
+
+			attr.push( new proxytype( array, i * size ) );
+
+		}
+
+	}
+
+}
+
+THREE.TypedFace3 = function ( array, offset, vertexNormals ) {
+
+	this.array = array;
+	this.offset = offset;
+	this.vertexNormals = vertexNormals;
+
+	//THREE.Face3.call( this, array[offset], array[offset+1], array[offset+2] /*, normal, color, materialIndex */);
+
+}
+
+THREE.TypedFace3.prototype = Object.create( THREE.Face3.prototype );
+
+Object.defineProperties( THREE.TypedFace3.prototype, {
+	'a': {
+		enumerable: true,  
+		get: function () { return this.array[ this.offset ]; },
+		set: function ( v ) { this.array[ this.offset ] = v; }
+	},
+	'b': {
+		enumerable: true,  
+		get: function () { return this.array[ this.offset + 1 ]; },
+		set: function ( v ) { this.array[ this.offset + 1 ] = v; }
+	},
+	'c': {
+		enumerable: true,  
+		get: function () { return this.array[ this.offset + 2 ]; },
+		set: function ( v ) { this.array[ this.offset + 2 ] = v; }
+	},
+} );

src/core/IndexedGeometry2.js

@@ -13,4 +13,4 @@ THREE.IndexedGeometry2 = function ( indices, vertices, normals, uvs ) {
 
 };
 
-THREE.IndexedGeometry2.prototype = Object.create( THREE.BufferGeometry.prototype );
+THREE.IndexedGeometry2.prototype = Object.create( THREE.Geometry99.prototype );

utils/build/includes/common.json

@@ -34,6 +34,7 @@
 	"src/core/BufferGeometryManipulator.js",
 	"src/core/Geometry.js",
 	"src/core/Geometry2.js",
+	"src/core/Geometry99.js",
 	"src/core/IndexedGeometry2.js",
 	"src/cameras/Camera.js",
 	"src/cameras/OrthographicCamera.js",