cha0s/avocado-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: explicit routine context

Browse Source
This commit is contained in:
cha0s 2019-09-08 08:18:16 -05:00
parent 4f6869863c
commit 0a3e1848f4
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/behavior/item/routine.js
View File

@ -7,14 +7,9 @@ export class Routine {
} }
constructor() { constructor() {
this._context = undefined;
this.actions = new Actions(); this.actions = new Actions();
} }
set context(context) {
this._context = context;
}
clone(other) { clone(other) {
this.actions = other.actions.clone(); this.actions = other.actions.clone();
} }
@ -24,8 +19,8 @@ export class Routine {
return this; return this;
} }
tick(elapsed) { tick(context, elapsed) {
this.actions.tick(this._context, elapsed); this.actions.tick(context, elapsed);
} }
toJSON() { toJSON() {

8
packages/behavior/item/routines.js
View File

@ -7,7 +7,6 @@ export class Routines {
} }
constructor() { constructor() {
this._context = undefined;
this.routines = {}; this.routines = {};
} }
@ -18,13 +17,6 @@ export class Routines {
} }
} }
set context(context) {
this._context = context;
for (const routine of this) {
routine.context = context;
}
}
clone(other) { clone(other) {
for (const i in other.routines) { for (const i in other.routines) {
const routine = other.routines[i]; const routine = other.routines[i];

3
packages/behavior/traits/behaved.trait.js
View File

@ -38,7 +38,6 @@ export class Behaved extends decorate(Trait) {
this._currentRoutine = undefined; this._currentRoutine = undefined;
const routinesJSON = this.params.routines; const routinesJSON = this.params.routines;
this._routines = (new Routines()).fromJSON(routinesJSON); this._routines = (new Routines()).fromJSON(routinesJSON);
this._routines.context = this._context;
this.updateCurrentRoutine(this.state.currentRoutine); this.updateCurrentRoutine(this.state.currentRoutine);
} }
@ -73,7 +72,7 @@ export class Behaved extends decorate(Trait) {
tick(elapsed) { tick(elapsed) {
if (AVOCADO_SERVER) { if (AVOCADO_SERVER) {
if (this._currentRoutine && this.entity.isBehaving) { if (this._currentRoutine && this.entity.isBehaving) {
this._currentRoutine.tick(elapsed); this._currentRoutine.tick(this._context, elapsed);
} }
} }
} }