diff --git a/examples/webgl_raycast_texture.html b/examples/webgl_raycast_texture.html index 6ccef047842023809578dd673422fa426e4b0edb..35d1f3af282cdaac80bf183d9cde2b22e0087359 100644 --- a/examples/webgl_raycast_texture.html +++ b/examples/webgl_raycast_texture.html @@ -225,20 +225,15 @@ cubeTexture = new THREE.Texture( undefined, THREE.UVMapping, THREE.RepeatWrapping, THREE.RepeatWrapping ); canvas = new CanvasTexture( cubeTexture ); var cubeMaterial = new THREE.MeshBasicMaterial( { map: cubeTexture } ); - var cubeGeometry = new THREE.BoxGeometry( 20, 20, 20 ); + var cubeGeometry = new THREE.BoxBufferGeometry( 20, 20, 20 ); + var uvs = cubeGeometry.attributes.uv.array; // Set a specific texture mapping. - var uvs; - for ( var i = 0; i < cubeGeometry.faceVertexUvs[ 0 ].length; i ++ ) { - - uvs = cubeGeometry.faceVertexUvs[ 0 ][ i ]; - for ( var j = 0; j < 3; j ++ ) { - - if ( uvs[ j ].x < 0.1 ) uvs[ j ].x = - 1; - if ( uvs[ j ].y < 0.1 ) uvs[ j ].y = - 1; + for ( var i = 0; i < uvs.length; i ++ ) { - } + uvs[ i ] *= 2; } + var cube = new THREE.Mesh( cubeGeometry, cubeMaterial ); cube.position.x = 4; cube.position.y = - 5; diff --git a/examples/webgl_shaders_tonemapping.html b/examples/webgl_shaders_tonemapping.html index 9b58b330e2b1691c5e9034af72991d9ed85a807e..6bc6d60cfcf6aa929f0ac5ec8bfb3f4bd0d05a8a 100644 --- a/examples/webgl_shaders_tonemapping.html +++ b/examples/webgl_shaders_tonemapping.html @@ -323,22 +323,8 @@ var textureCube = new THREE.CubeTextureLoader().load( urls ); textureCube.format = THREE.RGBFormat; - var skyboxShader = THREE.ShaderLib[ "cube" ]; - skyboxShader.uniforms[ "tCube" ].value = textureCube; - - var skyboxMaterial = new THREE.ShaderMaterial( { - - fragmentShader: skyboxShader.fragmentShader, - vertexShader: skyboxShader.vertexShader, - uniforms: skyboxShader.uniforms, - depthWrite: false, - side: THREE.BackSide - - } ), - - mesh = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100 ), skyboxMaterial ); - sceneCube.add( mesh ); + sceneCube.background = textureCube; renderer = new THREE.WebGLRenderer(); renderer.setPixelRatio( window.devicePixelRatio ); diff --git a/examples/webgl_shadowmap.html b/examples/webgl_shadowmap.html index 0f9e55c5450996d3e425d8a52dc645c606ee8260..b44db405cfb89b936afcc5058386898fad61aab0 100644 --- a/examples/webgl_shadowmap.html +++ b/examples/webgl_shadowmap.html @@ -241,7 +241,7 @@ // CUBES - var mesh = new THREE.Mesh( new THREE.BoxGeometry( 1500, 220, 150 ), planeMaterial ); + var mesh = new THREE.Mesh( new THREE.BoxBufferGeometry( 1500, 220, 150 ), planeMaterial ); mesh.position.y = FLOOR - 50; mesh.position.z = 20; @@ -251,7 +251,7 @@ scene.add( mesh ); - var mesh = new THREE.Mesh( new THREE.BoxGeometry( 1600, 170, 250 ), planeMaterial ); + var mesh = new THREE.Mesh( new THREE.BoxBufferGeometry( 1600, 170, 250 ), planeMaterial ); mesh.position.y = FLOOR - 50; mesh.position.z = 20; diff --git a/examples/webgl_shadowmap_performance.html b/examples/webgl_shadowmap_performance.html index d4e0a1782571b7d05e2878ab81d08c24cf5bd52e..1531ef44c6982afd328938d9a43afaefb4eaa77f 100644 --- a/examples/webgl_shadowmap_performance.html +++ b/examples/webgl_shadowmap_performance.html @@ -212,7 +212,7 @@ // CUBES - var mesh = new THREE.Mesh( new THREE.BoxGeometry( 1500, 220, 150 ), planeMaterial ); + var mesh = new THREE.Mesh( new THREE.BoxBufferGeometry( 1500, 220, 150 ), planeMaterial ); mesh.position.y = FLOOR - 50; mesh.position.z = 20; @@ -222,7 +222,7 @@ scene.add( mesh ); - var mesh = new THREE.Mesh( new THREE.BoxGeometry( 1600, 170, 250 ), planeMaterial ); + var mesh = new THREE.Mesh( new THREE.BoxBufferGeometry( 1600, 170, 250 ), planeMaterial ); mesh.position.y = FLOOR - 50; mesh.position.z = 20; diff --git a/examples/webvr_vive.html b/examples/webvr_vive.html index 2e3c6a5c6a4d2e2474ecaa9ca3eae550feacec2d..de8115f93effaf194d351c1e1c61f97bb0176141 100644 --- a/examples/webvr_vive.html +++ b/examples/webvr_vive.html @@ -60,7 +60,7 @@ camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.1, 10 ); room = new THREE.Mesh( - new THREE.BoxGeometry( 6, 6, 6, 8, 8, 8 ), + new THREE.BoxBufferGeometry( 6, 6, 6, 8, 8, 8 ), new THREE.MeshBasicMaterial( { color: 0x404040, wireframe: true } ) ); room.position.y = 3; @@ -72,7 +72,7 @@ light.position.set( 1, 1, 1 ).normalize(); scene.add( light ); - var geometry = new THREE.BoxGeometry( 0.2, 0.2, 0.2 ); + var geometry = new THREE.BoxBufferGeometry( 0.2, 0.2, 0.2 ); for ( var i = 0; i < 200; i ++ ) { @@ -217,7 +217,7 @@ var cube = room.children[ i ]; - if ( cube.geometry instanceof THREE.BoxGeometry === false ) continue; + if ( cube.geometry instanceof THREE.BoxBufferGeometry === false ) continue; // cube.position.add( cube.userData.velocity ); diff --git a/examples/webvr_vive_paint.html b/examples/webvr_vive_paint.html index d0d78b25084465275e8d1289f4ba346d21e12d2c..e9d46fcc97bbb6b1bedd84862d5a5c0a6fb4593f 100644 --- a/examples/webvr_vive_paint.html +++ b/examples/webvr_vive_paint.html @@ -71,7 +71,7 @@ camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 50 ); - var geometry = new THREE.BoxGeometry( 0.5, 0.8, 0.5 ); + var geometry = new THREE.BoxBufferGeometry( 0.5, 0.8, 0.5 ); var material = new THREE.MeshStandardMaterial( { color: 0x444444, roughness: 1.0, @@ -93,7 +93,7 @@ scene.add( table ); */ - var geometry = new THREE.PlaneGeometry( 4, 4 ); + var geometry = new THREE.PlaneBufferGeometry( 4, 4 ); var material = new THREE.MeshStandardMaterial( { color: 0x222222, roughness: 1.0, @@ -162,8 +162,8 @@ controller.receiveShadow = true; // var pivot = new THREE.Group(); - // var pivot = new THREE.Mesh( new THREE.BoxGeometry( 0.01, 0.01, 0.01 ) ); - var pivot = new THREE.Mesh( new THREE.IcosahedronGeometry( 0.01, 2 ) ); + // var pivot = new THREE.Mesh( new THREE.BoxBufferGeometry( 0.01, 0.01, 0.01 ) ); + var pivot = new THREE.Mesh( new THREE.IcosahedronBufferGeometry( 0.01, 2 ) ); pivot.name = 'pivot'; pivot.position.y = -0.016; pivot.position.z = -0.043; @@ -230,20 +230,22 @@ scene.add( line ); // Shapes - shapes[ 'tube' ] = getTubeShapes(1.0); + shapes[ 'tube' ] = getTubeShapes( 1.0 ); } - function getTubeShapes(size) { + function getTubeShapes( size ) { var PI2 = Math.PI * 2; var sides = 10; var array = []; var radius = 0.01 * size; - for( var i = 0; i < sides; i ++ ){ + + for( var i = 0; i < sides; i ++ ) { var angle = ( i / sides ) * PI2; array.push( new THREE.Vector3( Math.sin( angle ) * radius, Math.cos( angle ) * radius, 0 ) ); + } return array; diff --git a/examples/webvr_vive_sculpt.html b/examples/webvr_vive_sculpt.html index a3855417218c1ab92797df99d4778935bea3a8aa..c7e2c21d3fb1fe93923ef51f94a1bd928411990d 100644 --- a/examples/webvr_vive_sculpt.html +++ b/examples/webvr_vive_sculpt.html @@ -61,7 +61,7 @@ camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 50 ); - var geometry = new THREE.BoxGeometry( 0.5, 0.8, 0.5 ); + var geometry = new THREE.BoxBufferGeometry( 0.5, 0.8, 0.5 ); var material = new THREE.MeshStandardMaterial( { color: 0x444444, roughness: 1.0, @@ -74,7 +74,7 @@ table.receiveShadow = true; scene.add( table ); - var geometry = new THREE.PlaneGeometry( 4, 4 ); + var geometry = new THREE.PlaneBufferGeometry( 4, 4 ); var material = new THREE.MeshStandardMaterial( { color: 0x222222, roughness: 1.0, @@ -139,8 +139,8 @@ controller.castShadow = true; controller.receiveShadow = true; - // var pivot = new THREE.Mesh( new THREE.BoxGeometry( 0.01, 0.01, 0.01 ) ); - var pivot = new THREE.Mesh( new THREE.IcosahedronGeometry( 0.002, 2 ), blob.material ); + // var pivot = new THREE.Mesh( new THREE.BoxBufferGeometry( 0.01, 0.01, 0.01 ) ); + var pivot = new THREE.Mesh( new THREE.IcosahedronBufferGeometry( 0.002, 2 ), blob.material ); pivot.name = 'pivot'; pivot.position.y = -0.016; pivot.position.z = -0.043;