AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-06 04:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: expressions menu icon compression breaks on iOS builds (#1513)

Browse Source
This commit is contained in:
bd_ 2025-03-21 20:25:00 -07:00 committed by GitHub
parent fce938820b
commit 6175e20e46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-PRERELEASE-jp.md
View File

@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正 - [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正
- [#1513] iOSビルドでエクスプレッションメニューアイコンの圧縮が壊れる問題を修正
### Changed ### Changed
- [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました - [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました

1
CHANGELOG-PRERELEASE.md
View File

@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- [#1508] Fix an issue where automatic compression of expressions menu icons would fail when the texture dimensions were - [#1508] Fix an issue where automatic compression of expressions menu icons would fail when the texture dimensions were
not divisible by four. not divisible by four.
- [#1513] Expression menu icon compression broke on iOS builds
### Changed ### Changed
- [#1514] `Merge Blend Tree` is now `Merge Motion (Blend Tree)` and supports merging animation clips as well as blend trees - [#1514] `Merge Blend Tree` is now `Merge Motion (Blend Tree)` and supports merging animation clips as well as blend trees

1
CHANGELOG-jp.md
View File

@ -23,6 +23,7 @@ Modular Avatarの主な変更点をこのファイルで記録しています。
- [#1504] 一部の状況で内部の`DelayDisable`レイヤーが不要なオブジェクトを参照しないように変更 - [#1504] 一部の状況で内部の`DelayDisable`レイヤーが不要なオブジェクトを参照しないように変更
- これにより、オブジェクトがアニメーションされているかどうかを追跡するAAOなどのツールとの互換性が向上します - これにより、オブジェクトがアニメーションされているかどうかを追跡するAAOなどのツールとの互換性が向上します
- [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正 - [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正
- [#1513] iOSビルドでエクスプレッションメニューアイコンの圧縮処理が壊れる問題を修正
### Changed ### Changed
- [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました - [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました

1
CHANGELOG.md
View File

@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- This helps improve compatibility with AAO and other tools that track whether objects are animated - This helps improve compatibility with AAO and other tools that track whether objects are animated
- [#1508] Fix an issue where automatic compression of expressions menu icons would fail when the texture dimensions were - [#1508] Fix an issue where automatic compression of expressions menu icons would fail when the texture dimensions were
not divisible by four. not divisible by four.
- [#1513] Expression menu icon compression broke on iOS builds
### Changed ### Changed
- [#1514] `Merge Blend Tree` is now `Merge Motion (Blend Tree)` and supports merging animation clips as well as blend trees - [#1514] `Merge Blend Tree` is now `Merge Motion (Blend Tree)` and supports merging animation clips as well as blend trees

19
Editor/FixupPasses/FixupExpressionsMenuPass.cs
View File

@ -119,11 +119,20 @@ namespace nadena.dev.modular_avatar.core.editor
} }
} }
#if UNITY_ANDROID internal static TextureFormat TargetFormat
internal const TextureFormat TargetFormat = TextureFormat.ASTC_4x4; {
#else get
internal const TextureFormat TargetFormat = TextureFormat.DXT5; {
#endif switch (EditorUserBuildSettings.activeBuildTarget)
{
case BuildTarget.StandaloneWindows64:
return TextureFormat.DXT5;
default:
return TextureFormat.ASTC_4x4;
}
}
}
private static Texture2D MaybeScaleIcon(BuildContext context, Texture2D original) private static Texture2D MaybeScaleIcon(BuildContext context, Texture2D original)
{ {