@galacean/effects-plugin-model 2.1.0-alpha.7 → 2.1.0-alpha.9

package/dist/loader.mjs

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player model plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 飂兮
- * Version: v2.1.0-alpha.7
+ * Version: v2.1.0-alpha.9
  */
 
 import * as EFFECTS from '@galacean/effects';
@@ -400,284 +400,6 @@ function _inherits(subClass, superClass) {
     if (superClass) _set_prototype_of(subClass, superClass);
 }
 
-var InterpolationSampler = /*#__PURE__*/ function() {
-    function InterpolationSampler(time, data, componentCount) {
-        this.time = time;
-        this.data = data;
-        this.componentCount = componentCount;
-        this.cachedIndex = 0;
-    }
-    var _proto = InterpolationSampler.prototype;
-    /**
-   * 计算当前 t 时刻的插值
-   * @param t - 当前时间
-   * @returns 插值结果
-   */ _proto.evaluate = function evaluate(t) {
-        var pp = this.time;
-        var i1 = this.cachedIndex;
-        var t1 = pp[i1];
-        var t0 = pp[i1 - 1];
-        validate_interval: {
-            seek: {
-                var right;
-                linear_scan: {
-                    //- See http://jsperf.com/comparison-to-undefined/3
-                    //- slower code:
-                    //-
-                    //- 				if ( t >= t1 || t1 === undefined ) {
-                    forward_scan: if (!(t < t1)) {
-                        for(var giveUpAt = i1 + 2;;){
-                            if (t1 === undefined) {
-                                if (t < t0) {
-                                    break forward_scan;
-                                }
-                                // after end
-                                i1 = pp.length;
-                                this.cachedIndex = i1;
-                                return this.copySampleValue(i1 - 1);
-                            }
-                            if (i1 === giveUpAt) {
-                                break;
-                            } // this loop
-                            t0 = t1;
-                            t1 = pp[++i1];
-                            if (t < t1) {
-                                break seek;
-                            }
-                        }
-                        // prepare binary search on the right side of the index
-                        right = pp.length;
-                        break linear_scan;
-                    }
-                    //- slower code:
-                    //-					if ( t < t0 || t0 === undefined ) {
-                    if (!(t >= t0)) {
-                        // looping?
-                        var t1global = pp[1];
-                        if (t < t1global) {
-                            i1 = 2; // + 1, using the scan for the details
-                            t0 = t1global;
-                        }
-                        // linear reverse scan
-                        for(var giveUpAt1 = i1 - 2;;){
-                            if (t0 === undefined) {
-                                // before start
-                                this.cachedIndex = 0;
-                                return this.copySampleValue(0);
-                            }
-                            if (i1 === giveUpAt1) {
-                                break;
-                            } // this loop
-                            t1 = t0;
-                            t0 = pp[--i1 - 1];
-                            if (t >= t0) {
-                                break seek;
-                            }
-                        }
-                        // prepare binary search on the left side of the index
-                        right = i1;
-                        i1 = 0;
-                        break linear_scan;
-                    }
-                    break validate_interval;
-                } // linear scan
-                // binary search
-                while(i1 < right){
-                    var mid = i1 + right >>> 1;
-                    if (t < pp[mid]) {
-                        right = mid;
-                    } else {
-                        i1 = mid + 1;
-                    }
-                }
-                t1 = pp[i1];
-                t0 = pp[i1 - 1];
-                // check boundary cases, again
-                if (t0 === undefined) {
-                    this.cachedIndex = 0;
-                    return this.copySampleValue(0);
-                }
-                if (t1 === undefined) {
-                    i1 = pp.length;
-                    this.cachedIndex = i1;
-                    return this.copySampleValue(i1 - 1);
-                }
-            } // seek
-            this.cachedIndex = i1;
-            this.intervalChanged(i1, t0, t1);
-        } // validate_interval
-        return this.interpolate(i1, t0, t, t1);
-    };
-    /**
-   * 销毁
-   */ _proto.dispose = function dispose() {
-        // @ts-expect-error
-        this.time = undefined;
-        // @ts-expect-error
-        this.data = undefined;
-    };
-    _proto.copySampleValue = function copySampleValue(index) {
-        // copies a sample value to the result buffer
-        var values = this.data;
-        var stride = this.componentCount;
-        var offset = index * stride;
-        var result = new Float32Array(stride);
-        for(var i = 0; i !== stride; ++i){
-            result[i] = values[offset + i];
-        }
-        return result;
-    };
-    return InterpolationSampler;
-}();
-var LinearSampler = /*#__PURE__*/ function(InterpolationSampler) {
-    _inherits(LinearSampler, InterpolationSampler);
-    function LinearSampler(time, data, size) {
-        return InterpolationSampler.call(this, time, data, size);
-    }
-    var _proto = LinearSampler.prototype;
-    _proto.intervalChanged = function intervalChanged(i1, t0, t1) {};
-    _proto.interpolate = function interpolate(i1, t0, t, t1) {
-        var values = this.data;
-        var _this_componentCount;
-        var stride = (_this_componentCount = this.componentCount) != null ? _this_componentCount : 1;
-        var offset1 = i1 * stride;
-        var offset0 = offset1 - stride;
-        var weight1 = (t - t0) / (t1 - t0);
-        var weight0 = 1 - weight1;
-        var result = new Float32Array(stride);
-        for(var i = 0; i !== stride; ++i){
-            result[i] = values[offset0 + i] * weight0 + values[offset1 + i] * weight1;
-        }
-        return result;
-    };
-    return LinearSampler;
-}(InterpolationSampler);
-var DiscreteSampler = /*#__PURE__*/ function(InterpolationSampler) {
-    _inherits(DiscreteSampler, InterpolationSampler);
-    function DiscreteSampler(time, data, size) {
-        return InterpolationSampler.call(this, time, data, size);
-    }
-    var _proto = DiscreteSampler.prototype;
-    _proto.intervalChanged = function intervalChanged(i1, t0, t1) {};
-    _proto.interpolate = function interpolate(i1, t0, t, t1) {
-        var values = this.data;
-        var _this_componentCount;
-        var stride = (_this_componentCount = this.componentCount) != null ? _this_componentCount : 1;
-        var offset = (i1 - 1) * stride;
-        var result = new Float32Array(stride);
-        for(var i = 0; i !== stride; ++i){
-            result[i] = values[offset + i];
-        }
-        return result;
-    };
-    return DiscreteSampler;
-}(InterpolationSampler);
-var QuaternionInner = /*#__PURE__*/ function() {
-    function QuaternionInner() {}
-    QuaternionInner.slerpFlat = function slerpFlat(dst, dstOffset, src0, srcOffset0, src1, srcOffset1, t) {
-        // fuzz-free, array-based Quaternion SLERP operation
-        var x0 = src0[srcOffset0 + 0];
-        var y0 = src0[srcOffset0 + 1];
-        var z0 = src0[srcOffset0 + 2];
-        var w0 = src0[srcOffset0 + 3];
-        var x1 = src1[srcOffset1 + 0];
-        var y1 = src1[srcOffset1 + 1];
-        var z1 = src1[srcOffset1 + 2];
-        var w1 = src1[srcOffset1 + 3];
-        if (t === 0) {
-            dst[dstOffset + 0] = x0;
-            dst[dstOffset + 1] = y0;
-            dst[dstOffset + 2] = z0;
-            dst[dstOffset + 3] = w0;
-            return;
-        }
-        if (t === 1) {
-            dst[dstOffset + 0] = x1;
-            dst[dstOffset + 1] = y1;
-            dst[dstOffset + 2] = z1;
-            dst[dstOffset + 3] = w1;
-            return;
-        }
-        if (w0 !== w1 || x0 !== x1 || y0 !== y1 || z0 !== z1) {
-            var s = 1 - t;
-            var cos = x0 * x1 + y0 * y1 + z0 * z1 + w0 * w1;
-            var dir = cos >= 0 ? 1 : -1;
-            var sqrSin = 1 - cos * cos;
-            // Skip the Slerp for tiny steps to avoid numeric problems:
-            if (sqrSin > Number.EPSILON) {
-                var sin = Math.sqrt(sqrSin);
-                var len = Math.atan2(sin, cos * dir);
-                s = Math.sin(s * len) / sin;
-                t = Math.sin(t * len) / sin;
-            }
-            var tDir = t * dir;
-            x0 = x0 * s + x1 * tDir;
-            y0 = y0 * s + y1 * tDir;
-            z0 = z0 * s + z1 * tDir;
-            w0 = w0 * s + w1 * tDir;
-            // Normalize in case we just did a lerp:
-            if (s === 1 - t) {
-                var f = 1 / Math.sqrt(x0 * x0 + y0 * y0 + z0 * z0 + w0 * w0);
-                x0 *= f;
-                y0 *= f;
-                z0 *= f;
-                w0 *= f;
-            }
-        }
-        dst[dstOffset] = x0;
-        dst[dstOffset + 1] = y0;
-        dst[dstOffset + 2] = z0;
-        dst[dstOffset + 3] = w0;
-    };
-    return QuaternionInner;
-}();
-var QuaternionLinearSampler = /*#__PURE__*/ function(InterpolationSampler) {
-    _inherits(QuaternionLinearSampler, InterpolationSampler);
-    function QuaternionLinearSampler(time, data, size) {
-        return InterpolationSampler.call(this, time, data, size);
-    }
-    var _proto = QuaternionLinearSampler.prototype;
-    _proto.intervalChanged = function intervalChanged(i1, t0, t1) {};
-    _proto.interpolate = function interpolate(i1, t0, t, t1) {
-        var values = this.data;
-        var _this_componentCount;
-        var stride = (_this_componentCount = this.componentCount) != null ? _this_componentCount : 1;
-        var alpha = (t - t0) / (t1 - t0);
-        var offset = i1 * stride;
-        var result = new Float32Array(stride);
-        for(var end = offset + stride; offset !== end; offset += 4){
-            QuaternionInner.slerpFlat(result, 0, values, offset - stride, values, offset, alpha);
-        }
-        return result;
-    };
-    return QuaternionLinearSampler;
-}(InterpolationSampler);
-/**
- * 创建动画采样器，支持线性和跳变两种模式，类别上支持平移、旋转和缩放
- * @param type - 动画类型，线性和跳变
- * @param times - 时间点数组
- * @param data - 关键帧数组
- * @param size - 数据分量
- * @param path - 动画类别，平移、旋转和缩放
- * @returns 动画采样器
- */ function createAnimationSampler(type, times, data, size, path) {
-    switch(type){
-        case "LINEAR":
-            if (path === "rotation") {
-                return new QuaternionLinearSampler(times, data, size);
-            } else {
-                return new LinearSampler(times, data, size);
-            }
-        case "STEP":
-            return new DiscreteSampler(times, data, size);
-        case "CUBICSPLINE":
-            // FIXME: support cubic spline
-            return new LinearSampler(times, data, size);
-        default:
-            return new LinearSampler(times, data, size);
-    }
-}
-
 function _defineProperties(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
@@ -1226,7 +948,7 @@ var objectIndex = 1;
 
 var primitiveVert = "precision highp float;\n#define FEATURES\n#include <animation.vert.glsl>\nattribute vec4 aPos;varying vec3 v_Position;\n#ifdef HAS_NORMALS\nattribute vec4 aNormal;\n#endif\n#ifdef HAS_TANGENTS\nattribute vec4 aTangent;\n#endif\n#ifdef HAS_NORMALS\n#ifdef HAS_TANGENTS\nvarying mat3 v_TBN;\n#else\nvarying vec3 v_Normal;\n#endif\n#endif\n#ifdef HAS_UV_SET1\nattribute vec2 aUV;\n#endif\n#ifdef HAS_UV_SET2\nattribute vec2 aUV2;\n#endif\nvarying vec2 v_UVCoord1;\n#ifdef HAS_UV_SET2\nvarying vec2 v_UVCoord2;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC3\nattribute vec3 aColor;varying vec3 v_Color;\n#endif\n#ifdef HAS_VERTEX_COLOR_VEC4\nattribute vec4 aColor;varying vec4 v_Color;\n#endif\nuniform mat4 effects_MatrixVP;uniform mat4 effects_ObjectToWorld;uniform mat4 _NormalMatrix;\n#ifdef EDITOR_TRANSFORM\nuniform vec4 uEditorTransform;\n#endif\n#ifdef USE_SHADOW_MAPPING\nuniform mat4 _LightViewProjectionMatrix;uniform float _DeltaSceneSize;varying vec4 v_PositionLightSpace;varying 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=aTangent;\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=effects_ObjectToWorld*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(effects_ObjectToWorld*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=aColor;\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=effects_MatrixVP*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#extension GL_OES_standard_derivatives : enable\n#if 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#ifdef GL_FRAGMENT_PRECISION_HIGH\nprecision highp float;\n#else\nprecision mediump float;\n#endif\n#include <extensions.frag.glsl>\n#include <tone-mapping.frag.glsl>\n#include <textures.vert.glsl>\n#include <functions.frag.glsl>\n#include <shadow-common.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 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\ngl_FragColor=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\ngl_FragColor=fragColorUnlit;\n#else\n#ifdef DEBUG_UV\ngl_FragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),getNormal()));\n#endif\n#ifdef DEBUG_METALLIC\ngl_FragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\ngl_FragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\ngl_FragColor.rgb=getNormal()*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\ngl_FragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\ngl_FragColor.rgb=vec3(1.0);\n#endif\n#ifdef DEBUG_EMISSIVE\ngl_FragColor.rgb=vec3(0.0);\n#endif\n#ifdef DEBUG_ALPHA\ngl_FragColor.rgb=vec3(baseColor.a);\n#endif\ngl_FragColor.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\ngl_FragColor=fragColorOut;\n#else\n#ifdef DEBUG_UV\ngl_FragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),normal));\n#endif\n#ifdef DEBUG_METALLIC\ngl_FragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\ngl_FragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\ngl_FragColor.rgb=normal*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\ngl_FragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\n#ifdef HAS_OCCLUSION_MAP\ngl_FragColor.rgb=vec3(mix(1.0,ao,_OcclusionStrength));\n#else\ngl_FragColor.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\ngl_FragColor.rgb=LINEARtoSRGB(emissive);\n#endif\n#ifdef DEBUG_F0\ngl_FragColor.rgb=vec3(f0);\n#endif\n#ifdef DEBUG_ALPHA\ngl_FragColor.rgb=vec3(baseColor.a);\n#endif\n#ifdef DEBUG_DIFFUSE\nvec3 debugDiffuse=vec3(0.0);\n#ifdef USE_PUNCTUAL\nvec3 newBaseColor=vec3(dot(_BaseColorFactor.xyz,vec3(0.3)));MaterialInfo diffuseMaterialInfo=MaterialInfo(1.0,vec3(0.0),1.0,newBaseColor,vec3(0.0),vec3(0.0));for(int i=0;i<LIGHT_COUNT;++i){Light light=_Lights[i];if(light.type==LightType_Directional){debugDiffuse+=applyDirectionalLight(light,diffuseMaterialInfo,normal,view,shadow);}else if(light.type==LightType_Point){debugDiffuse+=applyPointLight(light,diffuseMaterialInfo,normal,view);}else if(light.type==LightType_Spot){debugDiffuse+=applySpotLight(light,diffuseMaterialInfo,normal,view,shadow);}else if(light.type==LightType_Ambient){debugDiffuse+=applyAmbientLight(light,diffuseMaterialInfo);}}\n#endif\ngl_FragColor.rgb=toneMap(debugDiffuse);\n#endif\ngl_FragColor.a=1.0;\n#endif\n}";
+var metallicRoughnessFrag = "\n#define FEATURES\n#extension GL_OES_standard_derivatives : enable\n#if 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#ifdef GL_FRAGMENT_PRECISION_HIGH\nprecision highp float;\n#else\nprecision mediump float;\n#endif\n#include <extensions.frag.glsl>\n#include <tone-mapping.frag.glsl>\n#include <textures.vert.glsl>\n#include <functions.frag.glsl>\n#include <shadow-common.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 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\ngl_FragColor=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\ngl_FragColor=fragColorUnlit;\n#else\n#ifdef DEBUG_UV\ngl_FragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),getNormal()));\n#endif\n#ifdef DEBUG_METALLIC\ngl_FragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\ngl_FragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\ngl_FragColor.rgb=getNormal()*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\ngl_FragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\ngl_FragColor.rgb=vec3(1.0);\n#endif\n#ifdef DEBUG_EMISSIVE\ngl_FragColor.rgb=vec3(0.0);\n#endif\n#ifdef DEBUG_ALPHA\ngl_FragColor.rgb=vec3(baseColor.a);\n#endif\ngl_FragColor.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\ngl_FragColor=fragColorOut;\n#else\n#ifdef DEBUG_UV\ngl_FragColor.rgb=vec3(getDebugUVColor(getBaseColorUV(),normal));\n#endif\n#ifdef DEBUG_METALLIC\ngl_FragColor.rgb=vec3(metallic);\n#endif\n#ifdef DEBUG_ROUGHNESS\ngl_FragColor.rgb=vec3(perceptualRoughness);\n#endif\n#ifdef DEBUG_NORMAL\ngl_FragColor.rgb=normal*0.5+0.5;\n#endif\n#ifdef DEBUG_BASECOLOR\ngl_FragColor.rgb=LINEARtoSRGB(baseColor.rgb);\n#endif\n#ifdef DEBUG_OCCLUSION\n#ifdef HAS_OCCLUSION_MAP\ngl_FragColor.rgb=vec3(mix(1.0,ao,_OcclusionStrength));\n#else\ngl_FragColor.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\ngl_FragColor.rgb=LINEARtoSRGB(emissive);\n#endif\n#ifdef DEBUG_F0\ngl_FragColor.rgb=vec3(f0);\n#endif\n#ifdef DEBUG_ALPHA\ngl_FragColor.rgb=vec3(baseColor.a);\n#endif\n#ifdef DEBUG_DIFFUSE\nvec3 debugDiffuse=vec3(0.0);\n#ifdef USE_PUNCTUAL\nMaterialInfo diffuseMaterialInfo=MaterialInfo(1.0,f0,1.0,vec3(0.35),f0,f0);for(int i=0;i<LIGHT_COUNT;++i){Light light=_Lights[i];if(light.type==LightType_Directional){debugDiffuse+=applyDirectionalLight(light,diffuseMaterialInfo,normal,view,shadow);}else if(light.type==LightType_Point){debugDiffuse+=applyPointLight(light,diffuseMaterialInfo,normal,view);}else if(light.type==LightType_Spot){debugDiffuse+=applySpotLight(light,diffuseMaterialInfo,normal,view,shadow);}else if(light.type==LightType_Ambient){debugDiffuse+=applyAmbientLight(light,diffuseMaterialInfo);}}\n#ifdef USE_IBL\ndebugDiffuse+=getIBLContribution(diffuseMaterialInfo,normal,view);\n#endif\n#endif\ngl_FragColor.rgb=toneMap(debugDiffuse);\n#endif\ngl_FragColor.a=1.0;\n#endif\n}";
 
 var shadowPassFrag = "#define FEATURES\n#include <shadow-common.vert.glsl>\n#if defined(SHADOWMAP_VSM)\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\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)\ngl_FragColor=CalcMomentVSM(gl_FragCoord.z);\n#else\ngl_FragColor=CalcMomentEVSM(gl_FragCoord.z);\n#endif\n}";
 
@@ -3795,117 +3517,6 @@ ModelPluginComponent = __decorate([
     return pluginComp == null ? void 0 : pluginComp.scene;
 }
 
-/**
- * 场景树元素类，支持插件中节点树相关的动画能力
- */ var ModelTreeItem = /*#__PURE__*/ function() {
-    function ModelTreeItem(props, owner) {
-        this.baseTransform = owner.transform;
-        this.animationManager = new PAnimationManager(props, owner);
-        this.build(props);
-    }
-    var _proto = ModelTreeItem.prototype;
-    /**
-   * 场景树更新，主要是动画更新
-   * @param dt - 时间间隔
-   */ _proto.tick = function tick(dt) {
-        this.animationManager.tick(dt);
-    };
-    /**
-   * 获取所有节点
-   * @returns
-   */ _proto.getNodes = function getNodes() {
-        return this.nodes;
-    };
-    /**
-   * 根据节点编号，查询节点
-   * @param nodeId - 节点编号
-   * @returns
-   */ _proto.getNodeById = function getNodeById(nodeId) {
-        var cache = this.cacheMap;
-        if (!cache[nodeId]) {
-            var index = "^" + nodeId;
-            // @ts-expect-error
-            cache[nodeId] = this.allNodes.find(function(node) {
-                return node.id === index;
-            });
-        }
-        return cache[nodeId];
-    };
-    /**
-   * 根据节点名称，查询节点
-   * @param name - 名称
-   * @returns
-   */ _proto.getNodeByName = function getNodeByName(name) {
-        var cache = this.cacheMap;
-        if (!cache[name]) {
-            // @ts-expect-error
-            cache[name] = this.allNodes.find(function(node) {
-                return node.name === name;
-            });
-        }
-        return cache[name];
-    };
-    /**
-   * 根据节点 id 查询节点变换，如果查询不到节点就直接返回基础变换
-   * @param nodeId - 节点 id
-   * @returns
-   */ _proto.getNodeTransform = function getNodeTransform(nodeId) {
-        var node = this.getNodeById(nodeId);
-        return node ? node.transform : this.baseTransform;
-    };
-    /**
-   * 销毁场景树对象
-   */ _proto.dispose = function dispose() {
-        var _this_animationManager;
-        this.allNodes = [];
-        this.nodes = [];
-        this.cacheMap = {};
-        // @ts-expect-error
-        this.baseTransform = null;
-        (_this_animationManager = this.animationManager) == null ? void 0 : _this_animationManager.dispose();
-        // @ts-expect-error
-        this.animationManager = null;
-    };
-    _proto.build = function build(options) {
-        var _this = this;
-        var topTransform = this.baseTransform;
-        var nodes = options.nodes.map(function(node, i) {
-            return {
-                name: node.name || node.id || i + "",
-                transform: new Transform(_extends({}, node.transform, {
-                    valid: true
-                }), topTransform),
-                id: "^" + (node.id || i),
-                children: [],
-                tree: _this
-            };
-        });
-        this.cacheMap = {};
-        nodes.forEach(function(node, i) {
-            var children = options.nodes[i].children;
-            // @ts-expect-error
-            node.transform.name = node.name;
-            node.transform.setValid(true);
-            if (children) {
-                children.forEach(function(index) {
-                    var child = nodes[index];
-                    if (child && child !== node) {
-                        if (child.transform.parentTransform !== topTransform) {
-                            console.error("Node parent has been set.");
-                        }
-                        child.transform.parentTransform = node.transform;
-                        node.children.push(child);
-                    }
-                });
-            }
-        });
-        this.allNodes = nodes;
-        this.nodes = options.children.map(function(i) {
-            return nodes[i];
-        });
-    };
-    return ModelTreeItem;
-}();
 var ModelTreeComponent = /*#__PURE__*/ function(Behaviour) {
     _inherits(ModelTreeComponent, Behaviour);
     function ModelTreeComponent(engine, options) {
@@ -3923,56 +3534,6 @@ var ModelTreeComponent = /*#__PURE__*/ function(Behaviour) {
    */ _proto.fromData = function fromData(options) {
         Behaviour.prototype.fromData.call(this, options);
         this.options = options;
-        this.createContent();
-    };
-    /**
-   * 组件开始，查询合成中场景管理器并设置到动画管理器中
-   */ _proto.onStart = function onStart() {
-        this.item.type = spec.ItemType.tree;
-        this.content.baseTransform.setValid(true);
-        var sceneManager = getSceneManager(this);
-        if (sceneManager) {
-            this.content.animationManager.setSceneManager(sceneManager);
-        }
-    };
-    /**
-   * 组件更新，内部对象更新
-   * @param dt
-   */ _proto.onUpdate = function onUpdate(dt) {
-        var // this.timeline?.getRenderData(time, true);
-        // TODO: 需要使用lifetime
-        _this_content;
-        (_this_content = this.content) == null ? void 0 : _this_content.tick(dt);
-    };
-    /**
-   * 组件销毁，内部对象销毁
-   */ _proto.onDestroy = function onDestroy() {
-        var _this_content;
-        (_this_content = this.content) == null ? void 0 : _this_content.dispose();
-    };
-    /**
-   * 创建内部场景树元素
-   */ _proto.createContent = function createContent() {
-        if (this.options) {
-            var treeOptions = this.options.options.tree;
-            this.content = new ModelTreeItem(treeOptions, this.item);
-        }
-    };
-    /**
-   * 获取元素的变换
-   * @param itemId - 元素索引
-   * @returns
-   */ _proto.getNodeTransform = function getNodeTransform(itemId) {
-        if (this.content === undefined) {
-            return this.transform;
-        }
-        var idWithSubfix = this.item.id + "^";
-        if (itemId.indexOf(idWithSubfix) === 0) {
-            var nodeId = itemId.substring(idWithSubfix.length);
-            return this.content.getNodeTransform(nodeId);
-        } else {
-            return this.transform;
-        }
     };
     return ModelTreeComponent;
 }(Behaviour);
@@ -3980,24 +3541,6 @@ ModelTreeComponent = __decorate([
     effectsClass(spec.DataType.TreeComponent)
 ], ModelTreeComponent);
 
-/**
- * 场景树插件类，支持 3D 相关的节点动画和骨骼动画等
- */ var ModelTreePlugin = /*#__PURE__*/ function(AbstractPlugin) {
-    _inherits(ModelTreePlugin, AbstractPlugin);
-    function ModelTreePlugin() {
-        var _this;
-        _this = AbstractPlugin.apply(this, arguments) || this;
-        /**
-   * 插件名称
-   */ _this.name = "tree";
-        /**
-   * 高优先级更新
-   */ _this.order = 2;
-        return _this;
-    }
-    return ModelTreePlugin;
-}(AbstractPlugin);
-
 var CameraGestureType;
 (function(CameraGestureType) {
     CameraGestureType[CameraGestureType["none"] = 0] = "none";
@@ -4402,9 +3945,8 @@ var CameraGestureHandlerImp = /*#__PURE__*/ function() {
     return CameraGestureHandlerImp;
 }();
 
-registerPlugin("tree", ModelTreePlugin, VFXItem, true);
 registerPlugin("model", ModelPlugin, VFXItem);
-var version = "2.1.0-alpha.7";
+var version = "2.1.0-alpha.9";
 logger.info("Plugin model version: " + version + ".");
 if (version !== EFFECTS.version) {
     console.error("注意：请统一 Model 插件与 Player 版本，不统一的版本混用会有不可预知的后果！", "\nAttention: Please ensure the Model plugin is synchronized with the Player version. Mixing and matching incompatible versions may result in unpredictable consequences!");
@@ -6155,31 +5697,6 @@ var normal = new Vector3();
                             console.error("setupItem3DOptions: Invalid inverseBindMatrices type, " + inverseBindMatrices + ".");
                         }
                     }
-                } else if (item.type === spec.ItemType.tree) {
-                    var jsonItem = item;
-                    var studioItem = item;
-                    var jsonAnimations = jsonItem.content.options.tree.animations;
-                    var studioAnimations = studioItem.content.options.tree.animations;
-                    if (jsonAnimations !== undefined && studioAnimations !== undefined) {
-                        jsonAnimations.forEach(function(jsonAnim, i) {
-                            var studioAnim = studioAnimations[i];
-                            jsonAnim.tracks.forEach(function(jsonTrack, j) {
-                                var inputArray = typedArrayFromBinary(scene.bins, jsonTrack.input);
-                                var outputArray = typedArrayFromBinary(scene.bins, jsonTrack.output);
-                                var studioTrack = studioAnim.tracks[j];
-                                if (_instanceof1(inputArray, Float32Array)) {
-                                    studioTrack.input = inputArray;
-                                } else {
-                                    console.error("setupItem3DOptions: Type of inputArray should be float32, " + inputArray + ".");
-                                }
-                                if (_instanceof1(outputArray, Float32Array)) {
-                                    studioTrack.output = outputArray;
-                                } else {
-                                    console.error("setupItem3DOptions: Type of outputArray should be float32, " + outputArray + ".");
-                                }
-                            });
-                        });
-                    }
                 } else if (item.type === spec.ItemType.skybox) {
                     var skybox = item;
                     var studioSkybox = item;
@@ -8118,144 +7635,6 @@ var PAnimPathType;
     PAnimPathType[PAnimPathType["scale"] = 2] = "scale";
     PAnimPathType[PAnimPathType["weights"] = 3] = "weights";
 })(PAnimPathType || (PAnimPathType = {}));
-/**
- * 动画轨道类
- */ var PAnimTrack = /*#__PURE__*/ function() {
-    function PAnimTrack(options) {
-        /**
-   * 路径类型
-   */ this.path = 0;
-        /**
-   * 插值类型
-   */ this.interp = 0;
-        var node = options.node, input = options.input, output = options.output, path = options.path, interpolation = options.interpolation;
-        this.node = node;
-        this.timeArray = input;
-        this.dataArray = output;
-        //
-        if (path === "translation") {
-            this.path = 0;
-            this.component = 3;
-        } else if (path === "rotation") {
-            this.path = 1;
-            this.component = 4;
-        } else if (path === "scale") {
-            this.path = 2;
-            this.component = 3;
-        } else if (path === "weights") {
-            this.path = 3;
-            this.component = this.dataArray.length / this.timeArray.length;
-            // special checker for weights animation
-            if (this.component <= 0) {
-                console.error("Invalid weights component: " + this.timeArray.length + ", " + this.component + ", " + this.dataArray.length + ".");
-            } else if (this.timeArray.length * this.component != this.dataArray.length) {
-                console.error("Invalid weights array length: " + this.timeArray.length + ", " + this.component + ", " + this.dataArray.length + ".");
-            }
-        } else {
-            // should never happened
-            console.error("Invalid path status: " + path + ".");
-        }
-        if (this.timeArray.length * this.component > this.dataArray.length) {
-            throw new Error("Data length mismatch: " + this.timeArray.length + ", " + this.component + ", " + this.dataArray.length + ".");
-        }
-        if (interpolation === "LINEAR") {
-            this.interp = 0;
-        } else if (interpolation === "STEP") {
-            this.interp = 1;
-        } else {
-            this.interp = 2;
-        }
-        this.sampler = createAnimationSampler(this.getInterpInfo(), this.timeArray, this.dataArray, this.component, this.getPathInfo());
-    }
-    var _proto = PAnimTrack.prototype;
-    /**
-   * 销毁
-   */ _proto.dispose = function dispose() {
-        var _this_sampler;
-        // @ts-expect-error
-        this.timeArray = undefined;
-        // @ts-expect-error
-        this.dataArray = undefined;
-        (_this_sampler = this.sampler) == null ? void 0 : _this_sampler.dispose();
-        this.sampler = undefined;
-    };
-    /**
-   * 更新节点动画数据
-   * @param time - 当前播放时间
-   * @param treeItem - 节点树元素
-   * @param sceneManager - 3D 场景管理器
-   */ _proto.tick = function tick(time, treeItem, sceneManager) {
-        var _treeComponent_content;
-        var treeComponent = treeItem.getComponent(ModelTreeComponent);
-        var node = treeComponent == null ? void 0 : (_treeComponent_content = treeComponent.content) == null ? void 0 : _treeComponent_content.getNodeById(this.node);
-        if (this.sampler !== undefined && node !== undefined) {
-            var result = this.sampler.evaluate(time);
-            switch(this.path){
-                case 0:
-                    node.transform.setPosition(result[0], result[1], result[2]);
-                    break;
-                case 1:
-                    node.transform.setQuaternion(result[0], result[1], result[2], result[3]);
-                    break;
-                case 2:
-                    node.transform.setScale(result[0], result[1], result[2]);
-                    break;
-                case 3:
-                    {
-                        /**
-             * 先生成Mesh的父节点id，然后通过id查询Mesh对象
-             * 最后更新Mesh对象权重数据
-             */ var parentId = this.genParentId(treeItem.id, this.node);
-                        var mesh = sceneManager == null ? void 0 : sceneManager.queryMesh(parentId);
-                        if (mesh !== undefined) {
-                            mesh.updateMorphWeights(result);
-                        }
-                    }
-                    break;
-            }
-        } else {
-            if (this.sampler !== undefined) {
-                console.error("AnimTrack: error", this.sampler, node);
-            }
-        }
-    };
-    /**
-   * 获取动画结束时间
-   * @returns
-   */ _proto.getEndTime = function getEndTime() {
-        var index = this.timeArray.length - 1;
-        return this.timeArray[index];
-    };
-    /**
-   * 生成 Mesh 元素的父节点
-   *
-   * @param parentId - 父节点 id 名称
-   * @param nodeIndex - Mesh 节点索引
-   *
-   * @returns 生成的 Mesh 节点名称
-   */ _proto.genParentId = function genParentId(parentId, nodeIndex) {
-        return parentId + "^" + nodeIndex;
-    };
-    _proto.getPathInfo = function getPathInfo() {
-        if (this.path === 2) {
-            return "scale";
-        } else if (this.path === 1) {
-            return "rotation";
-        } else {
-            return "translation";
-        }
-    };
-    _proto.getInterpInfo = function getInterpInfo() {
-        if (this.interp === 2) {
-            return "CUBICSPLINE";
-        } else if (this.interp === 1) {
-            return "STEP";
-        } else {
-            return "LINEAR";
-        }
-    };
-    return PAnimTrack;
-}();
 /**
  * 动画纹理类
  */ var PAnimTexture = /*#__PURE__*/ function() {
@@ -8342,148 +7721,6 @@ var PAnimPathType;
     };
     return PAnimTexture;
 }();
-/**
- * 动画类，负责动画数据创建、更新和销毁
- */ var PAnimation = /*#__PURE__*/ function(PObject) {
-    _inherits(PAnimation, PObject);
-    function PAnimation() {
-        var _this;
-        _this = PObject.apply(this, arguments) || this;
-        _this.time = 0;
-        _this.duration = 0;
-        _this.tracks = [];
-        return _this;
-    }
-    var _proto = PAnimation.prototype;
-    /**
-   * 创建动画对象
-   * @param options - 动画参数
-   */ _proto.create = function create(options) {
-        var _this = this;
-        var _options_name;
-        this.name = this.genName((_options_name = options.name) != null ? _options_name : "Unnamed animation");
-        this.type = PObjectType.animation;
-        //
-        this.time = 0;
-        this.duration = 0;
-        //
-        this.tracks = [];
-        options.tracks.forEach(function(inTrack) {
-            var track = new PAnimTrack(inTrack);
-            _this.tracks.push(track);
-            _this.duration = Math.max(_this.duration, track.getEndTime());
-        });
-    };
-    /**
-   * 动画更新
-   * @param time - 当前时间
-   * @param treeItem - 场景树元素
-   * @param sceneManager - 3D 场景管理器
-   */ _proto.tick = function tick(time, treeItem, sceneManager) {
-        this.time = time;
-        // TODO: 这里时间事件定义不明确，先兼容原先实现
-        var newTime = this.time % this.duration;
-        this.tracks.forEach(function(track) {
-            track.tick(newTime, treeItem, sceneManager);
-        });
-    };
-    /**
-   * 销毁
-   */ _proto.dispose = function dispose() {
-        this.tracks.forEach(function(track) {
-            track.dispose();
-        });
-        this.tracks = [];
-    };
-    return PAnimation;
-}(PObject);
-/**
- * 动画管理类，负责管理动画对象
- */ var PAnimationManager = /*#__PURE__*/ function(PObject) {
-    _inherits(PAnimationManager, PObject);
-    function PAnimationManager(treeOptions, ownerItem) {
-        var _this;
-        _this = PObject.call(this) || this;
-        _this.animation = 0;
-        _this.speed = 0;
-        _this.delay = 0;
-        _this.time = 0;
-        _this.animations = [];
-        var _ownerItem_name;
-        _this.name = _this.genName((_ownerItem_name = ownerItem.name) != null ? _ownerItem_name : "Unnamed tree");
-        _this.type = PObjectType.animationManager;
-        //
-        _this.ownerItem = ownerItem;
-        var _treeOptions_animation;
-        _this.animation = (_treeOptions_animation = treeOptions.animation) != null ? _treeOptions_animation : -1;
-        _this.speed = 1.0;
-        var _ownerItem_start;
-        _this.delay = (_ownerItem_start = ownerItem.start) != null ? _ownerItem_start : 0;
-        _this.animations = [];
-        if (treeOptions.animations !== undefined) {
-            treeOptions.animations.forEach(function(animOpts) {
-                var anim = _this.createAnimation(animOpts);
-                _this.animations.push(anim);
-            });
-        }
-        return _this;
-    }
-    var _proto = PAnimationManager.prototype;
-    /**
-   * 设置场景管理器
-   * @param sceneManager - 场景管理器
-   */ _proto.setSceneManager = function setSceneManager(sceneManager) {
-        this.sceneManager = sceneManager;
-    };
-    /**
-   * 创建动画对象
-   * @param animationOpts - 动画参数
-   * @returns 动画对象
-   */ _proto.createAnimation = function createAnimation(animationOpts) {
-        var animation = new PAnimation();
-        animation.create(animationOpts);
-        return animation;
-    };
-    /**
-   * 动画更新
-   * @param deltaSeconds - 更新间隔
-   */ _proto.tick = function tick(deltaSeconds) {
-        var _this = this;
-        var newDeltaSeconds = deltaSeconds * this.speed * 0.001;
-        this.time += newDeltaSeconds;
-        // TODO: 需要合并到TreeItem中，通过lifetime进行计算
-        var itemTime = this.time - this.delay;
-        if (itemTime >= 0) {
-            if (this.animation >= 0 && this.animation < this.animations.length) {
-                var anim = this.animations[this.animation];
-                anim.tick(itemTime, this.ownerItem, this.sceneManager);
-            } else if (this.animation == -88888888) {
-                this.animations.forEach(function(anim) {
-                    anim.tick(itemTime, _this.ownerItem, _this.sceneManager);
-                });
-            }
-        }
-    };
-    /**
-   * 销毁
-   */ _proto.dispose = function dispose() {
-        // @ts-expect-error
-        this.ownerItem = null;
-        this.animations.forEach(function(anim) {
-            anim.dispose();
-        });
-        this.animations = [];
-        // @ts-expect-error
-        this.sceneManager = null;
-    };
-    /**
-   * 获取场景树元素
-   * @returns
-   */ _proto.getTreeItem = function getTreeItem() {
-        return this.ownerItem;
-    };
-    return PAnimationManager;
-}(PObject);
 
 var deg2rad = Math.PI / 180;
 /**
@@ -9938,15 +9175,6 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
     _proto.isHide = function isHide() {
         return this.data.hide === true;
     };
-    _proto.getParentNode = function getParentNode() {
-        var _this_parentItem;
-        var nodeIndex = this.getParentIndex();
-        var parentTree = (_this_parentItem = this.parentItem) == null ? void 0 : _this_parentItem.getComponent(ModelTreeComponent);
-        if (parentTree !== undefined && nodeIndex >= 0) {
-            return parentTree.content.getNodeById(nodeIndex);
-        }
-        return undefined;
-    };
     _proto.getParentIndex = function getParentIndex() {
         return -1;
     };
@@ -10337,7 +9565,7 @@ var JSONConverter = /*#__PURE__*/ function() {
     _proto.processScene = function processScene(sceneData) {
         var _this = this;
         return _async_to_generator(function() {
-            var sceneJSON, _tmp, oldScene, _oldScene_bins, oldBinUrls, binFiles, _iterator, _step, bin, _, newScene;
+            var sceneJSON, _tmp, oldScene, _oldScene_bins, oldBinUrls, binFiles, v, _iterator, _step, bin, _, newScene;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -10374,6 +9602,14 @@ var JSONConverter = /*#__PURE__*/ function() {
                         oldScene = getStandardJSON(sceneJSON);
                         oldBinUrls = (_oldScene_bins = oldScene.bins) != null ? _oldScene_bins : [];
                         binFiles = [];
+                        //@ts-expect-error
+                        v = sceneJSON.version.split(".");
+                        if (Number(v[0]) >= 3) {
+                            return [
+                                2,
+                                oldScene
+                            ];
+                        }
                         if (!oldScene.bins) return [
                             3,
                             7
@@ -10573,7 +9809,6 @@ var JSONConverter = /*#__PURE__*/ function() {
                 this.createItemsFromTreeComponent(comp, newScene, oldScene);
                 treeComp.options.tree.animation = undefined;
                 treeComp.options.tree.animations = undefined;
-                newComponents.push(comp);
             } else if (comp.dataType !== spec.DataType.MeshComponent) {
                 newComponents.push(comp);
             }
@@ -11011,6 +10246,7 @@ var JSONConverter = /*#__PURE__*/ function() {
                 });
             });
         }
+        treeItem.components = [];
         treeItem.components.push({
             id: animationComponent.id
         });
@@ -12348,6 +11584,59 @@ var LoaderImpl = /*#__PURE__*/ function() {
         this.items.push(item);
         this.components.push(component);
     };
+    _proto.addSkybox = function addSkybox(skybox) {
+        var _this_images, // @ts-expect-error
+        _this_textures;
+        var itemId = generateGUID();
+        var skyboxInfo = PSkyboxCreator.createSkyboxComponentData(skybox);
+        var imageList = skyboxInfo.imageList, textureOptionsList = skyboxInfo.textureOptionsList, component = skyboxInfo.component;
+        component.item.id = itemId;
+        if (skybox.intensity !== undefined) {
+            component.intensity = skybox.intensity;
+        }
+        if (skybox.reflectionsIntensity !== undefined) {
+            component.reflectionsIntensity = skybox.reflectionsIntensity;
+        }
+        var _skybox_renderable;
+        component.renderable = (_skybox_renderable = skybox.renderable) != null ? _skybox_renderable : false;
+        var item = {
+            id: itemId,
+            name: "Skybox-Customize",
+            duration: 999,
+            type: spec.ItemType.skybox,
+            pn: 0,
+            visible: true,
+            endBehavior: spec.EndBehavior.freeze,
+            transform: {
+                position: {
+                    x: 0,
+                    y: 0,
+                    z: 0
+                },
+                eulerHint: {
+                    x: 0,
+                    y: 0,
+                    z: 0
+                },
+                scale: {
+                    x: 1,
+                    y: 1,
+                    z: 1
+                }
+            },
+            components: [
+                {
+                    id: component.id
+                }
+            ],
+            content: {},
+            dataType: spec.DataType.VFXItemData
+        };
+        (_this_images = this.images).push.apply(_this_images, [].concat(imageList));
+        (_this_textures = this.textures).push.apply(_this_textures, [].concat(textureOptionsList));
+        this.items.push(item);
+        this.components.push(component);
+    };
     _proto.tryAddSkybox = function tryAddSkybox(skybox) {
         var _this = this;
         return _async_to_generator(function() {
@@ -12482,43 +11771,6 @@ var LoaderImpl = /*#__PURE__*/ function() {
         });
         return sceneAABB;
     };
-    /**
-   * 按照传入的动画播放参数，计算需要播放的动画索引
-   *
-   * @param treeOptions 节点树属性，需要初始化animations列表。
-   * @returns 返回计算的动画索引，-1表示没有动画需要播放，-88888888表示播放所有动画。
-   */ _proto.getPlayAnimationIndex = function getPlayAnimationIndex(treeOptions) {
-        var animations = treeOptions.animations;
-        if (animations === undefined || animations.length <= 0) {
-            // 硬编码，内部指定的不播放动画的索引值
-            return -1;
-        }
-        if (this.isPlayAllAnimation()) {
-            // 硬编码，内部指定的播放全部动画的索引值
-            return -88888888;
-        }
-        var animationInfo = this.sceneOptions.effects.playAnimation;
-        if (animationInfo === undefined) {
-            return -1;
-        }
-        if (typeof animationInfo === "number") {
-            if (animationInfo >= 0 && animationInfo < animations.length) {
-                return animationInfo;
-            } else {
-                return -1;
-            }
-        } else {
-            // typeof animationInfo === 'string'
-            var animationIndex = -1;
-            // 通过动画名字查找动画索引
-            animations.forEach(function(anim, index) {
-                if (anim.name === animationInfo) {
-                    animationIndex = index;
-                }
-            });
-            return animationIndex;
-        }
-    };
     _proto.isPlayAnimation = function isPlayAnimation() {
         return this.sceneOptions.effects.playAnimation !== undefined;
     };
@@ -12660,64 +11912,6 @@ var LoaderImpl = /*#__PURE__*/ function() {
             }
         });
     };
-    _proto.createTreeOptions = function createTreeOptions(scene) {
-        var nodeList = scene.nodes.map(function(node, nodeIndex) {
-            var children = node.children.map(function(child) {
-                if (child.nodeIndex === undefined) {
-                    throw new Error("Undefined nodeIndex for child " + child);
-                }
-                return child.nodeIndex;
-            });
-            var pos;
-            var quat;
-            var scale;
-            if (node.matrix !== undefined) {
-                if (node.matrix.length !== 16) {
-                    throw new Error("Invalid matrix length " + node.matrix.length + " for node " + node);
-                }
-                var mat = Matrix4.fromArray(node.matrix);
-                var transform = mat.getTransform();
-                pos = transform.translation.toArray();
-                quat = transform.rotation.toArray();
-                scale = transform.scale.toArray();
-            } else {
-                if (node.translation !== undefined) {
-                    pos = node.translation;
-                }
-                if (node.rotation !== undefined) {
-                    quat = node.rotation;
-                }
-                if (node.scale !== undefined) {
-                    scale = node.scale;
-                }
-            }
-            node.nodeIndex = nodeIndex;
-            var treeNode = {
-                name: node.name,
-                transform: {
-                    position: pos,
-                    quat: quat,
-                    scale: scale
-                },
-                children: children,
-                id: "" + node.nodeIndex
-            };
-            return treeNode;
-        });
-        var rootNodes = scene.rootNodes.map(function(root) {
-            if (root.nodeIndex === undefined) {
-                throw new Error("Undefined nodeIndex for root " + root);
-            }
-            return root.nodeIndex;
-        });
-        var treeOptions = {
-            nodes: nodeList,
-            children: rootNodes,
-            animation: -1,
-            animations: []
-        };
-        return treeOptions;
-    };
     _proto.createAnimations = function createAnimations(animations) {
         return animations.map(function(anim) {
             var tracks = anim.channels.map(function(channel) {