@galacean/effects 1.5.0-alpha.0 → 1.5.0

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime player for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.5.0-alpha.0
+ * Version: v1.5.0
  */
 
 'use strict';
@@ -509,6 +509,10 @@ function isAndroid() {
 function isSimulatorCellPhone() {
     return isAndroid() || /\b(iPad|iPhone|iPod)\b/.test(navigator.userAgent);
 }
+function isAlipayMiniApp() {
+    //@ts-expect-error
+    return typeof my !== 'undefined' && (my === null || my === void 0 ? void 0 : my.renderTarget) === 'web';
+}
 
 function imageDataFromColor(value) {
     if (isString(value)) {
@@ -24255,7 +24259,7 @@ var AssetManager = /** @class */ (function () {
                 _a = this.options, useCompressedTexture = _a.useCompressedTexture, variables = _a.variables;
                 baseUrl = this.baseUrl;
                 jobs = images.map(function (img, idx) { return __awaiter(_this, void 0, void 0, function () {
-                    var png, webp, imageURL, webpURL, template, isTemplateV2, background, url_1, isVideo, loadFn, resultImage, resultImage, compressed, src, bufferURL, _a, url, image;
+                    var png, webp, imageURL, webpURL, template, isTemplateV2, background, url_1, isVideo, loadFn, resultImage, e_3, resultImage, compressed, src, bufferURL, _a, url, image;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
@@ -24290,8 +24294,8 @@ var AssetManager = /** @class */ (function () {
                             case 4: return [2 /*return*/, _b.sent()];
                             case 5: return [3 /*break*/, 7];
                             case 6:
-                                _b.sent();
-                                throw new Error("Failed to load. Check the template or if the URL is ".concat(isVideo ? 'video' : 'image', " type, URL: ").concat(url_1, "."));
+                                e_3 = _b.sent();
+                                throw new Error("Failed to load. Check the template or if the URL is ".concat(isVideo ? 'video' : 'image', " type, URL: ").concat(url_1, ", Error: ").concat(e_3.message));
                             case 7: return [3 /*break*/, 12];
                             case 8:
                                 _b.trys.push([8, 11, , 12]);
@@ -25643,7 +25647,7 @@ var Composition = /** @class */ (function () {
 }());
 
 /**
- * Engine 基类，负责维护所有 GPU 资源的销毁
+ * Engine 基类，负责维护所有 GPU 资源的管理及销毁
  */
 var Engine = /** @class */ (function () {
     function Engine() {
@@ -25653,6 +25657,10 @@ var Engine = /** @class */ (function () {
         this.geometries = [];
         this.meshes = [];
         this.renderPasses = [];
+        /**
+         * 渲染过程中错误队列
+         */
+        this.renderErrors = new Set();
     }
     Engine.prototype.addTexture = function (tex) {
         if (this.destroyed) {
@@ -26496,7 +26504,6 @@ var GLRendererInternal = /** @class */ (function () {
         var glMaterial = material;
         var program = glMaterial.shader.program;
         if (!program) {
-            console.warn('Material ' + glMaterial.name + ' 的shader着色器程序未初始化。');
             return;
         }
         var vao = program.setupAttributes(glGeometry);
@@ -26580,13 +26587,8 @@ var GLRendererInternal = /** @class */ (function () {
         logger.error('gl lost, destroy glRenderer by default', e.target);
         this.deleteResource();
     };
-    GLRendererInternal.prototype.dispose = function (haltGL) {
+    GLRendererInternal.prototype.dispose = function () {
         this.deleteResource();
-        var gl = this.gl;
-        if (gl && haltGL) {
-            var ex = gl.getExtension('WEBGL_lose_context');
-            ex === null || ex === void 0 ? void 0 : ex.loseContext();
-        }
         // @ts-expect-error safe to assign
         this.emptyTexture2D = this.emptyTextureCube = this.pipelineContext = this.gpu = this.gl = null;
         this.destroyed = true;
@@ -27604,29 +27606,34 @@ var GLMaterial = /** @class */ (function (_super) {
     };
     GLMaterial.prototype.use = function (renderer, globalUniforms) {
         var e_1, _a, e_2, _b;
+        var _c;
         var engine = renderer.engine;
         var pipelineContext = engine.getGLPipelineContext();
+        if (!this.shader.program) {
+            (_c = this.engine) === null || _c === void 0 ? void 0 : _c.renderErrors.add(new Error('Shader program is not initialized'));
+            return;
+        }
         this.shader.program.bind();
         this.setupStates(pipelineContext);
         var name;
         if (globalUniforms) {
             try {
                 // 加入全局 uniform 名称
-                for (var _c = __values$1(globalUniforms.uniforms), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    name = _d.value;
+                for (var _d = __values$1(globalUniforms.uniforms), _e = _d.next(); !_e.done; _e = _d.next()) {
+                    name = _e.value;
                     this.checkUniform(name);
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
             try {
-                for (var _e = __values$1(globalUniforms.samplers), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    name = _f.value;
+                for (var _f = __values$1(globalUniforms.samplers), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    name = _g.value;
                     if (!this.samplers.includes(name)) {
                         this.samplers.push(name);
                         this.uniformDirtyFlag = true;
@@ -27636,7 +27643,7 @@ var GLMaterial = /** @class */ (function (_super) {
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                    if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
@@ -28156,6 +28163,31 @@ var GLContextManager = /** @class */ (function () {
     return GLContextManager;
 }());
 
+var GLEngine = /** @class */ (function (_super) {
+    __extends(GLEngine, _super);
+    function GLEngine(gl) {
+        var _this = _super.call(this) || this;
+        _this.gpuCapability = new GPUCapability(gl);
+        return _this;
+    }
+    GLEngine.prototype.dispose = function () {
+        if (this.isDestroyed) {
+            return;
+        }
+        _super.prototype.dispose.call(this);
+    };
+    GLEngine.prototype.getGLRenderer = function () {
+        return this.renderer;
+    };
+    GLEngine.prototype.getGLRendererInternal = function () {
+        return this.getGLRenderer().glRenderer;
+    };
+    GLEngine.prototype.getGLPipelineContext = function () {
+        return this.getGLRenderer().pipelineContext;
+    };
+    return GLEngine;
+}(Engine));
+
 var GLRenderBuffer = /** @class */ (function (_super) {
     __extends(GLRenderBuffer, _super);
     function GLRenderBuffer(props, renderer) {
@@ -29697,31 +29729,6 @@ var GLPipelineContext = /** @class */ (function () {
     return GLPipelineContext;
 }());
 
-var GLEngine = /** @class */ (function (_super) {
-    __extends(GLEngine, _super);
-    function GLEngine(gl) {
-        var _this = _super.call(this) || this;
-        _this.gpuCapability = new GPUCapability(gl);
-        return _this;
-    }
-    GLEngine.prototype.dispose = function () {
-        if (this.isDestroyed) {
-            return;
-        }
-        _super.prototype.dispose.call(this);
-    };
-    GLEngine.prototype.getGLRenderer = function () {
-        return this.renderer;
-    };
-    GLEngine.prototype.getGLRendererInternal = function () {
-        return this.getGLRenderer().glRenderer;
-    };
-    GLEngine.prototype.getGLPipelineContext = function () {
-        return this.getGLRenderer().pipelineContext;
-    };
-    return GLEngine;
-}(Engine));
-
 var GLRenderer = /** @class */ (function (_super) {
     __extends(GLRenderer, _super);
     function GLRenderer(canvas, framework, renderOptions) {
@@ -29999,12 +30006,12 @@ var GLRenderer = /** @class */ (function (_super) {
     GLRenderer.prototype.getHeight = function () {
         return this.height;
     };
-    GLRenderer.prototype.dispose = function (haltGL) {
+    GLRenderer.prototype.dispose = function () {
         var _a;
         this.context.dispose();
         this.extension.dispose();
         this.pipelineContext.dispose();
-        (_a = this.glRenderer) === null || _a === void 0 ? void 0 : _a.dispose(haltGL);
+        (_a = this.glRenderer) === null || _a === void 0 ? void 0 : _a.dispose();
         // @ts-expect-error
         this.canvas = null;
         this.engine.dispose();
@@ -30554,7 +30561,14 @@ var Player = /** @class */ (function () {
     };
     Player.prototype.doTick = function (dt, forceRender) {
         var _this = this;
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
+        var renderErrors = this.renderer.engine.renderErrors;
+        // TODO: 临时处理，2.0.0 做优化
+        if (renderErrors.size > 0) {
+            (_a = this.handleRenderError) === null || _a === void 0 ? void 0 : _a.call(this, renderErrors.values().next().value);
+            // 有渲染错误时暂停播放
+            (_b = this.ticker) === null || _b === void 0 ? void 0 : _b.pause();
+        }
         dt = Math.min(dt, 33) * this.speed;
         var comps = this.compositions;
         var skipRender = false;
@@ -30577,8 +30591,8 @@ var Player = /** @class */ (function () {
         }
         this.baseCompositionIndex = this.compositions.length;
         if (skipRender) {
-            (_a = this.handleRenderError) === null || _a === void 0 ? void 0 : _a.call(this, new Error('play when texture offloaded'));
-            return (_b = this.ticker) === null || _b === void 0 ? void 0 : _b.pause();
+            (_c = this.handleRenderError) === null || _c === void 0 ? void 0 : _c.call(this, new Error('play when texture offloaded'));
+            return (_d = this.ticker) === null || _d === void 0 ? void 0 : _d.pause();
         }
         if (!this.paused || forceRender) {
             var level = this.gpuCapability.level;
@@ -30602,7 +30616,7 @@ var Player = /** @class */ (function () {
             time === null || time === void 0 ? void 0 : time.end();
             time === null || time === void 0 ? void 0 : time.getTime().then(function (t) { var _a; return (_a = _this.reportGPUTime) === null || _a === void 0 ? void 0 : _a.call(_this, t !== null && t !== void 0 ? t : 0); }).catch;
             if (this.autoPlaying) {
-                (_c = this.handlePlayableUpdate) === null || _c === void 0 ? void 0 : _c.call(this, {
+                (_e = this.handlePlayableUpdate) === null || _e === void 0 ? void 0 : _e.call(this, {
                     player: this,
                     playing: true,
                 });
@@ -30927,7 +30941,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
 Engine.create = function (gl) {
     return new GLEngine(gl);
 };
-var version = "1.5.0-alpha.0";
+var version = "1.5.0";
 logger.info('player version: ' + version);
 
 exports.AbstractPlugin = AbstractPlugin;
@@ -31113,6 +31127,7 @@ exports.initErrors = initErrors;
 exports.initGLContext = initGLContext;
 exports.integrate = integrate;
 exports.interpolateColor = interpolateColor;
+exports.isAlipayMiniApp = isAlipayMiniApp;
 exports.isAndroid = isAndroid;
 exports.isArray = isArray;
 exports.isCanvasUsedByPlayer = isCanvasUsedByPlayer;