@jolly-pixel/engine 2.1.0 → 2.3.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 +1 -0
- package/dist/actor/Actor.d.ts +2 -2
- package/dist/actor/Actor.d.ts.map +1 -1
- package/dist/actor/Actor.js.map +1 -1
- package/dist/actor/ActorComponent.d.ts +1 -5
- package/dist/actor/ActorComponent.d.ts.map +1 -1
- package/dist/actor/ActorComponent.js +1 -18
- package/dist/actor/ActorComponent.js.map +1 -1
- package/dist/actor/Signal.d.ts +0 -7
- package/dist/actor/Signal.d.ts.map +1 -1
- package/dist/actor/Signal.js +0 -25
- package/dist/actor/Signal.js.map +1 -1
- package/dist/actor/index.d.ts +1 -1
- package/dist/actor/index.d.ts.map +1 -1
- package/dist/actor/index.js +1 -1
- package/dist/actor/index.js.map +1 -1
- package/dist/audio/AudioLibrary.d.ts +4 -3
- package/dist/audio/AudioLibrary.d.ts.map +1 -1
- package/dist/audio/AudioLibrary.js +15 -3
- package/dist/audio/AudioLibrary.js.map +1 -1
- package/dist/audio/AudioManager.d.ts +5 -1
- package/dist/audio/AudioManager.d.ts.map +1 -1
- package/dist/audio/AudioManager.js +23 -1
- package/dist/audio/AudioManager.js.map +1 -1
- package/dist/components/renderers/model/ModelAnimation.d.ts +17 -8
- package/dist/components/renderers/model/ModelAnimation.d.ts.map +1 -1
- package/dist/components/renderers/model/ModelAnimation.js +97 -28
- package/dist/components/renderers/model/ModelAnimation.js.map +1 -1
- package/dist/components/renderers/model/ModelRenderer.d.ts +10 -8
- package/dist/components/renderers/model/ModelRenderer.d.ts.map +1 -1
- package/dist/components/renderers/model/ModelRenderer.js +17 -13
- package/dist/components/renderers/model/ModelRenderer.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.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 +32 -3
- package/dist/systems/SceneManager.d.ts.map +1 -1
- package/dist/systems/SceneManager.js +134 -1
- package/dist/systems/SceneManager.js.map +1 -1
- package/dist/systems/World.d.ts.map +1 -1
- package/dist/systems/World.js +1 -0
- 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/RenderStrategy.d.ts +2 -2
- package/dist/systems/rendering/RenderStrategy.d.ts.map +1 -1
- package/dist/systems/rendering/RenderStrategy.js +15 -2
- package/dist/systems/rendering/RenderStrategy.js.map +1 -1
- package/dist/systems/rendering/ThreeRenderer.d.ts.map +1 -1
- package/dist/systems/rendering/ThreeRenderer.js +27 -7
- package/dist/systems/rendering/ThreeRenderer.js.map +1 -1
- package/package.json +1 -1
|
@@ -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"}
|
package/dist/systems/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/systems/index.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EACL,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAE5B,cAAc,iBAAiB,CAAC;AAOhC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AAMtD,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/systems/index.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EACL,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAE5B,cAAc,iBAAiB,CAAC;AAOhC,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;AAMtD,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC"}
|
|
@@ -14,8 +14,8 @@ export declare class DirectRenderStrategy implements RenderStrategy {
|
|
|
14
14
|
}
|
|
15
15
|
export declare class ComposerRenderStrategy implements RenderStrategy {
|
|
16
16
|
#private;
|
|
17
|
-
constructor(composer: EffectComposer);
|
|
18
|
-
render(
|
|
17
|
+
constructor(renderer: THREE.WebGLRenderer, composer: EffectComposer);
|
|
18
|
+
render(scene: THREE.Scene, _renderComponents: RenderComponent[]): void;
|
|
19
19
|
resize(width: number, height: number): void;
|
|
20
20
|
addEffect(pass: Pass): void;
|
|
21
21
|
removeEffect(pass: Pass): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderStrategy.d.ts","sourceRoot":"","sources":["../../../src/systems/rendering/RenderStrategy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EACV,cAAc,EACd,IAAI,EACL,MAAM,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"RenderStrategy.d.ts","sourceRoot":"","sources":["../../../src/systems/rendering/RenderStrategy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EACV,cAAc,EACd,IAAI,EACL,MAAM,+CAA+C,CAAC;AAIvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IACtE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7C;AAED,qBAAa,oBAAqB,YAAW,cAAc;;gBAIvD,QAAQ,EAAE,KAAK,CAAC,aAAa;IAK/B,MAAM,CACJ,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,gBAAgB,EAAE,eAAe,EAAE,GAClC,IAAI;IAMP,MAAM,CACJ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,IAAI;CAGR;AAED,qBAAa,sBAAuB,YAAW,cAAc;;gBAKzD,QAAQ,EAAE,KAAK,CAAC,aAAa,EAC7B,QAAQ,EAAE,cAAc;IAM1B,MAAM,CACJ,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,iBAAiB,EAAE,eAAe,EAAE,GACnC,IAAI;IAWP,MAAM,CACJ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,IAAI;IAOP,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAI3B,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAI9B,WAAW,IAAI,cAAc;CAG9B"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// Import Third-party Dependencies
|
|
2
2
|
import * as THREE from "three";
|
|
3
|
+
import { RenderPass } from "three/addons/postprocessing/RenderPass.js";
|
|
3
4
|
export class DirectRenderStrategy {
|
|
4
5
|
#renderer;
|
|
5
6
|
constructor(renderer) {
|
|
@@ -15,14 +16,26 @@ export class DirectRenderStrategy {
|
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
export class ComposerRenderStrategy {
|
|
19
|
+
#renderer;
|
|
18
20
|
#composer;
|
|
19
|
-
constructor(composer) {
|
|
21
|
+
constructor(renderer, composer) {
|
|
22
|
+
this.#renderer = renderer;
|
|
20
23
|
this.#composer = composer;
|
|
21
24
|
}
|
|
22
|
-
render(
|
|
25
|
+
render(scene, _renderComponents) {
|
|
26
|
+
// Keep RenderPass scene references in sync with the active scene so that
|
|
27
|
+
// scene transitions work correctly in composer mode.
|
|
28
|
+
for (const pass of this.#composer.passes) {
|
|
29
|
+
if (pass instanceof RenderPass) {
|
|
30
|
+
pass.scene = scene;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
23
33
|
this.#composer.render();
|
|
24
34
|
}
|
|
25
35
|
resize(width, height) {
|
|
36
|
+
// Must resize the WebGLRenderer canvas first, otherwise the final pass
|
|
37
|
+
// renders into a (0, 0, 0, 0) WebGL viewport and nothing is drawn.
|
|
38
|
+
this.#renderer.setSize(width, height, false);
|
|
26
39
|
this.#composer.setSize(width, height);
|
|
27
40
|
}
|
|
28
41
|
addEffect(pass) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderStrategy.js","sourceRoot":"","sources":["../../../src/systems/rendering/RenderStrategy.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"RenderStrategy.js","sourceRoot":"","sources":["../../../src/systems/rendering/RenderStrategy.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAE,UAAU,EAAE,MAAM,2CAA2C,CAAC;AAYvE,MAAM,OAAO,oBAAoB;IAC/B,SAAS,CAAsB;IAE/B,YACE,QAA6B;QAE7B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAED,MAAM,CACJ,KAAkB,EAClB,gBAAmC;QAEnC,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE,CAAC;YAC/C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,MAAM,CACJ,KAAa,EACb,MAAc;QAEd,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,OAAO,sBAAsB;IACjC,SAAS,CAAsB;IAC/B,SAAS,CAAiB;IAE1B,YACE,QAA6B,EAC7B,QAAwB;QAExB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAED,MAAM,CACJ,KAAkB,EAClB,iBAAoC;QAEpC,yEAAyE;QACzE,qDAAqD;QACrD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACzC,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;gBAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACrB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IAC1B,CAAC;IAED,MAAM,CACJ,KAAa,EACb,MAAc;QAEd,uEAAuE;QACvE,mEAAmE;QACnE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,SAAS,CAAC,IAAU;QAClB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,YAAY,CAAC,IAAU;QACrB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF"}
|
|
@@ -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,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;
|
|
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;IAiBP,aAAa,CACX,IAAI,EAAE,UAAU,GACf,IAAI;IA6BP,UAAU,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI;IAwBpC,QAAQ,CACN,KAAK,GAAE,MAAM,GAAG,IAAW;IAa7B,aAAa;IAmCb,eAAe;IAOf,MAAM,aA0BJ;IAEF,IAAI;IAiBJ,MAAM,CACJ,QAAQ,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC;KAAE,KAAK,IAAI;IAK7D,KAAK;CAGN"}
|
|
@@ -41,8 +41,10 @@ export class ThreeRenderer extends EventEmitter {
|
|
|
41
41
|
}
|
|
42
42
|
if (this.renderStrategy instanceof ComposerRenderStrategy) {
|
|
43
43
|
const composer = this.renderStrategy.getComposer();
|
|
44
|
-
const renderPass = composer.passes.find((pass) => pass.camera === component);
|
|
45
|
-
|
|
44
|
+
const renderPass = composer.passes.find((pass) => pass instanceof RenderPass && pass.camera === component);
|
|
45
|
+
if (renderPass) {
|
|
46
|
+
this.renderStrategy.removeEffect(renderPass);
|
|
47
|
+
}
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
50
|
setRenderMode(mode) {
|
|
@@ -56,18 +58,31 @@ export class ThreeRenderer extends EventEmitter {
|
|
|
56
58
|
const renderPass = new RenderPass(scene, renderComponent);
|
|
57
59
|
composer.addPass(renderPass);
|
|
58
60
|
}
|
|
59
|
-
this.renderStrategy = new ComposerRenderStrategy(composer);
|
|
61
|
+
this.renderStrategy = new ComposerRenderStrategy(this.webGLRenderer, composer);
|
|
60
62
|
}
|
|
61
63
|
this.resize();
|
|
62
|
-
|
|
64
|
+
// Guard: skip clear when the framebuffer still has zero dimensions
|
|
65
|
+
// (e.g. at construction time before the first ResizeObserver callback).
|
|
66
|
+
if (this.#pendingResizeWidth > 0 && this.#pendingResizeHeight > 0) {
|
|
67
|
+
this.clear();
|
|
68
|
+
}
|
|
63
69
|
return this;
|
|
64
70
|
}
|
|
65
71
|
setEffects(...effects) {
|
|
66
|
-
if (this.renderStrategy instanceof ComposerRenderStrategy) {
|
|
67
|
-
|
|
68
|
-
|
|
72
|
+
if (!(this.renderStrategy instanceof ComposerRenderStrategy)) {
|
|
73
|
+
console.warn("ThreeRenderer.setEffects: called in direct render mode — effects are ignored. Call setRenderMode(\"composer\") first.");
|
|
74
|
+
return this;
|
|
75
|
+
}
|
|
76
|
+
// Remove all existing effect passes, keeping only RenderPasses.
|
|
77
|
+
const composer = this.renderStrategy.getComposer();
|
|
78
|
+
for (const pass of [...composer.passes]) {
|
|
79
|
+
if (!(pass instanceof RenderPass)) {
|
|
80
|
+
this.renderStrategy.removeEffect(pass);
|
|
69
81
|
}
|
|
70
82
|
}
|
|
83
|
+
for (const pass of effects) {
|
|
84
|
+
this.renderStrategy.addEffect(pass);
|
|
85
|
+
}
|
|
71
86
|
return this;
|
|
72
87
|
}
|
|
73
88
|
setRatio(ratio = null) {
|
|
@@ -143,6 +158,11 @@ export class ThreeRenderer extends EventEmitter {
|
|
|
143
158
|
};
|
|
144
159
|
draw() {
|
|
145
160
|
this.resize();
|
|
161
|
+
// Guard: skip draw when the framebuffer still has zero dimensions
|
|
162
|
+
// (e.g. before the first ResizeObserver callback fires).
|
|
163
|
+
if (this.#pendingResizeWidth === 0 || this.#pendingResizeHeight === 0) {
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
146
166
|
this.clear();
|
|
147
167
|
this.renderStrategy.render(this.sceneManager.getSource(), this.renderComponents);
|
|
148
168
|
this.emit("draw", { source: this.webGLRenderer });
|
|
@@ -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;AAUpD,OAAO,EAGL,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAc7B,MAAM,OAAO,aAEX,SAAQ,YAAiC;IACzC,aAAa,CAAsB;IACnC,gBAAgB,GAAsB,EAAE,CAAC;IACzC,cAAc,CAAiB;IAC/B,KAAK,GAAkB,IAAI,CAAC;IAC5B,YAAY,CAAyB;IAErC,eAAe,GAA0B,IAAI,CAAC;IAC9C,mBAAmB,GAAG,CAAC,CAAC;IACxB,oBAAoB,GAAG,CAAC,CAAC;IACzB,YAAY,GAAG,IAAI,CAAC;IAEpB,YACE,MAAyB,EACzB,OAAuC;QAEvC,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,YAAY,EAAE,UAAU,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;QAExD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;IACvC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,kBAAkB,CAChB,SAA0B;QAE1B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,IAAI,CAAC,cAAc,YAAY,sBAAsB,EAAE,CAAC;YAC1D,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,qBAAqB,CACnB,SAA0B;QAE1B,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,YAAY,sBAAsB,EAAE,CAAC;YAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;YACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CACrC,CAAC,IAAI,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"ThreeRenderer.js","sourceRoot":"","sources":["../../../src/systems/rendering/ThreeRenderer.ts"],"names":[],"mappings":"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"}
|