-
Notifications
You must be signed in to change notification settings - Fork 428
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
VRM/UnlitTransparentZWrite の Import を修正
#1248
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| using UniGLTF; | ||
| using UnityEngine; | ||
| using VRMShaders; | ||
|
|
||
| namespace VRM | ||
| { | ||
| public static class VRMZWriteMaterialImporter | ||
| { | ||
| public const string ShaderName = "VRM/UnlitTransparentZWrite"; | ||
|
|
||
| public static bool TryCreateParam(GltfData data, glTF_VRM_extensions vrm, int materialIdx, out MaterialDescriptor matDesc) | ||
| { | ||
| if (vrm?.materialProperties == null || vrm.materialProperties.Count == 0) | ||
| { | ||
| matDesc = default; | ||
| return false; | ||
| } | ||
| if (materialIdx < 0 || materialIdx >= vrm.materialProperties.Count) | ||
| { | ||
| matDesc = default; | ||
| return false; | ||
| } | ||
|
|
||
| var vrmMaterial = vrm.materialProperties[materialIdx]; | ||
| if (vrmMaterial.shader != ShaderName) | ||
| { | ||
| // fallback to gltf | ||
| matDesc = default; | ||
| return false; | ||
| } | ||
|
|
||
| // use material.name, because material name may renamed in GltfParser. | ||
| var name = data.GLTF.materials[materialIdx].name; | ||
|
|
||
| // | ||
| // import as MToon | ||
| // | ||
| matDesc = new MaterialDescriptor(name, MToon.Utils.ShaderName); | ||
|
|
||
| matDesc.RenderQueue = vrmMaterial.renderQueue; | ||
|
|
||
| if (vrmMaterial.textureProperties.ContainsKey(MToon.Utils.PropMainTex)) | ||
| { | ||
| if (VRMMToonTextureImporter.TryGetTextureFromMaterialProperty(data, vrmMaterial, MToon.Utils.PropMainTex, out var texture)) | ||
| { | ||
| matDesc.TextureSlots.Add(MToon.Utils.PropMainTex, texture.Item2); | ||
| matDesc.TextureSlots.Add(MToon.Utils.PropShadeTexture, texture.Item2); | ||
| } | ||
| } | ||
|
|
||
| matDesc.Colors[MToon.Utils.PropColor] = Color.white; | ||
| matDesc.Colors[MToon.Utils.PropShadeColor] = Color.white; | ||
|
|
||
| foreach (var kv in vrmMaterial.keywordMap) | ||
| { | ||
| if (kv.Value) | ||
| { | ||
| matDesc.Actions.Add(material => material.EnableKeyword(kv.Key)); | ||
| } | ||
| else | ||
| { | ||
| matDesc.Actions.Add(material => material.DisableKeyword(kv.Key)); | ||
| } | ||
| } | ||
|
|
||
| foreach (var kv in vrmMaterial.tagMap) | ||
| { | ||
| matDesc.Actions.Add(material => material.SetOverrideTag(kv.Key, kv.Value)); | ||
| } | ||
|
|
||
| if (vrmMaterial.shader == MToon.Utils.ShaderName) | ||
| { | ||
| // TODO: Material拡張にMToonの項目が追加されたら旧バージョンのshaderPropから変換をかける | ||
| // インポート時にUniVRMに含まれるMToonのバージョンに上書きする | ||
| matDesc.FloatValues[MToon.Utils.PropVersion] = MToon.Utils.VersionNumber; | ||
| } | ||
|
|
||
| matDesc.Actions.Add(m => | ||
| { | ||
| m.SetFloat(MToon.Utils.PropBlendMode, (float)MToon.RenderMode.TransparentWithZWrite); | ||
| MToon.Utils.ValidateProperties(m, true); | ||
| }); | ||
|
|
||
| return true; | ||
| } | ||
| } | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
11 changes: 11 additions & 0 deletions
11
Assets/VRMShaders/GLTF/UniUnlit/Runtime/UniUnlitUtil.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ここで分岐