|
@@ -122,11 +122,16 @@ class MaterialLoader extends Loader {
|
|
if ( json.transparent !== undefined ) material.transparent = json.transparent;
|
|
if ( json.transparent !== undefined ) material.transparent = json.transparent;
|
|
if ( json.alphaTest !== undefined ) material.alphaTest = json.alphaTest;
|
|
if ( json.alphaTest !== undefined ) material.alphaTest = json.alphaTest;
|
|
if ( json.alphaHash !== undefined ) material.alphaHash = json.alphaHash;
|
|
if ( json.alphaHash !== undefined ) material.alphaHash = json.alphaHash;
|
|
|
|
+ if ( json.depthFunc !== undefined ) material.depthFunc = json.depthFunc;
|
|
if ( json.depthTest !== undefined ) material.depthTest = json.depthTest;
|
|
if ( json.depthTest !== undefined ) material.depthTest = json.depthTest;
|
|
if ( json.depthWrite !== undefined ) material.depthWrite = json.depthWrite;
|
|
if ( json.depthWrite !== undefined ) material.depthWrite = json.depthWrite;
|
|
if ( json.colorWrite !== undefined ) material.colorWrite = json.colorWrite;
|
|
if ( json.colorWrite !== undefined ) material.colorWrite = json.colorWrite;
|
|
-
|
|
|
|
- if ( json.stencilWrite !== undefined ) material.stencilWrite = json.stencilWrite;
|
|
|
|
|
|
+ if ( json.blendSrc !== undefined ) material.blendSrc = json.blendSrc;
|
|
|
|
+ if ( json.blendDst !== undefined ) material.blendDst = json.blendDst;
|
|
|
|
+ if ( json.blendEquation !== undefined ) material.blendEquation = json.blendEquation;
|
|
|
|
+ if ( json.blendSrcAlpha !== undefined ) material.blendSrcAlpha = json.blendSrcAlpha;
|
|
|
|
+ if ( json.blendDstAlpha !== undefined ) material.blendDstAlpha = json.blendDstAlpha;
|
|
|
|
+ if ( json.blendEquationAlpha !== undefined ) material.blendEquationAlpha = json.blendEquationAlpha;
|
|
if ( json.stencilWriteMask !== undefined ) material.stencilWriteMask = json.stencilWriteMask;
|
|
if ( json.stencilWriteMask !== undefined ) material.stencilWriteMask = json.stencilWriteMask;
|
|
if ( json.stencilFunc !== undefined ) material.stencilFunc = json.stencilFunc;
|
|
if ( json.stencilFunc !== undefined ) material.stencilFunc = json.stencilFunc;
|
|
if ( json.stencilRef !== undefined ) material.stencilRef = json.stencilRef;
|
|
if ( json.stencilRef !== undefined ) material.stencilRef = json.stencilRef;
|
|
@@ -134,6 +139,7 @@ class MaterialLoader extends Loader {
|
|
if ( json.stencilFail !== undefined ) material.stencilFail = json.stencilFail;
|
|
if ( json.stencilFail !== undefined ) material.stencilFail = json.stencilFail;
|
|
if ( json.stencilZFail !== undefined ) material.stencilZFail = json.stencilZFail;
|
|
if ( json.stencilZFail !== undefined ) material.stencilZFail = json.stencilZFail;
|
|
if ( json.stencilZPass !== undefined ) material.stencilZPass = json.stencilZPass;
|
|
if ( json.stencilZPass !== undefined ) material.stencilZPass = json.stencilZPass;
|
|
|
|
+ if ( json.stencilWrite !== undefined ) material.stencilWrite = json.stencilWrite;
|
|
|
|
|
|
if ( json.wireframe !== undefined ) material.wireframe = json.wireframe;
|
|
if ( json.wireframe !== undefined ) material.wireframe = json.wireframe;
|
|
if ( json.wireframeLinewidth !== undefined ) material.wireframeLinewidth = json.wireframeLinewidth;
|
|
if ( json.wireframeLinewidth !== undefined ) material.wireframeLinewidth = json.wireframeLinewidth;
|