@jolly-pixel/engine 2.0.0 → 2.2.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/Scene.d.ts +41 -0
- package/dist/systems/Scene.d.ts.map +1 -0
- package/dist/systems/Scene.js +41 -0
- package/dist/systems/Scene.js.map +1 -0
- package/dist/systems/SceneManager.d.ts +41 -14
- package/dist/systems/SceneManager.d.ts.map +1 -1
- package/dist/systems/SceneManager.js +190 -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 +46 -12
- package/dist/systems/World.js.map +1 -1
- package/dist/systems/asset/Base.d.ts +1 -1
- package/dist/systems/asset/Base.d.ts.map +1 -1
- package/dist/systems/asset/Base.js.map +1 -1
- package/dist/systems/asset/Manager.d.ts +1 -1
- package/dist/systems/asset/Manager.d.ts.map +1 -1
- package/dist/systems/asset/Manager.js +12 -9
- package/dist/systems/asset/Manager.js.map +1 -1
- package/dist/systems/asset/Queue.d.ts +1 -1
- package/dist/systems/asset/Queue.d.ts.map +1 -1
- package/dist/systems/asset/Queue.js +8 -0
- package/dist/systems/asset/Queue.js.map +1 -1
- package/dist/systems/index.d.ts +1 -0
- package/dist/systems/index.d.ts.map +1 -1
- package/dist/systems/index.js +1 -0
- package/dist/systems/index.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 +74 -41
- package/dist/systems/rendering/ThreeRenderer.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,7 +7,15 @@ 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 = [];
|
|
13
|
+
#currentScene = null;
|
|
14
|
+
#pendingScene = null;
|
|
15
|
+
#sceneStartPending = false;
|
|
16
|
+
#world = null;
|
|
17
|
+
#appendedScenes = new Map();
|
|
18
|
+
#appendedScenesPendingStart = new Set();
|
|
11
19
|
tree = new ActorTree({
|
|
12
20
|
addCallback: (actor) => this.default.add(actor.object3D),
|
|
13
21
|
removeCallback: (actor) => this.default.remove(actor.object3D)
|
|
@@ -16,9 +24,18 @@ export class SceneManager extends EventEmitter {
|
|
|
16
24
|
super();
|
|
17
25
|
this.default = scene ?? new THREE.Scene();
|
|
18
26
|
}
|
|
27
|
+
get currentScene() {
|
|
28
|
+
return this.#currentScene;
|
|
29
|
+
}
|
|
30
|
+
get hasPendingScene() {
|
|
31
|
+
return this.#pendingScene !== null;
|
|
32
|
+
}
|
|
19
33
|
getSource() {
|
|
20
34
|
return this.default;
|
|
21
35
|
}
|
|
36
|
+
bindWorld(world) {
|
|
37
|
+
this.#world = world;
|
|
38
|
+
}
|
|
22
39
|
awake() {
|
|
23
40
|
for (const { actor } of this.tree.walk()) {
|
|
24
41
|
if (!actor.awoken) {
|
|
@@ -28,37 +45,157 @@ export class SceneManager extends EventEmitter {
|
|
|
28
45
|
}
|
|
29
46
|
this.emit("awake");
|
|
30
47
|
}
|
|
31
|
-
|
|
32
|
-
this.#
|
|
33
|
-
|
|
34
|
-
|
|
48
|
+
setScene(scene) {
|
|
49
|
+
if (this.#currentScene !== null) {
|
|
50
|
+
for (const entry of this.#appendedScenes.values()) {
|
|
51
|
+
this.emit("sceneRemoved", entry.scene);
|
|
52
|
+
entry.scene.destroy();
|
|
53
|
+
}
|
|
54
|
+
this.#appendedScenes.clear();
|
|
55
|
+
this.#appendedScenesPendingStart.clear();
|
|
56
|
+
this.emit("sceneDestroyed", this.#currentScene);
|
|
57
|
+
this.#currentScene.destroy();
|
|
58
|
+
const allActors = Array.from(this.#registeredActors);
|
|
59
|
+
for (const actor of allActors) {
|
|
60
|
+
this.destroyActor(actor);
|
|
61
|
+
}
|
|
62
|
+
this.componentsToBeStarted.length = 0;
|
|
63
|
+
this.componentsToBeDestroyed.length = 0;
|
|
64
|
+
this.default.clear();
|
|
65
|
+
this.#registeredActors.clear();
|
|
66
|
+
this.#actorsByName.clear();
|
|
67
|
+
}
|
|
68
|
+
scene.world = this.#world;
|
|
69
|
+
this.#currentScene = scene;
|
|
70
|
+
scene.awake();
|
|
71
|
+
this.awake();
|
|
72
|
+
this.#sceneStartPending = true;
|
|
73
|
+
this.emit("sceneChanged", scene);
|
|
74
|
+
}
|
|
75
|
+
loadScene(scene) {
|
|
76
|
+
this.#pendingScene = scene;
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* Inserts a scene as a prefab into the current scene.
|
|
80
|
+
* The scene's awake() is called immediately; start() is deferred to the next beginFrame.
|
|
81
|
+
* All actors created during awake() are tracked and will be destroyed on removeScene().
|
|
82
|
+
*/
|
|
83
|
+
appendScene(scene) {
|
|
84
|
+
const snapshot = new Set(this.#registeredActors);
|
|
85
|
+
scene.world = this.#world;
|
|
86
|
+
scene.awake();
|
|
87
|
+
const ownedActors = new Set();
|
|
88
|
+
for (const actor of this.#registeredActors) {
|
|
89
|
+
if (!snapshot.has(actor)) {
|
|
90
|
+
ownedActors.add(actor);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
// Awaken any actors created during awake() that haven't been woken yet
|
|
94
|
+
this.awake();
|
|
95
|
+
this.#appendedScenes.set(scene.id, { scene, ownedActors });
|
|
96
|
+
this.#appendedScenesPendingStart.add(scene.id);
|
|
97
|
+
this.emit("sceneAppended", scene);
|
|
98
|
+
}
|
|
99
|
+
removeScene(target) {
|
|
100
|
+
if (typeof target === "string") {
|
|
101
|
+
for (const [id, entry] of this.#appendedScenes) {
|
|
102
|
+
if (entry.scene.name === target) {
|
|
103
|
+
this.#teardownAppendedScene(id, entry);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
const entry = this.#appendedScenes.get(target.id);
|
|
109
|
+
if (entry !== undefined) {
|
|
110
|
+
this.#teardownAppendedScene(target.id, entry);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
#teardownAppendedScene(id, entry) {
|
|
115
|
+
this.emit("sceneRemoved", entry.scene);
|
|
116
|
+
entry.scene.destroy();
|
|
117
|
+
// Destroy only root-level owned actors; destroyActor cascades to children
|
|
118
|
+
for (const actor of entry.ownedActors) {
|
|
119
|
+
if (actor.parent === null || !entry.ownedActors.has(actor.parent)) {
|
|
120
|
+
this.destroyActor(actor);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
this.#appendedScenes.delete(id);
|
|
124
|
+
this.#appendedScenesPendingStart.delete(id);
|
|
125
|
+
}
|
|
126
|
+
getScene(target) {
|
|
127
|
+
if (target === undefined) {
|
|
128
|
+
return this.#currentScene;
|
|
129
|
+
}
|
|
130
|
+
if (typeof target === "number") {
|
|
131
|
+
return this.#appendedScenes.get(target)?.scene ?? null;
|
|
132
|
+
}
|
|
133
|
+
const result = [];
|
|
134
|
+
for (const entry of this.#appendedScenes.values()) {
|
|
135
|
+
if (entry.scene.name === target) {
|
|
136
|
+
result.push(entry.scene);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
return result;
|
|
140
|
+
}
|
|
141
|
+
beginFrame() {
|
|
142
|
+
if (this.#pendingScene !== null) {
|
|
143
|
+
this.setScene(this.#pendingScene);
|
|
144
|
+
this.#pendingScene = null;
|
|
145
|
+
}
|
|
146
|
+
if (this.#sceneStartPending) {
|
|
147
|
+
this.#currentScene?.start();
|
|
148
|
+
this.#sceneStartPending = false;
|
|
149
|
+
}
|
|
150
|
+
if (this.#appendedScenesPendingStart.size > 0) {
|
|
151
|
+
for (const id of this.#appendedScenesPendingStart) {
|
|
152
|
+
this.#appendedScenes.get(id)?.scene.start();
|
|
153
|
+
}
|
|
154
|
+
this.#appendedScenesPendingStart.clear();
|
|
35
155
|
}
|
|
36
|
-
|
|
156
|
+
this.#cachedActors = Array.from(this.#registeredActors);
|
|
37
157
|
let i = 0;
|
|
38
158
|
while (i < this.componentsToBeStarted.length) {
|
|
39
159
|
const component = this.componentsToBeStarted[i];
|
|
40
160
|
// If the component to be started is part of an actor
|
|
41
161
|
// which will not be updated, skip it until next loop
|
|
42
|
-
if (
|
|
162
|
+
if (!this.#registeredActors.has(component.actor)) {
|
|
43
163
|
i++;
|
|
44
164
|
continue;
|
|
45
165
|
}
|
|
46
166
|
component.start?.();
|
|
47
167
|
this.componentsToBeStarted.splice(i, 1);
|
|
48
168
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
cachedActors.forEach((actor) => {
|
|
169
|
+
}
|
|
170
|
+
fixedUpdate(deltaTime) {
|
|
171
|
+
this.#cachedActors.forEach((actor) => {
|
|
172
|
+
actor.fixedUpdate(deltaTime);
|
|
173
|
+
});
|
|
174
|
+
this.#currentScene?.fixedUpdate(deltaTime);
|
|
175
|
+
for (const { scene } of this.#appendedScenes.values()) {
|
|
176
|
+
scene.fixedUpdate(deltaTime);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
update(deltaTime) {
|
|
180
|
+
this.#cachedActors.forEach((actor) => {
|
|
52
181
|
actor.update(deltaTime);
|
|
53
|
-
if (actor.pendingForDestruction || actor.isDestroyed()) {
|
|
54
|
-
actorToBeDestroyed.push(actor);
|
|
55
|
-
}
|
|
56
182
|
});
|
|
57
|
-
|
|
183
|
+
this.#currentScene?.update(deltaTime);
|
|
184
|
+
for (const { scene } of this.#appendedScenes.values()) {
|
|
185
|
+
scene.update(deltaTime);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
endFrame() {
|
|
58
189
|
this.componentsToBeDestroyed.forEach((component) => {
|
|
59
190
|
component.destroy();
|
|
60
191
|
});
|
|
61
192
|
this.componentsToBeDestroyed.length = 0;
|
|
193
|
+
const actorToBeDestroyed = [];
|
|
194
|
+
this.#cachedActors.forEach((actor) => {
|
|
195
|
+
if (actor.pendingForDestruction || actor.isDestroyed()) {
|
|
196
|
+
actorToBeDestroyed.push(actor);
|
|
197
|
+
}
|
|
198
|
+
});
|
|
62
199
|
actorToBeDestroyed.forEach((actor) => {
|
|
63
200
|
this.destroyActor(actor);
|
|
64
201
|
});
|
|
@@ -68,14 +205,49 @@ export class SceneManager extends EventEmitter {
|
|
|
68
205
|
childrenToDestroy.forEach((child) => {
|
|
69
206
|
this.destroyActor(child);
|
|
70
207
|
});
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
//
|
|
208
|
+
this.unregisterActor(actor);
|
|
209
|
+
// For root actors (parent === null): removes from tree.children and fires
|
|
210
|
+
// the removeCallback that detaches actor.object3D from the THREE.Scene.
|
|
211
|
+
// For non-root actors this is a no-op; actor.destroy() handles removal
|
|
212
|
+
// from the parent's children list via parent.remove(this).
|
|
76
213
|
this.tree.remove(actor);
|
|
77
214
|
actor.destroy();
|
|
78
215
|
}
|
|
216
|
+
registerActor(actor) {
|
|
217
|
+
this.#registeredActors.add(actor);
|
|
218
|
+
const actors = this.#actorsByName.get(actor.name);
|
|
219
|
+
if (actors) {
|
|
220
|
+
actors.push(actor);
|
|
221
|
+
}
|
|
222
|
+
else {
|
|
223
|
+
this.#actorsByName.set(actor.name, [actor]);
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
unregisterActor(actor) {
|
|
227
|
+
this.#registeredActors.delete(actor);
|
|
228
|
+
const actors = this.#actorsByName.get(actor.name);
|
|
229
|
+
if (actors) {
|
|
230
|
+
const index = actors.indexOf(actor);
|
|
231
|
+
if (index !== -1) {
|
|
232
|
+
actors.splice(index, 1);
|
|
233
|
+
}
|
|
234
|
+
if (actors.length === 0) {
|
|
235
|
+
this.#actorsByName.delete(actor.name);
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
getActor(name) {
|
|
240
|
+
const actors = this.#actorsByName.get(name);
|
|
241
|
+
if (!actors) {
|
|
242
|
+
return null;
|
|
243
|
+
}
|
|
244
|
+
for (const actor of actors) {
|
|
245
|
+
if (!actor.pendingForDestruction) {
|
|
246
|
+
return actor;
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
return null;
|
|
250
|
+
}
|
|
79
251
|
destroyComponent(component) {
|
|
80
252
|
if (component.pendingForDestruction) {
|
|
81
253
|
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;IAuBjC,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,32 @@
|
|
|
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();
|
|
29
|
+
sceneManager.bindWorld(this);
|
|
27
30
|
globalsAdapter.setGame(this);
|
|
28
31
|
}
|
|
29
32
|
setLoadingManager(manager) {
|
|
@@ -38,26 +41,57 @@ export class World {
|
|
|
38
41
|
}
|
|
39
42
|
connect() {
|
|
40
43
|
this.input.connect();
|
|
41
|
-
this
|
|
44
|
+
this.renderer.observeResize();
|
|
42
45
|
this.sceneManager.awake();
|
|
43
46
|
return this;
|
|
44
47
|
}
|
|
45
48
|
disconnect() {
|
|
46
49
|
this.input.disconnect();
|
|
47
|
-
this
|
|
50
|
+
this.renderer.unobserveResize();
|
|
48
51
|
return this;
|
|
49
52
|
}
|
|
50
|
-
|
|
53
|
+
start() {
|
|
54
|
+
this.loop.start();
|
|
55
|
+
return this;
|
|
56
|
+
}
|
|
57
|
+
stop() {
|
|
58
|
+
this.loop.stop();
|
|
59
|
+
return this;
|
|
60
|
+
}
|
|
61
|
+
setFps(fps, fixedFps) {
|
|
62
|
+
this.loop.setFps(fps, fixedFps);
|
|
63
|
+
return this;
|
|
64
|
+
}
|
|
65
|
+
tick() {
|
|
66
|
+
this.#beginFrame();
|
|
67
|
+
this.loop.tick({
|
|
68
|
+
fixedUpdate: (fixedDelta) => {
|
|
69
|
+
const dt = fixedDelta / 1000;
|
|
70
|
+
this.emit("beforeFixedUpdate", dt);
|
|
71
|
+
this.sceneManager.fixedUpdate(dt);
|
|
72
|
+
this.emit("afterFixedUpdate", dt);
|
|
73
|
+
},
|
|
74
|
+
update: (_interpolation, delta) => {
|
|
75
|
+
const dt = delta / 1000;
|
|
76
|
+
this.emit("beforeUpdate", dt);
|
|
77
|
+
this.sceneManager.update(dt);
|
|
78
|
+
this.renderer.draw();
|
|
79
|
+
this.emit("afterUpdate", dt);
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
return this.#endFrame();
|
|
83
|
+
}
|
|
84
|
+
#beginFrame() {
|
|
51
85
|
this.input.update();
|
|
52
|
-
this.sceneManager.
|
|
86
|
+
this.sceneManager.beginFrame();
|
|
87
|
+
}
|
|
88
|
+
#endFrame() {
|
|
89
|
+
this.sceneManager.endFrame();
|
|
53
90
|
if (this.input.exited) {
|
|
54
91
|
this.renderer.clear();
|
|
55
92
|
return true;
|
|
56
93
|
}
|
|
57
94
|
return false;
|
|
58
95
|
}
|
|
59
|
-
render() {
|
|
60
|
-
this.renderer.draw();
|
|
61
|
-
}
|
|
62
96
|
}
|
|
63
97
|
//# 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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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type AssetTypeName = "unknown" | "
|
|
1
|
+
export type AssetTypeName = "unknown" | "model" | "font" | "tilemap" | (string & {});
|
|
2
2
|
export declare class Asset {
|
|
3
3
|
id: `${string}-${string}-${string}-${string}-${string}`;
|
|
4
4
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Base.d.ts","sourceRoot":"","sources":["../../../src/systems/asset/Base.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,aAAa,GACrB,SAAS,GACT,
|
|
1
|
+
{"version":3,"file":"Base.d.ts","sourceRoot":"","sources":["../../../src/systems/asset/Base.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,aAAa,GACrB,SAAS,GACT,OAAO,GACP,MAAM,GACN,SAAS,GACT,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB,qBAAa,KAAK;IAChB,EAAE,sDAAkC;IAEpC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,CAAC;gBAGlB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,aAAa;IAUtB,IAAI,QAAQ,WAEX;IAED,IAAI,OAAO,WAOV;IAED,QAAQ;IAIR,MAAM,CAAC,IAAI,CACT,WAAW,EAAE,KAAK,GAAG,MAAM,GAC1B,KAAK;CAOT;AAED,MAAM,WAAW,SAAS,CAAC,CAAC,GAAG,OAAO;IACpC,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,MAAM,CAAC,CAAC;CACd"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../src/systems/asset/Base.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../src/systems/asset/Base.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAS5C,MAAM,OAAO,KAAK;IAChB,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAEpC,IAAI,CAAS;IACb,GAAG,CAAS;IACZ,IAAI,CAAS;IACb,IAAI,CAAgB;IAEpB,YACE,IAAY,EACZ,IAAoB;QAEpB,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,SAAS,CAAC;IAChC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;IAC9B,CAAC;IAED,IAAI,OAAO;QACT,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE5C,OAAO,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC;YAC3B,EAAE,CAAC,CAAC;YACJ,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,IAAI,CACT,WAA2B;QAE3B,IAAI,WAAW,YAAY,KAAK,EAAE,CAAC;YACjC,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,OAAO,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;CACF"}
|
|
@@ -14,7 +14,7 @@ export declare class AssetManager {
|
|
|
14
14
|
autoload: boolean;
|
|
15
15
|
load<T = unknown>(assetOrPath: Asset | string): LazyAsset<T>;
|
|
16
16
|
lazyLoad<T = unknown>(): (assetOrPath: Asset | string) => LazyAsset<T>;
|
|
17
|
-
get<T>(
|
|
17
|
+
get<T>(path: string): T;
|
|
18
18
|
scheduleAutoload(context: AssetLoaderContext): this;
|
|
19
19
|
loadAssets(context: AssetLoaderContext, options?: LoadAssetsOptions): Promise<void>;
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../../src/systems/asset/Manager.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,EACL,KAAK,SAAS,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,aAAa,EACb,KAAK,kBAAkB,EACxB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,uBAAuB,GAAG,CACpC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,KACR,IAAI,CAAC;AAEV,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,qBAAa,YAAY;;IACvB,QAAQ,gBAAuB;IAC/B,OAAO,aAAoB;IAC3B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAa;IACzC,OAAO,EAAE,kBAAkB,CAA2C;IAEtE,QAAQ,UAAS;IAGjB,IAAI,CAAC,CAAC,GAAG,OAAO,EACd,WAAW,EAAE,KAAK,GAAG,MAAM,GAC1B,SAAS,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../../src/systems/asset/Manager.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,EACL,KAAK,SAAS,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,aAAa,EACb,KAAK,kBAAkB,EACxB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,uBAAuB,GAAG,CACpC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,KACR,IAAI,CAAC;AAEV,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,qBAAa,YAAY;;IACvB,QAAQ,gBAAuB;IAC/B,OAAO,aAAoB;IAC3B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAa;IACzC,OAAO,EAAE,kBAAkB,CAA2C;IAEtE,QAAQ,UAAS;IAGjB,IAAI,CAAC,CAAC,GAAG,OAAO,EACd,WAAW,EAAE,KAAK,GAAG,MAAM,GAC1B,SAAS,CAAC,CAAC,CAAC;IAmBf,QAAQ,CAAC,CAAC,GAAG,OAAO,KAAK,CAAC,WAAW,EAAE,KAAK,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC;IAItE,GAAG,CAAC,CAAC,EACH,IAAI,EAAE,MAAM,GACX,CAAC;IAQJ,gBAAgB,CACd,OAAO,EAAE,kBAAkB;IAkBvB,UAAU,CACd,OAAO,EAAE,kBAAkB,EAC3B,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC;CAuBjB"}
|
|
@@ -16,24 +16,27 @@ export class AssetManager {
|
|
|
16
16
|
if (asset.type === "unknown") {
|
|
17
17
|
asset.type = this.registry.getTypeForExt(asset.longExt);
|
|
18
18
|
}
|
|
19
|
-
|
|
20
|
-
this.
|
|
19
|
+
const path = asset.toString();
|
|
20
|
+
if (!this.assets.has(path)) {
|
|
21
|
+
this.waiting.enqueue(asset);
|
|
22
|
+
this.scheduleAutoload(this.context);
|
|
23
|
+
}
|
|
21
24
|
return {
|
|
22
25
|
asset,
|
|
23
|
-
get: () => this.get(
|
|
26
|
+
get: () => this.get(path)
|
|
24
27
|
};
|
|
25
28
|
}
|
|
26
29
|
lazyLoad() {
|
|
27
30
|
return (assetOrPath) => this.load(assetOrPath);
|
|
28
31
|
}
|
|
29
|
-
get(
|
|
30
|
-
if (this.assets.has(
|
|
31
|
-
return this.assets.get(
|
|
32
|
+
get(path) {
|
|
33
|
+
if (this.assets.has(path)) {
|
|
34
|
+
return this.assets.get(path);
|
|
32
35
|
}
|
|
33
|
-
throw new Error(`Asset
|
|
36
|
+
throw new Error(`Asset "${path}" is not yet loaded.`);
|
|
34
37
|
}
|
|
35
38
|
scheduleAutoload(context) {
|
|
36
|
-
if (
|
|
39
|
+
if (context) {
|
|
37
40
|
this.context = context;
|
|
38
41
|
}
|
|
39
42
|
if (this.autoload && !this.#hasAutoloadTimeout) {
|
|
@@ -59,7 +62,7 @@ export class AssetManager {
|
|
|
59
62
|
}
|
|
60
63
|
onStart?.(asset);
|
|
61
64
|
const result = await loader(asset, context);
|
|
62
|
-
this.assets.set(asset.
|
|
65
|
+
this.assets.set(asset.toString(), result);
|
|
63
66
|
};
|
|
64
67
|
const loadingPromises = assets.map((asset) => loadAsset(asset));
|
|
65
68
|
await Promise.all(loadingPromises);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../../src/systems/asset/Manager.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,+BAA+B;AAC/B,OAAO,EACL,KAAK,EAEN,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,aAAa,EAEd,MAAM,eAAe,CAAC;AAWvB,MAAM,OAAO,YAAY;IACvB,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;IAC/B,OAAO,GAAG,IAAI,UAAU,EAAE,CAAC;IAC3B,MAAM,GAAyB,IAAI,GAAG,EAAE,CAAC;IACzC,OAAO,GAAuB,EAAE,OAAO,EAAE,IAAI,KAAK,CAAC,cAAc,EAAE,EAAE,CAAC;IAEtE,QAAQ,GAAG,KAAK,CAAC;IACjB,mBAAmB,GAAG,KAAK,CAAC;IAE5B,IAAI,CACF,WAA2B;QAE3B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../../src/systems/asset/Manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../src/systems/asset/Queue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,qBAAa,UAAU;;
|
|
1
|
+
{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../src/systems/asset/Queue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,qBAAa,UAAU;;IAIrB,IAAI,IAAI,WAEP;IAED,OAAO,CACL,KAAK,EAAE,KAAK,GACX,OAAO;IAYV,UAAU,IAAI,KAAK,EAAE;CAOtB"}
|
|
@@ -2,15 +2,23 @@
|
|
|
2
2
|
import { Asset } from "./Base.js";
|
|
3
3
|
export class AssetQueue {
|
|
4
4
|
#assets = [];
|
|
5
|
+
#pendingPaths = new Set();
|
|
5
6
|
get size() {
|
|
6
7
|
return this.#assets.length;
|
|
7
8
|
}
|
|
8
9
|
enqueue(asset) {
|
|
10
|
+
const path = asset.toString();
|
|
11
|
+
if (this.#pendingPaths.has(path)) {
|
|
12
|
+
return false;
|
|
13
|
+
}
|
|
9
14
|
this.#assets.push(asset);
|
|
15
|
+
this.#pendingPaths.add(path);
|
|
16
|
+
return true;
|
|
10
17
|
}
|
|
11
18
|
dequeueAll() {
|
|
12
19
|
const assets = [...this.#assets];
|
|
13
20
|
this.#assets = [];
|
|
21
|
+
this.#pendingPaths.clear();
|
|
14
22
|
return assets;
|
|
15
23
|
}
|
|
16
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../../src/systems/asset/Queue.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,MAAM,OAAO,UAAU;IACrB,OAAO,GAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../../src/systems/asset/Queue.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,MAAM,OAAO,UAAU;IACrB,OAAO,GAAY,EAAE,CAAC;IACtB,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,OAAO,CACL,KAAY;QAEZ,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU;QACR,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAE3B,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
package/dist/systems/index.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { AssetManager, type AssetOnProgressCallback } from "./asset/Manager.ts";
|
|
|
2
2
|
export * from "./asset/Base.ts";
|
|
3
3
|
export type { AssetLoaderCallback, AssetLoaderContext, AssetLoaderOptions } from "./asset/Registry.ts";
|
|
4
4
|
export * from "./World.ts";
|
|
5
|
+
export * from "./Scene.ts";
|
|
5
6
|
export * from "./FixedTimeStep.ts";
|
|
6
7
|
export * from "./rendering/index.ts";
|
|
7
8
|
export * from "./SceneManager.ts";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/systems/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAE5B,cAAc,iBAAiB,CAAC;AAChC,YAAY,EACV,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAE7B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AAEtD,YAAY,EACV,uBAAuB,EACxB,CAAC;AAEF,eAAO,MAAM,MAAM,cAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/systems/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAE5B,cAAc,iBAAiB,CAAC;AAChC,YAAY,EACV,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAE7B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AAEtD,YAAY,EACV,uBAAuB,EACxB,CAAC;AAEF,eAAO,MAAM,MAAM,cAAqB,CAAC"}
|