Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions examples/js/loaders/GLTFLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,11 @@ THREE.GLTFLoader = ( function () {
// in addUnknownExtensionsToUserData().
// Remove this workaround if we move all the existing
// extension handlers to plugin system
extensions[ plugin.name ] = true;
if ( plugin.addExtensionsToUserData !== true ) {

extensions[ plugin.name ] = true;

}

}

Expand Down Expand Up @@ -1898,13 +1902,21 @@ THREE.GLTFLoader = ( function () {

} );

Promise.all( [
Promise.all( this._invokeAll( function ( ext ) {

this.getDependencies( 'scene' ),
this.getDependencies( 'animation' ),
this.getDependencies( 'camera' ),
return ext.beforeRoot && ext.beforeRoot();

] ).then( function ( dependencies ) {
} ) ).then( function () {

return Promise.all( [

parser.getDependencies( 'scene' ),
parser.getDependencies( 'animation' ),
parser.getDependencies( 'camera' ),

] );

} ).then( function ( dependencies ) {

var result = {
scene: dependencies[ 0 ][ json.scene || 0 ],
Expand All @@ -1920,7 +1932,15 @@ THREE.GLTFLoader = ( function () {

assignExtrasToUserData( result, json );

onLoad( result );
Promise.all( parser._invokeAll( function ( ext ) {

return ext.afterRoot && ext.afterRoot( result );

} ) ).then( function () {

onLoad( result );

} );

} ).catch( onError );

Expand Down
34 changes: 27 additions & 7 deletions examples/jsm/loaders/GLTFLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,11 @@ var GLTFLoader = ( function () {
// in addUnknownExtensionsToUserData().
// Remove this workaround if we move all the existing
// extension handlers to plugin system
extensions[ plugin.name ] = true;
if ( plugin.addExtensionsToUserData !== true ) {

extensions[ plugin.name ] = true;

}

}

Expand Down Expand Up @@ -1963,13 +1967,21 @@ var GLTFLoader = ( function () {

} );

Promise.all( [
Promise.all( this._invokeAll( function ( ext ) {

this.getDependencies( 'scene' ),
this.getDependencies( 'animation' ),
this.getDependencies( 'camera' ),
return ext.beforeRoot && ext.beforeRoot();

] ).then( function ( dependencies ) {
} ) ).then( function () {

return Promise.all( [

parser.getDependencies( 'scene' ),
parser.getDependencies( 'animation' ),
parser.getDependencies( 'camera' ),

] );

} ).then( function ( dependencies ) {

var result = {
scene: dependencies[ 0 ][ json.scene || 0 ],
Expand All @@ -1985,7 +1997,15 @@ var GLTFLoader = ( function () {

assignExtrasToUserData( result, json );

onLoad( result );
Promise.all( parser._invokeAll( function ( ext ) {

return ext.afterRoot && ext.afterRoot( result );

} ) ).then( function () {

onLoad( result );

} );

} ).catch( onError );

Expand Down
104 changes: 104 additions & 0 deletions examples/jsm/loaders/gltf_plugins/KHR_materials_variants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/**
* Materials variants extension
*
* Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_variants
*/
export default function GLTFMaterialsVariantsExtension( parser ) {

this.parser = parser;
this.name = 'KHR_materials_variants';
this.addExtensionsToUserData = true;

}

GLTFMaterialsVariantsExtension.prototype.afterRoot = function ( gltf ) {

var parser = this.parser;
var json = parser.json;
var name = this.name;

if ( ! json.extensions || ! json.extensions[ name ] ) return null;

var extensionDef = json.extensions[ name ];
var variantsDef = extensionDef.variants || [];
var variants = [];

for ( var i = 0, il = variantsDef.length; i < il; i ++ ) {

variants.push( variantsDef[ i ].name );

}

for ( var i = 0, il = gltf.scenes.length; i < il; i ++ ) {

gltf.scenes[ i ].userData.variants = variants;

}

gltf.userData.variants = variants;

gltf.userData.selectVariant = function selectVariant ( variantName ) {

var scenes = gltf.scenes;
var pending = [];

for ( var i = 0, il = scenes.length; i < il; i ++ ) {

var scene = scenes[ i ];

var variantIndex = variants.indexOf( variantName );

if ( variantIndex === - 1 ) continue;

scene.traverse( function ( object ) {

if ( ! object.isMesh || ! object.userData.gltfExtensions ||
! object.userData.gltfExtensions[ name ] ) return;

var meshVariantDef = object.userData.gltfExtensions[ name ];
var mappings = meshVariantDef.mappings || [];
var materialIndex = - 1;

for ( var j = 0, jl = mappings.length; j < jl; j ++ ) {

var mapping = mappings[ j ];

if ( mapping.variants.indexOf( variantIndex ) !== - 1 ) {

materialIndex = mapping.material;
break;

}

}

if ( materialIndex >= 0 ) {

if ( ! object.userData.originalMaterial ) {

object.userData.originalMaterial = object.material;

}

pending.push( parser.getDependency( 'material', materialIndex ).then( function ( material ) {

object.material = material;
parser.assignFinalMaterial( object );

} ) );

} else if ( object.userData.originalMaterial ) {

object.material = object.userData.originalMaterial;

}

} );

}

return Promise.all( pending );

};

};
60 changes: 14 additions & 46 deletions examples/webgl_loader_gltf_variants.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import { GLTFLoader } from './jsm/loaders/GLTFLoader.js';
import { RGBELoader } from './jsm/loaders/RGBELoader.js';

import GLTFMaterialsVariantsExtension from './jsm/loaders/gltf_plugins/KHR_materials_variants.js';

let camera, scene, renderer;
let gui;

Expand Down Expand Up @@ -59,7 +61,12 @@

// model

const loader = new GLTFLoader().setPath( 'models/gltf/MaterialsVariantsShoe/glTF/' );
const loader = new GLTFLoader().register( function ( parser ) {

return new GLTFMaterialsVariantsExtension( parser );

} ).setPath( 'models/gltf/MaterialsVariantsShoe/glTF/' );

loader.load( 'MaterialsVariantsShoe.gltf', function ( gltf ) {

gltf.scene.scale.set( 10.0, 10.0, 10.0 );
Expand All @@ -69,16 +76,15 @@
// GUI
gui = new GUI();

// Details of the KHR_materials_variants extension used here can be found below
// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_variants
const parser = gltf.parser;
const variantsExtension = gltf.userData.gltfExtensions[ 'KHR_materials_variants' ];
const variants = variantsExtension.variants.map( ( variant ) => variant.name );
const variants = gltf.userData.variants;
const variantsCtrl = gui.add( state, 'variant', variants ).name( 'Variant' );

selectVariant( scene, parser, variantsExtension, state.variant );
variantsCtrl.onChange( async ( value ) => {

await gltf.userData.selectVariant( value );
render();

variantsCtrl.onChange( ( value ) => selectVariant( scene, parser, variantsExtension, value ) );
} );

render();

Expand Down Expand Up @@ -108,44 +114,6 @@

}

function selectVariant( scene, parser, extension, variantName ) {

const variantIndex = extension.variants.findIndex( ( v ) => v.name.includes( variantName ) );

scene.traverse( async ( object ) => {

if ( ! object.isMesh || ! object.userData.gltfExtensions ) return;

const meshVariantDef = object.userData.gltfExtensions[ 'KHR_materials_variants' ];

if ( ! meshVariantDef ) return;

if ( ! object.userData.originalMaterial ) {

object.userData.originalMaterial = object.material;

}

const mapping = meshVariantDef.mappings
.find( ( mapping ) => mapping.variants.includes( variantIndex ) );

if ( mapping ) {

object.material = await parser.getDependency( 'material', mapping.material );
parser.assignFinalMaterial(object);

} else {

object.material = object.userData.originalMaterial;

}

render();

} );

}

function onWindowResize() {

camera.aspect = window.innerWidth / window.innerHeight;
Expand Down