Skip to content

Commit

Permalink
GLTFLoader, GLTFExporter: Remove KHR_materials_pbrSpecularGlossiness (#…
Browse files Browse the repository at this point in the history
…24950)

* GLTFLoader, GLTFExporter: Remove KHR_materials_pbrSpecularGlossiness

* GLTFLoader: Remove unused import
  • Loading branch information
donmccurdy committed Nov 15, 2022
1 parent ac30ce0 commit e29c14b
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 418 deletions.
1 change: 0 additions & 1 deletion docs/examples/en/loaders/GLTFLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ <h2>Extensions</h2>
<li>KHR_draco_mesh_compression</li>
<li>KHR_materials_clearcoat</li>
<li>KHR_materials_ior</li>
<li>KHR_materials_pbrSpecularGlossiness</li>
<li>KHR_materials_specular</li>
<li>KHR_materials_transmission</li>
<li>KHR_materials_iridescence</li>
Expand Down
1 change: 0 additions & 1 deletion docs/examples/zh/loaders/GLTFLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ <h2>��展</h2>
<li>KHR_draco_mesh_compression</li>
<li>KHR_materials_clearcoat</li>
<li>KHR_materials_ior</li>
<li>KHR_materials_pbrSpecularGlossiness</li>
<li>KHR_materials_specular</li>
<li>KHR_materials_transmission</li>
<li>KHR_materials_iridescence</li>
Expand Down
62 changes: 0 additions & 62 deletions examples/jsm/exporters/GLTFExporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ class GLTFExporter {

} );

this.register( function ( writer ) {

return new GLTFMaterialsPBRSpecularGlossiness( writer );

} );

this.register( function ( writer ) {

return new GLTFMaterialsTransmissionExtension( writer );
Expand Down Expand Up @@ -2281,62 +2275,6 @@ class GLTFMaterialsUnlitExtension {

}

/**
* Specular-Glossiness Extension
*
* Specification: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Archived/KHR_materials_pbrSpecularGlossiness
*/
class GLTFMaterialsPBRSpecularGlossiness {

constructor( writer ) {

this.writer = writer;
this.name = 'KHR_materials_pbrSpecularGlossiness';

}

writeMaterial( material, materialDef ) {

if ( ! material.isGLTFSpecularGlossinessMaterial ) return;

const writer = this.writer;
const extensionsUsed = writer.extensionsUsed;

const extensionDef = {};

if ( materialDef.pbrMetallicRoughness.baseColorFactor ) {

extensionDef.diffuseFactor = materialDef.pbrMetallicRoughness.baseColorFactor;

}

const specularFactor = [ 1, 1, 1 ];
material.specular.toArray( specularFactor, 0 );
extensionDef.specularFactor = specularFactor;
extensionDef.glossinessFactor = material.glossiness;

if ( materialDef.pbrMetallicRoughness.baseColorTexture ) {

extensionDef.diffuseTexture = materialDef.pbrMetallicRoughness.baseColorTexture;

}

if ( material.specularMap ) {

const specularMapDef = { index: writer.processTexture( material.specularMap ) };
writer.applyTextureTransform( specularMapDef, material.specularMap );
extensionDef.specularGlossinessTexture = specularMapDef;

}

materialDef.extensions = materialDef.extensions || {};
materialDef.extensions[ this.name ] = extensionDef;
extensionsUsed[ this.name ] = true;

}

}

/**
* Clearcoat Materials Extension
*
Expand Down
Loading

0 comments on commit e29c14b

Please sign in to comment.