[gltf] Sanitize node names.

mrdoob · Jun 12, 2017 · 6324c1f · 6324c1f
1 parent 31ba90d
commit 6324c1f
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/examples/js/loaders/GLTF2Loader.js b/examples/js/loaders/GLTF2Loader.js
@@ -2540,6 +2540,12 @@ THREE.GLTF2Loader = ( function () {
 
 			}
 
+			if ( _node.name !== undefined ) {
+
+				_node.name = THREE.PropertyBinding.sanitizeTrackName( _node.name );
+
+			}
+
 			if ( node.extras ) _node.userData = node.extras;
 
 			if ( node.matrix !== undefined ) {

diff --git a/src/animation/PropertyBinding.js b/src/animation/PropertyBinding.js
@@ -102,6 +102,19 @@ Object.assign( PropertyBinding, {
 
 	},
 
+	/**
+	 * Replaces spaces with underscores and removes unsupported characters from
+	 * track names, to ensure compatibility with parseTrackName().
+	 *
+	 * @param  {string} trackName Track name to be sanitized.
+	 * @return {string}
+	 */
+	sanitizeTrackName: function ( trackName ) {
+
+		return trackName.replace( /\s/g, '_' ).replace( /[^\w-]/g, '' );
+
+	},
+
 	parseTrackName: function () {
 
 		// Parent directories, delimited by '/' or ':'. Currently unused, but must

diff --git a/test/unit/src/animation/PropertyBinding.js b/test/unit/src/animation/PropertyBinding.js
@@ -198,3 +198,25 @@ QUnit.test( 'parseTrackName' , function( assert ) {
 
 	} );
 });
+
+QUnit.test( 'sanitizeTrackName' , function( assert ) {
+
+	assert.equal(
+		THREE.PropertyBinding.sanitizeTrackName( 'valid-name-123_' ),
+		'valid-name-123_',
+		'Leaves valid name intact.'
+	);
+
+	assert.equal(
+		THREE.PropertyBinding.sanitizeTrackName( 'space separated name 123_ -' ),
+		'space_separated_name_123__-',
+		'Replaces spaces with underscores.'
+	);
+
+	assert.equal(
+		THREE.PropertyBinding.sanitizeTrackName( '"invalid" name %123%_' ),
+		'invalid_name_123_',
+		'Strips invalid characters.'
+	);
+
+} );