Skip to content

GLTFExporter: Serialize material.userData #14015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 17, 2018
Merged

GLTFExporter: Serialize material.userData #14015

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb9dc43
GLTFExporter: Serialize material.userData
takahirox May 7, 2018
39a01e4
GLTFExporter add missing argument for catch
takahirox May 7, 2018
735787d
GLTFExporter: Do not halt even if userData serialization fails.
takahirox May 8, 2018
affb727
GLTFExporter: Return an empty object if fails to serialize userData
takahirox May 8, 2018
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
39 changes: 30 additions & 9 deletions examples/js/exporters/GLTFExporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,29 @@ THREE.GLTFExporter.prototype = {

}

/**
* Serializes a userData.
*
* @param {THREE.Object3D|THREE.Material} object
* @returns {Object}
*/
function serializeUserData( object ) {

try {

return JSON.parse( JSON.stringify( object.userData ) );

} catch ( error ) {

console.warn( 'THREE.GLTFExporter: userData of \'' + object.name + '\' ' +
'won\'t be serialized because of JSON.stringify error - ' + error.message );

return {};

}

}

/**
* Process a buffer to append to the default one.
* @param {ArrayBuffer} buffer
Expand Down Expand Up @@ -936,6 +959,12 @@ THREE.GLTFExporter.prototype = {

}

if ( Object.keys( material.userData ).length > 0 ) {

gltfMaterial.extras = serializeUserData( material );

}

outputJSON.materials.push( gltfMaterial );

var index = outputJSON.materials.length - 1;
Expand Down Expand Up @@ -1512,15 +1541,7 @@ THREE.GLTFExporter.prototype = {

if ( object.userData && Object.keys( object.userData ).length > 0 ) {

try {

gltfNode.extras = JSON.parse( JSON.stringify( object.userData ) );

} catch ( e ) {

throw new Error( 'THREE.GLTFExporter: userData can\'t be serialized' );

}
gltfNode.extras = serializeUserData( object );

}

Expand Down