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.

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

Jump to bottom

add help for reflection probe and rename Fxaa #15790

Merged
merged 3 commits into from
Jul 21, 2023
Merged

add help for reflection probe and rename Fxaa #15790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2538ac
help for reflection probe
xubing0906 Jul 21, 2023
6da121e
rename fxaa
xubing0906 Jul 21, 2023
7a96c07
for help
xubing0906 Jul 21, 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
3 changes: 2 additions & 1 deletion cocos/3d/reflection-probe/reflection-probe-component.ts
View file
Open in desktop
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 @@ export enum ProbeResolution {
@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
8 changes: 4 additions & 4 deletions cocos/rendering/post-process/components/fxaa.ts
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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