Fix lots of type issues in Tween system (#16948)

cocos · May 16, 2024 · ead9ae0 · ead9ae0
1 parent 3e3a3b4
commit ead9ae0
Show file tree

Hide file tree

Showing 14 changed files with 483 additions and 462 deletions.
diff --git a/.github/workflows/run_test_cases.yml b/.github/workflows/run_test_cases.yml
@@ -66,6 +66,8 @@ jobs:
 
       - name: Checkout rebase
         run: |
+          git config user.email
+          git config user.name
           git fetch origin
           git reset --hard   
           git checkout origin/${{ steps.parse_pr.outputs.pr_base_ref }}

diff --git a/cocos/core/algorithm/easing.ts b/cocos/core/algorithm/easing.ts
@@ -197,7 +197,7 @@ export function sineInOut (k: number): number {
  * @zh 启动慢，加速快。具体效果可以参考[该文档](https://docs.cocos.com/creator/manual/zh/tween/tween-function.html)。
  */
 export function expoIn (k: number): number {
-    return k === 0 ? 0 : Math.pow(1024, k - 1);
+    return k === 0 ? 0 : 1024 ** (k - 1);
 }
 
 /**
@@ -206,7 +206,7 @@ export function expoIn (k: number): number {
  * @zh 起动迅速，减速慢。具体效果可以参考[该文档](https://docs.cocos.com/creator/manual/zh/tween/tween-function.html)。
  */
 export function expoOut (k: number): number {
-    return k === 1 ? 1 : 1 - Math.pow(2, -10 * k);
+    return k === 1 ? 1 : 1 - (2 ** (-10 * k));
 }
 
 /**
@@ -223,9 +223,9 @@ export function expoInOut (k: number): number {
     }
     k *= 2;
     if (k < 1) {
-        return 0.5 * Math.pow(1024, k - 1);
+        return 0.5 * 1024 ** (k - 1);
     }
-    return 0.5 * (-Math.pow(2, -10 * (k - 1)) + 2);
+    return 0.5 * (-(2 ** (-10 * (k - 1))) + 2);
 }
 
 /**
@@ -278,7 +278,7 @@ export function elasticIn (k: number): number {
     } else {
         s = p * Math.asin(1 / a) / (2 * Math.PI);
     }
-    return -(a * Math.pow(2, 10 * (k -= 1)) * Math.sin((k - s) * (2 * Math.PI) / p));
+    return -(a * 2 ** (10 * (k -= 1)) * Math.sin((k - s) * (2 * Math.PI) / p));
 }
 
 /**
@@ -301,7 +301,7 @@ export function elasticOut (k: number): number {
     } else {
         s = p * Math.asin(1 / a) / (2 * Math.PI);
     }
-    return (a * Math.pow(2, -10 * k) * Math.sin((k - s) * (2 * Math.PI) / p) + 1);
+    return (a * 2 ** (-10 * k) * Math.sin((k - s) * (2 * Math.PI) / p) + 1);
 }
 
 /**
@@ -327,9 +327,9 @@ export function elasticInOut (k: number): number {
     k *= 2;
     if (k < 1) {
         return -0.5
-            * (a * Math.pow(2, 10 * (k -= 1)) * Math.sin((k - s) * (2 * Math.PI) / p));
+            * (a * 2 ** (10 * (k -= 1)) * Math.sin((k - s) * (2 * Math.PI) / p));
     }
-    return a * Math.pow(2, -10 * (k -= 1)) * Math.sin((k - s) * (2 * Math.PI) / p) * 0.5 + 1;
+    return a * 2 ** (-10 * (k -= 1)) * Math.sin((k - s) * (2 * Math.PI) / p) * 0.5 + 1;
 }
 
 /**

diff --git a/cocos/misc/renderer.ts b/cocos/misc/renderer.ts
@@ -244,14 +244,17 @@ export class Renderer extends Component {
     }
 
     protected _onMaterialModified (index: number, material: Material | null): void {
+        /* empty */
     }
 
     /**
      * @engineInternal
      */
     public _onRebuildPSO (index: number, material: Material | null): void {
+        /* empty */
     }
 
     protected _clearMaterials (): void {
+        /* empty */
     }
 }
diff --git a/cocos/primitive/torus.ts b/cocos/primitive/torus.ts
@@ -46,7 +46,19 @@ interface ITorusOptions extends IGeometryOptions {
  * @param tube @zh 管形大小。@en The radius of tube
  * @param opts @zh 参数选项。@en The optional creation parameters of the torus
  */
-export default function torus (radius = 0.4, tube = 0.1, opts: RecursivePartial<ITorusOptions> = {}): { positions: number[]; normals: number[]; uvs: number[]; indices: number[]; minPos: Vec3; maxPos: Vec3; boundingRadius: number; } {
+export default function torus (
+    radius = 0.4,
+    tube = 0.1,
+    opts: RecursivePartial<ITorusOptions> = {},
+): {
+    positions: number[];
+    normals: number[];
+    uvs: number[];
+    indices: number[];
+    minPos: Vec3;
+    maxPos: Vec3;
+    boundingRadius: number;
+} {
     const radialSegments = opts.radialSegments || 32;
     const tubularSegments = opts.tubularSegments || 32;
     const arc = opts.arc || 2.0 * Math.PI;