ColladaLoader: Clean up.

Author: mrdoob

examples/js/exporters/ColladaExporter.js

@@ -220,13 +220,9 @@ THREE.ColladaExporter.prototype = {
 						bufferGeometry.groups :
 						[ { start: 0, count: indexCount, materialIndex: 0 } ];
 
-				var gnode = `<geometry id="${ meshid }"` +
-					(
-						g.name ?
-							` name="${ g.name }"` :
-							''
-					) +
-					'><mesh>';
+
+				var gname = g.name ? ` name="${ g.name }"` : '';
+				var gnode = `<geometry id="${ meshid }"${ gname }><mesh>`;
 
 				// define the geometry node and the vertices for the geometry
 				var posName = `${ meshid }-position`;
@@ -499,15 +495,10 @@ THREE.ColladaExporter.prototype = {
 
 					'</effect>';
 
-				var materialNode = `<material id="${ matid }"` +
-					(
-						m.name ?
-							` name="${ m.name }` :
-							''
-					) +
-					`"><instance_effect url="#${ matid }-effect" /></material>`;
+				var materialName = m.name ? ` name="${ m.name }"` : '';
+				var materialNode = `<material id="${ matid }"${ materialName }><instance_effect url="#${ matid }-effect" /></material>`;
 
-				libraryMaterials.push(materialNode);
+				libraryMaterials.push( materialNode );
 				libraryEffects.push( effectnode );
 				materialMap.set( m, matid );
 

examples/jsm/exporters/ColladaExporter.js

@@ -231,13 +231,9 @@ ColladaExporter.prototype = {
 						bufferGeometry.groups :
 						[ { start: 0, count: indexCount, materialIndex: 0 } ];
 
-				var gnode = `<geometry id="${ meshid }"` +
-					(
-						g.name ?
-						` name="${ g.name }"` :
-						''
-					) +
-					'><mesh>';
+
+				var gname = g.name ? ` name="${ g.name }"` : '';
+				var gnode = `<geometry id="${ meshid }"${ gname }><mesh>`;
 
 				// define the geometry node and the vertices for the geometry
 				var posName = `${ meshid }-position`;
@@ -510,15 +506,10 @@ ColladaExporter.prototype = {
 
 					'</effect>';
 
-				var materialNode = `<material id="${ matid }"` +
-					(
-						m.name ?
-						` name="${ m.name }` :
-						''
-					) +
-					`"><instance_effect url="#${ matid }-effect" /></material>`;
+				var materialName = m.name ? ` name="${ m.name }"` : '';
+				var materialNode = `<material id="${ matid }"${ materialName }><instance_effect url="#${ matid }-effect" /></material>`;
 
-				libraryMaterials.push(materialNode);
+				libraryMaterials.push( materialNode );
 				libraryEffects.push( effectnode );
 				materialMap.set( m, matid );