Skip to content

Feat: add bevel and bloom filters properties #413

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
MakinoharaShoko merged 2 commits into from
May 22, 2025
Merged

Feat: add bevel and bloom filters properties #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4e9661
feat: add bevel and bloom filters properties
May 10, 2025
b193435
Merge branch 'dev' into pr/413
MakinoharaShoko May 16, 2025
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
276 changes: 196 additions & 80 deletions packages/origine2/src/locales/en.po
View file
Open in desktop

Large diffs are not rendered by default.

278 changes: 197 additions & 81 deletions packages/origine2/src/locales/ja.po
View file
Open in desktop

Large diffs are not rendered by default.

268 changes: 192 additions & 76 deletions packages/origine2/src/locales/zhCn.po
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 17 additions & 12 deletions packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/ChangeBg.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,10 @@ export default function ChangeBg(props: ISentenceEditorProps) {
updateExpand(props.index);
}}>{t`打开效果编辑器`}</Button>
</CommonOptions>
<TerrePanel sentenceIndex={props.index} title={t`效果编辑器`}>
<div>
<CommonTips
text={t`提示：效果只有在切换到不同背景或关闭之前的背景再重新添加时生效。如果你要为现有的背景设置效果，请使用单独的设置效果命令`}/>
<EffectEditor json={json.value.toString()} onChange={(newJson) => {
json.set(newJson);
submit();
}}/>
<TerrePanel
sentenceIndex={props.index}
title={t`效果编辑器`}
bottomBarChildren={[
<CommonOptions key="10" title={t`持续时间（单位为毫秒）`}>
<div>
<Input
Expand All @@ -94,13 +90,22 @@ export default function ChangeBg(props: ISentenceEditorProps) {
const newDuration = Number(data.value);
if (isNaN(newDuration) || data.value === '')
duration.set("");

else
duration.set(newDuration);
}}
onBlur={submit}
/>
} }
onBlur={submit} />
</div>
</CommonOptions>
</CommonOptions>,
]}
>
<div>
<CommonTips
text={t`提示：效果只有在切换到不同背景或关闭之前的背景再重新添加时生效。如果你要为现有的背景设置效果，请使用单独的设置效果命令`}/>
<EffectEditor json={json.value.toString()} onChange={(newJson) => {
json.set(newJson);
submit();
}}/>
</div>
</TerrePanel>
</div>
Expand Down
176 changes: 88 additions & 88 deletions packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,96 +248,96 @@ export default function ChangeFigure(props: ISentenceEditorProps) {
<TerrePanel
title={t`效果编辑器`}
sentenceIndex={props.index}
>
<div>
<CommonTips
text={t`提示：效果只有在切换到不同立绘或关闭之前的立绘再重新添加时生效。如果你要为现有的立绘设置效果，请使用单独的设置效果命令`}/>
<EffectEditor json={json.value.toString()} onChange={(newJson) => {
json.set(newJson);
submit();
}}/>
<CommonOptions key="10" title={t`持续时间（单位为毫秒）`}>
<div>
<Input placeholder={t`持续时间（单位为毫秒）`} value={duration.value.toString()} onChange={(_, data) => {
const newDuration = Number(data.value);
if (isNaN(newDuration) || data.value === '')
duration.set("");
else
duration.set(newDuration);
}} onBlur={submit}/>
</div>
</CommonOptions>
</div>
<div style={{
display: 'flex',
flexWrap: 'wrap',
gap: '8px',
width: animationFlag.value !== "on" ? 'auto' : '100%'
}}>
<CommonOptions title={t`唇形同步与眨眼`} key="5">
<WheelDropdown
options={animationFlags}
value={animationFlag.value}
onValueChange={(newValue) => {
animationFlag.set(newValue?.toString() ?? "");
submit();
}}
/>
</CommonOptions>
{animationFlag.value === "on" &&
<CommonOptions key="6" title={t`张开嘴`}>
<>
{mouthOpen.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
mouthOpen.set(fileDesc?.name ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>}
{animationFlag.value === "on" &&
<CommonOptions key="7" title={t`半张嘴`}>
<>
{mouthHalfOpen.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
mouthHalfOpen.set(fileDesc?.name ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>}
{animationFlag.value === "on" &&
<CommonOptions key="8" title={t`闭上嘴`}>
<>
{mouthClose.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
mouthClose.set(fileDesc?.name ?? "");
bottomBarChildren={[
<CommonOptions key="10" title={t`持续时间（单位为毫秒）`}>
<div>
<Input placeholder={t`持续时间（单位为毫秒）`} value={duration.value.toString()} onChange={(_, data) => {
const newDuration = Number(data.value);
if (isNaN(newDuration) || data.value === '')
duration.set("");
else
duration.set(newDuration);
}} onBlur={submit}/>
</div>
</CommonOptions>,
<CommonOptions title={t`唇形同步与眨眼`} key="5">
<WheelDropdown
options={animationFlags}
value={animationFlag.value}
onValueChange={(newValue) => {
animationFlag.set(newValue?.toString() ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>}
{animationFlag.value === "on" && <CommonOptions key="9" title={t`睁开眼睛`}>
<>
{eyesOpen.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
eyesOpen.set(fileDesc?.name ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>}
{animationFlag.value === "on" && <CommonOptions key="10" title={t`闭上眼睛`}>
<>
{eyesClose.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
eyesClose.set(fileDesc?.name ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>}
</div>
/>
</CommonOptions>,
<div style={{display: animationFlag.value === "on" ? 'flex' : 'none'}}>
<CommonOptions key="6" title={t`张开嘴`}>
<>
{mouthOpen.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
mouthOpen.set(fileDesc?.name ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>
</div>,
<div style={{display: animationFlag.value === "on" ? 'flex' : 'none'}}>
<CommonOptions key="7" title={t`半张嘴`}>
<>
{mouthHalfOpen.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
mouthHalfOpen.set(fileDesc?.name ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>
</div>,
<div style={{display: animationFlag.value === "on" ? 'flex' : 'none'}}>
<CommonOptions key="8" title={t`闭上嘴`}>
<>
{mouthClose.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
mouthClose.set(fileDesc?.name ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>
</div>,
<div style={{display: animationFlag.value === "on" ? 'flex' : 'none'}}>
<CommonOptions key="9" title={t`睁开眼睛`}>
<>
{eyesOpen.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
eyesOpen.set(fileDesc?.name ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>
</div>,
<div style={{display: animationFlag.value === "on" ? 'flex' : 'none'}}>
<CommonOptions key="10" title={t`闭上眼睛`}>
<>
{eyesClose.value + "\u00a0\u00a0"}
<ChooseFile sourceBase="figure" onChange={(fileDesc) => {
eyesClose.set(fileDesc?.name ?? "");
submit();
}}
extName={[".png", ".jpg", ".webp"]}/>
</>
</CommonOptions>
</div>,
]}
>
<CommonTips
text={t`提示：效果只有在切换到不同立绘或关闭之前的立绘再重新添加时生效。如果你要为现有的立绘设置效果，请使用单独的设置效果命令`}/>
<EffectEditor json={json.value.toString()} onChange={(newJson) => {
json.set(newJson);
submit();
}}/>
</TerrePanel>

</div>
Expand Down
1 change: 1 addition & 0 deletions packages/origine2/src/pages/editor/GraphicalEditor/components/CommonOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import styles from './commonOption.module.scss';
interface ICommonOptionProps{
title:string,
children:ReactNode
row?:boolean
}

export default function CommonOptions(props:ICommonOptionProps){
Expand Down
Loading