Merge branch 'dev' into main

galacean · Dec 20, 2023 · dae9252 · dae9252
2 parents 0e2d537 + e493738
commit dae9252
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/packages/effects-core/src/asset-manager.ts b/packages/effects-core/src/asset-manager.ts
@@ -167,7 +167,7 @@ export class AssetManager implements Disposable {
     const waitPromise = new Promise<Scene>((resolve, reject) =>
       loadTimer = window.setTimeout(() => {
         cancelLoading = true;
-        reject(`Load time out: ${url}`);
+        reject(`Load time out: ${JSON.stringify(url)}`);
       }, this.timeout * 1000));
     const hookTimeInfo = async<T> (label: string, func: () => Promise<T>) => {
       if (!cancelLoading) {
@@ -302,7 +302,7 @@ export class AssetManager implements Disposable {
         return this.loadBins(bin.url);
       }
 
-      throw new Error(`Invalid bins source: ${bins}`);
+      throw new Error(`Invalid bins source: ${JSON.stringify(bins)}`);
     });
 
     return Promise.all(jobs);
@@ -325,7 +325,7 @@ export class AssetManager implements Disposable {
           AssetManager.fonts.add(font.fontFamily);
         } catch (e) {
           console.warn({
-            content: `Invalid fonts source: ${font.fontURL}`,
+            content: `Invalid fonts source: ${JSON.stringify(font.fontURL)}`,
             type: LOG_TYPE,
           });
         }
@@ -483,7 +483,7 @@ export class AssetManager implements Disposable {
         url,
         resolve,
         (status, responseText) => {
-          reject(`Couldn't load JSON ${url}: status ${status}, ${responseText}`);
+          reject(`Couldn't load JSON ${JSON.stringify(url)}: status ${status}, ${responseText}`);
         });
     });
   }
@@ -494,7 +494,7 @@ export class AssetManager implements Disposable {
         url,
         resolve,
         (status, responseText) => {
-          reject(`Couldn't load bins ${url}: status ${status}, ${responseText}`);
+          reject(`Couldn't load bins ${JSON.stringify(url)}: status ${status}, ${responseText}`);
         });
     });
   }

diff --git a/packages/effects-core/src/downloader.ts b/packages/effects-core/src/downloader.ts
@@ -161,7 +161,7 @@ export async function loadImage (
 
   // 2. 非法类型
   if (!url) {
-    throw new Error(`Invalid url type: ${source}`);
+    throw new Error(`Invalid url type: ${JSON.stringify(source)}`);
   }
 
   return new Promise<HTMLImageElement>((resolve, reject) => {
@@ -184,7 +184,7 @@ export async function loadImage (
         URL.revokeObjectURL(url);
       }
 
-      return reject(`Load image fail: ${e}`);
+      return reject(`Load image fail: ${JSON.stringify(e)}`);
     };
     img.src = url;
   });

diff --git a/packages/effects-core/src/render/render-pass.ts b/packages/effects-core/src/render/render-pass.ts
@@ -246,7 +246,7 @@ export interface RenderPassDelegate {
    * @param mesh - 当前 Mesh
    * @param state - 当前渲染状态
    */
-  didiRenderMesh?: (mesh: Mesh, state: RenderingData) => void,
+  didRenderMesh?: (mesh: Mesh, state: RenderingData) => void,
 }
 
 /**

diff --git a/packages/effects-webgl/src/gl-renderer.ts b/packages/effects-webgl/src/gl-renderer.ts
@@ -68,11 +68,11 @@ export class GLRenderer extends Renderer implements Disposable {
   }
 
   get height () {
-    return this.glRenderer?.height || 0;
+    return this.glRenderer?.height ?? 0;
   }
 
   get width () {
-    return this.glRenderer?.width || 0;
+    return this.glRenderer?.width ?? 0;
   }
 
   override renderRenderFrame (renderFrame: RenderFrame) {
@@ -108,9 +108,9 @@ export class GLRenderer extends Renderer implements Disposable {
     for (const pass of passes) {
       const delegate = pass.delegate;
 
-      delegate.willBeginRenderPass && delegate?.willBeginRenderPass(pass, this.renderingData);
+      delegate.willBeginRenderPass?.(pass, this.renderingData);
       this.renderRenderPass(pass);
-      delegate.didEndRenderPass && delegate?.didEndRenderPass(pass, this.renderingData);
+      delegate.didEndRenderPass?.(pass, this.renderingData);
     }
 
     for (const pass of passes) {
@@ -146,9 +146,9 @@ export class GLRenderer extends Renderer implements Disposable {
       }
       mesh.material.initialize();
       mesh.geometry.initialize();
-      delegate.willRenderMesh && delegate.willRenderMesh(mesh, this.renderingData);
+      delegate.willRenderMesh?.(mesh, this.renderingData);
       mesh.render(this);
-      delegate.didiRenderMesh && delegate.didiRenderMesh(mesh, this.renderingData);
+      delegate.didRenderMesh?.(mesh, this.renderingData);
     }
   }
 

diff --git a/web-packages/demo/src/single.ts b/web-packages/demo/src/single.ts
@@ -3,7 +3,7 @@ import '@galacean/effects-plugin-spine';
 import '@galacean/effects-plugin-model';
 import inspireList from './assets/inspire-list';
 
-const json = inspireList.preComp.url;
+const json = 'https://mdn.alipayobjects.com/mars/afts/file/A*3mT3SJ4KGKYAAAAAAAAAAAAADlB4AQ';
 const container = document.getElementById('J-container');
 
 (async () => {

diff --git a/web-packages/test/unit/src/effects-webgl/gl-material.spec.ts b/web-packages/test/unit/src/effects-webgl/gl-material.spec.ts
@@ -1114,7 +1114,7 @@ describe('gl-material', () => {
   //       meshes,
   //       camera: { name: 'main' },
   //       delegate: {
-  //         didiRenderMesh (mesh) {
+  //         didRenderMesh (mesh) {
   //           const db = mesh.material.dataBlocks[1];
 
   //           expect(db.name).to.eql('Test');
@@ -1193,7 +1193,7 @@ describe('gl-material', () => {
     const renderPass = new RenderPass({
       name: 'basic', priority: 8, meshes, camera: { name: 'main' },
       delegate: {
-        didiRenderMesh () {
+        didRenderMesh () {
           spy();
         },
       },
@@ -1272,7 +1272,7 @@ describe('gl-material', () => {
       meshes: meshes,
       camera: { name: 'main' },
       delegate: {
-        didiRenderMesh () {
+        didRenderMesh () {
           spy();
         },
       },