Skip to content

RendererNodes: Add .isToneMappingState #26463

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 5 commits into from
Jul 20, 2023
Merged

RendererNodes: Add .isToneMappingState #26463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb90521
Renderer: Added .getRenderTarget()
sunag Jul 19, 2023
d91ffa8
Nodes: Add .isToneMappingState
sunag Jul 19, 2023
b9a4d9e
Merge branch 'dev' into dev-tonemappingstate
sunag Jul 19, 2023
280654a
Revert Add getRenderTarget()
sunag Jul 19, 2023
621bcb7
Merge branch 'dev' into dev-tonemappingstate
sunag Jul 19, 2023
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
12 changes: 6 additions & 6 deletions examples/jsm/renderers/common/Renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,12 @@ class Renderer {

}

getRenderTarget() {

return this._renderTarget;

}

async compute( computeNodes ) {

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

}

getRenderTarget() {

return this._renderTarget;

}

hasFeature( name ) {

return this.backend.hasFeature( name );
Expand Down
13 changes: 12 additions & 1 deletion examples/jsm/renderers/common/nodes/Nodes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ class Nodes extends DataMap {

getToneMappingNode() {

if ( this.isToneMappingState === false ) return null;

return this.renderer.toneMappingNode || this.get( this.renderer ).toneMappingNode || null;

}
Expand Down Expand Up @@ -107,13 +109,22 @@ class Nodes extends DataMap {

}

get isToneMappingState() {
Copy link
Contributor

@LeviPesin LeviPesin Aug 31, 2023

Choose a reason for hiding this comment

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

Maybe applyToneMapping?


const renderer = this.renderer;
const renderTarget = renderer.getRenderTarget();

return renderTarget && renderTarget.isCubeRenderTarget ? false : true;
Copy link
Contributor

@LeviPesin LeviPesin Aug 31, 2023

Choose a reason for hiding this comment

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

Just ! renderTarget || ! renderTarget.isCubeRenderTarget maybe?


}

updateToneMapping() {

const renderer = this.renderer;
const rendererData = this.get( renderer );
const rendererToneMapping = renderer.toneMapping;

if ( rendererToneMapping !== NoToneMapping ) {
if ( this.isToneMappingState && rendererToneMapping !== NoToneMapping ) {

if ( rendererData.toneMapping !== rendererToneMapping ) {

Expand Down