Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Removed THREE.Ribbon. See #3860.

Mr.doob 12 years ago
parent
03b2fef601
commit
3f3cfa27de
12 changed files with 3 additions and 935 deletions
Split View Show Diff Stats
  1. 1 8
      docs/api/core/Geometry.html
  2. 0 52
      docs/api/objects/Ribbon.html
  3. 0 1
      docs/list.js
  4. 0 2
      examples/index.html
  5. 0 284
      examples/webgl_custom_attributes_ribbons.html
  6. 0 317
      examples/webgl_ribbons.html
  7. 1 2
      src/core/Geometry.js
  8. 0 24
      src/objects/Ribbon.js
  9. 1 242
      src/renderers/WebGLRenderer.js
  10. 0 1
      utils/build/includes/common.json
  11. 0 1
      utils/build/includes/webgl.json
  12. 0 1
      utils/editors/sublimetext2/threejs.sublime-completions

+ 1 - 8
docs/api/core/Geometry.html
View File 

@@ -59,18 +59,11 @@
 
 		<h3>.[page:Array colors]</h3>
 
 		<div>
 
 		Array of vertex [page:Color colors], matching number and order of vertices.<br />
 
-		Used in [page:ParticleSystem], [page:Line] and [page:Ribbon].<br />
 
+		Used in [page:ParticleSystem] and [page:Line].<br />
 
 		[page:Mesh Meshes] use per-face-use-of-vertex colors embedded directly in faces.<br />
 
 		To signal an update in this array, [page:Geometry Geometry.colorsNeedUpdate] needs to be set to true.
 
 		</div>
 
 
-		<h3>.[page:Array normals]</h3>
 
-		<div>
 
-		Array of vertex [page:Vector3 normals], matching number and order of vertices.<br />
 
-		[link:http://en.wikipedia.org/wiki/Normal_(geometry) Normal vectors] are  nessecary for lighting <br />
 
-		To signal an update in this array, [page:Geometry Geometry.normalsNeedUpdate] needs to be set to true.
 
-		</div>
 
-
 
 		<h3>.[page:Array faces]</h3>
 
 		<div>
 
 		Array of [page:Face3 triangles].<br />

+ 0 - 52
docs/api/objects/Ribbon.html
View File 

@@ -1,52 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-	<head>
 
-		<meta charset="utf-8" />
 
-		<script src="../../list.js"></script>
 
-		<script src="../../page.js"></script>
 
-		<link type="text/css" rel="stylesheet" href="../../page.css" />
 
-	</head>
 
-	<body>
 
-		[page:Object3D] &rarr;
 
-
 
-		<h1>[name]</h1>
 
-
 
-		<div class="desc">todo</div>
 
-
 
-
 
-		<h2>Constructor</h2>
 
-
 
-
 
-		<h3>[name]([page:todo geometry], [page:todo material])</h3>
 
-		<div>
 
-		geometry -- todo <br />
 
-		material -- todo
 
-		</div>
 
-		<div>
 
-		todo
 
-		</div>
 
-
 
-
 
-		<h2>Properties</h2>
 
-
 
-
 
-
 
-		<h3>.[page:todo geometry]</h3>
 
-		<div>
 
-		todo
 
-		</div> 
-
 
-		<h3>.[page:todo material]</h3>
 
-		<div>
 
-		todo
 
-		</div> 
-
 
-		<h2>Methods</h2>
 
-
 
-
 
-
 
-		<h2>Source</h2>
 
-
 
-		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
-	</body>
 
-</html>

+ 0 - 1
docs/list.js
View File 

@@ -91,7 +91,6 @@ var list = {
 
 			[ "MorphAnimMesh", "api/objects/MorphAnimMesh" ],
 
 			[ "Particle", "api/objects/Particle" ],
 
 			[ "ParticleSystem", "api/objects/ParticleSystem" ],
 
-			[ "Ribbon", "api/objects/Ribbon" ],
 
 			[ "SkinnedMesh", "api/objects/SkinnedMesh" ],
 
 			[ "Sprite", "api/objects/Sprite" ]

+ 0 - 2
examples/index.html
View File 

@@ -113,7 +113,6 @@
 
 				"webgl_custom_attributes_particles",
 
 				"webgl_custom_attributes_particles2",
 
 				"webgl_custom_attributes_particles3",
 
-				"webgl_custom_attributes_ribbons",
 
 				"webgl_geometries",
 
 				"webgl_geometries2",
 
 				"webgl_geometry_colors",
 
@@ -233,7 +232,6 @@
 
 				"webgl_postprocessing_dof",
 
 				"webgl_postprocessing_dof2",
 
 				"webgl_postprocessing_godrays",
 
-				"webgl_ribbons",
 
 				"webgl_rtt",
 
 				"webgl_sandbox",
 
 				"webgl_shader",

+ 0 - 284
examples/webgl_custom_attributes_ribbons.html
View File 

@@ -1,284 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-	<head>
 
-		<title>three.js webgl - custom attributes [ribbons]</title>
 
-		<meta charset="utf-8">
 
-		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
-		<style>
 
-			body {
 
-				background-color: #000000;
 
-				margin: 0px;
 
-				overflow: hidden;
 
-				font-family:Monospace;
 
-				font-size:13px;
 
-				text-align:center;
 
-				font-weight: bold;
 
-				text-align:center;
 
-			}
 
-
 
-			a {
 
-				color:#0078ff;
 
-			}
 
-
 
-			#info {
 
-				color:#fff;
 
-				position: absolute;
 
-				top: 0px; width: 100%;
 
-				padding: 5px;
 
-				z-index:100;
 
-			}
 
-		</style>
 
-	</head>
 
-
 
-	<body>
 
-
 
-		<script src="../build/three.min.js"></script>
 
-
 
-		<script src="js/Detector.js"></script>
 
-		<script src="js/libs/stats.min.js"></script>
 
-
 
-		<div id="info">
 
-			<a href="http://threejs.org" target="_blank">three.js</a> - webgl custom attributes example
 
-		</div>
 
-
 
-		<script type="x-shader/x-vertex" id="vertexShader">
 
-
 
-			uniform float ratio;
 
-
 
-			attribute vec3 position2;
 
-			attribute vec3 customColor;
 
-
 
-			varying vec3 vColor;
 
-
 
-			void main() {
 
-
 
-				vColor = customColor;
 
-
 
-				vec3 newPosition = mix( position, position2, ratio );
 
-				gl_Position = projectionMatrix * modelViewMatrix * vec4( newPosition, 1.0 );
 
-
 
-			}
 
-
 
-		</script>
 
-
 
-		<script type="x-shader/x-fragment" id="fragmentShader">
 
-
 
-			uniform vec3 color;
 
-			varying vec3 vColor;
 
-
 
-			void main() {
 
-
 
-				gl_FragColor = vec4( color * vColor, 1.0 );
 
-
 
-			}
 
-
 
-		</script>
 
-
 
-		<script>
 
-
 
-			if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
-
 
-			var container, stats;
 
-			var camera, scene, renderer;
 
-
 
-			var materials = [];
 
-
 
-			var mouseX = 0, mouseY = 0;
 
-
 
-			var windowHalfX = window.innerWidth / 2;
 
-			var windowHalfY = window.innerHeight / 2;
 
-
 
-			init();
 
-			animate();
 
-
 
-			function init() {
 
-
 
-				container = document.createElement( 'div' );
 
-				document.body.appendChild( container );
 
-
 
-				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 3000 );
 
-				camera.position.z = 1200;
 
-
 
-				scene = new THREE.Scene();
 
-				scene.fog = new THREE.FogExp2( 0x000000, 0.0016 );
 
-
 
-				//
 
-
 
-				var vertexShader = document.getElementById( 'vertexShader' ).textContent;
 
-				var fragmentShader = document.getElementById( 'fragmentShader' ).textContent;
 
-
 
-				var attributes = { customColor:  { type: 'c',  boundTo: 'vertices', value: [] },
 
-								   position2:    { type: 'v3', boundTo: 'vertices', value: [] }
 
-								  };
 
-
 
-				uniforms =  { ratio: { type: "f", value: 1.0 },
 
-							  color:     { type: "c", value: new THREE.Color( 0xffffff ) }
 
-							};
 
-
 
-				var material = new THREE.ShaderMaterial( { uniforms: uniforms, attributes: attributes, vertexShader: vertexShader, fragmentShader: fragmentShader, side: THREE.DoubleSide } );
 
-
 
-				var position2 = attributes.position2.value;
 
-				var colors = attributes.customColor.value;
 
-
 
-				//
 
-
 
-				var geometry = new THREE.Geometry();
 
-
 
-				var i, i2;
 
-				var x1, y1, z1;
 
-				var x2, y2, z2;
 
-				var color;
 
-
 
-				var n = 200;
 
-
 
-				for ( i = -n; i < n; i ++ ) {
 
-
 
-					i2 = i + n;
 
-
 
-					x1 = 10 * i;
 
-					y1 = - 50 + ( i2 % 2 ) * 100 - Math.cos( 4 * Math.PI * i/n ) * 50;
 
-					z1 = 0;
 
-
 
-					x2 = x1;
 
-					y2 = y1 + Math.cos( 4 * Math.PI * i/n ) * 100;
 
-					z2 = z1;
 
-
 
-					h = i2 % 2 ? 1 : 0.25;
 
-					if ( i2 % 4 <= 2 ) h -= 0.15;
 
-
 
-					color = new THREE.Color().setHSL( 0.1, 0.15, h );
 
-
 
-					position2[ geometry.vertices.length ] = new THREE.Vector3( x2, y2, z2 );
 
-					colors[ geometry.vertices.length ] = color;
 
-
 
-					geometry.vertices.push( new THREE.Vector3( x1, y1, z1 ) );
 
-
 
-				}
 
-
 
-				var ribbon = new THREE.Ribbon( geometry, material );
 
-				scene.add( ribbon );
 
-
 
-				materials.push( ribbon.material );
 
-
 
-				var ribbon = new THREE.Ribbon( geometry, material.clone() );
 
-				ribbon.position.y = 250;
 
-				ribbon.position.x = 250;
 
-				scene.add( ribbon );
 
-
 
-				ribbon.material.uniforms.color.value.setHSL( 0, 1, 0.5 );
 
-				materials.push( ribbon.material );
 
-
 
-				var ribbon = new THREE.Ribbon( geometry, material.clone() );
 
-				ribbon.position.y = -250;
 
-				ribbon.position.x = 250;
 
-				scene.add( ribbon );
 
-
 
-				ribbon.material.uniforms.color.value.setHSL( 0.1, 1, 0.5 );
 
-				materials.push( ribbon.material );
 
-
 
-				//
 
-
 
-				renderer = new THREE.WebGLRenderer( { antialias: true } );
 
-				renderer.setSize( window.innerWidth, window.innerHeight );
 
-				renderer.setClearColor( scene.fog.color, 1 );
 
-
 
-				container.appendChild( renderer.domElement );
 
-
 
-				//
 
-
 
-				stats = new Stats();
 
-				stats.domElement.style.position = 'absolute';
 
-				stats.domElement.style.top = '0px';
 
-				container.appendChild( stats.domElement );
 
-
 
-				//
 
-
 
-				document.addEventListener( 'mousemove', onDocumentMouseMove, false );
 
-				document.addEventListener( 'touchstart', onDocumentTouchStart, false );
 
-				document.addEventListener( 'touchmove', onDocumentTouchMove, false );
 
-
 
-				//
 
-
 
-				window.addEventListener( 'resize', onWindowResize, false );
 
-
 
-			}
 
-
 
-			function onWindowResize() {
 
-
 
-				windowHalfX = window.innerWidth / 2;
 
-				windowHalfY = window.innerHeight / 2;
 
-
 
-				camera.aspect = window.innerWidth / window.innerHeight;
 
-				camera.updateProjectionMatrix();
 
-
 
-				renderer.setSize( window.innerWidth, window.innerHeight );
 
-
 
-			}
 
-
 
-			function onDocumentMouseMove( event ) {
 
-
 
-				mouseX = event.clientX - windowHalfX;
 
-				mouseY = event.clientY - windowHalfY;
 
-
 
-			}
 
-
 
-			function onDocumentTouchStart( event ) {
 
-
 
-				if ( event.touches.length === 1 ) {
 
-
 
-					event.preventDefault();
 
-
 
-					mouseX = event.touches[ 0 ].pageX - windowHalfX;
 
-					mouseY = event.touches[ 0 ].pageY - windowHalfY;
 
-
 
-				}
 
-
 
-			}
 
-
 
-			function onDocumentTouchMove( event ) {
 
-
 
-				if ( event.touches.length === 1 ) {
 
-
 
-					event.preventDefault();
 
-
 
-					mouseX = event.touches[ 0 ].pageX - windowHalfX;
 
-					mouseY = event.touches[ 0 ].pageY - windowHalfY;
 
-
 
-				}
 
-
 
-			}
 
-
 
-			//
 
-
 
-			function animate() {
 
-
 
-				requestAnimationFrame( animate );
 
-
 
-				render();
 
-				stats.update();
 
-
 
-			}
 
-
 
-			function render() {
 
-
 
-				var time = Date.now() * 0.0025;
 
-
 
-				//camera.position.x += ( mouseX - camera.position.x ) * 0.036;
 
-				//camera.position.y += ( - mouseY - camera.position.y ) * 0.036;
 
-
 
-				camera.lookAt( scene.position );
 
-
 
-				for ( var i = 0; i < materials.length; i ++ ) {
 
-
 
-					var uniforms = materials[ i ].uniforms;
 
-					uniforms.ratio.value = 0.5 * ( Math.sin( time ) + 1 );
 
-
 
-				}
 
-
 
-				renderer.render( scene, camera );
 
-
 
-			}
 
-
 
-		</script>
 
-	</body>
 
-</html>

+ 0 - 317
examples/webgl_ribbons.html
View File 

@@ -1,317 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-	<head>
 
-		<title>three.js webgl - ribbons</title>
 
-		<meta charset="utf-8">
 
-		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
-		<style>
 
-			body {
 
-				background-color: #000000;
 
-				margin: 0px;
 
-				overflow: hidden;
 
-				font-family:Monospace;
 
-				font-size:13px;
 
-				text-align:center;
 
-				font-weight: bold;
 
-				text-align:center;
 
-			}
 
-
 
-			a {
 
-				color:#0078ff;
 
-			}
 
-
 
-			#info {
 
-				color:#fff;
 
-				position: absolute;
 
-				top: 0px; width: 100%;
 
-				padding: 5px;
 
-				z-index:100;
 
-			}
 
-		</style>
 
-	</head>
 
-
 
-	<body>
 
-
 
-		<script src="../build/three.min.js"></script>
 
-
 
-		<script src="js/shaders/ConvolutionShader.js"></script>
 
-		<script src="js/shaders/CopyShader.js"></script>
 
-
 
-		<script src="js/postprocessing/EffectComposer.js"></script>
 
-		<script src="js/postprocessing/MaskPass.js"></script>
 
-		<script src="js/postprocessing/RenderPass.js"></script>
 
-		<script src="js/postprocessing/ShaderPass.js"></script>
 
-		<script src="js/postprocessing/BloomPass.js"></script>
 
-
 
-		<script src="js/Detector.js"></script>
 
-		<script src="js/libs/stats.min.js"></script>
 
-
 
-		<div id="info">
 
-			<a href="http://threejs.org" target="_blank">three.js</a> - webgl ribbons example
 
-		</div>
 
-
 
-
 
-		<script>
 
-
 
-			if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
 
-
 
-			var container, stats;
 
-			var camera, scene, renderer, ribbon, geometry, geometry2, ribbons = [],
 
-				parameters, i, i2, h, color, x, y, z, z2, s, n, n2, nribbons, grid;
 
-
 
-			var mouseX = 0, mouseY = 0;
 
-
 
-			var windowHalfX = window.innerWidth / 2;
 
-			var windowHalfY = window.innerHeight / 2;
 
-
 
-			var postprocessing = { enabled  : true };
 
-
 
-			var composer;
 
-
 
-			init();
 
-			animate();
 
-
 
-			function init() {
 
-
 
-				container = document.createElement( 'div' );
 
-				document.body.appendChild( container );
 
-
 
-				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 3000 );
 
-				camera.position.z = 1200;
 
-
 
-				scene = new THREE.Scene();
 
-				scene.fog = new THREE.FogExp2( 0x000000, 0.0016 );
 
-
 
-				geometry = new THREE.Geometry();
 
-				geometry2 = new THREE.Geometry();
 
-
 
-				n = 1000;
 
-				n2 = 2 * n;
 
-
 
-				for ( i = -n; i < n; i++ ) {
 
-
 
-					i2 = i + n;
 
-
 
-					x = i * 1.175;
 
-					y = ( i2 % 2 ) * 5;
 
-
 
-					if ( i2 % 2 )  {
 
-
 
-						z = 10 * Math.sin( i2 * 0.3 ) * Math.cos( i2 * 0.1 );
 
-
 
-					}
 
-
 
-					geometry.vertices.push( new THREE.Vector3( x, y, z ) );
 
-					geometry2.vertices.push( new THREE.Vector3( x, y, z ) );
 
-
 
-					h = i2 % 2 ? 1 : 0.15;
 
-					if( i2 % 4 <= 2 ) h -= 0.15;
 
-
 
-					color = new THREE.Color( 0xffffff );
 
-					color.setHSL( 0.1, 0, h );
 
-					geometry.colors.push( color );
 
-					geometry2.colors.push( color );
 
-
 
-				}
 
-
 
-				var tmpRot = new THREE.Matrix4();
 
-				tmpRot.makeRotationAxis( new THREE.Vector3( 1, 0, 0 ), Math.PI/2 );
 
-
 
-				xgrid = 34;
 
-				ygrid = 15;
 
-				nribbons = xgrid * ygrid;
 
-
 
-				c = 0;
 
-
 
-				var rotationMatrix = new THREE.Matrix4();
 
-
 
-				for ( i = 0; i < xgrid; i ++ ) {
 
-					for ( j = 0; j < ygrid; j ++ ) {
 
-
 
-						var material = new THREE.MeshBasicMaterial( { color: 0xffffff, vertexColors: true, side: THREE.DoubleSide } );
 
-
 
-						ribbon = new THREE.Ribbon( i % 2 ? geometry : geometry2, material );
 
-						ribbon.rotation.x = 0;
 
-						ribbon.rotation.y = Math.PI / 2;
 
-						ribbon.rotation.z = Math.PI;
 
-
 
-						x = 40 * ( i - xgrid/2 );
 
-						y = 40 * ( j - ygrid/2 );
 
-						z = 0;
 
-
 
-						ribbon.position.set( x, y, z );
 
-
 
-						ribbon.matrixAutoUpdate = false;
 
-
 
-						// manually create local matrix
 
-
 
-						ribbon.matrix.setPosition( ribbon.position );
 
-
 
-						rotationMatrix.makeRotationFromEuler( ribbon.rotation );
 
-
 
-						ribbon.matrix.elements[ 0 ] = rotationMatrix.elements[ 0 ];
 
-						ribbon.matrix.elements[ 4 ] = rotationMatrix.elements[ 4 ];
 
-						ribbon.matrix.elements[ 8 ] = rotationMatrix.elements[ 8 ];
 
-
 
-						ribbon.matrix.elements[ 1 ] = rotationMatrix.elements[ 1 ];
 
-						ribbon.matrix.elements[ 5 ] = rotationMatrix.elements[ 5 ];
 
-						ribbon.matrix.elements[ 9 ] = rotationMatrix.elements[ 9 ];
 
-
 
-						ribbon.matrix.elements[ 2 ] = rotationMatrix.elements[ 2 ];
 
-						ribbon.matrix.elements[ 6 ] = rotationMatrix.elements[ 6 ];
 
-						ribbon.matrix.elements[ 10 ] = rotationMatrix.elements[ 10 ];
 
-
 
-						ribbon.matrix.multiply( tmpRot );
 
-
 
-						ribbon.matrix.scale( ribbon.scale );
 
-
 
-						ribbons.push( ribbon );
 
-						scene.add( ribbon );
 
-
 
-						c ++;
 
-
 
-					}
 
-
 
-				}
 
-
 
-				scene.matrixAutoUpdate = false;
 
-
 
-				//
 
-
 
-				renderer = new THREE.WebGLRenderer( { antialias: false } );
 
-				renderer.setSize( window.innerWidth, window.innerHeight );
 
-				renderer.autoClear = false;
 
-				renderer.setClearColor( scene.fog.color, 1 );
 
-
 
-				container.appendChild( renderer.domElement );
 
-
 
-				//
 
-
 
-				stats = new Stats();
 
-				stats.domElement.style.position = 'absolute';
 
-				stats.domElement.style.top = '0px';
 
-				container.appendChild( stats.domElement );
 
-
 
-				//
 
-
 
-				document.addEventListener( 'mousemove', onDocumentMouseMove, false );
 
-				document.addEventListener( 'touchstart', onDocumentTouchStart, false );
 
-				document.addEventListener( 'touchmove', onDocumentTouchMove, false );
 
-
 
-				//
 
-
 
-				var renderModel = new THREE.RenderPass( scene, camera );
 
-				var effectBloom = new THREE.BloomPass( 1.0 );
 
-				var effectCopy = new THREE.ShaderPass( THREE.CopyShader );
 
-
 
-				effectCopy.renderToScreen = true;
 
-
 
-				composer = new THREE.EffectComposer( renderer );
 
-
 
-				composer.addPass( renderModel );
 
-				composer.addPass( effectBloom );
 
-				composer.addPass( effectCopy );
 
-
 
-				//
 
-
 
-				window.addEventListener( 'resize', onWindowResize, false );
 
-
 
-			}
 
-
 
-			function onWindowResize() {
 
-
 
-				windowHalfX = window.innerWidth / 2;
 
-				windowHalfY = window.innerHeight / 2;
 
-
 
-				camera.aspect = window.innerWidth / window.innerHeight;
 
-				camera.updateProjectionMatrix();
 
-
 
-				renderer.setSize( window.innerWidth, window.innerHeight );
 
-
 
-				composer.reset();
 
-
 
-			}
 
-
 
-			function onDocumentMouseMove( event ) {
 
-
 
-				mouseX = event.clientX - windowHalfX;
 
-				mouseY = event.clientY - windowHalfY;
 
-
 
-			}
 
-
 
-			function onDocumentTouchStart( event ) {
 
-
 
-				if ( event.touches.length === 1 ) {
 
-
 
-					event.preventDefault();
 
-
 
-					mouseX = event.touches[ 0 ].pageX - windowHalfX;
 
-					mouseY = event.touches[ 0 ].pageY - windowHalfY;
 
-
 
-				}
 
-
 
-			}
 
-
 
-			function onDocumentTouchMove( event ) {
 
-
 
-				if ( event.touches.length === 1 ) {
 
-
 
-					event.preventDefault();
 
-
 
-					mouseX = event.touches[ 0 ].pageX - windowHalfX;
 
-					mouseY = event.touches[ 0 ].pageY - windowHalfY;
 
-
 
-				}
 
-
 
-			}
 
-
 
-			//
 
-
 
-			function animate() {
 
-
 
-				requestAnimationFrame( animate );
 
-
 
-				render();
 
-				stats.update();
 
-
 
-			}
 
-
 
-			function render() {
 
-
 
-				var time = Date.now() * 0.00005;
 
-
 
-				camera.position.x += ( mouseX - camera.position.x ) * 0.036;
 
-				camera.position.y += ( - mouseY - camera.position.y ) * 0.036;
 
-
 
-				camera.lookAt( scene.position );
 
-
 
-				for ( i = -n; i < n; i ++ ) {
 
-
 
-					i2 = i + n;
 
-
 
-					z  =  10 * Math.sin( i2 * 0.1 + time*30 );
 
-					z2 =  20 * Math.cos( Math.sin( i2 * 0.1 + time * 20 ) );
 
-
 
-					geometry.vertices[ i2 ].z = z;
 
-					geometry2.vertices[ i2 ].z = z2;
 
-
 
-				}
 
-
 
-				geometry.verticesNeedUpdate = true;
 
-				geometry2.verticesNeedUpdate = true;
 
-
 
-				for ( i = 0; i < nribbons; i++ ) {
 
-
 
-					h = ( 360 * ( i / nribbons + time ) % 360 ) / 360;
 
-					ribbons[ i ].material.color.setHSL( h, ( i % 20 / 20 ) * 0.3 + 0.7, 0.6 );
 
-
 
-				}
 
-
 
-				renderer.clear();
 
-				composer.render( 0.1 );
 
-
 
-			}
 
-
 
-		</script>
 
-	</body>
 
-</html>

+ 1 - 2
src/core/Geometry.js
View File 

@@ -15,8 +15,7 @@ THREE.Geometry = function () {
 
 	this.name = '';
 
 
 	this.vertices = [];
 
-	this.colors = [];  // one-to-one vertex colors, used in ParticleSystem, Line and Ribbon
 
-	this.normals = []; // one-to-one vertex normals, used in Ribbon
 
+	this.colors = [];  // one-to-one vertex colors, used in ParticleSystem and Line
 
 
 	this.faces = [];

+ 0 - 24
src/objects/Ribbon.js
View File 

@@ -1,24 +0,0 @@
 
-/**
 
- * @author alteredq / http://alteredqualia.com/
 
- */
 
-
 
-THREE.Ribbon = function ( geometry, material ) {
 
-
 
-	THREE.Object3D.call( this );
 
-
 
-	this.geometry = geometry;
 
-	this.material = material;
 
-
 
-};
 
-
 
-THREE.Ribbon.prototype = Object.create( THREE.Object3D.prototype );
 
-
 
-THREE.Ribbon.prototype.clone = function ( object ) {
 
-
 
-	if ( object === undefined ) object = new THREE.Ribbon( this.geometry, this.material );
 
-
 
-	THREE.Object3D.prototype.clone.call( this, object );
 
-
 
-	return object;
 
-
 
-};

+ 1 - 242
src/renderers/WebGLRenderer.js
View File 

@@ -452,16 +452,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 	};
 
 
-	function createRibbonBuffers ( geometry ) {
 
-
 
-		geometry.__webglVertexBuffer = _gl.createBuffer();
 
-		geometry.__webglColorBuffer = _gl.createBuffer();
 
-		geometry.__webglNormalBuffer = _gl.createBuffer();
 
-
 
-		_this.info.memory.geometries ++;
 
-
 
-	};
 
-
 
 	function createMeshBuffers ( geometryGroup ) {
 
 
 		geometryGroup.__webglVertexBuffer = _gl.createBuffer();
 
@@ -837,20 +827,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 	};
 
 
-	function initRibbonBuffers ( geometry, object ) {
 
-
 
-		var nvertices = geometry.vertices.length;
 
-
 
-		geometry.__vertexArray = new Float32Array( nvertices * 3 );
 
-		geometry.__colorArray = new Float32Array( nvertices * 3 );
 
-		geometry.__normalArray = new Float32Array( nvertices * 3 );
 
-
 
-		geometry.__webglVertexCount = nvertices;
 
-
 
-		initCustomAttributes ( geometry, object );
 
-
 
-	};
 
-
 
 	function initMeshBuffers ( geometryGroup, object ) {
 
 
 		var geometry = object.geometry,
 
@@ -1600,182 +1576,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 	};
 
 
-	function setRibbonBuffers ( geometry, hint ) {
 
-
 
-		var v, c, n, vertex, offset, color, normal,
 
-
 
-		i, il, ca, cal, customAttribute, value,
 
-
 
-		vertices = geometry.vertices,
 
-		colors = geometry.colors,
 
-		normals = geometry.normals,
 
-
 
-		vl = vertices.length,
 
-		cl = colors.length,
 
-		nl = normals.length,
 
-
 
-		vertexArray = geometry.__vertexArray,
 
-		colorArray = geometry.__colorArray,
 
-		normalArray = geometry.__normalArray,
 
-
 
-		dirtyVertices = geometry.verticesNeedUpdate,
 
-		dirtyColors = geometry.colorsNeedUpdate,
 
-		dirtyNormals = geometry.normalsNeedUpdate,
 
-
 
-		customAttributes = geometry.__webglCustomAttributesList;
 
-
 
-		if ( dirtyVertices ) {
 
-
 
-			for ( v = 0; v < vl; v ++ ) {
 
-
 
-				vertex = vertices[ v ];
 
-
 
-				offset = v * 3;
 
-
 
-				vertexArray[ offset ]     = vertex.x;
 
-				vertexArray[ offset + 1 ] = vertex.y;
 
-				vertexArray[ offset + 2 ] = vertex.z;
 
-
 
-			}
 
-
 
-			_gl.bindBuffer( _gl.ARRAY_BUFFER, geometry.__webglVertexBuffer );
 
-			_gl.bufferData( _gl.ARRAY_BUFFER, vertexArray, hint );
 
-
 
-		}
 
-
 
-		if ( dirtyColors ) {
 
-
 
-			for ( c = 0; c < cl; c ++ ) {
 
-
 
-				color = colors[ c ];
 
-
 
-				offset = c * 3;
 
-
 
-				colorArray[ offset ]     = color.r;
 
-				colorArray[ offset + 1 ] = color.g;
 
-				colorArray[ offset + 2 ] = color.b;
 
-
 
-			}
 
-
 
-			_gl.bindBuffer( _gl.ARRAY_BUFFER, geometry.__webglColorBuffer );
 
-			_gl.bufferData( _gl.ARRAY_BUFFER, colorArray, hint );
 
-
 
-		}
 
-
 
-		if ( dirtyNormals ) {
 
-
 
-			for ( n = 0; n < nl; n ++ ) {
 
-
 
-				normal = normals[ n ];
 
-
 
-				offset = n * 3;
 
-
 
-				normalArray[ offset ]     = normal.x;
 
-				normalArray[ offset + 1 ] = normal.y;
 
-				normalArray[ offset + 2 ] = normal.z;
 
-
 
-			}
 
-
 
-			_gl.bindBuffer( _gl.ARRAY_BUFFER, geometry.__webglNormalBuffer );
 
-			_gl.bufferData( _gl.ARRAY_BUFFER, normalArray, hint );
 
-
 
-		}
 
-
 
-		if ( customAttributes ) {
 
-
 
-			for ( i = 0, il = customAttributes.length; i < il; i ++ ) {
 
-
 
-				customAttribute = customAttributes[ i ];
 
-
 
-				if ( customAttribute.needsUpdate &&
 
-					 ( customAttribute.boundTo === undefined ||
 
-					   customAttribute.boundTo === "vertices" ) ) {
 
-
 
-					offset = 0;
 
-
 
-					cal = customAttribute.value.length;
 
-
 
-					if ( customAttribute.size === 1 ) {
 
-
 
-						for ( ca = 0; ca < cal; ca ++ ) {
 
-
 
-							customAttribute.array[ ca ] = customAttribute.value[ ca ];
 
-
 
-						}
 
-
 
-					} else if ( customAttribute.size === 2 ) {
 
-
 
-						for ( ca = 0; ca < cal; ca ++ ) {
 
-
 
-							value = customAttribute.value[ ca ];
 
-
 
-							customAttribute.array[ offset ] 	= value.x;
 
-							customAttribute.array[ offset + 1 ] = value.y;
 
-
 
-							offset += 2;
 
-
 
-						}
 
-
 
-					} else if ( customAttribute.size === 3 ) {
 
-
 
-						if ( customAttribute.type === "c" ) {
 
-
 
-							for ( ca = 0; ca < cal; ca ++ ) {
 
-
 
-								value = customAttribute.value[ ca ];
 
-
 
-								customAttribute.array[ offset ] 	= value.r;
 
-								customAttribute.array[ offset + 1 ] = value.g;
 
-								customAttribute.array[ offset + 2 ] = value.b;
 
-
 
-								offset += 3;
 
-
 
-							}
 
-
 
-						} else {
 
-
 
-							for ( ca = 0; ca < cal; ca ++ ) {
 
-
 
-								value = customAttribute.value[ ca ];
 
-
 
-								customAttribute.array[ offset ] 	= value.x;
 
-								customAttribute.array[ offset + 1 ] = value.y;
 
-								customAttribute.array[ offset + 2 ] = value.z;
 
-
 
-								offset += 3;
 
-
 
-							}
 
-
 
-						}
 
-
 
-					} else if ( customAttribute.size === 4 ) {
 
-
 
-						for ( ca = 0; ca < cal; ca ++ ) {
 
-
 
-							value = customAttribute.value[ ca ];
 
-
 
-							customAttribute.array[ offset ] 	 = value.x;
 
-							customAttribute.array[ offset + 1  ] = value.y;
 
-							customAttribute.array[ offset + 2  ] = value.z;
 
-							customAttribute.array[ offset + 3  ] = value.w;
 
-
 
-							offset += 4;
 
-
 
-						}
 
-
 
-					}
 
-
 
-					_gl.bindBuffer( _gl.ARRAY_BUFFER, customAttribute.buffer );
 
-					_gl.bufferData( _gl.ARRAY_BUFFER, customAttribute.array, hint );
 
-
 
-				}
 
-
 
-			}
 
-
 
-		}
 
-
 
-	};
 
-
 
 	function setMeshBuffers( geometryGroup, object, hint, dispose, material ) {
 
 
 		if ( ! geometryGroup.__inittedArrays ) {
 
@@ -3193,14 +2993,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 			_this.info.render.calls ++;
 
 			_this.info.render.points += geometryGroup.__webglParticleCount;
 
 
-		// render ribbon
 
-
 
-		} else if ( object instanceof THREE.Ribbon ) {
 
-
 
-			_gl.drawArrays( _gl.TRIANGLE_STRIP, 0, geometryGroup.__webglVertexCount );
 
-
 
-			_this.info.render.calls ++;
 
-
 
 		}
 
 
 	};
 
@@ -3994,19 +3786,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 				}
 
 
-			} else if ( object instanceof THREE.Ribbon ) {
 
-
 
-				if ( ! geometry.__webglVertexBuffer ) {
 
-
 
-					createRibbonBuffers( geometry );
 
-					initRibbonBuffers( geometry, object );
 
-
 
-					geometry.verticesNeedUpdate = true;
 
-					geometry.colorsNeedUpdate = true;
 
-					geometry.normalsNeedUpdate = true;
 
-
 
-				}
 
-
 
 			} else if ( object instanceof THREE.Line ) {
 
 
 				if ( ! geometry.__webglVertexBuffer ) {
 
@@ -4058,8 +3837,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 				}
 
 
-			} else if ( object instanceof THREE.Ribbon ||
 
-						object instanceof THREE.Line ||
 
+			} else if ( object instanceof THREE.Line ||
 
 						object instanceof THREE.ParticleSystem ) {
 
 
 				geometry = object.geometry;
 
@@ -4165,24 +3943,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 			material.attributes && clearCustomAttributes( material );
 
 
-		} else if ( object instanceof THREE.Ribbon ) {
 
-
 
-			material = getBufferMaterial( object, geometry );
 
-
 
-			customAttributesDirty = material.attributes && areCustomAttributesDirty( material );
 
-
 
-			if ( geometry.verticesNeedUpdate || geometry.colorsNeedUpdate || geometry.normalsNeedUpdate || customAttributesDirty ) {
 
-
 
-				setRibbonBuffers( geometry, _gl.DYNAMIC_DRAW );
 
-
 
-			}
 
-
 
-			geometry.verticesNeedUpdate = false;
 
-			geometry.colorsNeedUpdate = false;
 
-			geometry.normalsNeedUpdate = false;
 
-
 
-			material.attributes && clearCustomAttributes( material );
 
-
 
 		} else if ( object instanceof THREE.Line ) {
 
 
 			material = getBufferMaterial( object, geometry );
 
@@ -4253,7 +4013,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 		if ( object instanceof THREE.Mesh  ||
 
 			 object instanceof THREE.ParticleSystem ||
 
-			 object instanceof THREE.Ribbon ||
 
 			 object instanceof THREE.Line ) {
 
 
 			removeInstances( scene.__webglObjects, object );

+ 0 - 1
utils/build/includes/common.json
View File 

@@ -73,7 +73,6 @@
 
 	"src/objects/Bone.js",
 
 	"src/objects/SkinnedMesh.js",
 
 	"src/objects/MorphAnimMesh.js",
 
-	"src/objects/Ribbon.js",
 
 	"src/objects/LOD.js",
 
 	"src/objects/Sprite.js",
 
 	"src/scenes/Scene.js",

+ 0 - 1
utils/build/includes/webgl.json
View File 

@@ -65,7 +65,6 @@
 
 	"src/objects/Bone.js",
 
 	"src/objects/SkinnedMesh.js",
 
 	"src/objects/MorphAnimMesh.js",
 
-	"src/objects/Ribbon.js",
 
 	"src/objects/LOD.js",
 
 	"src/objects/Sprite.js",
 
 	"src/scenes/Scene.js",

+ 0 - 1
utils/editors/sublimetext2/threejs.sublime-completions
View File 

@@ -75,7 +75,6 @@
 
 		{ "trigger": "THREE.Mesh", "contents": "THREE.Mesh( ${1:geometry}, ${2:material} )$0" },
 
 		{ "trigger": "THREE.SkinnedMesh", "contents": "THREE.SkinnedMesh( ${1:geometry}, ${2:material}, ${3:useVertexTexture} )$0" },
 
 		{ "trigger": "THREE.MorphAnimMesh", "contents": "THREE.MorphAnimMesh( ${1:geometry}, ${2:material} )$0" },
 
-		{ "trigger": "THREE.Ribbon", "contents": "THREE.Ribbon( ${1:geometry}, ${2:material} )$0" },
 
 		{ "trigger": "THREE.LOD", "contents": "THREE.LOD()$0" },
 
 		{ "trigger": "THREE.Sprite", "contents": "THREE.Sprite( ${1:material} )$0" },
 
 		{ "trigger": "THREE.Scene", "contents": "THREE.Scene()$0" },