Browse Source

Added Wireframe and skinning attributes serialization to MaterialLoader and Material.toJSON (#9481)

Tentone 9 years ago
parent
commit
da9f70c789
2 changed files with 10 additions and 0 deletions
  1. 5 0
      src/loaders/MaterialLoader.js
  2. 5 0
      src/materials/Material.js

+ 5 - 0
src/loaders/MaterialLoader.js

@@ -77,8 +77,13 @@ Object.assign( MaterialLoader.prototype, {
 		if ( json.colorWrite !== undefined ) material.colorWrite = json.colorWrite;
 		if ( json.wireframe !== undefined ) material.wireframe = json.wireframe;
 		if ( json.wireframeLinewidth !== undefined ) material.wireframeLinewidth = json.wireframeLinewidth;
+		if ( json.wireframeLinecap !== undefined ) material.wireframeLinecap = json.wireframeLinecap;
+		if ( json.wireframeLinejoin !== undefined ) material.wireframeLinejoin = json.wireframeLinejoin;
+		if ( json.skinning !== undefined ) material.skinning = json.skinning;
+		if ( json.morphTargets !== undefined ) material.wireframe = json.morphTargets;
 
 		// for PointsMaterial
+
 		if ( json.size !== undefined ) material.size = json.size;
 		if ( json.sizeAttenuation !== undefined ) material.sizeAttenuation = json.sizeAttenuation;
 

+ 5 - 0
src/materials/Material.js

@@ -216,6 +216,11 @@ Material.prototype = {
 		if ( this.premultipliedAlpha === true ) data.premultipliedAlpha = this.premultipliedAlpha;
 		if ( this.wireframe === true ) data.wireframe = this.wireframe;
 		if ( this.wireframeLinewidth > 1 ) data.wireframeLinewidth = this.wireframeLinewidth;
+		if ( this.wireframeLinecap !== 'round' ) data.wireframeLinecap = this.wireframeLinecap;
+		if ( this.wireframeLinejoin !== 'round' ) data.wireframeLinejoin = this.wireframeLinejoin;
+
+		data.skinning = this.skinning;
+		data.morphTargets = this.morphTargets;
 
 		// TODO: Copied from Object3D.toJSON