Skip to content
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.

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

add help for reflection probe and rename Fxaa #15790

Merged
merged 3 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion cocos/3d/reflection-probe/reflection-probe-component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import { ccclass, executeInEditMode, menu, playOnFocus, serializable, tooltip, type, visible } from 'cc.decorator';
import { ccclass, executeInEditMode, help, menu, playOnFocus, serializable, tooltip, type, visible } from 'cc.decorator';
import { EDITOR, EDITOR_NOT_IN_PREVIEW } from 'internal:constants';
import { CCBoolean, CCObject, Color, Enum, Vec3 } from '../../core';

Expand Down Expand Up @@ -62,6 +62,7 @@
@menu('Rendering/ReflectionProbe')
@executeInEditMode
@playOnFocus
@help('i18n:cc.ReflectionProbe')
export class ReflectionProbe extends Component {
protected static readonly DEFAULT_CUBE_SIZE: Readonly<Vec3> = new Vec3(1, 1, 1);
protected static readonly DEFAULT_PLANER_SIZE: Readonly<Vec3> = new Vec3(5, 0.5, 5);
Expand Down Expand Up @@ -151,7 +152,7 @@
this._objFlags ^= CCObject.Flags.IsRotationLocked;
}
if (!this._sourceCamera) {
console.warn('the reflection camera is invalid, please set the reflection camera');

Check failure on line 155 in cocos/3d/reflection-probe/reflection-probe-component.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

Unexpected console statement
} else {
this.probe.switchProbeType(value, this._sourceCamera.camera);
}
Expand All @@ -171,7 +172,7 @@
* @en set render texture size
* @zh 设置渲染纹理大小
*/
@visible(function (this: ReflectionProbe) { return this.probeType === ProbeType.CUBE; })

Check warning on line 175 in cocos/3d/reflection-probe/reflection-probe-component.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

Unexpected unnamed function
@type(Enum(ProbeResolution))
set resolution (value: number) {
this._resolution = value;
Expand Down Expand Up @@ -199,7 +200,7 @@
* @en Clearing color of the camera.
* @zh 相机的颜色缓冲默认值。
*/
@visible(function (this: ReflectionProbe) { return this._clearFlag === ProbeClearFlag.SOLID_COLOR; })

Check warning on line 203 in cocos/3d/reflection-probe/reflection-probe-component.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

Unexpected unnamed function
@type(Color)
set backgroundColor (val: Color) {
this._backgroundColor = val;
Expand Down Expand Up @@ -227,7 +228,7 @@
* @en The camera to render planar reflections, specified by the user
* @zh 需要渲染平面反射的相机,由用户指定
*/
@visible(function (this: ReflectionProbe) { return this.probeType === ProbeType.PLANAR; })

Check warning on line 231 in cocos/3d/reflection-probe/reflection-probe-component.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

Unexpected unnamed function
@type(Camera)
set sourceCamera (camera: Camera) {
this._sourceCamera = camera;
Expand All @@ -248,7 +249,7 @@
* @en fast bake no convolution.
* @zh 快速烘焙不会进行卷积。
*/
@visible(function (this: ReflectionProbe) { return this.probeType === ProbeType.CUBE; })

Check warning on line 252 in cocos/3d/reflection-probe/reflection-probe-component.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

Unexpected unnamed function
@type(CCBoolean)
@tooltip('i18n:reflection_probe.fastBake')
get fastBake () {
Expand Down
8 changes: 4 additions & 4 deletions cocos/rendering/post-process/components/fxaa.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ccclass, disallowMultiple, executeInEditMode, help, menu } from '../../../core/data/decorators';
import { PostProcessSetting } from './post-process-setting';

@ccclass('cc.Fxaa')
@help('cc.Fxaa')
@menu('PostProcess/Fxaa')
@ccclass('cc.FXAA')
@help('cc.FXAA')
@menu('PostProcess/FXAA')
@disallowMultiple
@executeInEditMode
export class Fxaa extends PostProcessSetting {
export class FXAA extends PostProcessSetting {
}
4 changes: 2 additions & 2 deletions cocos/rendering/post-process/passes/fxaa-pass.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import { getCameraUniqueID } from '../../custom/define';
import { passContext } from '../utils/pass-context';

import { getSetting, SettingPass } from './setting-pass';
import { Fxaa } from '../components/fxaa';
import { FXAA } from '../components/fxaa';

export class FxaaPass extends SettingPass {
get setting () { return getSetting(Fxaa); }
get setting () { return getSetting(FXAA); }

name = 'FxaaPass'
effectName = 'pipeline/post-process/fxaa-hq';
Expand Down
3 changes: 2 additions & 1 deletion editor/i18n/en/localization.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,13 @@ module.exports = link(mixin({
BlitScreen: `${url}/${version}/manual/en/render-pipeline/post-process/blit-screen.html`,
TAA: `${url}/${version}/manual/en/render-pipeline/post-process/index.html`,
FSR: `${url}/${version}/manual/en/render-pipeline/post-process/index.html`,
Fxaa: `${url}/${version}/manual/en/render-pipeline/post-process/index.html`,
FXAA: `${url}/${version}/manual/en/render-pipeline/post-process/index.html`,
Bloom: `${url}/${version}/manual/en/render-pipeline/post-process/index.html`,
HBAO: `${url}/${version}/manual/en/render-pipeline/post-process/index.html`,
ColorGrading: `${url}/${version}/manual/en/render-pipeline/post-process/index.html`,
Skin: `${url}/${version}/manual/en/shader/advanced-shader/skin.html`,
RenderRoot2D: `${url}/${version}/manual/en/ui-system/components/editor/renderroot2d.html`,
ReflectionProbe: `${url}/${version}/manual/en/concepts/scene/light/probe/reflection-art-workflow.html`,
},
assets: {
javascript: `${url}/${version}/manual/en/concepts/scene/node-component.html`,
Expand Down
3 changes: 2 additions & 1 deletion editor/i18n/zh/localization.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,13 @@ module.exports = link(mixin({
BlitScreen: `${url}/${version}/manual/zh/render-pipeline/post-process/blit-screen.html`,
TAA: `${url}/${version}/manual/zh/render-pipeline/post-process/index.html`,
FSR: `${url}/${version}/manual/zh/render-pipeline/post-process/index.html`,
Fxaa: `${url}/${version}/manual/zh/render-pipeline/post-process/index.html`,
FXAA: `${url}/${version}/manual/zh/render-pipeline/post-process/index.html`,
Bloom: `${url}/${version}/manual/zh/render-pipeline/post-process/index.html`,
HBAO: `${url}/${version}/manual/zh/render-pipeline/post-process/index.html`,
ColorGrading: `${url}/${version}/manual/zh/render-pipeline/post-process/index.html`,
Skin: `${url}/${version}/manual/zh/shader/advanced-shader/skin.html`,
RenderRoot2D: `${url}/${version}/manual/zh/ui-system/components/editor/renderroot2d.html`,
ReflectionProbe: `${url}/${version}/manual/zh/concepts/scene/light/probe/reflection-art-workflow.html`,
},
assets: {
javascript: `${url}/${version}/manual/zh/concepts/scene/node-component.html`,
Expand Down
Loading