mani-game-engine 1.0.0-pre.9 → 1.0.0-pre.91
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/lib/clock.d.ts +26 -3
- package/lib/clock.js +94 -20
- package/lib/clock.js.map +1 -1
- package/lib/ecsInjector.d.ts +31 -12
- package/lib/ecsInjector.js +125 -46
- package/lib/ecsInjector.js.map +1 -1
- package/lib/entity.d.ts +23 -4
- package/lib/entity.js +131 -8
- package/lib/entity.js.map +1 -1
- package/lib/gameEngine.d.ts +29 -6
- package/lib/gameEngine.js +253 -78
- package/lib/gameEngine.js.map +1 -1
- package/lib/index.d.ts +7 -7
- package/lib/index.js +35 -10
- package/lib/index.js.map +1 -1
- package/lib/injector.d.ts +125 -0
- package/lib/injector.js +305 -0
- package/lib/injector.js.map +1 -0
- package/lib/scope/scopeContext.d.ts +34 -11
- package/lib/scope/scopeContext.js +97 -31
- package/lib/scope/scopeContext.js.map +1 -1
- package/lib/systemContext.d.ts +12 -5
- package/lib/systemContext.js +43 -6
- package/lib/systemContext.js.map +1 -1
- package/lib/types.d.ts +26 -16
- package/lib/types.js +12 -3
- package/lib/types.js.map +1 -1
- package/lib/utils/map2k.js +5 -1
- package/lib/utils/map2k.js.map +1 -1
- package/package.json +12 -15
- package/src/clock.ts +183 -91
- package/src/ecsInjector.ts +130 -36
- package/src/entity.ts +219 -83
- package/src/gameEngine.ts +555 -361
- package/src/index.ts +22 -7
- package/src/injector.ts +410 -0
- package/src/scope/scopeContext.ts +122 -35
- package/src/systemContext.ts +50 -14
- package/src/types.ts +20 -10
package/LICENSE
CHANGED
package/lib/clock.d.ts
CHANGED
|
@@ -6,8 +6,14 @@ declare const defaultOptions: {
|
|
|
6
6
|
maxFrameTime: number;
|
|
7
7
|
timeScale: number;
|
|
8
8
|
};
|
|
9
|
-
export
|
|
9
|
+
export type Timeout = {
|
|
10
|
+
recall?: number;
|
|
11
|
+
callback: Function;
|
|
12
|
+
callTime: number;
|
|
13
|
+
};
|
|
14
|
+
export type GameClockOptions = Partial<typeof defaultOptions>;
|
|
10
15
|
export interface Clock {
|
|
16
|
+
readonly gameTime: number;
|
|
11
17
|
onPrepare: Signal<unknown>;
|
|
12
18
|
onEarlyUpdate: Signal<OnEarlyUpdateParams>;
|
|
13
19
|
onUpdate: Signal<OnUpdateParams>;
|
|
@@ -15,26 +21,43 @@ export interface Clock {
|
|
|
15
21
|
timeScale: number;
|
|
16
22
|
start(): this;
|
|
17
23
|
stop(): this;
|
|
24
|
+
dispose(): void;
|
|
25
|
+
setTimeout(callback: Function, delay: number): number;
|
|
26
|
+
setInterval(callback: Function, delay: number): number;
|
|
27
|
+
clearTimeout(timeoutId: number): boolean;
|
|
28
|
+
fixedTween(duration: number, from: number, to: number, onUpdate: (t: number) => void): Promise<void>;
|
|
29
|
+
tween(duration: number, from: number, to: number, onUpdate: (t: number) => void): Promise<void>;
|
|
18
30
|
}
|
|
19
31
|
export declare class GameClock implements Clock {
|
|
32
|
+
get gameTime(): number;
|
|
33
|
+
get animationTime(): number;
|
|
34
|
+
private _animationTime;
|
|
35
|
+
private nextTimeoutId;
|
|
36
|
+
private timeouts;
|
|
20
37
|
private isRunning;
|
|
21
38
|
private requestId;
|
|
22
39
|
private currentTime;
|
|
23
40
|
private accumulator;
|
|
24
|
-
private
|
|
41
|
+
private _gameTime;
|
|
25
42
|
private readonly _fixedDeltaTime;
|
|
26
43
|
private update;
|
|
27
|
-
private maxFrameTime;
|
|
44
|
+
private readonly maxFrameTime;
|
|
28
45
|
readonly onPrepare: Signal<unknown>;
|
|
29
46
|
readonly onEarlyUpdate: Signal<OnEarlyUpdateParams>;
|
|
30
47
|
readonly onUpdate: Signal<OnUpdateParams>;
|
|
31
48
|
readonly onFixedUpdate: Signal<OnFixedUpdateParams>;
|
|
32
49
|
constructor(options?: GameClockOptions);
|
|
50
|
+
dispose(): void;
|
|
33
51
|
get fixedDeltaTime(): number;
|
|
34
52
|
private _timeScale;
|
|
35
53
|
get timeScale(): number;
|
|
36
54
|
set timeScale(value: number);
|
|
37
55
|
start(): this;
|
|
38
56
|
stop(): this;
|
|
57
|
+
setTimeout(callback: Function, delay: number): number;
|
|
58
|
+
setInterval(callback: Function, delay: number): number;
|
|
59
|
+
fixedTween(duration: number, from: number, to: number, onUpdate: (t: number) => void): Promise<void>;
|
|
60
|
+
tween(duration: number, from: number, to: number, onUpdate: (t: number) => void): Promise<void>;
|
|
61
|
+
clearTimeout(timeoutId: number): boolean;
|
|
39
62
|
}
|
|
40
63
|
export {};
|
package/lib/clock.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GameClock = void 0;
|
|
4
|
+
const mani_signal_1 = require("mani-signal");
|
|
2
5
|
const MIN_TIME_SCALE = 0.00001;
|
|
3
6
|
const defaultOptions = {
|
|
4
7
|
autoStart: true,
|
|
@@ -6,47 +9,65 @@ const defaultOptions = {
|
|
|
6
9
|
maxFrameTime: 0.25,
|
|
7
10
|
timeScale: 1,
|
|
8
11
|
};
|
|
9
|
-
|
|
12
|
+
class GameClock {
|
|
13
|
+
get gameTime() {
|
|
14
|
+
return this._gameTime;
|
|
15
|
+
}
|
|
16
|
+
get animationTime() {
|
|
17
|
+
return this._animationTime;
|
|
18
|
+
}
|
|
10
19
|
constructor(options) {
|
|
20
|
+
this._animationTime = 0;
|
|
21
|
+
this.nextTimeoutId = 0;
|
|
22
|
+
this.timeouts = new Map();
|
|
11
23
|
this.isRunning = false;
|
|
12
24
|
this.requestId = 0;
|
|
13
25
|
this.currentTime = 0;
|
|
14
26
|
this.accumulator = 0;
|
|
15
|
-
this.
|
|
27
|
+
this._gameTime = 0;
|
|
16
28
|
this.update = (time) => {
|
|
17
29
|
const newTime = time * 0.001;
|
|
18
30
|
if (!this.isRunning) {
|
|
19
31
|
this.currentTime = newTime;
|
|
20
32
|
this.isRunning = true;
|
|
21
33
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
34
|
+
const rawDelta = newTime - this.currentTime;
|
|
35
|
+
let clampedDelta = rawDelta;
|
|
36
|
+
if (clampedDelta > this.maxFrameTime) {
|
|
37
|
+
clampedDelta = this.maxFrameTime;
|
|
25
38
|
}
|
|
39
|
+
const frameTime = clampedDelta * this.timeScale;
|
|
26
40
|
this.currentTime = newTime;
|
|
27
41
|
this.accumulator += frameTime;
|
|
28
|
-
let isMultipleFixedUpdate = false;
|
|
29
|
-
this.onPrepare.dispatch();
|
|
30
|
-
this.onEarlyUpdate.dispatch({ time: this.gameTime, deltaTime: frameTime });
|
|
31
42
|
while (this.accumulator >= this._fixedDeltaTime) {
|
|
32
|
-
|
|
33
|
-
|
|
43
|
+
this.onEarlyUpdate.dispatch({ time: this._gameTime, deltaTime: this._fixedDeltaTime });
|
|
44
|
+
this.onPrepare.dispatch();
|
|
45
|
+
for (const [id, timeOut] of this.timeouts) {
|
|
46
|
+
if (this._gameTime >= timeOut.callTime) {
|
|
47
|
+
timeOut.callback();
|
|
48
|
+
if (timeOut.recall) {
|
|
49
|
+
timeOut.callTime += timeOut.recall;
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
this.timeouts.delete(id);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
34
55
|
}
|
|
35
|
-
this.onFixedUpdate.dispatch({ time: this.
|
|
36
|
-
isMultipleFixedUpdate = true;
|
|
56
|
+
this.onFixedUpdate.dispatch({ time: this._gameTime, deltaTime: this._fixedDeltaTime });
|
|
37
57
|
this.accumulator -= this._fixedDeltaTime;
|
|
38
|
-
this.
|
|
58
|
+
this._gameTime += this._fixedDeltaTime;
|
|
39
59
|
}
|
|
40
60
|
const alpha = this.accumulator / this._fixedDeltaTime;
|
|
41
|
-
this.
|
|
61
|
+
this._animationTime = this._gameTime + alpha * this._fixedDeltaTime;
|
|
62
|
+
this.onUpdate.dispatch({ time: this._animationTime, deltaTime: frameTime, alpha: alpha });
|
|
42
63
|
if (this.isRunning) {
|
|
43
64
|
this.requestId = requestAnimationFrame(this.update);
|
|
44
65
|
}
|
|
45
66
|
};
|
|
46
|
-
this.onPrepare = new Signal();
|
|
47
|
-
this.onEarlyUpdate = new Signal();
|
|
48
|
-
this.onUpdate = new Signal();
|
|
49
|
-
this.onFixedUpdate = new Signal();
|
|
67
|
+
this.onPrepare = new mani_signal_1.Signal();
|
|
68
|
+
this.onEarlyUpdate = new mani_signal_1.Signal();
|
|
69
|
+
this.onUpdate = new mani_signal_1.Signal();
|
|
70
|
+
this.onFixedUpdate = new mani_signal_1.Signal();
|
|
50
71
|
this._timeScale = 1;
|
|
51
72
|
const opts = Object.assign(Object.assign({}, defaultOptions), options);
|
|
52
73
|
this._fixedDeltaTime = opts.fixedDeltaTime;
|
|
@@ -54,17 +75,28 @@ export class GameClock {
|
|
|
54
75
|
this.timeScale = opts.timeScale;
|
|
55
76
|
opts.autoStart && this.start();
|
|
56
77
|
}
|
|
78
|
+
dispose() {
|
|
79
|
+
this.stop();
|
|
80
|
+
this.timeouts.clear();
|
|
81
|
+
this.onPrepare.detachAll();
|
|
82
|
+
this.onEarlyUpdate.detachAll();
|
|
83
|
+
this.onUpdate.detachAll();
|
|
84
|
+
this.onFixedUpdate.detachAll();
|
|
85
|
+
}
|
|
57
86
|
get fixedDeltaTime() { return this._fixedDeltaTime; }
|
|
58
87
|
get timeScale() {
|
|
59
88
|
return this._timeScale;
|
|
60
89
|
}
|
|
61
90
|
set timeScale(value) {
|
|
62
|
-
this._timeScale = Math.max(value, MIN_TIME_SCALE);
|
|
91
|
+
this._timeScale = value === 0 ? 0 : Math.max(value, MIN_TIME_SCALE);
|
|
63
92
|
}
|
|
64
93
|
start() {
|
|
65
94
|
if (this.isRunning) {
|
|
66
95
|
return this;
|
|
67
96
|
}
|
|
97
|
+
this.isRunning = true;
|
|
98
|
+
this.currentTime = performance.now() * 0.001;
|
|
99
|
+
this.accumulator = 0;
|
|
68
100
|
this.requestId = requestAnimationFrame(this.update);
|
|
69
101
|
return this;
|
|
70
102
|
}
|
|
@@ -76,5 +108,47 @@ export class GameClock {
|
|
|
76
108
|
cancelAnimationFrame(this.requestId);
|
|
77
109
|
return this;
|
|
78
110
|
}
|
|
111
|
+
setTimeout(callback, delay) {
|
|
112
|
+
const timeOut = { callback, callTime: this._gameTime + delay };
|
|
113
|
+
this.nextTimeoutId++;
|
|
114
|
+
this.timeouts.set(this.nextTimeoutId, timeOut);
|
|
115
|
+
return this.nextTimeoutId;
|
|
116
|
+
}
|
|
117
|
+
setInterval(callback, delay) {
|
|
118
|
+
const timeOut = { callback, callTime: this._gameTime + delay, recall: delay };
|
|
119
|
+
this.nextTimeoutId++;
|
|
120
|
+
this.timeouts.set(this.nextTimeoutId, timeOut);
|
|
121
|
+
return this.nextTimeoutId;
|
|
122
|
+
}
|
|
123
|
+
async fixedTween(duration, from, to, onUpdate) {
|
|
124
|
+
return new Promise((resolve) => {
|
|
125
|
+
const startTime = this.gameTime;
|
|
126
|
+
const binding = this.onFixedUpdate.add(({ time }) => {
|
|
127
|
+
const t = Math.min(1, (this.gameTime - startTime) / duration);
|
|
128
|
+
onUpdate(from + (to - from) * t);
|
|
129
|
+
if (t >= 1) {
|
|
130
|
+
binding.detach();
|
|
131
|
+
resolve();
|
|
132
|
+
}
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
async tween(duration, from, to, onUpdate) {
|
|
137
|
+
return new Promise((resolve) => {
|
|
138
|
+
const startTime = this._animationTime;
|
|
139
|
+
const binding = this.onUpdate.add(({ time }) => {
|
|
140
|
+
const t = Math.min(1, (this._animationTime - startTime) / duration);
|
|
141
|
+
onUpdate(from + (to - from) * t);
|
|
142
|
+
if (t >= 1) {
|
|
143
|
+
binding.detach();
|
|
144
|
+
resolve();
|
|
145
|
+
}
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
clearTimeout(timeoutId) {
|
|
150
|
+
return this.timeouts.delete(timeoutId);
|
|
151
|
+
}
|
|
79
152
|
}
|
|
153
|
+
exports.GameClock = GameClock;
|
|
80
154
|
//# sourceMappingURL=clock.js.map
|
package/lib/clock.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clock.js","sourceRoot":"","sources":["../src/clock.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"clock.js","sourceRoot":"","sources":["../src/clock.ts"],"names":[],"mappings":"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"}
|
package/lib/ecsInjector.d.ts
CHANGED
|
@@ -1,25 +1,44 @@
|
|
|
1
|
-
import { Class, ID, Injector, ResolverFunction } from 'mani-injector';
|
|
2
1
|
import { Signal } from 'mani-signal';
|
|
2
|
+
import { Class, Dependency, ID, Injector, ResolverFunction } from './injector';
|
|
3
3
|
import { SystemContext } from './systemContext';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
4
|
+
import { Entity } from './entity';
|
|
5
|
+
type ComponentClass = Class;
|
|
6
|
+
type EntityClass = Class;
|
|
7
|
+
type ComponentDependency = Dependency & {
|
|
8
|
+
kind: 'component';
|
|
9
|
+
index: number;
|
|
10
|
+
type: Class;
|
|
11
|
+
};
|
|
12
|
+
type DynamicComponentDependency = Dependency & {
|
|
13
|
+
kind: 'dynamic';
|
|
14
|
+
index: number;
|
|
15
|
+
type: Class;
|
|
16
|
+
};
|
|
17
|
+
export declare const GetComponent: (dependantType: Class<any>, _propertyKey: any, index: number) => any;
|
|
18
|
+
export declare const GetDynamicComponent: (dependantType: Class<any>, _propertyKey: any, index: number) => any;
|
|
19
|
+
export declare const GetEntity: (dependantType: Class<any>, _propertyKey: any, index: number) => any;
|
|
20
|
+
export declare const GetContext: (dependantType: Class<any>, _propertyKey: any, index: number) => any;
|
|
21
|
+
export declare const GetSignal: (id: ID) => (dependantType: Class<any>, _propertyKey: any, index: number) => any;
|
|
22
|
+
export declare const GetEntitySignal: (id: ID) => (dependantType: Class<any>, _propertyKey: any, index: number) => any;
|
|
12
23
|
export declare const EntityComponent: (target: object, propertyKey: string) => any;
|
|
13
24
|
export declare const signalHandlers: Map<Object, [string, ID][]>;
|
|
14
25
|
export declare const staticSignalHandlers: Map<Object, [string, ID][]>;
|
|
15
26
|
export declare const OnSignal: (id: ID) => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
|
|
16
27
|
export declare class EcsInjector<SystemClass extends Class = Class> extends Injector {
|
|
28
|
+
static warnNoMatchingEntities: boolean;
|
|
29
|
+
static entityComponents: Map<EntityClass, Map<ComponentClass, string>>;
|
|
30
|
+
protected componentDependencyMap: Map<Class, ComponentDependency[]>;
|
|
31
|
+
protected dynamicComponentDependencyMap: Map<Class, DynamicComponentDependency[]>;
|
|
17
32
|
protected entitySystemMap: Map<Class, SystemClass[]>;
|
|
18
|
-
protected
|
|
19
|
-
|
|
33
|
+
protected dynamicComponentSystemMap: Map<Class, SystemClass[]>;
|
|
34
|
+
protected entitySystemResolverTuples: Map<Class, Map<SystemClass, ResolverFunction[]>>;
|
|
35
|
+
private readonly signalMap;
|
|
20
36
|
constructor(parent?: EcsInjector<SystemClass>);
|
|
21
37
|
registerSystem<T extends SystemClass>(systemClass: T): void;
|
|
22
|
-
|
|
38
|
+
createSystemsForDynamicComponents(dynamicComponentClass: Class, entity: Entity): Set<SystemContext<import("./types").System>> | undefined;
|
|
39
|
+
createSystemsForEntity(entity: Entity): Set<SystemContext>;
|
|
40
|
+
private createSystems;
|
|
41
|
+
private getSystemResolverTuples;
|
|
23
42
|
getSignal<T>(id: ID): Signal<T>;
|
|
24
43
|
dispose(): void;
|
|
25
44
|
}
|
package/lib/ecsInjector.js
CHANGED
|
@@ -1,41 +1,58 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EcsInjector = exports.OnSignal = exports.staticSignalHandlers = exports.signalHandlers = exports.EntityComponent = exports.GetEntitySignal = exports.GetSignal = exports.GetContext = exports.GetEntity = exports.GetDynamicComponent = exports.GetComponent = void 0;
|
|
4
|
+
const mani_signal_1 = require("mani-signal");
|
|
5
|
+
const injector_1 = require("./injector");
|
|
6
|
+
const systemContext_1 = require("./systemContext");
|
|
7
|
+
exports.GetComponent = (0, injector_1.createDependencyAnnotation)((type, index) => ({ kind: 'component', type, index }));
|
|
8
|
+
exports.GetDynamicComponent = (0, injector_1.createDependencyAnnotation)((type, index) => ({
|
|
9
|
+
kind: 'dynamic',
|
|
10
|
+
type,
|
|
11
|
+
index,
|
|
12
|
+
}));
|
|
13
|
+
exports.GetEntity = (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'entity', index }));
|
|
14
|
+
exports.GetContext = (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'context', index }));
|
|
15
|
+
const GetSignal = (id) => (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'signal', index, id }));
|
|
16
|
+
exports.GetSignal = GetSignal;
|
|
17
|
+
const GetEntitySignal = (id) => (0, injector_1.createDependencyAnnotation)((_type, index) => ({
|
|
18
|
+
kind: 'entitySignal',
|
|
19
|
+
index,
|
|
20
|
+
id,
|
|
21
|
+
}));
|
|
22
|
+
exports.GetEntitySignal = GetEntitySignal;
|
|
23
|
+
const EntityComponent = (target, propertyKey) => {
|
|
10
24
|
const entityClass = target.constructor;
|
|
11
25
|
const componentClass = Reflect.getMetadata('design:type', target, propertyKey);
|
|
12
26
|
if (componentClass === Object) {
|
|
13
27
|
throw new Error(`Object component type not allowed. Forgot to specify type of ${entityClass.name}.${propertyKey}?`);
|
|
14
28
|
}
|
|
15
|
-
const componentSet = putIfAbsent(entityComponents, entityClass, () => new Map());
|
|
29
|
+
const componentSet = (0, injector_1.putIfAbsent)(EcsInjector.entityComponents, entityClass, () => new Map());
|
|
16
30
|
componentSet.set(componentClass, propertyKey);
|
|
17
31
|
};
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
32
|
+
exports.EntityComponent = EntityComponent;
|
|
33
|
+
exports.signalHandlers = new Map();
|
|
34
|
+
exports.staticSignalHandlers = new Map();
|
|
35
|
+
const OnSignal = (id) => (target, propertyKey, descriptor) => {
|
|
21
36
|
if (target instanceof Function) {
|
|
22
|
-
let mappingList = putIfAbsent(staticSignalHandlers, target, () => []);
|
|
37
|
+
let mappingList = (0, injector_1.putIfAbsent)(exports.staticSignalHandlers, target, () => []);
|
|
23
38
|
mappingList.push([propertyKey, id]);
|
|
24
39
|
}
|
|
25
40
|
else {
|
|
26
|
-
let mappingList = putIfAbsent(signalHandlers, target.constructor, () => []);
|
|
41
|
+
let mappingList = (0, injector_1.putIfAbsent)(exports.signalHandlers, target.constructor, () => []);
|
|
27
42
|
mappingList.push([propertyKey, id]);
|
|
28
43
|
}
|
|
29
44
|
};
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
45
|
+
exports.OnSignal = OnSignal;
|
|
46
|
+
const extractDependenciesWithType = (type) => {
|
|
47
|
+
const result = new Map();
|
|
48
|
+
injector_1.Injector.dependencyMap.forEach((dependency, system) => {
|
|
49
|
+
(0, injector_1.putIfAbsent)(result, system, () => [...dependency.filter((dependency) => dependency.kind === type)]);
|
|
50
|
+
});
|
|
51
|
+
return result;
|
|
35
52
|
};
|
|
36
53
|
const getEntityClassesForComponentDependencies = (componentTypes) => {
|
|
37
54
|
const result = [];
|
|
38
|
-
for (const [entityClass, componentMap] of entityComponents) {
|
|
55
|
+
for (const [entityClass, componentMap] of EcsInjector.entityComponents) {
|
|
39
56
|
let allDependenciesMet = true;
|
|
40
57
|
for (const componentType of componentTypes) {
|
|
41
58
|
if (!componentMap.has(componentType)) {
|
|
@@ -56,80 +73,139 @@ const componentResolver = (context, dependency) => {
|
|
|
56
73
|
throw new Error(`Could not resolve Component ${type.name}. @GetComponent only allowed in system scope.`);
|
|
57
74
|
}
|
|
58
75
|
const entityClass = context.entityClass;
|
|
59
|
-
const key = entityComponents.get(entityClass).get(dependency.type);
|
|
76
|
+
const key = EcsInjector.entityComponents.get(entityClass).get(dependency.type);
|
|
60
77
|
return (context) => context.entity[key];
|
|
61
78
|
};
|
|
79
|
+
const dynamicComponentResolver = (context, dependency) => {
|
|
80
|
+
const kind = context.kind;
|
|
81
|
+
const type = context.type;
|
|
82
|
+
if (kind !== 'system') {
|
|
83
|
+
throw new Error(`Could not resolve Component ${type.name}. @GetComponent only allowed in system scope.`);
|
|
84
|
+
}
|
|
85
|
+
return (context) => context.entity.getDynamicComponent(dependency.type);
|
|
86
|
+
};
|
|
62
87
|
const entityResolver = ({ type, kind }, _dependency) => {
|
|
63
88
|
if (kind !== 'system') {
|
|
64
89
|
throw new Error(`Could not resolve Entity in ${type.name}. @GetEntity only allowed in system scope.`);
|
|
65
90
|
}
|
|
66
91
|
return (context) => context.entity;
|
|
67
92
|
};
|
|
93
|
+
const entitySignalResolver = ({ type, kind }, dependency) => {
|
|
94
|
+
if (kind !== 'system') {
|
|
95
|
+
throw new Error(`Could not resolve Entity in ${type.name}. @GetEntity only allowed in system scope.`);
|
|
96
|
+
}
|
|
97
|
+
return (context) => context.entity.getSignal(dependency.id);
|
|
98
|
+
};
|
|
68
99
|
const contextResolver = ({ type, kind }, _dependency) => {
|
|
69
100
|
if (kind !== 'system') {
|
|
70
101
|
throw new Error(`Could not resolve Context in ${type.name}. @GetContext only allowed in system scope.`);
|
|
71
102
|
}
|
|
72
103
|
return (context) => context;
|
|
73
104
|
};
|
|
74
|
-
|
|
105
|
+
class EcsInjector extends injector_1.Injector {
|
|
75
106
|
constructor(parent) {
|
|
76
107
|
super(parent);
|
|
108
|
+
this.componentDependencyMap = extractDependenciesWithType('component');
|
|
109
|
+
this.dynamicComponentDependencyMap = extractDependenciesWithType('dynamic');
|
|
77
110
|
this.signalMap = parent ? parent.signalMap : new Map();
|
|
78
|
-
this.entitySystemMap =
|
|
79
|
-
this.
|
|
111
|
+
this.entitySystemMap = new Map();
|
|
112
|
+
this.dynamicComponentSystemMap = new Map();
|
|
113
|
+
this.entitySystemResolverTuples = new Map();
|
|
80
114
|
this.map(EcsInjector).toValue(this);
|
|
81
115
|
if (!parent) {
|
|
82
116
|
this.addExtensionResolver('entity', entityResolver);
|
|
83
117
|
this.addExtensionResolver('component', componentResolver);
|
|
118
|
+
this.addExtensionResolver('dynamic', dynamicComponentResolver);
|
|
84
119
|
this.addExtensionResolver('context', contextResolver);
|
|
85
120
|
const signalResolver = ({ kind }, dependency) => {
|
|
86
|
-
const signal = putIfAbsent(this.signalMap, dependency.id, () => new Signal());
|
|
121
|
+
const signal = (0, injector_1.putIfAbsent)(this.signalMap, dependency.id, () => new mani_signal_1.Signal());
|
|
87
122
|
return (entity) => signal;
|
|
88
123
|
};
|
|
89
124
|
this.addExtensionResolver('signal', signalResolver);
|
|
125
|
+
this.addExtensionResolver('entitySignal', entitySignalResolver);
|
|
90
126
|
}
|
|
91
127
|
}
|
|
92
128
|
registerSystem(systemClass) {
|
|
93
|
-
|
|
129
|
+
var _a;
|
|
130
|
+
const componentDependencies = ((_a = this.componentDependencyMap.get(systemClass)) === null || _a === void 0 ? void 0 : _a.map(it => it.type)) || [];
|
|
131
|
+
const dynamicComponentDependencies = this.dynamicComponentDependencyMap.get(systemClass) || [];
|
|
132
|
+
for (const dynamicComponentDependency of dynamicComponentDependencies) {
|
|
133
|
+
const systemClassesForDynamicComponent = (0, injector_1.putIfAbsent)(this.dynamicComponentSystemMap, dynamicComponentDependency.type, () => []);
|
|
134
|
+
systemClassesForDynamicComponent.push(systemClass);
|
|
135
|
+
}
|
|
94
136
|
if (componentDependencies.length === 0) {
|
|
95
137
|
throw new Error(`${systemClass.name} needs at least one component dependency.`);
|
|
96
138
|
}
|
|
97
139
|
const entityClasses = getEntityClassesForComponentDependencies(componentDependencies);
|
|
98
|
-
if (entityClasses.length === 0) {
|
|
140
|
+
if (entityClasses.length === 0 && EcsInjector.warnNoMatchingEntities) {
|
|
99
141
|
console.warn(`System '${systemClass.name}' has no matching entities.`);
|
|
100
142
|
return;
|
|
101
143
|
}
|
|
102
144
|
for (let entityClass of entityClasses) {
|
|
103
|
-
const systemClasses = putIfAbsent(this.entitySystemMap, entityClass, () => []);
|
|
145
|
+
const systemClasses = (0, injector_1.putIfAbsent)(this.entitySystemMap, entityClass, () => []);
|
|
104
146
|
systemClasses.push(systemClass);
|
|
105
147
|
}
|
|
106
148
|
}
|
|
107
|
-
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
149
|
+
createSystemsForDynamicComponents(dynamicComponentClass, entity) {
|
|
150
|
+
const potentialSystems = this.getSystemResolverTuples(entity);
|
|
151
|
+
const systems = this.dynamicComponentSystemMap.get(dynamicComponentClass);
|
|
152
|
+
if (!systems) {
|
|
153
|
+
return undefined;
|
|
154
|
+
}
|
|
155
|
+
const finalSystemResolverEntries = new Map();
|
|
156
|
+
for (const system of systems) {
|
|
157
|
+
const resolverTuples = potentialSystems.get(system);
|
|
158
|
+
if (resolverTuples) {
|
|
159
|
+
finalSystemResolverEntries.set(system, resolverTuples);
|
|
116
160
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
161
|
+
}
|
|
162
|
+
return this.createSystems(finalSystemResolverEntries, entity);
|
|
163
|
+
}
|
|
164
|
+
createSystemsForEntity(entity) {
|
|
165
|
+
const systemResolverTuples = this.getSystemResolverTuples(entity);
|
|
166
|
+
return this.createSystems(systemResolverTuples, entity);
|
|
167
|
+
}
|
|
168
|
+
createSystems(systemResolverMap, entity) {
|
|
169
|
+
const systemInstances = new Set();
|
|
170
|
+
for (const [system, resolver] of systemResolverMap) {
|
|
121
171
|
const args = new Array(resolver.length);
|
|
122
|
-
const
|
|
172
|
+
const dynamicDependencies = this.dynamicComponentDependencyMap.get(system) || [];
|
|
173
|
+
const hasUnfulfilledDynamicDependencies = dynamicDependencies.some((dependency, index) => {
|
|
174
|
+
return !entity.hasDynamicComponentClass(dependency.type);
|
|
175
|
+
});
|
|
176
|
+
if (hasUnfulfilledDynamicDependencies) {
|
|
177
|
+
continue;
|
|
178
|
+
}
|
|
179
|
+
const systemContext = new systemContext_1.SystemContext(entity);
|
|
123
180
|
for (let i = 0; i < args.length; i++) {
|
|
124
181
|
args[i] = resolver[i](systemContext);
|
|
125
182
|
}
|
|
126
|
-
|
|
127
|
-
|
|
183
|
+
const newSystem = new system(...args);
|
|
184
|
+
const entitySignals = systemContext_1.entitySignalHandlers.get(system);
|
|
185
|
+
if (entitySignals === null || entitySignals === void 0 ? void 0 : entitySignals.length) {
|
|
186
|
+
for (const [propertyKey, id] of entitySignals) {
|
|
187
|
+
entity.getSignal(id).add(newSystem[propertyKey], { context: newSystem });
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
systemContext.system = newSystem;
|
|
191
|
+
systemInstances.add(systemContext);
|
|
128
192
|
}
|
|
129
193
|
return systemInstances;
|
|
130
194
|
}
|
|
195
|
+
getSystemResolverTuples(entity) {
|
|
196
|
+
return (0, injector_1.putIfAbsent)(this.entitySystemResolverTuples, entity.constructor, () => {
|
|
197
|
+
const systems = this.entitySystemMap.get(entity.constructor);
|
|
198
|
+
if (!systems)
|
|
199
|
+
return [];
|
|
200
|
+
const result = new Map();
|
|
201
|
+
for (const systemClass of systems) {
|
|
202
|
+
result.set(systemClass, this.createResolverArray({ type: systemClass, kind: 'system', entityClass: entity.constructor }));
|
|
203
|
+
}
|
|
204
|
+
return result;
|
|
205
|
+
});
|
|
206
|
+
}
|
|
131
207
|
getSignal(id) {
|
|
132
|
-
return putIfAbsent(this.signalMap, id, () => new Signal());
|
|
208
|
+
return (0, injector_1.putIfAbsent)(this.signalMap, id, () => new mani_signal_1.Signal());
|
|
133
209
|
}
|
|
134
210
|
dispose() {
|
|
135
211
|
for (const [key, signal] of this.signalMap) {
|
|
@@ -137,4 +213,7 @@ export class EcsInjector extends Injector {
|
|
|
137
213
|
}
|
|
138
214
|
}
|
|
139
215
|
}
|
|
216
|
+
exports.EcsInjector = EcsInjector;
|
|
217
|
+
EcsInjector.warnNoMatchingEntities = true;
|
|
218
|
+
EcsInjector.entityComponents = new Map();
|
|
140
219
|
//# sourceMappingURL=ecsInjector.js.map
|
package/lib/ecsInjector.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ecsInjector.js","sourceRoot":"","sources":["../src/ecsInjector.ts"],"names":[],"mappings":"AACA,
|
|
1
|
+
{"version":3,"file":"ecsInjector.js","sourceRoot":"","sources":["../src/ecsInjector.ts"],"names":[],"mappings":"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"}
|