From ec3259270cf2260c0f603318bedb261394821ab7 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 14 Oct 2014 16:13:58 +0200 Subject: [PATCH] Updated examples that could use PlaneBufferGeometry. --- examples/canvas_ascii_effect.html | 2 +- examples/canvas_geometry_cube.html | 2 +- examples/canvas_geometry_earth.html | 2 +- examples/canvas_materials_depth.html | 2 +- examples/canvas_materials_video.html | 4 -- examples/js/Ocean.js | 4 +- examples/js/SimulationRenderer.js | 4 +- examples/js/crossfade/transition.js | 4 +- examples/js/math/Lut.js | 4 +- .../js/renderers/WebGLDeferredRenderer.js | 2 +- examples/misc_ubiquity_test.html | 2 +- examples/software_geometry_earth.html | 2 +- examples/svg_sandbox.html | 2 +- examples/webgl_animation_cloth.html | 2 +- examples/webgl_animation_skinning_morph.html | 6 +- examples/webgl_geometry_colors.html | 2 +- examples/webgl_geometry_extrude_shapes2.html | 12 ++-- examples/webgl_geometry_text.html | 5 +- examples/webgl_geometry_text2.html | 5 +- examples/webgl_hdr.html | 38 ++++++------- .../webgl_interactive_draggablecubes.html | 5 +- examples/webgl_lights_hemisphere.html | 2 +- examples/webgl_lights_pointlights2.html | 2 +- examples/webgl_loader_gltf.html | 2 +- examples/webgl_loader_json_objconverter.html | 6 +- examples/webgl_loader_ply.html | 5 +- examples/webgl_loader_stl.html | 5 +- examples/webgl_materials_blending.html | 6 +- examples/webgl_materials_blending_custom.html | 22 +++---- examples/webgl_materials_grass.html | 2 +- .../webgl_materials_texture_anisotropy.html | 2 +- examples/webgl_materials_texture_filters.html | 4 +- .../webgl_materials_texture_manualmipmap.html | 4 +- examples/webgl_mirror.html | 6 +- examples/webgl_morphtargets_md2.html | 12 ++-- examples/webgl_morphtargets_md2_control.html | 48 ++++++++-------- examples/webgl_multiple_canvases_circle.html | 2 +- examples/webgl_multiple_canvases_complex.html | 2 +- examples/webgl_multiple_canvases_grid.html | 2 +- examples/webgl_multiple_views.html | 2 +- examples/webgl_particles_dynamic.html | 13 +---- examples/webgl_postprocessing_advanced.html | 57 ++++++++++--------- examples/webgl_postprocessing_godrays.html | 5 +- examples/webgl_rtt.html | 2 +- examples/webgl_shader.html | 2 +- examples/webgl_shaders_ocean.html | 3 +- examples/webgl_shading_physical.html | 20 ++++--- examples/webgl_shadowmap.html | 12 ++-- examples/webgl_shadowmap_performance.html | 33 +---------- examples/webgl_skinning_simple.html | 2 +- examples/webgl_terrain_dynamic.html | 2 +- examples/webgldeferred_animation.html | 3 +- examples/webgldeferred_pointlights.html | 2 +- 53 files changed, 189 insertions(+), 214 deletions(-) diff --git a/examples/canvas_ascii_effect.html b/examples/canvas_ascii_effect.html index 29c0a8c163..731ab08303 100644 --- a/examples/canvas_ascii_effect.html +++ b/examples/canvas_ascii_effect.html @@ -76,7 +76,7 @@ // Plane - plane = new THREE.Mesh( new THREE.PlaneGeometry( 400, 400 ), new THREE.MeshBasicMaterial( { color: 0xe0e0e0 } ) ); + plane = new THREE.Mesh( new THREE.PlaneBufferGeometry( 400, 400 ), new THREE.MeshBasicMaterial( { color: 0xe0e0e0 } ) ); plane.position.y = - 200; plane.rotation.x = - Math.PI / 2; scene.add( plane ); diff --git a/examples/canvas_geometry_cube.html b/examples/canvas_geometry_cube.html index 22d23b8b64..40513af974 100644 --- a/examples/canvas_geometry_cube.html +++ b/examples/canvas_geometry_cube.html @@ -81,7 +81,7 @@ // Plane - var geometry = new THREE.PlaneGeometry( 200, 200 ); + var geometry = new THREE.PlaneBufferGeometry( 200, 200 ); geometry.applyMatrix( new THREE.Matrix4().makeRotationX( - Math.PI / 2 ) ); var material = new THREE.MeshBasicMaterial( { color: 0xe0e0e0, overdraw: 0.5 } ); diff --git a/examples/canvas_geometry_earth.html b/examples/canvas_geometry_earth.html index 6654eaf897..35bcdbac55 100644 --- a/examples/canvas_geometry_earth.html +++ b/examples/canvas_geometry_earth.html @@ -103,7 +103,7 @@ var texture = new THREE.Texture( canvas ); texture.needsUpdate = true; - var geometry = new THREE.PlaneGeometry( 300, 300, 3, 3 ); + var geometry = new THREE.PlaneBufferGeometry( 300, 300, 3, 3 ); var material = new THREE.MeshBasicMaterial( { map: texture, overdraw: 0.5 } ); var mesh = new THREE.Mesh( geometry, material ); diff --git a/examples/canvas_materials_depth.html b/examples/canvas_materials_depth.html index c99446e307..71447b8399 100644 --- a/examples/canvas_materials_depth.html +++ b/examples/canvas_materials_depth.html @@ -66,7 +66,7 @@ var material = new THREE.MeshDepthMaterial( { side: THREE.DoubleSide, overdraw: 0.5 } ); - plane = new THREE.Mesh( new THREE.PlaneGeometry( 1000, 1000, 10, 10 ), material ); + plane = new THREE.Mesh( new THREE.PlaneBufferGeometry( 1000, 1000, 10, 10 ), material ); plane.position.y = - 100; plane.rotation.x = - Math.PI / 2; scene.add( plane ); diff --git a/examples/canvas_materials_video.html b/examples/canvas_materials_video.html index 257a63d574..e5c5cbc10c 100644 --- a/examples/canvas_materials_video.html +++ b/examples/canvas_materials_video.html @@ -81,8 +81,6 @@ imageContext.fillRect( 0, 0, 480, 204 ); texture = new THREE.Texture( image ); - texture.minFilter = THREE.LinearFilter; - texture.magFilter = THREE.LinearFilter; var material = new THREE.MeshBasicMaterial( { map: texture, overdraw: 0.5 } ); @@ -99,8 +97,6 @@ imageReflectionGradient.addColorStop( 1, 'rgba(240, 240, 240, 0.8)' ); textureReflection = new THREE.Texture( imageReflection ); - textureReflection.minFilter = THREE.LinearFilter; - textureReflection.magFilter = THREE.LinearFilter; var materialReflection = new THREE.MeshBasicMaterial( { map: textureReflection, side: THREE.BackSide, overdraw: 0.5 } ); diff --git a/examples/js/Ocean.js b/examples/js/Ocean.js index 7ada58f002..efbbafe676 100644 --- a/examples/js/Ocean.js +++ b/examples/js/Ocean.js @@ -191,7 +191,7 @@ this.materialOcean.blending = 0; // Create the simulation plane - this.screenQuad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ) ); + this.screenQuad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ) ); this.scene.add(this.screenQuad); // Initialise spectrum data @@ -324,4 +324,4 @@ THREE.Ocean.prototype.renderNormalMap = function () { if (this.changed) this.materialNormal.uniforms.u_size.value = this.size; this.materialNormal.uniforms.u_displacementMap.value = this.displacementMapFramebuffer; this.renderer.render(this.scene, this.oceanCamera, this.normalMapFramebuffer, true); -}; \ No newline at end of file +}; diff --git a/examples/js/SimulationRenderer.js b/examples/js/SimulationRenderer.js index 44e9d35dd6..8c43ddd1cb 100644 --- a/examples/js/SimulationRenderer.js +++ b/examples/js/SimulationRenderer.js @@ -43,7 +43,7 @@ function SimulationRenderer(WIDTH, renderer) { fragmentShader: document.getElementById( 'fragmentShader' ).textContent } ); - var mesh = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), passThruShader ); + var mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), passThruShader ); var positionShader = new THREE.ShaderMaterial( { @@ -224,4 +224,4 @@ function SimulationRenderer(WIDTH, renderer) { } -} \ No newline at end of file +} diff --git a/examples/js/crossfade/transition.js b/examples/js/crossfade/transition.js index 39d290fd47..14f87634b6 100644 --- a/examples/js/crossfade/transition.js +++ b/examples/js/crossfade/transition.js @@ -83,9 +83,9 @@ function Transition ( sceneA, sceneB ) { ].join("\n") - }); + }); - quadgeometry = new THREE.PlaneGeometry(window.innerWidth, window.innerHeight); + quadgeometry = new THREE.PlaneBufferGeometry(window.innerWidth, window.innerHeight); this.quad = new THREE.Mesh(quadgeometry, this.quadmaterial); this.scene.add(this.quad); diff --git a/examples/js/math/Lut.js b/examples/js/math/Lut.js index f50bf553b2..b91c97ed70 100644 --- a/examples/js/math/Lut.js +++ b/examples/js/math/Lut.js @@ -4,7 +4,7 @@ THREE.Lut = function ( colormap, numberofcolors ) { - this.lut = new Array(); + this.lut = []; this.map = THREE.ColorMapKeywords[ colormap ]; this.n = numberofcolors; this.mapname = colormap; @@ -194,7 +194,7 @@ THREE.Lut.prototype = { this.legend.ctx.putImageData( imageData, 0, 0 ); this.legend.texture.needsUpdate = true; - this.legend.legendGeometry = new THREE.PlaneGeometry( this.legend.dimensions.width , this.legend.dimensions.height ); + this.legend.legendGeometry = new THREE.PlaneBufferGeometry( this.legend.dimensions.width , this.legend.dimensions.height ); this.legend.legendMaterial = new THREE.MeshBasicMaterial( { map : this.legend.texture, side : THREE.DoubleSide } ); this.legend.mesh = new THREE.Mesh( this.legend.legendGeometry, this.legend.legendMaterial ); diff --git a/examples/js/renderers/WebGLDeferredRenderer.js b/examples/js/renderers/WebGLDeferredRenderer.js index 2085517f82..be85675698 100644 --- a/examples/js/renderers/WebGLDeferredRenderer.js +++ b/examples/js/renderers/WebGLDeferredRenderer.js @@ -61,7 +61,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) { // var geometryLightSphere = new THREE.SphereGeometry( 1, 16, 8 ); - var geometryLightPlane = new THREE.PlaneGeometry( 2, 2 ); + var geometryLightPlane = new THREE.PlaneBufferGeometry( 2, 2 ); var black = new THREE.Color( 0x000000 ); diff --git a/examples/misc_ubiquity_test.html b/examples/misc_ubiquity_test.html index 3f3a219546..d76fc363eb 100644 --- a/examples/misc_ubiquity_test.html +++ b/examples/misc_ubiquity_test.html @@ -77,7 +77,7 @@ // PLANE - mesh = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, side: THREE.DoubleSide } ) ); + mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, side: THREE.DoubleSide } ) ); mesh.position.y = -500; mesh.scale.x = mesh.scale.y = mesh.scale.z = 2; scene.add( mesh ); diff --git a/examples/software_geometry_earth.html b/examples/software_geometry_earth.html index b11c89f863..316d86e0ea 100644 --- a/examples/software_geometry_earth.html +++ b/examples/software_geometry_earth.html @@ -103,7 +103,7 @@ var texture = new THREE.Texture( canvas ); texture.needsUpdate = true; - var geometry = new THREE.PlaneGeometry( 300, 300, 3, 3 ); + var geometry = new THREE.PlaneBufferGeometry( 300, 300, 3, 3 ); var material = new THREE.MeshBasicMaterial( { map: texture, overdraw: 0.5 } ); var mesh = new THREE.Mesh( geometry, material ); diff --git a/examples/svg_sandbox.html b/examples/svg_sandbox.html index 01e61c829d..1670ef2e06 100644 --- a/examples/svg_sandbox.html +++ b/examples/svg_sandbox.html @@ -70,7 +70,7 @@ // PLANE - mesh = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, side: THREE.DoubleSide } ) ); + mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, side: THREE.DoubleSide } ) ); mesh.position.y = -500; mesh.scale.x = mesh.scale.y = mesh.scale.z = 2; scene.add( mesh ); diff --git a/examples/webgl_animation_cloth.html b/examples/webgl_animation_cloth.html index 2f30dbf363..8e11965ed8 100644 --- a/examples/webgl_animation_cloth.html +++ b/examples/webgl_animation_cloth.html @@ -233,7 +233,7 @@ var groundMaterial = new THREE.MeshPhongMaterial( { color: 0xffffff, specular: 0x111111, map: groundTexture } ); - var mesh = new THREE.Mesh( new THREE.PlaneGeometry( 20000, 20000 ), groundMaterial ); + var mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 20000, 20000 ), groundMaterial ); mesh.position.y = -250; mesh.rotation.x = - Math.PI / 2; mesh.receiveShadow = true; diff --git a/examples/webgl_animation_skinning_morph.html b/examples/webgl_animation_skinning_morph.html index daa7876785..c14e5d4537 100644 --- a/examples/webgl_animation_skinning_morph.html +++ b/examples/webgl_animation_skinning_morph.html @@ -89,10 +89,10 @@ // GROUND - var groundMaterial = new THREE.MeshPhongMaterial( { emissive: 0xbbbbbb } ); - var planeGeometry = new THREE.PlaneGeometry( 16000, 16000 ); + var geometry = new THREE.PlaneBufferGeometry( 16000, 16000 ); + var material = new THREE.MeshPhongMaterial( { emissive: 0xbbbbbb } ); - var ground = new THREE.Mesh( planeGeometry, groundMaterial ); + var ground = new THREE.Mesh( geometry, material ); ground.position.set( 0, FLOOR, 0 ); ground.rotation.x = -Math.PI/2; scene.add( ground ); diff --git a/examples/webgl_geometry_colors.html b/examples/webgl_geometry_colors.html index 28cb224e0d..db8fddb296 100644 --- a/examples/webgl_geometry_colors.html +++ b/examples/webgl_geometry_colors.html @@ -88,7 +88,7 @@ shadowTexture.needsUpdate = true; var shadowMaterial = new THREE.MeshBasicMaterial( { map: shadowTexture } ); - var shadowGeo = new THREE.PlaneGeometry( 300, 300, 1, 1 ); + var shadowGeo = new THREE.PlaneBufferGeometry( 300, 300, 1, 1 ); mesh = new THREE.Mesh( shadowGeo, shadowMaterial ); mesh.position.y = - 250; diff --git a/examples/webgl_geometry_extrude_shapes2.html b/examples/webgl_geometry_extrude_shapes2.html index 2426a7b795..9517980161 100644 --- a/examples/webgl_geometry_extrude_shapes2.html +++ b/examples/webgl_geometry_extrude_shapes2.html @@ -315,8 +315,6 @@ var addGeoObject = function( group, svgObject ) { }; var init3d = function(){ - var near = 1.0; - var far = 10000.0; /// Global : renderer renderer = new THREE.WebGLRenderer( { antialias: true } ); @@ -327,7 +325,7 @@ var init3d = function(){ scene = new THREE.Scene(); /// Global : camera - camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, near, far ); + camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 1, 1000 ); camera.position.set( 0, 0, 200 ); /// Global : group @@ -344,11 +342,9 @@ var init3d = function(){ scene.add( ambientLight ); /// backgroup grids - var plane = new THREE.Mesh( - new THREE.PlaneGeometry(160, 160, 20, 20), - new THREE.MeshBasicMaterial({ color: 0x7f7f7f, wireframe: true })); - plane.rotation.x = Math.PI; - group.add( plane ); + var helper = new THREE.GridHelper( 80, 10 ); + helper.rotation.x = Math.PI / 2; + group.add( helper ); var obj = initSVGObject(); addGeoObject( group, obj ); diff --git a/examples/webgl_geometry_text.html b/examples/webgl_geometry_text.html index 266a0be63f..28920a1597 100644 --- a/examples/webgl_geometry_text.html +++ b/examples/webgl_geometry_text.html @@ -235,7 +235,10 @@ createText(); - var plane = new THREE.Mesh( new THREE.PlaneGeometry( 10000, 10000 ), new THREE.MeshBasicMaterial( { color: 0xffffff, opacity: 0.5, transparent: true } ) ); + var plane = new THREE.Mesh( + new THREE.PlaneBufferGeometry( 10000, 10000 ), + new THREE.MeshBasicMaterial( { color: 0xffffff, opacity: 0.5, transparent: true } ) + ); plane.position.y = 100; plane.rotation.x = - Math.PI / 2; scene.add( plane ); diff --git a/examples/webgl_geometry_text2.html b/examples/webgl_geometry_text2.html index a89ee0a2e2..f1f26d613c 100644 --- a/examples/webgl_geometry_text2.html +++ b/examples/webgl_geometry_text2.html @@ -250,7 +250,10 @@ createText(); - var plane = new THREE.Mesh( new THREE.PlaneGeometry( 10000, 10000 ), new THREE.MeshBasicMaterial( { color: 0xffffff, opacity: 0.5, transparent: true } ) ); + var plane = new THREE.Mesh( + new THREE.PlaneBufferGeometry( 10000, 10000 ), + new THREE.MeshBasicMaterial( { color: 0xffffff, opacity: 0.5, transparent: true } ) + ); plane.position.y = 100; plane.rotation.x = - Math.PI / 2; scene.add( plane ); diff --git a/examples/webgl_hdr.html b/examples/webgl_hdr.html index 702ed2f949..606f5470e8 100644 --- a/examples/webgl_hdr.html +++ b/examples/webgl_hdr.html @@ -5,27 +5,27 @@ @@ -142,7 +142,7 @@ } ); - var plane = new THREE.PlaneGeometry( 512, 768 ); + var plane = new THREE.PlaneBufferGeometry( 512, 768 ); quad = new THREE.Mesh( plane, materialHDR ); quad.position.z = -100; diff --git a/examples/webgl_interactive_draggablecubes.html b/examples/webgl_interactive_draggablecubes.html index f77eefebcd..ce76c3f587 100644 --- a/examples/webgl_interactive_draggablecubes.html +++ b/examples/webgl_interactive_draggablecubes.html @@ -100,7 +100,10 @@ } - plane = new THREE.Mesh( new THREE.PlaneGeometry( 2000, 2000, 8, 8 ), new THREE.MeshBasicMaterial( { color: 0x000000, opacity: 0.25, transparent: true, wireframe: true } ) ); + plane = new THREE.Mesh( + new THREE.PlaneBufferGeometry( 2000, 2000, 8, 8 ), + new THREE.MeshBasicMaterial( { color: 0x000000, opacity: 0.25, transparent: true } ) + ); plane.visible = false; scene.add( plane ); diff --git a/examples/webgl_lights_hemisphere.html b/examples/webgl_lights_hemisphere.html index b8fb18b096..60756c0a87 100644 --- a/examples/webgl_lights_hemisphere.html +++ b/examples/webgl_lights_hemisphere.html @@ -164,7 +164,7 @@ // GROUND - var groundGeo = new THREE.PlaneGeometry( 10000, 10000 ); + var groundGeo = new THREE.PlaneBufferGeometry( 10000, 10000 ); var groundMat = new THREE.MeshPhongMaterial( { ambient: 0xffffff, color: 0xffffff, specular: 0x050505 } ); groundMat.color.setHSL( 0.095, 1, 0.75 ); diff --git a/examples/webgl_lights_pointlights2.html b/examples/webgl_lights_pointlights2.html index 30379f7237..39922c7701 100644 --- a/examples/webgl_lights_pointlights2.html +++ b/examples/webgl_lights_pointlights2.html @@ -133,7 +133,7 @@ // GROUND - var mesh = new THREE.Mesh( new THREE.PlaneGeometry( 800, 400, 2, 2 ), groundMaterial ); + var mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 800, 400, 2, 2 ), groundMaterial ); mesh.position.y = -5; mesh.rotation.x = - Math.PI / 2; scene.add( mesh ); diff --git a/examples/webgl_loader_gltf.html b/examples/webgl_loader_gltf.html index bfbae06a00..7591e842b3 100644 --- a/examples/webgl_loader_gltf.html +++ b/examples/webgl_loader_gltf.html @@ -201,7 +201,7 @@ ambient: 0x888888, shading: THREE.SmoothShading, }); - ground = new THREE.Mesh( new THREE.PlaneGeometry(1024, 1024), groundMaterial); + ground = new THREE.Mesh( new THREE.PlaneBufferGeometry(1024, 1024), groundMaterial); if (sceneInfo.shadows) { ground.receiveShadow = true; diff --git a/examples/webgl_loader_json_objconverter.html b/examples/webgl_loader_json_objconverter.html index 36c62dbf74..e2b659b1a5 100644 --- a/examples/webgl_loader_json_objconverter.html +++ b/examples/webgl_loader_json_objconverter.html @@ -105,7 +105,7 @@ xm.map.needsUpdate = true; xm.map.repeat.set( 10, 10 ); - geometry = new THREE.PlaneGeometry( 100, 100, 15, 10 ); + geometry = new THREE.PlaneBufferGeometry( 100, 100, 15, 10 ); mesh = new THREE.Mesh( geometry, xm ); mesh.position.set( 0, FLOOR, 0 ); @@ -230,7 +230,7 @@ // material - mesh = new THREE.Mesh( new THREE.PlaneGeometry( size, size ), materials[i] ); + mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( size, size ), materials[i] ); mesh.position.x = i * (size + 5) - ( ( materials.length - 1 )* ( size + 5 )/2); mesh.position.y = FLOOR + size/2 + bottom; mesh.position.z = -100; @@ -250,7 +250,7 @@ var xm = new THREE.MeshBasicMaterial( { map: new THREE.Texture( x ), transparent: true } ); xm.map.needsUpdate = true; - mesh = new THREE.Mesh( new THREE.PlaneGeometry( size, size ), xm ); + mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( size, size ), xm ); mesh.position.x = i * ( size + 5 ) - ( ( materials.length - 1 )* ( size + 5 )/2); mesh.position.y = FLOOR + size/2 + bottom; mesh.position.z = -99; diff --git a/examples/webgl_loader_ply.html b/examples/webgl_loader_ply.html index 8e219f5032..06f7e637f0 100644 --- a/examples/webgl_loader_ply.html +++ b/examples/webgl_loader_ply.html @@ -76,7 +76,10 @@ // Ground - var plane = new THREE.Mesh( new THREE.PlaneGeometry( 40, 40 ), new THREE.MeshPhongMaterial( { ambient: 0x999999, color: 0x999999, specular: 0x101010 } ) ); + var plane = new THREE.Mesh( + new THREE.PlaneBufferGeometry( 40, 40 ), + new THREE.MeshPhongMaterial( { ambient: 0x999999, color: 0x999999, specular: 0x101010 } ) + ); plane.rotation.x = -Math.PI/2; plane.position.y = -0.5; scene.add( plane ); diff --git a/examples/webgl_loader_stl.html b/examples/webgl_loader_stl.html index 5061bc2ddc..a5d2dac9dc 100644 --- a/examples/webgl_loader_stl.html +++ b/examples/webgl_loader_stl.html @@ -76,7 +76,10 @@ // Ground - var plane = new THREE.Mesh( new THREE.PlaneGeometry( 40, 40 ), new THREE.MeshPhongMaterial( { ambient: 0x999999, color: 0x999999, specular: 0x101010 } ) ); + var plane = new THREE.Mesh( + new THREE.PlaneBufferGeometry( 40, 40 ), + new THREE.MeshPhongMaterial( { ambient: 0x999999, color: 0x999999, specular: 0x101010 } ) + ); plane.rotation.x = -Math.PI/2; plane.position.y = -0.5; scene.add( plane ); diff --git a/examples/webgl_materials_blending.html b/examples/webgl_materials_blending.html index e2c0c178f7..080b5d7be5 100644 --- a/examples/webgl_materials_blending.html +++ b/examples/webgl_materials_blending.html @@ -66,7 +66,7 @@ var materialBg = new THREE.MeshBasicMaterial( { map: mapBg } ); - var meshBg = new THREE.Mesh( new THREE.PlaneGeometry( 4000, 2000 ), materialBg ); + var meshBg = new THREE.Mesh( new THREE.PlaneBufferGeometry( 4000, 2000 ), materialBg ); meshBg.position.set( 0, 0, -1 ); scene.add( meshBg ); @@ -80,8 +80,8 @@ var map3 = THREE.ImageUtils.loadTexture( 'textures/lensflare/lensflare0.png' ); var map4 = THREE.ImageUtils.loadTexture( 'textures/lensflare/lensflare0_alpha.png' ); - var geo1 = new THREE.PlaneGeometry( 100, 100 ); - var geo2 = new THREE.PlaneGeometry( 100, 25 ); + var geo1 = new THREE.PlaneBufferGeometry( 100, 100 ); + var geo2 = new THREE.PlaneBufferGeometry( 100, 25 ); addImageRow( map0, 300 ); addImageRow( map1, 150 ); diff --git a/examples/webgl_materials_blending_custom.html b/examples/webgl_materials_blending_custom.html index 96a5e5f185..3eebd8969f 100644 --- a/examples/webgl_materials_blending_custom.html +++ b/examples/webgl_materials_blending_custom.html @@ -78,9 +78,6 @@ if ( ! Detector.webgl ) Detector.addGetWebGLMessage(); - var SCREEN_WIDTH = window.innerWidth - 215; - var SCREEN_HEIGHT = window.innerHeight; - var camera, scene, renderer; var materialBg; @@ -99,7 +96,7 @@ // CAMERA - camera = new THREE.PerspectiveCamera( 70, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 1000 ); + camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 1000 ); camera.position.z = 700; // SCENE @@ -175,7 +172,7 @@ materialBg = new THREE.MeshBasicMaterial( { map: mapBg1 } ); - var meshBg = new THREE.Mesh( new THREE.PlaneGeometry( 4000, 2000 ), materialBg ); + var meshBg = new THREE.Mesh( new THREE.PlaneBufferGeometry( 4000, 2000 ), materialBg ); meshBg.position.set( 0, 0, -1 ); scene.add( meshBg ); @@ -210,8 +207,8 @@ var src = [ "ZeroFactor", "OneFactor", "SrcAlphaFactor", "OneMinusSrcAlphaFactor", "DstAlphaFactor", "OneMinusDstAlphaFactor", "DstColorFactor", "OneMinusDstColorFactor", "SrcAlphaSaturateFactor" ]; var dst = [ "ZeroFactor", "OneFactor", "SrcColorFactor", "OneMinusSrcColorFactor", "SrcAlphaFactor", "OneMinusSrcAlphaFactor", "DstAlphaFactor", "OneMinusDstAlphaFactor" ]; - var geo1 = new THREE.PlaneGeometry( 100, 100 ); - var geo2 = new THREE.PlaneGeometry( 100, 25 ); + var geo1 = new THREE.PlaneBufferGeometry( 100, 100 ); + var geo2 = new THREE.PlaneBufferGeometry( 100, 25 ); var blending = "CustomBlending"; @@ -282,7 +279,7 @@ // RENDERER renderer = new THREE.WebGLRenderer(); - renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); + renderer.setSize( window.innerWidth, window.innerHeight ); renderer.domElement.style.position = "absolute"; renderer.domElement.style.left = "215px"; @@ -393,12 +390,9 @@ function onWindowResize( event ) { - SCREEN_WIDTH = window.innerWidth; - SCREEN_HEIGHT = window.innerHeight; - - renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); + renderer.setSize( window.innerWidth, window.innerHeight ); - camera.aspect = SCREEN_WIDTH / SCREEN_HEIGHT; + camera.aspect = window.innerWidth / window.innerHeight; camera.updateProjectionMatrix(); } @@ -418,7 +412,7 @@ //xc.shadowColor = "#000"; //xc.shadowBlur = 3; xc.fillStyle = "white"; - xc.font = "10pt arial bold"; + xc.font = "12pt arial bold"; xc.fillText( text, 8, 22 ); var map = new THREE.Texture( x ); diff --git a/examples/webgl_materials_grass.html b/examples/webgl_materials_grass.html index 4d4162938a..758e5d310b 100644 --- a/examples/webgl_materials_grass.html +++ b/examples/webgl_materials_grass.html @@ -38,7 +38,7 @@ scene = new THREE.Scene(); - var geometry = new THREE.PlaneGeometry( 100, 100 ); + var geometry = new THREE.PlaneBufferGeometry( 100, 100 ); var texture = new THREE.Texture( generateTexture() ); texture.needsUpdate = true; diff --git a/examples/webgl_materials_texture_anisotropy.html b/examples/webgl_materials_texture_anisotropy.html index 63c3a6a917..e9dc667e27 100644 --- a/examples/webgl_materials_texture_anisotropy.html +++ b/examples/webgl_materials_texture_anisotropy.html @@ -139,7 +139,7 @@ // - var geometry = new THREE.PlaneGeometry( 100, 100 ); + var geometry = new THREE.PlaneBufferGeometry( 100, 100 ); var mesh1 = new THREE.Mesh( geometry, material1 ); mesh1.rotation.x = - Math.PI / 2; diff --git a/examples/webgl_materials_texture_filters.html b/examples/webgl_materials_texture_filters.html index 97f671e1bd..e4a56f95a6 100644 --- a/examples/webgl_materials_texture_filters.html +++ b/examples/webgl_materials_texture_filters.html @@ -126,7 +126,7 @@ textureCanvas2.needsUpdate = true; textureCanvas2.repeat.set( 1000, 1000 ); - var geometry = new THREE.PlaneGeometry( 100, 100 ); + var geometry = new THREE.PlaneBufferGeometry( 100, 100 ); var meshCanvas = new THREE.Mesh( geometry, materialCanvas ); meshCanvas.rotation.x = - Math.PI / 2; @@ -149,7 +149,7 @@ scene.add( meshCanvas ); scene2.add( meshCanvas2 ); - var geometry = new THREE.PlaneGeometry( 100, 100 ); + var geometry = new THREE.PlaneBufferGeometry( 100, 100 ); var mesh = new THREE.Mesh( geometry, materialPainting ); var mesh2 = new THREE.Mesh( geometry, materialPainting2 ); diff --git a/examples/webgl_materials_texture_manualmipmap.html b/examples/webgl_materials_texture_manualmipmap.html index 9b0b3b2a91..78943be9f8 100644 --- a/examples/webgl_materials_texture_manualmipmap.html +++ b/examples/webgl_materials_texture_manualmipmap.html @@ -140,7 +140,7 @@ textureCanvas2.needsUpdate = true; materialCanvas2 = new THREE.MeshBasicMaterial( { color: 0xffccaa, map: textureCanvas2 } ); - var geometry = new THREE.PlaneGeometry( 100, 100 ); + var geometry = new THREE.PlaneBufferGeometry( 100, 100 ); var meshCanvas1 = new THREE.Mesh( geometry, materialCanvas1 ); meshCanvas1.rotation.x = -Math.PI / 2; @@ -163,7 +163,7 @@ scene1.add( meshCanvas1 ); scene2.add( meshCanvas2 ); - var geometry = new THREE.PlaneGeometry( 100, 100 ); + var geometry = new THREE.PlaneBufferGeometry( 100, 100 ); var mesh1 = new THREE.Mesh( geometry, materialPainting1 ); var mesh2 = new THREE.Mesh( geometry, materialPainting2 ); diff --git a/examples/webgl_mirror.html b/examples/webgl_mirror.html index 66a1f08458..1e5bee2100 100644 --- a/examples/webgl_mirror.html +++ b/examples/webgl_mirror.html @@ -83,9 +83,9 @@ function fillScene() { - var planeGeo = new THREE.PlaneGeometry( 100.1, 100.1 ); + var planeGeo = new THREE.PlaneBufferGeometry( 100.1, 100.1 ); - //MIRORR planes + // MIRORR planes groundMirror = new THREE.Mirror( renderer, camera, { clipBias: 0.003, textureWidth: WIDTH, textureHeight: HEIGHT, color: 0x777777 } ); var mirrorMesh = new THREE.Mesh( planeGeo, groundMirror.material ); @@ -95,7 +95,7 @@ verticalMirror = new THREE.Mirror( renderer, camera, { clipBias: 0.003, textureWidth: WIDTH, textureHeight: HEIGHT, color:0x889999 } ); - var verticalMirrorMesh = new THREE.Mesh( new THREE.PlaneGeometry( 60, 60 ), verticalMirror.material ); + var verticalMirrorMesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 60, 60 ), verticalMirror.material ); verticalMirrorMesh.add( verticalMirror ); verticalMirrorMesh.position.y = 35; verticalMirrorMesh.position.z = -45; diff --git a/examples/webgl_morphtargets_md2.html b/examples/webgl_morphtargets_md2.html index 8e37f79c72..82ab719b14 100644 --- a/examples/webgl_morphtargets_md2.html +++ b/examples/webgl_morphtargets_md2.html @@ -5,7 +5,7 @@ @@ -117,9 +117,12 @@ // - var materialColor = new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( "textures/cube/SwedishRoyalCastle/pz.jpg" ), depthTest: false } ); + var materialColor = new THREE.MeshBasicMaterial( { + map: THREE.ImageUtils.loadTexture( "textures/cube/SwedishRoyalCastle/pz.jpg" ), + depthTest: false + } ); - quadBG = new THREE.Mesh( new THREE.PlaneGeometry( 1, 1 ), materialColor ); + quadBG = new THREE.Mesh( new THREE.PlaneBufferGeometry( 1, 1 ), materialColor ); quadBG.position.z = -500; quadBG.scale.set( width, height, 1 ); sceneBG.add( quadBG ); @@ -128,7 +131,7 @@ var sceneMask = new THREE.Scene(); - quadMask = new THREE.Mesh( new THREE.PlaneGeometry( 1, 1 ), new THREE.MeshBasicMaterial( { color: 0xffaa00 } ) ); + quadMask = new THREE.Mesh( new THREE.PlaneBufferGeometry( 1, 1 ), new THREE.MeshBasicMaterial( { color: 0xffaa00 } ) ); quadMask.position.z = -300; quadMask.scale.set( width / 2, height / 2, 1 ); sceneMask.add( quadMask ); diff --git a/examples/webgl_postprocessing_godrays.html b/examples/webgl_postprocessing_godrays.html index 831a4b7556..a66a53649e 100644 --- a/examples/webgl_postprocessing_godrays.html +++ b/examples/webgl_postprocessing_godrays.html @@ -250,7 +250,10 @@ postprocessing.godrayCombineUniforms.fGodRayIntensity.value = 0.75; - postprocessing.quad = new THREE.Mesh( new THREE.PlaneGeometry( window.innerWidth, window.innerHeight ), postprocessing.materialGodraysGenerate ); + postprocessing.quad = new THREE.Mesh( + new THREE.PlaneBufferGeometry( window.innerWidth, window.innerHeight ), + postprocessing.materialGodraysGenerate + ); postprocessing.quad.position.z = -9900; postprocessing.scene.add( postprocessing.quad ); diff --git a/examples/webgl_rtt.html b/examples/webgl_rtt.html index dca87b7931..bdacdd8a47 100644 --- a/examples/webgl_rtt.html +++ b/examples/webgl_rtt.html @@ -147,7 +147,7 @@ } ); - var plane = new THREE.PlaneGeometry( window.innerWidth, window.innerHeight ); + var plane = new THREE.PlaneBufferGeometry( window.innerWidth, window.innerHeight ); quad = new THREE.Mesh( plane, material ); quad.position.z = -100; diff --git a/examples/webgl_shader.html b/examples/webgl_shader.html index bb443020e6..c508dd1c40 100644 --- a/examples/webgl_shader.html +++ b/examples/webgl_shader.html @@ -108,7 +108,7 @@ scene = new THREE.Scene(); - var geometry = new THREE.PlaneGeometry( 2, 2 ); + var geometry = new THREE.PlaneBufferGeometry( 2, 2 ); uniforms = { time: { type: "f", value: 1.0 }, diff --git a/examples/webgl_shaders_ocean.html b/examples/webgl_shaders_ocean.html index ee733f2ee5..14b21c6f33 100644 --- a/examples/webgl_shaders_ocean.html +++ b/examples/webgl_shaders_ocean.html @@ -110,10 +110,9 @@ mirrorMesh = new THREE.Mesh( - new THREE.PlaneGeometry( parameters.width * 500, parameters.height * 500, 50, 50 ), + new THREE.PlaneBufferGeometry( parameters.width * 500, parameters.height * 500 ), water.material ); - mirrorMesh.add( water ); mirrorMesh.rotation.x = - Math.PI * 0.5; diff --git a/examples/webgl_shading_physical.html b/examples/webgl_shading_physical.html index 2b1407d299..807dc2eeff 100644 --- a/examples/webgl_shading_physical.html +++ b/examples/webgl_shading_physical.html @@ -5,7 +5,7 @@