Feature/extract key #872
Merged
Feature/extract key #872
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
Santarh
requested changes
Apr 14, 2021
| /// の呼び出し時に、identifier.name と externalObject.name が同じでない運用にしてみる。 | ||
| /// | ||
| /// </summary> | ||
| public struct SubAssetKey |
| @@ -49,13 +49,13 @@ private enum BlendMode | |||
| Transparent | |||
| } | |||
|
|
|||
| public static TextureImportParam BaseColorTexture(GltfParser parser, glTFMaterial src) | |||
| public static (SubAssetKey, TextureImportParam Param) BaseColorTexture(GltfParser parser, glTFMaterial src) | |||
There was a problem hiding this comment.
(SubAssetKey, TextureImportParam Param) 、もはや自明な型に定義してよさそうｗ
There was a problem hiding this comment.
struct SubAssetObject
{
public SubAssetKey Key;
public UnityEngine.Object Object;
}的な。
| @@ -173,11 +174,11 @@ public int CompareTo(ExpressionKey other) | |||
| return 0; | |||
| } | |||
|
|
|||
| public string ExtractKey | |||
| public SubAssetKey ExtractKey | |||
| @@ -13,7 +13,7 @@ namespace UniVRM10 | |||
| [CreateAssetMenu(menuName = "VRM10/ExpressionAvatar")] | |||
| public sealed class VRM10ExpressionAvatar : ScriptableObject | |||
| { | |||
| public const string ExtractKey = "ExpressionAvatar"; | |||
| public static UniGLTF.SubAssetKey ExtractKey => new UniGLTF.SubAssetKey(typeof(VRM10ExpressionAvatar), "ExpressionAvatar"); | |||
| @@ -10,7 +11,7 @@ namespace UniVRM10 | |||
| [CreateAssetMenu(menuName = "VRM10/MetaObject")] | |||
| public class VRM10MetaObject : ScriptableObject | |||
| { | |||
| public const string ExtractKey = "Meta"; | |||
| public static SubAssetKey ExtractKey => new SubAssetKey(typeof(VRM10MetaObject), "Meta"); | |||
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.
SubAsset を string レベルでユニークにする準備
ScriptedImporter で SubAsset を識別する SourceAssetIdentifier(Type, string) で、Type が違うけど string が同じ場合に警告が出る。
例えば、 alicia_body マテリアルに alicia_body.jpg テクスチャーがある場合に発生する。
(警告なので直さなくてもよいかもしれない)
これの対策で、string レベルでユニークにする準備。
TextureImportParam 簡略化
srgb, normal, standard に応じて、gltfname と convertedName を使い分けるのが分かりにくいので、
UnityObjectName に整理。