Merge pull request #13421 from WestLangley/dev-to_bg_1

Examples: Geometry => BufferGeometry

examples/canvas_geometry_nurbs.html

@@ -105,25 +105,26 @@
 
 				}
 
-				var nurbsCurve = new THREE.NURBSCurve(nurbsDegree, nurbsKnots, nurbsControlPoints);
+				var nurbsCurve = new THREE.NURBSCurve( nurbsDegree, nurbsKnots, nurbsControlPoints );
+
+				var nurbsGeometry = new THREE.BufferGeometry();
+				nurbsGeometry.setFromPoints( nurbsCurve.getPoints( 200 ) );
 
-				var nurbsGeometry = new THREE.Geometry();
-				nurbsGeometry.vertices = nurbsCurve.getPoints( 200 );
 				var nurbsMaterial = new THREE.LineBasicMaterial( { linewidth: 10, color: 0x333333 } );
 
 				var nurbsLine = new THREE.Line( nurbsGeometry, nurbsMaterial );
-				nurbsLine.position.set( 0, -100, 0 );
+				nurbsLine.position.set( 0, - 100, 0 );
+				group.add( nurbsLine );
+
+				var nurbsControlPointsGeometry = new THREE.BufferGeometry();
+				nurbsControlPointsGeometry.setFromPoints( nurbsCurve.controlPoints );
 
-				var nurbsControlPointsGeometry = new THREE.Geometry();
-				nurbsControlPointsGeometry.vertices = nurbsCurve.controlPoints;
 				var nurbsControlPointsMaterial = new THREE.LineBasicMaterial( { linewidth: 2, color: 0x333333, opacity: 0.25 } );
 
 				var nurbsControlPointsLine = new THREE.Line( nurbsControlPointsGeometry, nurbsControlPointsMaterial );
 				nurbsControlPointsLine.position.copy( nurbsLine.position );
 
-				group.add( nurbsLine, nurbsControlPointsLine );
-				// this also works:
-				// group.add( nurbsLine ).add( nurbsControlPointsLine );
+				group.add( nurbsControlPointsLine );
 
 				//
 

examples/canvas_geometry_shapes.html

@@ -83,9 +83,9 @@
 					// line
 
 					var points = shape.getPoints();
-					var geometry = new THREE.Geometry().setFromPoints( points );
+					var geometry = new THREE.BufferGeometry().setFromPoints( points );
 
-					var material = new THREE.LineBasicMaterial( { linewidth: 10, color: 0x333333, transparent: true } );
+					var material = new THREE.LineBasicMaterial( { linewidth: 10, color: 0x333333 } );
 
 					var line = new THREE.Line( geometry, material );
 					line.position.set( x, y, z );

examples/canvas_lines.html

@@ -73,7 +73,7 @@
 
 				} );
 
-				var geometry = new THREE.Geometry();
+				var points = [];
 
 				for ( var i = 0; i < 100; i ++ ) {
 
@@ -86,12 +86,14 @@
 					particle.scale.x = particle.scale.y = 10;
 					scene.add( particle );
 
-					geometry.vertices.push( particle.position );
+					points.push( particle.position );
 
 				}
 
 				// lines
 
+				var geometry = new THREE.BufferGeometry().setFromPoints( points );
+
 				var line = new THREE.Line( geometry, new THREE.LineBasicMaterial( { color: 0xffffff, opacity: 0.5 } ) );
 				scene.add( line );
 

examples/webgl_geometry_nurbs.html

@@ -107,19 +107,22 @@
 
 				}
 
-				var nurbsCurve = new THREE.NURBSCurve(nurbsDegree, nurbsKnots, nurbsControlPoints);
+				var nurbsCurve = new THREE.NURBSCurve( nurbsDegree, nurbsKnots, nurbsControlPoints );
 
-				var nurbsGeometry = new THREE.Geometry();
-				nurbsGeometry.vertices = nurbsCurve.getPoints(200);
-				var nurbsMaterial = new THREE.LineBasicMaterial( { linewidth: 10, color: 0x333333, transparent: true } );
+				var nurbsGeometry = new THREE.BufferGeometry();
+				nurbsGeometry.setFromPoints( nurbsCurve.getPoints( 200 ) );
+
+				var nurbsMaterial = new THREE.LineBasicMaterial( { linewidth: 10, color: 0x333333 } );
 
 				var nurbsLine = new THREE.Line( nurbsGeometry, nurbsMaterial );
-				nurbsLine.position.set( 200, -100, 0 );
+				nurbsLine.position.set( 200, - 100, 0 );
 				group.add( nurbsLine );
 
-				var nurbsControlPointsGeometry = new THREE.Geometry();
-				nurbsControlPointsGeometry.vertices = nurbsCurve.controlPoints;
+				var nurbsControlPointsGeometry = new THREE.BufferGeometry();
+				nurbsControlPointsGeometry.setFromPoints( nurbsCurve.controlPoints );
+
 				var nurbsControlPointsMaterial = new THREE.LineBasicMaterial( { linewidth: 2, color: 0x333333, opacity: 0.25, transparent: true } );
+
 				var nurbsControlPointsLine = new THREE.Line( nurbsControlPointsGeometry, nurbsControlPointsMaterial );
 				nurbsControlPointsLine.position.copy( nurbsLine.position );
 				group.add( nurbsControlPointsLine );
@@ -156,9 +159,9 @@
 				map.wrapS = map.wrapT = THREE.RepeatWrapping;
 				map.anisotropy = 16;
 
-				function getSurfacePoint(u, v) {
+				function getSurfacePoint( u, v ) {
 
-					return nurbsSurface.getPoint(u, v);
+					return nurbsSurface.getPoint( u, v );
 
 				}