diff --git a/examples/css3d_sandbox.html b/examples/css3d_sandbox.html index 365f9a8ccd99f9269e5c08aefb5a873d3319bebf..6b601ccdc6ebe325b374952b0fbdb5daa86b1ddd 100644 --- a/examples/css3d_sandbox.html +++ b/examples/css3d_sandbox.html @@ -82,7 +82,7 @@ object.scale.y = Math.random() + 0.5; scene2.add( object ); - var geometry = new THREE.PlaneGeometry( 100, 100 ); + var geometry = new THREE.PlaneBufferGeometry( 100, 100 ); var mesh = new THREE.Mesh( geometry, material ); mesh.position.copy( object.position ); mesh.rotation.copy( object.rotation ); @@ -93,7 +93,7 @@ // - renderer = new THREE.WebGLRenderer(); + renderer = new THREE.WebGLRenderer( { antialias: true } ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); document.body.appendChild( renderer.domElement ); diff --git a/examples/files.js b/examples/files.js index eeeb4a83bd7d1d7e96dbc6774b215dca43421b25..1d8d216e9bb47c011550eadee912e1cbe07998e3 100644 --- a/examples/files.js +++ b/examples/files.js @@ -233,6 +233,7 @@ var files = { "webgl_postprocessing_ssaa_unbiased", "webgl_postprocessing_nodes", "webgl_postprocessing_outline", + "webgl_postprocessing_pixel", "webgl_postprocessing_procedural", "webgl_postprocessing_sao", "webgl_postprocessing_smaa", diff --git a/examples/js/postprocessing/SAOPass.js b/examples/js/postprocessing/SAOPass.js index 5428bca6c82a2a9114be1b6abaa475ed2b5939f4..57a98151c5b574c5a96835c8032fb4719bbc5d19 100644 --- a/examples/js/postprocessing/SAOPass.js +++ b/examples/js/postprocessing/SAOPass.js @@ -161,7 +161,7 @@ THREE.SAOPass = function ( scene, camera, depthTexture, useNormals, resolution ) this.quadCamera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 ); this.quadScene = new THREE.Scene(); - this.quad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null ); + this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null ); this.quadScene.add( this.quad ); }; diff --git a/examples/js/postprocessing/SSAARenderPass.js b/examples/js/postprocessing/SSAARenderPass.js index 6ec4e3a6985b6e872b46ee85e930e2cb522b2c37..3088d58ab8fc7a32ebabad89b2f6883bcd55797f 100644 --- a/examples/js/postprocessing/SSAARenderPass.js +++ b/examples/js/postprocessing/SSAARenderPass.js @@ -42,7 +42,7 @@ THREE.SSAARenderPass = function ( scene, camera, clearColor, clearAlpha ) { this.camera2 = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 ); this.scene2 = new THREE.Scene(); - this.quad2 = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), this.copyMaterial ); + this.quad2 = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), this.copyMaterial ); this.quad2.frustumCulled = false; // Avoid getting clipped this.scene2.add( this.quad2 ); diff --git a/examples/webaudio_sandbox.html b/examples/webaudio_sandbox.html index c18e5893e988c938f11bd61a7fc4e8b4d5b48a47..e158b850b4550c1a651a0673146f1f357582c4d0 100644 --- a/examples/webaudio_sandbox.html +++ b/examples/webaudio_sandbox.html @@ -39,22 +39,16 @@ navigate with WASD / arrows / mouse - -
- - - @@ -49,8 +48,6 @@ function init() { - var container = document.getElementById( 'container' ); - camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 2000 ); camera.position.y = 400; @@ -73,43 +70,43 @@ // - object = new THREE.Mesh( new THREE.SphereGeometry( 75, 20, 10 ), material ); + object = new THREE.Mesh( new THREE.SphereBufferGeometry( 75, 20, 10 ), material ); object.position.set( - 300, 0, 200 ); scene.add( object ); - object = new THREE.Mesh( new THREE.IcosahedronGeometry( 75, 1 ), material ); + object = new THREE.Mesh( new THREE.IcosahedronBufferGeometry( 75, 1 ), material ); object.position.set( - 100, 0, 200 ); scene.add( object ); - object = new THREE.Mesh( new THREE.OctahedronGeometry( 75, 2 ), material ); + object = new THREE.Mesh( new THREE.OctahedronBufferGeometry( 75, 2 ), material ); object.position.set( 100, 0, 200 ); scene.add( object ); - object = new THREE.Mesh( new THREE.TetrahedronGeometry( 75, 0 ), material ); + object = new THREE.Mesh( new THREE.TetrahedronBufferGeometry( 75, 0 ), material ); object.position.set( 300, 0, 200 ); scene.add( object ); // - object = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100, 4, 4 ), material ); + object = new THREE.Mesh( new THREE.PlaneBufferGeometry( 100, 100, 4, 4 ), material ); object.position.set( - 300, 0, 0 ); scene.add( object ); - object = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100, 4, 4, 4 ), material ); + object = new THREE.Mesh( new THREE.BoxBufferGeometry( 100, 100, 100, 4, 4, 4 ), material ); object.position.set( - 100, 0, 0 ); scene.add( object ); - object = new THREE.Mesh( new THREE.CircleGeometry( 50, 20, 0, Math.PI * 2 ), material ); + object = new THREE.Mesh( new THREE.CircleBufferGeometry( 50, 20, 0, Math.PI * 2 ), material ); object.position.set( 100, 0, 0 ); scene.add( object ); - object = new THREE.Mesh( new THREE.RingGeometry( 10, 50, 20, 5, 0, Math.PI * 2 ), material ); + object = new THREE.Mesh( new THREE.RingBufferGeometry( 10, 50, 20, 5, 0, Math.PI * 2 ), material ); object.position.set( 300, 0, 0 ); scene.add( object ); // - object = new THREE.Mesh( new THREE.CylinderGeometry( 25, 75, 100, 40, 5 ), material ); + object = new THREE.Mesh( new THREE.CylinderBufferGeometry( 25, 75, 100, 40, 5 ), material ); object.position.set( - 300, 0, - 200 ); scene.add( object ); @@ -121,15 +118,15 @@ } - object = new THREE.Mesh( new THREE.LatheGeometry( points, 20 ), material ); + object = new THREE.Mesh( new THREE.LatheBufferGeometry( points, 20 ), material ); object.position.set( - 100, 0, - 200 ); scene.add( object ); - object = new THREE.Mesh( new THREE.TorusGeometry( 50, 20, 20, 20 ), material ); + object = new THREE.Mesh( new THREE.TorusBufferGeometry( 50, 20, 20, 20 ), material ); object.position.set( 100, 0, - 200 ); scene.add( object ); - object = new THREE.Mesh( new THREE.TorusKnotGeometry( 50, 10, 50, 20 ), material ); + object = new THREE.Mesh( new THREE.TorusKnotBufferGeometry( 50, 10, 50, 20 ), material ); object.position.set( 300, 0, - 200 ); scene.add( object ); @@ -138,11 +135,10 @@ renderer = new THREE.WebGLRenderer( { antialias: true } ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); - - container.appendChild( renderer.domElement ); + document.body.appendChild( renderer.domElement ); stats = new Stats(); - container.appendChild( stats.dom ); + document.body.appendChild( stats.dom ); // diff --git a/examples/webgl_geometry_extrude_splines.html b/examples/webgl_geometry_extrude_splines.html index e2f2d6a24e95161ae4cc0715d89e7a8ab32f0e69..ececa0278f52b6b61db32c3ca0de672348d0bb23 100644 --- a/examples/webgl_geometry_extrude_splines.html +++ b/examples/webgl_geometry_extrude_splines.html @@ -195,7 +195,7 @@ // debug camera - cameraEye = new THREE.Mesh( new THREE.SphereGeometry( 5 ), new THREE.MeshBasicMaterial( { color: 0xdddddd } ) ); + cameraEye = new THREE.Mesh( new THREE.SphereBufferGeometry( 5 ), new THREE.MeshBasicMaterial( { color: 0xdddddd } ) ); parent.add( cameraEye ); cameraHelper.visible = params.cameraHelper; diff --git a/examples/webgl_geometry_spline_editor.html b/examples/webgl_geometry_spline_editor.html index f29d8352dc306d5e3ce111145d1e44ce17df6dd6..e64e97ce9cdcd509d40d0d82f97ed054bca2a58e 100644 --- a/examples/webgl_geometry_spline_editor.html +++ b/examples/webgl_geometry_spline_editor.html @@ -57,13 +57,13 @@ var splineHelperObjects = [], splineOutline; var splinePointsLength = 4; var positions = []; + var point = new THREE.Vector3(); var options; - var geometry = new THREE.BoxGeometry( 20, 20, 20 ); + var geometry = new THREE.BoxBufferGeometry( 20, 20, 20 ); var transformControl; var ARC_SEGMENTS = 200; - var splineMesh; var splines = {}; @@ -102,7 +102,7 @@ scene.add( light ); spotlight = light; - var planeGeometry = new THREE.PlaneGeometry( 2000, 2000 ); + var planeGeometry = new THREE.PlaneBufferGeometry( 2000, 2000 ); planeGeometry.rotateX( - Math.PI / 2 ); var planeMaterial = new THREE.ShadowMaterial( { opacity: 0.2 } ); @@ -230,7 +230,6 @@ } - /******* * Curves *********/ @@ -249,13 +248,8 @@ } - var geometry = new THREE.Geometry(); - - for ( var i = 0; i < ARC_SEGMENTS; i ++ ) { - - geometry.vertices.push( new THREE.Vector3() ); - - } + var geometry = new THREE.BufferGeometry(); + geometry.addAttribute( 'position', new THREE.BufferAttribute( new Float32Array( ARC_SEGMENTS * 3 ), 3 ) ); var curve = new THREE.CatmullRomCurve3( positions ); curve.curveType = 'catmullrom'; @@ -357,17 +351,18 @@ var spline = splines[ k ]; - splineMesh = spline.mesh; + var splineMesh = spline.mesh; + var position = splineMesh.geometry.attributes.position; for ( var i = 0; i < ARC_SEGMENTS; i ++ ) { - var p = splineMesh.geometry.vertices[ i ]; var t = i / ( ARC_SEGMENTS - 1 ); - spline.getPoint( t, p ); + spline.getPoint( t, point ); + position.setXYZ( i, point.x, point.y, point.z ); } - splineMesh.geometry.verticesNeedUpdate = true; + position.needsUpdate = true; } diff --git a/examples/webgl_interactive_lines.html b/examples/webgl_interactive_lines.html index d029e54e20b6ecb4b89190f2a80b685bca674ceb..686369c409e3488d19a50efbe7ff247f92bd1a33 100644 --- a/examples/webgl_interactive_lines.html +++ b/examples/webgl_interactive_lines.html @@ -50,14 +50,15 @@ scene = new THREE.Scene(); scene.background = new THREE.Color( 0xf0f0f0 ); - var geometry = new THREE.SphereGeometry( 5 ); + var geometry = new THREE.SphereBufferGeometry( 5 ); var material = new THREE.MeshBasicMaterial( { color: 0xff0000 } ); sphereInter = new THREE.Mesh( geometry, material ); sphereInter.visible = false; scene.add( sphereInter ); - var geometry = new THREE.Geometry(); + var lineGeometry = new THREE.BufferGeometry(); + var points = []; var point = new THREE.Vector3(); var direction = new THREE.Vector3(); @@ -70,11 +71,12 @@ direction.normalize().multiplyScalar( 10 ); point.add( direction ); - - geometry.vertices.push( point.clone() ); + points.push( point.x, point.y, point.z ); } + lineGeometry.addAttribute( 'position', new THREE.Float32BufferAttribute( points, 3 ) ); + parentTransform = new THREE.Object3D(); parentTransform.position.x = Math.random() * 40 - 20; parentTransform.position.y = Math.random() * 40 - 20; @@ -94,11 +96,11 @@ if ( Math.random() > 0.5 ) { - object = new THREE.Line( geometry ); + object = new THREE.Line( lineGeometry ); } else { - object = new THREE.LineSegments( geometry ); + object = new THREE.LineSegments( lineGeometry ); } diff --git a/examples/webgl_interactive_raycasting_points.html b/examples/webgl_interactive_raycasting_points.html index df812023d67c80e5dcc35284930b12851e9fc3ff..f1113f886b1fcb2870df3da04259911ffa04b0f7 100644 --- a/examples/webgl_interactive_raycasting_points.html +++ b/examples/webgl_interactive_raycasting_points.html @@ -247,7 +247,7 @@ // - var sphereGeometry = new THREE.SphereGeometry( 0.1, 32, 32 ); + var sphereGeometry = new THREE.SphereBufferGeometry( 0.1, 32, 32 ); var sphereMaterial = new THREE.MeshBasicMaterial( { color: 0xff0000 } ); for ( var i = 0; i < 40; i++ ) { @@ -260,7 +260,7 @@ // - renderer = new THREE.WebGLRenderer(); + renderer = new THREE.WebGLRenderer( { antialias: true } ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); diff --git a/examples/webgl_lights_hemisphere.html b/examples/webgl_lights_hemisphere.html index 4a24d4bd1bd7bd1975ff1cd1cbb06427aee724d0..664123dfcc15dc14150a94964881065bfd03f098 100644 --- a/examples/webgl_lights_hemisphere.html +++ b/examples/webgl_lights_hemisphere.html @@ -141,7 +141,7 @@ dirLight.shadow.camera.far = 3500; dirLight.shadow.bias = -0.0001; - dirLightHeper = new THREE.DirectionalLightHelper( dirLight, 10 ) + dirLightHeper = new THREE.DirectionalLightHelper( dirLight, 10 ); scene.add( dirLightHeper ); // GROUND @@ -171,7 +171,7 @@ scene.fog.color.copy( uniforms.bottomColor.value ); - var skyGeo = new THREE.SphereGeometry( 4000, 32, 15 ); + var skyGeo = new THREE.SphereBufferGeometry( 4000, 32, 15 ); var skyMat = new THREE.ShaderMaterial( { vertexShader: vertexShader, fragmentShader: fragmentShader, uniforms: uniforms, side: THREE.BackSide } ); var sky = new THREE.Mesh( skyGeo, skyMat ); diff --git a/examples/webgl_lights_pointlights2.html b/examples/webgl_lights_pointlights2.html index 887e00d1650066cfd20aa7595dd43b80e38dc5d0..84c626ae3c8887d35441cf451ad4d79aaaa821bd 100644 --- a/examples/webgl_lights_pointlights2.html +++ b/examples/webgl_lights_pointlights2.html @@ -114,9 +114,7 @@ // OBJECTS - //var objectGeometry = new THREE.BoxGeometry( 0.5, 1, 1 ); - //var objectGeometry = new THREE.SphereGeometry( 1.5, 16, 8 ); - var objectGeometry = new THREE.TorusGeometry( 1.5, 0.4, 8, 16 ); + var objectGeometry = new THREE.TorusBufferGeometry( 1.5, 0.4, 8, 16 ); for ( var i = 0; i < 5000; i ++ ) { @@ -143,7 +141,7 @@ var c1 = 0xff0040, c2 = 0x0040ff, c3 = 0x80ff80, c4 = 0xffaa00, c5 = 0x00ffaa, c6 = 0xff1100; - var sphere = new THREE.SphereGeometry( 0.25, 16, 8 ); + var sphere = new THREE.SphereBufferGeometry( 0.25, 16, 8 ); light1 = new THREE.PointLight( c1, intensity, distance, decay ); light1.add( new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: c1 } ) ) ); @@ -175,7 +173,7 @@ // RENDERER - renderer = new THREE.WebGLRenderer(); + renderer = new THREE.WebGLRenderer( { antialias: true } ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); diff --git a/examples/webgl_lights_rectarealight.html b/examples/webgl_lights_rectarealight.html index e456fa7c852738a1d5df690d884ae57116072d42..d580b09e58ddc76a250494b1258ca3dc9a95c4c6 100644 --- a/examples/webgl_lights_rectarealight.html +++ b/examples/webgl_lights_rectarealight.html @@ -117,14 +117,14 @@ rectLightMeshBack.rotation.y = Math.PI; rectLightMesh.add( rectLightMeshBack ); - var geoFloor = new THREE.BoxGeometry( 2000, 0.1, 2000 ); + var geoFloor = new THREE.BoxBufferGeometry( 2000, 0.1, 2000 ); var matStdFloor = new THREE.MeshStandardMaterial( { color: 0x808080, roughness: 0, metalness: 0 } ); var mshStdFloor = new THREE.Mesh( geoFloor, matStdFloor ); scene.add( mshStdFloor ); var matStdObjects = new THREE.MeshStandardMaterial( { color: 0xA00000, roughness: 0, metalness: 0 } ); - var geoBox = new THREE.BoxGeometry( Math.PI, Math.sqrt( 2 ), Math.E ); + var geoBox = new THREE.BoxBufferGeometry( Math.PI, Math.sqrt( 2 ), Math.E ); var mshStdBox = new THREE.Mesh( geoBox, matStdObjects ); mshStdBox.position.set( 0, 5, 0 ); mshStdBox.rotation.set( 0, Math.PI / 2.0, 0 ); @@ -132,14 +132,14 @@ mshStdBox.receiveShadow = true; scene.add( mshStdBox ); - var geoSphere = new THREE.SphereGeometry( 1.5, 32, 32 ); + var geoSphere = new THREE.SphereBufferGeometry( 1.5, 32, 32 ); var mshStdSphere = new THREE.Mesh( geoSphere, matStdObjects ); mshStdSphere.position.set( - 5, 5, 0 ); mshStdSphere.castShadow = true; mshStdSphere.receiveShadow = true; scene.add( mshStdSphere ); - var geoKnot = new THREE.TorusKnotGeometry( 1.5, 0.5, 100, 16 ); + var geoKnot = new THREE.TorusKnotBufferGeometry( 1.5, 0.5, 100, 16 ); var mshStdKnot = new THREE.Mesh( geoKnot, matStdObjects ); mshStdKnot.position.set( 5, 5, 0 ); mshStdKnot.castShadow = true; diff --git a/examples/webgl_loader_collada_kinematics.html b/examples/webgl_loader_collada_kinematics.html index 3aefbae5e22cd4af881b876a5bf56c26c91812fe..f5c2cccb4bb424f54023fd56fa85057cfc1f6a6f 100644 --- a/examples/webgl_loader_collada_kinematics.html +++ b/examples/webgl_loader_collada_kinematics.html @@ -102,7 +102,7 @@ scene.add( dae ); - particleLight = new THREE.Mesh( new THREE.SphereGeometry( 4, 8, 8 ), new THREE.MeshBasicMaterial( { color: 0xffffff } ) ); + particleLight = new THREE.Mesh( new THREE.SphereBufferGeometry( 4, 8, 8 ), new THREE.MeshBasicMaterial( { color: 0xffffff } ) ); scene.add( particleLight ); // Lights diff --git a/examples/webgl_loader_fbx.html b/examples/webgl_loader_fbx.html index a2e378449c2b413173635186e5f63de57fc7937d..2d1983ceeba9cf709e7f53675b5d5aaaa18d6289 100644 --- a/examples/webgl_loader_fbx.html +++ b/examples/webgl_loader_fbx.html @@ -90,7 +90,7 @@ // scene.add( new THREE.CameraHelper( light.shadow.camera ) ); // ground - var mesh = new THREE.Mesh( new THREE.PlaneGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) ); + var mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) ); mesh.rotation.x = - Math.PI / 2; mesh.receiveShadow = true; scene.add( mesh ); @@ -125,7 +125,7 @@ } ); - renderer = new THREE.WebGLRenderer(); + renderer = new THREE.WebGLRenderer( { antialias: true } ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.shadowMap.enabled = true; diff --git a/examples/webgl_materials_cubemap_dynamic.html b/examples/webgl_materials_cubemap_dynamic.html index 4496df4e86c2ef2a85a500e3b0261b2eb9260c4e..e152f67ac227f800742ad701fcc2e921a3d07df1 100644 --- a/examples/webgl_materials_cubemap_dynamic.html +++ b/examples/webgl_materials_cubemap_dynamic.html @@ -501,8 +501,8 @@ // OBJECTS - var cylinderGeometry = new THREE.CylinderGeometry( 2, 50, 1000, 32 ); - var sphereGeometry = new THREE.SphereGeometry( 100, 32, 16 ); + var cylinderGeometry = new THREE.CylinderBufferGeometry( 2, 50, 1000, 32 ); + var sphereGeometry = new THREE.SphereBufferGeometry( 100, 32, 16 ); var sy1 = -500 + 38; var sy2 = -88; diff --git a/examples/webgl_materials_lightmap.html b/examples/webgl_materials_lightmap.html index 3ad136e0991fa55d1147c81453f5eae197e9274b..a8ad805e67d4d91c368052629ebc3e6e457b854a 100644 --- a/examples/webgl_materials_lightmap.html +++ b/examples/webgl_materials_lightmap.html @@ -112,7 +112,7 @@ }; uniforms.topColor.value.copy( light.color ); - var skyGeo = new THREE.SphereGeometry( 4000, 32, 15 ); + var skyGeo = new THREE.SphereBufferGeometry( 4000, 32, 15 ); var skyMat = new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, diff --git a/examples/webgl_materials_shaders_fresnel.html b/examples/webgl_materials_shaders_fresnel.html index e95cec93c504a6d176b3e72ae1027707c2d7a774..887d5f90570c843ce5e5ef24255e0e4a65af7883 100644 --- a/examples/webgl_materials_shaders_fresnel.html +++ b/examples/webgl_materials_shaders_fresnel.html @@ -89,7 +89,7 @@ // - var geometry = new THREE.SphereGeometry( 100, 32, 16 ); + var geometry = new THREE.SphereBufferGeometry( 100, 32, 16 ); var shader = THREE.FresnelShader; var uniforms = THREE.UniformsUtils.clone( shader.uniforms ); diff --git a/examples/webgl_postprocessing.html b/examples/webgl_postprocessing.html index 4c1e42f2dbbc678a2b3c0cd582ee6b3cbe38ef54..ca41bcf35228e20e001efafb844dba8774d9d62f 100644 --- a/examples/webgl_postprocessing.html +++ b/examples/webgl_postprocessing.html @@ -51,7 +51,7 @@ object = new THREE.Object3D(); scene.add( object ); - var geometry = new THREE.SphereGeometry( 1, 4, 4 ); + var geometry = new THREE.SphereBufferGeometry( 1, 4, 4 ); var material = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true } ); for ( var i = 0; i < 100; i ++ ) { diff --git a/examples/webgl_postprocessing_dof.html b/examples/webgl_postprocessing_dof.html index ffb02b5e977b18858b11f6d36052fa7b3ac264c5..c07a0f5da7d7d8f295399d9186e0c152eeba28a5 100644 --- a/examples/webgl_postprocessing_dof.html +++ b/examples/webgl_postprocessing_dof.html @@ -110,7 +110,7 @@ if( singleMaterial ) zmaterial = [ cubeMaterial ]; - var geo = new THREE.SphereGeometry( 1, 20, 10 ); + var geo = new THREE.SphereBufferGeometry( 1, 20, 10 ); var start = Date.now(); diff --git a/examples/webgl_postprocessing_glitch.html b/examples/webgl_postprocessing_glitch.html index 15d96bbfd3d47d00e2352f7d5b977577383aa978..164a00c1ef049a247c2d7659c9895e3d9a720fa3 100644 --- a/examples/webgl_postprocessing_glitch.html +++ b/examples/webgl_postprocessing_glitch.html @@ -76,7 +76,7 @@ object = new THREE.Object3D(); scene.add( object ); - var geometry = new THREE.SphereGeometry( 1, 4, 4 ); + var geometry = new THREE.SphereBufferGeometry( 1, 4, 4 ); for ( var i = 0; i < 100; i ++ ) { diff --git a/examples/webgl_postprocessing_godrays.html b/examples/webgl_postprocessing_godrays.html index 5a508efa2f113e817242ad8fb1f9ea0d78040546..b5a268b517e244239af4dce290a63562dc19d89d 100644 --- a/examples/webgl_postprocessing_godrays.html +++ b/examples/webgl_postprocessing_godrays.html @@ -92,7 +92,7 @@ // tree var loader = new THREE.OBJLoader(); - loader.load( "models/obj/tree.obj", function ( object ) { + loader.load( 'models/obj/tree.obj', function ( object ) { object.material = materialScene; object.position.set( 0, -150, -150 ); @@ -103,7 +103,7 @@ // sphere - var geo = new THREE.SphereGeometry( 1, 20, 10 ); + var geo = new THREE.SphereBufferGeometry( 1, 20, 10 ); sphereMesh = new THREE.Mesh( geo, materialScene ); sphereMesh.scale.multiplyScalar( 20 ); scene.add( sphereMesh ); diff --git a/examples/webgl_postprocessing_nodes.html b/examples/webgl_postprocessing_nodes.html index 6694cd4d04713f279ae0bc269d13ae160f051e99..0f4937ded25c5b249bd37db9345cbb2c4d32fe17 100644 --- a/examples/webgl_postprocessing_nodes.html +++ b/examples/webgl_postprocessing_nodes.html @@ -534,7 +534,7 @@ object = new THREE.Object3D(); scene.add( object ); - var geometry = new THREE.SphereGeometry( 1, 4, 4 ); + var geometry = new THREE.SphereBufferGeometry( 1, 4, 4 ); for ( var i = 0; i < 100; i ++ ) { diff --git a/examples/webgl_postprocessing_pixel.html b/examples/webgl_postprocessing_pixel.html index 5232d25e3b0c757696302386aa8db3fa2bcaeb40..b24c1f3b52491cf687600c8d4962bda312e8c7dd 100644 --- a/examples/webgl_postprocessing_pixel.html +++ b/examples/webgl_postprocessing_pixel.html @@ -113,11 +113,11 @@ scene.add( dirLight3 ); var geometries = [ - new THREE.SphereGeometry( 1, 64, 64 ), - new THREE.BoxGeometry( 1, 1, 1 ), - new THREE.ConeGeometry( 1, 1, 32 ), - new THREE.TetrahedronGeometry( 1 ), - new THREE.TorusKnotGeometry( 1, .4 ) + new THREE.SphereBufferGeometry( 1, 64, 64 ), + new THREE.BoxBufferGeometry( 1, 1, 1 ), + new THREE.ConeBufferGeometry( 1, 1, 32 ), + new THREE.TetrahedronBufferGeometry( 1 ), + new THREE.TorusKnotBufferGeometry( 1, .4 ) ]; group = new THREE.Group(); diff --git a/examples/webgl_postprocessing_procedural.html b/examples/webgl_postprocessing_procedural.html index b4c81d5d6ed54527b1acbda8c938b199ab5354e8..a8946b775451f7f19ce9f2a617eab7b6971ea042 100644 --- a/examples/webgl_postprocessing_procedural.html +++ b/examples/webgl_postprocessing_procedural.html @@ -87,7 +87,7 @@ var camera, postScene, renderer, postMaterial, noiseRandom1DMaterial, noiseRandon2DMaterial, noiseRandom3DMaterial, postQuad; var gui, stats, texture; - var params = { procedure: "noiseRandom3D" }; + var params = { procedure: 'noiseRandom3D' }; init(); animate(); @@ -114,22 +114,22 @@ container.appendChild( stats.dom ); // Setup post processing stage - postCamera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0, 1); + postCamera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 ); noiseRandom1DMaterial = new THREE.ShaderMaterial({ - vertexShader: document.querySelector('#procedural-vert').textContent.trim(), - fragmentShader: document.querySelector('#noiseRandom1D-frag').textContent.trim() + vertexShader: document.querySelector( '#procedural-vert' ).textContent.trim(), + fragmentShader: document.querySelector( '#noiseRandom1D-frag' ).textContent.trim() }); noiseRandom2DMaterial = new THREE.ShaderMaterial({ - vertexShader: document.querySelector('#procedural-vert').textContent.trim(), - fragmentShader: document.querySelector('#noiseRandom2D-frag').textContent.trim() + vertexShader: document.querySelector( '#procedural-vert' ).textContent.trim(), + fragmentShader: document.querySelector( '#noiseRandom2D-frag' ).textContent.trim() }); noiseRandom3DMaterial = new THREE.ShaderMaterial({ - vertexShader: document.querySelector('#procedural-vert').textContent.trim(), - fragmentShader: document.querySelector('#noiseRandom3D-frag').textContent.trim() + vertexShader: document.querySelector( '#procedural-vert' ).textContent.trim(), + fragmentShader: document.querySelector( '#noiseRandom3D-frag' ).textContent.trim() }); postMaterial = noiseRandom3DMaterial; - var postPlane = new THREE.PlaneGeometry(2, 2); - postQuad = new THREE.Mesh(postPlane, postMaterial); + var postPlane = new THREE.PlaneBufferGeometry( 2, 2 ); + postQuad = new THREE.Mesh( postPlane, postMaterial ); postScene = new THREE.Scene(); postScene.add(postQuad); diff --git a/examples/webgl_shaders_tonemapping.html b/examples/webgl_shaders_tonemapping.html index 3565a71b7a17b8f5b732f6c4363a604a4fe8ca10..9b58b330e2b1691c5e9034af72991d9ed85a807e 100644 --- a/examples/webgl_shaders_tonemapping.html +++ b/examples/webgl_shaders_tonemapping.html @@ -241,7 +241,7 @@ earthCloudsMat.needsUpdate = true; } ); - var earthGeo = new THREE.SphereGeometry( 600, 24, 24 ); + var earthGeo = new THREE.SphereBufferGeometry( 600, 24, 24 ); var sphereMesh = new THREE.Mesh( earthGeo, earthMat ); scene.add( sphereMesh ); diff --git a/examples/webgl_shading_physical.html b/examples/webgl_shading_physical.html index 43bfeb4afc2ae9cc6aad39f0b5d26cfc9f92302c..38812390ca45731745b263d34daee52473315ed9 100644 --- a/examples/webgl_shading_physical.html +++ b/examples/webgl_shading_physical.html @@ -149,9 +149,9 @@ // OBJECTS - var sphereGeometry = new THREE.SphereGeometry( 100, 64, 32 ); - var torusGeometry = new THREE.TorusGeometry( 240, 60, 32, 64 ); - var cubeGeometry = new THREE.BoxGeometry( 150, 150, 150 ); + var sphereGeometry = new THREE.SphereBufferGeometry( 100, 64, 32 ); + var torusGeometry = new THREE.TorusBufferGeometry( 240, 60, 32, 64 ); + var cubeGeometry = new THREE.BoxBufferGeometry( 150, 150, 150 ); addObject( torusGeometry, materialPhong, 0, 100, 0, 0 ); addObject( cubeGeometry, materialLambert, 350, 75, 300, 0 ); @@ -186,9 +186,9 @@ } - var bigCube = new THREE.BoxGeometry( 50, 500, 50 ); - var midCube = new THREE.BoxGeometry( 50, 200, 50 ); - var smallCube = new THREE.BoxGeometry( 100, 100, 100 ); + var bigCube = new THREE.BoxBufferGeometry( 50, 500, 50 ); + var midCube = new THREE.BoxBufferGeometry( 50, 200, 50 ); + var smallCube = new THREE.BoxBufferGeometry( 100, 100, 100 ); addObjectColor( bigCube, 0xff0000, -500, 250, 0, 0 ); addObjectColor( smallCube, 0xff0000, -500, 50, -150, 0 ); @@ -202,10 +202,10 @@ addObjectColor( midCube, 0xff00ff, 0, 100, 500, 0 ); addObjectColor( smallCube, 0xff00ff, -150, 50, 500, 0 ); - addObjectColor( new THREE.BoxGeometry( 500, 10, 10 ), 0xffff00, 0, 600, 0, Math.PI/4 ); - addObjectColor( new THREE.BoxGeometry( 250, 10, 10 ), 0xffff00, 0, 600, 0, 0 ); + addObjectColor( new THREE.BoxBufferGeometry( 500, 10, 10 ), 0xffff00, 0, 600, 0, Math.PI/4 ); + addObjectColor( new THREE.BoxBufferGeometry( 250, 10, 10 ), 0xffff00, 0, 600, 0, 0 ); - addObjectColor( new THREE.SphereGeometry( 100, 32, 26 ), 0xffffff, -300, 100, 300, 0 ); + addObjectColor( new THREE.SphereBufferGeometry( 100, 32, 26 ), 0xffffff, -300, 100, 300, 0 ); // MORPHS