From ff4d488d790c988ac3f93295d56828535c4f20a8 Mon Sep 17 00:00:00 2001 From: WestLangley Date: Sun, 9 Jul 2017 20:28:52 -0400 Subject: [PATCH] material.shading ==> material.flatShading --- examples/js/loaders/3MFLoader.js | 2 +- examples/js/loaders/AMFLoader.js | 4 ++-- examples/js/loaders/AssimpJSONLoader.js | 6 ++---- examples/js/loaders/OBJLoader.js | 2 +- examples/js/loaders/OBJLoader2.js | 4 ++-- examples/js/loaders/WWOBJLoader2.js | 18 +++++++++--------- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/examples/js/loaders/3MFLoader.js b/examples/js/loaders/3MFLoader.js index c3f8842420..05f10ab59c 100644 --- a/examples/js/loaders/3MFLoader.js +++ b/examples/js/loaders/3MFLoader.js @@ -479,7 +479,7 @@ THREE.ThreeMFLoader.prototype = { geometry.computeBoundingSphere(); var materialOpts = { - shading: THREE.FlatShading + flatShading: true }; if ( meshData[ 'colors' ] && 0 < meshData[ 'colors' ].length ) { diff --git a/examples/js/loaders/AMFLoader.js b/examples/js/loaders/AMFLoader.js index 8e107b8e34..274833f593 100644 --- a/examples/js/loaders/AMFLoader.js +++ b/examples/js/loaders/AMFLoader.js @@ -167,7 +167,7 @@ THREE.AMFLoader.prototype = { } loadedMaterial = new THREE.MeshPhongMaterial( { - shading: THREE.FlatShading, + flatShading: true, color: new THREE.Color( color.r, color.g, color.b ), name: matName } ); @@ -412,7 +412,7 @@ THREE.AMFLoader.prototype = { } var sceneObject = new THREE.Group(); - var defaultMaterial = new THREE.MeshPhongMaterial( { color: 0xaaaaff, shading: THREE.FlatShading } ); + var defaultMaterial = new THREE.MeshPhongMaterial( { color: 0xaaaaff, flatShading: true } ); sceneObject.name = amfName; sceneObject.userData.author = amfAuthor; diff --git a/examples/js/loaders/AssimpJSONLoader.js b/examples/js/loaders/AssimpJSONLoader.js index e9f11a9a37..069fc0d7d2 100644 --- a/examples/js/loaders/AssimpJSONLoader.js +++ b/examples/js/loaders/AssimpJSONLoader.js @@ -158,9 +158,7 @@ THREE.AssimpJSONLoader.prototype = { var scope = this; var i, prop, has_textures = [], - init_props = { - shading : THREE.SmoothShading - }; + init_props = {}; function toColor( value_arr ) { @@ -261,7 +259,7 @@ THREE.AssimpJSONLoader.prototype = { // aiShadingMode_Flat if ( prop.value === 1 ) { - init_props.shading = THREE.FlatShading; + init_props.flatShading = true; } diff --git a/examples/js/loaders/OBJLoader.js b/examples/js/loaders/OBJLoader.js index 7fc4b68a27..6a7e70ce19 100644 --- a/examples/js/loaders/OBJLoader.js +++ b/examples/js/loaders/OBJLoader.js @@ -696,7 +696,7 @@ THREE.OBJLoader = ( function () { } - material.shading = sourceMaterial.smooth ? THREE.SmoothShading : THREE.FlatShading; + material.flatShading = sourceMaterial.smooth ? false : true; createdMaterials.push(material); diff --git a/examples/js/loaders/OBJLoader2.js b/examples/js/loaders/OBJLoader2.js index 9c9c79ce38..5be32b2e43 100644 --- a/examples/js/loaders/OBJLoader2.js +++ b/examples/js/loaders/OBJLoader2.js @@ -846,7 +846,7 @@ THREE.OBJLoader2 = (function () { * @param {string} objectName Name of the mesh * @param {string} groupName Name of the group * @param {string} materialName Name of the material - * @param {number} smoothingGroup Normalized smoothingGroup (0: THREE.FlatShading, 1: THREE.SmoothShading) + * @param {number} smoothingGroup Normalized smoothingGroup (0: flat shading, 1: smooth shading) */ var RawObjectDescription = (function () { @@ -1013,7 +1013,7 @@ THREE.OBJLoader2 = (function () { materialClone = material.clone(); materialClone.name = materialName; - materialClone.shading = THREE.FlatShading; + materialClone.flatShading = true; this.materials[ materialName ] = name; } diff --git a/examples/js/loaders/WWOBJLoader2.js b/examples/js/loaders/WWOBJLoader2.js index de1df1be8d..74594b9d73 100644 --- a/examples/js/loaders/WWOBJLoader2.js +++ b/examples/js/loaders/WWOBJLoader2.js @@ -1,10 +1,10 @@ -/** - * @author Kai Salmen / https://kaisalmen.de - * Development repository: https://github.com/kaisalmen/WWOBJLoader - */ - -'use strict'; - +/** + * @author Kai Salmen / https://kaisalmen.de + * Development repository: https://github.com/kaisalmen/WWOBJLoader + */ + +'use strict'; + if ( THREE.OBJLoader2 === undefined ) { THREE.OBJLoader2 = {} } /** @@ -435,7 +435,7 @@ THREE.OBJLoader2.WWOBJLoader2 = (function () { materialClone = material.clone(); materialClone.name = materialName; - materialClone.shading = THREE.FlatShading; + materialClone.flatShading = true; this.materials[ materialName ] = name; } @@ -1227,7 +1227,7 @@ THREE.OBJLoader2.WWOBJLoader2.LoadedMeshUserOverride = function ( disregardMesh, material: Validator.verifyInput( material, null ) }; }; - + /** * Orchestrate loading of multiple OBJ files/data from an instruction queue with a configurable amount of workers (1-16). * Workflow: -- GitLab