Skip to content

CSS3DRenderer: Use WeakMap for styles cache. #13867

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

Merged
merged 2 commits into from
Apr 17, 2018
Merged

CSS3DRenderer: Use WeakMap for styles cache. #13867

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b8030f
fix memory leaks
yomotsu Apr 15, 2018
00bf233
use WeakMap
yomotsu Apr 15, 2018
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
40 changes: 27 additions & 13 deletions examples/js/renderers/CSS3DRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ THREE.CSS3DRenderer = function () {

var cache = {
camera: { fov: 0, style: '' },
objects: {}
objects: new WeakMap()
};

var domElement = document.createElement( 'div' );
Expand Down Expand Up @@ -184,21 +184,23 @@ THREE.CSS3DRenderer = function () {
}

var element = object.element;
var cachedStyle = cache.objects[ object.id ] && cache.objects[ object.id ].style;
var cachedStyle = cache.objects.get( object );

if ( cachedStyle === undefined || cachedStyle !== style ) {

element.style.WebkitTransform = style;
element.style.transform = style;

cache.objects[ object.id ] = { style: style };
var objectData = { style: style };

if ( isIE ) {

cache.objects[ object.id ].distanceToCameraSquared = getDistanceToSquared( camera, object );
objectData.distanceToCameraSquared = getDistanceToSquared( camera, object );

}

cache.objects.set( object, objectData );

}

if ( element.parentNode !== cameraElement ) {
Expand Down Expand Up @@ -233,27 +235,39 @@ THREE.CSS3DRenderer = function () {

}();

function zOrder( scene ) {
function filterAndFlatten( scene ) {

var order = Object.keys( cache.objects ).sort( function ( a, b ) {
Copy link
Contributor Author

@yomotsu yomotsu Apr 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only for IE11 (to sort by Z).
Cached Object.keys will not work anymore, since it cached in a WeakMap. To make an array, I added a function called filterAndFlatten

var result = [];

scene.traverse( function ( object ) {

return cache.objects[ a ].distanceToCameraSquared - cache.objects[ b ].distanceToCameraSquared;
if ( object instanceof THREE.CSS3DObject ) result.push( object );

} );
var zMax = order.length;

scene.traverse( function ( object ) {
return result;

}

var index = order.indexOf( object.id + '' );
function zOrder( scene ) {

if ( index !== - 1 ) {
var sorted = filterAndFlatten( scene ).sort( function ( a, b ) {

object.element.style.zIndex = zMax - index;
var distanceA = cache.objects.get( a ).distanceToCameraSquared;
var distanceB = cache.objects.get( b ).distanceToCameraSquared;

}
return distanceA - distanceB;

} );

var zMax = sorted.length;

for ( var i = 0, l = sorted.length; i < l; i ++ ) {

sorted[ i ].element.style.zIndex = zMax - i;

}

}

this.render = function ( scene, camera ) {
Expand Down