@jolly-pixel/engine 2.0.0 → 2.1.0
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/README.md +2 -2
- package/dist/actor/Actor.d.ts +5 -2
- package/dist/actor/Actor.d.ts.map +1 -1
- package/dist/actor/Actor.js +22 -9
- package/dist/actor/Actor.js.map +1 -1
- package/dist/actor/ActorComponent.d.ts +2 -0
- package/dist/actor/ActorComponent.d.ts.map +1 -1
- package/dist/actor/ActorComponent.js +19 -0
- package/dist/actor/ActorComponent.js.map +1 -1
- package/dist/actor/ActorTree.d.ts.map +1 -1
- package/dist/actor/ActorTree.js +10 -2
- package/dist/actor/ActorTree.js.map +1 -1
- package/dist/components/types.d.ts +2 -0
- package/dist/components/types.d.ts.map +1 -1
- package/dist/systems/SceneManager.d.ts +11 -13
- package/dist/systems/SceneManager.d.ts.map +1 -1
- package/dist/systems/SceneManager.js +57 -18
- package/dist/systems/SceneManager.js.map +1 -1
- package/dist/systems/World.d.ts +17 -8
- package/dist/systems/World.d.ts.map +1 -1
- package/dist/systems/World.js +45 -12
- package/dist/systems/World.js.map +1 -1
- package/dist/systems/rendering/Renderer.d.ts +2 -0
- package/dist/systems/rendering/Renderer.d.ts.map +1 -1
- package/dist/systems/rendering/ThreeRenderer.d.ts +10 -6
- package/dist/systems/rendering/ThreeRenderer.d.ts.map +1 -1
- package/dist/systems/rendering/ThreeRenderer.js +64 -40
- package/dist/systems/rendering/ThreeRenderer.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<
|
|
1
|
+
<h1 align="center">
|
|
2
2
|
engine
|
|
3
3
|
</h1>
|
|
4
4
|
|
|
@@ -66,7 +66,7 @@ import { Systems, Actor } from "@jolly-pixel/engine";
|
|
|
66
66
|
|
|
67
67
|
const sceneManager = new Systems.SceneManager();
|
|
68
68
|
const renderer = new Systems.ThreeRenderer(canvas, {
|
|
69
|
-
|
|
69
|
+
sceneManager,
|
|
70
70
|
renderMode: "direct"
|
|
71
71
|
});
|
|
72
72
|
const game = new Systems.World(renderer, {
|
package/dist/actor/Actor.d.ts
CHANGED
|
@@ -15,19 +15,21 @@ export interface ActorOptions<TContext = WorldDefaultContext> {
|
|
|
15
15
|
layer?: number | number[];
|
|
16
16
|
}
|
|
17
17
|
export declare class Actor<TContext = WorldDefaultContext> extends ActorTree<TContext> {
|
|
18
|
+
#private;
|
|
18
19
|
static Id: IntegerIncrement;
|
|
19
20
|
static PersistentId: PersistentIdIncrement;
|
|
20
21
|
world: World<any, TContext>;
|
|
21
22
|
id: number;
|
|
22
23
|
persistentId: string;
|
|
23
24
|
name: string;
|
|
24
|
-
awoken: boolean;
|
|
25
25
|
parent: Actor<TContext> | null;
|
|
26
26
|
components: Component[];
|
|
27
|
+
componentsRequiringUpdate: Component[];
|
|
27
28
|
behaviors: Record<string, Behavior<any, TContext>[]>;
|
|
28
|
-
|
|
29
|
+
awoken: boolean;
|
|
29
30
|
pendingForDestruction: boolean;
|
|
30
31
|
object3D: THREE.Group<THREE.Object3DEventMap>;
|
|
32
|
+
transform: Transform;
|
|
31
33
|
constructor(world: World<any, TContext>, options: ActorOptions<TContext>);
|
|
32
34
|
addComponent<T extends ComponentConstructor>(componentClass: T, ...args: RequiresOptions<T> extends true ? [options: ConstructorParameters<T>[1], callback?: (component: InstanceType<T>) => void] : [options?: ConstructorParameters<T>[1], callback?: (component: InstanceType<T>) => void]): this;
|
|
33
35
|
addComponentAndGet<T extends ComponentConstructor>(componentClass: T, ...args: RequiresOptions<T> extends true ? [options: ConstructorParameters<T>[1]] : [options?: ConstructorParameters<T>[1]]): InstanceType<T>;
|
|
@@ -38,6 +40,7 @@ export declare class Actor<TContext = WorldDefaultContext> extends ActorTree<TCo
|
|
|
38
40
|
removeChildren(...objects: THREE.Object3D[]): this;
|
|
39
41
|
awake(): void;
|
|
40
42
|
update(deltaTime: number): void;
|
|
43
|
+
fixedUpdate(deltaTime: number): void;
|
|
41
44
|
toString(): string;
|
|
42
45
|
isDestroyed(): boolean;
|
|
43
46
|
destroy(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Actor.d.ts","sourceRoot":"","sources":["../../src/actor/Actor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EACV,SAAS,EACV,MAAM,wBAAwB,CAAC;AAMhC,KAAK,oBAAoB,GAAG,KAAK,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,SAAS,CAAC;AAEjF,KAAK,eAAe,CAAC,CAAC,SAAS,oBAAoB,IACjD,CAAC,SAAS,KAAK,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GACtE,SAAS,SAAS,CAAC,GAAG,KAAK,GAAG,IAAI,GAClC,KAAK,CAAC;AAEZ,MAAM,WAAW,YAAY,CAC3B,QAAQ,GAAG,mBAAmB;IAE9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC3B;AAED,qBAAa,KAAK,CAChB,QAAQ,GAAG,mBAAmB,CAC9B,SAAQ,SAAS,CAAC,QAAQ,CAAC
|
|
1
|
+
{"version":3,"file":"Actor.d.ts","sourceRoot":"","sources":["../../src/actor/Actor.ts"],"names":[],"mappings":"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"}
|
package/dist/actor/Actor.js
CHANGED
|
@@ -15,13 +15,14 @@ export class Actor extends ActorTree {
|
|
|
15
15
|
id = Actor.Id.incr();
|
|
16
16
|
persistentId = Actor.PersistentId.next();
|
|
17
17
|
name;
|
|
18
|
-
awoken = false;
|
|
19
18
|
parent = null;
|
|
20
19
|
components = [];
|
|
20
|
+
componentsRequiringUpdate = [];
|
|
21
21
|
behaviors = {};
|
|
22
|
-
|
|
22
|
+
awoken = false;
|
|
23
23
|
pendingForDestruction = false;
|
|
24
24
|
object3D = new THREE.Group();
|
|
25
|
+
transform;
|
|
25
26
|
constructor(world, options) {
|
|
26
27
|
super();
|
|
27
28
|
const { name, parent = null, visible = true, layer } = options;
|
|
@@ -51,22 +52,28 @@ export class Actor extends ActorTree {
|
|
|
51
52
|
else {
|
|
52
53
|
this.world.sceneManager.tree.add(this);
|
|
53
54
|
}
|
|
55
|
+
this.world.sceneManager.registerActor(this);
|
|
56
|
+
}
|
|
57
|
+
#initializeComponent(component) {
|
|
58
|
+
if (this.awoken) {
|
|
59
|
+
component.awake?.();
|
|
60
|
+
}
|
|
61
|
+
if (("update" in component && typeof component.update === "function") ||
|
|
62
|
+
("fixedUpdate" in component && typeof component.fixedUpdate === "function")) {
|
|
63
|
+
component.needUpdate = true;
|
|
64
|
+
}
|
|
54
65
|
}
|
|
55
66
|
addComponent(componentClass, ...args) {
|
|
56
67
|
const [options, callback] = args;
|
|
57
68
|
const component = new componentClass(this, options);
|
|
58
69
|
callback?.(component);
|
|
59
|
-
|
|
60
|
-
component.awake?.();
|
|
61
|
-
}
|
|
70
|
+
this.#initializeComponent(component);
|
|
62
71
|
return this;
|
|
63
72
|
}
|
|
64
73
|
addComponentAndGet(componentClass, ...args) {
|
|
65
74
|
const [options] = args;
|
|
66
75
|
const component = new componentClass(this, options);
|
|
67
|
-
|
|
68
|
-
component.awake?.();
|
|
69
|
-
}
|
|
76
|
+
this.#initializeComponent(component);
|
|
70
77
|
return component;
|
|
71
78
|
}
|
|
72
79
|
getComponent(typeNameOrClass) {
|
|
@@ -108,7 +115,12 @@ export class Actor extends ActorTree {
|
|
|
108
115
|
}
|
|
109
116
|
update(deltaTime) {
|
|
110
117
|
if (!this.pendingForDestruction) {
|
|
111
|
-
this.
|
|
118
|
+
this.componentsRequiringUpdate.forEach((component) => component.update?.(deltaTime));
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
fixedUpdate(deltaTime) {
|
|
122
|
+
if (!this.pendingForDestruction) {
|
|
123
|
+
this.componentsRequiringUpdate.forEach((component) => component.fixedUpdate?.(deltaTime));
|
|
112
124
|
}
|
|
113
125
|
}
|
|
114
126
|
toString() {
|
|
@@ -118,6 +130,7 @@ export class Actor extends ActorTree {
|
|
|
118
130
|
return this.pendingForDestruction;
|
|
119
131
|
}
|
|
120
132
|
destroy() {
|
|
133
|
+
this.world.sceneManager.unregisterActor(this);
|
|
121
134
|
for (let i = this.components.length - 1; i >= 0; i--) {
|
|
122
135
|
this.components[i].destroy?.();
|
|
123
136
|
}
|
package/dist/actor/Actor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../../src/actor/Actor.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,+BAA+B;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAOvF,SAAS,uBAAuB,CAAC,SAAoB;IACnD,OAAO,uBAAuB,IAAI,SAAS,IAAK,SAAiB,CAAC,qBAAqB,KAAK,IAAI,CAAC;AACnG,CAAC;AAkBD,MAAM,OAAO,KAEX,SAAQ,SAAmB;IAC3B,MAAM,CAAC,EAAE,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACnC,MAAM,CAAC,YAAY,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAElD,KAAK,CAAuB;IAE5B,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IACrB,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IACzC,IAAI,CAAS;IACb,MAAM,
|
|
1
|
+
{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../../src/actor/Actor.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,+BAA+B;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAOvF,SAAS,uBAAuB,CAAC,SAAoB;IACnD,OAAO,uBAAuB,IAAI,SAAS,IAAK,SAAiB,CAAC,qBAAqB,KAAK,IAAI,CAAC;AACnG,CAAC;AAkBD,MAAM,OAAO,KAEX,SAAQ,SAAmB;IAC3B,MAAM,CAAC,EAAE,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACnC,MAAM,CAAC,YAAY,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAElD,KAAK,CAAuB;IAE5B,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IACrB,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IACzC,IAAI,CAAS;IACb,MAAM,GAA2B,IAAI,CAAC;IAEtC,UAAU,GAAgB,EAAE,CAAC;IAC7B,yBAAyB,GAAgB,EAAE,CAAC;IAC5C,SAAS,GAA8C,EAAE,CAAC;IAE1D,MAAM,GAAG,KAAK,CAAC;IACf,qBAAqB,GAAG,KAAK,CAAC;IAE9B,QAAQ,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;IAC7B,SAAS,CAAY;IAErB,YACE,KAA2B,EAC3B,OAA+B;QAE/B,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAE/D,IACE,MAAM,KAAK,IAAI;YACf,MAAM,CAAC,qBAAqB,EAC5B,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;QAEtC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACtD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE9C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACjB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;aACI,CAAC;YACJ,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,oBAAoB,CAClB,SAAoB;QAEpB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC;QACtB,CAAC;QACD,IACE,CAAC,QAAQ,IAAI,SAAS,IAAI,OAAO,SAAS,CAAC,MAAM,KAAK,UAAU,CAAC;YACjE,CAAC,aAAa,IAAI,SAAS,IAAI,OAAO,SAAS,CAAC,WAAW,KAAK,UAAU,CAAC,EAC3E,CAAC;YACD,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,YAAY,CACV,cAAiB,EACjB,GAAG,IAEyF;QAE5F,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;QAEjC,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,QAAQ,EAAE,CAAC,SAA4B,CAAC,CAAC;QACzC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAErC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,kBAAkB,CAChB,cAAiB,EACjB,GAAG,IAEwC;QAE3C,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;QAEvB,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAErC,OAAO,SAA4B,CAAC;IACtC,CAAC;IAID,YAAY,CAAC,eAAuD;QAClE,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE,CAAC;YACxC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACnC,IAAI,IAAI,CAAC,QAAQ,KAAK,eAAe,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxE,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACnC,IAAI,IAAI,YAAY,eAAe,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtE,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,CAAE,aAAa,CACb,cAAyC;QAEzC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACnC,IAAI,IAAI,YAAY,cAAc,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrE,MAAM,IAAS,CAAC;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IAED,WAAW,CACT,GAAG,OAAyB;QAE5B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;QAE9B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc,CACZ,GAAG,OAAyB;QAE5B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7B,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,CACJ,SAAiB;QAEjB,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAChC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAED,WAAW,CACT,SAAiB;QAEjB,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAChC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAEQ,QAAQ;QACf,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;IACxD,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACpC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAE9C,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACrD,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QACjC,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;aACI,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,eAAe,CACpB,MAAsB;QAEtB,IAAI,UAAU,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,YAAY,KAAK,CAAC,cAAc,EAAE,CAAC;YAC5E,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC9C,CAAC,CAAC,MAAM,CAAC,QAAQ;gBACjB,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAEtB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,IAAI,QAAQ,YAAY,KAAK,CAAC,QAAQ,EAAE,CAAC;oBACvC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,sBAAsB;QACpB,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAClC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAED,SAAS,CACP,SAA0B,EAC1B,SAAS,GAAG,KAAK;QAEjB,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,CAAC,qBAAqB,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QACxF,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QAExB,MAAM,QAAQ,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC9B,SAAS,CAAC;QACZ,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnB,MAAM,WAAW,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;YACrC,SAAS,CAAC,QAAQ,CAAC;QACrB,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;aACI,CAAC;YACJ,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;IACH,CAAC"}
|
|
@@ -21,6 +21,8 @@ export declare class ActorComponent<TContext = WorldDefaultContext> extends Even
|
|
|
21
21
|
typeName: FreeComponentEnum;
|
|
22
22
|
pendingForDestruction: boolean;
|
|
23
23
|
constructor(options: ActorComponentOptions<TContext>);
|
|
24
|
+
get needUpdate(): boolean;
|
|
25
|
+
set needUpdate(value: boolean);
|
|
24
26
|
get context(): TContext;
|
|
25
27
|
toString(): string;
|
|
26
28
|
isDestroyed(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorComponent.d.ts","sourceRoot":"","sources":["../../src/actor/ActorComponent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,KAAK,EACV,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,qBAAqB,CACpC,QAAQ,GAAG,mBAAmB;IAE9B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvB,QAAQ,EAAE,iBAAiB,CAAC;CAC7B;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,mBAAmB,EAAE,EAAE,CAAC;CACzB,CAAC;AAEF,qBAAa,cAAc,CACzB,QAAQ,GAAG,mBAAmB,CAC9B,SAAQ,YAAY,CAAC,oBAAoB,CAAE,YAAW,SAAS;;IAC/D,MAAM,CAAC,EAAE,mBAA0B;IACnC,MAAM,CAAC,YAAY,wBAA+B;IAElD,EAAE,SAA4B;IAC9B,YAAY,SAAsC;IAClD,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvB,QAAQ,EAAE,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"ActorComponent.d.ts","sourceRoot":"","sources":["../../src/actor/ActorComponent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,KAAK,EACV,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,qBAAqB,CACpC,QAAQ,GAAG,mBAAmB;IAE9B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvB,QAAQ,EAAE,iBAAiB,CAAC;CAC7B;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,mBAAmB,EAAE,EAAE,CAAC;CACzB,CAAC;AAEF,qBAAa,cAAc,CACzB,QAAQ,GAAG,mBAAmB,CAC9B,SAAQ,YAAY,CAAC,oBAAoB,CAAE,YAAW,SAAS;;IAC/D,MAAM,CAAC,EAAE,mBAA0B;IACnC,MAAM,CAAC,YAAY,wBAA+B;IAElD,EAAE,SAA4B;IAC9B,YAAY,SAAsC;IAClD,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvB,QAAQ,EAAE,iBAAiB,CAAC;IAG5B,qBAAqB,UAAS;gBAG5B,OAAO,EAAE,qBAAqB,CAAC,QAAQ,CAAC;IAc1C,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,UAAU,CAAC,KAAK,EAAE,OAAO,EAc5B;IAED,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAcQ,QAAQ,IAAI,MAAM;IAI3B,WAAW;IAIX,OAAO;CAaR"}
|
|
@@ -12,6 +12,7 @@ export class ActorComponent extends EventEmitter {
|
|
|
12
12
|
persistentId = ActorComponent.PersistentId.next();
|
|
13
13
|
actor;
|
|
14
14
|
typeName;
|
|
15
|
+
#needUpdate = false;
|
|
15
16
|
pendingForDestruction = false;
|
|
16
17
|
constructor(options) {
|
|
17
18
|
super();
|
|
@@ -23,6 +24,23 @@ export class ActorComponent extends EventEmitter {
|
|
|
23
24
|
// that the component instance is fully constructed
|
|
24
25
|
queueMicrotask(() => this.#initSignalDecorators());
|
|
25
26
|
}
|
|
27
|
+
get needUpdate() {
|
|
28
|
+
return this.#needUpdate;
|
|
29
|
+
}
|
|
30
|
+
set needUpdate(value) {
|
|
31
|
+
this.#needUpdate = value;
|
|
32
|
+
if (this.#needUpdate) {
|
|
33
|
+
if (!this.actor.componentsRequiringUpdate.includes(this)) {
|
|
34
|
+
this.actor.componentsRequiringUpdate.push(this);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
const index = this.actor.componentsRequiringUpdate.indexOf(this);
|
|
39
|
+
if (index !== -1) {
|
|
40
|
+
this.actor.componentsRequiringUpdate.splice(index, 1);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
26
44
|
get context() {
|
|
27
45
|
return this.actor.world.context;
|
|
28
46
|
}
|
|
@@ -43,6 +61,7 @@ export class ActorComponent extends EventEmitter {
|
|
|
43
61
|
return this.pendingForDestruction;
|
|
44
62
|
}
|
|
45
63
|
destroy() {
|
|
64
|
+
this.needUpdate = false;
|
|
46
65
|
const startIndex = this.actor.world.sceneManager.componentsToBeStarted.indexOf(this);
|
|
47
66
|
if (startIndex !== -1) {
|
|
48
67
|
this.actor.world.sceneManager.componentsToBeStarted.splice(startIndex, 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorComponent.js","sourceRoot":"","sources":["../../src/actor/ActorComponent.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,+BAA+B;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAoBvF,MAAM,OAAO,cAEX,SAAQ,YAAkC;IAC1C,MAAM,CAAC,EAAE,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACnC,MAAM,CAAC,YAAY,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAElD,EAAE,GAAG,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IAC9B,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAClD,KAAK,CAAkB;IACvB,QAAQ,CAAoB;IAE5B,qBAAqB,GAAG,KAAK,CAAC;IAE9B,YACE,OAAwC;QAExC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/D,0DAA0D;QAC1D,mDAAmD;QACnD,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;IAClC,CAAC;IAED,qBAAqB;QACnB,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAE1C,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,MAAM,YAAY,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBAC5C,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,WAAW,EAAE,CAAC;YACzC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACnC,CAAC;IAEQ,QAAQ;QACf,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;IAC5D,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACpC,CAAC;IAED,OAAO;QACL,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrF,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,qBAAqB,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"ActorComponent.js","sourceRoot":"","sources":["../../src/actor/ActorComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorTree.d.ts","sourceRoot":"","sources":["../../src/actor/ActorTree.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,MAAM,aAAa,CACvB,QAAQ,GAAG,mBAAmB,IAC5B;IACF,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvB,MAAM,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC1B,CAAC;AAEF,MAAM,WAAW,gBAAgB,CAC/B,QAAQ,GAAG,mBAAmB;IAE9B,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;IAC/C,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;CACnD;AAED,qBAAa,SAAS,CACpB,QAAQ,GAAG,mBAAmB;;IAK9B,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAM;gBAG/B,OAAO,GAAE,gBAAgB,CAAC,QAAQ,CAAM;IAM1C,GAAG,CACD,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,GACrB,IAAI;IAKP,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI;IAQlC,SAAS,CACT,OAAO,EAAE,MAAM,GACd,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ActorTree.d.ts","sourceRoot":"","sources":["../../src/actor/ActorTree.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,MAAM,aAAa,CACvB,QAAQ,GAAG,mBAAmB,IAC5B;IACF,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvB,MAAM,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC1B,CAAC;AAEF,MAAM,WAAW,gBAAgB,CAC/B,QAAQ,GAAG,mBAAmB;IAE9B,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;IAC/C,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;CACnD;AAED,qBAAa,SAAS,CACpB,QAAQ,GAAG,mBAAmB;;IAK9B,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAM;gBAG/B,OAAO,GAAE,gBAAgB,CAAC,QAAQ,CAAM;IAM1C,GAAG,CACD,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,GACrB,IAAI;IAKP,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI;IAQlC,SAAS,CACT,OAAO,EAAE,MAAM,GACd,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAgGpC;;;;OAIG;IACH,QAAQ,CACN,IAAI,EAAE,MAAM,GACX,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI;IAqCvB,aAAa,IAAI,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAQlD,YAAY,IAAI,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAMnD,YAAY,CACV,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC;IAOxB,gBAAgB;IAiBd,IAAI,IAAI,gBAAgB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAMjD,YAAY,CACZ,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,GACxB,gBAAgB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAM1C,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;CAOzD"}
|
package/dist/actor/ActorTree.js
CHANGED
|
@@ -46,8 +46,16 @@ export class ActorTree {
|
|
|
46
46
|
}
|
|
47
47
|
const currentPattern = patternParts[patternIndex];
|
|
48
48
|
const isLastPattern = patternIndex === patternParts.length - 1;
|
|
49
|
+
const matchers = new Map();
|
|
49
50
|
// eslint-disable-next-line func-style
|
|
50
|
-
const matchSinglePattern = (name, pattern) =>
|
|
51
|
+
const matchSinglePattern = (name, pattern) => {
|
|
52
|
+
let matcher = matchers.get(pattern);
|
|
53
|
+
if (!matcher) {
|
|
54
|
+
matcher = pm(pattern);
|
|
55
|
+
matchers.set(pattern, matcher);
|
|
56
|
+
}
|
|
57
|
+
return matcher(name);
|
|
58
|
+
};
|
|
51
59
|
if (currentPattern === "**") {
|
|
52
60
|
if (isLastPattern) {
|
|
53
61
|
for (const { actor: descendant } of this.#walkDepthFirstGenerator(actor)) {
|
|
@@ -113,7 +121,7 @@ export class ActorTree {
|
|
|
113
121
|
if (!currentNode) {
|
|
114
122
|
break;
|
|
115
123
|
}
|
|
116
|
-
currentNode =
|
|
124
|
+
currentNode = currentNode.children.find((child) => child.name === parts[i]) ?? null;
|
|
117
125
|
}
|
|
118
126
|
return currentNode;
|
|
119
127
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorTree.js","sourceRoot":"","sources":["../../src/actor/ActorTree.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,EAAE,MAAM,WAAW,CAAC;AAM3B,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAgBnC,MAAM,OAAO,SAAS;IAGpB,YAAY,CAAoC;IAChD,eAAe,CAAoC;IAEnD,QAAQ,GAAsB,EAAE,CAAC;IAEjC,YACE,UAAsC,EAAE;QAExC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;QACxC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAChD,CAAC;IAED,GAAG,CACD,KAAsB;QAEtB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,KAAsB;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC/B,IAAI,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,CAAE,SAAS,CACT,OAAe;QAEf,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,KAAK,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;YAE7C,OAAO;QACT,CAAC;QAED,MAAM,iBAAiB,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QAEtC,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACpC,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;gBAClE,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAED,CAAE,uBAAuB,CACvB,OAAe;QAEf,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;QAE/D,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtC,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,CAAC;gBACrC,KAAK,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;IACH,CAAC;IAED,CAAE,eAAe,CACf,KAAsB,EACtB,YAAsB,EACtB,YAAoB;QAEpB,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACxC,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,YAAY,KAAK,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;QAE/D,sCAAsC;QACtC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ActorTree.js","sourceRoot":"","sources":["../../src/actor/ActorTree.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,11 @@ export type FreeComponentEnum = StrictComponentEnum | (string & {});
|
|
|
4
4
|
export interface Component {
|
|
5
5
|
actor: Actor<any>;
|
|
6
6
|
typeName: FreeComponentEnum;
|
|
7
|
+
needUpdate: boolean;
|
|
7
8
|
awake?(): void;
|
|
8
9
|
start?(): void;
|
|
9
10
|
update?(deltaTime: number): void;
|
|
11
|
+
fixedUpdate?(deltaTime: number): void;
|
|
10
12
|
destroy(): void;
|
|
11
13
|
}
|
|
12
14
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/components/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,MAAM,MAAM,mBAAmB,GAC3B,gBAAgB,GAChB,QAAQ,GACR,eAAe,GACf,gBAAgB,GAChB,eAAe,GACf,kBAAkB,GAClB,cAAc,CAAC;AAEnB,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAEpE,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,QAAQ,EAAE,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/components/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,MAAM,MAAM,mBAAmB,GAC3B,gBAAgB,GAChB,QAAQ,GACR,eAAe,GACf,gBAAgB,GAChB,eAAe,GACf,kBAAkB,GAClB,cAAc,CAAC;AAEnB,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAEpE,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IAEpB,KAAK,CAAC,IAAI,IAAI,CAAC;IACf,KAAK,CAAC,IAAI,IAAI,CAAC;IACf,MAAM,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,WAAW,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,OAAO,IAAI,IAAI,CAAC;CACjB"}
|
|
@@ -1,30 +1,28 @@
|
|
|
1
1
|
import * as THREE from "three";
|
|
2
2
|
import { EventEmitter } from "@posva/event-emitter";
|
|
3
3
|
import { Actor, ActorComponent, ActorTree } from "../actor/index.ts";
|
|
4
|
+
import type { WorldDefaultContext } from "./World.ts";
|
|
4
5
|
import type { Component } from "../components/types.ts";
|
|
5
6
|
export type SceneEvents = {
|
|
6
7
|
awake: [];
|
|
7
8
|
};
|
|
8
|
-
export
|
|
9
|
-
readonly tree: ActorTree<any>;
|
|
10
|
-
componentsToBeStarted: Component[];
|
|
11
|
-
componentsToBeDestroyed: Component[];
|
|
12
|
-
getSource(): THREE.Scene;
|
|
13
|
-
awake(): void;
|
|
14
|
-
update(deltaTime: number): void;
|
|
15
|
-
destroyActor(actor: Actor<any>): void;
|
|
16
|
-
}
|
|
17
|
-
export declare class SceneManager extends EventEmitter<SceneEvents> implements SceneContract {
|
|
9
|
+
export declare class SceneManager<TContext = WorldDefaultContext> extends EventEmitter<SceneEvents> {
|
|
18
10
|
#private;
|
|
19
11
|
default: THREE.Scene;
|
|
20
12
|
componentsToBeStarted: Component[];
|
|
21
13
|
componentsToBeDestroyed: Component[];
|
|
22
|
-
readonly tree: ActorTree<
|
|
14
|
+
readonly tree: ActorTree<TContext>;
|
|
23
15
|
constructor(scene?: THREE.Scene);
|
|
24
16
|
getSource(): THREE.Scene<THREE.Object3DEventMap>;
|
|
25
17
|
awake(): void;
|
|
18
|
+
beginFrame(): void;
|
|
19
|
+
fixedUpdate(deltaTime: number): void;
|
|
26
20
|
update(deltaTime: number): void;
|
|
27
|
-
|
|
28
|
-
|
|
21
|
+
endFrame(): void;
|
|
22
|
+
destroyActor(actor: Actor<TContext>): void;
|
|
23
|
+
registerActor(actor: Actor<TContext>): void;
|
|
24
|
+
unregisterActor(actor: Actor<TContext>): void;
|
|
25
|
+
getActor(name: string): Actor<TContext> | null;
|
|
26
|
+
destroyComponent(component: ActorComponent<TContext>): void;
|
|
29
27
|
}
|
|
30
28
|
//# sourceMappingURL=SceneManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SceneManager.d.ts","sourceRoot":"","sources":["../../src/systems/SceneManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EACL,KAAK,EACL,cAAc,EACd,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,EAAE,CAAC;CACX,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"SceneManager.d.ts","sourceRoot":"","sources":["../../src/systems/SceneManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EACL,KAAK,EACL,cAAc,EACd,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,EAAE,CAAC;CACX,CAAC;AAEF,qBAAa,YAAY,CACvB,QAAQ,GAAG,mBAAmB,CAC9B,SAAQ,YAAY,CAAC,WAAW,CAAC;;IACjC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC;IAErB,qBAAqB,EAAE,SAAS,EAAE,CAAM;IACxC,uBAAuB,EAAE,SAAS,EAAE,CAAM;IAM1C,QAAQ,CAAC,IAAI,sBAGV;gBAGD,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK;IAMrB,SAAS;IAIT,KAAK;IAUL,UAAU;IAmBV,WAAW,CACT,SAAS,EAAE,MAAM;IAOnB,MAAM,CACJ,SAAS,EAAE,MAAM;IAOnB,QAAQ;IAkBR,YAAY,CACV,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC;IAexB,aAAa,CACX,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC;IAaxB,eAAe,CACb,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC;IAgBxB,QAAQ,CACN,IAAI,EAAE,MAAM,GACX,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI;IAezB,gBAAgB,CACd,SAAS,EAAE,cAAc,CAAC,QAAQ,CAAC;CActC"}
|
|
@@ -7,6 +7,8 @@ export class SceneManager extends EventEmitter {
|
|
|
7
7
|
default;
|
|
8
8
|
componentsToBeStarted = [];
|
|
9
9
|
componentsToBeDestroyed = [];
|
|
10
|
+
#registeredActors = new Set();
|
|
11
|
+
#actorsByName = new Map();
|
|
10
12
|
#cachedActors = [];
|
|
11
13
|
tree = new ActorTree({
|
|
12
14
|
addCallback: (actor) => this.default.add(actor.object3D),
|
|
@@ -28,37 +30,42 @@ export class SceneManager extends EventEmitter {
|
|
|
28
30
|
}
|
|
29
31
|
this.emit("awake");
|
|
30
32
|
}
|
|
31
|
-
|
|
32
|
-
this.#cachedActors
|
|
33
|
-
for (const { actor } of this.tree.walk()) {
|
|
34
|
-
this.#cachedActors.push(actor);
|
|
35
|
-
}
|
|
36
|
-
const cachedActors = this.#cachedActors;
|
|
33
|
+
beginFrame() {
|
|
34
|
+
this.#cachedActors = Array.from(this.#registeredActors);
|
|
37
35
|
let i = 0;
|
|
38
36
|
while (i < this.componentsToBeStarted.length) {
|
|
39
37
|
const component = this.componentsToBeStarted[i];
|
|
40
38
|
// If the component to be started is part of an actor
|
|
41
39
|
// which will not be updated, skip it until next loop
|
|
42
|
-
if (
|
|
40
|
+
if (!this.#registeredActors.has(component.actor)) {
|
|
43
41
|
i++;
|
|
44
42
|
continue;
|
|
45
43
|
}
|
|
46
44
|
component.start?.();
|
|
47
45
|
this.componentsToBeStarted.splice(i, 1);
|
|
48
46
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
cachedActors.forEach((actor) => {
|
|
47
|
+
}
|
|
48
|
+
fixedUpdate(deltaTime) {
|
|
49
|
+
this.#cachedActors.forEach((actor) => {
|
|
50
|
+
actor.fixedUpdate(deltaTime);
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
update(deltaTime) {
|
|
54
|
+
this.#cachedActors.forEach((actor) => {
|
|
52
55
|
actor.update(deltaTime);
|
|
53
|
-
if (actor.pendingForDestruction || actor.isDestroyed()) {
|
|
54
|
-
actorToBeDestroyed.push(actor);
|
|
55
|
-
}
|
|
56
56
|
});
|
|
57
|
-
|
|
57
|
+
}
|
|
58
|
+
endFrame() {
|
|
58
59
|
this.componentsToBeDestroyed.forEach((component) => {
|
|
59
60
|
component.destroy();
|
|
60
61
|
});
|
|
61
62
|
this.componentsToBeDestroyed.length = 0;
|
|
63
|
+
const actorToBeDestroyed = [];
|
|
64
|
+
this.#cachedActors.forEach((actor) => {
|
|
65
|
+
if (actor.pendingForDestruction || actor.isDestroyed()) {
|
|
66
|
+
actorToBeDestroyed.push(actor);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
62
69
|
actorToBeDestroyed.forEach((actor) => {
|
|
63
70
|
this.destroyActor(actor);
|
|
64
71
|
});
|
|
@@ -68,14 +75,46 @@ export class SceneManager extends EventEmitter {
|
|
|
68
75
|
childrenToDestroy.forEach((child) => {
|
|
69
76
|
this.destroyActor(child);
|
|
70
77
|
});
|
|
71
|
-
|
|
72
|
-
if (cachedIndex !== -1) {
|
|
73
|
-
this.#cachedActors.splice(cachedIndex, 1);
|
|
74
|
-
}
|
|
78
|
+
this.unregisterActor(actor);
|
|
75
79
|
// NOTE: make sure to remove deeply into the tree
|
|
76
80
|
this.tree.remove(actor);
|
|
77
81
|
actor.destroy();
|
|
78
82
|
}
|
|
83
|
+
registerActor(actor) {
|
|
84
|
+
this.#registeredActors.add(actor);
|
|
85
|
+
const actors = this.#actorsByName.get(actor.name);
|
|
86
|
+
if (actors) {
|
|
87
|
+
actors.push(actor);
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
this.#actorsByName.set(actor.name, [actor]);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
unregisterActor(actor) {
|
|
94
|
+
this.#registeredActors.delete(actor);
|
|
95
|
+
const actors = this.#actorsByName.get(actor.name);
|
|
96
|
+
if (actors) {
|
|
97
|
+
const index = actors.indexOf(actor);
|
|
98
|
+
if (index !== -1) {
|
|
99
|
+
actors.splice(index, 1);
|
|
100
|
+
}
|
|
101
|
+
if (actors.length === 0) {
|
|
102
|
+
this.#actorsByName.delete(actor.name);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
getActor(name) {
|
|
107
|
+
const actors = this.#actorsByName.get(name);
|
|
108
|
+
if (!actors) {
|
|
109
|
+
return null;
|
|
110
|
+
}
|
|
111
|
+
for (const actor of actors) {
|
|
112
|
+
if (!actor.pendingForDestruction) {
|
|
113
|
+
return actor;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return null;
|
|
117
|
+
}
|
|
79
118
|
destroyComponent(component) {
|
|
80
119
|
if (component.pendingForDestruction) {
|
|
81
120
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SceneManager.js","sourceRoot":"","sources":["../../src/systems/SceneManager.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,+BAA+B;AAC/B,OAAO,EACL,KAAK,EACL,cAAc,EACd,SAAS,EACV,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"SceneManager.js","sourceRoot":"","sources":["../../src/systems/SceneManager.ts"],"names":[],"mappings":"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"}
|
package/dist/systems/World.d.ts
CHANGED
|
@@ -1,37 +1,46 @@
|
|
|
1
1
|
import * as THREE from "three";
|
|
2
|
+
import { EventEmitter } from "@posva/event-emitter";
|
|
2
3
|
import { type Renderer } from "./rendering/index.ts";
|
|
3
4
|
import { Actor, type ActorOptions } from "../actor/index.ts";
|
|
4
|
-
import { type
|
|
5
|
+
import { type SceneManager } from "./SceneManager.ts";
|
|
5
6
|
import { Input } from "../controls/Input.class.ts";
|
|
6
7
|
import { GlobalAudio } from "../audio/GlobalAudio.ts";
|
|
7
|
-
import { type WindowAdapter } from "../adapters/window.ts";
|
|
8
8
|
import { type GlobalsAdapter } from "../adapters/global.ts";
|
|
9
|
+
import { FixedTimeStep } from "./FixedTimeStep.ts";
|
|
10
|
+
export type WorldEvents = {
|
|
11
|
+
beforeFixedUpdate: [number];
|
|
12
|
+
afterFixedUpdate: [number];
|
|
13
|
+
beforeUpdate: [number];
|
|
14
|
+
afterUpdate: [number];
|
|
15
|
+
};
|
|
9
16
|
export interface WorldOptions<TContext = WorldDefaultContext> {
|
|
10
17
|
enableOnExit?: boolean;
|
|
11
|
-
sceneManager:
|
|
18
|
+
sceneManager: SceneManager<TContext>;
|
|
12
19
|
input?: Input;
|
|
13
20
|
audio?: GlobalAudio;
|
|
14
21
|
context?: TContext;
|
|
15
|
-
windowAdapter?: WindowAdapter;
|
|
16
22
|
globalsAdapter?: GlobalsAdapter;
|
|
17
23
|
}
|
|
18
24
|
export interface WorldDefaultContext {
|
|
19
25
|
[key: string]: unknown;
|
|
20
26
|
}
|
|
21
|
-
export declare class World<T = THREE.WebGLRenderer, TContext = WorldDefaultContext> {
|
|
27
|
+
export declare class World<T = THREE.WebGLRenderer, TContext = WorldDefaultContext> extends EventEmitter<WorldEvents> {
|
|
22
28
|
#private;
|
|
23
29
|
renderer: Renderer<T>;
|
|
24
30
|
input: Input;
|
|
25
31
|
loadingManager: THREE.LoadingManager;
|
|
26
|
-
sceneManager:
|
|
32
|
+
sceneManager: SceneManager<TContext>;
|
|
27
33
|
audio: GlobalAudio;
|
|
28
34
|
context: TContext;
|
|
35
|
+
loop: FixedTimeStep;
|
|
29
36
|
constructor(renderer: Renderer<T>, options: WorldOptions<TContext>);
|
|
30
37
|
setLoadingManager(manager: THREE.LoadingManager): this;
|
|
31
38
|
createActor(name: string, options?: Omit<ActorOptions<TContext>, "name">): Actor<TContext>;
|
|
32
39
|
connect(): this;
|
|
33
40
|
disconnect(): this;
|
|
34
|
-
|
|
35
|
-
|
|
41
|
+
start(): this;
|
|
42
|
+
stop(): this;
|
|
43
|
+
setFps(fps: number, fixedFps?: number): this;
|
|
44
|
+
tick(): boolean;
|
|
36
45
|
}
|
|
37
46
|
//# sourceMappingURL=World.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"World.d.ts","sourceRoot":"","sources":["../../src/systems/World.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"World.d.ts","sourceRoot":"","sources":["../../src/systems/World.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EACL,KAAK,QAAQ,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,EACL,KAAK,YAAY,EAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,KAAK,YAAY,EAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,MAAM,WAAW,GAAG;IACxB,iBAAiB,EAAE,CAAC,MAAM,CAAC,CAAC;IAC5B,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC;IAC3B,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC;IACvB,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,YAAY,CAC3B,QAAQ,GAAG,mBAAmB;IAE9B,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,YAAY,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACrC,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,qBAAa,KAAK,CAChB,CAAC,GAAG,KAAK,CAAC,aAAa,EACvB,QAAQ,GAAG,mBAAmB,CAC9B,SAAQ,YAAY,CAAC,WAAW,CAAC;;IACjC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,KAAK,CAAC,cAAc,CAA8B;IAClE,YAAY,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACrC,KAAK,EAAE,WAAW,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAC;IAClB,IAAI,EAAE,aAAa,CAAC;gBAGlB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC;IAsBjC,iBAAiB,CACf,OAAO,EAAE,KAAK,CAAC,cAAc;IAO/B,WAAW,CACT,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAM,GACjD,KAAK,CAAC,QAAQ,CAAC;IAOlB,OAAO;IAQP,UAAU;IAOV,KAAK;IAML,IAAI;IAMJ,MAAM,CACJ,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,MAAM;IAOnB,IAAI;CAqCL"}
|
package/dist/systems/World.js
CHANGED
|
@@ -1,29 +1,31 @@
|
|
|
1
1
|
// Import Third-party Dependencies
|
|
2
2
|
import * as THREE from "three";
|
|
3
|
+
import { EventEmitter } from "@posva/event-emitter";
|
|
3
4
|
// Import Internal Dependencies
|
|
4
5
|
import {} from "./rendering/index.js";
|
|
5
6
|
import { Actor } from "../actor/index.js";
|
|
6
7
|
import {} from "./SceneManager.js";
|
|
7
8
|
import { Input } from "../controls/Input.class.js";
|
|
8
9
|
import { GlobalAudio } from "../audio/GlobalAudio.js";
|
|
9
|
-
import { BrowserWindowAdapter } from "../adapters/window.js";
|
|
10
10
|
import { BrowserGlobalsAdapter } from "../adapters/global.js";
|
|
11
|
-
|
|
11
|
+
import { FixedTimeStep } from "./FixedTimeStep.js";
|
|
12
|
+
export class World extends EventEmitter {
|
|
12
13
|
renderer;
|
|
13
14
|
input;
|
|
14
15
|
loadingManager = new THREE.LoadingManager();
|
|
15
16
|
sceneManager;
|
|
16
17
|
audio;
|
|
17
18
|
context;
|
|
18
|
-
|
|
19
|
+
loop;
|
|
19
20
|
constructor(renderer, options) {
|
|
20
|
-
|
|
21
|
+
super();
|
|
22
|
+
const { sceneManager, input = new Input(renderer.canvas, { enableOnExit: options.enableOnExit ?? false }), audio = new GlobalAudio(), context = Object.create(null), globalsAdapter = new BrowserGlobalsAdapter() } = options;
|
|
21
23
|
this.renderer = renderer;
|
|
22
24
|
this.sceneManager = sceneManager;
|
|
23
25
|
this.input = input;
|
|
24
26
|
this.audio = audio;
|
|
25
27
|
this.context = context;
|
|
26
|
-
this
|
|
28
|
+
this.loop = new FixedTimeStep();
|
|
27
29
|
globalsAdapter.setGame(this);
|
|
28
30
|
}
|
|
29
31
|
setLoadingManager(manager) {
|
|
@@ -38,26 +40,57 @@ export class World {
|
|
|
38
40
|
}
|
|
39
41
|
connect() {
|
|
40
42
|
this.input.connect();
|
|
41
|
-
this
|
|
43
|
+
this.renderer.observeResize();
|
|
42
44
|
this.sceneManager.awake();
|
|
43
45
|
return this;
|
|
44
46
|
}
|
|
45
47
|
disconnect() {
|
|
46
48
|
this.input.disconnect();
|
|
47
|
-
this
|
|
49
|
+
this.renderer.unobserveResize();
|
|
48
50
|
return this;
|
|
49
51
|
}
|
|
50
|
-
|
|
52
|
+
start() {
|
|
53
|
+
this.loop.start();
|
|
54
|
+
return this;
|
|
55
|
+
}
|
|
56
|
+
stop() {
|
|
57
|
+
this.loop.stop();
|
|
58
|
+
return this;
|
|
59
|
+
}
|
|
60
|
+
setFps(fps, fixedFps) {
|
|
61
|
+
this.loop.setFps(fps, fixedFps);
|
|
62
|
+
return this;
|
|
63
|
+
}
|
|
64
|
+
tick() {
|
|
65
|
+
this.#beginFrame();
|
|
66
|
+
this.loop.tick({
|
|
67
|
+
fixedUpdate: (fixedDelta) => {
|
|
68
|
+
const dt = fixedDelta / 1000;
|
|
69
|
+
this.emit("beforeFixedUpdate", dt);
|
|
70
|
+
this.sceneManager.fixedUpdate(dt);
|
|
71
|
+
this.emit("afterFixedUpdate", dt);
|
|
72
|
+
},
|
|
73
|
+
update: (_interpolation, delta) => {
|
|
74
|
+
const dt = delta / 1000;
|
|
75
|
+
this.emit("beforeUpdate", dt);
|
|
76
|
+
this.sceneManager.update(dt);
|
|
77
|
+
this.renderer.draw();
|
|
78
|
+
this.emit("afterUpdate", dt);
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
return this.#endFrame();
|
|
82
|
+
}
|
|
83
|
+
#beginFrame() {
|
|
51
84
|
this.input.update();
|
|
52
|
-
this.sceneManager.
|
|
85
|
+
this.sceneManager.beginFrame();
|
|
86
|
+
}
|
|
87
|
+
#endFrame() {
|
|
88
|
+
this.sceneManager.endFrame();
|
|
53
89
|
if (this.input.exited) {
|
|
54
90
|
this.renderer.clear();
|
|
55
91
|
return true;
|
|
56
92
|
}
|
|
57
93
|
return false;
|
|
58
94
|
}
|
|
59
|
-
render() {
|
|
60
|
-
this.renderer.draw();
|
|
61
|
-
}
|
|
62
95
|
}
|
|
63
96
|
//# sourceMappingURL=World.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"World.js","sourceRoot":"","sources":["../../src/systems/World.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"World.js","sourceRoot":"","sources":["../../src/systems/World.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,8 @@ export interface Renderer<T = any, Events extends GenericEventMap = RendererEven
|
|
|
27
27
|
on<Key extends keyof Events>(type: Key, handler: Handler<Events[Key]>): RemoveEventListener;
|
|
28
28
|
off<Key extends keyof Events>(type: Key, handler?: Handler<Events[Key]>): void;
|
|
29
29
|
emit<Key extends keyof Events>(type: Key, ...payload: Events[Key] extends [unknown, ...unknown[]] | [] ? Events[Key] : [Events[Key]]): void;
|
|
30
|
+
observeResize(): void;
|
|
31
|
+
unobserveResize(): void;
|
|
30
32
|
resize(): void;
|
|
31
33
|
draw(): void;
|
|
32
34
|
onDraw(callback: (source: T) => void): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Renderer.d.ts","sourceRoot":"","sources":["../../../src/systems/rendering/Renderer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,KAAK,EACV,eAAe,EACf,QAAQ,IAAI,OAAO,EACnB,oBAAoB,IAAI,mBAAmB,EAC5C,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC,kBAAkB,CAAC;AAEjF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE;QACN;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;SAAE;KACnC,CAAC;IACF,IAAI,EAAE;QACJ;YAAE,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC;SAAE;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,SAAS,eAAe,GAAG,cAAc;IAChF,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEnC,SAAS,IAAI,CAAC,CAAC;IACf,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACrC,UAAU,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAErC,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IACrD,qBAAqB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IAExD,EAAE,CAAC,GAAG,SAAS,MAAM,MAAM,EACzB,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAC5B,mBAAmB,CAAC;IACvB,GAAG,CAAC,GAAG,SAAS,MAAM,MAAM,EAC1B,IAAI,EAAE,GAAG,EACT,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAC7B,IAAI,CAAC;IACR,IAAI,CAAC,GAAG,SAAS,MAAM,MAAM,EAC3B,IAAI,EAAE,GAAG,EACT,GAAG,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,EAAE,GACxD,MAAM,CAAC,GAAG,CAAC,GACX,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAChB,IAAI,CAAC;IAER,MAAM,IAAI,IAAI,CAAC;IACf,IAAI,IAAI,IAAI,CAAC;IACb,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5C,KAAK,IAAI,IAAI,CAAC;CACf"}
|
|
1
|
+
{"version":3,"file":"Renderer.d.ts","sourceRoot":"","sources":["../../../src/systems/rendering/Renderer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,KAAK,EACV,eAAe,EACf,QAAQ,IAAI,OAAO,EACnB,oBAAoB,IAAI,mBAAmB,EAC5C,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC,kBAAkB,CAAC;AAEjF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE;QACN;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;SAAE;KACnC,CAAC;IACF,IAAI,EAAE;QACJ;YAAE,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC;SAAE;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,SAAS,eAAe,GAAG,cAAc;IAChF,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAEnC,SAAS,IAAI,CAAC,CAAC;IACf,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACrC,UAAU,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAErC,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IACrD,qBAAqB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IAExD,EAAE,CAAC,GAAG,SAAS,MAAM,MAAM,EACzB,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAC5B,mBAAmB,CAAC;IACvB,GAAG,CAAC,GAAG,SAAS,MAAM,MAAM,EAC1B,IAAI,EAAE,GAAG,EACT,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAC7B,IAAI,CAAC;IACR,IAAI,CAAC,GAAG,SAAS,MAAM,MAAM,EAC3B,IAAI,EAAE,GAAG,EACT,GAAG,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,EAAE,GACxD,MAAM,CAAC,GAAG,CAAC,GACX,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAChB,IAAI,CAAC;IAER,aAAa,IAAI,IAAI,CAAC;IACtB,eAAe,IAAI,IAAI,CAAC;IACxB,MAAM,IAAI,IAAI,CAAC;IACf,IAAI,IAAI,IAAI,CAAC;IACb,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5C,KAAK,IAAI,IAAI,CAAC;CACf"}
|
|
@@ -2,23 +2,25 @@ import * as THREE from "three";
|
|
|
2
2
|
import { type Pass } from "three/addons/postprocessing/EffectComposer.js";
|
|
3
3
|
import { EventEmitter } from "@posva/event-emitter";
|
|
4
4
|
import type { Renderer, RenderComponent, RendererEvents } from "./Renderer.ts";
|
|
5
|
-
import type {
|
|
5
|
+
import type { WorldDefaultContext } from "../World.ts";
|
|
6
|
+
import type { SceneManager } from "../SceneManager.ts";
|
|
6
7
|
import { type RenderMode, type RenderStrategy } from "./RenderStrategy.ts";
|
|
7
8
|
export type ThreeRendererEvents = RendererEvents;
|
|
8
|
-
export interface ThreeRendererOptions {
|
|
9
|
+
export interface ThreeRendererOptions<TContext = WorldDefaultContext> {
|
|
9
10
|
/**
|
|
10
11
|
* @default "direct"
|
|
11
12
|
*/
|
|
12
13
|
renderMode: RenderMode;
|
|
13
|
-
|
|
14
|
+
sceneManager: SceneManager<TContext>;
|
|
14
15
|
}
|
|
15
|
-
export declare class ThreeRenderer extends EventEmitter<ThreeRendererEvents> implements Renderer {
|
|
16
|
+
export declare class ThreeRenderer<TContext = WorldDefaultContext> extends EventEmitter<ThreeRendererEvents> implements Renderer {
|
|
17
|
+
#private;
|
|
16
18
|
webGLRenderer: THREE.WebGLRenderer;
|
|
17
19
|
renderComponents: RenderComponent[];
|
|
18
20
|
renderStrategy: RenderStrategy;
|
|
19
21
|
ratio: number | null;
|
|
20
|
-
|
|
21
|
-
constructor(canvas: HTMLCanvasElement, options: ThreeRendererOptions);
|
|
22
|
+
sceneManager: SceneManager<TContext>;
|
|
23
|
+
constructor(canvas: HTMLCanvasElement, options: ThreeRendererOptions<TContext>);
|
|
22
24
|
get canvas(): HTMLCanvasElement;
|
|
23
25
|
getSource(): THREE.WebGLRenderer;
|
|
24
26
|
addRenderComponent(component: RenderComponent): void;
|
|
@@ -26,6 +28,8 @@ export declare class ThreeRenderer extends EventEmitter<ThreeRendererEvents> imp
|
|
|
26
28
|
setRenderMode(mode: RenderMode): this;
|
|
27
29
|
setEffects(...effects: Pass[]): this;
|
|
28
30
|
setRatio(ratio?: number | null): this;
|
|
31
|
+
observeResize(): void;
|
|
32
|
+
unobserveResize(): void;
|
|
29
33
|
resize: () => void;
|
|
30
34
|
draw(): void;
|
|
31
35
|
onDraw(callback: (event: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThreeRenderer.d.ts","sourceRoot":"","sources":["../../../src/systems/rendering/ThreeRenderer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAkB,KAAK,IAAI,EAAE,MAAM,+CAA+C,CAAC;AAE1F,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,cAAc,EACf,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ThreeRenderer.d.ts","sourceRoot":"","sources":["../../../src/systems/rendering/ThreeRenderer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAkB,KAAK,IAAI,EAAE,MAAM,+CAA+C,CAAC;AAE1F,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,cAAc,EACf,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,KAAK,UAAU,EACf,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC;AAEjD,MAAM,WAAW,oBAAoB,CACnC,QAAQ,GAAG,mBAAmB;IAE9B;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;CACtC;AAED,qBAAa,aAAa,CACxB,QAAQ,GAAG,mBAAmB,CAC9B,SAAQ,YAAY,CAAC,mBAAmB,CAAE,YAAW,QAAQ;;IAC7D,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC;IACnC,gBAAgB,EAAE,eAAe,EAAE,CAAM;IACzC,cAAc,EAAE,cAAc,CAAC;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC5B,YAAY,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAQnC,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC;IAUzC,IAAI,MAAM,sBAET;IAED,SAAS;IAIT,kBAAkB,CAChB,SAAS,EAAE,eAAe,GACzB,IAAI;IAQP,qBAAqB,CACnB,SAAS,EAAE,eAAe,GACzB,IAAI;IAeP,aAAa,CACX,IAAI,EAAE,UAAU,GACf,IAAI;IAuBP,UAAU,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI;IAUpC,QAAQ,CACN,KAAK,GAAE,MAAM,GAAG,IAAW;IAa7B,aAAa;IAmCb,eAAe;IAOf,MAAM,aA0BJ;IAEF,IAAI;IAWJ,MAAM,CACJ,QAAQ,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC;KAAE,KAAK,IAAI;IAK7D,KAAK;CAGN"}
|
|
@@ -9,11 +9,15 @@ export class ThreeRenderer extends EventEmitter {
|
|
|
9
9
|
renderComponents = [];
|
|
10
10
|
renderStrategy;
|
|
11
11
|
ratio = null;
|
|
12
|
-
|
|
12
|
+
sceneManager;
|
|
13
|
+
#resizeObserver = null;
|
|
14
|
+
#pendingResizeWidth = 0;
|
|
15
|
+
#pendingResizeHeight = 0;
|
|
16
|
+
#resizeDirty = true;
|
|
13
17
|
constructor(canvas, options) {
|
|
14
18
|
super();
|
|
15
|
-
const {
|
|
16
|
-
this.
|
|
19
|
+
const { sceneManager, renderMode = "direct" } = options;
|
|
20
|
+
this.sceneManager = sceneManager;
|
|
17
21
|
this.webGLRenderer = createWebGLRenderer(canvas);
|
|
18
22
|
this.setRenderMode(renderMode);
|
|
19
23
|
}
|
|
@@ -26,7 +30,7 @@ export class ThreeRenderer extends EventEmitter {
|
|
|
26
30
|
addRenderComponent(component) {
|
|
27
31
|
this.renderComponents.push(component);
|
|
28
32
|
if (this.renderStrategy instanceof ComposerRenderStrategy) {
|
|
29
|
-
const renderPass = new RenderPass(this.
|
|
33
|
+
const renderPass = new RenderPass(this.sceneManager.getSource(), component);
|
|
30
34
|
this.renderStrategy.addEffect(renderPass);
|
|
31
35
|
}
|
|
32
36
|
}
|
|
@@ -47,7 +51,7 @@ export class ThreeRenderer extends EventEmitter {
|
|
|
47
51
|
}
|
|
48
52
|
else {
|
|
49
53
|
const composer = new EffectComposer(this.webGLRenderer);
|
|
50
|
-
const scene = this.
|
|
54
|
+
const scene = this.sceneManager.getSource();
|
|
51
55
|
for (const renderComponent of this.renderComponents) {
|
|
52
56
|
const renderPass = new RenderPass(scene, renderComponent);
|
|
53
57
|
composer.addPass(renderPass);
|
|
@@ -75,52 +79,72 @@ export class ThreeRenderer extends EventEmitter {
|
|
|
75
79
|
this.resize();
|
|
76
80
|
return this;
|
|
77
81
|
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
if (this.ratio) {
|
|
82
|
-
if (document.body.clientWidth / document.body.clientHeight > this.ratio) {
|
|
83
|
-
height = document.body.clientHeight;
|
|
84
|
-
width = Math.min(document.body.clientWidth, height * this.ratio);
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
width = document.body.clientWidth;
|
|
88
|
-
height = Math.min(document.body.clientHeight, width / this.ratio);
|
|
89
|
-
}
|
|
82
|
+
observeResize() {
|
|
83
|
+
if (this.#resizeObserver) {
|
|
84
|
+
return;
|
|
90
85
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
86
|
+
const target = this.ratio ?
|
|
87
|
+
document.body :
|
|
88
|
+
this.webGLRenderer.domElement.parentElement ?? this.webGLRenderer.domElement;
|
|
89
|
+
this.#resizeObserver = new ResizeObserver((entries) => {
|
|
90
|
+
const entry = entries[0];
|
|
91
|
+
if (!entry) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
const { width, height } = entry.contentRect;
|
|
95
|
+
if (this.ratio) {
|
|
96
|
+
if (width / height > this.ratio) {
|
|
97
|
+
this.#pendingResizeHeight = Math.round(height);
|
|
98
|
+
this.#pendingResizeWidth = Math.round(Math.min(width, height * this.ratio));
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
this.#pendingResizeWidth = Math.round(width);
|
|
102
|
+
this.#pendingResizeHeight = Math.round(Math.min(height, width / this.ratio));
|
|
103
|
+
}
|
|
96
104
|
}
|
|
97
105
|
else {
|
|
98
|
-
|
|
99
|
-
|
|
106
|
+
this.#pendingResizeWidth = Math.round(width);
|
|
107
|
+
this.#pendingResizeHeight = Math.round(height);
|
|
100
108
|
}
|
|
109
|
+
this.#resizeDirty = true;
|
|
110
|
+
});
|
|
111
|
+
this.#resizeObserver.observe(target);
|
|
112
|
+
}
|
|
113
|
+
unobserveResize() {
|
|
114
|
+
if (this.#resizeObserver) {
|
|
115
|
+
this.#resizeObserver.disconnect();
|
|
116
|
+
this.#resizeObserver = null;
|
|
101
117
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
118
|
+
}
|
|
119
|
+
resize = () => {
|
|
120
|
+
if (!this.#resizeDirty) {
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
this.#resizeDirty = false;
|
|
124
|
+
const width = this.#pendingResizeWidth;
|
|
125
|
+
const height = this.#pendingResizeHeight;
|
|
126
|
+
if (width === 0 || height === 0) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
this.renderStrategy.resize(width, height);
|
|
130
|
+
for (const renderComponent of this.renderComponents) {
|
|
131
|
+
if (renderComponent instanceof THREE.PerspectiveCamera) {
|
|
132
|
+
renderComponent.aspect = width / height;
|
|
133
|
+
}
|
|
134
|
+
if (renderComponent instanceof THREE.OrthographicCamera) {
|
|
135
|
+
renderComponent.left = width / -2;
|
|
136
|
+
renderComponent.right = width / 2;
|
|
137
|
+
renderComponent.top = height / 2;
|
|
138
|
+
renderComponent.bottom = height / -2;
|
|
116
139
|
}
|
|
117
|
-
|
|
140
|
+
renderComponent.updateProjectionMatrix();
|
|
118
141
|
}
|
|
142
|
+
this.emit("resize", { width, height });
|
|
119
143
|
};
|
|
120
144
|
draw() {
|
|
121
145
|
this.resize();
|
|
122
146
|
this.clear();
|
|
123
|
-
this.renderStrategy.render(this.
|
|
147
|
+
this.renderStrategy.render(this.sceneManager.getSource(), this.renderComponents);
|
|
124
148
|
this.emit("draw", { source: this.webGLRenderer });
|
|
125
149
|
}
|
|
126
150
|
onDraw(callback) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThreeRenderer.js","sourceRoot":"","sources":["../../../src/systems/rendering/ThreeRenderer.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAa,MAAM,+CAA+C,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,2CAA2C,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"ThreeRenderer.js","sourceRoot":"","sources":["../../../src/systems/rendering/ThreeRenderer.ts"],"names":[],"mappings":"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"}
|