Skip to content

Commit 66a31ae

Browse files
lafflanMugen87
andauthored
CSS2DObject and CSS3DObject visibility needs to consider whether ancestors are visible (#28293)
* CSS2DObject and CSS3DObject visibility needs to consider whether ancestors are visible * Update CSS2DRenderer.js Clean up. * Update CSS3DRenderer.js Clean up. * Update CSS3DRenderer.js More clean up. * Optimize CSS renderers code * Update CSS2DRenderer.js Clean up. * Update CSS3DRenderer.js Clean up. * Update CSS2DRenderer.js Simplify code. * Update CSS3DRenderer.js Simplify code. --------- Co-authored-by: Michael Herzog <michael.herzog@human-interactive.org>
1 parent b8c4dce commit 66a31ae

File tree

2 files changed

+35
-4
lines changed

2 files changed

+35
-4
lines changed

examples/jsm/renderers/CSS2DRenderer.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ class CSS2DRenderer {
9696
_viewMatrix.copy( camera.matrixWorldInverse );
9797
_viewProjectionMatrix.multiplyMatrices( camera.projectionMatrix, _viewMatrix );
9898

99+
hideObject( scene );
99100
renderObject( scene, scene, camera );
100101
zOrder( scene );
101102

@@ -114,22 +115,36 @@ class CSS2DRenderer {
114115

115116
};
116117

118+
function hideObject( object ) {
119+
120+
if ( object.isCSS2DObject ) object.element.style.display = 'none';
121+
122+
for ( let i = 0, l = object.children.length; i < l; i ++ ) {
123+
124+
hideObject( object.children[ i ] );
125+
126+
}
127+
}
128+
117129
function renderObject( object, scene, camera ) {
118130

131+
if ( object.visible === false ) return;
132+
119133
if ( object.isCSS2DObject ) {
120134

121135
_vector.setFromMatrixPosition( object.matrixWorld );
122136
_vector.applyMatrix4( _viewProjectionMatrix );
123137

124-
const visible = ( object.visible === true ) && ( _vector.z >= - 1 && _vector.z <= 1 ) && ( object.layers.test( camera.layers ) === true );
125-
object.element.style.display = ( visible === true ) ? '' : 'none';
138+
const visible = ( _vector.z >= - 1 && _vector.z <= 1 ) && ( object.layers.test( camera.layers ) === true );
126139

127140
if ( visible === true ) {
128141

129142
object.onBeforeRender( _this, scene, camera );
130143

131144
const element = object.element;
132145

146+
element.style.display = '';
147+
133148
element.style.transform = 'translate(' + ( - 100 * object.center.x ) + '%,' + ( - 100 * object.center.y ) + '%)' + 'translate(' + ( _vector.x * _widthHalf + _widthHalf ) + 'px,' + ( - _vector.y * _heightHalf + _heightHalf ) + 'px)';
134149

135150
if ( element.parentNode !== domElement ) {

examples/jsm/renderers/CSS3DRenderer.js

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ class CSS3DRenderer {
172172

173173
}
174174

175+
hideObject( scene );
175176
renderObject( scene, scene, camera, cameraCSSMatrix );
176177

177178
};
@@ -251,12 +252,25 @@ class CSS3DRenderer {
251252

252253
}
253254

255+
function hideObject( object ) {
256+
257+
if ( object.isCSS3DObject ) object.element.style.display = 'none';
258+
259+
for ( let i = 0, l = object.children.length; i < l; i ++ ) {
260+
261+
hideObject( object.children[ i ] );
262+
263+
}
264+
265+
}
266+
254267
function renderObject( object, scene, camera, cameraCSSMatrix ) {
255268

269+
if ( object.visible === false ) return;
270+
256271
if ( object.isCSS3DObject ) {
257272

258-
const visible = ( object.visible === true ) && ( object.layers.test( camera.layers ) === true );
259-
object.element.style.display = ( visible === true ) ? '' : 'none';
273+
const visible = ( object.layers.test( camera.layers ) === true );
260274

261275
if ( visible === true ) {
262276

@@ -293,6 +307,8 @@ class CSS3DRenderer {
293307
const element = object.element;
294308
const cachedObject = cache.objects.get( object );
295309

310+
element.style.display = '';
311+
296312
if ( cachedObject === undefined || cachedObject.style !== style ) {
297313

298314
element.style.transform = style;

0 commit comments

Comments
 (0)