修复帧时间不准确问题

预新增fsm （简单状态机）

Author: esengine

.vscode/launch.json

@@ -1,11 +1,6 @@
 # egret-BehaviourTree
 基于Egret开发的AI（BehaviourTree、UtilityAI）系统，一套已经非常完整的系统。大家可以自行看源代码来学习，项目当中也有好几个示例，如果对项目你有更多的解决方案可发起 `pull request`请求或者有任何疑问可发起`issue`。
 
-## 加入我们
-如果需要任何帮助，或者有任何疑问可以加入以下信息:
-
-QQ群: 711978707
-
 ## 目录结构
 
 - src `源目录`

README.md

@@ -39,13 +39,16 @@
 		"bin-debug/behaviourTree/decorators/Inverter.js",
 		"bin-debug/behaviourTree/decorators/Repeater.js",
 		"bin-debug/behaviourTree/decorators/UntilFail.js",
+		"bin-debug/behaviourTree/decorators/UntilSuccess.js",
 		"bin-debug/LoadingUI.js",
-		"bin-debug/core/ArrayExt.js",
 		"bin-debug/core/Assert.js",
 		"bin-debug/core/Mathf.js",
 		"bin-debug/core/Random.js",
 		"bin-debug/core/Timer.js",
 		"bin-debug/core/TimerItem.js",
+		"bin-debug/fsm/SimpleStateMachine.js",
+		"bin-debug/fsm/State.js",
+		"bin-debug/fsm/StateMachine.js",
 		"bin-debug/test/LowPriorityAbortTree.js",
 		"bin-debug/test/SelfAbortTree.js",
 		"bin-debug/test/State.js",
@@ -69,6 +72,6 @@
 		"bin-debug/utilityAI/considerations/appraisals/IAppraisal.js",
 		"bin-debug/utilityAI/reasoners/FirstScoreReasoner.js",
 		"bin-debug/utilityAI/reasoners/HighestScoreReasoner.js",
-		"bin-debug/behaviourTree/decorators/UntilSuccess.js"
+		"bin-debug/core/ArrayExt.js"
 	]
 }

manifest.json

@@ -114,9 +114,9 @@ class Main extends eui.UILayer {
     }
 
     private onEnterFrame(){
-        // this.selfAbortTreeSample.update();
+        this.selfAbortTreeSample.update();
         // this.lowerPriorityAbortTreeSample.update();
-        this.utilitySample.update();
+        // this.utilitySample.update();
     }
 
     /**

src/Main.ts

@@ -7,6 +7,8 @@ class BehaviorTree<T>{
      * 更新周期为0.2将使树每秒更新5次。
      */
     public updatePeriod: number;
+    public lastUpdate: number = 0;
+    public stepUpdateCounter: number = 0;
     /**
      * 上下文应包含运行树所需的所有数据
      */
@@ -22,21 +24,21 @@ class BehaviorTree<T>{
         this._root = rootNode;
 
         this.updatePeriod = this._elapsedTime = updatePeriod;
+        this.lastUpdate = egret.getTimer();
     }
 
     public tick(){
+        let now = egret.getTimer();
+        let dt = now - this.lastUpdate;
+        this.lastUpdate = now;
+        this.stepUpdateCounter += dt;
         /**
          * 小于或等于0的updatePeriod将标记每一帧
          */
         if (this.updatePeriod > 0){
-            // TODO: 这里是需要优化的地方.
-            this._elapsedTime -= Number((1000 / Timer.deltaTime).toFixed(5)) / 10000;
-            // this._elapsedTime -= Timer.deltaTime;
-            if (this._elapsedTime <= 0){
-                while (this._elapsedTime <= 0)
-                    this._elapsedTime += this.updatePeriod;
-
+            if (this.stepUpdateCounter >= this.updatePeriod){
                 this._root.tick(this._context);
+                this.stepUpdateCounter -= this.updatePeriod;
             }
         }
         else{

src/behaviourTree/BehaviorTree.ts

@@ -0,0 +1,71 @@
+module fsm{
+    /**
+     * 具有字符串约束的简单状态机。 使用此功能时必须遵循一些规则：
+     *  - 在调用update之前必须设置initialState（使用构造函数）
+     *  - 如果在子类中实现更新，则必须调用super.update（）
+     *
+     * @abstract
+     * @class SimpleStateMachine
+     * @template TEnum
+     */
+    export abstract class SimpleStateMachine{
+        protected elapsedTimeInState: number = 0;
+        protected previousState: string;
+        private _stateCache: {[key: string]: StateMethodCache};
+        private _stateMethods: StateMethodCache;
+
+        private _currentState: string;
+        public get currentState(): string{
+            return this._currentState;
+        }
+
+        public set currentState(value: string){
+            if (this._currentState == value)
+                return;
+
+            this.previousState = this._currentState;
+            this._currentState = value;
+
+            if (this._stateMethods.exitState != null)
+                this._stateMethods.exitState();
+
+            this.elapsedTimeInState = 0;
+            this._stateMethods = this._stateCache[this._currentState];
+
+            if (this._stateMethods.enterState != null)
+                this._stateMethods.enterState();
+        }
+
+        protected set initialState(value: string){
+            this._currentState = value;
+            this._stateMethods = this._stateCache[this._currentState];
+
+            if (this._stateMethods.enterState != null)
+                this._stateMethods.enterState();
+        }
+
+        constructor(){
+            this._stateCache = {};
+        }
+
+        public update(){
+            if (this._stateMethods.tick != null)
+                this._stateMethods.tick();
+        }
+
+        public setEnterMethod(stateName: string, enterState: Function, tickState: Function, exitState: Function){
+            let state = new StateMethodCache();
+            state.enterState = enterState;
+            state.tick = tickState;
+            state.exitState = exitState;
+
+            this._stateCache[stateName] = state;
+        }
+    }
+
+    export class StateMethodCache{
+        public enterState: Function;
+        public tick: Function;
+        public exitState: Function;
+    }
+}

src/fsm/SimpleStateMachine.ts

@@ -0,0 +1,49 @@
+module fsm{
+    export abstract class State<T>{
+        protected _machine: StateMachine<T>;
+        protected _context: T;
+
+        public setMachineAndContext(machine: StateMachine<T>, context: T){
+            this._machine = machine;
+            this._context = context;
+            this.onInitialized();
+        }
+
+        /**
+         * 在设置machine和context之后直接调用，允许状态执行任何所需的设置
+         *
+         * @memberof State
+         */
+        public onInitialized(){}
+
+        /**
+         * 当状态变为活动状态时调用
+         *
+         * @memberof State
+         */
+        public begin(){}
+
+        /**
+         * 在更新之前调用，允许状态最后一次机会改变状态
+         *
+         * @memberof State
+         */
+        public reason(){}
+
+        /**
+         * 每个帧调用此状态为活动状态
+         *
+         * @abstract
+         * @param {number} deltaTime
+         * @memberof State
+         */
+        public abstract update(deltaTime: number);
+
+        /**
+         * 此状态不再是活动状态时调用
+         *
+         * @memberof State
+         */
+        public end(){}
+    }
+}

src/fsm/State.ts

@@ -0,0 +1,24 @@
+module fsm{
+    export class StateMachine<T>{
+        public onStateChanged: Function;
+        
+
+        public get currentState(): State<T>{
+            return this._currentState;
+        }
+        public previousState: State<T>;
+        public elapsedTimeInState: number = 0;
+        protected _currentState: State<T>;
+        protected _context: T;
+        private _states: {[key: number]: State<T>} = {};
+
+        constructor(context: T, initialState: State<T>){
+            this._context = context;
+            this.addState(initialState);
+        }
+
+        public addState(state: State<T>){
+            state.setMachineAndContext(this, this._context);
+        }
+    }
+}