From 55a52a30efe5819cd1cfa138494eea367a466d2b Mon Sep 17 00:00:00 2001 From: PYZ <592744797@qq.com> Date: Mon, 16 Apr 2018 11:24:49 +0800 Subject: [PATCH 1/3] add tween --- lib/entity.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lib/entity.js b/lib/entity.js index ffd9645..9894d03 100644 --- a/lib/entity.js +++ b/lib/entity.js @@ -14,12 +14,17 @@ export default class Entity { this._ready = false; this._destroyed = false; this._comps = []; + this._tweens = null; // app internal data this._app = null; this._poolID = -1; } + get tweens() { + return this._tweens; + } + get enabledInHierarchy() { return this._enabled && this._ancestorEnabled; } @@ -32,6 +37,27 @@ export default class Entity { return this._destroyed; } + addTween(component, prop, option) { + if (!this._vtweens) { + this._vtweens = this._app.tweenEngine.newTimeLine({}); + } + + if (component === 'Entity') { + let vtween = this._app.tweenEngine.newTask(this, prop, option); + this._vtweens.add(vtween); + return; + } + + let com = this.getComp(component); + + if (!com) { + return; + } + + let vtween = this._app.tweenEngine.newTask(com, prop, option); + this._vtweens.add(vtween); + } + destroy() { if (this._destroyed) { return; From 050bcf79f1a523269c8f1af80d3b4a7bb20e61f4 Mon Sep 17 00:00:00 2001 From: PYZ <592744797@qq.com> Date: Mon, 16 Apr 2018 11:41:54 +0800 Subject: [PATCH 2/3] fix bug --- lib/entity.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/entity.js b/lib/entity.js index 9894d03..c52b103 100644 --- a/lib/entity.js +++ b/lib/entity.js @@ -39,11 +39,11 @@ export default class Entity { addTween(component, prop, option) { if (!this._vtweens) { - this._vtweens = this._app.tweenEngine.newTimeLine({}); + this._vtweens = this._app._vtween.newTimeLine({}); } if (component === 'Entity') { - let vtween = this._app.tweenEngine.newTask(this, prop, option); + let vtween = this._app._vtween.newTask(this, prop, option); this._vtweens.add(vtween); return; } @@ -54,7 +54,7 @@ export default class Entity { return; } - let vtween = this._app.tweenEngine.newTask(com, prop, option); + let vtween = this._app._vtween.newTask(com, prop, option); this._vtweens.add(vtween); } From 46067302c0da98f98310cb9df7109a5eef6fcfcb Mon Sep 17 00:00:00 2001 From: PYZ <592744797@qq.com> Date: Mon, 16 Apr 2018 12:51:42 +0800 Subject: [PATCH 3/3] fix bug --- lib/entity.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/entity.js b/lib/entity.js index c52b103..57da15a 100644 --- a/lib/entity.js +++ b/lib/entity.js @@ -38,13 +38,13 @@ export default class Entity { } addTween(component, prop, option) { - if (!this._vtweens) { - this._vtweens = this._app._vtween.newTimeLine({}); + if (!this._tweens) { + this._tweens = this._app._vtween.newTimeLine({}); } if (component === 'Entity') { let vtween = this._app._vtween.newTask(this, prop, option); - this._vtweens.add(vtween); + this._tweens.add(vtween); return; } @@ -55,7 +55,7 @@ export default class Entity { } let vtween = this._app._vtween.newTask(com, prop, option); - this._vtweens.add(vtween); + this._tweens.add(vtween); } destroy() {