Merge branch 'dev'

OpenWebGAL · Nov 6, 2023 · 8537d2e · 8537d2e
2 parents 1bfed2f + e1fc205
commit 8537d2e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/packages/webgal/src/Core/controller/stage/pixi/PixiController.ts b/packages/webgal/src/Core/controller/stage/pixi/PixiController.ts
@@ -33,7 +33,7 @@ export interface IStageObject {
   uuid: string;
   // 一般与作用目标有关
   key: string;
-  pixiContainer: PIXI.Container;
+  pixiContainer: WebGALPixiContainer;
   // 相关的源 url
   sourceUrl: string;
 }
@@ -226,10 +226,10 @@ export default class PixiStage {
               x: target.pixiContainer.scale.x,
               y: target.pixiContainer.scale.y,
             },
-            pivot: {
-              x: target.pixiContainer.pivot.x,
-              y: target.pixiContainer.pivot.y,
-            },
+            // pivot: {
+            //   x: target.pixiContainer.pivot.x,
+            //   y: target.pixiContainer.pivot.y,
+            // },
             position: {
               x: target.pixiContainer.x,
               y: target.pixiContainer.y,

diff --git a/packages/webgal/src/Core/controller/stage/pixi/WebGALPixiContainer.ts b/packages/webgal/src/Core/controller/stage/pixi/WebGALPixiContainer.ts
@@ -27,10 +27,8 @@ export class WebGALPixiContainer extends PIXI.Container {
   }
 
   public get x() {
-    if (!super.position) {
-      return 0;
-    }
-    return super.position.x - this.baseX;
+    const rX = super.position?.x ?? 0;
+    return rX - this.baseX;
   }
 
   public set x(value) {
@@ -41,10 +39,8 @@ export class WebGALPixiContainer extends PIXI.Container {
   }
 
   public get y() {
-    if (!super.position) {
-      return 0;
-    }
-    return super.position.y - this.baseY;
+    const rY = super.position?.y ?? 0;
+    return rY - this.baseY;
   }
 
   public set y(value) {

diff --git a/packages/webgal/src/config/info.ts b/packages/webgal/src/config/info.ts
@@ -1,5 +1,5 @@
 export const __INFO = {
-  version: 'WebGAL 4.4.6',
+  version: 'WebGAL 4.4.6.1',
   contributors: [
     { username: 'Mahiru', link: 'https://github.com/MakinoharaShoko' },
     { username: 'Hoshinokinya', link: 'https://github.com/hshqwq' },