Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PostProcessing: Allow usage with more than one instance. #1498

Merged
merged 5 commits into from
Jan 19, 2025
Merged

PostProcessing: Allow usage with more than one instance. #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ee703a
PostProcessing: Allow usage with more than one instance.
Methuselah96 Jan 19, 2025
bf8ce62
Update three.js
Methuselah96 Jan 19, 2025
af49d95
Add src
Methuselah96 Jan 19, 2025
75686a2
Update patch and delete src
Methuselah96 Jan 19, 2025
b905bc2
Update declarations
Methuselah96 Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions src-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4182,7 +4182,7 @@ index e9f6f2e0..dd7ea2d4 100644
}
}
diff --git a/src-testing/src/renderers/common/ChainMap.ts b/src-testing/src/renderers/common/ChainMap.ts
index 24789e1e..224e5456 100644
index b913d6b6..d4d3d9be 100644
--- a/src-testing/src/renderers/common/ChainMap.ts
+++ b/src-testing/src/renderers/common/ChainMap.ts
@@ -1,3 +1,5 @@
Expand All @@ -4191,18 +4191,17 @@ index 24789e1e..224e5456 100644
/**
* Data structure for the renderer. It allows defining values
* with chained, hierarchical keys. Keys are meant to be
@@ -6,7 +8,9 @@
@@ -6,7 +8,8 @@
*
* @private
*/
-export default class ChainMap {
+export default class ChainMap<K extends readonly object[], V> {
-class ChainMap {
+class ChainMap<K extends readonly object[], V> {
+ weakMap: RecursiveWeakMap<K, V>;
+
/**
* Constructs a new chained map.
* Constructs a new Chain Map.
*/
@@ -16,7 +20,7 @@ export default class ChainMap {
@@ -16,7 +19,7 @@ class ChainMap {
*
* @type {WeakMap}
*/
Expand All @@ -4211,7 +4210,7 @@ index 24789e1e..224e5456 100644
}

/**
@@ -25,16 +29,16 @@ export default class ChainMap {
@@ -25,16 +28,16 @@ class ChainMap {
* @param {Array<Object>} keys - List of keys.
* @return {Any} The value. Returns `undefined` if no value was found.
*/
Expand All @@ -4232,9 +4231,9 @@ index 24789e1e..224e5456 100644
}

/**
@@ -44,18 +48,18 @@ export default class ChainMap {
@@ -44,18 +47,18 @@ class ChainMap {
* @param {Any} value - The value to set.
* @return {ChainMap} A reference to this chain map.
* @return {ChainMap} A reference to this Chain Map.
*/
- set(keys, value) {
- let map = this.weakMap;
Expand All @@ -4256,7 +4255,7 @@ index 24789e1e..224e5456 100644

return this;
}
@@ -66,11 +70,11 @@ export default class ChainMap {
@@ -66,11 +69,11 @@ class ChainMap {
* @param {Array<Object>} keys - The keys.
* @return {Boolean} Returns `true` if the value has been removed successfully and `false` if the value has not be found.
*/
Expand Down Expand Up @@ -5726,7 +5725,7 @@ index d12ad583..ef6e14ec 100644
}

diff --git a/src-testing/src/renderers/common/RenderObject.ts b/src-testing/src/renderers/common/RenderObject.ts
index 7284e730..4e9dbde0 100644
index 67024b0f..4884039e 100644
--- a/src-testing/src/renderers/common/RenderObject.ts
+++ b/src-testing/src/renderers/common/RenderObject.ts
@@ -1,8 +1,27 @@
Expand Down Expand Up @@ -5758,10 +5757,10 @@ index 7284e730..4e9dbde0 100644
const keys = Object.keys(obj);

let proto = Object.getPrototypeOf(obj);
@@ -45,6 +64,48 @@ function getKeys(obj) {
@@ -45,6 +64,47 @@ function getKeys(obj) {
* @private
*/
export default class RenderObject {
class RenderObject {
+ _nodes: Nodes;
+ _geometries: Geometries;
+
Expand Down Expand Up @@ -5803,11 +5802,10 @@ index 7284e730..4e9dbde0 100644
+ readonly isRenderObject: true;
+
+ onMaterialDispose: () => void;
+
/**
* Constructs a new render object.
*
@@ -60,16 +121,16 @@ export default class RenderObject {
@@ -60,16 +120,16 @@ class RenderObject {
* @param {ClippingContext} clippingContext - The clipping context.
*/
constructor(
Expand All @@ -5834,7 +5832,7 @@ index 7284e730..4e9dbde0 100644
) {
this.id = _id++;

@@ -295,7 +356,7 @@ export default class RenderObject {
@@ -295,7 +355,7 @@ class RenderObject {
*
* @param {ClippingContext} context - The clipping context to set.
*/
Expand All @@ -5843,7 +5841,7 @@ index 7284e730..4e9dbde0 100644
this.clippingContext = context;
}

@@ -309,7 +370,7 @@ export default class RenderObject {
@@ -309,7 +369,7 @@ class RenderObject {
if (this.clippingContext === null || this.clippingContext.cacheKey === this.clippingContextCacheKey)
return false;

Expand All @@ -5852,7 +5850,7 @@ index 7284e730..4e9dbde0 100644

return true;
}
@@ -375,7 +436,7 @@ export default class RenderObject {
@@ -375,7 +435,7 @@ class RenderObject {
* @return {Array<Object>} An array with object references.
*/
getChainArray() {
Expand All @@ -5861,7 +5859,7 @@ index 7284e730..4e9dbde0 100644
}

/**
@@ -384,7 +445,7 @@ export default class RenderObject {
@@ -384,7 +444,7 @@ class RenderObject {
*
* @param {BufferGeometry} geometry - The geometry to set.
*/
Expand All @@ -5870,7 +5868,7 @@ index 7284e730..4e9dbde0 100644
this.geometry = geometry;
this.attributes = null;
}
@@ -401,8 +462,8 @@ export default class RenderObject {
@@ -401,8 +461,8 @@ class RenderObject {
const nodeAttributes = this.getNodeBuilderState().nodeAttributes;
const geometry = this.geometry;

Expand All @@ -5881,14 +5879,15 @@ index 7284e730..4e9dbde0 100644

for (const nodeAttribute of nodeAttributes) {
const attribute =
@@ -681,6 +742,6 @@ export default class RenderObject {
@@ -681,7 +741,7 @@ class RenderObject {
dispose() {
this.material.removeEventListener('dispose', this.onMaterialDispose);

- this.onDispose();
+ this.onDispose!();
}
}

diff --git a/src-testing/src/renderers/common/RenderObjects.ts b/src-testing/src/renderers/common/RenderObjects.ts
index d9a10284..2f536d3f 100644
--- a/src-testing/src/renderers/common/RenderObjects.ts
Expand Down Expand Up @@ -7755,7 +7754,7 @@ index dba46fd8..69a96404 100644

/**
diff --git a/src-testing/src/renderers/common/UniformsGroup.ts b/src-testing/src/renderers/common/UniformsGroup.ts
index bbc6dc77..186ab14f 100644
index 59ab7f3c..3493d8d4 100644
--- a/src-testing/src/renderers/common/UniformsGroup.ts
+++ b/src-testing/src/renderers/common/UniformsGroup.ts
@@ -1,5 +1,15 @@
Expand Down Expand Up @@ -7916,7 +7915,7 @@ index bbc6dc77..186ab14f 100644
if (type === 'int' || type === 'ivec2' || type === 'ivec3' || type === 'ivec4')
return new Int32Array(this.buffer.buffer);
if (type === 'uint' || type === 'uvec2' || type === 'uvec3' || type === 'uvec4')
@@ -401,7 +417,7 @@ class UniformsGroup extends UniformBuffer {
@@ -402,7 +418,7 @@ class UniformsGroup extends UniformBuffer {
* @param {TypedArray} b - The second array.
* @param {Number} offset - An index offset for the first array.
*/
Expand All @@ -7925,7 +7924,7 @@ index bbc6dc77..186ab14f 100644
for (let i = 0, l = b.length; i < l; i++) {
a[offset + i] = b[i];
}
@@ -415,7 +431,7 @@ function setArray(a, b, offset) {
@@ -417,7 +433,7 @@ function setArray(a, b, offset) {
* @param {Number} offset - An index offset for the first array.
* @return {Boolean} Whether the given arrays are equal or not.
*/
Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 8 files
+4 −4 src/nodes/accessors/MaterialNode.js
+6 −6 src/nodes/display/BumpMapNode.js
+6 −6 src/nodes/display/NormalMapNode.js
+6 −4 src/renderers/common/ChainMap.js
+24 −8 src/renderers/common/PostProcessing.js
+3 −1 src/renderers/common/RenderObject.js
+2 −0 src/renderers/common/UniformsGroup.js
+8 −1 utils/docs/jsdoc.config.json
10 changes: 5 additions & 5 deletions types/three/src/renderers/common/ChainMap.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ type RecursiveWeakMap<K extends readonly object[], V> = WeakMap<K[number], V | R
* Data structure for the renderer. It allows defining values
* with chained, hierarchical keys. Keys are meant to be
* objects since the module internally works with Weak Maps
* for perforamnce reasons.
* for performance reasons.
*
* @private
*/
export default class ChainMap<K extends readonly object[], V> {
declare class ChainMap<K extends readonly object[], V> {
weakMap: RecursiveWeakMap<K, V>;
/**
* Constructs a new chained map.
* Constructs a new Chain Map.
*/
constructor();
/**
Expand All @@ -25,7 +25,7 @@ export default class ChainMap<K extends readonly object[], V> {
*
* @param {Array<Object>} keys - List of keys.
* @param {Any} value - The value to set.
* @return {ChainMap} A reference to this chain map.
* @return {ChainMap} A reference to this Chain Map.
*/
set(keys: K, value: V): this;
/**
Expand All @@ -36,4 +36,4 @@ export default class ChainMap<K extends readonly object[], V> {
*/
delete(keys: K): boolean;
}
export {};
export default ChainMap;
2 changes: 1 addition & 1 deletion types/three/src/renderers/common/PostProcessing.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ declare class PostProcessing {

render(): void;

update(): void;
dispose(): void;

renderAsync(): Promise<void>;
}
Expand Down
3 changes: 2 additions & 1 deletion types/three/src/renderers/common/RenderObject.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import RenderPipeline from "./RenderPipeline.js";
*
* @private
*/
export default class RenderObject {
declare class RenderObject {
_nodes: Nodes;
_geometries: Geometries;
id: number;
Expand Down Expand Up @@ -248,3 +248,4 @@ export default class RenderObject {
*/
dispose(): void;
}
export default RenderObject;
Loading