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

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player model plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 飂兮
- * Version: v2.0.0-alpha.7
+ * Version: v2.0.0-alpha.8
  */
 
 'use strict';
@@ -268,6 +268,8 @@ exports.PShadowType = void 0;
     PShadowType[PShadowType["variance"] = 2] = "variance";
     PShadowType[PShadowType["expVariance"] = 3] = "expVariance";
 })(exports.PShadowType || (exports.PShadowType = {}));
+var PBRShaderGUID = "pbr00000000000000000000000000000";
+var UnlitShaderGUID = "unlit000000000000000000000000000";
 /**
  * 插件变换类
  */ var PTransform = /*#__PURE__*/ function() {
@@ -2085,11 +2087,11 @@ var deg2rad = Math.PI / 180;
         var color = data.color;
         _this.color = new Vector3(color.r, color.g, color.b);
         _this.intensity = data.intensity;
-        if (data.lightType === "point") {
+        if (data.lightType === effects.spec.LightType.point) {
             _this.lightType = exports.PLightType.point;
             var _data_range;
             _this.range = (_data_range = data.range) != null ? _data_range : -1;
-        } else if (data.lightType === "spot") {
+        } else if (data.lightType === effects.spec.LightType.spot) {
             _this.lightType = exports.PLightType.spot;
             var _data_range1;
             _this.range = (_data_range1 = data.range) != null ? _data_range1 : -1;
@@ -2097,7 +2099,7 @@ var deg2rad = Math.PI / 180;
             _this.outerConeAngle = (_data_outerConeAngle = data.outerConeAngle) != null ? _data_outerConeAngle : Math.PI;
             var _data_innerConeAngle;
             _this.innerConeAngle = (_data_innerConeAngle = data.innerConeAngle) != null ? _data_innerConeAngle : 0;
-        } else if (data.lightType === "directional") {
+        } else if (data.lightType === effects.spec.LightType.directional) {
             _this.lightType = exports.PLightType.directional;
         } else {
             _this.lightType = exports.PLightType.ambient;
@@ -2801,8 +2803,8 @@ function _assert_this_initialized(self) {
    * @param skybox - 天空盒
    */ _proto.build = function build(lightCount, uniformSemantics, skybox) {
         var globalState = PGlobalState.getInstance();
-        var featureList = this.getFeatureList(lightCount, true, skybox);
-        this.material.build(featureList);
+        var primitiveMacroList = this.getMacroList(lightCount, true, skybox);
+        var materialMacroList = this.material.getMacroList(primitiveMacroList);
         var newSemantics = uniformSemantics != null ? uniformSemantics : {};
         newSemantics["_ViewProjectionMatrix"] = "VIEWPROJECTION";
         //newSemantics["uView"] = 'VIEWINVERSE';
@@ -2814,19 +2816,10 @@ function _assert_this_initialized(self) {
             material = this.material.material;
             // @ts-expect-error
             material.uniformSemantics = newSemantics;
-            var shader = new effects.Shader(this.engine);
-            shader.fromData({
-                // FIXME: check shader id
-                //id: 'pbr00000000000000000000000000000',
-                id: effects.generateGUID(),
-                dataType: "Shader",
-                vertex: this.material.vertexShaderCode,
-                fragment: this.material.fragmentShaderCode,
-                // @ts-expect-error
-                glslVersion: isWebGL2 ? effects.GLSLVersion.GLSL3 : effects.GLSLVersion.GLSL1
+            materialMacroList.forEach(function(macro) {
+                var name = macro.name, value = macro.value;
+                material.enableMacro(name, value);
             });
-            // @ts-expect-error
-            material.shader = shader;
             this.material.setMaterialStates(material);
         } else {
             material = effects.Material.create(this.engine, {
@@ -2892,11 +2885,14 @@ function _assert_this_initialized(self) {
             }
         }
         if (this.material.materialType !== exports.PMaterialType.unlit) {
+            // let hasLight = false;
             if (lightCount > 0 && this.geometry.hasNormals()) {
+                // hasLight = true;
                 featureList.push("USE_PUNCTUAL 1");
                 featureList.push("LIGHT_COUNT " + lightCount);
             }
             if (skybox !== undefined && skybox.available) {
+                // hasLight = true;
                 featureList.push("USE_IBL 1");
                 featureList.push("USE_TEX_LOD 1");
                 if (skybox.hasDiffuseImage) ; else {
@@ -2916,6 +2912,116 @@ function _assert_this_initialized(self) {
         }
         return featureList;
     };
+    _proto.getMacroList = function getMacroList(lightCount, pbrPass, skybox) {
+        var macroList = [];
+        if (this.geometry.hasNormals()) {
+            macroList.push({
+                name: "HAS_NORMALS"
+            });
+        }
+        if (this.geometry.hasTangents()) {
+            macroList.push({
+                name: "HAS_TANGENTS"
+            });
+        }
+        if (this.geometry.hasUVCoords(1)) {
+            macroList.push({
+                name: "HAS_UV_SET1"
+            });
+        }
+        if (this.geometry.hasUVCoords(2)) {
+            macroList.push({
+                name: "HAS_UV_SET2"
+            });
+        }
+        if (this.morph !== undefined && this.morph.hasMorph()) {
+            // 存在 Morph 动画，需要配置 Morph 动画相关的 Shader 宏定义
+            // USE_MORPHING 是总开关，WEIGHT_COUNT 是 weights 数组长度（Shader）
+            macroList.push({
+                name: "USE_MORPHING"
+            });
+            macroList.push({
+                name: "WEIGHT_COUNT",
+                value: this.morph.morphWeightsLength
+            });
+            for(var i = 0; i < this.morph.morphWeightsLength; i++){
+                if (this.morph.hasPositionMorph) {
+                    macroList.push({
+                        name: "HAS_TARGET_POSITION" + i
+                    });
+                }
+                if (this.morph.hasNormalMorph) {
+                    macroList.push({
+                        name: "HAS_TARGET_NORMAL" + i
+                    });
+                }
+                if (this.morph.hasTangentMorph) {
+                    macroList.push({
+                        name: "HAS_TARGET_TANGENT" + i
+                    });
+                }
+            }
+        }
+        if (this.skin !== undefined) {
+            macroList.push({
+                name: "USE_SKINNING"
+            });
+            macroList.push({
+                name: "JOINT_COUNT",
+                value: this.skin.getJointCount()
+            });
+            macroList.push({
+                name: "HAS_JOINT_SET1"
+            });
+            macroList.push({
+                name: "HAS_WEIGHT_SET1"
+            });
+            if (this.skin.textureDataMode) {
+                macroList.push({
+                    name: "USE_SKINNING_TEXTURE"
+                });
+            }
+        }
+        if (this.material.materialType !== exports.PMaterialType.unlit) {
+            if (lightCount > 0 && this.geometry.hasNormals()) {
+                macroList.push({
+                    name: "USE_PUNCTUAL"
+                });
+                macroList.push({
+                    name: "LIGHT_COUNT",
+                    value: lightCount
+                });
+            }
+            if (skybox !== undefined && skybox.available) {
+                macroList.push({
+                    name: "USE_IBL"
+                });
+                macroList.push({
+                    name: "USE_TEX_LOD"
+                });
+                if (skybox.hasDiffuseImage) ; else {
+                    macroList.push({
+                        name: "IRRADIANCE_COEFFICIENTS"
+                    });
+                }
+            }
+        // if(!hasLight){
+        //   featureList.push('MATERIAL_UNLIT 1');
+        // }
+        }
+        // 渲染中间结果输出，用于渲染效果调试，支持 pbr 和 unlit
+        var renderMode = PGlobalState.getInstance().renderMode3D;
+        var outputDefine = this.getRenderMode3DDefine(renderMode);
+        if (outputDefine !== undefined) {
+            macroList.push({
+                name: "DEBUG_OUTPUT"
+            });
+            macroList.push({
+                name: outputDefine
+            });
+        }
+        return macroList;
+    };
     /**
    * 销毁，需要释放创建的 GE 对象
    */ _proto.dispose = function dispose() {
@@ -3780,7 +3886,7 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
     return PSceneManager;
 }();
 
-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 a_UV2;\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=a_UV2;\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 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}";
 
@@ -3839,6 +3945,18 @@ var StandardShaderSource;
    * @param isWebGL2 - 是否 WebGL2
    * @returns 最终代码
    */ StandardShaderSource.build = build;
+    function getSourceCode(source, isWebGL2) {
+        var match;
+        while((match = /#include <(.+)>/gm.exec(source)) !== null){
+            source = source.replace(match[0], glsl[match[1]]);
+        }
+        if (isWebGL2) {
+            return "#version 300 es\n" + source;
+        } else {
+            return "#version 100\n" + source;
+        }
+    }
+    StandardShaderSource.getSourceCode = getSourceCode;
 })(StandardShaderSource || (StandardShaderSource = {}));
 
 /**
@@ -3884,12 +4002,57 @@ var StandardShaderSource;
                 throw new Error("Invalid material type " + materialType + " for getFragmentShaderString!");
         }
     };
+    StandardShader.genVertexShaderCode = function genVertexShaderCode(materialType, isWebGL2) {
+        switch(materialType){
+            case exports.PMaterialType.unlit:
+            case exports.PMaterialType.pbr:
+            case exports.PMaterialType.shadowBase:
+                return StandardShaderSource.getSourceCode(primitiveVert, isWebGL2);
+            case exports.PMaterialType.skyboxFilter:
+                return StandardShaderSource.getSourceCode(skyboxVert, isWebGL2);
+            default:
+                throw new Error("Invalid material type " + materialType + " for genVertexShaderCode!");
+        }
+    };
+    /**
+   * 获取片段着色器代码
+   * @param materialType - 材质类型
+   * @returns
+   */ StandardShader.genFragmentShaderCode = function genFragmentShaderCode(materialType, isWebGL2) {
+        switch(materialType){
+            case exports.PMaterialType.unlit:
+            case exports.PMaterialType.pbr:
+                return StandardShaderSource.getSourceCode(metallicRoughnessFrag, isWebGL2);
+            case exports.PMaterialType.shadowBase:
+                return StandardShaderSource.getSourceCode(shadowPassFrag, isWebGL2);
+            case exports.PMaterialType.skyboxFilter:
+                return StandardShaderSource.getSourceCode(skyboxFrag, isWebGL2);
+            default:
+                throw new Error("Invalid material type " + materialType + " for genFragmentShaderCode!");
+        }
+    };
     return StandardShader;
 }();
 /**
    * WebGL 环境
    */ StandardShader.environment = "webgl1";
 
+function fetchPBRShaderCode(isWebGL2) {
+    var vertexShaderCode = StandardShader.genVertexShaderCode(exports.PMaterialType.pbr, isWebGL2);
+    var fragmentShaderCode = StandardShader.genFragmentShaderCode(exports.PMaterialType.pbr, isWebGL2);
+    return {
+        vertexShaderCode: vertexShaderCode,
+        fragmentShaderCode: fragmentShaderCode
+    };
+}
+function fetchUnlitShaderCode(isWebGL2) {
+    var vertexShaderCode = StandardShader.genVertexShaderCode(exports.PMaterialType.unlit, isWebGL2);
+    var fragmentShaderCode = StandardShader.genFragmentShaderCode(exports.PMaterialType.unlit, isWebGL2);
+    return {
+        vertexShaderCode: vertexShaderCode,
+        fragmentShaderCode: fragmentShaderCode
+    };
+}
 /**
  * 获取 PBR 材质着色器代码
  * @param context - 着色器上下文
@@ -4345,7 +4508,7 @@ exports.ModelMeshComponent = /*#__PURE__*/ function(RendererComponent) {
     return ModelMeshComponent;
 }(effects.RendererComponent);
 exports.ModelMeshComponent = __decorate([
-    effects.effectsClass(effects.DataType.MeshComponent)
+    effects.effectsClass(effects.spec.DataType.MeshComponent)
 ], exports.ModelMeshComponent);
 exports.ModelSkyboxComponent = /*#__PURE__*/ function(RendererComponent) {
     _inherits(ModelSkyboxComponent, RendererComponent);
@@ -4419,7 +4582,7 @@ exports.ModelSkyboxComponent = /*#__PURE__*/ function(RendererComponent) {
     return ModelSkyboxComponent;
 }(effects.RendererComponent);
 exports.ModelSkyboxComponent = __decorate([
-    effects.effectsClass(effects.DataType.SkyboxComponent)
+    effects.effectsClass(effects.spec.DataType.SkyboxComponent)
 ], exports.ModelSkyboxComponent);
 exports.ModelLightComponent = /*#__PURE__*/ function(ItemBehaviour) {
     _inherits(ModelLightComponent, ItemBehaviour);
@@ -4484,7 +4647,7 @@ exports.ModelLightComponent = /*#__PURE__*/ function(ItemBehaviour) {
     return ModelLightComponent;
 }(effects.ItemBehaviour);
 exports.ModelLightComponent = __decorate([
-    effects.effectsClass(effects.DataType.LightComponent)
+    effects.effectsClass(effects.spec.DataType.LightComponent)
 ], exports.ModelLightComponent);
 exports.ModelCameraComponent = /*#__PURE__*/ function(ItemBehaviour) {
     _inherits(ModelCameraComponent, ItemBehaviour);
@@ -4572,9 +4735,21 @@ exports.ModelCameraComponent = /*#__PURE__*/ function(ItemBehaviour) {
     return ModelCameraComponent;
 }(effects.ItemBehaviour);
 exports.ModelCameraComponent = __decorate([
-    effects.effectsClass(effects.DataType.CameraComponent)
+    effects.effectsClass(effects.spec.DataType.CameraComponent)
 ], exports.ModelCameraComponent);
 
+// 射线与带旋转的包围盒求交
+// function transformDirection (m: Matrix4, direction: Vector3) {
+//   const x = direction.x;
+//   const y = direction.y;
+//   const z = direction.z;
+//   const me = m.elements;
+//   const result = new Vector3();
+//   result.x = me[0] * x + me[4] * y + me[8] * z;
+//   result.y = me[1] * x + me[5] * y + me[9] * z;
+//   result.z = me[2] * x + me[6] * y + me[10] * z;
+//   return result.normalize();
+// }
 /**
  * 带旋转的射线与包围盒求交
  * @param ray - 射线
@@ -5498,14 +5673,13 @@ var normal = new Vector3();
         if (camera.perspective === undefined) {
             return;
         }
-        var p = camera.perspective;
-        var _p_zfar;
-        ({
-            near: p.znear,
-            far: (_p_zfar = p.zfar) != null ? _p_zfar : 1000,
-            fov: p.yfov,
-            clipMode: 0
-        });
+    // const p = camera.perspective;
+    // const options: ModelCameraOptions = {
+    //   near: p.znear,
+    //   far: p.zfar ?? 1000,
+    //   fov: p.yfov,
+    //   clipMode: 0,
+    // };
     };
     /**
    * 转成播放器中 [0, 255] 区间的颜色值
@@ -5686,7 +5860,7 @@ var normal = new Vector3();
             var textures = scene.textureOptions;
             jsonScene.compositions.forEach(function(comp) {
                 comp.items.forEach(function(item) {
-                    if (item.type === "mesh") {
+                    if (item.type === effects.spec.ItemType.mesh) {
                         var meshItem = item;
                         var primitives = meshItem.content.options.primitives;
                         primitives.forEach(function(prim) {
@@ -5713,7 +5887,7 @@ var normal = new Vector3();
                                 }
                             }
                         });
-                    } else if (item.type === "skybox") {
+                    } else if (item.type === effects.spec.ItemType.skybox) {
                         loadSkybox = true;
                         //
                         var skyboxItem = item;
@@ -5728,7 +5902,7 @@ var normal = new Vector3();
         } else {
             jsonScene.compositions.forEach(function(comp) {
                 comp.items.forEach(function(item) {
-                    if (item.type === "skybox") {
+                    if (item.type === effects.spec.ItemType.skybox) {
                         loadSkybox = true;
                     }
                 });
@@ -5738,7 +5912,7 @@ var normal = new Vector3();
             jsonScene.compositions.forEach(function(comp) {
                 var lightCount = 0;
                 comp.items.forEach(function(item) {
-                    if (item.type === "light" || item.type === "skybox") {
+                    if (item.type === effects.spec.ItemType.light || item.type === effects.spec.ItemType.skybox) {
                         ++lightCount;
                     }
                 });
@@ -5865,7 +6039,7 @@ var normal = new Vector3();
             sceneComp.items.forEach(function(data) {
                 var itemId = data.id;
                 var item = composition.getEngine().jsonSceneData[itemId];
-                if (item.type === "mesh") {
+                if (item.type === effects.spec.ItemType.mesh) {
                     var meshItem = item;
                     var skin = meshItem.content.options.skin;
                     var primitives = meshItem.content.options.primitives;
@@ -5900,7 +6074,7 @@ var normal = new Vector3();
                             console.error("setupItem3DOptions: Invalid inverseBindMatrices type, " + inverseBindMatrices);
                         }
                     }
-                } else if (item.type === "tree") {
+                } else if (item.type === effects.spec.ItemType.tree) {
                     var jsonItem = item;
                     var studioItem = item;
                     var jsonAnimations = jsonItem.content.options.tree.animations;
@@ -5925,7 +6099,7 @@ var normal = new Vector3();
                             });
                         });
                     }
-                } else if (item.type === "skybox") {
+                } else if (item.type === effects.spec.ItemType.skybox) {
                     var skybox = item;
                     var studioSkybox = item;
                     var options = skybox.content.options;
@@ -7568,6 +7742,24 @@ var toHalf = function() {
         }
         return featureList;
     };
+    _proto.getShaderMacros = function getShaderMacros() {
+        var macroList = [];
+        if (this.isOpaque()) {
+            macroList.push({
+                name: "ALPHAMODE_OPAQUE"
+            });
+        } else if (this.isMasked()) {
+            macroList.push({
+                name: "ALPHAMODE_MASK"
+            });
+        }
+        if (this.faceSideMode === exports.PFaceSideMode.both) {
+            macroList.push({
+                name: "DOUBLE_SIDED"
+            });
+        }
+        return macroList;
+    };
     /**
    * 根据材质状态，更新 GE 材质状态
    * @param material - GE 材质
@@ -7619,6 +7811,30 @@ var toHalf = function() {
         }
         return finalFeatureList;
     };
+    _proto.getMacroList = function getMacroList(inMacroList) {
+        var finalMacroList = this.getShaderMacros();
+        if (inMacroList !== undefined) {
+            var _finalMacroList;
+            (_finalMacroList = finalMacroList).push.apply(_finalMacroList, [].concat(inMacroList));
+        }
+        var isWebGL2 = PGlobalState.getInstance().isWebGL2;
+        if (isWebGL2) {
+            finalMacroList.push({
+                name: "WEBGL2"
+            });
+        }
+        // 目前只有 PRB 和 Unlit 是需要 EDITOR_TRANSFORM，适配编辑器的视口 Offset
+        // 阴影 Pass 的渲染是不需要，所以这里特殊处理下
+        if (this.materialType !== exports.PMaterialType.shadowBase) {
+            var isEditorEvn = PGlobalState.getInstance().isEditorEnv;
+            if (isEditorEvn) {
+                finalMacroList.push({
+                    name: "EDITOR_TRANSFORM"
+                });
+            }
+        }
+        return finalMacroList;
+    };
     /**
    * 获取混合模式，根据 GE 混合模式
    * @param mode - GE 混合模式
@@ -7768,10 +7984,7 @@ var toHalf = function() {
  */ var PMaterialUnlit = /*#__PURE__*/ function(PMaterialBase) {
     _inherits(PMaterialUnlit, PMaterialBase);
     function PMaterialUnlit() {
-        var _this;
-        _this = PMaterialBase.apply(this, arguments) || this;
-        _this.baseColorFactor = new Vector4(1, 1, 1, 1);
-        return _this;
+        return PMaterialBase.apply(this, arguments);
     }
     var _proto = PMaterialUnlit.prototype;
     /**
@@ -7785,7 +7998,6 @@ var toHalf = function() {
         if (options.baseColorTexture) {
             this.baseColorTexture = options.baseColorTexture;
         }
-        this.setBaseColorFactor(PluginHelper.toPluginColor4(options.baseColorFactor));
         /**
      * 默认需要写入深度值，只有传入false才是false
      */ if (options.depthMask === false) {
@@ -7798,6 +8010,25 @@ var toHalf = function() {
         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 = exports.PObjectType.material;
+        this.materialType = exports.PMaterialType.unlit;
+        var _mat_getTexture;
+        //
+        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 : effects.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 : effects.spec.SideMode.FRONT;
+        this.faceSideMode = this.getFaceSideMode(side);
+    };
     /**
    * 销毁材质
    */ _proto.dispose = function dispose() {
@@ -7816,6 +8047,21 @@ var toHalf = function() {
         featureList.push("MATERIAL_UNLIT 1");
         return featureList;
     };
+    _proto.getShaderMacros = function getShaderMacros() {
+        var macroList = PMaterialBase.prototype.getShaderMacros.call(this);
+        macroList.push({
+            name: "MATERIAL_METALLICROUGHNESS"
+        });
+        if (this.hasBaseColorTexture()) {
+            macroList.push({
+                name: "HAS_BASE_COLOR_MAP"
+            });
+        }
+        macroList.push({
+            name: "MATERIAL_UNLIT"
+        });
+        return macroList;
+    };
     /**
    * 更新对应的 GE 材质中着色器的 Uniform 数据
    * @param material - GE 材质
@@ -7823,14 +8069,12 @@ var toHalf = function() {
         PMaterialBase.prototype.updateUniforms.call(this, material);
         //
         var uvTransform = new Matrix3().identity();
-        material.setVector4("_BaseColorFactor", this.baseColorFactor);
         if (this.hasBaseColorTexture()) {
-            material.setTexture("_BaseColorSampler", this.getBaseColorTexture());
             material.setInt("_BaseColorUVSet", 0);
             material.setMatrix3("_BaseColorUVTransform", uvTransform);
         }
-        material.setFloat("_MetallicFactor", 0.0);
-        material.setFloat("_RoughnessFactor", 0.0);
+        material.setFloat("_MetallicFactor", 0);
+        material.setFloat("_RoughnessFactor", 0);
         material.setFloat("_Exposure", 1.0);
     };
     /**
@@ -7851,22 +8095,6 @@ 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, Vector4)) {
-            this.baseColorFactor.set(val.x, val.y, val.z, val.w);
-        } else {
-            this.baseColorFactor.set(val[0], val[1], val[2], val[3]);
-        }
-    };
     return PMaterialUnlit;
 }(PMaterialBase);
 /**
@@ -7966,8 +8194,6 @@ var toHalf = function() {
             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) {
@@ -7975,7 +8201,7 @@ var toHalf = function() {
         this.material = mat;
         this.name = mat.name;
         this.type = exports.PObjectType.material;
-        this.materialType = mat.getInt("shaderType") ? exports.PMaterialType.unlit : exports.PMaterialType.pbr;
+        this.materialType = exports.PMaterialType.pbr;
         var _mat_getTexture;
         //
         this.baseColorTexture = (_mat_getTexture = mat.getTexture("_BaseColorSampler")) != null ? _mat_getTexture : undefined;
@@ -8068,6 +8294,72 @@ var toHalf = function() {
         }
         return featureList;
     };
+    _proto.getShaderMacros = function getShaderMacros() {
+        var macroList = PMaterialBase.prototype.getShaderMacros.call(this);
+        macroList.push({
+            name: "MATERIAL_METALLICROUGHNESS"
+        });
+        if (this.hasBaseColorTexture()) {
+            macroList.push({
+                name: "HAS_BASE_COLOR_MAP"
+            });
+            if (this.baseColorTextureTrans !== undefined) {
+                macroList.push({
+                    name: "HAS_BASECOLOR_UV_TRANSFORM"
+                });
+            }
+        }
+        if (this.hasMetallicRoughnessTexture()) {
+            macroList.push({
+                name: "HAS_METALLIC_ROUGHNESS_MAP"
+            });
+            if (this.metallicRoughnessTextureTrans !== undefined) {
+                macroList.push({
+                    name: "HAS_METALLICROUGHNESS_UV_TRANSFORM"
+                });
+            }
+        }
+        if (this.useSpecularAA) {
+            macroList.push({
+                name: "USE_SPECULAR_AA"
+            });
+        }
+        if (this.hasNormalTexture()) {
+            macroList.push({
+                name: "HAS_NORMAL_MAP"
+            });
+            if (this.normalTextureTrans !== undefined) {
+                macroList.push({
+                    name: "HAS_NORMAL_UV_TRANSFORM"
+                });
+            }
+        }
+        if (this.hasOcclusionTexture()) {
+            macroList.push({
+                name: "HAS_OCCLUSION_MAP"
+            });
+            if (this.occlusionTextureTrans !== undefined) {
+                macroList.push({
+                    name: "HAS_OCCLUSION_UV_TRANSFORM"
+                });
+            }
+        }
+        if (this.hasEmissiveTexture()) {
+            macroList.push({
+                name: "HAS_EMISSIVE_MAP"
+            });
+            if (this.emissiveTextureTrans !== undefined) {
+                macroList.push({
+                    name: "HAS_EMISSIVE_UV_TRANSFORM"
+                });
+            }
+        } else if (this.hasEmissiveFactor()) {
+            macroList.push({
+                name: "HAS_EMISSIVE"
+            });
+        }
+        return macroList;
+    };
     /**
    * 更新关联的 GE 材质中着色器的 Uniform 数据
    * @param material - GE 材质
@@ -8340,18 +8632,24 @@ var toHalf = function() {
  * @returns 材质对象
  */ function createPluginMaterial(options) {
     if (_instanceof1(options, effects.Material)) {
-        var materialPBR = new PMaterialPBR();
-        materialPBR.createFromMaterial(options);
-        return materialPBR;
+        if (options.shader.getInstanceId() === PBRShaderGUID) {
+            var materialPBR = new PMaterialPBR();
+            materialPBR.createFromMaterial(options);
+            return materialPBR;
+        } else {
+            var materialUnlit = new PMaterialUnlit();
+            materialUnlit.createFromMaterial(options);
+            return materialUnlit;
+        }
     } else {
         if (options.type === effects.spec.MaterialType.pbr) {
             var materialPBR1 = new PMaterialPBR();
             materialPBR1.create(options);
             return materialPBR1;
         } else {
-            var materialUnlit = new PMaterialUnlit();
-            materialUnlit.create(options);
-            return materialUnlit;
+            var materialUnlit1 = new PMaterialUnlit();
+            materialUnlit1.create(options);
+            return materialUnlit1;
         }
     }
 }
@@ -8810,12 +9108,12 @@ exports.PSkyboxType = void 0;
    */ PSkyboxCreator.createSpecularCubeMap = function createSpecularCubeMap(engine, params) {
         return _async_to_generator(function() {
             return __generator(this, function(_state) {
-                ({
-                    wrapS: effects.glContext.CLAMP_TO_EDGE,
-                    wrapT: effects.glContext.CLAMP_TO_EDGE,
-                    magFilter: effects.glContext.LINEAR,
-                    minFilter: effects.glContext.LINEAR_MIPMAP_LINEAR
-                });
+                // const configOptions: TextureConfigOptions = {
+                //   wrapS: glContext.CLAMP_TO_EDGE,
+                //   wrapT: glContext.CLAMP_TO_EDGE,
+                //   magFilter: glContext.LINEAR,
+                //   minFilter: glContext.LINEAR_MIPMAP_LINEAR,
+                // };
                 if (params.type === "url") {
                     return [
                         2,
@@ -8881,7 +9179,9 @@ exports.PSkyboxType = void 0;
         var dataArray = [];
         switch(skyboxType){
             case 0:
-                return undefined;
+                {
+                    return undefined;
+                }
             case 1:
                 dataArray = [
                     0.2665672302246094,
@@ -9371,7 +9671,7 @@ exports.PSkyboxType = void 0;
    * @param options - 加载选项
    */ ModelPlugin.prepareResource = function prepareResource(scene, options) {
         return _async_to_generator(function() {
-            var _options_pluginData, _options_pluginData1, keyList, pluginData, _options_env, runtimeEnv, _options_pluginData_compatibleMode, _options_pluginData_autoAdjustScene;
+            var keyList, pluginData, _options_env, runtimeEnv;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -9393,8 +9693,8 @@ exports.PSkyboxType = void 0;
                         //
                         runtimeEnv = (_options_env = options.env) != null ? _options_env : "";
                         scene.storage["runtimeEnv"] = runtimeEnv;
-                        (_options_pluginData_compatibleMode = (_options_pluginData = options.pluginData) == null ? void 0 : _options_pluginData["compatibleMode"]) != null ? _options_pluginData_compatibleMode : "gltf";
-                        (_options_pluginData_autoAdjustScene = (_options_pluginData1 = options.pluginData) == null ? void 0 : _options_pluginData1["autoAdjustScene"]) != null ? _options_pluginData_autoAdjustScene : false;
+                        // const compatibleMode = options.pluginData?.['compatibleMode'] ?? 'gltf';
+                        // const autoAdjustScene = options.pluginData?.['autoAdjustScene'] ?? false;
                         //
                         //PluginHelper.preprocessScene(scene, runtimeEnv, compatibleMode, autoAdjustScene);
                         return [
@@ -9412,24 +9712,28 @@ exports.PSkyboxType = void 0;
     };
     ModelPlugin.precompile = function precompile(compositions, renderer) {
         var isWebGL2 = renderer.engine.gpuCapability.level === 2;
-        var context = {
+        var pbrShaderCode = fetchPBRShaderCode(isWebGL2);
+        var unlitShaderCode = fetchUnlitShaderCode(isWebGL2);
+        var pbrShaderData = {
+            id: PBRShaderGUID,
+            name: "PBR Shader",
+            dataType: effects.spec.DataType.Shader,
+            fragment: pbrShaderCode.fragmentShaderCode,
+            vertex: pbrShaderCode.vertexShaderCode,
             // @ts-expect-error
-            material: {
-                materialType: exports.PMaterialType.pbr
-            },
-            isWebGL2: isWebGL2,
-            featureList: []
+            glslVersion: isWebGL2 ? effects.GLSLVersion.GLSL3 : effects.GLSLVersion.GLSL1
         };
-        var pbrShader = getPBRPassShaderCode(context);
-        renderer.engine.addEffectsObjectData({
-            // FIXME: 'unlit000000000000000000000000000',
-            id: "pbr00000000000000000000000000000",
-            dataType: "Shader",
+        var unlitShaderData = {
+            id: UnlitShaderGUID,
+            name: "Unlit Shader",
+            dataType: effects.spec.DataType.Shader,
+            fragment: unlitShaderCode.fragmentShaderCode,
+            vertex: unlitShaderCode.vertexShaderCode,
             // @ts-expect-error
-            fragment: pbrShader.fragmentShaderCode,
-            vertex: pbrShader.vertexShaderCode,
             glslVersion: isWebGL2 ? effects.GLSLVersion.GLSL3 : effects.GLSLVersion.GLSL1
-        });
+        };
+        renderer.engine.addEffectsObjectData(pbrShaderData);
+        renderer.engine.addEffectsObjectData(unlitShaderData);
         return Promise.resolve();
     };
     return ModelPlugin;
@@ -9589,7 +9893,7 @@ exports.ModelPluginComponent = /*#__PURE__*/ function(ItemBehaviour) {
     return ModelPluginComponent;
 }(effects.ItemBehaviour);
 exports.ModelPluginComponent = __decorate([
-    effects.effectsClass(effects.DataType.ModelPluginComponent)
+    effects.effectsClass(effects.spec.DataType.ModelPluginComponent)
 ], exports.ModelPluginComponent);
 /**
  * 获取场景管理器，从合成中查找
@@ -9785,7 +10089,7 @@ exports.ModelTreeComponent = /*#__PURE__*/ function(ItemBehaviour) {
     return ModelTreeComponent;
 }(effects.ItemBehaviour);
 exports.ModelTreeComponent = __decorate([
-    effects.effectsClass(effects.DataType.TreeComponent)
+    effects.effectsClass(effects.spec.DataType.TreeComponent)
 ], exports.ModelTreeComponent);
 
 /**
@@ -11705,7 +12009,7 @@ var GLTFHelper = /*#__PURE__*/ function() {
 
 effects.registerPlugin("tree", ModelTreePlugin, effects.VFXItem, true);
 effects.registerPlugin("model", ModelPlugin, effects.VFXItem);
-var version = "2.0.0-alpha.7";
+var version = "2.0.0-alpha.8";
 effects.logger.info("plugin model version: " + version);
 
 exports.BoxMesh = BoxMesh;
@@ -11729,6 +12033,7 @@ exports.PAnimTexture = PAnimTexture;
 exports.PAnimTrack = PAnimTrack;
 exports.PAnimation = PAnimation;
 exports.PAnimationManager = PAnimationManager;
+exports.PBRShaderGUID = PBRShaderGUID;
 exports.PCamera = PCamera;
 exports.PCameraManager = PCameraManager;
 exports.PCoordinate = PCoordinate;
@@ -11757,6 +12062,7 @@ exports.RayIntersectsBoxWithRotation = RayIntersectsBoxWithRotation;
 exports.RayTriangleTesting = RayTriangleTesting;
 exports.ToggleItemBounding = ToggleItemBounding;
 exports.TwoStatesSet = TwoStatesSet;
+exports.UnlitShaderGUID = UnlitShaderGUID;
 exports.VFX_ITEM_TYPE_3D = VFX_ITEM_TYPE_3D;
 exports.VertexAttribBuffer = VertexAttribBuffer;
 exports.WebGLHelper = WebGLHelper;
@@ -11764,6 +12070,8 @@ exports.WebHelper = WebHelper;
 exports.createAnimationSampler = createAnimationSampler;
 exports.createInternalMaterial = createInternalMaterial;
 exports.createPluginMaterial = createPluginMaterial;
+exports.fetchPBRShaderCode = fetchPBRShaderCode;
+exports.fetchUnlitShaderCode = fetchUnlitShaderCode;
 exports.getDefaultEffectsGLTFLoader = getDefaultEffectsGLTFLoader;
 exports.getDiffuseOnlyShaderCode = getDiffuseOnlyShaderCode;
 exports.getGaussianBlurShaderCodeV1 = getGaussianBlurShaderCodeV1;