From 188b9b7019e57adf51e5906c7338586ca5464403 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Mon, 5 Jan 2015 14:27:38 +0900 Subject: [PATCH] Examples: Cleaned up setClearColor(). --- docs/api/renderers/WebGLRenderer.html | 4 +- docs/scenes/js/material.js | 236 +++++++++--------- examples/canvas_lines_colors_2d.html | 3 +- examples/canvas_lines_dashed.html | 2 +- examples/js/crossfade/scenes.js | 24 +- examples/misc_animation_keys.html | 2 +- examples/misc_controls_orbit.html | 2 +- examples/misc_controls_trackball.html | 2 +- .../webgl_animation_skinning_blending.html | 3 +- examples/webgl_animation_skinning_morph.html | 3 +- examples/webgl_buffergeometry.html | 2 +- examples/webgl_buffergeometry_particles.html | 2 +- examples/webgl_buffergeometry_uint.html | 2 +- examples/webgl_custom_attributes.html | 2 +- examples/webgl_custom_attributes_lines.html | 2 +- examples/webgl_effects_oculusrift.html | 2 +- .../webgl_geometry_colors_lookuptable.html | 2 +- examples/webgl_geometry_dynamic.html | 2 +- examples/webgl_geometry_minecraft.html | 2 +- examples/webgl_geometry_shapes.html | 2 +- examples/webgl_geometry_text.html | 4 +- examples/webgl_geometry_text2.html | 6 +- examples/webgl_gpgpu_birds.html | 2 +- .../webgl_interactive_buffergeometry.html | 4 +- examples/webgl_interactive_cubes_gpu.html | 2 +- examples/webgl_lensflares.html | 2 +- examples/webgl_lights_hemisphere.html | 2 +- examples/webgl_lights_pointlights2.html | 2 +- examples/webgl_lines_dashed.html | 2 +- examples/webgl_loader_ctm.html | 6 +- examples/webgl_loader_ply.html | 2 +- examples/webgl_loader_stl.html | 2 +- examples/webgl_loader_utf8.html | 2 +- examples/webgl_marchingcubes.html | 2 +- examples/webgl_materials2.html | 2 +- examples/webgl_materials_bumpmap.html | 2 +- examples/webgl_materials_bumpmap_skin.html | 6 +- examples/webgl_materials_cubemap_dynamic.html | 4 +- examples/webgl_materials_lightmap.html | 2 +- examples/webgl_materials_normalmap.html | 2 +- examples/webgl_materials_skin.html | 2 +- .../webgl_materials_texture_anisotropy.html | 2 +- examples/webgl_materials_texture_filters.html | 2 +- .../webgl_materials_texture_manualmipmap.html | 2 +- examples/webgl_materials_texture_tga.html | 40 +-- examples/webgl_modifier_tessellation.html | 2 +- examples/webgl_morphtargets.html | 2 +- examples/webgl_morphtargets_md2.html | 2 +- examples/webgl_morphtargets_md2_control.html | 2 +- examples/webgl_particles_dynamic.html | 54 ++-- examples/webgl_performance.html | 2 +- examples/webgl_performance_doublesided.html | 2 +- examples/webgl_postprocessing_advanced.html | 6 +- examples/webgl_postprocessing_godrays.html | 2 +- examples/webgl_shading_physical.html | 5 +- examples/webgl_shadowmap.html | 2 +- examples/webgl_shadowmap_performance.html | 2 +- examples/webgl_terrain_dynamic.html | 4 +- 58 files changed, 242 insertions(+), 252 deletions(-) diff --git a/docs/api/renderers/WebGLRenderer.html b/docs/api/renderers/WebGLRenderer.html index 41ed44d254..661e0e5a74 100644 --- a/docs/api/renderers/WebGLRenderer.html +++ b/docs/api/renderers/WebGLRenderer.html @@ -184,8 +184,8 @@ // Creates a renderer with red background var renderer = new THREE.WebGLRenderer(); - renderer.setSize(200, 100); - renderer.setClearColor(0xff0000, 1); + renderer.setSize( 200, 100 ); + renderer.setClearColor( 0xff0000 );

[method:Color getClearColor]()

diff --git a/docs/scenes/js/material.js b/docs/scenes/js/material.js index f63476477f..98ffbcc16c 100644 --- a/docs/scenes/js/material.js +++ b/docs/scenes/js/material.js @@ -3,60 +3,60 @@ */ var constants = { - + combine: { - + "THREE.MultiplyOperation" : THREE.MultiplyOperation, "THREE.MixOperation" : THREE.MixOperation, "THREE.AddOperation" : THREE.AddOperation - + }, - + side : { - + "THREE.FrontSide" : THREE.FrontSide, "THREE.BackSide" : THREE.BackSide, "THREE.DoubleSide" : THREE.DoubleSide - + }, - + shading : { - + "THREE.NoShading" : THREE.NoShading, "THREE.FlatShading" : THREE.FlatShading, "THREE.SmoothShading" : THREE.SmoothShading - + }, colors : { - + "THREE.NoColors" : THREE.NoColors, "THREE.FaceColors" : THREE.FaceColors, "THREE.VertexColors" : THREE.VertexColors - + }, - + blendingMode : { - + "THREE.NoBlending" : THREE.NoBlending, "THREE.NormalBlending" : THREE.NormalBlending, "THREE.AdditiveBlending" : THREE.AdditiveBlending, "THREE.SubtractiveBlending" : THREE.SubtractiveBlending, "THREE.MultiplyBlending" : THREE.MultiplyBlending, "THREE.CustomBlending" : THREE.CustomBlending - + }, - + equations : { - + "THREE.AddEquation" : THREE.AddEquation, "THREE.SubtractEquation" : THREE.SubtractEquation, "THREE.ReverseSubtractEquation" : THREE.ReverseSubtractEquation - + }, - + destinationFactors : { - + "THREE.ZeroFactor" : THREE.ZeroFactor, "THREE.OneFactor" : THREE.OneFactor, "THREE.SrcColorFactor" : THREE.SrcColorFactor, @@ -65,38 +65,38 @@ var constants = { "THREE.OneMinusSrcAlphaFactor" : THREE.OneMinusSrcAlphaFactor, "THREE.DstAlphaFactor" : THREE.DstAlphaFactor, "THREE.OneMinusDstAlphaFactor" : THREE.OneMinusDstAlphaFactor - + }, - + sourceFactors : { - + "THREE.DstColorFactor" : THREE.DstColorFactor, "THREE.OneMinusDstColorFactor" : THREE.OneMinusDstColorFactor, "THREE.SrcAlphaSaturateFactor" : THREE.SrcAlphaSaturateFactor - + } - + } function getObjectsKeys( obj ) { - + var keys = []; - + for ( var key in obj ) { - + if ( obj.hasOwnProperty( key ) ) { - + keys.push( key ); - + } - + } - + return keys; } var envMaps = (function () { - + var path = "../../examples/textures/cube/SwedishRoyalCastle/"; var format = '.jpg'; var urls = [ @@ -111,32 +111,32 @@ var envMaps = (function () { var refractionCube = new THREE.Texture( reflectionCube.image, THREE.CubeRefractionMapping ); reflectionCube.format = THREE.RGBFormat; - + return { none : null, reflection : reflectionCube, refraction : refractionCube }; - + })(); var envMapKeys = getObjectsKeys( envMaps ); var textureMaps = (function () { - + return { none : null, grass : THREE.ImageUtils.loadTexture( "../../examples/textures/terrain/grasslight-thin.jpg" ) }; - + })(); var textureMapKeys = getObjectsKeys( textureMaps ); function generateVertexColors ( geometry ) { - + for ( var i=0, il = geometry.faces.length; i < il; i++ ) { - + geometry.faces[i].vertexColors.push( new THREE.Color().setHSL( i / il * Math.random(), 0.5, @@ -152,15 +152,15 @@ function generateVertexColors ( geometry ) { 0.5, 0.5 ) ); - + geometry.faces[i].color = new THREE.Color().setHSL( i / il * Math.random(), 0.5, 0.5 ); - + } - + } function generateMorphTargets ( mesh, geometry ) { @@ -172,7 +172,7 @@ function generateMorphTargets ( mesh, geometry ) { vertices.push( geometry.vertices[ i ].clone() ); scale = 1 + Math.random() * 0.3; - + vertices[ vertices.length - 1 ].x *= scale; vertices[ vertices.length - 1 ].y *= scale; vertices[ vertices.length - 1 ].z *= scale; @@ -180,31 +180,31 @@ function generateMorphTargets ( mesh, geometry ) { } geometry.morphTargets.push( { name: "target1", vertices: vertices } ); - + geometry.update } function handleColorChange ( color ) { - + return function ( value ){ - + if (typeof value === "string") { - + value = value.replace('#', '0x'); - + } - + color.setHex( value ); - + }; - + } function needsUpdate ( material, geometry ) { - + return function () { - + material.shading = +material.shading; //Ensure number material.vertexColors = +material.vertexColors; //Ensure number material.side = +material.side; //Ensure number @@ -212,63 +212,63 @@ function needsUpdate ( material, geometry ) { geometry.verticesNeedUpdate = true; geometry.normalsNeedUpdate = true; geometry.colorsNeedUpdate = true; - + }; - + }; function updateMorphs ( torus, material ) { return function () { - + torus.updateMorphTargets(); material.needsUpdate = true; - + }; - + } function updateTexture ( material, materialKey, textures ) { return function ( key ) { - + material[materialKey] = textures[key]; material.needsUpdate = true; - + }; - + } function guiScene ( gui, scene ) { - + var folder = gui.addFolder('Scene'); - + var data = { background : "#000000", "ambient light" : ambientLight.color.getHex() } - + var color = new THREE.Color(); var colorConvert = handleColorChange( color ); - + folder.addColor( data, "background" ).onChange( function ( value ) { - + colorConvert( value ); - - renderer.setClearColor(color.getHex(), 1); - + + renderer.setClearColor( color.getHex() ); + } ); - + folder.addColor( data, "ambient light" ).onChange( handleColorChange( ambientLight.color ) ) - + guiSceneFog( folder, scene ); - + } function guiSceneFog ( folder, scene ) { - + var fogFolder = folder.addFolder('scene.fog'); - + var fog = new THREE.Fog( 0x3f7b9d, 0, 60 ); var data = { @@ -277,29 +277,29 @@ function guiSceneFog ( folder, scene ) { "scene.fog.color" : fog.color.getHex() } }; - + fogFolder.add( data.fog, 'THREE.Fog()' ).onChange( function ( useFog ) { - + if ( useFog ) { - + scene.fog = fog; - + } else { - + scene.fog = null; - + } - + } ); - + fogFolder.addColor( data.fog, 'scene.fog.color').onChange( handleColorChange( fog.color ) ); - + } function guiMaterial ( gui, mesh, material, geometry ) { - + var folder = gui.addFolder('THREE.Material'); - + folder.add( material, 'transparent' ); folder.add( material, 'opacity', 0, 1 ); // folder.add( material, 'blending', constants.blendingMode ); @@ -315,11 +315,11 @@ function guiMaterial ( gui, mesh, material, geometry ) { // folder.add( material, 'overdraw', 0, 5 ); folder.add( material, 'visible' ); folder.add( material, 'side', constants.side ).onChange( needsUpdate( material, geometry ) ); - + } function guiMeshBasicMaterial ( gui, mesh, material, geometry ) { - + var data = { color : material.color.getHex(), envMaps : envMapKeys, @@ -328,7 +328,7 @@ function guiMeshBasicMaterial ( gui, mesh, material, geometry ) { specularMap : textureMapKeys, alphaMap : textureMapKeys }; - + var folder = gui.addFolder('THREE.MeshBasicMaterial'); folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) ); @@ -337,7 +337,7 @@ function guiMeshBasicMaterial ( gui, mesh, material, geometry ) { folder.add( material, 'shading', constants.shading); folder.add( material, 'vertexColors', constants.colors).onChange( needsUpdate( material, geometry ) ); folder.add( material, 'fog' ); - + folder.add( data, 'envMaps', envMapKeys ).onChange( updateTexture( material, 'envMap', envMaps ) ); folder.add( data, 'map', textureMapKeys ).onChange( updateTexture( material, 'map', textureMaps ) ); folder.add( data, 'lightMap', textureMapKeys ).onChange( updateTexture( material, 'lightMap', textureMaps ) ); @@ -348,36 +348,36 @@ function guiMeshBasicMaterial ( gui, mesh, material, geometry ) { folder.add( material, 'reflectivity', 0, 1 ); folder.add( material, 'refractionRatio', 0, 1 ); //folder.add( material, 'skinning' ); - + } function guiMeshDepthMaterial ( gui, mesh, material, geometry ) { - + var folder = gui.addFolder('THREE.MeshDepthMaterial'); - + folder.add( material, 'wireframe' ); folder.add( material, 'wireframeLinewidth', 0, 10 ); folder.add( material, 'morphTargets' ).onChange( updateMorphs( mesh, material ) ); - + } function guiMeshNormalMaterial ( gui, mesh, material, geometry ) { - + var folder = gui.addFolder('THREE.MeshNormalMaterial'); - + folder.add( material, 'shading', constants.shading).onChange( needsUpdate( material, geometry ) ); folder.add( material, 'wireframe' ); folder.add( material, 'wireframeLinewidth', 0, 10 ); folder.add( material, 'morphTargets' ).onChange( updateMorphs( mesh, material ) ); - + } function guiLineBasicMaterial ( gui, mesh, material, geometry ) { - + var data = { color : material.color.getHex() }; - + var folder = gui.addFolder('THREE.LineBasicMaterial'); folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) ); @@ -386,11 +386,11 @@ function guiLineBasicMaterial ( gui, mesh, material, geometry ) { folder.add( material, 'linejoin', ["round", "bevel", "miter"] ); folder.add( material, 'vertexColors', constants.colors).onChange( needsUpdate( material, geometry ) ); folder.add( material, 'fog' ); - + } function guiMeshLambertMaterial ( gui, mesh, material, geometry ) { - + var data = { color : material.color.getHex(), ambient : material.ambient.getHex(), @@ -401,15 +401,15 @@ function guiMeshLambertMaterial ( gui, mesh, material, geometry ) { specularMap : textureMapKeys, alphaMap : textureMapKeys }; - + var envObj = {}; - + var folder = gui.addFolder('THREE.MeshLambertMaterial'); folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) ); folder.addColor( data, 'ambient' ).onChange( handleColorChange( material.ambient ) ); folder.addColor( data, 'emissive' ).onChange( handleColorChange( material.emissive ) ); - + folder.add( material, 'shading', constants.shading ).onChange( needsUpdate( material, geometry ) ); folder.add( material, 'wireframe' ); folder.add( material, 'wireframeLinewidth', 0, 10 ); @@ -426,11 +426,11 @@ function guiMeshLambertMaterial ( gui, mesh, material, geometry ) { folder.add( material, 'reflectivity', 0, 1 ); folder.add( material, 'refractionRatio', 0, 1 ); //folder.add( material, 'skinning' ); - + } function guiMeshPhongMaterial ( gui, mesh, material, geometry ) { - + var data = { color : material.color.getHex(), ambient : material.ambient.getHex(), @@ -442,7 +442,7 @@ function guiMeshPhongMaterial ( gui, mesh, material, geometry ) { specularMap : textureMapKeys, alphaMap : textureMapKeys }; - + var folder = gui.addFolder('THREE.MeshPhongMaterial'); folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) ); @@ -461,16 +461,16 @@ function guiMeshPhongMaterial ( gui, mesh, material, geometry ) { folder.add( data, 'lightMap', textureMapKeys ).onChange( updateTexture( material, 'lightMap', textureMaps ) ); folder.add( data, 'specularMap', textureMapKeys ).onChange( updateTexture( material, 'specularMap', textureMaps ) ); folder.add( data, 'alphaMap', textureMapKeys ).onChange( updateTexture( material, 'alphaMap', textureMaps ) ); - + } function chooseFromHash ( gui, mesh, geometry ) { var selectedMaterial = window.location.hash.substring(1) || "MeshBasicMaterial"; var material; - + switch (selectedMaterial) { - + case "MeshBasicMaterial" : material = new THREE.MeshBasicMaterial({color: 0x2194CE}); @@ -480,7 +480,7 @@ function chooseFromHash ( gui, mesh, geometry ) { return material; break; - + case "MeshLambertMaterial" : material = new THREE.MeshLambertMaterial({color: 0x2194CE}); @@ -490,7 +490,7 @@ function chooseFromHash ( gui, mesh, geometry ) { return material; break; - + case "MeshPhongMaterial" : material = new THREE.MeshPhongMaterial({color: 0x2194CE}); @@ -500,27 +500,27 @@ function chooseFromHash ( gui, mesh, geometry ) { return material; break; - + case "MeshDepthMaterial" : - + material = new THREE.MeshDepthMaterial({color: 0x2194CE}); guiMaterial( gui, mesh, material, geometry ); guiMeshDepthMaterial( gui, mesh, material, geometry ); return material; - + break; - + case "MeshNormalMaterial" : - + material = new THREE.MeshNormalMaterial(); guiMaterial( gui, mesh, material, geometry ); guiMeshNormalMaterial( gui, mesh, material, geometry ); return material; - + break; - + case "LineBasicMaterial" : material = new THREE.LineBasicMaterial({color: 0x2194CE}); @@ -531,5 +531,5 @@ function chooseFromHash ( gui, mesh, geometry ) { break; } - + } diff --git a/examples/canvas_lines_colors_2d.html b/examples/canvas_lines_colors_2d.html index 2ff31e7518..aee9ac31ad 100644 --- a/examples/canvas_lines_colors_2d.html +++ b/examples/canvas_lines_colors_2d.html @@ -80,8 +80,7 @@ scene = new THREE.Scene(); - renderer = new THREE.CanvasRenderer( { antialias: false } ); - renderer.setClearColor( 0x000000, 1 ); + renderer = new THREE.CanvasRenderer(); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); diff --git a/examples/canvas_lines_dashed.html b/examples/canvas_lines_dashed.html index 9dc2952700..7c0431996d 100644 --- a/examples/canvas_lines_dashed.html +++ b/examples/canvas_lines_dashed.html @@ -99,7 +99,7 @@ scene.add( object ); renderer = new THREE.CanvasRenderer(); - renderer.setClearColor( 0x111111, 1 ); + renderer.setClearColor( 0x111111 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( WIDTH, HEIGHT ); diff --git a/examples/js/crossfade/scenes.js b/examples/js/crossfade/scenes.js index c532ac00e3..f3d2628f05 100644 --- a/examples/js/crossfade/scenes.js +++ b/examples/js/crossfade/scenes.js @@ -1,7 +1,7 @@ function generateGeometry(objectType, numObjects) { var geometry = new THREE.Geometry(); - + function applyVertexColors( g, c ) { g.faces.forEach( function( f ) { @@ -19,7 +19,7 @@ function generateGeometry(objectType, numObjects) { } for ( var i = 0; i < numObjects; i ++ ) { - + var position = new THREE.Vector3(); position.x = Math.random() * 10000 - 5000; @@ -51,7 +51,7 @@ function generateGeometry(objectType, numObjects) { scale.y = scale.z = scale.x; color.setRGB( Math.random()+0.1, 0, 0 ); } - + // give the geom's vertices a random color, to be displayed applyVertexColors( geom, color ); @@ -70,12 +70,12 @@ function generateGeometry(objectType, numObjects) { } function Scene ( type, numObjects, cameraZ, fov, rotationSpeed, clearColor ) { - + this.clearColor = clearColor; - + this.camera = new THREE.PerspectiveCamera( fov, window.innerWidth / window.innerHeight, 1, 10000 ); this.camera.position.z = cameraZ; - + // Setup scene this.scene = new THREE.Scene(); this.scene.add( new THREE.AmbientLight( 0x555555 ) ); @@ -91,19 +91,19 @@ function Scene ( type, numObjects, cameraZ, fov, rotationSpeed, clearColor ) { renderTargetParameters = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat, stencilBuffer: false }; this.fbo = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, renderTargetParameters ); - + this.render = function( delta, rtt ) { - + this.mesh.rotation.x += delta*this.rotationSpeed.x; this.mesh.rotation.y += delta*this.rotationSpeed.y; this.mesh.rotation.z += delta*this.rotationSpeed.z; - - renderer.setClearColor( this.clearColor, 1 ); - + + renderer.setClearColor( this.clearColor ); + if (rtt) renderer.render( this.scene, this.camera, this.fbo, true ); else renderer.render( this.scene, this.camera ); - + }; } diff --git a/examples/misc_animation_keys.html b/examples/misc_animation_keys.html index 52a3c7ce39..69cfd7799f 100644 --- a/examples/misc_animation_keys.html +++ b/examples/misc_animation_keys.html @@ -59,7 +59,7 @@ camera.lookAt(new THREE.Vector3( 0, 0, 0 )); renderer = new THREE.WebGLRenderer(); - renderer.setClearColor( 0x555555, 1 ); + renderer.setClearColor( 0x555555 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); diff --git a/examples/misc_controls_orbit.html b/examples/misc_controls_orbit.html index 5a894d005b..df08449ee6 100644 --- a/examples/misc_controls_orbit.html +++ b/examples/misc_controls_orbit.html @@ -109,7 +109,7 @@ // renderer renderer = new THREE.WebGLRenderer( { antialias: false } ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); diff --git a/examples/misc_controls_trackball.html b/examples/misc_controls_trackball.html index 6f5a631879..0a3c64fa91 100644 --- a/examples/misc_controls_trackball.html +++ b/examples/misc_controls_trackball.html @@ -117,7 +117,7 @@ // renderer renderer = new THREE.WebGLRenderer( { antialias: false } ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); diff --git a/examples/webgl_animation_skinning_blending.html b/examples/webgl_animation_skinning_blending.html index 2b532e0038..8b7cc2dc1f 100644 --- a/examples/webgl_animation_skinning_blending.html +++ b/examples/webgl_animation_skinning_blending.html @@ -68,7 +68,7 @@ scene.add( light ); renderer = new THREE.WebGLRenderer( { antialias: true, alpha: false } ); - renderer.setClearColor( '#777777', 1 ); + renderer.setClearColor( 0x777777 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.autoClear = true; @@ -263,4 +263,3 @@ - diff --git a/examples/webgl_animation_skinning_morph.html b/examples/webgl_animation_skinning_morph.html index ffdcb29af9..ada80b00ee 100644 --- a/examples/webgl_animation_skinning_morph.html +++ b/examples/webgl_animation_skinning_morph.html @@ -134,12 +134,11 @@ // RENDERER renderer = new THREE.WebGLRenderer( { antialias: true } ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); renderer.domElement.style.position = "relative"; - renderer.setClearColor( scene.fog.color, 1 ); - container.appendChild( renderer.domElement ); renderer.gammaInput = true; diff --git a/examples/webgl_buffergeometry.html b/examples/webgl_buffergeometry.html index c36495f0b0..7cd0f6fdfa 100644 --- a/examples/webgl_buffergeometry.html +++ b/examples/webgl_buffergeometry.html @@ -227,7 +227,7 @@ // renderer = new THREE.WebGLRenderer( { antialias: false } ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); diff --git a/examples/webgl_buffergeometry_particles.html b/examples/webgl_buffergeometry_particles.html index 34305dc3cb..7e286f732d 100644 --- a/examples/webgl_buffergeometry_particles.html +++ b/examples/webgl_buffergeometry_particles.html @@ -117,7 +117,7 @@ // renderer = new THREE.WebGLRenderer( { antialias: false } ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); diff --git a/examples/webgl_buffergeometry_uint.html b/examples/webgl_buffergeometry_uint.html index 043a99ce82..e6f7f8410f 100644 --- a/examples/webgl_buffergeometry_uint.html +++ b/examples/webgl_buffergeometry_uint.html @@ -208,7 +208,7 @@ // renderer = new THREE.WebGLRenderer( { antialias: false } ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); diff --git a/examples/webgl_custom_attributes.html b/examples/webgl_custom_attributes.html index 812e77ed15..56b02e114b 100644 --- a/examples/webgl_custom_attributes.html +++ b/examples/webgl_custom_attributes.html @@ -150,7 +150,7 @@ scene.add( sphere ); renderer = new THREE.WebGLRenderer(); - renderer.setClearColor( 0x050505, 1 ); + renderer.setClearColor( 0x050505 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( WIDTH, HEIGHT ); diff --git a/examples/webgl_custom_attributes_lines.html b/examples/webgl_custom_attributes_lines.html index d5e8376d3f..69ff10e9be 100644 --- a/examples/webgl_custom_attributes_lines.html +++ b/examples/webgl_custom_attributes_lines.html @@ -186,7 +186,7 @@ scene.add( object ); renderer = new THREE.WebGLRenderer( { antialias: true } ); - renderer.setClearColor( 0x050505, 1 ); + renderer.setClearColor( 0x050505 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( WIDTH, HEIGHT ); diff --git a/examples/webgl_effects_oculusrift.html b/examples/webgl_effects_oculusrift.html index aa3a3d23ff..29187c46ab 100644 --- a/examples/webgl_effects_oculusrift.html +++ b/examples/webgl_effects_oculusrift.html @@ -194,7 +194,7 @@ scene.add( directionalLight ); renderer = new THREE.WebGLRenderer(); - renderer.setClearColor( 0xbfd1e5, 1 ); + renderer.setClearColor( 0xbfd1e5 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); diff --git a/examples/webgl_geometry_colors_lookuptable.html b/examples/webgl_geometry_colors_lookuptable.html index 68b9b547c7..ac8500e633 100644 --- a/examples/webgl_geometry_colors_lookuptable.html +++ b/examples/webgl_geometry_colors_lookuptable.html @@ -105,7 +105,7 @@ scene.add( directionalLight ); renderer = new THREE.WebGLRenderer( { antialias: true } ); - renderer.setClearColor(0xffffff, 1); + renderer.setClearColor( 0xffffff ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); diff --git a/examples/webgl_geometry_dynamic.html b/examples/webgl_geometry_dynamic.html index 9435870961..447a9640f7 100644 --- a/examples/webgl_geometry_dynamic.html +++ b/examples/webgl_geometry_dynamic.html @@ -112,7 +112,7 @@ scene.add( mesh ); renderer = new THREE.WebGLRenderer(); - renderer.setClearColor( 0xaaccff, 1 ); + renderer.setClearColor( 0xaaccff ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); diff --git a/examples/webgl_geometry_minecraft.html b/examples/webgl_geometry_minecraft.html index 2d182d551e..7cbdbc5b46 100644 --- a/examples/webgl_geometry_minecraft.html +++ b/examples/webgl_geometry_minecraft.html @@ -193,7 +193,7 @@ scene.add( directionalLight ); renderer = new THREE.WebGLRenderer(); - renderer.setClearColor( 0xbfd1e5, 1 ); + renderer.setClearColor( 0xbfd1e5 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); diff --git a/examples/webgl_geometry_shapes.html b/examples/webgl_geometry_shapes.html index 53e07f88c8..e3622f86b2 100644 --- a/examples/webgl_geometry_shapes.html +++ b/examples/webgl_geometry_shapes.html @@ -331,7 +331,7 @@ // renderer = new THREE.WebGLRenderer( { antialias: true } ); - renderer.setClearColor( 0xf0f0f0, 1 ); + renderer.setClearColor( 0xf0f0f0 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); diff --git a/examples/webgl_geometry_text.html b/examples/webgl_geometry_text.html index 3eebed1ed4..6d2de4a231 100644 --- a/examples/webgl_geometry_text.html +++ b/examples/webgl_geometry_text.html @@ -223,7 +223,7 @@ } - material = new THREE.MeshFaceMaterial( [ + material = new THREE.MeshFaceMaterial( [ new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading } ), // front new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.SmoothShading } ) // side ] ); @@ -246,7 +246,7 @@ // RENDERER renderer = new THREE.WebGLRenderer( { antialias: true } ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); diff --git a/examples/webgl_geometry_text2.html b/examples/webgl_geometry_text2.html index 437bdf468d..0c49db51a6 100644 --- a/examples/webgl_geometry_text2.html +++ b/examples/webgl_geometry_text2.html @@ -84,7 +84,7 @@ }; } )(); - + - + diff --git a/examples/webgl_modifier_tessellation.html b/examples/webgl_modifier_tessellation.html index fe78f29606..b8bd31cd98 100644 --- a/examples/webgl_modifier_tessellation.html +++ b/examples/webgl_modifier_tessellation.html @@ -229,7 +229,7 @@ scene.add( mesh ); renderer = new THREE.WebGLRenderer( { antialias: true } ); - renderer.setClearColor( 0x050505, 1 ); + renderer.setClearColor( 0x050505 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( WIDTH, HEIGHT ); diff --git a/examples/webgl_morphtargets.html b/examples/webgl_morphtargets.html index 8bdf6fd86a..735a4efc1c 100644 --- a/examples/webgl_morphtargets.html +++ b/examples/webgl_morphtargets.html @@ -141,7 +141,7 @@ // renderer = new THREE.WebGLRenderer(); - renderer.setClearColor( 0x222222, 1 ); + renderer.setClearColor( 0x222222 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); renderer.sortObjects = false; diff --git a/examples/webgl_morphtargets_md2.html b/examples/webgl_morphtargets_md2.html index ac42479b64..c3883e1b18 100644 --- a/examples/webgl_morphtargets_md2.html +++ b/examples/webgl_morphtargets_md2.html @@ -137,7 +137,7 @@ // RENDERER renderer = new THREE.WebGLRenderer( { antialias: true } ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); container.appendChild( renderer.domElement ); diff --git a/examples/webgl_morphtargets_md2_control.html b/examples/webgl_morphtargets_md2_control.html index daabeb48ec..7e3701db31 100644 --- a/examples/webgl_morphtargets_md2_control.html +++ b/examples/webgl_morphtargets_md2_control.html @@ -138,7 +138,7 @@ // RENDERER renderer = new THREE.WebGLRenderer( { antialias: true } ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); container.appendChild( renderer.domElement ); diff --git a/examples/webgl_particles_dynamic.html b/examples/webgl_particles_dynamic.html index 29cd7c916d..ae26dd26ce 100644 --- a/examples/webgl_particles_dynamic.html +++ b/examples/webgl_particles_dynamic.html @@ -5,40 +5,39 @@
- three.js - webgl dynamic particles + postprocessing - - models by Reallusion - iClone, - Troyano - -
+ three.js - webgl dynamic particles + postprocessing + - models by Reallusion + iClone, + Troyano + @@ -138,14 +137,13 @@ // renderer = new THREE.WebGLRenderer( { antialias: false } ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); renderer.autoClear = false; renderer.sortObjects = false; container.appendChild( renderer.domElement ); - renderer.setClearColor( scene.fog.color, 1 ); - // parent = new THREE.Object3D(); diff --git a/examples/webgl_performance.html b/examples/webgl_performance.html index 094c7f0ef9..cdab67480e 100644 --- a/examples/webgl_performance.html +++ b/examples/webgl_performance.html @@ -77,7 +77,7 @@ } ); renderer = new THREE.WebGLRenderer(); - renderer.setClearColor( 0xffffff, 1 ); + renderer.setClearColor( 0xffffff ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); diff --git a/examples/webgl_performance_doublesided.html b/examples/webgl_performance_doublesided.html index d97a7c91f5..d0b6b4bffe 100644 --- a/examples/webgl_performance_doublesided.html +++ b/examples/webgl_performance_doublesided.html @@ -107,7 +107,7 @@ } renderer = new THREE.WebGLRenderer( { antialias: true } ); - renderer.setClearColor( 0x050505, 1 ); + renderer.setClearColor( 0x050505 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); diff --git a/examples/webgl_postprocessing_advanced.html b/examples/webgl_postprocessing_advanced.html index e7dc948831..b78c5947eb 100644 --- a/examples/webgl_postprocessing_advanced.html +++ b/examples/webgl_postprocessing_advanced.html @@ -139,7 +139,7 @@ // renderer = new THREE.WebGLRenderer( { antialias: false } ); - renderer.setClearColor( 0x000000, 1 ); + renderer.setClearColor( 0x000000 ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( width, height ); renderer.autoClear = false; @@ -333,7 +333,7 @@ geometry.computeTangents(); var mat2 = new THREE.MeshLambertMaterial( { - + color: 0x999999, ambient: 0x444444, specular: 0x080808, @@ -341,7 +341,7 @@ map: THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Map-COL.jpg" ), normalMap: THREE.ImageUtils.loadTexture( "obj/leeperrysmith/Infinite-Level_02_Tangent_SmoothUV.jpg" ), normalScale: new THREE.Vector2( 0.75, 0.75 ) - + } ); mesh = new THREE.Mesh( geometry, mat2 ); diff --git a/examples/webgl_postprocessing_godrays.html b/examples/webgl_postprocessing_godrays.html index e301053afe..1a3d82a0f0 100644 --- a/examples/webgl_postprocessing_godrays.html +++ b/examples/webgl_postprocessing_godrays.html @@ -124,7 +124,7 @@ // renderer = new THREE.WebGLRenderer( { antialias: false } ); - renderer.setClearColor( bgColor, 1 ); + renderer.setClearColor( bgColor ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( window.innerWidth, window.innerHeight ); container.appendChild( renderer.domElement ); diff --git a/examples/webgl_shading_physical.html b/examples/webgl_shading_physical.html index baa287bc13..0713e8d844 100644 --- a/examples/webgl_shading_physical.html +++ b/examples/webgl_shading_physical.html @@ -324,7 +324,7 @@ // RENDERER renderer = new THREE.WebGLRenderer( { antialias: true } ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); @@ -496,7 +496,7 @@ if ( morph ) morph.updateAnimation( delta ); scene.fog.color.setHSL( 0.63, 0.05, parameters.control ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); sunLight.intensity = parameters.control * 0.7 + 0.3; pointLight.intensity = - parameters.control * 0.5 + 1; @@ -526,4 +526,3 @@ - diff --git a/examples/webgl_shadowmap.html b/examples/webgl_shadowmap.html index ec566020b9..80b830ea8c 100644 --- a/examples/webgl_shadowmap.html +++ b/examples/webgl_shadowmap.html @@ -133,11 +133,11 @@ // RENDERER renderer = new THREE.WebGLRenderer( { antialias: true } ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); container.appendChild( renderer.domElement ); - renderer.setClearColor( scene.fog.color, 1 ); renderer.autoClear = false; // diff --git a/examples/webgl_shadowmap_performance.html b/examples/webgl_shadowmap_performance.html index bb5fe735f5..239f0e3b49 100644 --- a/examples/webgl_shadowmap_performance.html +++ b/examples/webgl_shadowmap_performance.html @@ -129,7 +129,7 @@ renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); container.appendChild( renderer.domElement ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.autoClear = false; // diff --git a/examples/webgl_terrain_dynamic.html b/examples/webgl_terrain_dynamic.html index c46cba5b7c..258ec5e494 100644 --- a/examples/webgl_terrain_dynamic.html +++ b/examples/webgl_terrain_dynamic.html @@ -430,7 +430,7 @@ // RENDERER renderer = new THREE.WebGLRenderer(); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); renderer.setPixelRatio( window.devicePixelRatio ); renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT ); container.appendChild( renderer.domElement ); @@ -659,7 +659,7 @@ scene.fog.color.setHSL( 0.1, 0.5, lightVal ); - renderer.setClearColor( scene.fog.color, 1 ); + renderer.setClearColor( scene.fog.color ); directionalLight.intensity = THREE.Math.mapLinear( valNorm, 0, 1, 0.1, 1.15 ); pointLight.intensity = THREE.Math.mapLinear( valNorm, 0, 1, 0.9, 1.5 ); -- GitLab