add tone mapping #15558
Merged
add tone mapping #15558
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # cocos/rendering/pipeline-scene-data.ts
# Conflicts: # native/cocos/renderer/pipeline/PipelineSceneData.cpp
Interface Check Report! WARNING this pull request has changed these public interfaces:
@@ -12622,8 +12622,21 @@
updateBoundingBox(): void;
hasFrameBuffer(framebuffer: gfx.Framebuffer): boolean;
isRGBE(): boolean;
}
+ export const ToneMappingType: {
+ DEFAULT: number;
+ LINEAR: number;
+ };
+ export class ToneMapping {
+ protected _toneMappingType: number;
+ protected _activated: boolean;
+ set toneMappingType(val: number);
+ get toneMappingType(): number;
+ initialize(toneMappingInfo: ToneMappingInfo): void;
+ activate(): void;
+ protected _updatePipeline(): void;
+ }
}
export enum RenderQueue {
OPAQUE = 0,
TRANSPARENT = 1,
@@ -23260,8 +23273,9 @@
shadows: renderer.scene.Shadows;
csmLayers: __private._cocos_rendering_shadow_csm_layers__CSMLayers;
octree: renderer.scene.Octree;
skin: renderer.scene.Skin;
+ toneMapping: renderer.scene.ToneMapping;
lightProbes: any;
/**
* @en The list for valid punctual Lights, only available after the scene culling of the current frame.
* @zh 场景中精确的有效光源，仅在当前帧的场景剔除完成后有效。
@@ -26184,8 +26198,19 @@
* @param resource The skin configuration object in the render scene
*/
activate(resource: renderer.scene.Skin): void;
}
+ export class ToneMappingInfo {
+ /**
+ * @zh 色调映射类型
+ * @en Tone mapping type
+ */
+ set toneMappingType(val: number);
+ get toneMappingType(): number;
+ protected _toneMappingType: number;
+ protected _resource: renderer.scene.ToneMapping | null;
+ activate(resource: renderer.scene.ToneMapping): void;
+ }
export interface ILightProbeNode {
node: Node;
probes: math.Vec3[] | null;
}
@@ -26315,8 +26340,13 @@
* @zh 光照探针相关配置
*/
lightProbeInfo: LightProbeInfo;
/**
+ * @en Tone mapping related configuration
+ * @zh 色调映射相关配置
+ */
+ toneMapping: ToneMappingInfo;
+ /**
* @en bake with stationary main light
* @zh 主光源是否以静止状态烘培
*/
bakedWithStationaryMainLight: boolean;
|
|
@cocos-robot run test cases |
# Conflicts: # editor/i18n/en/localization.js # editor/inspector/contributions/node.js
|
|
|
@xubing0906, Please check the result of
Task Details
|
jk20012001
reviewed
Jul 25, 2023
| @@ -0,0 +1,37 @@ | |||
| import { Enum, cclegacy } from '../../core'; | |||
jk20012001
approved these changes
Jul 25, 2023
|
@xubing0906, Please check the result of
Task Details
|
|
@xubing0906, Please check the result of
Task Details
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re: https://github.com/cocos/3d-tasks/issues/14336
Changelog
Continuous Integration
This pull request:
Compatibility Check
This pull request: