Skip to content

Commit e4db75a

Browse files
authored
RendererNodes: Add .isToneMappingState (mrdoob#26463)
* Renderer: Added .getRenderTarget() * Nodes: Add .isToneMappingState * Revert Add getRenderTarget()
1 parent ebbaecf commit e4db75a

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

examples/jsm/renderers/common/Renderer.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,12 @@ class Renderer {
600600

601601
}
602602

603+
getRenderTarget() {
604+
605+
return this._renderTarget;
606+
607+
}
608+
603609
async compute( computeNodes ) {
604610

605611
if ( this._initialized === false ) await this.init();
@@ -650,12 +656,6 @@ class Renderer {
650656

651657
}
652658

653-
getRenderTarget() {
654-
655-
return this._renderTarget;
656-
657-
}
658-
659659
hasFeature( name ) {
660660

661661
return this.backend.hasFeature( name );

examples/jsm/renderers/common/nodes/Nodes.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ class Nodes extends DataMap {
7777

7878
getToneMappingNode() {
7979

80+
if ( this.isToneMappingState === false ) return null;
81+
8082
return this.renderer.toneMappingNode || this.get( this.renderer ).toneMappingNode || null;
8183

8284
}
@@ -107,13 +109,22 @@ class Nodes extends DataMap {
107109

108110
}
109111

112+
get isToneMappingState() {
113+
114+
const renderer = this.renderer;
115+
const renderTarget = renderer.getRenderTarget();
116+
117+
return renderTarget && renderTarget.isCubeRenderTarget ? false : true;
118+
119+
}
120+
110121
updateToneMapping() {
111122

112123
const renderer = this.renderer;
113124
const rendererData = this.get( renderer );
114125
const rendererToneMapping = renderer.toneMapping;
115126

116-
if ( rendererToneMapping !== NoToneMapping ) {
127+
if ( this.isToneMappingState && rendererToneMapping !== NoToneMapping ) {
117128

118129
if ( rendererData.toneMapping !== rendererToneMapping ) {
119130

0 commit comments

Comments
 (0)