@galacean/engine-core 1.2.0-beta.1 → 1.2.0-beta.2

package/dist/main.js

@@ -627,7 +627,7 @@ var Utils = /*#__PURE__*/ function() {
         if (Utils.isBase64Url(relativeUrl)) {
             return relativeUrl;
         }
-        return relativeUrl ? baseUrl.replace(/\/+$/, "") + "/" + relativeUrl.replace(/^\/+/, "") : baseUrl;
+        return relativeUrl ? new URL(relativeUrl, baseUrl).href : baseUrl;
     };
     /**
    * @internal
@@ -770,14 +770,6 @@ var Utils = /*#__PURE__*/ function() {
         });
         return result;
     };
-    Utils._formatRelativePath = function _formatRelativePath(path) {
-        // For example input is "a/b", "/a/b", "./a/b", "./a/./b", "./a/../a/b", output is "a/b"
-        return path.split("/").filter(Boolean).reduce(function(acc, cur) {
-            if (cur === "..") acc.pop();
-            else if (cur !== ".") acc.push(cur);
-            return acc;
-        }, []).join("/");
-    };
     Utils._insertionSort = function _insertionSort(a, from, to, compareFunc) {
         for(var i = from + 1; i < to; i++){
             var j = void 0;
@@ -1667,6 +1659,7 @@ exports.GLCapabilityType = void 0;
     GLCapabilityType["colorBufferHalfFloat"] = "EXT_color_buffer_half_float";
     GLCapabilityType["textureFilterAnisotropic"] = "EXT_texture_filter_anisotropic";
     GLCapabilityType["blendMinMax"] = "EXT_blend_minmax";
+    GLCapabilityType["fragDepth"] = "EXT_frag_depth";
     GLCapabilityType["astc"] = "WEBGL_compressed_texture_astc";
     GLCapabilityType["astc_webkit"] = "WEBKIT_WEBGL_compressed_texture_astc";
     GLCapabilityType["etc"] = "WEBGL_compressed_texture_etc";
@@ -3430,23 +3423,34 @@ var ShaderFactory = /*#__PURE__*/ function() {
    * @param shader - code
    * @param isFrag - Whether it is a fragment shader.
    * */ ShaderFactory.convertTo300 = function convertTo300(shader, isFrag) {
-        /** replace attribute and in */ shader = shader.replace(/\battribute\b/g, "in");
         shader = shader.replace(/\bvarying\b/g, isFrag ? "in" : "out");
-        /** replace api */ shader = shader.replace(/\btexture(2D|Cube)\b/g, "texture");
-        shader = shader.replace(/\btexture(2D|Cube)LodEXT\b/g, "textureLod");
+        shader = shader.replace(/\btexture(2D|Cube)\b/g, "texture");
+        shader = shader.replace(/\btexture2DProj\b/g, "textureProj");
         if (isFrag) {
-            var isMRT = /\bgl_FragData\[.+?\]/g.test(shader);
-            if (isMRT) {
-                shader = shader.replace(/\bgl_FragColor\b/g, "gl_FragData[0]");
-                var result = shader.match(/\bgl_FragData\[.+?\]/g);
-                shader = this._replaceMRTShader(shader, result);
-            } else {
-                shader = shader.replace(/void\s+?main\s*\(/g, "out vec4 glFragColor;\nvoid main(");
-                shader = shader.replace(/\bgl_FragColor\b/g, "glFragColor");
+            shader = shader.replace(/\btexture(2D|Cube)LodEXT\b/g, "textureLod");
+            shader = shader.replace(/\btexture(2D|Cube)GradEXT\b/g, "textureGrad");
+            shader = shader.replace(/\btexture2DProjLodEXT\b/g, "textureProjLod");
+            shader = shader.replace(/\btexture2DProjGradEXT\b/g, "textureProjGrad");
+            shader = shader.replace(/\bgl_FragDepthEXT\b/g, "gl_FragDepth");
+            if (!ShaderFactory._has300Output(shader)) {
+                var isMRT = /\bgl_FragData\[.+?\]/g.test(shader);
+                if (isMRT) {
+                    shader = shader.replace(/\bgl_FragColor\b/g, "gl_FragData[0]");
+                    var result = shader.match(/\bgl_FragData\[.+?\]/g);
+                    shader = this._replaceMRTShader(shader, result);
+                } else {
+                    shader = shader.replace(/void\s+?main\s*\(/g, "out vec4 glFragColor;\nvoid main(");
+                    shader = shader.replace(/\bgl_FragColor\b/g, "glFragColor");
+                }
             }
+        } else {
+            shader = shader.replace(/\battribute\b/g, "in");
         }
         return shader;
     };
+    ShaderFactory._has300Output = function _has300Output(fragmentShader) {
+        return ShaderFactory._has300OutInFragReg.test(fragmentShader);
+    };
     ShaderFactory._replaceMRTShader = function _replaceMRTShader(shader, result) {
         var declaration = "";
         var mrtIndexSet = new Set();
@@ -3468,11 +3472,16 @@ var ShaderFactory = /*#__PURE__*/ function() {
     /** @internal */ ShaderFactory._shaderExtension = [
         "GL_EXT_shader_texture_lod",
         "GL_OES_standard_derivatives",
-        "GL_EXT_draw_buffers"
+        "GL_EXT_draw_buffers",
+        "GL_EXT_frag_depth"
     ].map(function(e) {
         return "#extension " + e + " : enable\n";
     }).join("");
 })();
+(function() {
+    ShaderFactory._has300OutInFragReg = /\bout\s+(?:\w+\s+)?(?:vec4)\s+(?:\w+)\s*;/ // [layout(location = 0)] out [highp] vec4 [color];
+    ;
+})();
 
 /**
  * Shader tag key.
@@ -3763,6 +3772,10 @@ var ShaderFactory = /*#__PURE__*/ function() {
         this.materialUniformBlock = new ShaderUniformBlock();
         this.otherUniformBlock = new ShaderUniformBlock();
         /** @internal */ this._uploadRenderCount = -1;
+        /** @internal */ this._uploadSceneId = -1;
+        /** @internal */ this._uploadCameraId = -1;
+        /** @internal */ this._uploadRendererId = -1;
+        /** @internal */ this._uploadMaterialId = -1;
         this.attributeLocation = Object.create(null);
         this._activeTextureUint = 0;
         this._engine = engine;
@@ -11444,10 +11457,8 @@ var Basic2DBatcher = /*#__PURE__*/ function() {
         var vertexStride = this.createVertexElements(vertexElements);
         // vertices
         var vertexBuffer = this._vertexBuffers[index] = new Buffer(engine, exports.BufferBindFlag.VertexBuffer, MAX_VERTEX_COUNT * vertexStride, exports.BufferUsage.Dynamic);
-        vertexBuffer.isGCIgnored = true;
         // indices
         var indiceBuffer = this._indiceBuffers[index] = new Buffer(engine, exports.BufferBindFlag.IndexBuffer, MAX_VERTEX_COUNT * 6, exports.BufferUsage.Dynamic);
-        indiceBuffer.isGCIgnored = true;
         mesh.setVertexBufferBinding(vertexBuffer, vertexStride);
         mesh.setIndexBufferBinding(indiceBuffer, exports.IndexFormat.UInt16);
         mesh.setVertexElements(vertexElements);
@@ -15093,6 +15104,7 @@ var BaseMaterial = /*#__PURE__*/ function(Material1) {
             1
         ]); // left-top
         var blitMaterial = new Material(engine, Shader.find("blit"));
+        blitMaterial._addReferCount(1);
         blitMaterial.renderState.depthState.enabled = false;
         blitMaterial.renderState.depthState.writeEnabled = false;
         this.blitMesh = this._createBlitMesh(engine, vertices);
@@ -15792,6 +15804,9 @@ var ComponentCloner = /*#__PURE__*/ function() {
         projectionParams.set(flipProjection ? -1 : 1, virtualCamera.nearClipPlane, virtualCamera.farClipPlane, 0);
         shaderData.setVector4(RenderContext._cameraProjectionProperty, projectionParams);
     };
+    _proto.garbageCollection = function garbageCollection() {
+        this.camera = null;
+    };
     return RenderContext;
 }();
 (function() {
@@ -19924,66 +19939,85 @@ __decorate([
 
 /**
  * @internal
- */ var ParticleBufferUtils = /*#__PURE__*/ function() {
-    function ParticleBufferUtils(engine) {
-        this.billboardVertexElement = new VertexElement(ParticleBillboardVertexAttribute.cornerTextureCoordinate, 0, exports.VertexElementFormat.Vector4, 0);
-        this.instanceVertexElements = [
-            new VertexElement(ParticleInstanceVertexAttribute.ShapePositionStartLifeTime, 0, exports.VertexElementFormat.Vector4, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.DirectionTime, 16, exports.VertexElementFormat.Vector4, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.StartColor, 32, exports.VertexElementFormat.Vector4, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.StartSize, 48, exports.VertexElementFormat.Vector3, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.StartRotation0, 60, exports.VertexElementFormat.Vector3, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.StartSpeed, 72, exports.VertexElementFormat.Float, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.Random0, 76, exports.VertexElementFormat.Vector4, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.Random1, 92, exports.VertexElementFormat.Vector4, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.SimulationWorldPosition, 108, exports.VertexElementFormat.Vector3, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.SimulationWorldRotation, 120, exports.VertexElementFormat.Vector4, 1, 1),
-            new VertexElement(ParticleInstanceVertexAttribute.SimulationUV, 136, exports.VertexElementFormat.Vector4, 1, 1)
-        ];
-        this.instanceVertexStride = 152;
-        this.instanceVertexFloatStride = this.instanceVertexStride / 4;
-        this.startLifeTimeOffset = 3;
-        this.timeOffset = 7;
-        this.simulationUVOffset = 34;
-        this.billboardIndexCount = 6;
-        var stride = 16;
-        var billboardGeometryBuffer = new Buffer(engine, exports.BufferBindFlag.VertexBuffer, stride * 4, exports.BufferUsage.Static, false);
-        this.billboardVertexBufferBinding = new VertexBufferBinding(billboardGeometryBuffer, stride);
-        var indexBuffer = new Buffer(engine, exports.BufferBindFlag.IndexBuffer, this.billboardIndexCount, exports.BufferUsage.Static, false);
-        this.billboardIndexBufferBinding = new IndexBufferBinding(indexBuffer, exports.IndexFormat.UInt8);
-        this.setBufferData();
-    }
-    var _proto = ParticleBufferUtils.prototype;
-    _proto.setBufferData = function setBufferData() {
-        this.billboardVertexBufferBinding.buffer.setData(new Float32Array([
-            -0.5,
-            -0.5,
-            0,
-            1,
-            0.5,
-            -0.5,
-            1,
-            1,
-            0.5,
-            0.5,
-            1,
-            0,
-            -0.5,
-            0.5,
-            0,
-            0
-        ]));
-        this.billboardIndexBufferBinding.buffer.setData(new Uint8Array([
-            0,
-            2,
-            3,
-            0,
-            1,
-            2
-        ]));
-    };
-    return ParticleBufferUtils;
-}();
+ */ var ParticleBufferUtils = function ParticleBufferUtils(engine) {
+    this.billboardVertexElement = new VertexElement(ParticleBillboardVertexAttribute.cornerTextureCoordinate, 0, exports.VertexElementFormat.Vector4, 0);
+    this.instanceVertexElements = [
+        new VertexElement(ParticleInstanceVertexAttribute.ShapePositionStartLifeTime, 0, exports.VertexElementFormat.Vector4, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.DirectionTime, 16, exports.VertexElementFormat.Vector4, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.StartColor, 32, exports.VertexElementFormat.Vector4, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.StartSize, 48, exports.VertexElementFormat.Vector3, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.StartRotation0, 60, exports.VertexElementFormat.Vector3, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.StartSpeed, 72, exports.VertexElementFormat.Float, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.Random0, 76, exports.VertexElementFormat.Vector4, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.Random1, 92, exports.VertexElementFormat.Vector4, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.SimulationWorldPosition, 108, exports.VertexElementFormat.Vector3, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.SimulationWorldRotation, 120, exports.VertexElementFormat.Vector4, 1, 1),
+        new VertexElement(ParticleInstanceVertexAttribute.SimulationUV, 136, exports.VertexElementFormat.Vector4, 1, 1)
+    ];
+    this.instanceVertexStride = 152;
+    this.instanceVertexFloatStride = this.instanceVertexStride / 4;
+    this.startLifeTimeOffset = 3;
+    this.timeOffset = 7;
+    this.simulationUVOffset = 34;
+    this.billboardIndexCount = 6;
+    var stride = 16;
+    var billboardGeometryBuffer = new Buffer(engine, exports.BufferBindFlag.VertexBuffer, stride * 4, exports.BufferUsage.Static, false);
+    billboardGeometryBuffer.isGCIgnored = true;
+    this.billboardVertexBufferBinding = new VertexBufferBinding(billboardGeometryBuffer, stride);
+    var indexBuffer = new Buffer(engine, exports.BufferBindFlag.IndexBuffer, this.billboardIndexCount, exports.BufferUsage.Static, false);
+    indexBuffer.isGCIgnored = true;
+    this.billboardIndexBufferBinding = new IndexBufferBinding(indexBuffer, exports.IndexFormat.UInt8);
+    var billboardGeometryData = new Float32Array([
+        -0.5,
+        -0.5,
+        0,
+        1,
+        0.5,
+        -0.5,
+        1,
+        1,
+        0.5,
+        0.5,
+        1,
+        0,
+        -0.5,
+        0.5,
+        0,
+        0
+    ]);
+    var indexData = new Uint8Array([
+        0,
+        2,
+        3,
+        0,
+        1,
+        2
+    ]);
+    billboardGeometryBuffer.setData(billboardGeometryData);
+    indexBuffer.setData(indexData);
+    // Register content restorer
+    engine.resourceManager.addContentRestorer(new /*#__PURE__*/ (function(ContentRestorer) {
+        _inherits(_class, ContentRestorer);
+        function _class() {
+            return ContentRestorer.call(this, billboardGeometryBuffer);
+        }
+        var _proto = _class.prototype;
+        _proto.restoreContent = function restoreContent() {
+            billboardGeometryBuffer.setData(billboardGeometryData);
+        };
+        return _class;
+    }(ContentRestorer))());
+    engine.resourceManager.addContentRestorer(new /*#__PURE__*/ (function(ContentRestorer) {
+        _inherits(_class, ContentRestorer);
+        function _class() {
+            return ContentRestorer.call(this, indexBuffer);
+        }
+        var _proto = _class.prototype;
+        _proto.restoreContent = function restoreContent() {
+        };
+        return _class;
+    }(ContentRestorer))());
+};
 
 var blitFs = "#define GLSLIFY 1\nuniform mediump sampler2D renderer_BlitTexture;\n#ifdef HAS_TEX_LOD\nuniform float renderer_BlitMipLevel;\n#endif\nvarying vec2 v_uv;void main(){\n#ifdef HAS_TEX_LOD\ngl_FragColor=texture2DLodEXT(renderer_BlitTexture,v_uv,renderer_BlitMipLevel);\n#else\ngl_FragColor=texture2D(renderer_BlitTexture,v_uv);\n#endif\n}"; // eslint-disable-line
 
@@ -20685,7 +20719,6 @@ ShaderPool.init();
         resourceManager._restoreGraphicResources();
         console.log("Graphic resource restored.");
         // Restore resources content
-        this._particleBufferUtils.setBufferData();
         resourceManager._restoreResourcesContent().then(function() {
             console.log("Graphic resource content restored.\n\n" + "Device restored.");
             _this.dispatch("devicerestored", _this);
@@ -20700,6 +20733,7 @@ ShaderPool.init();
         this._spriteRenderDataPool.garbageCollection();
         this._spriteMaskRenderDataPool.garbageCollection();
         this._textRenderDataPool.garbageCollection();
+        this._renderContext.garbageCollection();
     };
     _create_class(Engine, [
         {
@@ -21057,7 +21091,6 @@ ShaderPool.init();
     };
     _proto._createPlane = function _createPlane(engine) {
         var mesh = new ModelMesh(engine);
-        mesh.isGCIgnored = true;
         var indices = new Uint8Array([
             1,
             2,
@@ -23042,22 +23075,6 @@ __decorate([
             maskManager.postRender(renderer);
         }
     };
-    _proto.destroy = function destroy() {
-        this._batchedQueue = null;
-        var _this = this, meshes = _this._meshes, vertexBuffers = _this._vertexBuffers, indiceBuffers = _this._indiceBuffers;
-        for(var i = 0, n = meshes.length; i < n; ++i){
-            meshes[i].destroy();
-        }
-        this._meshes = null;
-        for(var i1 = 0, n1 = vertexBuffers.length; i1 < n1; ++i1){
-            vertexBuffers[i1].destroy();
-        }
-        this._vertexBuffers = null;
-        for(var i2 = 0, n2 = indiceBuffers.length; i2 < n2; ++i2){
-            indiceBuffers[i2].destroy();
-        }
-        this._indiceBuffers = null;
-    };
     return SpriteBatcher;
 }(Basic2DBatcher);
 (function() {
@@ -23083,11 +23100,10 @@ __decorate([
         if (elements.length === 0) {
             return;
         }
-        var engine = camera.engine, scene = camera.scene;
+        var engine = camera.engine, cameraId = camera.instanceId, cameraData = camera.shaderData;
+        var _camera_scene = camera.scene, sceneData = _camera_scene.shaderData, sceneId = _camera_scene.instanceId;
         var renderCount = engine._renderCount;
         var rhi = engine._hardwareRenderer;
-        var sceneData = scene.shaderData;
-        var cameraData = camera.shaderData;
         var pipelineStageKey = RenderContext.pipelineStageKey;
         var renderQueueType = this._renderQueueType;
         for(var i = 0, n = elements.length; i < n; i++){
@@ -23099,9 +23115,8 @@ __decorate([
                 var primitive = data.primitive;
                 var renderer = data.component;
                 var material = data.material;
-                var rendererData = renderer.shaderData;
-                var materialData = material.shaderData;
-                var renderStates = material.renderStates;
+                var rendererData = renderer.shaderData, rendererId = renderer.instanceId;
+                var materialData = material.shaderData, materialId = material.instanceId, renderStates = material.renderStates;
                 // union render global macro and material self macro.
                 ShaderMacroCollection.unionCollection(renderer._globalShaderMacro, materialData._macroCollection, compileMacros);
                 for(var j = 0, m = shaderPasses.length; j < m; j++){
@@ -23127,33 +23142,33 @@ __decorate([
                         program.uploadAll(program.materialUniformBlock, materialData);
                         // UnGroup textures should upload default value, texture uint maybe change by logic of texture bind.
                         program.uploadUnGroupTextures();
-                        program._uploadScene = scene;
-                        program._uploadCamera = camera;
-                        program._uploadRenderer = renderer;
-                        program._uploadMaterial = material;
+                        program._uploadSceneId = sceneId;
+                        program._uploadCameraId = cameraId;
+                        program._uploadRendererId = rendererId;
+                        program._uploadMaterialId = materialId;
                         program._uploadRenderCount = renderCount;
                     } else {
-                        if (program._uploadScene !== scene) {
+                        if (program._uploadSceneId !== sceneId) {
                             program.uploadAll(program.sceneUniformBlock, sceneData);
-                            program._uploadScene = scene;
+                            program._uploadSceneId = sceneId;
                         } else if (switchProgram) {
                             program.uploadTextures(program.sceneUniformBlock, sceneData);
                         }
-                        if (program._uploadCamera !== camera) {
+                        if (program._uploadCameraId !== cameraId) {
                             program.uploadAll(program.cameraUniformBlock, cameraData);
-                            program._uploadCamera = camera;
+                            program._uploadCameraId = cameraId;
                         } else if (switchProgram) {
                             program.uploadTextures(program.cameraUniformBlock, cameraData);
                         }
-                        if (program._uploadRenderer !== renderer) {
+                        if (program._uploadRendererId !== rendererId) {
                             program.uploadAll(program.rendererUniformBlock, rendererData);
-                            program._uploadRenderer = renderer;
+                            program._uploadRendererId = rendererId;
                         } else if (switchProgram) {
                             program.uploadTextures(program.rendererUniformBlock, rendererData);
                         }
-                        if (program._uploadMaterial !== material) {
+                        if (program._uploadMaterialId !== materialId) {
                             program.uploadAll(program.materialUniformBlock, materialData);
-                            program._uploadMaterial = material;
+                            program._uploadMaterialId = materialId;
                         } else if (switchProgram) {
                             program.uploadTextures(program.materialUniformBlock, materialData);
                         }