@galacean/effects-plugin-model 2.0.0-alpha.8 → 2.0.0-alpha.9

package/dist/index.mjs

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player model plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 飂兮
- * Version: v2.0.0-alpha.8
+ * Version: v2.0.0-alpha.9
  */
 
 import { math, Transform, PLAYER_OPTIONS_ENV_EDITOR, spec, glContext, Texture, TextureSourceType, RenderPassAttachmentStorageType, Material, Mesh, Geometry, GLSLVersion, DestroyOptions, addItem, removeItem, effectsClass, RendererComponent, ItemBehaviour, TimelineComponent, HitTestType, RenderPass, TextureLoadAction, RenderPassDestroyAttachmentType, Player, Renderer, getDefaultTextureFactory, loadImage, VFXItem, AbstractPlugin, registerPlugin, logger } from '@galacean/effects';
@@ -199,7 +199,7 @@ function _extends() {
     return _extends.apply(this, arguments);
 }
 
-var Vector2 = math.Vector2, Vector3 = math.Vector3, Vector4 = math.Vector4, Matrix3 = math.Matrix3, Matrix4 = math.Matrix4, Euler = math.Euler, EulerOrder = math.EulerOrder, Quaternion = math.Quaternion, Box3 = math.Box3; math.Sphere; math.Ray; var DEG2RAD = math.DEG2RAD;
+var Vector2 = math.Vector2, Vector3 = math.Vector3, Vector4 = math.Vector4, Matrix3 = math.Matrix3, Matrix4 = math.Matrix4, Color = math.Color, Euler = math.Euler, EulerOrder = math.EulerOrder, Quaternion = math.Quaternion, Box3 = math.Box3; math.Sphere; math.Ray; var DEG2RAD = math.DEG2RAD;
 
 var PObjectType;
 (function(PObjectType) {
@@ -2508,14 +2508,10 @@ function _assert_this_initialized(self) {
         this.updateMaterial(scene);
         this.primitives.forEach(function(prim) {
             var mesh = prim.effectsMesh;
-            mesh.geometry.flush();
-            mesh.material.initialize();
             renderer.drawGeometry(mesh.geometry, mesh.material);
         });
         if (this.visBoundingBox && this.boundingBoxMesh !== undefined) {
             var mesh = this.boundingBoxMesh.mesh;
-            mesh.geometry.flush();
-            mesh.material.initialize();
             renderer.drawGeometry(mesh.geometry, mesh.material);
         }
     };
@@ -2808,8 +2804,8 @@ function _assert_this_initialized(self) {
         newSemantics["uEditorTransform"] = "EDITOR_TRANSFORM";
         var material;
         var isWebGL2 = PGlobalState.getInstance().isWebGL2;
-        if (this.material.material) {
-            material = this.material.material;
+        if (this.material.effectMaterial) {
+            material = this.material.effectMaterial;
             // @ts-expect-error
             material.uniformSemantics = newSemantics;
             materialMacroList.forEach(function(macro) {
@@ -3074,7 +3070,7 @@ function _assert_this_initialized(self) {
             });
         }
         var proxy = new HitTestingProxy();
-        var doubleSided = this.material.faceSideMode === PFaceSideMode.both;
+        var doubleSided = this.material.isDoubleSide();
         proxy.create(this.geometry.geometry, doubleSided, bindMatrices);
         return proxy.getHitPoint(newOrigin, newDirection);
     };
@@ -3884,7 +3880,7 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
 
 var primitiveVert = "precision highp float;\n#define FEATURES\n#include <webglCompatibility.glsl>\n#include <animation.vert.glsl>\nvsIn vec4 aPos;vsOut vec3 v_Position;\n#ifdef HAS_NORMALS\nvsIn vec4 aNormal;\n#endif\n#ifdef HAS_TANGENTS\nvsIn vec4 a_Tangent;\n#endif\n#ifdef HAS_NORMALS\n#ifdef HAS_TANGENTS\nvsOut mat3 v_TBN;\n#else\nvsOut vec3 v_Normal;\n#endif\n#endif\n#ifdef HAS_UV_SET1\nvsIn vec2 aUV;\n#endif\n#ifdef HAS_UV_SET2\nvsIn vec2 aUV2;\n#endif\nvsOut vec2 v_UVCoord1;\n#ifdef HAS_UV_SET2\nvsOut vec2 v_UVCoord2;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC3\nvsIn vec3 a_Color;vsOut vec3 v_Color;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC4\nvsIn vec4 a_Color;vsOut vec4 v_Color;\n#endif\nuniform mat4 _ViewProjectionMatrix;uniform mat4 _ModelMatrix;uniform mat4 _NormalMatrix;\n#ifdef EDITOR_TRANSFORM\nuniform vec4 uEditorTransform;\n#endif\n#ifdef USE_SHADOW_MAPPING\nuniform mat4 _LightViewProjectionMatrix;uniform float _DeltaSceneSize;vsOut vec4 v_PositionLightSpace;vsOut vec4 v_dPositionLightSpace;\n#endif\nvec4 getPosition(){vec4 pos=vec4(aPos.xyz,1.0);\n#ifdef USE_MORPHING\npos+=getTargetPosition();\n#endif\n#ifdef USE_SKINNING\npos=getSkinningMatrix()*pos;\n#endif\nreturn pos;}\n#ifdef HAS_NORMALS\nvec4 getNormal(){vec4 normal=aNormal;\n#ifdef USE_MORPHING\nnormal+=getTargetNormal();\n#endif\n#ifdef USE_SKINNING\nnormal=getSkinningNormalMatrix()*normal;\n#endif\nreturn normalize(normal);}\n#endif\n#ifdef HAS_TANGENTS\nvec4 getTangent(){vec4 tangent=a_Tangent;\n#ifdef USE_MORPHING\ntangent+=getTargetTangent();\n#endif\n#ifdef USE_SKINNING\ntangent=getSkinningMatrix()*tangent;\n#endif\nreturn normalize(tangent);}\n#endif\nvoid main(){vec4 pos=_ModelMatrix*getPosition();v_Position=vec3(pos.xyz)/pos.w;\n#ifdef HAS_NORMALS\n#ifdef HAS_TANGENTS\nvec4 tangent=getTangent();vec3 normalW=normalize(vec3(_NormalMatrix*vec4(getNormal().xyz,0.0)));vec3 tangentW=normalize(vec3(_ModelMatrix*vec4(tangent.xyz,0.0)));vec3 bitangentW=cross(normalW,tangentW)*tangent.w;v_TBN=mat3(tangentW,bitangentW,normalW);\n#else\nv_Normal=normalize(vec3(_NormalMatrix*vec4(getNormal().xyz,0.0)));\n#endif\n#endif\nv_UVCoord1=vec2(0.0,0.0);\n#ifdef HAS_UV_SET1\nv_UVCoord1=aUV;\n#endif\n#ifdef HAS_UV_SET2\nv_UVCoord2=aUV2;\n#endif\n#if defined(HAS_VERTEX_COLOR_VEC3) || defined(HAS_VERTEX_COLOR_VEC4)\nv_Color=a_Color;\n#endif\n#ifdef USE_SHADOW_MAPPING\nv_PositionLightSpace=_LightViewProjectionMatrix*pos;vec3 dpos=vec3(_DeltaSceneSize);v_dPositionLightSpace=_LightViewProjectionMatrix*(pos+vec4(dpos,0));\n#endif\ngl_Position=_ViewProjectionMatrix*pos;\n#ifdef EDITOR_TRANSFORM\ngl_Position=vec4(gl_Position.xy*uEditorTransform.xy+uEditorTransform.zw*gl_Position.w,gl_Position.zw);\n#endif\n}";
 
-var metallicRoughnessFrag = "\n#define FEATURES\n#ifndef WEBGL2\n#extension GL_OES_standard_derivatives : enable\n#endif\n#if !defined(WEBGL2) && defined(USE_TEX_LOD)\n#extension GL_EXT_shader_texture_lod : enable\n#endif\n#ifdef USE_HDR\n#extension GL_OES_texture_float : enable\n#extension GL_OES_texture_float_linear : enable\n#endif\n#if !defined(WEBGL2) && defined(USE_WBOIT)\n#extension GL_EXT_draw_buffers: require\n#endif\n#ifdef GL_FRAGMENT_PRECISION_HIGH\nprecision highp float;\n#else\nprecision mediump float;\n#endif\n#ifdef WEBGL2\n#ifdef USE_WBOIT\nlayout(location=0)out vec4 outFragColor0;layout(location=1)out vec4 outFragColor1;\n#else\nout vec4 outFragColor;\n#endif\n#else\n#ifdef USE_WBOIT\n#define outFragColor0 gl_FragData[0]\n#define outFragColor1 gl_FragData[1]\n#else\n#define outFragColor gl_FragColor\n#endif\n#endif\n#include <webglCompatibility.glsl>\n#include <extensions.frag.glsl>\n#include <tonemapping.frag.glsl>\n#include <textures.vert.glsl>\n#include <functions.frag.glsl>\n#include <shadowCommon.vert.glsl>\n#include <shadow.frag.glsl>\nstruct Light{vec3 direction;float range;vec3 color;float intensity;vec3 position;float innerConeCos;float outerConeCos;int type;vec2 padding;};const int LightType_Directional=0;const int LightType_Point=1;const int LightType_Spot=2;const int LightType_Ambient=3;\n#ifdef USE_PUNCTUAL\nuniform Light _Lights[LIGHT_COUNT];\n#endif\n#if defined(MATERIAL_SPECULARGLOSSINESS) || defined(MATERIAL_METALLICROUGHNESS)\nuniform float _MetallicFactor;uniform float _RoughnessFactor;uniform vec4 _BaseColorFactor;\n#endif\n#ifdef MATERIAL_SPECULARGLOSSINESS\nuniform vec3 _SpecularFactor;uniform vec4 _DiffuseFactor;uniform float _GlossinessFactor;\n#endif\n#ifdef ALPHAMODE_MASK\nuniform float _AlphaCutoff;\n#endif\n#ifdef ADD_FOG\nuniform vec4 _FogColor;\n#ifdef LINEAR_FOG\nuniform float _FogNear;uniform float _FogFar;\n#endif\n#ifdef EXP_FOG\nuniform float _FogDensity;\n#endif\n#endif\n#ifdef PREVIEW_BORDER\nuniform vec4 uPreviewColor;\n#endif\nuniform vec3 _Camera;uniform int _MipCount;struct MaterialInfo{float perceptualRoughness;vec3 reflectance0;float alphaRoughness;vec3 diffuseColor;vec3 reflectance90;vec3 specularColor;};\n#ifdef ADD_FOG\nvec3 getMixFogColor(vec3 baseColor){vec3 distance=_Camera-v_Position;float fogAmount=0.0;\n#ifdef LINEAR_FOG\nfogAmount=smoothstep(_FogNear,_FogFar,distance[2]);\n#endif\n#ifdef EXP_FOG\n#define LOG2 1.442695\nfogAmount=1.-exp2(-_FogDensity*_FogDensity*distance[2]*distance[2]*LOG2);fogAmount=clamp(fogAmount,0.,1.);\n#endif\nvec3 mixColor=baseColor.rgb+(vec3(_FogColor)-baseColor.rgb)*fogAmount;return mixColor;}\n#endif\n#ifdef IRRADIANCE_COEFFICIENTS\nvec3 getIrradiance(vec3 norm,SHCoefficients c){float x=norm.x;float y=norm.y;float z=norm.z;float c1=0.429043;float c2=0.511664;float c3=0.743125;float c4=0.886227;float c5=0.247708;vec3 irradiance=c1*c.l22*(x*x-y*y)+c3*c.l20*(z*z)+c4*c.l00-c5*c.l20+2.0*c1*(c.l2m2*x*y+c.l21*x*z+c.l2m1*y*z)+2.0*c2*(c.l11*x+c.l1m1*y+c.l10*z);return irradiance;}\n#endif\n#ifdef USE_IBL\nvec3 getIBLContribution(MaterialInfo materialInfo,vec3 n,vec3 v){float NdotV=clamp(dot(n,v),0.0,1.0);float lod=clamp(materialInfo.perceptualRoughness*float(_MipCount),0.0,float(_MipCount));vec3 reflection=normalize(reflect(-v,n));vec2 brdfSamplePoint=clamp(vec2(NdotV,materialInfo.perceptualRoughness),vec2(0.0,0.0),vec2(1.0,1.0));vec2 brdf=texture2D(_brdfLUT,brdfSamplePoint).rg;vec4 diffuseColor=vec4(1.0,0.0,0.0,1.0);\n#ifdef IRRADIANCE_COEFFICIENTS\nvec3 irradiance=getIrradiance(n,_shCoefficients);diffuseColor=vec4(irradiance,1.0);\n#else\ndiffuseColor=textureCube(_DiffuseEnvSampler,n);\n#endif\n#ifdef USE_TEX_LOD\nvec4 specularSample=_textureCubeLodEXT(_SpecularEnvSampler,reflection,lod);\n#else\nvec4 specularSample=textureCube(_SpecularEnvSampler,reflection,lod);\n#endif\n#ifdef USE_HDR\nvec3 diffuseLight=diffuseColor.rgb;vec3 specularLight=specularSample.rgb;\n#else\nvec3 diffuseLight=SRGBtoLINEAR(diffuseColor).rgb;vec3 specularLight=SRGBtoLINEAR(specularSample).rgb;\n#endif\nvec3 diffuse=diffuseLight*materialInfo.diffuseColor;vec3 specular=specularLight*(materialInfo.specularColor*brdf.x+brdf.y);return diffuse*_IblIntensity[0]+specular*_IblIntensity[1];}\n#endif\nvec3 diffuse(MaterialInfo materialInfo){return materialInfo.diffuseColor/M_PI;}vec3 specularReflection(MaterialInfo materialInfo,AngularInfo angularInfo){return materialInfo.reflectance0+(materialInfo.reflectance90-materialInfo.reflectance0)*pow(clamp(1.0-angularInfo.VdotH,0.0,1.0),5.0);}float visibilityOcclusion(MaterialInfo materialInfo,AngularInfo angularInfo){float NdotL=angularInfo.NdotL;float NdotV=angularInfo.NdotV;float alphaRoughnessSq=materialInfo.alphaRoughness*materialInfo.alphaRoughness;float GGXV=NdotL*sqrt(NdotV*NdotV*(1.0-alphaRoughnessSq)+alphaRoughnessSq);float GGXL=NdotV*sqrt(NdotL*NdotL*(1.0-alphaRoughnessSq)+alphaRoughnessSq);float GGX=GGXV+GGXL;if(GGX>0.0){return 0.5/GGX;}return 0.0;}float microfacetDistribution(MaterialInfo materialInfo,AngularInfo angularInfo){float alphaRoughnessSq=materialInfo.alphaRoughness*materialInfo.alphaRoughness;float f=(angularInfo.NdotH*alphaRoughnessSq-angularInfo.NdotH)*angularInfo.NdotH+1.0;return alphaRoughnessSq/(M_PI*f*f);}vec3 getPointShade(vec3 pointToLight,MaterialInfo materialInfo,vec3 normal,vec3 view){AngularInfo angularInfo=getAngularInfo(pointToLight,normal,view);if(angularInfo.NdotL>0.0||angularInfo.NdotV>0.0){vec3 F=specularReflection(materialInfo,angularInfo);float Vis=visibilityOcclusion(materialInfo,angularInfo);float D=microfacetDistribution(materialInfo,angularInfo);vec3 diffuseContrib=(1.0-F)*diffuse(materialInfo);vec3 specContrib=F*Vis*D;return angularInfo.NdotL*(diffuseContrib+specContrib);}return vec3(0.0,0.0,0.0);}float getRangeAttenuation(float range,float distance){if(range<=0.0){return 1.0;}return 1.0/(pow(5.0*distance/range,2.0)+1.0);}float getSpotAttenuation(vec3 pointToLight,vec3 spotDirection,float outerConeCos,float innerConeCos){float actualCos=dot(normalize(spotDirection),normalize(-pointToLight));if(actualCos>outerConeCos){if(actualCos<innerConeCos){return smoothstep(outerConeCos,innerConeCos,actualCos);}return 1.0;}return 0.0;}vec3 applyDirectionalLight(Light light,MaterialInfo materialInfo,vec3 normal,vec3 view,float shadow){vec3 pointToLight=-light.direction;vec3 shade=getPointShade(pointToLight,materialInfo,normal,view)*shadow;return light.intensity*light.color*shade;}vec3 applyPointLight(Light light,MaterialInfo materialInfo,vec3 normal,vec3 view){vec3 pointToLight=light.position-v_Position;float distance=length(pointToLight);float attenuation=getRangeAttenuation(light.range,distance);vec3 shade=getPointShade(pointToLight,materialInfo,normal,view);return light.color*shade*attenuation*light.intensity;}vec3 applySpotLight(Light light,MaterialInfo materialInfo,vec3 normal,vec3 view,float shadow){vec3 pointToLight=light.position-v_Position;float distance=length(pointToLight);float rangeAttenuation=getRangeAttenuation(light.range,distance);float spotAttenuation=getSpotAttenuation(pointToLight,light.direction,light.outerConeCos,light.innerConeCos);vec3 shade=getPointShade(pointToLight,materialInfo,normal,view)*shadow;return rangeAttenuation*spotAttenuation*light.intensity*light.color*shade;}vec3 applyAmbientLight(Light light,MaterialInfo materialInfo){return light.intensity*light.color*diffuse(materialInfo);}float weight(float z,float a){return clamp(pow(min(1.0,a*10.0)+0.01,3.0)*1e8*pow(1.0-z*0.9,3.0),1e-2,3e3);}void writeFragmentColor(vec4 fragColor){\n#if !defined(ALPHAMODE_OPAQUE) && defined(USE_WBOIT)\nfloat w=weight(gl_FragCoord.z,fragColor.a);fragColor.rgb*=fragColor.a;outFragColor0=vec4(fragColor.rgb*w,fragColor.a);outFragColor1=vec4(fragColor.a*w);\n#else\noutFragColor=fragColor;\n#endif\n}void main(){float perceptualRoughness=0.0;float metallic=0.0;vec4 baseColor=vec4(0.0,0.0,0.0,1.0);vec3 diffuseColor=vec3(0.0);vec3 specularColor=vec3(0.0);vec3 f0=vec3(0.04);\n#ifdef PREVIEW_BORDER\nwriteFragmentColor(uPreviewColor);return;\n#endif\n#ifdef MATERIAL_SPECULARGLOSSINESS\n#ifdef HAS_SPECULAR_GLOSSINESS_MAP\nvec4 sgSample=SRGBtoLINEAR(texture2D(_SpecularGlossinessSampler,getSpecularGlossinessUV()));perceptualRoughness=(1.0-sgSample.a*_GlossinessFactor);f0=sgSample.rgb*_SpecularFactor;\n#else\nf0=_SpecularFactor;perceptualRoughness=1.0-_GlossinessFactor;\n#endif\n#ifdef HAS_DIFFUSE_MAP\nbaseColor=SRGBtoLINEAR(texture2D(_DiffuseSampler,getDiffuseUV()))*_DiffuseFactor;\n#else\nbaseColor=SRGBtoLINEAR(_DiffuseFactor);\n#endif\nbaseColor*=getVertexColor();specularColor=f0;float oneMinusSpecularStrength=1.0-max(max(f0.r,f0.g),f0.b);diffuseColor=baseColor.rgb*oneMinusSpecularStrength;\n#ifdef DEBUG_METALLIC\nmetallic=solveMetallic(baseColor.rgb,specularColor,oneMinusSpecularStrength);\n#endif\n#endif\n#ifdef MATERIAL_METALLICROUGHNESS\n#ifdef HAS_METALLIC_ROUGHNESS_MAP\nvec4 mrSample=texture2D(_MetallicRoughnessSampler,getMetallicRoughnessUV());perceptualRoughness=mrSample.g*_RoughnessFactor;metallic=mrSample.b*_MetallicFactor;\n#else\nmetallic=_MetallicFactor;perceptualRoughness=_RoughnessFactor;\n#endif\n#ifdef HAS_BASE_COLOR_MAP\nbaseColor=SRGBtoLINEAR(texture2D(_BaseColorSampler,getBaseColorUV()))*_BaseColorFactor;\n#else\nbaseColor=SRGBtoLINEAR(_BaseColorFactor);\n#endif\nbaseColor*=getVertexColor();diffuseColor=baseColor.rgb*(vec3(1.0)-f0)*(1.0-metallic);specularColor=mix(f0,baseColor.rgb,metallic);\n#endif\n#ifdef ALPHAMODE_MASK\nif(baseColor.a<_AlphaCutoff){discard;}baseColor.a=1.0;\n#endif\n#ifdef ALPHAMODE_OPAQUE\nbaseColor.a=1.0;\n#endif\n#ifdef MATERIAL_UNLIT\n#ifndef DEBUG_OUTPUT\n#ifdef ADD_FOG\nvec3 mixColor=getMixFogColor(baseColor.rgb);vec4 fragColorUnlit=vec4(LINEARtoSRGB(mixColor)*baseColor.a,baseColor.a);\n#else\nvec4 fragColorUnlit=vec4(LINEARtoSRGB(baseColor.rgb)*baseColor.a,baseColor.a);\n#endif\nwriteFragmentColor(fragColorUnlit);\n#else\n#ifdef DEBUG_UV\noutFragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),getNormal()));\n#endif\n#ifdef DEBUG_METALLIC\noutFragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\noutFragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\noutFragColor.rgb=getNormal()*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\noutFragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\noutFragColor.rgb=vec3(1.0);\n#endif\n#ifdef DEBUG_EMISSIVE\noutFragColor.rgb=vec3(0.0);\n#endif\n#ifdef DEBUG_ALPHA\noutFragColor.rgb=vec3(baseColor.a);\n#endif\noutFragColor.a=1.0;\n#endif\nreturn;\n#endif\nmetallic=clamp(metallic,0.0,1.0);float alphaRoughness=perceptualRoughness*perceptualRoughness;vec3 normal=getNormal();\n#ifdef USE_SPECULAR_AA\nfloat AARoughnessFactor=getAARoughnessFactor(normal);perceptualRoughness+=AARoughnessFactor;alphaRoughness+=AARoughnessFactor;\n#endif\nperceptualRoughness=clamp(perceptualRoughness,0.04,1.0);alphaRoughness=clamp(alphaRoughness,0.04,1.0);float reflectance=max(max(specularColor.r,specularColor.g),specularColor.b);vec3 specularEnvironmentR0=specularColor.rgb;vec3 specularEnvironmentR90=vec3(clamp(reflectance*50.0,0.0,1.0));MaterialInfo materialInfo=MaterialInfo(perceptualRoughness,specularEnvironmentR0,alphaRoughness,diffuseColor,specularEnvironmentR90,specularColor);vec3 color=vec3(0.0,0.0,0.0);vec3 view=normalize(_Camera-v_Position);float shadow=1.0;\n#ifdef USE_SHADOW_MAPPING\nshadow=getShadowContribution();\n#endif\n#ifdef USE_PUNCTUAL\nfor(int i=0;i<LIGHT_COUNT;++i){Light light=_Lights[i];if(light.type==LightType_Directional){color+=applyDirectionalLight(light,materialInfo,normal,view,shadow);}else if(light.type==LightType_Point){color+=applyPointLight(light,materialInfo,normal,view);}else if(light.type==LightType_Spot){color+=applySpotLight(light,materialInfo,normal,view,shadow);}else if(light.type==LightType_Ambient){color+=applyAmbientLight(light,materialInfo);}}\n#endif\n#ifdef USE_IBL\ncolor+=getIBLContribution(materialInfo,normal,view);\n#endif\nfloat ao=1.0;\n#ifdef HAS_OCCLUSION_MAP\nao=texture2D(_OcclusionSampler,getOcclusionUV()).r;color=mix(color,color*ao,_OcclusionStrength);\n#endif\nvec3 emissive=vec3(0);\n#ifndef DEBUG_OUTPUT\n#ifdef ADD_FOG\nvec4 toneMapColor=SRGBtoLINEAR(vec4(toneMap(color),baseColor.a));color=getMixFogColor(toneMapColor.rgb);vec4 fragColorOut=vec4(LINEARtoSRGB(color.rgb)*baseColor.a,baseColor.a);\n#else\ncolor=toneMap(color)*baseColor.a;\n#ifdef HAS_EMISSIVE\ncolor+=_EmissiveFactor.rgb;\n#endif\n#ifdef HAS_EMISSIVE_MAP\nemissive=SRGBtoLINEAR(texture2D(_EmissiveSampler,getEmissiveUV())).rgb*_EmissiveFactor.rgb;color+=emissive;\n#endif\nvec4 fragColorOut=vec4(color,baseColor.a);\n#endif\nwriteFragmentColor(fragColorOut);\n#else\n#ifdef DEBUG_UV\noutFragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),normal));\n#endif\n#ifdef DEBUG_METALLIC\noutFragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\noutFragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\noutFragColor.rgb=normal*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\noutFragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\n#ifdef HAS_OCCLUSION_MAP\noutFragColor.rgb=vec3(mix(1.0,ao,_OcclusionStrength));\n#else\noutFragColor.rgb=vec3(1.0);\n#endif\n#endif\n#ifdef DEBUG_EMISSIVE\n#ifdef HAS_EMISSIVE\nemissive=_EmissiveFactor.rgb;\n#endif\n#ifdef HAS_EMISSIVE_MAP\nemissive=SRGBtoLINEAR(texture2D(_EmissiveSampler,getEmissiveUV())).rgb*_EmissiveFactor.rgb;\n#endif\noutFragColor.rgb=LINEARtoSRGB(emissive);\n#endif\n#ifdef DEBUG_F0\noutFragColor.rgb=vec3(f0);\n#endif\n#ifdef DEBUG_ALPHA\noutFragColor.rgb=vec3(baseColor.a);\n#endif\noutFragColor.a=1.0;\n#endif\n}";
+var metallicRoughnessFrag = "\n#define FEATURES\n#ifndef WEBGL2\n#extension GL_OES_standard_derivatives : enable\n#endif\n#if !defined(WEBGL2) && defined(USE_TEX_LOD)\n#extension GL_EXT_shader_texture_lod : enable\n#endif\n#ifdef USE_HDR\n#extension GL_OES_texture_float : enable\n#extension GL_OES_texture_float_linear : enable\n#endif\n#if !defined(WEBGL2) && defined(USE_WBOIT)\n#extension GL_EXT_draw_buffers: require\n#endif\n#ifdef GL_FRAGMENT_PRECISION_HIGH\nprecision highp float;\n#else\nprecision mediump float;\n#endif\n#ifdef WEBGL2\n#ifdef USE_WBOIT\nlayout(location=0)out vec4 outFragColor0;layout(location=1)out vec4 outFragColor1;\n#else\nout vec4 outFragColor;\n#endif\n#else\n#ifdef USE_WBOIT\n#define outFragColor0 gl_FragData[0]\n#define outFragColor1 gl_FragData[1]\n#else\n#define outFragColor gl_FragColor\n#endif\n#endif\n#include <webglCompatibility.glsl>\n#include <extensions.frag.glsl>\n#include <tonemapping.frag.glsl>\n#include <textures.vert.glsl>\n#include <functions.frag.glsl>\n#include <shadowCommon.vert.glsl>\n#include <shadow.frag.glsl>\nstruct Light{vec3 direction;float range;vec3 color;float intensity;vec3 position;float innerConeCos;float outerConeCos;int type;vec2 padding;};const int LightType_Directional=0;const int LightType_Point=1;const int LightType_Spot=2;const int LightType_Ambient=3;\n#ifdef USE_PUNCTUAL\nuniform Light _Lights[LIGHT_COUNT];\n#endif\n#if defined(MATERIAL_SPECULARGLOSSINESS) || defined(MATERIAL_METALLICROUGHNESS)\nuniform float _MetallicFactor;uniform float _RoughnessFactor;uniform vec4 _BaseColorFactor;\n#endif\n#ifdef MATERIAL_SPECULARGLOSSINESS\nuniform vec3 _SpecularFactor;uniform vec4 _DiffuseFactor;uniform float _GlossinessFactor;\n#endif\n#ifdef ALPHAMODE_MASK\nuniform float _AlphaCutoff;\n#endif\n#ifdef ADD_FOG\nuniform vec4 _FogColor;\n#ifdef LINEAR_FOG\nuniform float _FogNear;uniform float _FogFar;\n#endif\n#ifdef EXP_FOG\nuniform float _FogDensity;\n#endif\n#endif\n#ifdef PREVIEW_BORDER\nuniform vec4 uPreviewColor;\n#endif\nuniform vec3 _Camera;uniform int _MipCount;struct MaterialInfo{float perceptualRoughness;vec3 reflectance0;float alphaRoughness;vec3 diffuseColor;vec3 reflectance90;vec3 specularColor;};\n#ifdef ADD_FOG\nvec3 getMixFogColor(vec3 baseColor){vec3 distance=_Camera-v_Position;float fogAmount=0.0;\n#ifdef LINEAR_FOG\nfogAmount=smoothstep(_FogNear,_FogFar,distance[2]);\n#endif\n#ifdef EXP_FOG\n#define LOG2 1.442695\nfogAmount=1.-exp2(-_FogDensity*_FogDensity*distance[2]*distance[2]*LOG2);fogAmount=clamp(fogAmount,0.,1.);\n#endif\nvec3 mixColor=baseColor.rgb+(vec3(_FogColor)-baseColor.rgb)*fogAmount;return mixColor;}\n#endif\n#ifdef IRRADIANCE_COEFFICIENTS\nvec3 getIrradiance(vec3 norm,SHCoefficients c){float x=norm.x;float y=norm.y;float z=norm.z;float c1=0.429043;float c2=0.511664;float c3=0.743125;float c4=0.886227;float c5=0.247708;vec3 irradiance=c1*c.l22*(x*x-y*y)+c3*c.l20*(z*z)+c4*c.l00-c5*c.l20+2.0*c1*(c.l2m2*x*y+c.l21*x*z+c.l2m1*y*z)+2.0*c2*(c.l11*x+c.l1m1*y+c.l10*z);return irradiance;}\n#endif\n#ifdef USE_IBL\nvec3 getIBLContribution(MaterialInfo materialInfo,vec3 n,vec3 v){float NdotV=clamp(dot(n,v),0.0,1.0);float lod=clamp(materialInfo.perceptualRoughness*float(_MipCount),0.0,float(_MipCount));vec3 reflection=normalize(reflect(-v,n));vec2 brdfSamplePoint=clamp(vec2(NdotV,materialInfo.perceptualRoughness),vec2(0.0,0.0),vec2(1.0,1.0));vec2 brdf=texture2D(_brdfLUT,brdfSamplePoint).rg;vec4 diffuseColor=vec4(1.0,0.0,0.0,1.0);\n#ifdef IRRADIANCE_COEFFICIENTS\nvec3 irradiance=getIrradiance(n,_shCoefficients);diffuseColor=vec4(irradiance,1.0);\n#else\ndiffuseColor=textureCube(_DiffuseEnvSampler,n);\n#endif\n#ifdef USE_TEX_LOD\nvec4 specularSample=_textureCubeLodEXT(_SpecularEnvSampler,reflection,lod);\n#else\nvec4 specularSample=textureCube(_SpecularEnvSampler,reflection,lod);\n#endif\n#ifdef USE_HDR\nvec3 diffuseLight=diffuseColor.rgb;vec3 specularLight=specularSample.rgb;\n#else\nvec3 diffuseLight=SRGBtoLINEAR(diffuseColor).rgb;vec3 specularLight=SRGBtoLINEAR(specularSample).rgb;\n#endif\nvec3 diffuse=diffuseLight*materialInfo.diffuseColor;vec3 specular=specularLight*(materialInfo.specularColor*brdf.x+brdf.y);return diffuse*_IblIntensity[0]+specular*_IblIntensity[1];}\n#endif\nvec3 diffuse(MaterialInfo materialInfo){return materialInfo.diffuseColor/M_PI;}vec3 specularReflection(MaterialInfo materialInfo,AngularInfo angularInfo){return materialInfo.reflectance0+(materialInfo.reflectance90-materialInfo.reflectance0)*pow(clamp(1.0-angularInfo.VdotH,0.0,1.0),5.0);}float visibilityOcclusion(MaterialInfo materialInfo,AngularInfo angularInfo){float NdotL=angularInfo.NdotL;float NdotV=angularInfo.NdotV;float alphaRoughnessSq=materialInfo.alphaRoughness*materialInfo.alphaRoughness;float GGXV=NdotL*sqrt(NdotV*NdotV*(1.0-alphaRoughnessSq)+alphaRoughnessSq);float GGXL=NdotV*sqrt(NdotL*NdotL*(1.0-alphaRoughnessSq)+alphaRoughnessSq);float GGX=GGXV+GGXL;if(GGX>0.0){return 0.5/GGX;}return 0.0;}float microfacetDistribution(MaterialInfo materialInfo,AngularInfo angularInfo){float alphaRoughnessSq=materialInfo.alphaRoughness*materialInfo.alphaRoughness;float f=(angularInfo.NdotH*alphaRoughnessSq-angularInfo.NdotH)*angularInfo.NdotH+1.0;return alphaRoughnessSq/(M_PI*f*f);}vec3 getPointShade(vec3 pointToLight,MaterialInfo materialInfo,vec3 normal,vec3 view){AngularInfo angularInfo=getAngularInfo(pointToLight,normal,view);if(angularInfo.NdotL>0.0||angularInfo.NdotV>0.0){vec3 F=specularReflection(materialInfo,angularInfo);float Vis=visibilityOcclusion(materialInfo,angularInfo);float D=microfacetDistribution(materialInfo,angularInfo);vec3 diffuseContrib=(1.0-F)*diffuse(materialInfo);vec3 specContrib=F*Vis*D;return angularInfo.NdotL*(diffuseContrib+specContrib);}return vec3(0.0,0.0,0.0);}float getRangeAttenuation(float range,float distance){if(range<=0.0){return 1.0;}return 1.0/(pow(5.0*distance/range,2.0)+1.0);}float getSpotAttenuation(vec3 pointToLight,vec3 spotDirection,float outerConeCos,float innerConeCos){float actualCos=dot(normalize(spotDirection),normalize(-pointToLight));if(actualCos>outerConeCos){if(actualCos<innerConeCos){return smoothstep(outerConeCos,innerConeCos,actualCos);}return 1.0;}return 0.0;}vec3 applyDirectionalLight(Light light,MaterialInfo materialInfo,vec3 normal,vec3 view,float shadow){vec3 pointToLight=-light.direction;vec3 shade=getPointShade(pointToLight,materialInfo,normal,view)*shadow;return light.intensity*light.color*shade;}vec3 applyPointLight(Light light,MaterialInfo materialInfo,vec3 normal,vec3 view){vec3 pointToLight=light.position-v_Position;float distance=length(pointToLight);float attenuation=getRangeAttenuation(light.range,distance);vec3 shade=getPointShade(pointToLight,materialInfo,normal,view);return light.color*shade*attenuation*light.intensity;}vec3 applySpotLight(Light light,MaterialInfo materialInfo,vec3 normal,vec3 view,float shadow){vec3 pointToLight=light.position-v_Position;float distance=length(pointToLight);float rangeAttenuation=getRangeAttenuation(light.range,distance);float spotAttenuation=getSpotAttenuation(pointToLight,light.direction,light.outerConeCos,light.innerConeCos);vec3 shade=getPointShade(pointToLight,materialInfo,normal,view)*shadow;return rangeAttenuation*spotAttenuation*light.intensity*light.color*shade;}vec3 applyAmbientLight(Light light,MaterialInfo materialInfo){return light.intensity*light.color*diffuse(materialInfo);}float weight(float z,float a){return clamp(pow(min(1.0,a*10.0)+0.01,3.0)*1e8*pow(1.0-z*0.9,3.0),1e-2,3e3);}void writeFragmentColor(vec4 fragColor){\n#if !defined(ALPHAMODE_OPAQUE) && defined(USE_WBOIT)\nfloat w=weight(gl_FragCoord.z,fragColor.a);fragColor.rgb*=fragColor.a;outFragColor0=vec4(fragColor.rgb*w,fragColor.a);outFragColor1=vec4(fragColor.a*w);\n#else\noutFragColor=fragColor;\n#endif\n}void main(){float perceptualRoughness=0.0;float metallic=0.0;vec4 baseColor=vec4(0.0,0.0,0.0,1.0);vec3 diffuseColor=vec3(0.0);vec3 specularColor=vec3(0.0);vec3 f0=vec3(0.04);\n#ifdef PREVIEW_BORDER\nwriteFragmentColor(uPreviewColor);return;\n#endif\n#ifdef MATERIAL_SPECULARGLOSSINESS\n#ifdef HAS_SPECULAR_GLOSSINESS_MAP\nvec4 sgSample=SRGBtoLINEAR(texture2D(_SpecularGlossinessSampler,getSpecularGlossinessUV()));perceptualRoughness=(1.0-sgSample.a*_GlossinessFactor);f0=sgSample.rgb*_SpecularFactor;\n#else\nf0=_SpecularFactor;perceptualRoughness=1.0-_GlossinessFactor;\n#endif\n#ifdef HAS_DIFFUSE_MAP\nbaseColor=SRGBtoLINEAR(texture2D(_DiffuseSampler,getDiffuseUV()))*_DiffuseFactor;\n#else\nbaseColor=SRGBtoLINEAR(_DiffuseFactor);\n#endif\nbaseColor*=getVertexColor();specularColor=f0;float oneMinusSpecularStrength=1.0-max(max(f0.r,f0.g),f0.b);diffuseColor=baseColor.rgb*oneMinusSpecularStrength;\n#ifdef DEBUG_METALLIC\nmetallic=solveMetallic(baseColor.rgb,specularColor,oneMinusSpecularStrength);\n#endif\n#endif\n#ifdef MATERIAL_METALLICROUGHNESS\n#ifdef HAS_METALLIC_ROUGHNESS_MAP\nvec4 mrSample=texture2D(_MetallicRoughnessSampler,getMetallicRoughnessUV());perceptualRoughness=mrSample.g*_RoughnessFactor;metallic=mrSample.b*_MetallicFactor;\n#else\nmetallic=_MetallicFactor;perceptualRoughness=_RoughnessFactor;\n#endif\n#ifdef HAS_BASE_COLOR_MAP\nbaseColor=SRGBtoLINEAR(texture2D(_BaseColorSampler,getBaseColorUV()))*_BaseColorFactor;\n#else\nbaseColor=SRGBtoLINEAR(_BaseColorFactor);\n#endif\nbaseColor*=getVertexColor();diffuseColor=baseColor.rgb*(vec3(1.0)-f0)*(1.0-metallic);specularColor=mix(f0,baseColor.rgb,metallic);\n#endif\n#ifdef ALPHAMODE_MASK\nif(baseColor.a<_AlphaCutoff){discard;}baseColor.a=1.0;\n#endif\n#ifdef ALPHAMODE_OPAQUE\nbaseColor.a=1.0;\n#endif\n#ifdef MATERIAL_UNLIT\n#ifndef DEBUG_OUTPUT\n#ifdef ADD_FOG\nvec3 mixColor=getMixFogColor(baseColor.rgb);vec4 fragColorUnlit=vec4(LINEARtoSRGB(mixColor)*baseColor.a,baseColor.a);\n#else\nvec4 fragColorUnlit=vec4(LINEARtoSRGB(baseColor.rgb)*baseColor.a,baseColor.a);\n#endif\nwriteFragmentColor(fragColorUnlit);\n#else\n#ifdef DEBUG_UV\noutFragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),getNormal()));\n#endif\n#ifdef DEBUG_METALLIC\noutFragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\noutFragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\noutFragColor.rgb=getNormal()*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\noutFragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\noutFragColor.rgb=vec3(1.0);\n#endif\n#ifdef DEBUG_EMISSIVE\noutFragColor.rgb=vec3(0.0);\n#endif\n#ifdef DEBUG_ALPHA\noutFragColor.rgb=vec3(baseColor.a);\n#endif\noutFragColor.a=1.0;\n#endif\nreturn;\n#endif\nmetallic=clamp(metallic,0.0,1.0);float alphaRoughness=perceptualRoughness*perceptualRoughness;vec3 normal=getNormal();\n#ifdef USE_SPECULAR_AA\nfloat AARoughnessFactor=getAARoughnessFactor(normal);perceptualRoughness+=AARoughnessFactor;alphaRoughness+=AARoughnessFactor;\n#endif\nperceptualRoughness=clamp(perceptualRoughness,0.04,1.0);alphaRoughness=clamp(alphaRoughness,0.04,1.0);float reflectance=max(max(specularColor.r,specularColor.g),specularColor.b);vec3 specularEnvironmentR0=specularColor.rgb;vec3 specularEnvironmentR90=vec3(clamp(reflectance*50.0,0.0,1.0));MaterialInfo materialInfo=MaterialInfo(perceptualRoughness,specularEnvironmentR0,alphaRoughness,diffuseColor,specularEnvironmentR90,specularColor);vec3 color=vec3(0.0,0.0,0.0);vec3 view=normalize(_Camera-v_Position);float shadow=1.0;\n#ifdef USE_SHADOW_MAPPING\nshadow=getShadowContribution();\n#endif\n#ifdef USE_PUNCTUAL\nfor(int i=0;i<LIGHT_COUNT;++i){Light light=_Lights[i];if(light.type==LightType_Directional){color+=applyDirectionalLight(light,materialInfo,normal,view,shadow);}else if(light.type==LightType_Point){color+=applyPointLight(light,materialInfo,normal,view);}else if(light.type==LightType_Spot){color+=applySpotLight(light,materialInfo,normal,view,shadow);}else if(light.type==LightType_Ambient){color+=applyAmbientLight(light,materialInfo);}}\n#endif\n#ifdef USE_IBL\ncolor+=getIBLContribution(materialInfo,normal,view);\n#endif\nfloat ao=1.0;\n#ifdef HAS_OCCLUSION_MAP\nao=texture2D(_OcclusionSampler,getOcclusionUV()).r;color=mix(color,color*ao,_OcclusionStrength);\n#endif\nvec3 emissive=vec3(0);\n#ifndef DEBUG_OUTPUT\n#ifdef ADD_FOG\nvec4 toneMapColor=SRGBtoLINEAR(vec4(toneMap(color),baseColor.a));color=getMixFogColor(toneMapColor.rgb);vec4 fragColorOut=vec4(LINEARtoSRGB(color.rgb)*baseColor.a,baseColor.a);\n#else\ncolor=toneMap(color)*baseColor.a;\n#ifdef HAS_EMISSIVE\ncolor+=_EmissiveFactor.rgb*_EmissiveIntensity;\n#endif\n#ifdef HAS_EMISSIVE_MAP\nemissive=SRGBtoLINEAR(texture2D(_EmissiveSampler,getEmissiveUV())).rgb*_EmissiveFactor.rgb*_EmissiveIntensity;color+=emissive;\n#endif\nvec4 fragColorOut=vec4(color,baseColor.a);\n#endif\nwriteFragmentColor(fragColorOut);\n#else\n#ifdef DEBUG_UV\noutFragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),normal));\n#endif\n#ifdef DEBUG_METALLIC\noutFragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\noutFragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\noutFragColor.rgb=normal*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\noutFragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\n#ifdef HAS_OCCLUSION_MAP\noutFragColor.rgb=vec3(mix(1.0,ao,_OcclusionStrength));\n#else\noutFragColor.rgb=vec3(1.0);\n#endif\n#endif\n#ifdef DEBUG_EMISSIVE\n#ifdef HAS_EMISSIVE\nemissive=_EmissiveFactor.rgb*_EmissiveIntensity;\n#endif\n#ifdef HAS_EMISSIVE_MAP\nemissive=SRGBtoLINEAR(texture2D(_EmissiveSampler,getEmissiveUV())).rgb*_EmissiveFactor.rgb*_EmissiveIntensity;\n#endif\noutFragColor.rgb=LINEARtoSRGB(emissive);\n#endif\n#ifdef DEBUG_F0\noutFragColor.rgb=vec3(f0);\n#endif\n#ifdef DEBUG_ALPHA\noutFragColor.rgb=vec3(baseColor.a);\n#endif\noutFragColor.a=1.0;\n#endif\n}";
 
 var shadowPassFrag = "#define FEATURES\n#include <shadowCommon.vert.glsl>\n#include <webglCompatibility.glsl>\n#if defined(SHADOWMAP_VSM) && !defined(WEBGL2)\n#extension GL_OES_standard_derivatives : enable\n#endif\n#ifdef GL_FRAGMENT_PRECISION_HIGH\nprecision highp float;\n#else\nprecision mediump float;\n#endif\n#ifdef WEBGL2\nout vec4 outFragColor;\n#else\n#define outFragColor gl_FragColor\n#endif\nvec4 CalcMomentVSM(float depth){float dx=0.0;float dy=0.0;\n#if defined(SHADOWMAP_VSM) && (defined(GL_OES_standard_derivatives) || defined(WEBGL2))\ndx=dFdx(depth);dy=dFdy(depth);\n#endif\nfloat moment2=depth*depth+0.25*(dx*dx+dy*dy);return vec4(1.0-depth,1.0-moment2,0.0,1.0);}vec4 CalcMomentEVSM(float depth){float pos=EVSM_FUNC0(depth);float neg=EVSM_FUNC1(depth);return vec4(pos,pos*pos,neg,neg*neg);}void main(){\n#if defined(SHADOWMAP_STANDARD) || defined(SHADOWMAP_VSM)\noutFragColor=CalcMomentVSM(gl_FragCoord.z);\n#else\noutFragColor=CalcMomentEVSM(gl_FragCoord.z);\n#endif\n}";
 
@@ -3898,7 +3894,7 @@ var extensionsFragGLSL = "vec3 _dFdx(vec3 coord){\n#if defined(GL_OES_standard_d
 
 var tonemappingFragGLSL = "uniform float _Exposure;const float GAMMA=2.2;const float INV_GAMMA=1.0/GAMMA;vec3 LINEARtoSRGB(vec3 color){return pow(color,vec3(INV_GAMMA));}vec4 SRGBtoLINEAR(vec4 srgbIn){return vec4(pow(srgbIn.xyz,vec3(GAMMA)),srgbIn.w);}vec3 toneMapUncharted2Impl(vec3 color){const float A=0.15;const float B=0.50;const float C=0.10;const float D=0.20;const float E=0.02;const float F=0.30;return((color*(A*color+C*B)+D*E)/(color*(A*color+B)+D*F))-E/F;}vec3 toneMapUncharted(vec3 color){const float W=11.2;color=toneMapUncharted2Impl(color*2.0);vec3 whiteScale=1.0/toneMapUncharted2Impl(vec3(W));return LINEARtoSRGB(color*whiteScale);}vec3 toneMapHejlRichard(vec3 color){color=max(vec3(0.0),color-vec3(0.004));return(color*(6.2*color+.5))/(color*(6.2*color+1.7)+0.06);}vec3 toneMapACES(vec3 color){const float A=2.51;const float B=0.03;const float C=2.43;const float D=0.59;const float E=0.14;return LINEARtoSRGB(clamp((color*(A*color+B))/(color*(C*color+D)+E),0.0,1.0));}vec3 toneMap(vec3 color){color*=_Exposure;\n#ifdef TONEMAP_UNCHARTED\nreturn toneMapUncharted(color);\n#endif\n#ifdef TONEMAP_HEJLRICHARD\nreturn toneMapHejlRichard(color);\n#endif\n#ifdef TONEMAP_ACES\nreturn toneMapACES(color);\n#endif\nreturn LINEARtoSRGB(color);}";
 
-var texturesVertGLSL = "fsIn vec2 v_UVCoord1;\n#ifdef HAS_UV_SET2\nfsIn vec2 v_UVCoord2;\n#endif\n#ifdef HAS_NORMAL_MAP\nuniform sampler2D _NormalSampler;uniform float _NormalScale;uniform int _NormalUVSet;uniform mat3 _NormalUVTransform;\n#endif\n#ifdef HAS_EMISSIVE_MAP\nuniform sampler2D _EmissiveSampler;uniform int _EmissiveUVSet;uniform vec4 _EmissiveFactor;uniform mat3 _EmissiveUVTransform;\n#endif\n#ifdef HAS_EMISSIVE\nuniform vec4 _EmissiveFactor;\n#endif\n#ifdef HAS_OCCLUSION_MAP\nuniform sampler2D _OcclusionSampler;uniform int _OcclusionUVSet;uniform float _OcclusionStrength;uniform mat3 _OcclusionUVTransform;\n#endif\n#ifdef HAS_BASE_COLOR_MAP\nuniform sampler2D _BaseColorSampler;uniform int _BaseColorUVSet;uniform mat3 _BaseColorUVTransform;\n#endif\n#ifdef HAS_METALLIC_ROUGHNESS_MAP\nuniform sampler2D _MetallicRoughnessSampler;uniform int _MetallicRoughnessUVSet;uniform mat3 _MetallicRoughnessUVTransform;\n#endif\n#ifdef HAS_DIFFUSE_MAP\nuniform sampler2D _DiffuseSampler;uniform int _DiffuseUVSet;uniform mat3 _DiffuseUVTransform;\n#endif\n#ifdef HAS_SPECULAR_GLOSSINESS_MAP\nuniform sampler2D _SpecularGlossinessSampler;uniform int _SpecularGlossinessUVSet;uniform mat3 _SpecularGlossinessUVTransform;\n#endif\n#ifdef USE_IBL\nuniform samplerCube _DiffuseEnvSampler;uniform samplerCube _SpecularEnvSampler;uniform sampler2D _brdfLUT;uniform vec2 _IblIntensity;\n#endif\n#ifdef IRRADIANCE_COEFFICIENTS\nstruct SHCoefficients{vec3 l00,l1m1,l10,l11,l2m2,l2m1,l20,l21,l22;};uniform SHCoefficients _shCoefficients;\n#endif\n#ifdef USE_SHADOW_MAPPING\nuniform sampler2D _ShadowSampler;\n#endif\nvec2 getNormalUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_NORMAL_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_NormalUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_NORMAL_UV_TRANSFORM\nuv*=_NormalUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getEmissiveUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_EMISSIVE_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_EmissiveUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_EMISSIVE_UV_TRANSFORM\nuv*=_EmissiveUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getOcclusionUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_OCCLUSION_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_OcclusionUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_OCCLUSION_UV_TRANSFORM\nuv*=_OcclusionUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getBaseColorUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_BASE_COLOR_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_BaseColorUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_BASECOLOR_UV_TRANSFORM\nuv*=_BaseColorUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getMetallicRoughnessUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_METALLIC_ROUGHNESS_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_MetallicRoughnessUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_METALLICROUGHNESS_UV_TRANSFORM\nuv*=_MetallicRoughnessUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getSpecularGlossinessUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_SPECULAR_GLOSSINESS_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_SpecularGlossinessUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_SPECULARGLOSSINESS_UV_TRANSFORM\nuv*=_SpecularGlossinessUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getDiffuseUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_DIFFUSE_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_DiffuseUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_DIFFUSE_UV_TRANSFORM\nuv*=_DiffuseUVTransform;\n#endif\n#endif\nreturn uv.xy;}";
+var texturesVertGLSL = "fsIn vec2 v_UVCoord1;\n#ifdef HAS_UV_SET2\nfsIn vec2 v_UVCoord2;\n#endif\n#ifdef HAS_NORMAL_MAP\nuniform sampler2D _NormalSampler;uniform float _NormalScale;uniform int _NormalUVSet;uniform mat3 _NormalUVTransform;\n#endif\n#ifdef HAS_EMISSIVE_MAP\nuniform sampler2D _EmissiveSampler;uniform int _EmissiveUVSet;uniform vec4 _EmissiveFactor;uniform float _EmissiveIntensity;uniform mat3 _EmissiveUVTransform;\n#endif\n#ifdef HAS_EMISSIVE\nuniform vec4 _EmissiveFactor;uniform float _EmissiveIntensity;\n#endif\n#ifdef HAS_OCCLUSION_MAP\nuniform sampler2D _OcclusionSampler;uniform int _OcclusionUVSet;uniform float _OcclusionStrength;uniform mat3 _OcclusionUVTransform;\n#endif\n#ifdef HAS_BASE_COLOR_MAP\nuniform sampler2D _BaseColorSampler;uniform int _BaseColorUVSet;uniform mat3 _BaseColorUVTransform;\n#endif\n#ifdef HAS_METALLIC_ROUGHNESS_MAP\nuniform sampler2D _MetallicRoughnessSampler;uniform int _MetallicRoughnessUVSet;uniform mat3 _MetallicRoughnessUVTransform;\n#endif\n#ifdef HAS_DIFFUSE_MAP\nuniform sampler2D _DiffuseSampler;uniform int _DiffuseUVSet;uniform mat3 _DiffuseUVTransform;\n#endif\n#ifdef HAS_SPECULAR_GLOSSINESS_MAP\nuniform sampler2D _SpecularGlossinessSampler;uniform int _SpecularGlossinessUVSet;uniform mat3 _SpecularGlossinessUVTransform;\n#endif\n#ifdef USE_IBL\nuniform samplerCube _DiffuseEnvSampler;uniform samplerCube _SpecularEnvSampler;uniform sampler2D _brdfLUT;uniform vec2 _IblIntensity;\n#endif\n#ifdef IRRADIANCE_COEFFICIENTS\nstruct SHCoefficients{vec3 l00,l1m1,l10,l11,l2m2,l2m1,l20,l21,l22;};uniform SHCoefficients _shCoefficients;\n#endif\n#ifdef USE_SHADOW_MAPPING\nuniform sampler2D _ShadowSampler;\n#endif\nvec2 getNormalUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_NORMAL_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_NormalUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_NORMAL_UV_TRANSFORM\nuv*=_NormalUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getEmissiveUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_EMISSIVE_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_EmissiveUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_EMISSIVE_UV_TRANSFORM\nuv*=_EmissiveUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getOcclusionUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_OCCLUSION_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_OcclusionUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_OCCLUSION_UV_TRANSFORM\nuv*=_OcclusionUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getBaseColorUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_BASE_COLOR_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_BaseColorUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_BASECOLOR_UV_TRANSFORM\nuv*=_BaseColorUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getMetallicRoughnessUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_METALLIC_ROUGHNESS_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_MetallicRoughnessUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_METALLICROUGHNESS_UV_TRANSFORM\nuv*=_MetallicRoughnessUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getSpecularGlossinessUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_SPECULAR_GLOSSINESS_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_SpecularGlossinessUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_SPECULARGLOSSINESS_UV_TRANSFORM\nuv*=_SpecularGlossinessUVTransform;\n#endif\n#endif\nreturn uv.xy;}vec2 getDiffuseUV(){vec3 uv=vec3(v_UVCoord1,1.0);\n#ifdef HAS_DIFFUSE_MAP\n#ifdef HAS_UV_SET2\nuv.xy=_DiffuseUVSet<1 ? v_UVCoord1 : v_UVCoord2;\n#endif\n#ifdef HAS_DIFFUSE_UV_TRANSFORM\nuv*=_DiffuseUVTransform;\n#endif\n#endif\nreturn uv.xy;}";
 
 var functionsFragGLSL = "const float M_PI=3.141592653589793;const float c_MinReflectance=0.04;fsIn vec3 v_Position;\n#ifdef HAS_NORMALS\n#ifdef HAS_TANGENTS\nfsIn mat3 v_TBN;\n#else\nfsIn vec3 v_Normal;\n#endif\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC3\nfsIn vec3 v_Color;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC4\nfsIn vec4 v_Color;\n#endif\nstruct AngularInfo{float NdotL;float NdotV;float NdotH;float LdotH;float VdotH;vec3 padding;};vec4 getVertexColor(){vec4 color=vec4(1.0,1.0,1.0,1.0);\n#ifdef HAS_VERTEX_COLOR_VEC3\ncolor.rgb=v_Color;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC4\ncolor=v_Color;\n#endif\nreturn color;}vec3 getNormal(){vec2 UV=getNormalUV();\n#ifndef HAS_TANGENTS\nvec3 pos_dx=_dFdx(v_Position);vec3 pos_dy=_dFdy(v_Position);vec3 tex_dx=_dFdx(vec3(UV,0.0));vec3 tex_dy=_dFdy(vec3(UV,0.0));vec3 t=(tex_dy.t*pos_dx-tex_dx.t*pos_dy)/(tex_dx.s*tex_dy.t-tex_dy.s*tex_dx.t);\n#ifdef HAS_NORMALS\nvec3 ng=normalize(v_Normal);\n#else\nvec3 ng=cross(pos_dx,pos_dy);\n#endif\nt=normalize(t-ng*dot(ng,t));vec3 b=normalize(cross(ng,t));mat3 tbn=mat3(t,b,ng);\n#else\nmat3 tbn=v_TBN;\n#endif\n#ifdef HAS_NORMAL_MAP\nvec3 n=texture2D(_NormalSampler,UV).rgb;n=normalize(tbn*((2.0*n-1.0)*vec3(_NormalScale,_NormalScale,1.0)));\n#else\nvec3 n=normalize(tbn[2].xyz);\n#endif\n#ifdef DOUBLE_SIDED\nfloat faceDirection=gl_FrontFacing ? 1.0 :-1.0;n=n*faceDirection;\n#endif\nreturn n;}float getPerceivedBrightness(vec3 vector){return sqrt(0.299*vector.r*vector.r+0.587*vector.g*vector.g+0.114*vector.b*vector.b);}float solveMetallic(vec3 diffuse,vec3 specular,float oneMinusSpecularStrength){float specularBrightness=getPerceivedBrightness(specular);if(specularBrightness<c_MinReflectance){return 0.0;}float diffuseBrightness=getPerceivedBrightness(diffuse);float a=c_MinReflectance;float b=diffuseBrightness*oneMinusSpecularStrength/(1.0-c_MinReflectance)+specularBrightness-2.0*c_MinReflectance;float c=c_MinReflectance-specularBrightness;float D=b*b-4.0*a*c;return clamp((-b+sqrt(D))/(2.0*a),0.0,1.0);}AngularInfo getAngularInfo(vec3 pointToLight,vec3 normal,vec3 view){vec3 n=normalize(normal);vec3 v=normalize(view);vec3 l=normalize(pointToLight);vec3 h=normalize(l+v);float NdotL=clamp(dot(n,l),0.0,1.0);float NdotV=clamp(dot(n,v),0.0,1.0);float NdotH=clamp(dot(n,h),0.0,1.0);float LdotH=clamp(dot(l,h),0.0,1.0);float VdotH=clamp(dot(v,h),0.0,1.0);return AngularInfo(NdotL,NdotV,NdotH,LdotH,VdotH,vec3(0,0,0));}float getAARoughnessFactor(vec3 normal){vec3 dxy=max(abs(_dFdx(normal)),abs(_dFdy(normal)));return max(max(dxy.x,dxy.y),dxy.z)*2.0;}\n#ifdef DEBUG_UV\nuniform float _DebugUVGridSize;float getDebugUVColor(vec2 uv,vec3 n){float s=dot(abs(n),vec3(1,1,1))*0.6;uv=uv/(_DebugUVGridSize*2.0);uv=uv-floor(uv);uv=uv*2.0-vec2(1.0);return s*(uv.x*uv.y>=0.0 ? 0.2: 1.0);}\n#endif\n";
 
@@ -5344,7 +5340,7 @@ var normal = new Vector3();
    * @returns 纹理获取或 undefined
    */ WebGLHelper.getTexture = function getTexture(index, textures) {
         if (index < 0 || index >= textures.length) {
-            return undefined;
+            return null;
         } else {
             return textures[index];
         }
@@ -5669,13 +5665,15 @@ var normal = new Vector3();
         if (camera.perspective === undefined) {
             return;
         }
-    // const p = camera.perspective;
-    // const options: ModelCameraOptions = {
-    //   near: p.znear,
-    //   far: p.zfar ?? 1000,
-    //   fov: p.yfov,
-    //   clipMode: 0,
-    // };
+        var p = camera.perspective;
+        var _p_zfar;
+        var options = {
+            near: p.znear,
+            far: (_p_zfar = p.zfar) != null ? _p_zfar : 1000,
+            fov: p.yfov,
+            clipMode: 0
+        };
+        return options;
     };
     /**
    * 转成播放器中 [0, 255] 区间的颜色值
@@ -5729,36 +5727,30 @@ var normal = new Vector3();
     };
     /**
    * 创建 UV 变换矩阵，从 UV 变换参数中
-   * @param transform - 变换参数
+   * @param stValue - UV 的缩放和平移参数
+   * @param rotateValue - UV 的旋转参数
    * @returns 3阶变换矩阵
-   */ PluginHelper.createUVTransform = function createUVTransform(transform) {
-        if (transform === undefined) {
-            // no transform
-            return;
-        }
-        if (transform.offset === undefined && transform.rotation === undefined && transform.scale === undefined) {
-            // no transform, again
-            return;
-        }
+   */ PluginHelper.createUVTransform = function createUVTransform(material, stName, rotateName) {
+        var stValue = material.getVector4(stName);
+        var rotateValue = material.getFloat(rotateName);
         var res = Matrix3.fromIdentity();
-        var temp = new Matrix3();
-        if (transform.offset !== undefined) {
-            temp.setFromArray([
+        if (stValue) {
+            res.setFromArray([
                 1,
                 0,
                 0,
                 0,
                 1,
                 0,
-                transform.offset[0],
-                transform.offset[1],
+                stValue.z,
+                stValue.w,
                 1
             ]);
-            res.multiply(temp);
         }
-        if (transform.rotation !== undefined) {
-            var cosTheta = Math.cos(transform.rotation);
-            var sinTheta = Math.sin(transform.rotation);
+        var temp = new Matrix3();
+        if (rotateValue) {
+            var cosTheta = Math.cos(rotateValue);
+            var sinTheta = Math.sin(rotateValue);
             temp.setFromArray([
                 cosTheta,
                 sinTheta,
@@ -5772,13 +5764,13 @@ var normal = new Vector3();
             ]);
             res.multiply(temp);
         }
-        if (transform.scale !== undefined) {
+        if (stValue) {
             temp.setFromArray([
-                transform.scale[0],
+                stValue.x,
                 0,
                 0,
                 0,
-                transform.scale[1],
+                stValue.y,
                 0,
                 0,
                 0,
@@ -6185,7 +6177,7 @@ var normal = new Vector3();
    * @returns
    */ PluginHelper.getTextureObj = function getTextureObj(textures, index) {
         if (typeof index !== "number") {
-            return index;
+            return null;
         }
         if (index < 0 || index >= textures.length) {
             console.error("Invalid index for textures: " + index + ", " + textures.length);
@@ -6312,7 +6304,7 @@ var normal = new Vector3();
                             if (b) {
                                 resolve(b.arrayBuffer());
                             } else {
-                                reject(Error("no canvas blob"));
+                                reject(new Error("no canvas blob"));
                             }
                         }, "image/png", 1);
                     })
@@ -6718,7 +6710,7 @@ var AttributeArray = /*#__PURE__*/ function() {
             var r0 = this.getPosition(i0, p0, q0);
             var r1 = this.getPosition(i1, p1, q1);
             var r2 = this.getPosition(i2, p2, q2);
-            if (r0 === undefined || r1 === undefined || r2 === undefined) {
+            if (!r0 || !r1 || !r2) {
                 continue;
             }
             var t = RayTriangleTesting(rayOrigin, rayDirection, r0, r1, r2, backfaceCulling);
@@ -6740,7 +6732,7 @@ var AttributeArray = /*#__PURE__*/ function() {
    */ _proto.getPosition = function getPosition(index, vec3, vec4) {
         var posData = this.position.getData(index);
         if (posData === undefined) {
-            return;
+            return null;
         }
         if (this.hasAnimation) {
             var _this_joint, _this_weight;
@@ -7688,6 +7680,18 @@ var toHalf = function() {
     };
 }();
 
+var RenderType;
+(function(RenderType) {
+    RenderType["Opaque"] = "Opaque";
+    RenderType["Mask"] = "Mask";
+    RenderType["Blend"] = "Blend";
+})(RenderType || (RenderType = {}));
+var CullMode;
+(function(CullMode) {
+    CullMode["Front"] = "Front";
+    CullMode["Back"] = "Back";
+    CullMode["Double"] = "Double";
+})(CullMode || (CullMode = {}));
 /**
  * 3D 材质基础类，支持公共的材质功能
  */ var PMaterialBase = /*#__PURE__*/ function(PObject) {
@@ -7695,7 +7699,6 @@ var toHalf = function() {
     function PMaterialBase() {
         var _this;
         _this = PObject.apply(this, arguments) || this;
-        _this.fromMaterial = false;
         /**
    * 材质类型，主要是 pbr 和 unlit 两类
    */ _this.materialType = PMaterialType.none;
@@ -7707,19 +7710,19 @@ var toHalf = function() {
    */ _this.fragmentShaderCode = "";
         /**
    * 深度是否写入，默认是写入
-   */ _this.depthMask = true;
+   */ _this.ZWrite = true;
         /**
    * 是否深度测试提示，默认开启
-   */ _this.depthTestHint = true;
+   */ _this.ZTest = true;
         /**
-   * 混合模式，默认是不透明
-   */ _this.blendMode = PBlendMode.opaque;
+   * 渲染类型，默认是不透明
+   */ _this.renderType = "Opaque";
         /**
    * Alpha 测试截断值
    */ _this.alphaCutOff = 0.5;
         /**
    * 面侧模式，默认是正面
-   */ _this.faceSideMode = PFaceSideMode.front;
+   */ _this.cullMode = "Front";
         return _this;
     }
     var _proto = PMaterialBase.prototype;
@@ -7733,7 +7736,7 @@ var toHalf = function() {
         } else if (this.isMasked()) {
             featureList.push("ALPHAMODE_MASK 1");
         }
-        if (this.faceSideMode === PFaceSideMode.both) {
+        if (this.cullMode === "Double") {
             featureList.push("DOUBLE_SIDED 1");
         }
         return featureList;
@@ -7749,7 +7752,7 @@ var toHalf = function() {
                 name: "ALPHAMODE_MASK"
             });
         }
-        if (this.faceSideMode === PFaceSideMode.both) {
+        if (this.cullMode === "Double") {
             macroList.push({
                 name: "DOUBLE_SIDED"
             });
@@ -7760,9 +7763,6 @@ var toHalf = function() {
    * 根据材质状态，更新 GE 材质状态
    * @param material - GE 材质
    */ _proto.updateUniforms = function updateUniforms(material) {
-        if (this.isMasked()) {
-            material.setFloat("_AlphaCutoff", this.alphaCutOff);
-        }
         // 渲染 UV 结果输出时，设置 uv 大小
         var renderMode = PGlobalState.getInstance().renderMode3D;
         if (renderMode === spec.RenderMode3D.uv) {
@@ -7832,60 +7832,23 @@ var toHalf = function() {
         return finalMacroList;
     };
     /**
-   * 获取混合模式，根据 GE 混合模式
-   * @param mode - GE 混合模式
-   * @returns
-   */ _proto.getBlendMode = function getBlendMode(mode) {
-        if (mode === spec.MaterialBlending.masked) {
-            return PBlendMode.masked;
-        } else if (mode === spec.MaterialBlending.translucent) {
-            return PBlendMode.translucent;
-        } else if (mode === spec.MaterialBlending.additive) {
-            return PBlendMode.additive;
-        } else {
-            return PBlendMode.opaque;
-        }
-    };
-    /**
-   * 获取面侧模式，根据 GE 面侧模式
-   * @param mode - GE 面侧模式
-   * @returns
-   */ _proto.getFaceSideMode = function getFaceSideMode(mode) {
-        if (mode === spec.SideMode.DOUBLE) {
-            return PFaceSideMode.both;
-        } else if (mode === spec.SideMode.BACK) {
-            return PFaceSideMode.back;
-        } else {
-            return PFaceSideMode.front;
-        }
-    };
-    /**
    * 设置材质状态，根据 GE 材质状态
    * @param material - GE 材质
    */ _proto.setMaterialStates = function setMaterialStates(material) {
-        if (this.blendMode === PBlendMode.translucent || this.blendMode === PBlendMode.additive) {
+        if (this.renderType === "Blend") {
             material.blending = true;
             material.depthTest = true;
             material.blendEquation = [
                 glContext.FUNC_ADD,
                 glContext.FUNC_ADD
             ];
-            if (this.blendMode === PBlendMode.translucent) {
-                material.blendFunction = [
-                    glContext.ONE,
-                    glContext.ONE_MINUS_SRC_ALPHA,
-                    glContext.ONE,
-                    glContext.ONE_MINUS_SRC_ALPHA
-                ];
-            } else {
-                material.blendFunction = [
-                    glContext.ONE,
-                    glContext.ONE,
-                    glContext.ONE,
-                    glContext.ONE
-                ];
-            }
-            material.depthMask = this.depthMask;
+            material.blendFunction = [
+                glContext.ONE,
+                glContext.ONE_MINUS_SRC_ALPHA,
+                glContext.ONE,
+                glContext.ONE_MINUS_SRC_ALPHA
+            ];
+            material.depthMask = this.ZWrite;
         } else {
             if (PGlobalState.getInstance().isTiny3dMode) {
                 material.blending = false;
@@ -7894,16 +7857,16 @@ var toHalf = function() {
                 material.depthMask = true;
             } else {
                 material.blending = false;
-                material.depthTest = this.depthTestHint;
-                material.depthMask = this.depthMask;
+                material.depthTest = this.ZTest;
+                material.depthMask = this.ZWrite;
             }
         }
         this.setFaceSideStates(material);
     };
     _proto.setFaceSideStates = function setFaceSideStates(material) {
-        if (this.isBothFace()) {
+        if (this.isDoubleSide()) {
             material.culling = false;
-        } else if (this.isBackFace()) {
+        } else if (this.isBackSide()) {
             material.cullFace = glContext.FRONT;
             material.frontFace = glContext.CCW;
             material.culling = true;
@@ -7929,49 +7892,37 @@ var toHalf = function() {
    * 是否不透明
    * @returns
    */ _proto.isOpaque = function isOpaque() {
-        return this.blendMode === PBlendMode.opaque;
+        return this.renderType === "Opaque";
     };
     /**
    * 是否遮罩
    * @returns
    */ _proto.isMasked = function isMasked() {
-        return this.blendMode === PBlendMode.masked;
+        return this.renderType === "Mask";
     };
     /**
    * 是否半透明
    * @returns
-   */ _proto.isTranslucent = function isTranslucent() {
-        return this.blendMode === PBlendMode.translucent;
-    };
-    /**
-   * 是否加法混合
-   * @returns
-   */ _proto.isAdditive = function isAdditive() {
-        return this.blendMode === PBlendMode.additive;
-    };
-    /**
-   * 是否需要混合
-   * @returns
-   */ _proto.requireBlend = function requireBlend() {
-        return this.blendMode === PBlendMode.translucent || this.blendMode === PBlendMode.additive;
+   */ _proto.isBlend = function isBlend() {
+        return this.renderType === "Blend";
     };
     /**
    * 是否正面模式
    * @returns
-   */ _proto.isFrontFace = function isFrontFace() {
-        return this.faceSideMode === PFaceSideMode.front;
+   */ _proto.isFrontSide = function isFrontSide() {
+        return this.cullMode === "Front";
     };
     /**
    * 是否背面模式
    * @returns
-   */ _proto.isBackFace = function isBackFace() {
-        return this.faceSideMode === PFaceSideMode.back;
+   */ _proto.isBackSide = function isBackSide() {
+        return this.cullMode === "Back";
     };
     /**
    * 是否双面模式
    * @returns
-   */ _proto.isBothFace = function isBothFace() {
-        return this.faceSideMode === PFaceSideMode.both;
+   */ _proto.isDoubleSide = function isDoubleSide() {
+        return this.cullMode === "Double";
     };
     return PMaterialBase;
 }(PObject);
@@ -7980,50 +7931,37 @@ var toHalf = function() {
  */ var PMaterialUnlit = /*#__PURE__*/ function(PMaterialBase) {
     _inherits(PMaterialUnlit, PMaterialBase);
     function PMaterialUnlit() {
-        return PMaterialBase.apply(this, arguments);
+        var _this;
+        _this = PMaterialBase.apply(this, arguments) || this;
+        /**
+   * 基础颜色值，默认是白色 Color(1, 1, 1, 1)
+   */ _this.baseColorFactor = new Color(1, 1, 1, 1);
+        return _this;
     }
     var _proto = PMaterialUnlit.prototype;
     /**
    * 创建无光照材质，支持基础颜色纹理
-   * @param options - 无光照材质参数
-   */ _proto.create = function create(options) {
-        this.name = options.name;
+   * @param material - effect 材质对象
+   */ _proto.create = function create(material) {
+        this.effectMaterial = material;
+        this.name = material.name;
         this.type = PObjectType.material;
         this.materialType = PMaterialType.unlit;
+        var _material_getTexture;
         //
-        if (options.baseColorTexture) {
-            this.baseColorTexture = options.baseColorTexture;
-        }
-        /**
-     * 默认需要写入深度值，只有传入false才是false
-     */ if (options.depthMask === false) {
-            this.depthMask = false;
-        } else {
-            this.depthMask = true;
-        }
-        this.blendMode = this.getBlendMode(options.blending);
-        var _options_alphaCutOff;
-        this.alphaCutOff = (_options_alphaCutOff = options.alphaCutOff) != null ? _options_alphaCutOff : 0;
-        this.faceSideMode = this.getFaceSideMode(options.side);
-    };
-    _proto.createFromMaterial = function createFromMaterial(mat) {
-        this.fromMaterial = true;
-        this.material = mat;
-        this.name = mat.name;
-        this.type = PObjectType.material;
-        this.materialType = PMaterialType.unlit;
-        var _mat_getTexture;
+        this.baseColorTexture = (_material_getTexture = material.getTexture("_BaseColorSampler")) != null ? _material_getTexture : undefined;
+        this.baseColorTextureTrans = PluginHelper.createUVTransform(material, "_BaseColorSampler_ST", "_BaseColorRotation");
+        var _material_getColor;
+        this.baseColorFactor = (_material_getColor = material.getColor("_BaseColorFactor")) != null ? _material_getColor : new Color(1.0, 1.0, 1.0, 1.0);
         //
-        this.baseColorTexture = (_mat_getTexture = mat.getTexture("_BaseColorSampler")) != null ? _mat_getTexture : undefined;
-        this.depthMask = true;
-        var _mat_getInt;
-        var blending = (_mat_getInt = mat.getInt("blending")) != null ? _mat_getInt : spec.MaterialBlending.opaque;
-        this.blendMode = this.getBlendMode(blending);
-        var _mat_getFloat;
-        this.alphaCutOff = (_mat_getFloat = mat.getFloat("_AlphaCutoff")) != null ? _mat_getFloat : 0;
-        var _mat_getInt1;
-        var side = (_mat_getInt1 = mat.getInt("side")) != null ? _mat_getInt1 : spec.SideMode.FRONT;
-        this.faceSideMode = this.getFaceSideMode(side);
+        this.ZWrite = material.stringTags["ZWrite"] !== "false";
+        this.ZTest = material.stringTags["ZTest"] !== "false";
+        var _material_stringTags_RenderType;
+        this.renderType = (_material_stringTags_RenderType = material.stringTags["RenderType"]) != null ? _material_stringTags_RenderType : "Opaque";
+        var _material_getFloat;
+        this.alphaCutOff = (_material_getFloat = material.getFloat("_AlphaCutoff")) != null ? _material_getFloat : 0;
+        var _material_stringTags_Cull;
+        this.cullMode = (_material_stringTags_Cull = material.stringTags["Cull"]) != null ? _material_stringTags_Cull : "Front";
     };
     /**
    * 销毁材质
@@ -8063,11 +8001,9 @@ var toHalf = function() {
    * @param material - GE 材质
    */ _proto.updateUniforms = function updateUniforms(material) {
         PMaterialBase.prototype.updateUniforms.call(this, material);
-        //
-        var uvTransform = new Matrix3().identity();
-        if (this.hasBaseColorTexture()) {
+        if (this.baseColorTexture !== undefined) {
             material.setInt("_BaseColorUVSet", 0);
-            material.setMatrix3("_BaseColorUVTransform", uvTransform);
+            material.setMatrix3("_BaseColorUVTransform", this.baseColorTextureTrans);
         }
         material.setFloat("_MetallicFactor", 0);
         material.setFloat("_RoughnessFactor", 0);
@@ -8091,6 +8027,27 @@ var toHalf = function() {
    */ _proto.setBaseColorTexture = function setBaseColorTexture(val) {
         this.baseColorTexture = val;
     };
+    /**
+   * 获取基础颜色纹理
+   * @returns
+   */ _proto.getBaseColorFactor = function getBaseColorFactor() {
+        return this.baseColorFactor;
+    };
+    /**
+   * 设置基础颜色值
+   * @param val - 颜色值
+   */ _proto.setBaseColorFactor = function setBaseColorFactor(val) {
+        if (_instanceof1(val, Color)) {
+            // for Color
+            this.baseColorFactor.set(val.r, val.g, val.b, val.a);
+        } else if (_instanceof1(val, Vector4)) {
+            // for Vector4
+            this.baseColorFactor.set(val.x, val.y, val.z, val.w);
+        } else {
+            // for vec4
+            this.baseColorFactor.set(val[0], val[1], val[2], val[3]);
+        }
+    };
     return PMaterialUnlit;
 }(PMaterialBase);
 /**
@@ -8102,8 +8059,8 @@ var toHalf = function() {
         var _this;
         _this = PMaterialBase.apply(this, arguments) || this;
         /**
-   * 基础颜色值，默认是白色 Vector4(1, 1, 1, 1)
-   */ _this.baseColorFactor = new Vector4(1, 1, 1, 1);
+   * 基础颜色值，默认是白色 Color(1, 1, 1, 1)
+   */ _this.baseColorFactor = new Color(1, 1, 1, 1);
         /**
    * 是否高光抗锯齿，能够明显提升高光表现效果
    */ _this.useSpecularAA = false;
@@ -8121,121 +8078,65 @@ var toHalf = function() {
    */ _this.occlusionTextureStrength = 1;
         /**
    * 自发光颜色值，默认是黑色 Vector4(0, 0, 0, 0)
-   */ _this.emissiveFactor = new Vector4(0, 0, 0, 0);
+   */ _this.emissiveFactor = new Color(0, 0, 0, 0);
         /**
    * 自发光强度
    */ _this.emissiveIntensity = 1;
-        //
-        _this.enableShadow = false;
         return _this;
     }
     var _proto = PMaterialPBR.prototype;
     /**
    * 创建材质
-   * @param options - PBR 材质参数
-   */ _proto.create = function create(options) {
-        this.name = options.name;
+   * @param material - effect 材质对象
+   */ _proto.create = function create(material) {
+        this.effectMaterial = material;
+        this.name = material.name;
         this.type = PObjectType.material;
         this.materialType = PMaterialType.pbr;
+        var _material_getTexture;
         //
-        if (options.baseColorTexture) {
-            this.baseColorTexture = options.baseColorTexture;
-        }
-        if (options.baseColorTextureTransform) {
-            this.baseColorTextureTrans = PluginHelper.createUVTransform(options.baseColorTextureTransform);
-        }
-        this.setBaseColorFactor(PluginHelper.toPluginColor4(options.baseColorFactor));
-        if (options.metallicRoughnessTexture) {
-            this.metallicRoughnessTexture = options.metallicRoughnessTexture;
-        }
-        if (options.metallicRoughnessTextureTransform) {
-            this.metallicRoughnessTextureTrans = PluginHelper.createUVTransform(options.metallicRoughnessTextureTransform);
-        }
-        var _options_useSpecularAA;
-        this.useSpecularAA = (_options_useSpecularAA = options.useSpecularAA) != null ? _options_useSpecularAA : false;
-        this.metallicFactor = options.metallicFactor;
-        this.roughnessFactor = PluginHelper.clamp(options.roughnessFactor, 0, 1);
-        if (options.normalTexture) {
-            this.normalTexture = options.normalTexture;
-        }
-        if (options.normalTextureTransform) {
-            this.normalTextureTrans = PluginHelper.createUVTransform(options.normalTextureTransform);
-        }
-        var _options_normalTextureScale;
-        this.normalTextureScale = (_options_normalTextureScale = options.normalTextureScale) != null ? _options_normalTextureScale : 1.0;
-        if (options.occlusionTexture) {
-            this.occlusionTexture = options.occlusionTexture;
-        }
-        if (options.occlusionTextureTransform) {
-            this.occlusionTextureTrans = PluginHelper.createUVTransform(options.occlusionTextureTransform);
-        }
-        var _options_occlusionTextureStrength;
-        this.occlusionTextureStrength = (_options_occlusionTextureStrength = options.occlusionTextureStrength) != null ? _options_occlusionTextureStrength : 1.0;
-        if (options.emissiveTexture) {
-            this.emissiveTexture = options.emissiveTexture;
-        }
-        if (options.emissiveTextureTransform) {
-            this.emissiveTextureTrans = PluginHelper.createUVTransform(options.emissiveTextureTransform);
-        }
-        var emissiveFactor = PluginHelper.toPluginColor4(options.emissiveFactor);
-        this.setEmissiveFactor(Vector3.fromArray(emissiveFactor));
-        this.emissiveIntensity = options.emissiveIntensity;
-        var _options_enableShadow;
-        this.enableShadow = (_options_enableShadow = options.enableShadow) != null ? _options_enableShadow : false;
-        /**
-     * 默认需要写入深度值，只有传入false才是false
-     */ if (options.depthMask === false) {
-            this.depthMask = false;
-        } else {
-            this.depthMask = true;
-        }
-        this.blendMode = this.getBlendMode(options.blending);
-        this.faceSideMode = this.getFaceSideMode(options.side);
-    };
-    _proto.createFromMaterial = function createFromMaterial(mat) {
-        this.fromMaterial = true;
-        this.material = mat;
-        this.name = mat.name;
-        this.type = PObjectType.material;
-        this.materialType = PMaterialType.pbr;
-        var _mat_getTexture;
+        this.baseColorTexture = (_material_getTexture = material.getTexture("_BaseColorSampler")) != null ? _material_getTexture : undefined;
+        this.baseColorTextureTrans = PluginHelper.createUVTransform(material, "_BaseColorSampler_ST", "_BaseColorRotation");
+        var _material_getColor;
+        this.baseColorFactor = (_material_getColor = material.getColor("_BaseColorFactor")) != null ? _material_getColor : new Color(1.0, 1.0, 1.0, 1.0);
+        var _material_getTexture1;
+        //
+        this.metallicRoughnessTexture = (_material_getTexture1 = material.getTexture("_MetallicRoughnessSampler")) != null ? _material_getTexture1 : undefined;
+        this.metallicRoughnessTextureTrans = PluginHelper.createUVTransform(material, "_MetallicRoughnessSampler_ST", "_MetallicRoughnessRotation");
+        this.useSpecularAA = material.getFloat("_SpecularAA") === 1;
+        var _material_getFloat;
+        this.metallicFactor = (_material_getFloat = material.getFloat("_MetallicFactor")) != null ? _material_getFloat : 1;
+        var _material_getFloat1;
+        this.roughnessFactor = (_material_getFloat1 = material.getFloat("_RoughnessFactor")) != null ? _material_getFloat1 : 0;
+        var _material_getTexture2;
+        //
+        this.normalTexture = (_material_getTexture2 = material.getTexture("_NormalSampler")) != null ? _material_getTexture2 : undefined;
+        this.normalTextureTrans = PluginHelper.createUVTransform(material, "_NormalSampler_ST", "_NormalRotation");
+        var _material_getFloat2;
+        this.normalTextureScale = (_material_getFloat2 = material.getFloat("_NormalScale")) != null ? _material_getFloat2 : 1;
+        var _material_getTexture3;
         //
-        this.baseColorTexture = (_mat_getTexture = mat.getTexture("_BaseColorSampler")) != null ? _mat_getTexture : undefined;
-        var _mat_getVector4;
-        this.baseColorFactor = (_mat_getVector4 = mat.getVector4("_BaseColorFactor")) != null ? _mat_getVector4 : new Vector4(1.0, 1.0, 1.0, 1.0);
-        var _mat_getTexture1;
-        this.metallicRoughnessTexture = (_mat_getTexture1 = mat.getTexture("_MetallicRoughnessSampler")) != null ? _mat_getTexture1 : undefined;
-        this.useSpecularAA = mat.getFloat("_useSpecularAA") === 1;
-        var _mat_getFloat;
-        this.metallicFactor = (_mat_getFloat = mat.getFloat("_MetallicFactor")) != null ? _mat_getFloat : 1;
-        var _mat_getFloat1;
-        this.roughnessFactor = (_mat_getFloat1 = mat.getFloat("_RoughnessFactor")) != null ? _mat_getFloat1 : 1;
-        var _mat_getTexture2;
-        this.normalTexture = (_mat_getTexture2 = mat.getTexture("_NormalSampler")) != null ? _mat_getTexture2 : undefined;
-        var _mat_getFloat2;
-        this.normalTextureScale = (_mat_getFloat2 = mat.getFloat("_NormalScale")) != null ? _mat_getFloat2 : 1;
-        var _mat_getTexture3;
-        this.occlusionTexture = (_mat_getTexture3 = mat.getTexture("_OcclusionSampler")) != null ? _mat_getTexture3 : undefined;
-        var _mat_getFloat3;
-        this.occlusionTextureStrength = (_mat_getFloat3 = mat.getFloat("_OcclusionTextureStrength")) != null ? _mat_getFloat3 : 1;
-        var _mat_getTexture4;
-        this.emissiveTexture = (_mat_getTexture4 = mat.getTexture("_EmissiveSampler")) != null ? _mat_getTexture4 : undefined;
-        var _mat_getVector41;
-        this.emissiveFactor = (_mat_getVector41 = mat.getVector4("_EmissiveFactor")) != null ? _mat_getVector41 : new Vector4(0, 0, 0, 0);
-        var _mat_getFloat4;
-        this.emissiveIntensity = (_mat_getFloat4 = mat.getFloat("_EmissiveIntensity")) != null ? _mat_getFloat4 : 1;
-        var emissiveFactor = this.emissiveFactor.clone().multiply(this.emissiveIntensity);
-        mat.setVector4("_EmissiveFactor", emissiveFactor);
-        this.enableShadow = false;
-        this.depthMask = true;
-        var _mat_getInt;
-        var blending = (_mat_getInt = mat.getInt("blending")) != null ? _mat_getInt : spec.MaterialBlending.opaque;
-        this.blendMode = this.getBlendMode(blending);
-        var _mat_getFloat5;
-        this.alphaCutOff = (_mat_getFloat5 = mat.getFloat("_AlphaCutoff")) != null ? _mat_getFloat5 : 0;
-        var _mat_getInt1;
-        var side = (_mat_getInt1 = mat.getInt("side")) != null ? _mat_getInt1 : spec.SideMode.FRONT;
-        this.faceSideMode = this.getFaceSideMode(side);
+        this.occlusionTexture = (_material_getTexture3 = material.getTexture("_OcclusionSampler")) != null ? _material_getTexture3 : undefined;
+        this.occlusionTextureTrans = PluginHelper.createUVTransform(material, "_OcclusionSampler_ST", "_OcclusionRotation");
+        var _material_getFloat3;
+        this.occlusionTextureStrength = (_material_getFloat3 = material.getFloat("_OcclusionStrength")) != null ? _material_getFloat3 : 1;
+        var _material_getTexture4;
+        //
+        this.emissiveTexture = (_material_getTexture4 = material.getTexture("_EmissiveSampler")) != null ? _material_getTexture4 : undefined;
+        this.emissiveTextureTrans = PluginHelper.createUVTransform(material, "_EmissiveSampler_ST", "_EmissiveRotation");
+        var _material_getColor1;
+        this.emissiveFactor = (_material_getColor1 = material.getColor("_EmissiveFactor")) != null ? _material_getColor1 : new Color(0, 0, 0, 1);
+        var _material_getFloat4;
+        this.emissiveIntensity = (_material_getFloat4 = material.getFloat("_EmissiveIntensity")) != null ? _material_getFloat4 : 1;
+        //
+        this.ZWrite = material.stringTags["ZWrite"] !== "false";
+        this.ZTest = material.stringTags["ZTest"] !== "false";
+        var _material_stringTags_RenderType;
+        this.renderType = (_material_stringTags_RenderType = material.stringTags["RenderType"]) != null ? _material_stringTags_RenderType : "Opaque";
+        var _material_getFloat5;
+        this.alphaCutOff = (_material_getFloat5 = material.getFloat("_AlphaCutoff")) != null ? _material_getFloat5 : 0;
+        var _material_stringTags_Cull;
+        this.cullMode = (_material_stringTags_Cull = material.stringTags["Cull"]) != null ? _material_stringTags_Cull : "Front";
     };
     /**
    * 销毁材质
@@ -8285,7 +8186,7 @@ var toHalf = function() {
             if (this.emissiveTextureTrans !== undefined) {
                 featureList.push("HAS_EMISSIVE_UV_TRANSFORM 1");
             }
-        } else if (this.hasEmissiveFactor()) {
+        } else if (this.hasEmissiveValue()) {
             featureList.push("HAS_EMISSIVE 1");
         }
         return featureList;
@@ -8349,7 +8250,7 @@ var toHalf = function() {
                     name: "HAS_EMISSIVE_UV_TRANSFORM"
                 });
             }
-        } else if (this.hasEmissiveFactor()) {
+        } else if (this.hasEmissiveValue()) {
             macroList.push({
                 name: "HAS_EMISSIVE"
             });
@@ -8361,100 +8262,29 @@ var toHalf = function() {
    * @param material - GE 材质
    */ _proto.updateUniforms = function updateUniforms(material) {
         PMaterialBase.prototype.updateUniforms.call(this, material);
-        if (this.fromMaterial) {
-            var uvTransform = new Matrix3().identity();
-            if (this.baseColorTexture !== undefined) {
-                material.setInt("_BaseColorUVSet", 0);
-                material.setMatrix3("_BaseColorUVTransform", uvTransform);
-            }
-            //
-            if (this.metallicRoughnessTexture !== undefined) {
-                material.setInt("_MetallicRoughnessUVSet", 0);
-                material.setMatrix3("_MetallicRoughnessUVTransform", uvTransform);
-            }
-            //
-            if (this.normalTexture !== undefined) {
-                material.setInt("_NormalUVSet", 0);
-                material.setMatrix3("_NormalUVTransform", uvTransform);
-            }
-            //
-            if (this.occlusionTexture !== undefined) {
-                material.setInt("_OcclusionUVSet", 0);
-                material.setMatrix3("_OcclusionUVTransform", uvTransform);
-            }
-            //
-            if (this.emissiveTexture !== undefined) {
-                material.setInt("_EmissiveUVSet", 0);
-                material.setMatrix3("_EmissiveUVTransform", uvTransform);
-            }
-            material.setFloat("_Exposure", 3.0);
-            return;
-        }
-        //
-        var uvTransform1 = new Matrix3().identity();
-        material.setVector4("_BaseColorFactor", this.baseColorFactor);
         if (this.baseColorTexture !== undefined) {
-            material.setTexture("_BaseColorSampler", this.baseColorTexture);
             material.setInt("_BaseColorUVSet", 0);
-            if (this.baseColorTextureTrans !== undefined) {
-                material.setMatrix3("_BaseColorUVTransform", this.baseColorTextureTrans);
-            } else {
-                // fill other data
-                material.setMatrix3("_BaseColorUVTransform", uvTransform1);
-            }
+            material.setMatrix3("_BaseColorUVTransform", this.baseColorTextureTrans);
         }
         //
-        material.setFloat("_MetallicFactor", this.metallicFactor);
-        material.setFloat("_RoughnessFactor", this.roughnessFactor);
         if (this.metallicRoughnessTexture !== undefined) {
-            material.setTexture("_MetallicRoughnessSampler", this.metallicRoughnessTexture);
             material.setInt("_MetallicRoughnessUVSet", 0);
-            if (this.metallicRoughnessTextureTrans !== undefined) {
-                material.setMatrix3("_MetallicRoughnessUVTransform", this.metallicRoughnessTextureTrans);
-            } else {
-                // fill other data
-                material.setMatrix3("_MetallicRoughnessUVTransform", uvTransform1);
-            }
+            material.setMatrix3("_MetallicRoughnessUVTransform", this.metallicRoughnessTextureTrans);
         }
         //
         if (this.normalTexture !== undefined) {
-            material.setTexture("_NormalSampler", this.normalTexture);
-            material.setFloat("_NormalScale", this.normalTextureScale);
             material.setInt("_NormalUVSet", 0);
-            if (this.normalTextureTrans !== undefined) {
-                material.setMatrix3("_NormalUVTransform", this.normalTextureTrans);
-            } else {
-                // fill other data
-                material.setMatrix3("_NormalUVTransform", uvTransform1);
-            }
+            material.setMatrix3("_NormalUVTransform", this.normalTextureTrans);
         }
         //
         if (this.occlusionTexture !== undefined) {
-            material.setTexture("_OcclusionSampler", this.occlusionTexture);
-            material.setFloat("_OcclusionStrength", this.occlusionTextureStrength);
             material.setInt("_OcclusionUVSet", 0);
-            if (this.occlusionTextureTrans !== undefined) {
-                material.setMatrix3("_OcclusionUVTransform", this.occlusionTextureTrans);
-            } else {
-                // fill other data
-                material.setMatrix3("_OcclusionUVTransform", uvTransform1);
-            }
+            material.setMatrix3("_OcclusionUVTransform", this.occlusionTextureTrans);
         }
         //
         if (this.emissiveTexture !== undefined) {
-            var emissiveFactor = this.getEmissiveFactor();
-            material.setTexture("_EmissiveSampler", this.emissiveTexture);
-            material.setVector4("_EmissiveFactor", emissiveFactor);
             material.setInt("_EmissiveUVSet", 0);
-            if (this.emissiveTextureTrans !== undefined) {
-                material.setMatrix3("_EmissiveUVTransform", this.emissiveTextureTrans);
-            } else {
-                // fill other data
-                material.setMatrix3("_EmissiveUVTransform", uvTransform1);
-            }
-        } else if (this.hasEmissiveFactor()) {
-            var emissiveFactor1 = this.getEmissiveFactor();
-            material.setVector4("_EmissiveFactor", emissiveFactor1);
+            material.setMatrix3("_EmissiveUVTransform", this.emissiveTextureTrans);
         }
         material.setFloat("_Exposure", 3.0);
     };
@@ -8465,12 +8295,6 @@ var toHalf = function() {
         return this.baseColorTexture !== undefined;
     };
     /**
-   * 是否有基础颜色纹理变换
-   * @returns
-   */ _proto.hasBaseColorTextureTrans = function hasBaseColorTextureTrans() {
-        return this.baseColorTextureTrans !== undefined;
-    };
-    /**
    * 设置基础颜色纹理
    * @param val - 纹理
    */ _proto.setBaseColorTexture = function setBaseColorTexture(val) {
@@ -8486,7 +8310,10 @@ var toHalf = function() {
    * 设置基础颜色值
    * @param val - 颜色值
    */ _proto.setBaseColorFactor = function setBaseColorFactor(val) {
-        if (_instanceof1(val, Vector4)) {
+        if (_instanceof1(val, Color)) {
+            // for Vector4
+            this.baseColorFactor.set(val.r, val.g, val.b, val.a);
+        } else if (_instanceof1(val, Vector4)) {
             // for Vector4
             this.baseColorFactor.set(val.x, val.y, val.z, val.w);
         } else {
@@ -8501,12 +8328,6 @@ var toHalf = function() {
         return this.metallicRoughnessTexture !== undefined;
     };
     /**
-   * 是否有金属度粗超度纹理坐标变换
-   * @returns
-   */ _proto.hasMetallicRoughnessTextureTrans = function hasMetallicRoughnessTextureTrans() {
-        return this.metallicRoughnessTextureTrans !== undefined;
-    };
-    /**
    * 获取金属度粗超度纹理
    * @returns
    */ _proto.getMetallicRoughnessTexture = function getMetallicRoughnessTexture() {
@@ -8525,12 +8346,6 @@ var toHalf = function() {
         return this.normalTexture !== undefined;
     };
     /**
-   * 是否有法线纹理坐标变换
-   * @returns
-   */ _proto.hasNormalTextureTrans = function hasNormalTextureTrans() {
-        return this.normalTextureTrans !== undefined;
-    };
-    /**
    * 获取法线纹理
    * @returns
    */ _proto.getNormalTexture = function getNormalTexture() {
@@ -8549,12 +8364,6 @@ var toHalf = function() {
         return this.occlusionTexture !== undefined;
     };
     /**
-   * 是否有遮挡纹理坐标变换
-   * @returns
-   */ _proto.hasOcclusionTextureTrans = function hasOcclusionTextureTrans() {
-        return this.occlusionTextureTrans !== undefined;
-    };
-    /**
    * 获取遮挡纹理
    * @returns
    */ _proto.getOcclusionTexture = function getOcclusionTexture() {
@@ -8573,12 +8382,6 @@ var toHalf = function() {
         return this.emissiveTexture !== undefined;
     };
     /**
-   * 是否有自发光纹理坐标变换
-   * @returns
-   */ _proto.hasEmissiveTextureTrans = function hasEmissiveTextureTrans() {
-        return this.emissiveTextureTrans !== undefined;
-    };
-    /**
    * 获取自发光纹理
    * @returns
    */ _proto.getEmissiveTexture = function getEmissiveTexture() {
@@ -8591,22 +8394,25 @@ var toHalf = function() {
         this.emissiveTexture = val;
     };
     /**
-   * 是否有自发光颜色，包含强度
+   * 是否有自发光值，包含强度
    * @returns
-   */ _proto.hasEmissiveFactor = function hasEmissiveFactor() {
-        return this.emissiveFactor.sum() * this.emissiveIntensity > 0;
+   */ _proto.hasEmissiveValue = function hasEmissiveValue() {
+        return this.emissiveFactor.luminance() * this.emissiveIntensity > 0;
     };
     /**
-   * 获取自发光颜色，包含强度
+   * 获取自发光颜色
    * @returns
    */ _proto.getEmissiveFactor = function getEmissiveFactor() {
-        return this.emissiveFactor.clone().multiply(this.emissiveIntensity);
+        return this.emissiveFactor;
     };
     /**
    * 设置自发光颜色
    * @param val - 颜色
    */ _proto.setEmissiveFactor = function setEmissiveFactor(val) {
-        if (_instanceof1(val, Vector3)) {
+        if (_instanceof1(val, Color)) {
+            // Color
+            this.emissiveFactor.set(val.r, val.g, val.b, val.a);
+        } else if (_instanceof1(val, Vector3)) {
             // Vector3
             this.emissiveFactor.set(val.x, val.y, val.z, 0);
         } else {
@@ -8614,44 +8420,35 @@ var toHalf = function() {
             this.emissiveFactor.set(val[0], val[1], val[2], 0);
         }
     };
-    _proto.getTextureFromMaterial = function getTextureFromMaterial(mat, texName) {
-        var tex = mat.getTexture(texName);
-        if (tex !== null) {
-            return tex;
-        }
+    /**
+   * 获取自发光强度
+   * @returns
+   */ _proto.getEmissiveIntensity = function getEmissiveIntensity() {
+        return this.emissiveIntensity;
+    };
+    /**
+   * 设置自发光强度
+   * @param val - 强度
+   */ _proto.setEmissiveIntensity = function setEmissiveIntensity(val) {
+        this.emissiveIntensity = val;
     };
     return PMaterialPBR;
 }(PMaterialBase);
 /**
  * 创建插件材质对象
- * @param options - 材质参数
+ * @param material - Effects 材质对象
  * @returns 材质对象
- */ function createPluginMaterial(options) {
-    if (_instanceof1(options, Material)) {
-        if (options.shader.getInstanceId() === PBRShaderGUID) {
-            var materialPBR = new PMaterialPBR();
-            materialPBR.createFromMaterial(options);
-            return materialPBR;
-        } else {
-            var materialUnlit = new PMaterialUnlit();
-            materialUnlit.createFromMaterial(options);
-            return materialUnlit;
-        }
+ */ function createPluginMaterial(material) {
+    if (material.shader.getInstanceId() === PBRShaderGUID) {
+        var materialPBR = new PMaterialPBR();
+        materialPBR.create(material);
+        return materialPBR;
     } else {
-        if (options.type === spec.MaterialType.pbr) {
-            var materialPBR1 = new PMaterialPBR();
-            materialPBR1.create(options);
-            return materialPBR1;
-        } else {
-            var materialUnlit1 = new PMaterialUnlit();
-            materialUnlit1.create(options);
-            return materialUnlit1;
-        }
+        var materialUnlit = new PMaterialUnlit();
+        materialUnlit.create(material);
+        return materialUnlit;
     }
 }
-function createInternalMaterial(options) {
-    return {};
-}
 
 /**
  * 天空盒类，支持天空盒的渲染和 IBL 光照效果
@@ -8742,8 +8539,6 @@ function createInternalMaterial(options) {
         this.updateMaterial(scene);
         if (this.visible && this.renderable && this.skyboxMesh !== undefined) {
             var mesh = this.skyboxMesh;
-            mesh.geometry.flush();
-            mesh.material.initialize();
             renderer.drawGeometry(mesh.geometry, mesh.material);
         }
     };
@@ -8851,7 +8646,7 @@ function createInternalMaterial(options) {
    */ _proto.create = function create(skybox) {
         this.type = PObjectType.material;
         this.materialType = PMaterialType.skyboxFilter;
-        this.depthTestHint = false;
+        this.ZTest = false;
         //
         this.name = skybox.name;
         this.intensity = skybox.intensity;
@@ -9134,7 +8929,8 @@ var PSkyboxType;
             return __generator(this, function(_state) {
                 if (params.diffuseImage === undefined) {
                     return [
-                        2
+                        2,
+                        null
                     ];
                 }
                 if (params.type === "url") {
@@ -12005,8 +11801,8 @@ var GLTFHelper = /*#__PURE__*/ function() {
 
 registerPlugin("tree", ModelTreePlugin, VFXItem, true);
 registerPlugin("model", ModelPlugin, VFXItem);
-var version = "2.0.0-alpha.8";
+var version = "2.0.0-alpha.9";
 logger.info("plugin model version: " + version);
 
-export { BoxMesh, CameraGestureHandlerImp, CameraGestureType, CheckerHelper, CompositionCache, CompositionHitTest, FBOOptions, Float16ArrayWrapper, GeometryBoxProxy, HitTestingProxy, HookOGLFunc, InterpolationSampler, LoaderHelper, LoaderImpl, MeshHelper, ModelCameraComponent, ModelLightComponent, ModelMeshComponent, ModelPlugin, ModelPluginComponent, ModelSkyboxComponent, ModelTreeComponent, ModelTreeItem, ModelTreePlugin, PAnimInterpType, PAnimPathType, PAnimTexture, PAnimTrack, PAnimation, PAnimationManager, PBRShaderGUID, PBlendMode, PCamera, PCameraManager, PCoordinate, PEntity, PFaceSideMode, PGeometry, PGlobalState, PLight, PLightManager, PLightType, PMaterialBase, PMaterialPBR, PMaterialSkyboxFilter, PMaterialType, PMaterialUnlit, PMesh, PMorph, PObject, PObjectType, PPrimitive, PSceneManager, PShaderManager, PShadowType, PSkin, PSkybox, PSkyboxCreator, PSkyboxType, PTextureType, PTransform, PluginHelper, RayBoxTesting, RayIntersectsBoxWithRotation, RayTriangleTesting, TextureDataMode, ToggleItemBounding, TwoStatesSet, UnlitShaderGUID, VFX_ITEM_TYPE_3D, VertexAttribBuffer, WebGLHelper, WebHelper, createAnimationSampler, createInternalMaterial, createPluginMaterial, fetchPBRShaderCode, fetchUnlitShaderCode, getDefaultEffectsGLTFLoader, getDiffuseOnlyShaderCode, getGaussianBlurShaderCodeV1, getGaussianBlurShaderCodeV2, getKawaseBlurShaderCode, getNormalVisShaderCode, getPBRPassShaderCode, getPMeshList, getQuadFilterShaderCode, getRendererGPUInfo, getSceneManager, getShadowPassShaderCode, getSimpleFilterShaderCode, getSkyBoxShaderCode, getTransparecyBaseShader, getTransparecyFilterShader, setDefaultEffectsGLTFLoader, version };
+export { BoxMesh, CameraGestureHandlerImp, CameraGestureType, CheckerHelper, CompositionCache, CompositionHitTest, CullMode, FBOOptions, Float16ArrayWrapper, GeometryBoxProxy, HitTestingProxy, HookOGLFunc, InterpolationSampler, LoaderHelper, LoaderImpl, MeshHelper, ModelCameraComponent, ModelLightComponent, ModelMeshComponent, ModelPlugin, ModelPluginComponent, ModelSkyboxComponent, ModelTreeComponent, ModelTreeItem, ModelTreePlugin, PAnimInterpType, PAnimPathType, PAnimTexture, PAnimTrack, PAnimation, PAnimationManager, PBRShaderGUID, PBlendMode, PCamera, PCameraManager, PCoordinate, PEntity, PFaceSideMode, PGeometry, PGlobalState, PLight, PLightManager, PLightType, PMaterialBase, PMaterialPBR, PMaterialSkyboxFilter, PMaterialType, PMaterialUnlit, PMesh, PMorph, PObject, PObjectType, PPrimitive, PSceneManager, PShaderManager, PShadowType, PSkin, PSkybox, PSkyboxCreator, PSkyboxType, PTextureType, PTransform, PluginHelper, RayBoxTesting, RayIntersectsBoxWithRotation, RayTriangleTesting, RenderType, TextureDataMode, ToggleItemBounding, TwoStatesSet, UnlitShaderGUID, VFX_ITEM_TYPE_3D, VertexAttribBuffer, WebGLHelper, WebHelper, createAnimationSampler, createPluginMaterial, fetchPBRShaderCode, fetchUnlitShaderCode, getDefaultEffectsGLTFLoader, getDiffuseOnlyShaderCode, getGaussianBlurShaderCodeV1, getGaussianBlurShaderCodeV2, getKawaseBlurShaderCode, getNormalVisShaderCode, getPBRPassShaderCode, getPMeshList, getQuadFilterShaderCode, getRendererGPUInfo, getSceneManager, getShadowPassShaderCode, getSimpleFilterShaderCode, getSkyBoxShaderCode, getTransparecyBaseShader, getTransparecyFilterShader, setDefaultEffectsGLTFLoader, version };
 //# sourceMappingURL=index.mjs.map