@galacean/engine-core 1.1.0-alpha.2 → 1.1.0-alpha.3

package/dist/module.js

@@ -2761,6 +2761,8 @@ var DependentMode;
     function DisorderedArray(count) {
         if (count === void 0) count = 0;
         this.length = 0;
+        this._isLooping = false;
+        this._blankCount = 0;
         this._elements = new Array(count);
     }
     var _proto = DisorderedArray.prototype;
@@ -2789,21 +2791,49 @@ var DependentMode;
         }
         return this._elements[index];
     };
+    _proto.startLoop = function startLoop() {
+        this._isLooping = true;
+    };
     /**
    * Delete the element at the specified index.
    * @param index - The index of the element to be deleted
    * @returns The replaced item is used to reset its index
    */ _proto.deleteByIndex = function deleteByIndex(index) {
         var elements = this._elements;
-        var end = null;
-        var lastIndex = this.length - 1;
-        if (index !== lastIndex) {
-            end = elements[lastIndex];
-            elements[index] = end;
+        var end;
+        if (this._isLooping) {
+            this._elements[index] = null;
+            this._blankCount++;
+        } else {
+            var endIndex = this.length - 1;
+            if (index !== endIndex) {
+                end = elements[endIndex];
+                elements[index] = end;
+            }
+            elements[endIndex] = null;
+            this.length--;
         }
-        this.length--;
         return end;
     };
+    _proto.endLoop = function endLoop() {
+        this._isLooping = false;
+        if (this._blankCount) {
+            var elements = this._elements;
+            for(var i = 0, j = 0, n = this.length; i < n; i++){
+                var element = elements[i];
+                if (element) {
+                    elements[j++] = element;
+                }
+            }
+            this.length -= this._blankCount;
+            this._blankCount = 0;
+        }
+    };
+    _proto.endLoopAndClear = function endLoopAndClear() {
+        this._isLooping = false;
+        this.length = 0;
+        this._blankCount = 0;
+    };
     _proto.garbageCollection = function garbageCollection() {
         this._elements.length = this.length;
     };
@@ -4040,11 +4070,13 @@ var ComponentCloner = /*#__PURE__*/ function() {
             if (!this._isActiveInHierarchy) {
                 child._isActiveInHierarchy && (inActiveChangeFlag |= ActiveChangeFlag.Hierarchy);
             }
-            if (this._isActiveInScene) {
-                // cross scene should inActive first and then active
-                child._isActiveInScene && oldScene !== newScene && (inActiveChangeFlag |= ActiveChangeFlag.Scene);
-            } else {
-                child._isActiveInScene && (inActiveChangeFlag |= ActiveChangeFlag.Scene);
+            if (child._isActiveInScene) {
+                if (this._isActiveInScene) {
+                    // Cross scene should inActive first and then active
+                    oldScene !== newScene && (inActiveChangeFlag |= ActiveChangeFlag.Scene);
+                } else {
+                    inActiveChangeFlag |= ActiveChangeFlag.Scene;
+                }
             }
             inActiveChangeFlag && child._processInActive(inActiveChangeFlag);
             if (child._scene !== newScene) {
@@ -5017,7 +5049,7 @@ var begin_mobile_frag = "#define GLSLIFY 1\nvec4 ambient=vec4(0.0);vec4 emission
 
 var begin_viewdir_frag = "#define GLSLIFY 1\n#ifdef MATERIAL_NEED_WORLD_POS\nvec3 V=normalize(camera_Position-v_pos);\n#endif\n"; // eslint-disable-line
 
-var mobile_blinnphong_frag = "#define GLSLIFY 1\n#ifdef MATERIAL_HAS_NORMALTEXTURE\nmat3 tbn=getTBN(gl_FrontFacing);vec3 N=getNormalByNormalTexture(tbn,material_NormalTexture,material_NormalIntensity,v_uv,gl_FrontFacing);\n#else\nvec3 N=getNormal(gl_FrontFacing);\n#endif\nvec3 lightDiffuse=vec3(0.0,0.0,0.0);vec3 lightSpecular=vec3(0.0,0.0,0.0);float shadowAttenuation=1.0;\n#ifdef SCENE_DIRECT_LIGHT_COUNT\nshadowAttenuation=1.0;\n#ifdef SCENE_IS_CALCULATE_SHADOWS\nshadowAttenuation*=sampleShadowMap();\n#endif\nDirectLight directionalLight;for(int i=0;i<SCENE_DIRECT_LIGHT_COUNT;i++){if(isRendererCulledByLight(renderer_Layer.xy,scene_DirectLightCullingMask[i]))continue;directionalLight.color=scene_DirectLightColor[i];\n#ifdef SCENE_IS_CALCULATE_SHADOWS\nif(i==0){directionalLight.color*=shadowAttenuation;}\n#endif\ndirectionalLight.direction=scene_DirectLightDirection[i];float d=max(dot(N,-directionalLight.direction),0.0);lightDiffuse+=directionalLight.color*d;vec3 halfDir=normalize(V-directionalLight.direction);float s=pow(clamp(dot(N,halfDir),0.0,1.0),material_Shininess);lightSpecular+=directionalLight.color*s;}\n#endif\n#ifdef SCENE_POINT_LIGHT_COUNT\nPointLight pointLight;for(int i=0;i<SCENE_POINT_LIGHT_COUNT;i++){if(isRendererCulledByLight(renderer_Layer.xy,scene_PointLightCullingMask[i]))continue;pointLight.color=scene_PointLightColor[i];pointLight.position=scene_PointLightPosition[i];pointLight.distance=scene_PointLightDistance[i];vec3 direction=v_pos-pointLight.position;float dist=length(direction);direction/=dist;float decay=clamp(1.0-pow(dist/pointLight.distance,4.0),0.0,1.0);float d=max(dot(N,-direction),0.0)*decay;lightDiffuse+=pointLight.color*d;vec3 halfDir=normalize(V-direction);float s=pow(clamp(dot(N,halfDir),0.0,1.0),material_Shininess)*decay;lightSpecular+=pointLight.color*s;}\n#endif\n#ifdef SCENE_SPOT_LIGHT_COUNT\nSpotLight spotLight;for(int i=0;i<SCENE_SPOT_LIGHT_COUNT;i++){if(isRendererCulledByLight(renderer_Layer.xy,scene_SpotLightCullingMask[i]))continue;spotLight.color=scene_SpotLightColor[i];spotLight.position=scene_SpotLightPosition[i];spotLight.direction=scene_SpotLightDirection[i];spotLight.distance=scene_SpotLightDistance[i];spotLight.angleCos=scene_SpotLightAngleCos[i];spotLight.penumbraCos=scene_SpotLightPenumbraCos[i];vec3 direction=spotLight.position-v_pos;float lightDistance=length(direction);direction/=lightDistance;float angleCos=dot(direction,-spotLight.direction);float decay=clamp(1.0-pow(lightDistance/spotLight.distance,4.0),0.0,1.0);float spotEffect=smoothstep(spotLight.penumbraCos,spotLight.angleCos,angleCos);float decayTotal=decay*spotEffect;float d=max(dot(N,direction),0.0)*decayTotal;lightDiffuse+=spotLight.color*d;vec3 halfDir=normalize(V+direction);float s=pow(clamp(dot(N,halfDir),0.0,1.0),material_Shininess)*decayTotal;lightSpecular+=spotLight.color*s;}\n#endif\ndiffuse*=vec4(lightDiffuse,1.0);specular*=vec4(lightSpecular,1.0);\n#ifdef MATERIAL_IS_ALPHA_CUTOFF\nif(diffuse.a<material_AlphaCutoff){discard;}\n#endif\n"; // eslint-disable-line
+var mobile_blinnphong_frag = "#define GLSLIFY 1\n#ifdef MATERIAL_HAS_NORMALTEXTURE\nmat3 tbn=getTBN(gl_FrontFacing);vec3 N=getNormalByNormalTexture(tbn,material_NormalTexture,material_NormalIntensity,v_uv,gl_FrontFacing);\n#else\nvec3 N=getNormal(gl_FrontFacing);\n#endif\nvec3 lightDiffuse=vec3(0.0,0.0,0.0);vec3 lightSpecular=vec3(0.0,0.0,0.0);float shadowAttenuation=1.0;\n#ifdef SCENE_DIRECT_LIGHT_COUNT\nshadowAttenuation=1.0;\n#ifdef SCENE_IS_CALCULATE_SHADOWS\nshadowAttenuation*=sampleShadowMap();\n#endif\nDirectLight directionalLight;for(int i=0;i<SCENE_DIRECT_LIGHT_COUNT;i++){if(!isRendererCulledByLight(renderer_Layer.xy,scene_DirectLightCullingMask[i])){directionalLight.color=scene_DirectLightColor[i];\n#ifdef SCENE_IS_CALCULATE_SHADOWS\nif(i==0){directionalLight.color*=shadowAttenuation;}\n#endif\ndirectionalLight.direction=scene_DirectLightDirection[i];float d=max(dot(N,-directionalLight.direction),0.0);lightDiffuse+=directionalLight.color*d;vec3 halfDir=normalize(V-directionalLight.direction);float s=pow(clamp(dot(N,halfDir),0.0,1.0),material_Shininess);lightSpecular+=directionalLight.color*s;}}\n#endif\n#ifdef SCENE_POINT_LIGHT_COUNT\nPointLight pointLight;for(int i=0;i<SCENE_POINT_LIGHT_COUNT;i++){if(!isRendererCulledByLight(renderer_Layer.xy,scene_PointLightCullingMask[i])){pointLight.color=scene_PointLightColor[i];pointLight.position=scene_PointLightPosition[i];pointLight.distance=scene_PointLightDistance[i];vec3 direction=v_pos-pointLight.position;float dist=length(direction);direction/=dist;float decay=clamp(1.0-pow(dist/pointLight.distance,4.0),0.0,1.0);float d=max(dot(N,-direction),0.0)*decay;lightDiffuse+=pointLight.color*d;vec3 halfDir=normalize(V-direction);float s=pow(clamp(dot(N,halfDir),0.0,1.0),material_Shininess)*decay;lightSpecular+=pointLight.color*s;}}\n#endif\n#ifdef SCENE_SPOT_LIGHT_COUNT\nSpotLight spotLight;for(int i=0;i<SCENE_SPOT_LIGHT_COUNT;i++){if(!isRendererCulledByLight(renderer_Layer.xy,scene_SpotLightCullingMask[i])){spotLight.color=scene_SpotLightColor[i];spotLight.position=scene_SpotLightPosition[i];spotLight.direction=scene_SpotLightDirection[i];spotLight.distance=scene_SpotLightDistance[i];spotLight.angleCos=scene_SpotLightAngleCos[i];spotLight.penumbraCos=scene_SpotLightPenumbraCos[i];vec3 direction=spotLight.position-v_pos;float lightDistance=length(direction);direction/=lightDistance;float angleCos=dot(direction,-spotLight.direction);float decay=clamp(1.0-pow(lightDistance/spotLight.distance,4.0),0.0,1.0);float spotEffect=smoothstep(spotLight.penumbraCos,spotLight.angleCos,angleCos);float decayTotal=decay*spotEffect;float d=max(dot(N,direction),0.0)*decayTotal;lightDiffuse+=spotLight.color*d;vec3 halfDir=normalize(V+direction);float s=pow(clamp(dot(N,halfDir),0.0,1.0),material_Shininess)*decayTotal;lightSpecular+=spotLight.color*s;}}\n#endif\ndiffuse*=vec4(lightDiffuse,1.0);specular*=vec4(lightSpecular,1.0);\n#ifdef MATERIAL_IS_ALPHA_CUTOFF\nif(diffuse.a<material_AlphaCutoff){discard;}\n#endif\n"; // eslint-disable-line
 
 var noise_cellular = "#define GLSLIFY 1\n#include <noise_cellular_2D>\n#include <noise_cellular_3D>\n#include <noise_cellular_2x2>\n#include <noise_cellular_2x2x2>\n"; // eslint-disable-line
 
@@ -5057,7 +5089,7 @@ var pbr_helper = "#define GLSLIFY 1\n#include <normal_get>\nfloat computeSpecula
 
 var brdf = "#define GLSLIFY 1\nfloat F_Schlick(float dotLH){return 0.04+0.96*(pow(1.0-dotLH,5.0));}vec3 F_Schlick(vec3 specularColor,float dotLH){float fresnel=exp2((-5.55473*dotLH-6.98316)*dotLH);return(1.0-specularColor)*fresnel+specularColor;}float G_GGX_SmithCorrelated(float alpha,float dotNL,float dotNV){float a2=pow2(alpha);float gv=dotNL*sqrt(a2+(1.0-a2)*pow2(dotNV));float gl=dotNV*sqrt(a2+(1.0-a2)*pow2(dotNL));return 0.5/max(gv+gl,EPSILON);}float D_GGX(float alpha,float dotNH){float a2=pow2(alpha);float denom=pow2(dotNH)*(a2-1.0)+1.0;return RECIPROCAL_PI*a2/pow2(denom);}vec3 BRDF_Specular_GGX(vec3 incidentDirection,vec3 viewDir,vec3 normal,vec3 specularColor,float roughness){float alpha=pow2(roughness);vec3 halfDir=normalize(incidentDirection+viewDir);float dotNL=saturate(dot(normal,incidentDirection));float dotNV=saturate(dot(normal,viewDir));float dotNH=saturate(dot(normal,halfDir));float dotLH=saturate(dot(incidentDirection,halfDir));vec3 F=F_Schlick(specularColor,dotLH);float G=G_GGX_SmithCorrelated(alpha,dotNL,dotNV);float D=D_GGX(alpha,dotNH);return F*(G*D);}vec3 BRDF_Diffuse_Lambert(vec3 diffuseColor){return RECIPROCAL_PI*diffuseColor;}"; // eslint-disable-line
 
-var direct_irradiance_frag_define = "#define GLSLIFY 1\n#include <ShadowFragmentDeclaration>\nvoid addDirectRadiance(vec3 incidentDirection,vec3 color,Geometry geometry,Material material,inout ReflectedLight reflectedLight){float attenuation=1.0;\n#ifdef MATERIAL_ENABLE_CLEAR_COAT\nfloat clearCoatDotNL=saturate(dot(geometry.clearCoatNormal,incidentDirection));vec3 clearCoatIrradiance=clearCoatDotNL*color;reflectedLight.directSpecular+=material.clearCoat*clearCoatIrradiance*BRDF_Specular_GGX(incidentDirection,geometry.viewDir,geometry.clearCoatNormal,vec3(0.04),material.clearCoatRoughness);attenuation-=material.clearCoat*F_Schlick(geometry.clearCoatDotNV);\n#endif\nfloat dotNL=saturate(dot(geometry.normal,incidentDirection));vec3 irradiance=dotNL*color*PI;reflectedLight.directSpecular+=attenuation*irradiance*BRDF_Specular_GGX(incidentDirection,geometry.viewDir,geometry.normal,material.specularColor,material.roughness);reflectedLight.directDiffuse+=attenuation*irradiance*BRDF_Diffuse_Lambert(material.diffuseColor);}\n#ifdef SCENE_DIRECT_LIGHT_COUNT\nvoid addDirectionalDirectLightRadiance(DirectLight directionalLight,Geometry geometry,Material material,inout ReflectedLight reflectedLight){vec3 color=directionalLight.color;vec3 direction=-directionalLight.direction;addDirectRadiance(direction,color,geometry,material,reflectedLight);}\n#endif\n#ifdef SCENE_POINT_LIGHT_COUNT\nvoid addPointDirectLightRadiance(PointLight pointLight,Geometry geometry,Material material,inout ReflectedLight reflectedLight){vec3 lVector=pointLight.position-geometry.position;vec3 direction=normalize(lVector);float lightDistance=length(lVector);vec3 color=pointLight.color;color*=clamp(1.0-pow(lightDistance/pointLight.distance,4.0),0.0,1.0);addDirectRadiance(direction,color,geometry,material,reflectedLight);}\n#endif\n#ifdef SCENE_SPOT_LIGHT_COUNT\nvoid addSpotDirectLightRadiance(SpotLight spotLight,Geometry geometry,Material material,inout ReflectedLight reflectedLight){vec3 lVector=spotLight.position-geometry.position;vec3 direction=normalize(lVector);float lightDistance=length(lVector);float angleCos=dot(direction,-spotLight.direction);float spotEffect=smoothstep(spotLight.penumbraCos,spotLight.angleCos,angleCos);float decayEffect=clamp(1.0-pow(lightDistance/spotLight.distance,4.0),0.0,1.0);vec3 color=spotLight.color;color*=spotEffect*decayEffect;addDirectRadiance(direction,color,geometry,material,reflectedLight);}\n#endif\nvoid addTotalDirectRadiance(Geometry geometry,Material material,inout ReflectedLight reflectedLight){float shadowAttenuation=1.0;\n#ifdef SCENE_DIRECT_LIGHT_COUNT\nshadowAttenuation=1.0;\n#ifdef SCENE_IS_CALCULATE_SHADOWS\nshadowAttenuation*=sampleShadowMap();\n#endif\nDirectLight directionalLight;for(int i=0;i<SCENE_DIRECT_LIGHT_COUNT;i++){if(isRendererCulledByLight(renderer_Layer.xy,scene_DirectLightCullingMask[i]))continue;directionalLight.color=scene_DirectLightColor[i];\n#ifdef SCENE_IS_CALCULATE_SHADOWS\nif(i==0){directionalLight.color*=shadowAttenuation;}\n#endif\ndirectionalLight.direction=scene_DirectLightDirection[i];addDirectionalDirectLightRadiance(directionalLight,geometry,material,reflectedLight);}\n#endif\n#ifdef SCENE_POINT_LIGHT_COUNT\nPointLight pointLight;for(int i=0;i<SCENE_POINT_LIGHT_COUNT;i++){if(isRendererCulledByLight(renderer_Layer.xy,scene_PointLightCullingMask[i]))continue;pointLight.color=scene_PointLightColor[i];pointLight.position=scene_PointLightPosition[i];pointLight.distance=scene_PointLightDistance[i];addPointDirectLightRadiance(pointLight,geometry,material,reflectedLight);}\n#endif\n#ifdef SCENE_SPOT_LIGHT_COUNT\nSpotLight spotLight;for(int i=0;i<SCENE_SPOT_LIGHT_COUNT;i++){if(isRendererCulledByLight(renderer_Layer.xy,scene_SpotLightCullingMask[i]))continue;spotLight.color=scene_SpotLightColor[i];spotLight.position=scene_SpotLightPosition[i];spotLight.direction=scene_SpotLightDirection[i];spotLight.distance=scene_SpotLightDistance[i];spotLight.angleCos=scene_SpotLightAngleCos[i];spotLight.penumbraCos=scene_SpotLightPenumbraCos[i];addSpotDirectLightRadiance(spotLight,geometry,material,reflectedLight);}\n#endif\n}"; // eslint-disable-line
+var direct_irradiance_frag_define = "#define GLSLIFY 1\n#include <ShadowFragmentDeclaration>\nvoid addDirectRadiance(vec3 incidentDirection,vec3 color,Geometry geometry,Material material,inout ReflectedLight reflectedLight){float attenuation=1.0;\n#ifdef MATERIAL_ENABLE_CLEAR_COAT\nfloat clearCoatDotNL=saturate(dot(geometry.clearCoatNormal,incidentDirection));vec3 clearCoatIrradiance=clearCoatDotNL*color;reflectedLight.directSpecular+=material.clearCoat*clearCoatIrradiance*BRDF_Specular_GGX(incidentDirection,geometry.viewDir,geometry.clearCoatNormal,vec3(0.04),material.clearCoatRoughness);attenuation-=material.clearCoat*F_Schlick(geometry.clearCoatDotNV);\n#endif\nfloat dotNL=saturate(dot(geometry.normal,incidentDirection));vec3 irradiance=dotNL*color*PI;reflectedLight.directSpecular+=attenuation*irradiance*BRDF_Specular_GGX(incidentDirection,geometry.viewDir,geometry.normal,material.specularColor,material.roughness);reflectedLight.directDiffuse+=attenuation*irradiance*BRDF_Diffuse_Lambert(material.diffuseColor);}\n#ifdef SCENE_DIRECT_LIGHT_COUNT\nvoid addDirectionalDirectLightRadiance(DirectLight directionalLight,Geometry geometry,Material material,inout ReflectedLight reflectedLight){vec3 color=directionalLight.color;vec3 direction=-directionalLight.direction;addDirectRadiance(direction,color,geometry,material,reflectedLight);}\n#endif\n#ifdef SCENE_POINT_LIGHT_COUNT\nvoid addPointDirectLightRadiance(PointLight pointLight,Geometry geometry,Material material,inout ReflectedLight reflectedLight){vec3 lVector=pointLight.position-geometry.position;vec3 direction=normalize(lVector);float lightDistance=length(lVector);vec3 color=pointLight.color;color*=clamp(1.0-pow(lightDistance/pointLight.distance,4.0),0.0,1.0);addDirectRadiance(direction,color,geometry,material,reflectedLight);}\n#endif\n#ifdef SCENE_SPOT_LIGHT_COUNT\nvoid addSpotDirectLightRadiance(SpotLight spotLight,Geometry geometry,Material material,inout ReflectedLight reflectedLight){vec3 lVector=spotLight.position-geometry.position;vec3 direction=normalize(lVector);float lightDistance=length(lVector);float angleCos=dot(direction,-spotLight.direction);float spotEffect=smoothstep(spotLight.penumbraCos,spotLight.angleCos,angleCos);float decayEffect=clamp(1.0-pow(lightDistance/spotLight.distance,4.0),0.0,1.0);vec3 color=spotLight.color;color*=spotEffect*decayEffect;addDirectRadiance(direction,color,geometry,material,reflectedLight);}\n#endif\nvoid addTotalDirectRadiance(Geometry geometry,Material material,inout ReflectedLight reflectedLight){float shadowAttenuation=1.0;\n#ifdef SCENE_DIRECT_LIGHT_COUNT\nshadowAttenuation=1.0;\n#ifdef SCENE_IS_CALCULATE_SHADOWS\nshadowAttenuation*=sampleShadowMap();\n#endif\nDirectLight directionalLight;for(int i=0;i<SCENE_DIRECT_LIGHT_COUNT;i++){if(!isRendererCulledByLight(renderer_Layer.xy,scene_DirectLightCullingMask[i])){directionalLight.color=scene_DirectLightColor[i];\n#ifdef SCENE_IS_CALCULATE_SHADOWS\nif(i==0){directionalLight.color*=shadowAttenuation;}\n#endif\ndirectionalLight.direction=scene_DirectLightDirection[i];addDirectionalDirectLightRadiance(directionalLight,geometry,material,reflectedLight);}}\n#endif\n#ifdef SCENE_POINT_LIGHT_COUNT\nPointLight pointLight;for(int i=0;i<SCENE_POINT_LIGHT_COUNT;i++){if(!isRendererCulledByLight(renderer_Layer.xy,scene_PointLightCullingMask[i])){pointLight.color=scene_PointLightColor[i];pointLight.position=scene_PointLightPosition[i];pointLight.distance=scene_PointLightDistance[i];addPointDirectLightRadiance(pointLight,geometry,material,reflectedLight);}}\n#endif\n#ifdef SCENE_SPOT_LIGHT_COUNT\nSpotLight spotLight;for(int i=0;i<SCENE_SPOT_LIGHT_COUNT;i++){if(!isRendererCulledByLight(renderer_Layer.xy,scene_SpotLightCullingMask[i])){spotLight.color=scene_SpotLightColor[i];spotLight.position=scene_SpotLightPosition[i];spotLight.direction=scene_SpotLightDirection[i];spotLight.distance=scene_SpotLightDistance[i];spotLight.angleCos=scene_SpotLightAngleCos[i];spotLight.penumbraCos=scene_SpotLightPenumbraCos[i];addSpotDirectLightRadiance(spotLight,geometry,material,reflectedLight);}}\n#endif\n}"; // eslint-disable-line
 
 var ibl_frag_define = "#define GLSLIFY 1\nvec3 getLightProbeIrradiance(vec3 sh[9],vec3 normal){normal.x=-normal.x;vec3 result=sh[0]+sh[1]*(normal.y)+sh[2]*(normal.z)+sh[3]*(normal.x)+sh[4]*(normal.y*normal.x)+sh[5]*(normal.y*normal.z)+sh[6]*(3.0*normal.z*normal.z-1.0)+sh[7]*(normal.z*normal.x)+sh[8]*(normal.x*normal.x-normal.y*normal.y);return max(result,vec3(0.0));}vec3 envBRDFApprox(vec3 specularColor,float roughness,float dotNV){const vec4 c0=vec4(-1,-0.0275,-0.572,0.022);const vec4 c1=vec4(1,0.0425,1.04,-0.04);vec4 r=roughness*c0+c1;float a004=min(r.x*r.x,exp2(-9.28*dotNV))*r.x+r.y;vec2 AB=vec2(-1.04,1.04)*a004+r.zw;return specularColor*AB.x+AB.y;}float getSpecularMIPLevel(float roughness,int maxMIPLevel){return roughness*float(maxMIPLevel);}vec3 getLightProbeRadiance(vec3 viewDir,vec3 normal,float roughness,int maxMIPLevel,float specularIntensity){\n#ifndef SCENE_USE_SPECULAR_ENV\nreturn vec3(0);\n#else\nvec3 reflectVec=reflect(-viewDir,normal);reflectVec.x=-reflectVec.x;float specularMIPLevel=getSpecularMIPLevel(roughness,maxMIPLevel);\n#ifdef HAS_TEX_LOD\nvec4 envMapColor=textureCubeLodEXT(scene_EnvSpecularSampler,reflectVec,specularMIPLevel);\n#else\nvec4 envMapColor=textureCube(scene_EnvSpecularSampler,reflectVec,specularMIPLevel);\n#endif\n#ifdef SCENE_IS_DECODE_ENV_RGBM\nenvMapColor.rgb=RGBMToLinear(envMapColor,5.0).rgb;\n#ifdef ENGINE_IS_COLORSPACE_GAMMA\nenvMapColor=linearToGamma(envMapColor);\n#endif\n#else\n#ifndef ENGINE_IS_COLORSPACE_GAMMA\nenvMapColor=gammaToLinear(envMapColor);\n#endif\n#endif\nreturn envMapColor.rgb*specularIntensity;\n#endif\n}"; // eslint-disable-line
 
@@ -11552,19 +11584,20 @@ var PrimitiveType;
     /**
    * @internal
    */ _proto.update = function update() {
-        var skin = this._skin;
-        if (skin) {
-            var ibms = skin.inverseBindMatrices;
-            var worldToLocal = this._rootBone.getInvModelMatrix();
-            var _this = this, bones = _this._bones, jointMatrices = _this._jointMatrices;
+        var _this = this, skin = _this._skin, bones = _this._bones;
+        if (skin && bones) {
             // @todo: can optimize when share skin
+            var jointMatrices = this._jointMatrices;
+            var bindMatrices = skin.inverseBindMatrices;
+            var _this__rootBone;
+            var worldToLocal = ((_this__rootBone = this._rootBone) != null ? _this__rootBone : this.entity).getInvModelMatrix();
             for(var i = bones.length - 1; i >= 0; i--){
                 var bone = bones[i];
                 var offset = i * 16;
                 if (bone) {
-                    Utils._floatMatrixMultiply(bone.transform.worldMatrix, ibms[i].elements, 0, jointMatrices, offset);
+                    Utils._floatMatrixMultiply(bone.transform.worldMatrix, bindMatrices[i].elements, 0, jointMatrices, offset);
                 } else {
-                    jointMatrices.set(ibms[i].elements, offset);
+                    jointMatrices.set(bindMatrices[i].elements, offset);
                 }
                 Utils._floatMatrixMultiply(worldToLocal, jointMatrices, offset, jointMatrices, offset);
             }
@@ -12235,6 +12268,41 @@ var TextRenderData = /*#__PURE__*/ function(RenderData) {
     return TextRenderData;
 }(RenderData);
 
+/**
+ * Asset Type.
+ */ var AssetType;
+(function(AssetType) {
+    AssetType[/**
+   * Plain text.
+   * @remarks Will not be cached based on url in ResourceManager.
+   */ "Text"] = "Text";
+    AssetType[/**
+   * JSON.
+   * @remarks Will not be cached based on url in ResourceManager.
+   */ "JSON"] = "JSON";
+    AssetType[/**
+   * ArrayBuffer.
+   * @remarks Will not be cached based on url in ResourceManager.
+   */ "Buffer"] = "Buffer";
+    AssetType[/** 2D Texture. */ "Texture2D"] = "Texture2D";
+    AssetType[/** Cube Texture. */ "TextureCube"] = "TextureCube";
+    AssetType[/** Material. */ "Material"] = "Material";
+    AssetType[/** Mesh. */ "Mesh"] = "Mesh";
+    AssetType[/** AnimationClip. */ "AnimationClip"] = "AnimationClip";
+    AssetType[/** AnimatorController. */ "AnimatorController"] = "AnimatorController";
+    AssetType[/** Prefab.*/ "GLTF"] = "GLTF";
+    AssetType[/** Compress Texture. */ "KTX"] = "KTX";
+    AssetType[/** Cube Compress Texture. */ "KTXCube"] = "KTXCube";
+    AssetType[/** KTX2 Compress Texture */ "KTX2"] = "KTX2";
+    AssetType[/** Sprite. */ "Sprite"] = "Sprite";
+    AssetType[/** Sprite Atlas. */ "SpriteAtlas"] = "SpriteAtlas";
+    AssetType[/** Ambient light. */ "Env"] = "Environment";
+    AssetType[/** Scene. */ "Scene"] = "Scene";
+    AssetType[/** HDR to cube. */ "HDR"] = "HDR";
+    AssetType[/** Font. */ "Font"] = "Font";
+    AssetType[/** Source Font, include ttf、 otf and woff. */ "SourceFont"] = "SourceFont";
+})(AssetType || (AssetType = {}));
+
 var SafeLoopArray = /*#__PURE__*/ function() {
     function SafeLoopArray() {
         this._array = [];
@@ -12347,10 +12415,13 @@ var SafeLoopArray = /*#__PURE__*/ function() {
    */ _proto.loadScene = function loadScene(url, destroyOldScene) {
         if (destroyOldScene === void 0) destroyOldScene = true;
         var _this = this;
-        var scenePromise = this.engine.resourceManager.load(url);
+        var scenePromise = this.engine.resourceManager.load({
+            url: url,
+            type: AssetType.Scene
+        });
         scenePromise.then(function(scene) {
-            var scenes = _this._scenes;
             if (destroyOldScene) {
+                var scenes = _this._scenes.getArray();
                 for(var i = 0, n = scenes.length; i < n; i++){
                     scenes[i].destroy();
                 }
@@ -12980,17 +13051,21 @@ var rePropName = RegExp(// Match anything that isn't a dot or bracket.
         if (this._currentEnteredEntity !== rayCastEntity) {
             if (this._currentEnteredEntity) {
                 var scripts = this._currentEnteredEntity._scripts;
-                for(var i = scripts.length - 1; i >= 0; i--){
-                    var script = scripts.get(i);
-                    script._waitHandlingInValid || script.onPointerExit(this);
+                scripts.startLoop();
+                for(var i = 0; i < scripts.length; i++){
+                    var _scripts_get;
+                    (_scripts_get = scripts.get(i)) == null ? void 0 : _scripts_get.onPointerExit(this);
                 }
+                scripts.endLoop();
             }
             if (rayCastEntity) {
                 var scripts1 = rayCastEntity._scripts;
-                for(var i1 = scripts1.length - 1; i1 >= 0; i1--){
-                    var script1 = scripts1.get(i1);
-                    script1._waitHandlingInValid || script1.onPointerEnter(this);
+                scripts1.startLoop();
+                for(var i1 = 0; i1 < scripts1.length; i1++){
+                    var _scripts_get1;
+                    (_scripts_get1 = scripts1.get(i1)) == null ? void 0 : _scripts_get1.onPointerEnter(this);
                 }
+                scripts1.endLoop();
             }
             this._currentEnteredEntity = rayCastEntity;
         }
@@ -13000,10 +13075,12 @@ var rePropName = RegExp(// Match anything that isn't a dot or bracket.
    */ _proto._firePointerDown = function _firePointerDown(rayCastEntity) {
         if (rayCastEntity) {
             var scripts = rayCastEntity._scripts;
-            for(var i = scripts.length - 1; i >= 0; i--){
-                var script = scripts.get(i);
-                script._waitHandlingInValid || script.onPointerDown(this);
+            scripts.startLoop();
+            for(var i = 0; i < scripts.length; i++){
+                var _scripts_get;
+                (_scripts_get = scripts.get(i)) == null ? void 0 : _scripts_get.onPointerDown(this);
             }
+            scripts.endLoop();
         }
         this._currentPressedEntity = rayCastEntity;
     };
@@ -13012,10 +13089,12 @@ var rePropName = RegExp(// Match anything that isn't a dot or bracket.
    */ _proto._firePointerDrag = function _firePointerDrag() {
         if (this._currentPressedEntity) {
             var scripts = this._currentPressedEntity._scripts;
-            for(var i = scripts.length - 1; i >= 0; i--){
-                var script = scripts.get(i);
-                script._waitHandlingInValid || script.onPointerDrag(this);
+            scripts.startLoop();
+            for(var i = 0; i < scripts.length; i++){
+                var _scripts_get;
+                (_scripts_get = scripts.get(i)) == null ? void 0 : _scripts_get.onPointerDrag(this);
             }
+            scripts.endLoop();
         }
     };
     /**
@@ -13025,13 +13104,15 @@ var rePropName = RegExp(// Match anything that isn't a dot or bracket.
         if (pressedEntity) {
             var sameTarget = pressedEntity === rayCastEntity;
             var scripts = pressedEntity._scripts;
-            for(var i = scripts.length - 1; i >= 0; i--){
+            scripts.startLoop();
+            for(var i = 0; i < scripts.length; i++){
                 var script = scripts.get(i);
-                if (!script._waitHandlingInValid) {
+                if (script) {
                     sameTarget && script.onPointerClick(this);
                     script.onPointerUp(this);
                 }
             }
+            scripts.endLoop();
             this._currentPressedEntity = null;
         }
     };
@@ -13635,114 +13716,138 @@ var Collision = function Collision() {
             var shape1 = physicalObjectsMap[obj1];
             var shape2 = physicalObjectsMap[obj2];
             var scripts = shape1.collider.entity._scripts;
-            for(var i = 0, len = scripts.length; i < len; i++){
+            scripts.startLoop();
+            for(var i = 0; i < scripts.length; i++){
                 var script = scripts.get(i);
-                if (!script._waitHandlingInValid) {
+                if (script) {
                     var collision = PhysicsScene._collision;
                     collision.shape = shape2;
                     script.onCollisionEnter(collision);
                 }
             }
+            scripts.endLoop();
             scripts = shape2.collider.entity._scripts;
-            for(var i1 = 0, len1 = scripts.length; i1 < len1; i1++){
+            scripts.startLoop();
+            for(var i1 = 0; i1 < scripts.length; i1++){
                 var script1 = scripts.get(i1);
-                if (!script1._waitHandlingInValid) {
+                if (script1) {
                     var collision1 = PhysicsScene._collision;
                     collision1.shape = shape1;
                     script1.onCollisionEnter(collision1);
                 }
             }
+            scripts.endLoop();
         };
         this._onContactExit = function(obj1, obj2) {
             var physicalObjectsMap = _this._scene.engine._physicalObjectsMap;
             var shape1 = physicalObjectsMap[obj1];
             var shape2 = physicalObjectsMap[obj2];
             var scripts = shape1.collider.entity._scripts;
-            for(var i = 0, len = scripts.length; i < len; i++){
+            scripts.startLoop();
+            for(var i = 0; i < scripts.length; i++){
                 var script = scripts.get(i);
-                if (!script._waitHandlingInValid) {
+                if (script) {
                     var collision = PhysicsScene._collision;
                     collision.shape = shape2;
                     script.onCollisionExit(collision);
                 }
             }
+            scripts.endLoop();
             scripts = shape2.collider.entity._scripts;
-            for(var i1 = 0, len1 = scripts.length; i1 < len1; i1++){
+            scripts.startLoop();
+            for(var i1 = 0; i1 < scripts.length; i1++){
                 var script1 = scripts.get(i1);
-                if (!script1._waitHandlingInValid) {
+                if (script1) {
                     var collision1 = PhysicsScene._collision;
                     collision1.shape = shape1;
                     script1.onCollisionExit(collision1);
                 }
             }
+            scripts.endLoop();
         };
         this._onContactStay = function(obj1, obj2) {
             var physicalObjectsMap = _this._scene.engine._physicalObjectsMap;
             var shape1 = physicalObjectsMap[obj1];
             var shape2 = physicalObjectsMap[obj2];
             var scripts = shape1.collider.entity._scripts;
-            for(var i = 0, len = scripts.length; i < len; i++){
+            scripts.startLoop();
+            for(var i = 0; i < scripts.length; i++){
                 var script = scripts.get(i);
-                if (!script._waitHandlingInValid) {
+                if (script) {
                     var collision = PhysicsScene._collision;
                     collision.shape = shape2;
                     script.onCollisionStay(collision);
                 }
             }
+            scripts.endLoop();
             scripts = shape2.collider.entity._scripts;
-            for(var i1 = 0, len1 = scripts.length; i1 < len1; i1++){
+            scripts.startLoop();
+            for(var i1 = 0; i1 < scripts.length; i1++){
                 var script1 = scripts.get(i1);
-                if (!script1._waitHandlingInValid) {
+                if (script1) {
                     var collision1 = PhysicsScene._collision;
                     collision1.shape = shape1;
                     script1.onCollisionStay(collision1);
                 }
             }
+            scripts.endLoop();
         };
         this._onTriggerEnter = function(obj1, obj2) {
             var physicalObjectsMap = _this._scene.engine._physicalObjectsMap;
             var shape1 = physicalObjectsMap[obj1];
             var shape2 = physicalObjectsMap[obj2];
             var scripts = shape1.collider.entity._scripts;
-            for(var i = 0, len = scripts.length; i < len; i++){
-                var script = scripts.get(i);
-                script._waitHandlingInValid || script.onTriggerEnter(shape2);
+            scripts.startLoop();
+            for(var i = 0; i < scripts.length; i++){
+                var _scripts_get;
+                (_scripts_get = scripts.get(i)) == null ? void 0 : _scripts_get.onTriggerEnter(shape2);
             }
+            scripts.endLoop();
             scripts = shape2.collider.entity._scripts;
-            for(var i1 = 0, len1 = scripts.length; i1 < len1; i1++){
-                var script1 = scripts.get(i1);
-                script1._waitHandlingInValid || script1.onTriggerEnter(shape1);
+            scripts.startLoop();
+            for(var i1 = 0; i1 < scripts.length; i1++){
+                var _scripts_get1;
+                (_scripts_get1 = scripts.get(i1)) == null ? void 0 : _scripts_get1.onTriggerEnter(shape1);
             }
+            scripts.endLoop();
         };
         this._onTriggerExit = function(obj1, obj2) {
             var physicalObjectsMap = _this._scene.engine._physicalObjectsMap;
             var shape1 = physicalObjectsMap[obj1];
             var shape2 = physicalObjectsMap[obj2];
             var scripts = shape1.collider.entity._scripts;
-            for(var i = 0, n = scripts.length; i < n; i++){
-                var script = scripts.get(i);
-                script._waitHandlingInValid || script.onTriggerExit(shape2);
+            scripts.startLoop();
+            for(var i = 0; i < scripts.length; i++){
+                var _scripts_get;
+                (_scripts_get = scripts.get(i)) == null ? void 0 : _scripts_get.onTriggerExit(shape2);
             }
+            scripts.endLoop();
             scripts = shape2.collider.entity._scripts;
-            for(var i1 = 0, n1 = scripts.length; i1 < n1; i1++){
-                var script1 = scripts.get(i1);
-                script1._waitHandlingInValid || script1.onTriggerExit(shape1);
+            scripts.startLoop();
+            for(var i1 = 0; i1 < scripts.length; i1++){
+                var _scripts_get1;
+                (_scripts_get1 = scripts.get(i1)) == null ? void 0 : _scripts_get1.onTriggerExit(shape1);
             }
+            scripts.endLoop();
         };
         this._onTriggerStay = function(obj1, obj2) {
             var physicalObjectsMap = _this._scene.engine._physicalObjectsMap;
             var shape1 = physicalObjectsMap[obj1];
             var shape2 = physicalObjectsMap[obj2];
             var scripts = shape1.collider.entity._scripts;
-            for(var i = 0, len = scripts.length; i < len; i++){
-                var script = scripts.get(i);
-                script._waitHandlingInValid || script.onTriggerStay(shape2);
+            scripts.startLoop();
+            for(var i = 0; i < scripts.length; i++){
+                var _scripts_get;
+                (_scripts_get = scripts.get(i)) == null ? void 0 : _scripts_get.onTriggerStay(shape2);
             }
+            scripts.endLoop();
             scripts = shape2.collider.entity._scripts;
-            for(var i1 = 0, len1 = scripts.length; i1 < len1; i1++){
-                var script1 = scripts.get(i1);
-                script1._waitHandlingInValid || script1.onTriggerStay(shape1);
+            scripts.startLoop();
+            for(var i1 = 0; i1 < scripts.length; i1++){
+                var _scripts_get1;
+                (_scripts_get1 = scripts.get(i1)) == null ? void 0 : _scripts_get1.onTriggerStay(shape1);
             }
+            scripts.endLoop();
         };
         this._scene = scene;
         this._setGravity = this._setGravity.bind(this);
@@ -16880,7 +16985,6 @@ ShaderPool.init();
         this._onUpdateScripts = new DisorderedArray();
         this._onLateUpdateScripts = new DisorderedArray();
         this._onPhysicsUpdateScripts = new DisorderedArray();
-        this._disableScripts = [];
         this._pendingDestroyScripts = [];
         this._disposeDestroyScripts = [];
         // Animation
@@ -16958,102 +17062,110 @@ ShaderPool.init();
         replaced && (replaced._onUpdateIndex = renderer._onUpdateIndex);
         renderer._onUpdateIndex = -1;
     };
-    _proto.addDisableScript = function addDisableScript(component) {
-        this._disableScripts.push(component);
-    };
     _proto.addPendingDestroyScript = function addPendingDestroyScript(component) {
         this._pendingDestroyScripts.push(component);
     };
     _proto.callScriptOnStart = function callScriptOnStart() {
         var onStartScripts = this._onStartScripts;
         if (onStartScripts.length > 0) {
+            onStartScripts.startLoop();
             var elements = onStartScripts._elements;
             // The 'onStartScripts.length' maybe add if you add some Script with addComponent() in some Script's onStart()
             for(var i = 0; i < onStartScripts.length; i++){
                 var script = elements[i];
-                if (!script._waitHandlingInValid) {
+                if (script) {
                     script._started = true;
-                    script._onStartIndex = -1;
+                    this.removeOnStartScript(script);
                     script.onStart();
                 }
             }
-            onStartScripts.length = 0;
+            onStartScripts.endLoopAndClear();
         }
     };
     _proto.callScriptOnUpdate = function callScriptOnUpdate(deltaTime) {
-        var elements = this._onUpdateScripts._elements;
-        for(var i = this._onUpdateScripts.length - 1; i >= 0; --i){
+        var onUpdateScripts = this._onUpdateScripts;
+        onUpdateScripts.startLoop();
+        var elements = onUpdateScripts._elements;
+        for(var i = 0; i < onUpdateScripts.length; i++){
             var element = elements[i];
-            if (!element._waitHandlingInValid && element._started) {
+            if (element == null ? void 0 : element._started) {
                 element.onUpdate(deltaTime);
             }
         }
+        onUpdateScripts.endLoop();
     };
     _proto.callScriptOnLateUpdate = function callScriptOnLateUpdate(deltaTime) {
-        var elements = this._onLateUpdateScripts._elements;
-        for(var i = this._onLateUpdateScripts.length - 1; i >= 0; --i){
+        var onLateUpdateScripts = this._onLateUpdateScripts;
+        onLateUpdateScripts.startLoop();
+        var elements = onLateUpdateScripts._elements;
+        for(var i = 0; i < onLateUpdateScripts.length; i++){
             var element = elements[i];
-            if (!element._waitHandlingInValid && element._started) {
+            if (element == null ? void 0 : element._started) {
                 element.onLateUpdate(deltaTime);
             }
         }
+        onLateUpdateScripts.endLoop();
     };
     _proto.callScriptOnPhysicsUpdate = function callScriptOnPhysicsUpdate() {
-        var elements = this._onPhysicsUpdateScripts._elements;
-        for(var i = this._onPhysicsUpdateScripts.length - 1; i >= 0; --i){
+        var onPhysicsUpdateScripts = this._onPhysicsUpdateScripts;
+        onPhysicsUpdateScripts.startLoop();
+        var elements = onPhysicsUpdateScripts._elements;
+        for(var i = 0; i < onPhysicsUpdateScripts.length; i++){
             var element = elements[i];
-            if (!element._waitHandlingInValid && element._started) {
+            if (element == null ? void 0 : element._started) {
                 element.onPhysicsUpdate();
             }
         }
+        onPhysicsUpdateScripts.endLoop();
     };
     _proto.callAnimationUpdate = function callAnimationUpdate(deltaTime) {
-        var elements = this._onUpdateAnimations._elements;
-        for(var i = this._onUpdateAnimations.length - 1; i >= 0; --i){
+        var onUpdateAnimations = this._onUpdateAnimations;
+        onUpdateAnimations.startLoop();
+        var elements = onUpdateAnimations._elements;
+        for(var i = 0; i < onUpdateAnimations.length; i++){
             //@ts-ignore
             elements[i].update(deltaTime);
         }
+        onUpdateAnimations.endLoop();
     };
     _proto.callRendererOnUpdate = function callRendererOnUpdate(deltaTime) {
-        var elements = this._onUpdateRenderers._elements;
-        for(var i = this._onUpdateRenderers.length - 1; i >= 0; --i){
+        var onUpdateRenderers = this._onUpdateRenderers;
+        onUpdateRenderers.startLoop();
+        var elements = onUpdateRenderers._elements;
+        for(var i = 0; i < onUpdateRenderers.length; i++){
             elements[i].update(deltaTime);
         }
+        onUpdateRenderers.endLoop();
     };
     _proto.handlingInvalidScripts = function handlingInvalidScripts() {
-        var _this = this, disableScripts = _this._disableScripts;
-        var length = disableScripts.length;
-        if (length > 0) {
-            for(var i = length - 1; i >= 0; i--){
-                var disableScript = disableScripts[i];
-                disableScript._waitHandlingInValid && disableScript._handlingInValid();
-            }
-            disableScripts.length = 0;
-        }
-        var _this1 = this, pendingDestroyScripts = _this1._disposeDestroyScripts, disposeDestroyScripts = _this1._pendingDestroyScripts;
+        var _this = this, pendingDestroyScripts = _this._disposeDestroyScripts, disposeDestroyScripts = _this._pendingDestroyScripts;
         this._disposeDestroyScripts = disposeDestroyScripts;
         this._pendingDestroyScripts = pendingDestroyScripts;
         length = disposeDestroyScripts.length;
         if (length > 0) {
-            for(var i1 = length - 1; i1 >= 0; i1--){
-                disposeDestroyScripts[i1].onDestroy();
+            for(var i = length - 1; i >= 0; i--){
+                disposeDestroyScripts[i].onDestroy();
             }
             disposeDestroyScripts.length = 0;
         }
     };
     _proto.callCameraOnBeginRender = function callCameraOnBeginRender(camera) {
         var scripts = camera.entity._scripts;
-        for(var i = scripts.length - 1; i >= 0; --i){
-            var script = scripts.get(i);
-            script._waitHandlingInValid || script.onBeginRender(camera);
+        scripts.startLoop();
+        for(var i = 0; i < scripts.length; i++){
+            var _scripts_get;
+            (_scripts_get = scripts.get(i)) == null ? void 0 : _scripts_get.onBeginRender(camera);
         }
+        scripts.endLoop();
     };
     _proto.callCameraOnEndRender = function callCameraOnEndRender(camera) {
         var scripts = camera.entity._scripts;
-        for(var i = scripts.length - 1; i >= 0; --i){
-            var script = scripts.get(i);
-            script._waitHandlingInValid || script.onEndRender(camera);
+        scripts.startLoop();
+        for(var i = 0; i < scripts.length; i++){
+            var _scripts_get;
+            (_scripts_get = scripts.get(i)) == null ? void 0 : _scripts_get.onEndRender(camera);
         }
+        scripts.endLoop();
     };
     _proto.getActiveChangedTempList = function getActiveChangedTempList() {
         return this._componentsContainerPool.length ? this._componentsContainerPool.pop() : [];
@@ -18024,19 +18136,20 @@ __decorate([
         }
         // Process entity active/inActive
         var inActiveChangeFlag = ActiveChangeFlag.None;
-        if (this._isActiveInEngine) {
-            // Cross scene should inActive first and then active
-            entity._isActiveInHierarchy && oldScene !== this && (inActiveChangeFlag |= ActiveChangeFlag.Scene);
-        } else {
-            entity._isActiveInHierarchy && (inActiveChangeFlag |= ActiveChangeFlag.Hierarchy);
+        if (entity._isActiveInHierarchy) {
+            this._isActiveInEngine || (inActiveChangeFlag |= ActiveChangeFlag.Hierarchy);
         }
+        // Cross scene should inActive first and then active
+        entity._isActiveInScene && oldScene !== this && (inActiveChangeFlag |= ActiveChangeFlag.Scene);
         inActiveChangeFlag && entity._processInActive(inActiveChangeFlag);
         if (oldScene !== this) {
             Entity._traverseSetOwnerScene(entity, this);
         }
         var activeChangeFlag = ActiveChangeFlag.None;
-        if (this._isActiveInEngine && entity._isActive) {
-            !entity._isActiveInHierarchy && (activeChangeFlag |= ActiveChangeFlag.Hierarchy);
+        if (entity._isActive) {
+            if (this._isActiveInEngine) {
+                !entity._isActiveInHierarchy && (activeChangeFlag |= ActiveChangeFlag.Hierarchy);
+            }
             (!entity._isActiveInScene || oldScene !== this) && (activeChangeFlag |= ActiveChangeFlag.Scene);
         }
         activeChangeFlag && entity._processActive(activeChangeFlag);
@@ -18392,7 +18505,6 @@ __decorate([
         /** @internal */ _this._onPreRenderIndex = -1;
         /** @internal */ _this._onPostRenderIndex = -1;
         _this._entityScriptsIndex = -1;
-        _this._waitHandlingInValid = false;
         return _this;
     }
     var _proto = Script.prototype;
@@ -18501,37 +18613,30 @@ __decorate([
     /**
    * @internal
    */ _proto._onEnableInScene = function _onEnableInScene() {
-        if (this._waitHandlingInValid) {
-            this._waitHandlingInValid = false;
-        } else {
-            var _this_scene = this.scene, componentsManager = _this_scene._componentsManager;
-            var prototype = Script.prototype;
-            if (!this._started) {
-                componentsManager.addOnStartScript(this);
-            }
-            if (this.onUpdate !== prototype.onUpdate) {
-                componentsManager.addOnUpdateScript(this);
-            }
-            if (this.onLateUpdate !== prototype.onLateUpdate) {
-                componentsManager.addOnLateUpdateScript(this);
-            }
-            if (this.onPhysicsUpdate !== prototype.onPhysicsUpdate) {
-                componentsManager.addOnPhysicsUpdateScript(this);
-            }
-            this._entity._addScript(this);
+        var _this_scene = this.scene, componentsManager = _this_scene._componentsManager;
+        var prototype = Script.prototype;
+        if (!this._started) {
+            componentsManager.addOnStartScript(this);
+        }
+        if (this.onUpdate !== prototype.onUpdate) {
+            componentsManager.addOnUpdateScript(this);
+        }
+        if (this.onLateUpdate !== prototype.onLateUpdate) {
+            componentsManager.addOnLateUpdateScript(this);
+        }
+        if (this.onPhysicsUpdate !== prototype.onPhysicsUpdate) {
+            componentsManager.addOnPhysicsUpdateScript(this);
         }
+        this._entity._addScript(this);
     };
     /**
    * @internal
    */ _proto._onDisableInScene = function _onDisableInScene() {
-        this._waitHandlingInValid = true;
-        this.scene._componentsManager.addDisableScript(this);
-    };
-    /**
-   * @internal
-   */ _proto._handlingInValid = function _handlingInValid() {
         var componentsManager = this.scene._componentsManager;
         var prototype = Script.prototype;
+        if (!this._started) {
+            componentsManager.removeOnStartScript(this);
+        }
         if (this.onUpdate !== prototype.onUpdate) {
             componentsManager.removeOnUpdateScript(this);
         }
@@ -18542,7 +18647,6 @@ __decorate([
             componentsManager.removeOnPhysicsUpdateScript(this);
         }
         this._entity._removeScript(this);
-        this._waitHandlingInValid = false;
     };
     /**
    * @internal
@@ -18576,9 +18680,6 @@ __decorate([
 __decorate([
     ignoreClone
 ], Script.prototype, "_entityScriptsIndex", void 0);
-__decorate([
-    ignoreClone
-], Script.prototype, "_waitHandlingInValid", void 0);
 
 /**
  * Depth texture mode.
@@ -20893,41 +20994,6 @@ var MultiExecutor = /*#__PURE__*/ function() {
     Loader._engineObjects = {};
 })();
 
-/**
- * Asset Type.
- */ var AssetType;
-(function(AssetType) {
-    AssetType[/**
-   * Plain text.
-   * @remarks Will not be cached based on url in ResourceManager.
-   */ "Text"] = "Text";
-    AssetType[/**
-   * JSON.
-   * @remarks Will not be cached based on url in ResourceManager.
-   */ "JSON"] = "JSON";
-    AssetType[/**
-   * ArrayBuffer.
-   * @remarks Will not be cached based on url in ResourceManager.
-   */ "Buffer"] = "Buffer";
-    AssetType[/** 2D Texture. */ "Texture2D"] = "Texture2D";
-    AssetType[/** Cube Texture. */ "TextureCube"] = "TextureCube";
-    AssetType[/** Material. */ "Material"] = "Material";
-    AssetType[/** Mesh. */ "Mesh"] = "Mesh";
-    AssetType[/** AnimationClip. */ "AnimationClip"] = "AnimationClip";
-    AssetType[/** AnimatorController. */ "AnimatorController"] = "AnimatorController";
-    AssetType[/** Prefab.*/ "GLTF"] = "GLTF";
-    AssetType[/** Compress Texture. */ "KTX"] = "KTX";
-    AssetType[/** Cube Compress Texture. */ "KTXCube"] = "KTXCube";
-    AssetType[/** KTX2 Compress Texture */ "KTX2"] = "KTX2";
-    AssetType[/** Sprite. */ "Sprite"] = "Sprite";
-    AssetType[/** Sprite Atlas. */ "SpriteAtlas"] = "SpriteAtlas";
-    AssetType[/** Ambient light. */ "Env"] = "Environment";
-    AssetType[/** Scene. */ "Scene"] = "Scene";
-    AssetType[/** HDR to cube. */ "HDR"] = "HDR";
-    AssetType[/** Font. */ "Font"] = "Font";
-    AssetType[/** Source Font, include ttf、 otf and woff. */ "SourceFont"] = "SourceFont";
-})(AssetType || (AssetType = {}));
-
 /**
  * Alpha blend mode.
  */ var BlendMode;