Merge pull request #842 from GuoLei1990/dev/0.8

Merge latest main

lerna.json

@@ -1,6 +1,6 @@
 {
   "npmClient": "npm",
-  "version": "0.7.0-beta.6",
+  "version": "0.7.0-beta.7",
   "bootstrap": {
     "hoist": true
   },

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oasis-engine/core",
-  "version": "0.7.0-beta.6",
+  "version": "0.7.0-beta.7",
   "license": "MIT",
   "main": "dist/main.js",
   "module": "dist/module.js",
@@ -14,9 +14,9 @@
     "types/**/*"
   ],
   "dependencies": {
-    "@oasis-engine/math": "0.7.0-beta.6"
+    "@oasis-engine/math": "0.7.0-beta.7"
   },
   "devDependencies": {
-    "@oasis-engine/design": "0.7.0-beta.6"
+    "@oasis-engine/design": "0.7.0-beta.7"
   }
 }

packages/core/src/2d/text/TextRenderer.ts

@@ -1,14 +1,18 @@
 import { BoundingBox, Color, Vector3 } from "@oasis-engine/math";
-import { Sprite, SpriteMaskInteraction, SpriteMaskLayer, SpriteRenderer } from "..";
-import { CompareFunction, Renderer, UpdateFlag } from "../..";
 import { BoolUpdateFlag } from "../../BoolUpdateFlag";
 import { Camera } from "../../Camera";
 import { assignmentClone, deepClone, ignoreClone } from "../../clone/CloneManager";
 import { Entity } from "../../Entity";
+import { Renderer } from "../../Renderer";
+import { CompareFunction } from "../../shader/enums/CompareFunction";
 import { Texture2D } from "../../texture";
 import { FontStyle } from "../enums/FontStyle";
+import { SpriteMaskInteraction } from "../enums/SpriteMaskInteraction";
+import { SpriteMaskLayer } from "../enums/SpriteMaskLayer";
 import { TextHorizontalAlignment, TextVerticalAlignment } from "../enums/TextAlignment";
 import { OverflowMode } from "../enums/TextOverflow";
+import { Sprite } from "../sprite/Sprite";
+import { SpriteRenderer } from "../sprite/SpriteRenderer";
 import { Font } from "./Font";
 import { TextUtils } from "./TextUtils";
 
@@ -377,21 +381,21 @@ export class TextRenderer extends Renderer {
     const { pixelsPerUnit, pivot } = sprite;
     switch (horizontalAlignment) {
       case TextHorizontalAlignment.Left:
-        pivot.x = (this.width * pixelsPerUnit) / width * 0.5;
+        pivot.x = ((this.width * pixelsPerUnit) / width) * 0.5;
         break;
       case TextHorizontalAlignment.Right:
-        pivot.x = 1 - (this.width * pixelsPerUnit) / width * 0.5;
+        pivot.x = 1 - ((this.width * pixelsPerUnit) / width) * 0.5;
         break;
       case TextHorizontalAlignment.Center:
         pivot.x = 0.5;
         break;
     }
     switch (verticalAlignment) {
       case TextVerticalAlignment.Top:
-        pivot.y = 1 - (this.height * pixelsPerUnit) / height * 0.5;
+        pivot.y = 1 - ((this.height * pixelsPerUnit) / height) * 0.5;
         break;
       case TextVerticalAlignment.Bottom:
-        pivot.y = (this.height * pixelsPerUnit) / height * 0.5;
+        pivot.y = ((this.height * pixelsPerUnit) / height) * 0.5;
         break;
       case TextVerticalAlignment.Center:
         pivot.y = 0.5;

packages/core/src/animation/AnimationClip.ts

@@ -42,7 +42,7 @@ export class AnimationClip extends Motion {
   /**
    * @param name - The AnimationClip's name
    */
-  constructor (public readonly name: string) {
+  constructor(public readonly name: string) {
     super();
   }
 
@@ -60,9 +60,8 @@ export class AnimationClip extends Motion {
    */
   addEvent(event: AnimationEvent): void;
 
-
   addEvent(param: AnimationEvent | string, time?: number, parameter?: Object): void {
-    if (typeof param === 'string') {
+    if (typeof param === "string") {
       const event = new AnimationEvent();
       event.functionName = param;
       event.time = time;