Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions src/renderers/common/Geometries.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@ class Geometries extends DataMap {
*/
this.attributeCall = new WeakMap();

/**
* Stores the event listeners attached to geometries.
*
* @private
* @type {Map<BufferGeometry,Function>}
*/
this._geometryDisposeListeners = new Map();

}

/**
Expand Down Expand Up @@ -189,10 +197,16 @@ class Geometries extends DataMap {

geometry.removeEventListener( 'dispose', onDispose );

this._geometryDisposeListeners.delete( geometry );

};

geometry.addEventListener( 'dispose', onDispose );

// see #31798 why tracking separate remove listeners is required right now
// TODO: Re-evaluate how onDispose() is managed in this component
this._geometryDisposeListeners.set( geometry, onDispose );

}

/**
Expand Down Expand Up @@ -339,6 +353,18 @@ class Geometries extends DataMap {

}

dispose() {

for ( const [ geometry, onDispose ] of this._geometryDisposeListeners.entries() ) {

geometry.removeEventListener( 'dispose', onDispose );

}

this._geometryDisposeListeners.clear();

}

}

export default Geometries;
1 change: 1 addition & 0 deletions src/renderers/common/Renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2194,6 +2194,7 @@ class Renderer {

this._animation.dispose();
this._objects.dispose();
this._geometries.dispose();
this._pipelines.dispose();
this._nodes.dispose();
this._bindings.dispose();
Expand Down
Loading