CSS2D/3DRenderer: Make the code more reasonable. (#28393)

mrdoob · May 16, 2024 · de367cb · de367cb
1 parent a12adba
commit de367cb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/examples/jsm/renderers/CSS2DRenderer.js b/examples/jsm/renderers/CSS2DRenderer.js
@@ -96,7 +96,6 @@ class CSS2DRenderer {
 			_viewMatrix.copy( camera.matrixWorldInverse );
 			_viewProjectionMatrix.multiplyMatrices( camera.projectionMatrix, _viewMatrix );
 
-			hideObject( scene );
 			renderObject( scene, scene, camera );
 			zOrder( scene );
 
@@ -129,23 +128,28 @@ class CSS2DRenderer {
 
 		function renderObject( object, scene, camera ) {
 
-			if ( object.visible === false ) return;
+			if ( object.visible === false ) {
 
+				hideObject( object );
+
+				return;
+
+			}
+
 			if ( object.isCSS2DObject ) {
 
 				_vector.setFromMatrixPosition( object.matrixWorld );
 				_vector.applyMatrix4( _viewProjectionMatrix );
 
 				const visible = ( _vector.z >= - 1 && _vector.z <= 1 ) && ( object.layers.test( camera.layers ) === true );
 
+				const element = object.element;
+				element.style.display = visible === true ? '' : 'none';
+
 				if ( visible === true ) {
 
 					object.onBeforeRender( _this, scene, camera );
 
-					const element = object.element;
-
-					element.style.display = '';
-
 					element.style.transform = 'translate(' + ( - 100 * object.center.x ) + '%,' + ( - 100 * object.center.y ) + '%)' + 'translate(' + ( _vector.x * _widthHalf + _widthHalf ) + 'px,' + ( - _vector.y * _heightHalf + _heightHalf ) + 'px)';
 
 					if ( element.parentNode !== domElement ) {

diff --git a/examples/jsm/renderers/CSS3DRenderer.js b/examples/jsm/renderers/CSS3DRenderer.js
@@ -172,7 +172,6 @@ class CSS3DRenderer {
 
 			}
 
-			hideObject( scene );
 			renderObject( scene, scene, camera, cameraCSSMatrix );
 
 		};
@@ -266,12 +265,21 @@ class CSS3DRenderer {
 
 		function renderObject( object, scene, camera, cameraCSSMatrix ) {
 
-			if ( object.visible === false ) return;
+			if ( object.visible === false ) {
+
+				hideObject( object );
+
+				return;
+
+			}
 
 			if ( object.isCSS3DObject ) {
 
 				const visible = ( object.layers.test( camera.layers ) === true );
 
+				const element = object.element;
+				element.style.display = visible === true ? '' : 'none';
+
 				if ( visible === true ) {
 
 					object.onBeforeRender( _this, scene, camera );
@@ -304,11 +312,8 @@ class CSS3DRenderer {
 
 					}
 
-					const element = object.element;
 					const cachedObject = cache.objects.get( object );
 
-					element.style.display = '';
-
 					if ( cachedObject === undefined || cachedObject.style !== style ) {
 
 						element.style.transform = style;