Merge branch 'master' of https://github.com/zz85/three.js into dev

examples/index.html

@@ -143,6 +143,7 @@
 				"webgl_geometry_terrain_raycast",
 				"webgl_geometry_tessellation",
 				"webgl_geometry_text",
+				"webgl_gpgpu_birds",
 				"webgl_hdr",
 				"webgl_helpers",
 				"webgl_interactive_cubes",

examples/js/SimulatorRenderer.js

@@ -88,7 +88,30 @@ function SimulatorRenderer(WIDTH, renderer) {
 
 	scene.add( mesh );
 
-	this.getRenderTarget = function() {
+	var flipflop = true;
+	var rtPosition1, rtPosition2, rtVelocity1, rtVelocity2;
+
+	function init() {
+		var dtPosition = generateDataTexture();
+		var dtVelocity = generateVelocityTexture();
+
+		rtPosition1 = getRenderTarget();
+		rtPosition2 = rtPosition1.clone();
+		rtVelocity1 = rtPosition1.clone();
+		rtVelocity2 = rtPosition1.clone();
+
+		simulator.renderTexture(dtPosition, rtPosition1);
+		simulator.renderTexture(rtPosition1, rtPosition2);
+
+		simulator.renderTexture(dtVelocity, rtVelocity1);
+		simulator.renderTexture(rtVelocity1, rtVelocity2);
+
+		simulator.velocityUniforms.testing.value = 10;
+	}
+
+	this.init = init;
+
+	function getRenderTarget() {
 		var renderTarget = new THREE.WebGLRenderTarget(WIDTH, WIDTH, {
 			wrapS: THREE.RepeatWrapping,
 			wrapT: THREE.RepeatWrapping,
@@ -103,7 +126,7 @@ function SimulatorRenderer(WIDTH, renderer) {
 	}
 
 	// Takes a texture, and render out as another texture
-	this.renderTexture = function( input, output ) {
+	this.renderTexture = function ( input, output ) {
 		mesh.material = passThruShader;
 		uniforms.texture.value = input;
 		renderer.render( scene, camera, output );
@@ -117,6 +140,7 @@ function SimulatorRenderer(WIDTH, renderer) {
 		positionShader.uniforms.time.value = performance.now();
 		positionShader.uniforms.delta.value = delta;
 		renderer.render( scene, camera, output );
+		this.currentPosition = output;
 	}
 
 	this.renderVelocity = function(position, velocity, output, delta) {
@@ -126,6 +150,87 @@ function SimulatorRenderer(WIDTH, renderer) {
 		velocityShader.uniforms.time.value = performance.now();
 		velocityShader.uniforms.delta.value = delta;
 		renderer.render( scene, camera, output );
+		this.currentVelocity = output;
+	}
+
+	this.simulate = function( delta ) {
+
+		if (flipflop) {
+
+			simulator.renderVelocity( rtPosition1, rtVelocity1, rtVelocity2, delta );
+			simulator.renderPosition( rtPosition1, rtVelocity2, rtPosition2, delta );
+
+		} else {
+
+			simulator.renderVelocity( rtPosition2, rtVelocity2, rtVelocity1, delta );
+			simulator.renderPosition( rtPosition2, rtVelocity1, rtPosition1, delta );
+
+		}
+
+		flipflop = !flipflop;
+
+	}
+
+	function generateDataTexture() {
+
+		var x, y, z;
+
+		var w = WIDTH, h = WIDTH;
+
+		var a = new Float32Array(PARTICLES * 4);
+
+		for (var k = 0; k < PARTICLES; k++) {
+
+			x = Math.random() * BOUNDS - BOUNDS_HALF;
+			y = Math.random() * BOUNDS - BOUNDS_HALF;
+			z = Math.random() * BOUNDS - BOUNDS_HALF;
+
+			a[ k*4 + 0 ] = x;
+			a[ k*4 + 1 ] = y;
+			a[ k*4 + 2 ] = z;
+			a[ k*4 + 3 ] = 1;
+
+		}
+
+		var texture = new THREE.DataTexture( a, WIDTH, WIDTH, THREE.RGBAFormat, THREE.FloatType );
+		texture.minFilter = THREE.NearestFilter;
+		texture.magFilter = THREE.NearestFilter;
+		texture.needsUpdate = true;
+		texture.flipY = false;
+
+		return texture;
+
+	}
+
+	function generateVelocityTexture() {
+
+		var x, y, z;
+
+		var w = WIDTH, h = WIDTH;
+
+		var a = new Float32Array(PARTICLES * 4);
+
+		for (var k = 0; k < PARTICLES; k++) {
+
+			x = Math.random() - 0.5;
+			y = Math.random() - 0.5;
+			z = Math.random() - 0.5;
+
+			a[ k*4 + 0 ] = x * 10;
+			a[ k*4 + 1 ] = y * 10;
+			a[ k*4 + 2 ] = z * 10;
+			a[ k*4 + 3 ] = 1;
+
+		}
+
+		var texture = new THREE.DataTexture( a, WIDTH, WIDTH, THREE.RGBAFormat, THREE.FloatType );
+		texture.minFilter = THREE.NearestFilter;
+		texture.magFilter = THREE.NearestFilter;
+		texture.needsUpdate = true;
+		texture.flipY = false;
+
+		return texture;
+
 	}
 
 }

examples/webgl_gpgpu_birds.html

@@ -406,7 +406,7 @@
 				for (var f = 0; f<BIRDS; f++ ) {
 					verts.push(
 						new THREE.Vector3(0, -0, -20),
-						new THREE.Vector3(0, 10, -20),
+						new THREE.Vector3(0, 4, -20),
 						new THREE.Vector3(0, 0, 30)
 					);
 
@@ -422,18 +422,18 @@
 						new THREE.Vector2(1, 1)
 					]);
 
-					var wingsSpan = 30;
+					var wingsSpan = 20;
 
 					verts.push(
-						new THREE.Vector3(0, 0, -20),
+						new THREE.Vector3(0, 0, -15),
 						new THREE.Vector3(-wingsSpan, 0, 0),
-						new THREE.Vector3(0, 0, 20)
+						new THREE.Vector3(0, 0, 15)
 					);
 
 					verts.push(
-						new THREE.Vector3(0, 0, 20),
+						new THREE.Vector3(0, 0, 15),
 						new THREE.Vector3(wingsSpan, 0, 0),
-						new THREE.Vector3(0, 0, -20)
+						new THREE.Vector3(0, 0, -15)
 					);
 
 					faces.push(new THREE.Face3(
@@ -515,9 +515,6 @@
 
 
 			var simulator;
-			var flipflop = true;
-			var rtPosition1, rtPosition2, rtVelocity1, rtVelocity2;
-
 
 			init();
 			animate();
@@ -545,21 +542,7 @@
 				////////
 				simulator = new SimulatorRenderer(WIDTH, renderer);
 
-				var dtPosition = generateDataTexture();
-				var dtVelocity = generateVelocityTexture();
-
-				rtPosition1 = simulator.getRenderTarget();
-				rtPosition2 = rtPosition1.clone();
-				rtVelocity1 = rtPosition1.clone();
-				rtVelocity2 = rtPosition1.clone();
-
-				simulator.renderTexture(dtPosition, rtPosition1);
-				simulator.renderTexture(rtPosition1, rtPosition2);
-
-				simulator.renderTexture(dtVelocity, rtVelocity1);
-				simulator.renderTexture(rtVelocity1, rtVelocity2);
-
-				simulator.velocityUniforms.testing.value = 10;
+				simulator.init();
 
 				/////////
 
@@ -694,8 +677,8 @@
 					var y = ~~(i / WIDTH) / WIDTH;
 
 					birdColors[ v ] = new THREE.Color(
-						Math.random() * 0xffffff
-						// ~~(v / 9) / BIRDS * 0xffffff
+						0x444444 +
+						~~(v / 9) / BIRDS * 0x666666
 					);
 					references[ v ] = new THREE.Vector2( x, y );
 					birdVertex[ v ] = v % 9;
@@ -789,21 +772,13 @@
 				// 	delta = 0.0001;
 				// }
 
-				if (!paused)
-				if (flipflop) {
-					simulator.renderVelocity( rtPosition1, rtVelocity1, rtVelocity2, delta );
-					simulator.renderPosition( rtPosition1, rtVelocity2, rtPosition2, delta );
-					birdUniforms.texturePosition.value = rtPosition2;
-					birdUniforms.textureVelocity.value = rtVelocity2;
-
-				} else {
-					simulator.renderVelocity( rtPosition2, rtVelocity2, rtVelocity1, delta );
-					simulator.renderPosition( rtPosition2, rtVelocity1, rtPosition1, delta );
-					birdUniforms.texturePosition.value = rtPosition1;
-					birdUniforms.textureVelocity.value = rtVelocity1;
+				if (!paused) {
+					simulator.simulate( delta );
+
+					birdUniforms.texturePosition.value = simulator.currentPosition;
+					birdUniforms.textureVelocity.value = simulator.currentVelocity;
 				}
 
-				flipflop = !flipflop;
 
 				simulator.velocityUniforms.predator.value.set( mouseX / windowHalfX, -mouseY / windowHalfY, 0 );
 
@@ -824,67 +799,7 @@
 			}
 
 
-			function generateDataTexture() {
-
-				var x, y, z;
-
-				var w = WIDTH, h = WIDTH;
-
-				var a = new Float32Array(PARTICLES * 4);
-
-				for (var k = 0; k < PARTICLES; k++) {
-
-					x = Math.random() * BOUNDS - BOUNDS_HALF;
-					y = Math.random() * BOUNDS - BOUNDS_HALF;
-					z = Math.random() * BOUNDS - BOUNDS_HALF;
-
-					a[ k*4 + 0 ] = x;
-					a[ k*4 + 1 ] = y;
-					a[ k*4 + 2 ] = z;
-					a[ k*4 + 3 ] = 1;
-
-				}
-
-				var texture = new THREE.DataTexture( a, WIDTH, WIDTH, THREE.RGBAFormat, THREE.FloatType );
-				texture.minFilter = THREE.NearestFilter;
-				texture.magFilter = THREE.NearestFilter;
-				texture.needsUpdate = true;
-				texture.flipY = false;
-
-				return texture;
-
-			}
-
-			function generateVelocityTexture() {
-
-				var x, y, z;
-
-				var w = WIDTH, h = WIDTH;
-
-				var a = new Float32Array(PARTICLES * 4);
-
-				for (var k = 0; k < PARTICLES; k++) {
 
-					x = Math.random() - 0.5;
-					y = Math.random() - 0.5;
-					z = Math.random() - 0.5;
-
-					a[ k*4 + 0 ] = x * 10;
-					a[ k*4 + 1 ] = y * 10;
-					a[ k*4 + 2 ] = z * 10;
-					a[ k*4 + 3 ] = 1;
-
-				}
-
-				var texture = new THREE.DataTexture( a, WIDTH, WIDTH, THREE.RGBAFormat, THREE.FloatType );
-				texture.minFilter = THREE.NearestFilter;
-				texture.magFilter = THREE.NearestFilter;
-				texture.needsUpdate = true;
-				texture.flipY = false;
-
-				return texture;
-
-			}
 
 		</script>
 	</body>

src/extras/core/CurvePath.js

@@ -312,7 +312,8 @@ THREE.CurvePath.prototype.getWrapPoints = function ( oldPts, path ) {
 		// check for out of bounds?
 
 		var pathPt = path.getPoint( xNorm );
-		var normal = path.getNormalVector( xNorm ).multiplyScalar( oldY );
+		var normal = path.getNormalVector( xNorm );
+		normal.set( -normal.y, normal.x ).multiplyScalar( oldY );
 
 		p.x = pathPt.x + normal.x;
 		p.y = pathPt.y + normal.y;