Merge pull request #15465 from takahirox/ShaderMaterialExtensionsSeri…

…alization ShaderMaterial.extensions serialization
mrdoob · Dec 28, 2018 · cacce1a · cacce1a
2 parents 7e5f396 + 05d7b55
commit cacce1a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/loaders/MaterialLoader.js b/src/loaders/MaterialLoader.js
@@ -146,6 +146,16 @@ Object.assign( MaterialLoader.prototype, {
 		if ( json.vertexShader !== undefined ) material.vertexShader = json.vertexShader;
 		if ( json.fragmentShader !== undefined ) material.fragmentShader = json.fragmentShader;
 
+		if ( json.extensions !== undefined ) {
+
+			for ( var key in json.extensions ) {
+
+				material.extensions[ key ] = json.extensions[ key ];
+
+			}
+
+		}
+
 		// Deprecated
 
 		if ( json.shading !== undefined ) material.flatShading = json.shading === 1; // THREE.FlatShading

diff --git a/src/materials/ShaderMaterial.js b/src/materials/ShaderMaterial.js
@@ -182,6 +182,16 @@ ShaderMaterial.prototype.toJSON = function ( meta ) {
 	data.vertexShader = this.vertexShader;
 	data.fragmentShader = this.fragmentShader;
 
+	var extensions = {};
+
+	for ( var key in this.extensions ) {
+
+		if ( this.extensions[ key ] === true ) extensions[ key ] = true;
+
+	}
+
+	if ( Object.keys( extensions ).length > 0 ) data.extensions = extensions;
+
 	return data;
 
 };