Browse Source

Revert "Glossiness support in serialization/deserialization"

This reverts commit 27999fb5d246952499c4be0ff62a11f78af6fddb.
Takahiro 8 years ago
parent
commit
10d76dc296
3 changed files with 0 additions and 12 deletions
  1. 0 8
      src/loaders/Loader.js
  2. 0 2
      src/loaders/MaterialLoader.js
  3. 0 2
      src/materials/Material.js

+ 0 - 8
src/loaders/Loader.js

@@ -296,14 +296,6 @@ Object.assign( Loader.prototype, {
 					case 'mapRoughnessWrap':
 					case 'mapRoughnessWrap':
 					case 'mapRoughnessAnisotropy':
 					case 'mapRoughnessAnisotropy':
 						break;
 						break;
-					case 'mapGlossinessRepeat':
-					case 'mapGlossinessOffset':
-					case 'mapGlossinessWrap':
-					case 'mapGlossinessAnisotropy':
-						break;
-					case 'mapGlossiness':
-						json.glossinessMap = loadTexture( value, m.mapGlossinessRepeat, m.mapGlossinessOffset, m.mapGlossinessWrap, m.mapGlossinessAnisotropy );
-						break;
 					case 'mapAlpha':
 					case 'mapAlpha':
 						json.alphaMap = loadTexture( value, m.mapAlphaRepeat, m.mapAlphaOffset, m.mapAlphaWrap, m.mapAlphaAnisotropy );
 						json.alphaMap = loadTexture( value, m.mapAlphaRepeat, m.mapAlphaOffset, m.mapAlphaWrap, m.mapAlphaAnisotropy );
 						break;
 						break;

+ 0 - 2
src/loaders/MaterialLoader.js

@@ -59,7 +59,6 @@ Object.assign( MaterialLoader.prototype, {
 		if ( json.color !== undefined ) material.color.setHex( json.color );
 		if ( json.color !== undefined ) material.color.setHex( json.color );
 		if ( json.roughness !== undefined ) material.roughness = json.roughness;
 		if ( json.roughness !== undefined ) material.roughness = json.roughness;
 		if ( json.metalness !== undefined ) material.metalness = json.metalness;
 		if ( json.metalness !== undefined ) material.metalness = json.metalness;
-		if ( json.glossiness !== undefined ) material.glossiness = json.glossiness;
 		if ( json.emissive !== undefined ) material.emissive.setHex( json.emissive );
 		if ( json.emissive !== undefined ) material.emissive.setHex( json.emissive );
 		if ( json.specular !== undefined ) material.specular.setHex( json.specular );
 		if ( json.specular !== undefined ) material.specular.setHex( json.specular );
 		if ( json.shininess !== undefined ) material.shininess = json.shininess;
 		if ( json.shininess !== undefined ) material.shininess = json.shininess;
@@ -128,7 +127,6 @@ Object.assign( MaterialLoader.prototype, {
 
 
 		if ( json.roughnessMap !== undefined ) material.roughnessMap = getTexture( json.roughnessMap );
 		if ( json.roughnessMap !== undefined ) material.roughnessMap = getTexture( json.roughnessMap );
 		if ( json.metalnessMap !== undefined ) material.metalnessMap = getTexture( json.metalnessMap );
 		if ( json.metalnessMap !== undefined ) material.metalnessMap = getTexture( json.metalnessMap );
-		if ( json.glossinessMap !== undefined ) material.glossinessMap = getTexture( json.glossinessMap );
 
 
 		if ( json.emissiveMap !== undefined ) material.emissiveMap = getTexture( json.emissiveMap );
 		if ( json.emissiveMap !== undefined ) material.emissiveMap = getTexture( json.emissiveMap );
 		if ( json.emissiveIntensity !== undefined ) material.emissiveIntensity = json.emissiveIntensity;
 		if ( json.emissiveIntensity !== undefined ) material.emissiveIntensity = json.emissiveIntensity;

+ 0 - 2
src/materials/Material.js

@@ -147,7 +147,6 @@ Object.assign( Material.prototype, EventDispatcher.prototype, {
 
 
 		if ( this.roughness !== undefined ) data.roughness = this.roughness;
 		if ( this.roughness !== undefined ) data.roughness = this.roughness;
 		if ( this.metalness !== undefined ) data.metalness = this.metalness;
 		if ( this.metalness !== undefined ) data.metalness = this.metalness;
-		if ( this.glossiness !== undefined ) data.glossiness = this.glossiness;
 
 
 		if ( this.emissive && this.emissive.isColor ) data.emissive = this.emissive.getHex();
 		if ( this.emissive && this.emissive.isColor ) data.emissive = this.emissive.getHex();
 		if ( this.specular && this.specular.isColor ) data.specular = this.specular.getHex();
 		if ( this.specular && this.specular.isColor ) data.specular = this.specular.getHex();
@@ -179,7 +178,6 @@ Object.assign( Material.prototype, EventDispatcher.prototype, {
 		}
 		}
 		if ( this.roughnessMap && this.roughnessMap.isTexture ) data.roughnessMap = this.roughnessMap.toJSON( meta ).uuid;
 		if ( this.roughnessMap && this.roughnessMap.isTexture ) data.roughnessMap = this.roughnessMap.toJSON( meta ).uuid;
 		if ( this.metalnessMap && this.metalnessMap.isTexture ) data.metalnessMap = this.metalnessMap.toJSON( meta ).uuid;
 		if ( this.metalnessMap && this.metalnessMap.isTexture ) data.metalnessMap = this.metalnessMap.toJSON( meta ).uuid;
-		if ( this.glossinessMap && this.glossinessMap.isTexture ) data.glossinessMap = this.glossinessMap.toJSON( meta ).uuid;
 
 
 		if ( this.emissiveMap && this.emissiveMap.isTexture ) data.emissiveMap = this.emissiveMap.toJSON( meta ).uuid;
 		if ( this.emissiveMap && this.emissiveMap.isTexture ) data.emissiveMap = this.emissiveMap.toJSON( meta ).uuid;
 		if ( this.specularMap && this.specularMap.isTexture ) data.specularMap = this.specularMap.toJSON( meta ).uuid;
 		if ( this.specularMap && this.specularMap.isTexture ) data.specularMap = this.specularMap.toJSON( meta ).uuid;