diff --git a/examples/js/crossfade/scenes.js b/examples/js/crossfade/scenes.js index 066d71303e08dc84da2ca48309f9e755daa44125..7f360b0e57b3631180a158896cdece4e881e53ac 100644 --- a/examples/js/crossfade/scenes.js +++ b/examples/js/crossfade/scenes.js @@ -87,7 +87,7 @@ function Scene ( type, numObjects, cameraZ, fov, rotationSpeed, clearColor ) { this.rotationSpeed = rotationSpeed; - var defaultMaterial = new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ); + var defaultMaterial = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors } ); this.mesh = new THREE.Mesh( generateGeometry( type, numObjects ), defaultMaterial ); this.scene.add( this.mesh ); diff --git a/examples/js/renderers/RaytracingWorker.js b/examples/js/renderers/RaytracingWorker.js index e3b45b678640b54be14f42646c8bb36ddd66be2f..361745c2d8270cbb89135b44401b2deb6f8eb927 100644 --- a/examples/js/renderers/RaytracingWorker.js +++ b/examples/js/renderers/RaytracingWorker.js @@ -267,7 +267,7 @@ THREE.RaytracingRendererWorker = function () { // the same normal can be reused for all lights // (should be possible to cache even more) - computePixelNormal( normalVector, localPoint, material.shading, face, vertices ); + computePixelNormal( normalVector, localPoint, material.flatShading, face, vertices ); normalVector.applyMatrix3( _object.normalMatrix ).normalize(); normalComputed = true; @@ -397,16 +397,16 @@ THREE.RaytracingRendererWorker = function () { var tmpVec2 = new THREE.Vector3(); var tmpVec3 = new THREE.Vector3(); - return function computePixelNormal( outputVector, point, shading, face, vertices ) { + return function computePixelNormal( outputVector, point, flatShading, face, vertices ) { var faceNormal = face.normal; var vertexNormals = face.vertexNormals; - if ( shading === THREE.FlatShading ) { + if ( flatShading === true ) { outputVector.copy( faceNormal ); - } else if ( shading === THREE.SmoothShading ) { + } else { // compute barycentric coordinates diff --git a/examples/misc_controls_orbit.html b/examples/misc_controls_orbit.html index f4b150a7da74ed5ed86935b44ad0b05bde7b0c6c..4ac54c8914d7ecf81281164bb8132f888d27b666 100644 --- a/examples/misc_controls_orbit.html +++ b/examples/misc_controls_orbit.html @@ -82,7 +82,7 @@ // world var geometry = new THREE.CylinderGeometry( 0, 10, 30, 4, 1 ); - var material = new THREE.MeshPhongMaterial( { color:0xffffff, shading: THREE.FlatShading } ); + var material = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true } ); for ( var i = 0; i < 500; i ++ ) { diff --git a/examples/misc_controls_pointerlock.html b/examples/misc_controls_pointerlock.html index febada777c218ce1feeecfb7ba35fc617d8ef97a..8bd7fbd3385a1918356d899149230d80dc8dabd8 100644 --- a/examples/misc_controls_pointerlock.html +++ b/examples/misc_controls_pointerlock.html @@ -283,7 +283,7 @@ for ( var i = 0; i < 500; i ++ ) { - material = new THREE.MeshPhongMaterial( { specular: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ); + material = new THREE.MeshPhongMaterial( { specular: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors } ); var mesh = new THREE.Mesh( geometry, material ); mesh.position.x = Math.floor( Math.random() * 20 - 10 ) * 20; diff --git a/examples/misc_controls_trackball.html b/examples/misc_controls_trackball.html index dd73997aa9391e1d1ecfa19fca539703c1c48d65..6322037686401cb3b259868be661436a473d380b 100644 --- a/examples/misc_controls_trackball.html +++ b/examples/misc_controls_trackball.html @@ -85,7 +85,7 @@ scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 ); var geometry = new THREE.CylinderGeometry( 0, 10, 30, 4, 1 ); - var material = new THREE.MeshPhongMaterial( { color:0xffffff, shading: THREE.FlatShading } ); + var material = new THREE.MeshPhongMaterial( { color:0xffffff, flatShading: true } ); for ( var i = 0; i < 500; i ++ ) { diff --git a/examples/misc_lights_test.html b/examples/misc_lights_test.html index 186bd93c15f92097ffb47923bff3c9ddc37d9a9d..2917fcc983d14cb72b694b6ef8cb08ddf578abf5 100644 --- a/examples/misc_lights_test.html +++ b/examples/misc_lights_test.html @@ -71,7 +71,7 @@ // Spheres geometry = new THREE.SphereGeometry( 100, 16, 8 ); - material = new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5, shininess: 0 } ); + material = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, overdraw: 0.5, shininess: 0 } ); for ( var i = 0; i < 30; i ++ ) { diff --git a/examples/misc_sound.html b/examples/misc_sound.html index 01ed5897db89999b6b1a5fed9d2a6f9a7ce2b78b..8a95849b78b2404f656adb881ef057d1ba480f67 100644 --- a/examples/misc_sound.html +++ b/examples/misc_sound.html @@ -86,9 +86,9 @@ var sphere = new THREE.SphereGeometry( 20, 32, 16 ); - material1 = new THREE.MeshPhongMaterial( { color: 0xffaa00, shading: THREE.FlatShading, shininess: 0 } ); - material2 = new THREE.MeshPhongMaterial( { color: 0xff2200, shading: THREE.FlatShading, shininess: 0 } ); - material3 = new THREE.MeshPhongMaterial( { color: 0x6622aa, shading: THREE.FlatShading, shininess: 0 } ); + material1 = new THREE.MeshPhongMaterial( { color: 0xffaa00, flatShading: true, shininess: 0 } ); + material2 = new THREE.MeshPhongMaterial( { color: 0xff2200, flatShading: true, shininess: 0 } ); + material3 = new THREE.MeshPhongMaterial( { color: 0x6622aa, flatShading: true, shininess: 0 } ); // sound spheres diff --git a/examples/raytracing_sandbox.html b/examples/raytracing_sandbox.html index e190cdd2aca043bd1df16d2a07a921bfc862821e..f346582efa2154338b9e18129bde5a3b9f425655 100644 --- a/examples/raytracing_sandbox.html +++ b/examples/raytracing_sandbox.html @@ -45,7 +45,7 @@ specular: 0x222222, shininess: 150, vertexColors: THREE.NoColors, - shading: THREE.SmoothShading + flatShading: false } ); var phongMaterialBox = new THREE.MeshPhongMaterial( { @@ -53,7 +53,7 @@ specular: 0x111111, shininess: 100, vertexColors: THREE.NoColors, - shading: THREE.FlatShading + flatShading: true } ); var phongMaterialBoxBottom = new THREE.MeshPhongMaterial( { @@ -61,7 +61,7 @@ specular: 0x111111, shininess: 100, vertexColors: THREE.NoColors, - shading: THREE.FlatShading + flatShading: true } ); var phongMaterialBoxLeft = new THREE.MeshPhongMaterial( { @@ -69,7 +69,7 @@ specular: 0x111111, shininess: 100, vertexColors: THREE.NoColors, - shading: THREE.FlatShading + flatShading: true } ); var phongMaterialBoxRight = new THREE.MeshPhongMaterial( { @@ -77,7 +77,7 @@ specular: 0x111111, shininess: 100, vertexColors: THREE.NoColors, - shading: THREE.FlatShading + flatShading: true } ); var mirrorMaterialFlat = new THREE.MeshPhongMaterial( { @@ -85,7 +85,7 @@ specular: 0xff8888, shininess: 10000, vertexColors: THREE.NoColors, - shading: THREE.FlatShading + flatShading: true } ); mirrorMaterialFlat.mirror = true; mirrorMaterialFlat.reflectivity = 1; @@ -95,7 +95,7 @@ specular: 0xaaaaaa, shininess: 10000, vertexColors: THREE.NoColors, - shading: THREE.FlatShading + flatShading: true } ); mirrorMaterialFlatDark.mirror = true; mirrorMaterialFlatDark.reflectivity = 1; @@ -105,7 +105,7 @@ specular: 0x222222, shininess: 10000, vertexColors: THREE.NoColors, - shading: THREE.SmoothShading + flatShading: false } ); mirrorMaterialSmooth.mirror = true; mirrorMaterialSmooth.reflectivity = 0.3; @@ -115,7 +115,7 @@ specular: 0x00ff00, shininess: 10000, vertexColors: THREE.NoColors, - shading: THREE.FlatShading + flatShading: true } ); glassMaterialFlat.glass = true; glassMaterialFlat.reflectivity = 0.5; @@ -125,7 +125,7 @@ specular: 0xffaa55, shininess: 10000, vertexColors: THREE.NoColors, - shading: THREE.SmoothShading + flatShading: false } ); glassMaterialSmooth.glass = true; glassMaterialSmooth.reflectivity = 0.25; diff --git a/examples/webgl2_sandbox.html b/examples/webgl2_sandbox.html index 2423e86028d0a4f63360ef253f940d73d39cc417..e7e462ade6518b7620cc4ecbd025e7d16df86b97 100644 --- a/examples/webgl2_sandbox.html +++ b/examples/webgl2_sandbox.html @@ -81,8 +81,8 @@ new THREE.MeshBasicMaterial( { color: 0xffaa00, wireframe: true } ), new THREE.MeshBasicMaterial( { map: texture1, fog: false } ), new THREE.MeshLambertMaterial( { color: 0xdddddd } ), - new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.FlatShading } ), - new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.SmoothShading } ) + new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, flatShading: true } ), + new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30 } ) ]; diff --git a/examples/webgl_camera_logarithmicdepthbuffer.html b/examples/webgl_camera_logarithmicdepthbuffer.html index 6d5c3568e0003fc6c025d023d99e90ae2a97adf4..565675a32506873313fe83d971c5d16e88740b52 100644 --- a/examples/webgl_camera_logarithmicdepthbuffer.html +++ b/examples/webgl_camera_logarithmicdepthbuffer.html @@ -190,7 +190,6 @@ color: 0xffffff, specular: 0x050505, shininess: 50, - shading: THREE.SmoothShading, emissive: 0x000000 }; diff --git a/examples/webgl_geometry_colors.html b/examples/webgl_geometry_colors.html index ddbf108fff601ad08a148fa87067d210ccf536a0..75dfd0455b455d9e8fa8e81fe9ed80499abb4048 100644 --- a/examples/webgl_geometry_colors.html +++ b/examples/webgl_geometry_colors.html @@ -151,8 +151,8 @@ var materials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), - new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors, shininess: 0 } ), + new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_geometry_colors_blender.html b/examples/webgl_geometry_colors_blender.html index 36092744146ae61ceca96a7f9d03d0beef1a14e0..9238583ffe4b391fe4b159551ec8d27297c77734 100644 --- a/examples/webgl_geometry_colors_blender.html +++ b/examples/webgl_geometry_colors_blender.html @@ -105,8 +105,6 @@ function createScene1( geometry, materials ) { - materials[ 0 ].shading = THREE.FlatShading; - mesh = new THREE.Mesh( geometry, materials ); mesh.position.x = 400; mesh.scale.x = mesh.scale.y = mesh.scale.z = 250; @@ -116,8 +114,6 @@ function createScene2( geometry, materials ) { - materials[ 0 ].shading = THREE.FlatShading; - mesh2 = new THREE.Mesh( geometry, materials ); mesh2.position.x = - 400; mesh2.scale.x = mesh2.scale.y = mesh2.scale.z = 250; diff --git a/examples/webgl_geometry_teapot.html b/examples/webgl_geometry_teapot.html index e4b22d623f49aca6e8bef04595f70a047ec1ab90..88dac2c6de9b0b6447f432ec79913e7200d92aca 100644 --- a/examples/webgl_geometry_teapot.html +++ b/examples/webgl_geometry_teapot.html @@ -135,15 +135,15 @@ wireMaterial = new THREE.MeshBasicMaterial( { color: 0xFFFFFF, wireframe: true } ) ; - flatMaterial = new THREE.MeshPhongMaterial( { color: materialColor, specular: 0x0, shading: THREE.FlatShading, side: THREE.DoubleSide } ); + flatMaterial = new THREE.MeshPhongMaterial( { color: materialColor, specular: 0x000000, flatShading: true, side: THREE.DoubleSide } ); gouraudMaterial = new THREE.MeshLambertMaterial( { color: materialColor, side: THREE.DoubleSide } ); - phongMaterial = new THREE.MeshPhongMaterial( { color: materialColor, shading: THREE.SmoothShading, side: THREE.DoubleSide } ); + phongMaterial = new THREE.MeshPhongMaterial( { color: materialColor, side: THREE.DoubleSide } ); - texturedMaterial = new THREE.MeshPhongMaterial( { color: materialColor, map: textureMap, shading: THREE.SmoothShading, side: THREE.DoubleSide } ); + texturedMaterial = new THREE.MeshPhongMaterial( { color: materialColor, map: textureMap, side: THREE.DoubleSide } ); - reflectiveMaterial = new THREE.MeshPhongMaterial( { color: materialColor, envMap: textureCube, shading: THREE.SmoothShading, side: THREE.DoubleSide } ); + reflectiveMaterial = new THREE.MeshPhongMaterial( { color: materialColor, envMap: textureCube, side: THREE.DoubleSide } ); // scene itself scene = new THREE.Scene(); diff --git a/examples/webgl_geometry_text.html b/examples/webgl_geometry_text.html index 69db7e10d48f9a1621a9e036e38c77d6db28c75f..acda30d6d2ddfbc9ad0c35ec59716e3116d2e211 100644 --- a/examples/webgl_geometry_text.html +++ b/examples/webgl_geometry_text.html @@ -182,8 +182,8 @@ } materials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading } ), // front - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.SmoothShading } ) // side + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true } ), // front + new THREE.MeshPhongMaterial( { color: 0xffffff } ) // side ]; group = new THREE.Group(); diff --git a/examples/webgl_geometry_text_earcut.html b/examples/webgl_geometry_text_earcut.html index 4e4301f9bab6de68e4c0295d7dce2514cf1c6fdb..dfef52e003f141a40309c69cbe77a2c3f3aa2534 100644 --- a/examples/webgl_geometry_text_earcut.html +++ b/examples/webgl_geometry_text_earcut.html @@ -240,8 +240,8 @@ } materials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading } ), // front - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.SmoothShading } ) // side + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true } ), // front + new THREE.MeshPhongMaterial( { color: 0xffffff } ) // side ]; group = new THREE.Group(); diff --git a/examples/webgl_geometry_text_pnltri.html b/examples/webgl_geometry_text_pnltri.html index 85b6aa1e43e9c574fb50fe884e92edcf3287cb1f..91ad431f2b3ad1c0cecdfe0ede91e35211034125 100644 --- a/examples/webgl_geometry_text_pnltri.html +++ b/examples/webgl_geometry_text_pnltri.html @@ -212,8 +212,8 @@ } materials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading } ), // front - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.SmoothShading } ) // side + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true } ), // front + new THREE.MeshPhongMaterial( { color: 0xffffff } ) // side ]; group = new THREE.Group(); diff --git a/examples/webgl_interactive_cubes_gpu.html b/examples/webgl_interactive_cubes_gpu.html index 9b7b548e85e7c71b32c8fd894f81b1e037a0187b..d5f01e006e20961a06be6023d547a7aefce999ce 100644 --- a/examples/webgl_interactive_cubes_gpu.html +++ b/examples/webgl_interactive_cubes_gpu.html @@ -86,7 +86,7 @@ var geometry = new THREE.Geometry(), pickingGeometry = new THREE.Geometry(), pickingMaterial = new THREE.MeshBasicMaterial( { vertexColors: THREE.VertexColors } ), - defaultMaterial = new THREE.MeshPhongMaterial({ color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ); + defaultMaterial = new THREE.MeshPhongMaterial({ color: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors, shininess: 0 } ); function applyVertexColors( g, c ) { diff --git a/examples/webgl_interactive_raycasting_points.html b/examples/webgl_interactive_raycasting_points.html index ce4d85cb95e5d227354abc2f77f8e4ce24c00df0..5d415a4d4fe8ef4632b06c9aa628e0da6cb8b59c 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 sphereMaterial = new THREE.MeshBasicMaterial( { color: 0xff0000, shading: THREE.FlatShading } ); + var sphereMaterial = new THREE.MeshBasicMaterial( { color: 0xff0000 } ); for ( var i = 0; i < 40; i++ ) { diff --git a/examples/webgl_lights_hemisphere.html b/examples/webgl_lights_hemisphere.html index ea235b0049a1a25e6860648a40217d605aa21fbe..4b43baf3f185f8e4f1ef90d586a7095e64ac2965 100644 --- a/examples/webgl_lights_hemisphere.html +++ b/examples/webgl_lights_hemisphere.html @@ -184,7 +184,7 @@ loader.load( 'models/animated/flamingo.js', function( geometry ) { - var material = new THREE.MeshPhongMaterial( { color: 0xffffff, specular: 0xffffff, shininess: 20, morphTargets: true, vertexColors: THREE.FaceColors, shading: THREE.FlatShading } ); + var material = new THREE.MeshPhongMaterial( { color: 0xffffff, specular: 0xffffff, shininess: 20, morphTargets: true, vertexColors: THREE.FaceColors, flatShading: true } ); var mesh = new THREE.Mesh( geometry, material ); var s = 0.35; diff --git a/examples/webgl_loader_collada_kinematics.html b/examples/webgl_loader_collada_kinematics.html index 4af4c7d56a0d96ce9700507046f10fa04714ec6d..bd833d4942c2a133b6bd97c01574b0d0a21cb40b 100644 --- a/examples/webgl_loader_collada_kinematics.html +++ b/examples/webgl_loader_collada_kinematics.html @@ -66,8 +66,8 @@ if ( child instanceof THREE.Mesh ) { - child.geometry.computeFaceNormals(); - child.material.shading = THREE.FlatShading; + // model does not have normals + child.material.flatShading = true; } diff --git a/examples/webgl_loader_gltf2.html b/examples/webgl_loader_gltf2.html index 432d86b1ae2a932b6f885283294e55a7f6077cd5..fc3de51a66584a90de605ab82c5f2388716db28e 100644 --- a/examples/webgl_loader_gltf2.html +++ b/examples/webgl_loader_gltf2.html @@ -184,8 +184,7 @@ if (sceneInfo.addGround) { var groundMaterial = new THREE.MeshPhongMaterial({ - color: 0xFFFFFF, - shading: THREE.SmoothShading + color: 0xFFFFFF }); ground = new THREE.Mesh( new THREE.PlaneBufferGeometry(512, 512), groundMaterial); diff --git a/examples/webgl_loader_obj2.html b/examples/webgl_loader_obj2.html index 5e9b0a67c7d2b277641adc329c2021718c0d0169..e75e3124f266ca0df9ea40e2118b6d15206236b1 100644 --- a/examples/webgl_loader_obj2.html +++ b/examples/webgl_loader_obj2.html @@ -106,7 +106,7 @@ this.controls = null; - this.smoothShading = true; + this.flatShading = false; this.doubleSide = false; this.cube = null; @@ -245,14 +245,14 @@ this.renderer.render( this.scene, this.camera ); }; - OBJLoader2Example.prototype.alterSmoothShading = function () { + OBJLoader2Example.prototype.alterShading = function () { var scope = this; - scope.smoothShading = ! scope.smoothShading; - console.log( scope.smoothShading ? 'Enabling SmoothShading' : 'Enabling FlatShading'); + scope.flatShading = ! scope.flatShading; + console.log( scope.flatShading ? 'Enabling flat shading' : 'Enabling smooth shading'); scope.traversalFunction = function ( material ) { - material.shading = scope.smoothShading ? THREE.SmoothShading : THREE.FlatShading; + material.flatShading = scope.flatShading; material.needsUpdate = true; }; var scopeTraverse = function ( object3d ) { @@ -304,7 +304,7 @@ // Init dat.gui and controls var OBJLoader2Control = function() { - this.smoothShading = app.smoothShading; + this.flatShading = app.flatShading; this.doubleSide = app.doubleSide; }; var objLoader2Control = new OBJLoader2Control(); @@ -317,10 +317,10 @@ var menuDiv = document.getElementById( 'dat' ); menuDiv.appendChild(gui.domElement); var folderQueue = gui.addFolder( 'OBJLoader2 Options' ); - var controlSmooth = folderQueue.add( objLoader2Control, 'smoothShading' ).name( 'Smooth Shading' ); + var controlSmooth = folderQueue.add( objLoader2Control, 'flatShading' ).name( 'Flat Shading' ); controlSmooth.onChange( function( value ) { - console.log( 'Setting smoothShading to: ' + value ); - app.alterSmoothShading(); + console.log( 'Setting flatShading to: ' + value ); + app.alterShading(); }); var controlDouble = folderQueue.add( objLoader2Control, 'doubleSide' ).name( 'Double Side Materials' ); diff --git a/examples/webgl_loader_obj2_ww.html b/examples/webgl_loader_obj2_ww.html index 93c972ba5e8b02c3b59a95be86676ac2de5b6256..6c6bf98e8af7e6d4f406bc1d19aef1a0ce1c1453 100644 --- a/examples/webgl_loader_obj2_ww.html +++ b/examples/webgl_loader_obj2_ww.html @@ -111,7 +111,7 @@ this.controls = null; - this.smoothShading = true; + this.flatShading = false; this.doubleSide = false; this.streamMeshes = true; @@ -312,14 +312,14 @@ this.renderer.render( this.scene, this.camera ); }; - WWOBJLoader2Example.prototype.alterSmoothShading = function () { + WWOBJLoader2Example.prototype.alterShading = function () { var scope = this; - scope.smoothShading = ! scope.smoothShading; - console.log( scope.smoothShading ? 'Enabling SmoothShading' : 'Enabling FlatShading'); + scope.flatShading = ! scope.flatShading; + console.log( scope.flatShading ? 'Enabling flat shading' : 'Enabling smooth shading'); scope.traversalFunction = function ( material ) { - material.shading = scope.smoothShading ? THREE.SmoothShading : THREE.FlatShading; + material.flatShading = scope.flatShading; material.needsUpdate = true; }; var scopeTraverse = function ( object3d ) { @@ -408,7 +408,7 @@ // Init dat.gui and controls var elemFileInput = document.getElementById( 'fileUploadInput' ); var WWOBJLoader2Control = function() { - this.smoothShading = app.smoothShading; + this.flatShading = app.flatShading; this.doubleSide = app.doubleSide; this.streamMeshes = app.streamMeshes; }; @@ -422,10 +422,10 @@ var menuDiv = document.getElementById( 'dat' ); menuDiv.appendChild(gui.domElement); var folderOptions = gui.addFolder( 'WWOBJLoader2 Options' ); - var controlSmooth = folderOptions.add( wwObjLoader2Control, 'smoothShading' ).name( 'Smooth Shading' ); + var controlSmooth = folderOptions.add( wwObjLoader2Control, 'flatShading' ).name( 'Flat Shading' ); controlSmooth.onChange( function( value ) { - console.log( 'Setting smoothShading to: ' + value ); - app.alterSmoothShading(); + console.log( 'Setting flatShading to: ' + value ); + app.alterShading(); }); var controlDouble = folderOptions.add( wwObjLoader2Control, 'doubleSide' ).name( 'Double Side Materials' ); diff --git a/examples/webgl_loader_ply.html b/examples/webgl_loader_ply.html index 85e749c863e8b3dbd16b87ed3df5ff9fdd274dac..75ca443b4392308ecbc86d934450f5d2c333be79 100644 --- a/examples/webgl_loader_ply.html +++ b/examples/webgl_loader_ply.html @@ -94,7 +94,7 @@ geometry.computeVertexNormals(); - var material = new THREE.MeshStandardMaterial( { color: 0x0055ff, shading: THREE.FlatShading } ); + var material = new THREE.MeshStandardMaterial( { color: 0x0055ff, flatShading: true } ); var mesh = new THREE.Mesh( geometry, material ); mesh.position.y = - 0.2; @@ -113,7 +113,7 @@ geometry.computeVertexNormals(); - var material = new THREE.MeshStandardMaterial( { color: 0x0055ff, shading: THREE.FlatShading } ); + var material = new THREE.MeshStandardMaterial( { color: 0x0055ff, flatShading: true } ); var mesh = new THREE.Mesh( geometry, material ); mesh.position.x = - 0.2; diff --git a/examples/webgl_loader_ttf.html b/examples/webgl_loader_ttf.html index 523b6eac058b8c2c7fc76f579c8de67916a4cdec..7644eae320aa0a9858a27ed7c6d87500a9ec2f1c 100644 --- a/examples/webgl_loader_ttf.html +++ b/examples/webgl_loader_ttf.html @@ -100,7 +100,7 @@ pointLight.color.setHSL( Math.random(), 1, 0.5 ); scene.add( pointLight ); - material = new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading } ); + material = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true } ); group = new THREE.Group(); group.position.y = 100; diff --git a/examples/webgl_marchingcubes.html b/examples/webgl_marchingcubes.html index 078bc15a08c0c29dee82635b0624019882591a90..8a6a1ea7be60b8ebb8907702fff65711ed7ae030 100644 --- a/examples/webgl_marchingcubes.html +++ b/examples/webgl_marchingcubes.html @@ -313,7 +313,7 @@ "flat" : { - m: new THREE.MeshPhongMaterial( { color: 0x000000, specular: 0x111111, shininess: 1, shading: THREE.FlatShading } ), + m: new THREE.MeshPhongMaterial( { color: 0x000000, specular: 0x111111, shininess: 1, flatShading: true } ), h: 0, s: 0, l: 1 }, diff --git a/examples/webgl_materials.html b/examples/webgl_materials.html index ff1ad572011ed7d9df7022697a1b3a962cb80ae5..c7e0e40da1c273f66f37e7f46bb7998d304e9c92 100644 --- a/examples/webgl_materials.html +++ b/examples/webgl_materials.html @@ -56,21 +56,21 @@ texture.needsUpdate = true; materials.push( new THREE.MeshLambertMaterial( { map: texture, transparent: true } ) ); - materials.push( new THREE.MeshLambertMaterial( { color: 0xdddddd, shading: THREE.FlatShading } ) ); - materials.push( new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.FlatShading } ) ); - materials.push( new THREE.MeshNormalMaterial( ) ); + materials.push( new THREE.MeshLambertMaterial( { color: 0xdddddd } ) ); + materials.push( new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, flatShading: true } ) ); + materials.push( new THREE.MeshNormalMaterial() ); materials.push( new THREE.MeshBasicMaterial( { color: 0xffaa00, transparent: true, blending: THREE.AdditiveBlending } ) ); //materials.push( new THREE.MeshBasicMaterial( { color: 0xff0000, blending: THREE.SubtractiveBlending } ) ); - materials.push( new THREE.MeshLambertMaterial( { color: 0xdddddd, shading: THREE.SmoothShading } ) ); - materials.push( new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.SmoothShading, map: texture, transparent: true } ) ); - materials.push( new THREE.MeshNormalMaterial( { shading: THREE.SmoothShading } ) ); + materials.push( new THREE.MeshLambertMaterial( { color: 0xdddddd } ) ); + materials.push( new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, map: texture, transparent: true } ) ); + materials.push( new THREE.MeshNormalMaterial( { flatShading: true } ) ); materials.push( new THREE.MeshBasicMaterial( { color: 0xffaa00, wireframe: true } ) ); materials.push( new THREE.MeshDepthMaterial() ); - materials.push( new THREE.MeshLambertMaterial( { color: 0x666666, emissive: 0xff0000, shading: THREE.SmoothShading } ) ); - materials.push( new THREE.MeshPhongMaterial( { color: 0x000000, specular: 0x666666, emissive: 0xff0000, shininess: 10, shading: THREE.SmoothShading, opacity: 0.9, transparent: true } ) ); + materials.push( new THREE.MeshLambertMaterial( { color: 0x666666, emissive: 0xff0000 } ) ); + materials.push( new THREE.MeshPhongMaterial( { color: 0x000000, specular: 0x666666, emissive: 0xff0000, shininess: 10, opacity: 0.9, transparent: true } ) ); materials.push( new THREE.MeshBasicMaterial( { map: texture, transparent: true } ) ); diff --git a/examples/webgl_materials_channels.html b/examples/webgl_materials_channels.html index 80d1ec77dfc21193df29ee497866162ebd1a9df5..9187e9f1bca952c6432ccb000d0bf1c21cc933d3 100644 --- a/examples/webgl_materials_channels.html +++ b/examples/webgl_materials_channels.html @@ -166,7 +166,7 @@ normalMap: normalMap, normalScale: new THREE.Vector2( 1, - 1 ), - //shading: THREE.FlatShading, + //flatShading: true, side: THREE.DoubleSide } ); @@ -199,7 +199,7 @@ normalMap: normalMap, normalScale: new THREE.Vector2( 1, - 1 ), - //shading: THREE.FlatShading, + //flatShading: true, side: THREE.DoubleSide } ); diff --git a/examples/webgl_materials_envmaps_hdr.html b/examples/webgl_materials_envmaps_hdr.html index 10447304bfc71e8da595015a05d790066c789fca..94d725c833fa056e0be08efbde487cdfccc1c38b 100644 --- a/examples/webgl_materials_envmaps_hdr.html +++ b/examples/webgl_materials_envmaps_hdr.html @@ -94,8 +94,7 @@ bumpScale: - 0.05, color: 0xff4444, metalness: 0.5, - roughness: 1.0, - shading: THREE.SmoothShading + roughness: 1.0 } ); var geometry = new THREE.TorusKnotGeometry( 18, 8, 150, 20 ); @@ -111,8 +110,7 @@ roughnessMap: null, color: 0xffffff, metalness: 0.0, - roughness: 0.0, - shading: THREE.SmoothShading + roughness: 0.0 } ); var planeGeometry = new THREE.PlaneBufferGeometry( 200, 200 ); diff --git a/examples/webgl_materials_reflectivity.html b/examples/webgl_materials_reflectivity.html index 54db1bb16b6468c513496606194bf1f454a146fe..5d53dba166c155c7485e59b6d86268b42aa4f17a 100644 --- a/examples/webgl_materials_reflectivity.html +++ b/examples/webgl_materials_reflectivity.html @@ -95,7 +95,6 @@ opacity: 0.5, side: THREE.BackSide, transparent: true, - shading: THREE.SmoothShading, envMapIntensity: 5, premultipliedAlpha: true // TODO: Add custom blend mode that modulates background color by this materials color. @@ -109,7 +108,6 @@ opacity: 0.15, side: THREE.FrontSide, transparent: true, - shading: THREE.SmoothShading, envMapIntensity: 5, premultipliedAlpha: true } ); diff --git a/examples/webgl_materials_variations_basic.html b/examples/webgl_materials_variations_basic.html index 544621c3d12a7b38dcdc31044fb52fd1f5b0925b..babeec7d113d6c2e1e6ecc9d4d9a108abd0f5eae 100644 --- a/examples/webgl_materials_variations_basic.html +++ b/examples/webgl_materials_variations_basic.html @@ -76,7 +76,7 @@ imgTexture.anisotropy = 16; imgTexture = null; - var shininess = 50, specular = 0x333333, shading = THREE.SmoothShading; + var shininess = 50, specular = 0x333333; var materials = []; @@ -99,7 +99,6 @@ map: imgTexture, color: diffuseColor, reflectivity: beta, - shading: THREE.SmoothShading, envMap: alpha < 0.5 ? reflectionCube : null } ); diff --git a/examples/webgl_materials_variations_lambert.html b/examples/webgl_materials_variations_lambert.html index 08274295e8cafddb0623e72c4c33951263323117..640232377d6d6285fc34f4872f3c7495e09df41f 100644 --- a/examples/webgl_materials_variations_lambert.html +++ b/examples/webgl_materials_variations_lambert.html @@ -76,7 +76,7 @@ imgTexture.anisotropy = 16; imgTexture = null; - var shininess = 50, specular = 0x333333, shading = THREE.SmoothShading; + var shininess = 50, specular = 0x333333; var materials = []; diff --git a/examples/webgl_materials_variations_phong.html b/examples/webgl_materials_variations_phong.html index ed40a5329908f2d13afef9c901c6e2cd36f4b1d0..bf11917372b944c8b7cb73680d5fa06496bc3775 100644 --- a/examples/webgl_materials_variations_phong.html +++ b/examples/webgl_materials_variations_phong.html @@ -76,7 +76,7 @@ imgTexture.anisotropy = 16; imgTexture = null; - var shininess = 50, specular = 0x333333, bumpScale = 1, shading = THREE.SmoothShading; + var shininess = 50, specular = 0x333333, bumpScale = 1; var materials = []; @@ -108,7 +108,6 @@ specular: specularColor, reflectivity: beta, shininess: specularShininess, - shading: THREE.SmoothShading, envMap: alphaIndex % 2 === 0 ? null : reflectionCube } ); diff --git a/examples/webgl_materials_variations_standard.html b/examples/webgl_materials_variations_standard.html index a7300c2183981910bea1a59dbadf71912b78b210..6bafacebb38ee5ceac730a733d632328e72df4ee 100644 --- a/examples/webgl_materials_variations_standard.html +++ b/examples/webgl_materials_variations_standard.html @@ -101,7 +101,7 @@ hdrCubeRenderTarget = pmremCubeUVPacker.CubeUVRenderTarget; - var shininess = 50, specular = 0x333333, bumpScale = 1, shading = THREE.SmoothShading; + var shininess = 50, specular = 0x333333, bumpScale = 1; var materials = []; @@ -130,7 +130,6 @@ color: diffuseColor, metalness: beta, roughness: 1.0 - alpha, - shading: THREE.SmoothShading, envMap: index % 2 === 0 ? null : hdrCubeRenderTarget.texture } ); diff --git a/examples/webgl_materials_variations_toon.html b/examples/webgl_materials_variations_toon.html index 96a74517805b2c80eb35ab815548498663cba72d..66f8233e4706b0b00f091821490a5dd2766a3f5e 100644 --- a/examples/webgl_materials_variations_toon.html +++ b/examples/webgl_materials_variations_toon.html @@ -78,7 +78,7 @@ imgTexture.anisotropy = 16; imgTexture = null; - var shininess = 50, specular = 0x333333, bumpScale = 1, shading = THREE.SmoothShading; + var shininess = 50, specular = 0x333333, bumpScale = 1; var materials = []; @@ -110,7 +110,6 @@ specular: specularColor, reflectivity: beta, shininess: specularShininess, - shading: THREE.SmoothShading, envMap: alphaIndex % 2 === 0 ? null : reflectionCube } ); diff --git a/examples/webgl_mirror.html b/examples/webgl_mirror.html index 8781fc1228ddd5fd6a6efb133e65d629aaffa173..b85e358fc82b5833bfbd0fdd0c87e286f5287645 100644 --- a/examples/webgl_mirror.html +++ b/examples/webgl_mirror.html @@ -127,7 +127,7 @@ sphereGroup.add( halfSphere ); var geometry = new THREE.IcosahedronGeometry( 5, 0 ); - var material = new THREE.MeshPhongMaterial( { color: 0xffffff, emissive: 0x333333, shading: THREE.FlatShading } ); + var material = new THREE.MeshPhongMaterial( { color: 0xffffff, emissive: 0x333333, flatShading: true } ); smallSphere = new THREE.Mesh( geometry, material ); scene.add(smallSphere); diff --git a/examples/webgl_mirror_nodes.html b/examples/webgl_mirror_nodes.html index 5e6cf7d4a0f9728395e8e0d97beaed56ffc2dd2b..e3741b46e42bbf411085d48ebc65b24b7565c533 100644 --- a/examples/webgl_mirror_nodes.html +++ b/examples/webgl_mirror_nodes.html @@ -229,7 +229,7 @@ sphereGroup.add( halfSphere ); var geometry = new THREE.IcosahedronGeometry( 5, 0 ); - var material = new THREE.MeshPhongMaterial( { color: 0xffffff, emissive: 0x333333, shading: THREE.FlatShading } ); + var material = new THREE.MeshPhongMaterial( { color: 0xffffff, emissive: 0x333333, flatShading: true } ); smallSphere = new THREE.Mesh( geometry, material ); scene.add(smallSphere); diff --git a/examples/webgl_modifier_subdivision.html b/examples/webgl_modifier_subdivision.html index f053fff6d79655f4e157ec6513e23c93b043d1a3..399627f5c575bb89593dde02de47ed88218e587b 100644 --- a/examples/webgl_modifier_subdivision.html +++ b/examples/webgl_modifier_subdivision.html @@ -235,7 +235,7 @@ group.add( mesh ); var meshmaterials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ), + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors } ), new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, opacity: 0.15, transparent: true } ) ]; diff --git a/examples/webgl_morphnormals.html b/examples/webgl_morphnormals.html index e17dbebc28cd204004f957813265ad4f5fa87c27..245ea8b9d039b39e18778b097aa233b585a59140 100644 --- a/examples/webgl_morphnormals.html +++ b/examples/webgl_morphnormals.html @@ -77,7 +77,7 @@ color: 0xffffff, morphTargets: true, vertexColors: THREE.FaceColors, - shading: THREE.FlatShading + flatShading: true } ); var mesh = new THREE.Mesh( geometry, material ); @@ -103,8 +103,7 @@ color: 0xffffff, morphTargets: true, morphNormals: true, - vertexColors: THREE.FaceColors, - shading: THREE.SmoothShading + vertexColors: THREE.FaceColors } ); var mesh = new THREE.Mesh( geometry, material ); diff --git a/examples/webgl_multiple_canvases_circle.html b/examples/webgl_multiple_canvases_circle.html index 8245ef721bc324745e39ae9f59bd069c61192cf4..e7b1e68a36b9c7f379d778b0812159119454cdba 100644 --- a/examples/webgl_multiple_canvases_circle.html +++ b/examples/webgl_multiple_canvases_circle.html @@ -285,8 +285,8 @@ var materials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), - new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true } ) + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors, shininess: 0 } ), + new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_multiple_canvases_complex.html b/examples/webgl_multiple_canvases_complex.html index 501d8e90b2830a5189efcd82cbe72f15582932fa..80eb14f6eedd0262e37e470aa95bfde8a48db8a3 100644 --- a/examples/webgl_multiple_canvases_complex.html +++ b/examples/webgl_multiple_canvases_complex.html @@ -209,8 +209,8 @@ var materials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), - new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors, shininess: 0 } ), + new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_multiple_canvases_grid.html b/examples/webgl_multiple_canvases_grid.html index 78a4593b2cf393d5dd6427d4dc652ee9f9ef84b8..2d8ea73a06b19a4b6753be83c6c1b1ea42ce2fcd 100644 --- a/examples/webgl_multiple_canvases_grid.html +++ b/examples/webgl_multiple_canvases_grid.html @@ -226,8 +226,8 @@ var materials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), - new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors, shininess: 0 } ), + new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_multiple_elements.html b/examples/webgl_multiple_elements.html index 500edd4ebe0d5d4deeb05ed1e75e2af78eee95c8..8ca29c4c15f7fd2c335d28b5870b02b6c2a86ea3 100644 --- a/examples/webgl_multiple_elements.html +++ b/examples/webgl_multiple_elements.html @@ -140,7 +140,7 @@ color: new THREE.Color().setHSL( Math.random(), 1, 0.75 ), roughness: 0.5, metalness: 0, - shading: THREE.FlatShading + flatShading: true } ); diff --git a/examples/webgl_multiple_renderers.html b/examples/webgl_multiple_renderers.html index acdfb43e954c42d720a3c946ccacbcbbc5e1a75b..8efc56b0e2ffe51e8ac80d7d5a83ee513050d8e6 100644 --- a/examples/webgl_multiple_renderers.html +++ b/examples/webgl_multiple_renderers.html @@ -140,8 +140,8 @@ var materials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), - new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors, shininess: 0 } ), + new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_multiple_views.html b/examples/webgl_multiple_views.html index b28d625d436b4eea608c4c6f80537b29e1230041..467a5f83b89a6de718016ba4d404dd2dab741561 100644 --- a/examples/webgl_multiple_views.html +++ b/examples/webgl_multiple_views.html @@ -203,8 +203,8 @@ var materials = [ - new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), - new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) + new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: THREE.VertexColors, shininess: 0 } ), + new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_postprocessing.html b/examples/webgl_postprocessing.html index 3c1b01caf7c60e134d50ca1a70e47ff958c5eb3f..4c1e42f2dbbc678a2b3c0cd582ee6b3cbe38ef54 100644 --- a/examples/webgl_postprocessing.html +++ b/examples/webgl_postprocessing.html @@ -52,7 +52,7 @@ scene.add( object ); var geometry = new THREE.SphereGeometry( 1, 4, 4 ); - var material = new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading } ); + 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 861a505206a16f746b97e16991bd2eeb6686f1bd..019798a56e7a940e1893717bc5616aa2b57a3061 100644 --- a/examples/webgl_postprocessing_dof.html +++ b/examples/webgl_postprocessing_dof.html @@ -103,7 +103,7 @@ var textureCube = new THREE.CubeTextureLoader().load( urls ); - parameters = { color: 0xff1100, envMap: textureCube, shading: THREE.FlatShading }; + parameters = { color: 0xff1100, envMap: textureCube }; cubeMaterial = new THREE.MeshBasicMaterial( parameters ); singleMaterial = false; diff --git a/examples/webgl_postprocessing_glitch.html b/examples/webgl_postprocessing_glitch.html index 544cce7307a18530451b36e1f5126a0adb5febc5..15d96bbfd3d47d00e2352f7d5b977577383aa978 100644 --- a/examples/webgl_postprocessing_glitch.html +++ b/examples/webgl_postprocessing_glitch.html @@ -80,7 +80,7 @@ for ( var i = 0; i < 100; i ++ ) { - var material = new THREE.MeshPhongMaterial( { color: 0xffffff * Math.random(), shading: THREE.FlatShading } ); + var material = new THREE.MeshPhongMaterial( { color: 0xffffff * Math.random(), flatShading: true } ); var mesh = new THREE.Mesh( geometry, material ); mesh.position.set( Math.random() - 0.5, Math.random() - 0.5, Math.random() - 0.5 ).normalize(); diff --git a/examples/webgl_postprocessing_godrays.html b/examples/webgl_postprocessing_godrays.html index f30b6d96523aae576edf795abfe40350a2378d46..3b231a2bb3095b7fb7b418ea50cceff553c57332 100644 --- a/examples/webgl_postprocessing_godrays.html +++ b/examples/webgl_postprocessing_godrays.html @@ -86,7 +86,7 @@ materialDepth = new THREE.MeshDepthMaterial(); - var materialScene = new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading } ); + var materialScene = new THREE.MeshBasicMaterial( { color: 0x000000 } ); // tree diff --git a/examples/webgl_postprocessing_nodes.html b/examples/webgl_postprocessing_nodes.html index 73059c7d840e83907b124f15f127423a90828e34..c90da1598b80c96daf2778542321b0441091b782 100644 --- a/examples/webgl_postprocessing_nodes.html +++ b/examples/webgl_postprocessing_nodes.html @@ -521,7 +521,7 @@ for ( var i = 0; i < 100; i ++ ) { - var material = new THREE.MeshPhongMaterial( { color: 0x888888 + ( Math.random() * 0x888888 ), shading: THREE.FlatShading } ); + var material = new THREE.MeshPhongMaterial( { color: 0x888888 + ( Math.random() * 0x888888 ), flatShading: true } ); var mesh = new THREE.Mesh( geometry, material ); mesh.position.set( Math.random() - 0.5, Math.random() - 0.5, Math.random() - 0.5 ).normalize(); mesh.position.multiplyScalar( Math.random() * 400 ); diff --git a/examples/webgl_postprocessing_unreal_bloom.html b/examples/webgl_postprocessing_unreal_bloom.html index 680a715c73e815143cb13242ba1fb89fb0f9793a..86aa36a5840e1ab6596cdbd9e583c905abf9de9f 100644 --- a/examples/webgl_postprocessing_unreal_bloom.html +++ b/examples/webgl_postprocessing_unreal_bloom.html @@ -102,8 +102,7 @@ standardMaterial = new THREE.MeshStandardMaterial( { map: null, color: 0xffffff, - metalness: 1.0, - shading: THREE.SmoothShading + metalness: 1.0 } ); var geometry = new THREE.TorusKnotGeometry( 18, 8, 150, 20 ); diff --git a/examples/webgl_sandbox.html b/examples/webgl_sandbox.html index 6eab98a8197f650ad994a7fe96efc34c7efe8cde..f21c2590c969cb8c33f9cd8ca349f2a327779941 100644 --- a/examples/webgl_sandbox.html +++ b/examples/webgl_sandbox.html @@ -91,8 +91,8 @@ new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader, transparent: true } ), new THREE.MeshLambertMaterial( { map: texture2 } ), new THREE.MeshLambertMaterial( { color: 0xdddddd } ), - new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.FlatShading } ), - new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.SmoothShading } ) + new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, flatShading: true } ), + new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30 } ) ]; diff --git a/examples/webgl_shading_physical.html b/examples/webgl_shading_physical.html index 61b10d0910b74a498427c703276c5681b38f929d..4266874ab8e1c409c82053e7868b58b5a3f48350 100644 --- a/examples/webgl_shading_physical.html +++ b/examples/webgl_shading_physical.html @@ -213,7 +213,7 @@ loader.load( "models/animated/sittingBox.js", function( geometry ) { - var morphMaterial = new THREE.MeshPhongMaterial( { color: 0x000000, specular: 0xff9900, shininess: 50, morphTargets: true, side: THREE.DoubleSide, shading: THREE.FlatShading } ); + var morphMaterial = new THREE.MeshPhongMaterial( { color: 0x000000, specular: 0xff9900, shininess: 50, morphTargets: true, side: THREE.DoubleSide, flatShading: true } ); var mesh = new THREE.Mesh( geometry, morphMaterial ); diff --git a/examples/webgl_shadowmap_viewer.html b/examples/webgl_shadowmap_viewer.html index d14a21ccf0aa48e9aac6ce879513c22ff4bc5892..996aa90966cfc72f6656b87221eb09077fd7fe5c 100644 --- a/examples/webgl_shadowmap_viewer.html +++ b/examples/webgl_shadowmap_viewer.html @@ -105,8 +105,7 @@ var material = new THREE.MeshPhongMaterial( { color: 0xff0000, shininess: 150, - specular: 0x222222, - shading: THREE.SmoothShading + specular: 0x222222 } ); torusKnot = new THREE.Mesh( geometry, material ); @@ -127,8 +126,7 @@ var material = new THREE.MeshPhongMaterial( { color: 0xa0adaf, shininess: 150, - specular: 0xffffff, - shading: THREE.SmoothShading + specular: 0x111111 } ); var ground = new THREE.Mesh( geometry, material ); diff --git a/examples/webgl_shadowmesh.html b/examples/webgl_shadowmesh.html index 305dbfc1ed5cee37b144472d1c9436bc676cad63..4b13660792b88319069a273d3319776bf3bac564 100644 --- a/examples/webgl_shadowmesh.html +++ b/examples/webgl_shadowmesh.html @@ -163,7 +163,7 @@ // YELLOW PYRAMID and PYRAMID'S SHADOW var pyramidGeometry = new THREE.CylinderGeometry( 0, 0.5, 2, 4 ); - var pyramidMaterial = new THREE.MeshPhongMaterial( { color: 'rgb(255,255,0)', emissive: 0x440000, shading: THREE.FlatShading, shininess: 0 } ); + var pyramidMaterial = new THREE.MeshPhongMaterial( { color: 'rgb(255,255,0)', emissive: 0x440000, flatShading: true, shininess: 0 } ); pyramid = new THREE.Mesh( pyramidGeometry, pyramidMaterial ); pyramid.position.set( - 4, 1, 2 ); scene.add( pyramid ); diff --git a/examples/webgl_tonemapping.html b/examples/webgl_tonemapping.html index 5ca026f5ad624eaf2df4cf9eb2aa34f9c27719dc..e8247af4a718df5ecd2aa7462fd18ab59d1c7670 100644 --- a/examples/webgl_tonemapping.html +++ b/examples/webgl_tonemapping.html @@ -96,7 +96,6 @@ color: 0xffffff, metalness: 0.9, roughness: 0.8, - shading: THREE.SmoothShading, premultipliedAlpha: true, transparent: true } ); diff --git a/examples/webvr_rollercoaster.html b/examples/webvr_rollercoaster.html index b140ac90ef46aa62897fb044b25d844fac7a1ea6..e9775ca95f550579cb210a7ffc5d547359fd6fae 100644 --- a/examples/webvr_rollercoaster.html +++ b/examples/webvr_rollercoaster.html @@ -165,7 +165,8 @@ var geometry = new THREE.CylinderBufferGeometry( 10, 10, 5, 15 ); var material = new THREE.MeshLambertMaterial( { - color: 0xff8080, shading: THREE.FlatShading + color: 0xff8080, + //flatShading: true // Lambert does not support flat shading } ); var mesh = new THREE.Mesh( geometry, material ); mesh.position.set( - 80, 10, - 70 ); @@ -176,7 +177,8 @@ var geometry = new THREE.CylinderBufferGeometry( 5, 6, 4, 10 ); var material = new THREE.MeshLambertMaterial( { - color: 0x8080ff, shading: THREE.FlatShading + color: 0x8080ff, + //flatShading: true // Lambert does not support flat shading } ); var mesh = new THREE.Mesh( geometry, material ); mesh.position.set( 50, 2, 30 );