mani-game-engine 1.0.0-pre.3 → 1.0.0-pre.32
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 +34 -20
- package/lib/clock.js +55 -15
- package/lib/clock.js.map +1 -1
- package/lib/ecsInjector.d.ts +12 -6
- package/lib/ecsInjector.js +55 -29
- package/lib/ecsInjector.js.map +1 -1
- package/lib/entity.d.ts +8 -7
- package/lib/entity.js +29 -17
- package/lib/entity.js.map +1 -1
- package/lib/gameEngine.d.ts +44 -19
- package/lib/gameEngine.js +213 -103
- package/lib/gameEngine.js.map +1 -1
- package/lib/index.d.ts +12 -6
- package/lib/index.js +32 -5
- package/lib/index.js.map +1 -1
- package/lib/injector.d.ts +121 -0
- package/lib/injector.js +290 -0
- package/lib/injector.js.map +1 -0
- package/lib/scope/scopeContext.d.ts +57 -0
- package/lib/scope/scopeContext.js +255 -0
- package/lib/scope/scopeContext.js.map +1 -0
- package/lib/systemContext.d.ts +12 -0
- package/lib/systemContext.js +24 -0
- package/lib/systemContext.js.map +1 -0
- package/lib/types.d.ts +28 -9
- package/lib/types.js +17 -0
- 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 +15 -21
- package/src/clock.ts +90 -29
- package/src/ecsInjector.ts +42 -19
- package/src/entity.ts +24 -14
- package/src/gameEngine.ts +271 -137
- package/src/index.ts +29 -6
- package/src/injector.ts +363 -0
- package/src/scope/scopeContext.ts +320 -0
- package/src/systemContext.ts +27 -0
- package/src/types.ts +27 -10
package/LICENSE
CHANGED
package/lib/clock.d.ts
CHANGED
|
@@ -1,41 +1,55 @@
|
|
|
1
1
|
import { Signal } from 'mani-signal';
|
|
2
|
-
|
|
3
|
-
time: number;
|
|
4
|
-
deltaTime: number;
|
|
5
|
-
};
|
|
6
|
-
declare type OnUpdateParams = {
|
|
7
|
-
time: number;
|
|
8
|
-
deltaTime: number;
|
|
9
|
-
alpha: number;
|
|
10
|
-
};
|
|
11
|
-
declare type OnFixedUpdateParams = {
|
|
12
|
-
time: number;
|
|
13
|
-
deltaTime: number;
|
|
14
|
-
};
|
|
2
|
+
import { OnEarlyUpdateParams, OnFixedUpdateParams, OnUpdateParams } from './types';
|
|
15
3
|
declare const defaultOptions: {
|
|
16
4
|
autoStart: boolean;
|
|
17
5
|
fixedDeltaTime: number;
|
|
18
6
|
maxFrameTime: number;
|
|
19
7
|
timeScale: number;
|
|
20
8
|
};
|
|
9
|
+
export declare type Timeout = {
|
|
10
|
+
recall?: number;
|
|
11
|
+
callback: Function;
|
|
12
|
+
callTime: number;
|
|
13
|
+
};
|
|
21
14
|
export declare type GameClockOptions = Partial<typeof defaultOptions>;
|
|
22
|
-
export
|
|
15
|
+
export interface Clock {
|
|
16
|
+
onPrepare: Signal<unknown>;
|
|
17
|
+
onEarlyUpdate: Signal<OnEarlyUpdateParams>;
|
|
18
|
+
onUpdate: Signal<OnUpdateParams>;
|
|
19
|
+
onFixedUpdate: Signal<OnFixedUpdateParams>;
|
|
20
|
+
timeScale: number;
|
|
21
|
+
start(): this;
|
|
22
|
+
stop(): this;
|
|
23
|
+
dispose(): void;
|
|
24
|
+
setTimeout(callback: Function, delay: number): number;
|
|
25
|
+
setInterval(callback: Function, delay: number): number;
|
|
26
|
+
clearTimeout(timeoutId: number): boolean;
|
|
27
|
+
}
|
|
28
|
+
export declare class GameClock implements Clock {
|
|
29
|
+
private nextTimeoutId;
|
|
30
|
+
private timeouts;
|
|
23
31
|
private isRunning;
|
|
24
32
|
private requestId;
|
|
25
33
|
private currentTime;
|
|
26
34
|
private accumulator;
|
|
27
35
|
private gameTime;
|
|
28
|
-
private
|
|
29
|
-
private
|
|
30
|
-
readonly
|
|
36
|
+
private readonly _fixedDeltaTime;
|
|
37
|
+
private update;
|
|
38
|
+
private readonly maxFrameTime;
|
|
39
|
+
readonly onPrepare: Signal<unknown>;
|
|
31
40
|
readonly onEarlyUpdate: Signal<OnEarlyUpdateParams>;
|
|
32
41
|
readonly onUpdate: Signal<OnUpdateParams>;
|
|
33
42
|
readonly onFixedUpdate: Signal<OnFixedUpdateParams>;
|
|
34
43
|
constructor(options?: GameClockOptions);
|
|
35
|
-
|
|
44
|
+
dispose(): void;
|
|
45
|
+
get fixedDeltaTime(): number;
|
|
36
46
|
private _timeScale;
|
|
37
|
-
timeScale: number;
|
|
47
|
+
get timeScale(): number;
|
|
48
|
+
set timeScale(value: number);
|
|
38
49
|
start(): this;
|
|
39
|
-
stop():
|
|
50
|
+
stop(): this;
|
|
51
|
+
setTimeout(callback: Function, delay: number): number;
|
|
52
|
+
setInterval(callback: Function, delay: number): number;
|
|
53
|
+
clearTimeout(timeoutId: number): boolean;
|
|
40
54
|
}
|
|
41
55
|
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,17 +9,15 @@ const defaultOptions = {
|
|
|
6
9
|
maxFrameTime: 0.25,
|
|
7
10
|
timeScale: 1,
|
|
8
11
|
};
|
|
9
|
-
|
|
12
|
+
class GameClock {
|
|
10
13
|
constructor(options) {
|
|
14
|
+
this.nextTimeoutId = 0;
|
|
15
|
+
this.timeouts = new Map();
|
|
11
16
|
this.isRunning = false;
|
|
12
17
|
this.requestId = 0;
|
|
13
18
|
this.currentTime = 0;
|
|
14
19
|
this.accumulator = 0;
|
|
15
20
|
this.gameTime = 0;
|
|
16
|
-
this.onPrepare = new Signal();
|
|
17
|
-
this.onEarlyUpdate = new Signal();
|
|
18
|
-
this.onUpdate = new Signal();
|
|
19
|
-
this.onFixedUpdate = new Signal();
|
|
20
21
|
this.update = (time) => {
|
|
21
22
|
const newTime = time * 0.001;
|
|
22
23
|
if (!this.isRunning) {
|
|
@@ -32,28 +33,50 @@ export class Clock {
|
|
|
32
33
|
let isMultipleFixedUpdate = false;
|
|
33
34
|
this.onPrepare.dispatch();
|
|
34
35
|
this.onEarlyUpdate.dispatch({ time: this.gameTime, deltaTime: frameTime });
|
|
35
|
-
|
|
36
|
+
for (const [id, timeOut] of this.timeouts) {
|
|
37
|
+
if (this.gameTime >= timeOut.callTime) {
|
|
38
|
+
timeOut.callback();
|
|
39
|
+
if (timeOut.recall) {
|
|
40
|
+
timeOut.callTime += timeOut.recall;
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
this.timeouts.delete(id);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
while (this.accumulator >= this._fixedDeltaTime) {
|
|
36
48
|
if (isMultipleFixedUpdate) {
|
|
37
49
|
this.onPrepare.dispatch();
|
|
38
50
|
}
|
|
39
|
-
this.onFixedUpdate.dispatch({ time: this.gameTime, deltaTime: this.
|
|
51
|
+
this.onFixedUpdate.dispatch({ time: this.gameTime, deltaTime: this._fixedDeltaTime });
|
|
40
52
|
isMultipleFixedUpdate = true;
|
|
41
|
-
this.accumulator -= this.
|
|
42
|
-
this.gameTime += this.
|
|
53
|
+
this.accumulator -= this._fixedDeltaTime;
|
|
54
|
+
this.gameTime += this._fixedDeltaTime;
|
|
43
55
|
}
|
|
44
|
-
const alpha = this.accumulator / this.
|
|
45
|
-
this.onUpdate.dispatch({ time: this.gameTime + alpha * this.
|
|
56
|
+
const alpha = this.accumulator / this._fixedDeltaTime;
|
|
57
|
+
this.onUpdate.dispatch({ time: this.gameTime + alpha * this._fixedDeltaTime, deltaTime: frameTime, alpha: alpha });
|
|
46
58
|
if (this.isRunning) {
|
|
47
59
|
this.requestId = requestAnimationFrame(this.update);
|
|
48
60
|
}
|
|
49
61
|
};
|
|
62
|
+
this.onPrepare = new mani_signal_1.Signal();
|
|
63
|
+
this.onEarlyUpdate = new mani_signal_1.Signal();
|
|
64
|
+
this.onUpdate = new mani_signal_1.Signal();
|
|
65
|
+
this.onFixedUpdate = new mani_signal_1.Signal();
|
|
50
66
|
this._timeScale = 1;
|
|
51
|
-
const opts = Object.assign({}, defaultOptions, options);
|
|
52
|
-
this.
|
|
67
|
+
const opts = Object.assign(Object.assign({}, defaultOptions), options);
|
|
68
|
+
this._fixedDeltaTime = opts.fixedDeltaTime;
|
|
53
69
|
this.maxFrameTime = opts.maxFrameTime;
|
|
54
70
|
this.timeScale = opts.timeScale;
|
|
55
71
|
opts.autoStart && this.start();
|
|
56
72
|
}
|
|
73
|
+
dispose() {
|
|
74
|
+
this.onPrepare.detachAll();
|
|
75
|
+
this.onEarlyUpdate.detachAll();
|
|
76
|
+
this.onUpdate.detachAll();
|
|
77
|
+
this.onFixedUpdate.detachAll();
|
|
78
|
+
}
|
|
79
|
+
get fixedDeltaTime() { return this._fixedDeltaTime; }
|
|
57
80
|
get timeScale() {
|
|
58
81
|
return this._timeScale;
|
|
59
82
|
}
|
|
@@ -69,10 +92,27 @@ export class Clock {
|
|
|
69
92
|
}
|
|
70
93
|
stop() {
|
|
71
94
|
if (!this.isRunning) {
|
|
72
|
-
return;
|
|
95
|
+
return this;
|
|
73
96
|
}
|
|
74
97
|
this.isRunning = false;
|
|
75
98
|
cancelAnimationFrame(this.requestId);
|
|
99
|
+
return this;
|
|
100
|
+
}
|
|
101
|
+
setTimeout(callback, delay) {
|
|
102
|
+
const timeOut = { callback, callTime: this.gameTime + delay };
|
|
103
|
+
this.nextTimeoutId++;
|
|
104
|
+
this.timeouts.set(this.nextTimeoutId, timeOut);
|
|
105
|
+
return this.nextTimeoutId;
|
|
106
|
+
}
|
|
107
|
+
setInterval(callback, delay) {
|
|
108
|
+
const timeOut = { callback, callTime: this.gameTime + delay, recall: delay };
|
|
109
|
+
this.nextTimeoutId++;
|
|
110
|
+
this.timeouts.set(this.nextTimeoutId, timeOut);
|
|
111
|
+
return this.nextTimeoutId;
|
|
112
|
+
}
|
|
113
|
+
clearTimeout(timeoutId) {
|
|
114
|
+
return this.timeouts.delete(timeoutId);
|
|
76
115
|
}
|
|
77
116
|
}
|
|
117
|
+
exports.GameClock = GameClock;
|
|
78
118
|
//# 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,20 +1,26 @@
|
|
|
1
|
-
import { Class, ID, Injector, ResolverFunction } from 'mani-injector';
|
|
2
1
|
import { Signal } from 'mani-signal';
|
|
2
|
+
import { Class, ID, Injector, ResolverFunction } from './injector';
|
|
3
|
+
import { SystemContext } from './systemContext';
|
|
4
|
+
declare type ComponentClass = Class;
|
|
5
|
+
declare type EntityClass = Class;
|
|
3
6
|
declare type SystemResolvers<T extends Class> = [T, ResolverFunction[]];
|
|
4
|
-
export declare const entityComponents: Map<
|
|
7
|
+
export declare const entityComponents: Map<EntityClass, Map<ComponentClass, string>>;
|
|
5
8
|
export declare const GetComponent: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
|
|
6
9
|
export declare const GetEntity: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
|
|
7
|
-
export declare const
|
|
10
|
+
export declare const GetContext: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
|
|
11
|
+
export declare const GetSignal: (id: ID) => (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
|
|
8
12
|
export declare const EntityComponent: (target: object, propertyKey: string) => any;
|
|
9
|
-
export declare const signalHandlers: Map<Object, [string,
|
|
10
|
-
export declare const
|
|
13
|
+
export declare const signalHandlers: Map<Object, [string, ID][]>;
|
|
14
|
+
export declare const staticSignalHandlers: Map<Object, [string, ID][]>;
|
|
15
|
+
export declare const OnSignal: (id: ID) => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
|
|
11
16
|
export declare class EcsInjector<SystemClass extends Class = Class> extends Injector {
|
|
12
17
|
protected entitySystemMap: Map<Class, SystemClass[]>;
|
|
13
18
|
protected entitySystemResolverTuples: Map<Class, SystemResolvers<SystemClass>[]>;
|
|
14
19
|
private signalMap;
|
|
15
20
|
constructor(parent?: EcsInjector<SystemClass>);
|
|
16
21
|
registerSystem<T extends SystemClass>(systemClass: T): void;
|
|
17
|
-
createSystems(entity: Object):
|
|
22
|
+
createSystems(entity: Object): SystemContext[];
|
|
18
23
|
getSignal<T>(id: ID): Signal<T>;
|
|
24
|
+
dispose(): void;
|
|
19
25
|
}
|
|
20
26
|
export {};
|
package/lib/ecsInjector.js
CHANGED
|
@@ -1,35 +1,47 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EcsInjector = exports.OnSignal = exports.staticSignalHandlers = exports.signalHandlers = exports.EntityComponent = exports.GetSignal = exports.GetContext = exports.GetEntity = exports.GetComponent = exports.entityComponents = void 0;
|
|
4
|
+
const mani_signal_1 = require("mani-signal");
|
|
5
|
+
const injector_1 = require("./injector");
|
|
6
|
+
const systemContext_1 = require("./systemContext");
|
|
7
|
+
exports.entityComponents = new Map();
|
|
8
|
+
exports.GetComponent = (0, injector_1.createDependencyAnnotation)((type, index) => ({ kind: 'component', type, index }));
|
|
9
|
+
exports.GetEntity = (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'entity', index }));
|
|
10
|
+
exports.GetContext = (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'context', index }));
|
|
11
|
+
const GetSignal = (id) => (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'signal', index, id }));
|
|
12
|
+
exports.GetSignal = GetSignal;
|
|
13
|
+
const EntityComponent = (target, propertyKey) => {
|
|
8
14
|
const entityClass = target.constructor;
|
|
9
15
|
const componentClass = Reflect.getMetadata('design:type', target, propertyKey);
|
|
10
16
|
if (componentClass === Object) {
|
|
11
17
|
throw new Error(`Object component type not allowed. Forgot to specify type of ${entityClass.name}.${propertyKey}?`);
|
|
12
18
|
}
|
|
13
|
-
const componentSet = putIfAbsent(entityComponents, entityClass, () => new Map());
|
|
19
|
+
const componentSet = (0, injector_1.putIfAbsent)(exports.entityComponents, entityClass, () => new Map());
|
|
14
20
|
componentSet.set(componentClass, propertyKey);
|
|
15
21
|
};
|
|
16
|
-
|
|
17
|
-
|
|
22
|
+
exports.EntityComponent = EntityComponent;
|
|
23
|
+
exports.signalHandlers = new Map();
|
|
24
|
+
exports.staticSignalHandlers = new Map();
|
|
25
|
+
const OnSignal = (id) => (target, propertyKey, descriptor) => {
|
|
18
26
|
if (target instanceof Function) {
|
|
19
|
-
|
|
27
|
+
let mappingList = (0, injector_1.putIfAbsent)(exports.staticSignalHandlers, target, () => []);
|
|
28
|
+
mappingList.push([propertyKey, id]);
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
let mappingList = (0, injector_1.putIfAbsent)(exports.signalHandlers, target.constructor, () => []);
|
|
32
|
+
mappingList.push([propertyKey, id]);
|
|
20
33
|
}
|
|
21
|
-
let mappingList = putIfAbsent(signalHandlers, target.constructor, () => []);
|
|
22
|
-
mappingList.push([propertyKey, id]);
|
|
23
34
|
};
|
|
35
|
+
exports.OnSignal = OnSignal;
|
|
24
36
|
const getComponentDependencies = (system) => {
|
|
25
|
-
const dependencies = Injector.dependencyMap.get(system);
|
|
37
|
+
const dependencies = injector_1.Injector.dependencyMap.get(system);
|
|
26
38
|
return dependencies
|
|
27
39
|
? dependencies.filter((dependency) => dependency.kind === 'component')
|
|
28
40
|
: [];
|
|
29
41
|
};
|
|
30
42
|
const getEntityClassesForComponentDependencies = (componentTypes) => {
|
|
31
43
|
const result = [];
|
|
32
|
-
for (const [entityClass, componentMap] of entityComponents) {
|
|
44
|
+
for (const [entityClass, componentMap] of exports.entityComponents) {
|
|
33
45
|
let allDependenciesMet = true;
|
|
34
46
|
for (const componentType of componentTypes) {
|
|
35
47
|
if (!componentMap.has(componentType)) {
|
|
@@ -50,26 +62,34 @@ const componentResolver = (context, dependency) => {
|
|
|
50
62
|
throw new Error(`Could not resolve Component ${type.name}. @GetComponent only allowed in system scope.`);
|
|
51
63
|
}
|
|
52
64
|
const entityClass = context.entityClass;
|
|
53
|
-
const key = entityComponents.get(entityClass).get(dependency.type);
|
|
54
|
-
return (
|
|
65
|
+
const key = exports.entityComponents.get(entityClass).get(dependency.type);
|
|
66
|
+
return (context) => context.entity[key];
|
|
55
67
|
};
|
|
56
68
|
const entityResolver = ({ type, kind }, _dependency) => {
|
|
57
69
|
if (kind !== 'system') {
|
|
58
70
|
throw new Error(`Could not resolve Entity in ${type.name}. @GetEntity only allowed in system scope.`);
|
|
59
71
|
}
|
|
60
|
-
return (
|
|
72
|
+
return (context) => context.entity;
|
|
73
|
+
};
|
|
74
|
+
const contextResolver = ({ type, kind }, _dependency) => {
|
|
75
|
+
if (kind !== 'system') {
|
|
76
|
+
throw new Error(`Could not resolve Context in ${type.name}. @GetContext only allowed in system scope.`);
|
|
77
|
+
}
|
|
78
|
+
return (context) => context;
|
|
61
79
|
};
|
|
62
|
-
|
|
80
|
+
class EcsInjector extends injector_1.Injector {
|
|
63
81
|
constructor(parent) {
|
|
64
82
|
super(parent);
|
|
65
83
|
this.signalMap = parent ? parent.signalMap : new Map();
|
|
66
|
-
this.entitySystemMap =
|
|
67
|
-
this.entitySystemResolverTuples =
|
|
84
|
+
this.entitySystemMap = new Map();
|
|
85
|
+
this.entitySystemResolverTuples = new Map();
|
|
86
|
+
this.map(EcsInjector).toValue(this);
|
|
68
87
|
if (!parent) {
|
|
69
88
|
this.addExtensionResolver('entity', entityResolver);
|
|
70
89
|
this.addExtensionResolver('component', componentResolver);
|
|
90
|
+
this.addExtensionResolver('context', contextResolver);
|
|
71
91
|
const signalResolver = ({ kind }, dependency) => {
|
|
72
|
-
const signal = putIfAbsent(this.signalMap, dependency.id, () => new Signal());
|
|
92
|
+
const signal = (0, injector_1.putIfAbsent)(this.signalMap, dependency.id, () => new mani_signal_1.Signal());
|
|
73
93
|
return (entity) => signal;
|
|
74
94
|
};
|
|
75
95
|
this.addExtensionResolver('signal', signalResolver);
|
|
@@ -86,15 +106,14 @@ export class EcsInjector extends Injector {
|
|
|
86
106
|
return;
|
|
87
107
|
}
|
|
88
108
|
for (let entityClass of entityClasses) {
|
|
89
|
-
const systemClasses = putIfAbsent(this.entitySystemMap, entityClass, () => []);
|
|
109
|
+
const systemClasses = (0, injector_1.putIfAbsent)(this.entitySystemMap, entityClass, () => []);
|
|
90
110
|
systemClasses.push(systemClass);
|
|
91
111
|
}
|
|
92
112
|
}
|
|
93
113
|
createSystems(entity) {
|
|
94
|
-
const systemResolverTuples = putIfAbsent(this.entitySystemResolverTuples, entity.constructor, () => {
|
|
114
|
+
const systemResolverTuples = (0, injector_1.putIfAbsent)(this.entitySystemResolverTuples, entity.constructor, () => {
|
|
95
115
|
const systems = this.entitySystemMap.get(entity.constructor);
|
|
96
116
|
if (!systems) {
|
|
97
|
-
console.warn('no system for entity ' + entity.constructor.name);
|
|
98
117
|
return [];
|
|
99
118
|
}
|
|
100
119
|
const result = [];
|
|
@@ -106,16 +125,23 @@ export class EcsInjector extends Injector {
|
|
|
106
125
|
const systemInstances = [];
|
|
107
126
|
for (const [system, resolver] of systemResolverTuples) {
|
|
108
127
|
const args = new Array(resolver.length);
|
|
128
|
+
const systemContext = new systemContext_1.SystemContext(entity);
|
|
109
129
|
for (let i = 0; i < args.length; i++) {
|
|
110
|
-
args[i] = resolver[i](
|
|
130
|
+
args[i] = resolver[i](systemContext);
|
|
111
131
|
}
|
|
112
|
-
|
|
113
|
-
systemInstances.push(
|
|
132
|
+
systemContext.system = new system(...args);
|
|
133
|
+
systemInstances.push(systemContext);
|
|
114
134
|
}
|
|
115
135
|
return systemInstances;
|
|
116
136
|
}
|
|
117
137
|
getSignal(id) {
|
|
118
|
-
return putIfAbsent(this.signalMap, id, () => new Signal());
|
|
138
|
+
return (0, injector_1.putIfAbsent)(this.signalMap, id, () => new mani_signal_1.Signal());
|
|
139
|
+
}
|
|
140
|
+
dispose() {
|
|
141
|
+
for (const [key, signal] of this.signalMap) {
|
|
142
|
+
signal.detachAll();
|
|
143
|
+
}
|
|
119
144
|
}
|
|
120
145
|
}
|
|
146
|
+
exports.EcsInjector = EcsInjector;
|
|
121
147
|
//# 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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"}
|
package/lib/entity.d.ts
CHANGED
|
@@ -2,21 +2,22 @@ import { Signal } from 'mani-signal';
|
|
|
2
2
|
import { Class } from './types';
|
|
3
3
|
export declare class Entity {
|
|
4
4
|
readonly id: number;
|
|
5
|
-
children: Set<Entity>;
|
|
5
|
+
readonly children: Set<Entity>;
|
|
6
6
|
private gameEngine?;
|
|
7
7
|
private _parent?;
|
|
8
|
-
readonly parentChanged: Signal<
|
|
9
|
-
readonly onRemove: Signal<
|
|
8
|
+
readonly parentChanged: Signal<unknown>;
|
|
9
|
+
readonly onRemove: Signal<unknown>;
|
|
10
10
|
private markRemoval;
|
|
11
|
+
private _detached;
|
|
12
|
+
get detached(): boolean;
|
|
11
13
|
constructor();
|
|
12
14
|
onBeforeRemove?(): Promise<void>;
|
|
13
15
|
private setParent;
|
|
14
|
-
|
|
16
|
+
get parent(): Entity | undefined;
|
|
15
17
|
getComponent<T extends Class>(componentClass: T): InstanceType<T> | undefined;
|
|
16
18
|
add(entity: Entity): Promise<void>;
|
|
17
|
-
remove(entity: Entity): void
|
|
19
|
+
remove(entity: Entity): Promise<void>;
|
|
18
20
|
detach(): Promise<void>;
|
|
19
21
|
has(entity: Entity): boolean;
|
|
20
|
-
|
|
21
|
-
getAllChildren(target?: Entity[]): Entity[];
|
|
22
|
+
getAllEntities(target?: Entity[]): Entity[];
|
|
22
23
|
}
|
package/lib/entity.js
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Entity = void 0;
|
|
4
|
+
const mani_signal_1 = require("mani-signal");
|
|
5
|
+
const ecsInjector_1 = require("./ecsInjector");
|
|
3
6
|
let idCounter = 0;
|
|
4
|
-
|
|
7
|
+
class Entity {
|
|
5
8
|
constructor() {
|
|
6
9
|
this.children = new Set();
|
|
7
|
-
this.parentChanged = new Signal();
|
|
8
|
-
this.onRemove = new Signal();
|
|
10
|
+
this.parentChanged = new mani_signal_1.Signal();
|
|
11
|
+
this.onRemove = new mani_signal_1.Signal();
|
|
9
12
|
this.markRemoval = false;
|
|
13
|
+
this._detached = false;
|
|
10
14
|
this.id = idCounter++;
|
|
11
15
|
}
|
|
16
|
+
get detached() { return this._detached; }
|
|
12
17
|
setParent(parent) {
|
|
13
18
|
if (parent === this._parent) {
|
|
14
19
|
throw Error('same parent');
|
|
@@ -20,7 +25,7 @@ export class Entity {
|
|
|
20
25
|
return this._parent;
|
|
21
26
|
}
|
|
22
27
|
getComponent(componentClass) {
|
|
23
|
-
const componentMap = entityComponents.get(this.constructor);
|
|
28
|
+
const componentMap = ecsInjector_1.entityComponents.get(this.constructor);
|
|
24
29
|
if (!componentMap) {
|
|
25
30
|
throw new Error(`No components in entity of type '${this.constructor.name}'.`);
|
|
26
31
|
}
|
|
@@ -46,39 +51,46 @@ export class Entity {
|
|
|
46
51
|
}
|
|
47
52
|
else {
|
|
48
53
|
if (this.gameEngine) {
|
|
49
|
-
await this.gameEngine.
|
|
54
|
+
await this.gameEngine.add(entity);
|
|
50
55
|
}
|
|
51
56
|
}
|
|
52
57
|
if (this.gameEngine && this.gameEngine !== entity.gameEngine) {
|
|
53
58
|
}
|
|
54
59
|
}
|
|
55
|
-
remove(entity) {
|
|
60
|
+
async remove(entity) {
|
|
56
61
|
if (!this.children.delete(entity)) {
|
|
57
62
|
throw new Error('Could not remove. Entity is not a child.');
|
|
58
63
|
}
|
|
59
64
|
entity.setParent(undefined);
|
|
65
|
+
if (this.gameEngine) {
|
|
66
|
+
return await this.gameEngine.remove(entity);
|
|
67
|
+
}
|
|
60
68
|
}
|
|
61
69
|
async detach() {
|
|
62
|
-
if (
|
|
63
|
-
throw new Error('
|
|
70
|
+
if (this._detached) {
|
|
71
|
+
throw new Error('entity already detached');
|
|
64
72
|
}
|
|
73
|
+
this._detached = true;
|
|
65
74
|
if (this.parent) {
|
|
66
|
-
this.parent.remove(this);
|
|
75
|
+
await this.parent.remove(this);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
if (!this.gameEngine) {
|
|
79
|
+
throw new Error('entity isn\'t attached to a parent or the game engine');
|
|
80
|
+
}
|
|
81
|
+
await this.gameEngine.remove(this);
|
|
67
82
|
}
|
|
68
|
-
await this.gameEngine.removeEntity(this);
|
|
69
83
|
}
|
|
70
84
|
has(entity) {
|
|
71
85
|
return this.children.has(entity);
|
|
72
86
|
}
|
|
73
|
-
|
|
74
|
-
return 'Deine Vater';
|
|
75
|
-
}
|
|
76
|
-
getAllChildren(target = []) {
|
|
87
|
+
getAllEntities(target = []) {
|
|
77
88
|
target.push(this);
|
|
78
89
|
for (const child of this.children) {
|
|
79
|
-
child.
|
|
90
|
+
child.getAllEntities(target);
|
|
80
91
|
}
|
|
81
92
|
return target;
|
|
82
93
|
}
|
|
83
94
|
}
|
|
95
|
+
exports.Entity = Entity;
|
|
84
96
|
//# sourceMappingURL=entity.js.map
|
package/lib/entity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":"AACA,
|
|
1
|
+
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":"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"}
|