@ives_xxz/framework 1.6.5 → 2.0.0

package/utils/FWObjectPool.ts

@@ -1,22 +1,20 @@
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLog from '../log/FWLog';
 import FWObject from './FWObject';
 
 const POOL_DISABLE_POSITION: cc.Vec3 = cc.v3(50000, 50000);
 
 export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPool {
   private uniqueId: number;
-  private type: FWSystemDefine.FWObjectType;
+  private type: FW.SystemDefine.FWObjectType;
   private enablePoolMap: Map<number, FW.ObjectProperty>;
   private disablePoolMap: Map<number, FW.ObjectProperty>;
 
   constructor(
     protected node: cc.Node,
     protected parent: cc.Node,
-    type?: FWSystemDefine.FWObjectType,
+    type?: FW.SystemDefine.FWObjectType,
   ) {
     this.uniqueId = 0;
-    this.type = type !== undefined ? type : FWSystemDefine.FWObjectType.OPACITY;
+    this.type = type !== undefined ? type : FW.SystemDefine.FWObjectType.OPACITY;
     this.enablePoolMap = new Map<number, FW.ObjectProperty>();
     this.disablePoolMap = new Map<number, FW.ObjectProperty>();
   }
@@ -102,7 +100,7 @@ export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPoo
     ObjectProperty.enable = true;
 
     this.enablePoolMap.set(ObjectProperty.uniqueId, ObjectProperty);
-    if (this.type == FWSystemDefine.FWObjectType.OPACITY) {
+    if (this.type == FW.SystemDefine.FWObjectType.OPACITY) {
       node.opacity = 255;
     } else {
       node.active = true;
@@ -150,7 +148,7 @@ export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPoo
       return;
     }
 
-    if (this.type == FWSystemDefine.FWObjectType.OPACITY) {
+    if (this.type == FW.SystemDefine.FWObjectType.OPACITY) {
       node.opacity = 0;
     } else {
       node.active = false;

package/utils/FWTask.ts

@@ -1,10 +1,6 @@
-import { FWEventDefine } from '../define/FWEventDefine';
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLog from '../log/FWLog';
-
 export default class FWTask implements FW.Task {
   private taskQueue: FW.TaskGenerator[] = [];
-  private status: FWSystemDefine.FWTaskStatus = FWSystemDefine.FWTaskStatus.IDLE;
+  private status: FW.SystemDefine.FWTaskStatus = FW.SystemDefine.FWTaskStatus.IDLE;
   private isPaused = false;
   private frameBudget: number;
   private tasksFrameCount: number;
@@ -40,9 +36,9 @@ export default class FWTask implements FW.Task {
     const gen = generator();
     (gen as any).taskId = taskId;
     this.taskQueue = [gen];
-    this.status = FWSystemDefine.FWTaskStatus.RUNNING;
+    this.status = FW.SystemDefine.FWTaskStatus.RUNNING;
     this.recordEvent({
-      type: FWEventDefine.TaskEvent.START,
+      type: FW.EventDefine.TaskEvent.START,
       message: '任务开始',
       taskId,
     });
@@ -57,12 +53,12 @@ export default class FWTask implements FW.Task {
     (gen as any).taskId = taskId;
     this.taskQueue.push(gen);
     this.recordEvent({
-      type: FWEventDefine.TaskEvent.PROGRESS,
+      type: FW.EventDefine.TaskEvent.PROGRESS,
       message: '新任务加入队列',
       taskId,
     });
-    if (this.status !== FWSystemDefine.FWTaskStatus.RUNNING && !this.isPaused) {
-      this.status = FWSystemDefine.FWTaskStatus.RUNNING;
+    if (this.status !== FW.SystemDefine.FWTaskStatus.RUNNING && !this.isPaused) {
+      this.status = FW.SystemDefine.FWTaskStatus.RUNNING;
       this.executeFrame();
     }
     return this;
@@ -78,9 +74,9 @@ export default class FWTask implements FW.Task {
 
   pause(): void {
     this.isPaused = true;
-    this.status = FWSystemDefine.FWTaskStatus.PAUSED;
+    this.status = FW.SystemDefine.FWTaskStatus.PAUSED;
     this.recordEvent({
-      type: FWEventDefine.TaskEvent.PAUSE,
+      type: FW.EventDefine.TaskEvent.PAUSE,
       message: '任务已暂停',
     });
   }
@@ -89,9 +85,9 @@ export default class FWTask implements FW.Task {
     if (this.taskQueue.length === 0) return;
 
     this.isPaused = false;
-    this.status = FWSystemDefine.FWTaskStatus.RUNNING;
+    this.status = FW.SystemDefine.FWTaskStatus.RUNNING;
     this.recordEvent({
-      type: FWEventDefine.TaskEvent.PROGRESS,
+      type: FW.EventDefine.TaskEvent.PROGRESS,
       message: '任务已恢复',
     });
     this.executeFrame();
@@ -99,7 +95,7 @@ export default class FWTask implements FW.Task {
 
   reset(): void {
     this.taskQueue = [];
-    this.status = FWSystemDefine.FWTaskStatus.IDLE;
+    this.status = FW.SystemDefine.FWTaskStatus.IDLE;
     this.isPaused = false;
     this.performanceData = {
       frameTimes: [],
@@ -108,7 +104,7 @@ export default class FWTask implements FW.Task {
     };
   }
 
-  getStatus(): FWSystemDefine.FWTaskStatus {
+  getStatus(): FW.SystemDefine.FWTaskStatus {
     return this.status;
   }
 
@@ -134,7 +130,7 @@ export default class FWTask implements FW.Task {
       if (result.done) {
         this.taskQueue.shift();
         this.recordEvent({
-          type: FWEventDefine.TaskEvent.COMPLETE,
+          type: FW.EventDefine.TaskEvent.COMPLETE,
           progress: 1,
           message: '任务完成',
           taskId,
@@ -148,7 +144,7 @@ export default class FWTask implements FW.Task {
 
       frameTasks.push({
         taskId: taskId,
-        result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
+        result: result.done ? FW.EventDefine.TaskEvent.COMPLETE : FW.EventDefine.TaskEvent.YIELDED,
         message: (result?.value as any)?.message,
       });
 
@@ -169,13 +165,13 @@ export default class FWTask implements FW.Task {
     });
 
     if (this.taskQueue.length === 0) {
-      this.status = FWSystemDefine.FWTaskStatus.COMPLETED;
+      this.status = FW.SystemDefine.FWTaskStatus.COMPLETED;
       this.recordEvent({
-        type: FWEventDefine.TaskEvent.ALL_COMPLETE,
+        type: FW.EventDefine.TaskEvent.ALL_COMPLETE,
         progress: 1,
         message: '所有任务完成',
       });
-      FWLog.system('任务性能报告->', this.getPerformanceReport());
+      FW.Log.system('任务性能报告->', this.getPerformanceReport());
       return;
     }
 
@@ -225,7 +221,7 @@ export default class FWTask implements FW.Task {
   private recordEvent(event: FW.TaskEvent): void {
     this.performanceData.events.push(event);
     if (this.log) {
-      FWLog.debug(`[任务${this.id}]`, event.message || `${event.type} ${event.progress}%`);
+      FW.Log.debug(`[任务${this.id}]`, event.message || `${event.type} ${event.progress}%`);
     }
   }
 }

package/render/FWAssembler.ts

@@ -1,11 +0,0 @@
-// Learn TypeScript:
-//  - https://docs.cocos.com/creator/manual/en/scripting/typescript.html
-// Learn Attribute:
-//  - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html
-// Learn life-cycle callbacks:
-//  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
-
-const { ccclass, property } = cc._decorator;
-
-@ccclass
-export default class FWAssembler extends cc['Assembler'] {}