TinyMToonAlphaBlend

This commit is contained in:
ousttrue
2025-02-07 14:51:51 +09:00
parent 77b285fc76
commit 1553402a97
10 changed files with 4228 additions and 1576 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 6b60fe85d745eda4281e3278fcb0657c
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 45c6d2335bae988419dbc2ec65c33dae
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}

View File

@@ -10,9 +10,11 @@ namespace UniVRM10.VRM10Viewer
public class TinyMToonrMaterialImporter : IMaterialImporter
{
private Material m_opaque;
public TinyMToonrMaterialImporter(Material material)
private Material m_alphablend;
public TinyMToonrMaterialImporter(Material opaque, Material alphablend)
{
m_opaque = material;
m_opaque = opaque;
m_alphablend = alphablend;
}
bool IMaterialImporter.TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc)
@@ -33,7 +35,7 @@ namespace UniVRM10.VRM10Viewer
matDesc = new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, src),
m_opaque.shader,
src.alphaMode == "BLEND" ? m_alphablend.shader : m_opaque.shader,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

View File

@@ -30638,12 +30638,14 @@ MonoBehaviour:
Root: {fileID: 124675793}
m_version: {fileID: 1268276256}
m_faceCamera: {fileID: 1150163685}
m_opaqueMaterial: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4,
m_pbrOpaqueMaterial: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4,
type: 3}
m_alphaBlendMaterial: {fileID: -876546973899608171, guid: 868190a58757d6242bb3ca456402f82f,
m_pbrAlphaBlendMaterial: {fileID: -876546973899608171, guid: 868190a58757d6242bb3ca456402f82f,
type: 3}
m_mtoonMaterialOpaque: {fileID: -876546973899608171, guid: fd08e80eb7e04e849b8a6d534e48efea,
type: 3}
m_mtoonMaterialAlphaBlend: {fileID: -876546973899608171, guid: 6b60fe85d745eda4281e3278fcb0657c,
type: 3}
m_useCustomMaterial: {fileID: 731212246}
m_openModel: {fileID: 2009818433}
m_openMotion: {fileID: 168425996}

View File

@@ -24,11 +24,13 @@ namespace UniVRM10.VRM10Viewer
[Header("Material")]
[SerializeField]
Material m_opaqueMaterial = default;
Material m_pbrOpaqueMaterial = default;
[SerializeField]
Material m_alphaBlendMaterial = default;
Material m_pbrAlphaBlendMaterial = default;
[SerializeField]
Material m_mtoonMaterialOpaque = default;
[SerializeField]
Material m_mtoonMaterialAlphaBlend = default;
[Header("UI")]
[SerializeField]
@@ -497,8 +499,8 @@ namespace UniVRM10.VRM10Viewer
private void Start()
{
m_mtoonImporter = new(m_mtoonMaterialOpaque);
m_pbrImporter = new(m_opaqueMaterial, m_alphaBlendMaterial);
m_mtoonImporter = new(m_mtoonMaterialOpaque, m_mtoonMaterialAlphaBlend);
m_pbrImporter = new(m_pbrOpaqueMaterial, m_pbrAlphaBlendMaterial);
m_autoEmotion = gameObject.AddComponent<VRM10AutoExpression>();
m_autoBlink = gameObject.AddComponent<VRM10Blinker>();
@@ -518,7 +520,7 @@ namespace UniVRM10.VRM10Viewer
Motion = BvhMotion.LoadBvhFromText(m_motion.text);
if (m_useCustomMaterial.isOn)
{
Motion.SetBoxManMaterial(Instantiate(m_opaqueMaterial));
Motion.SetBoxManMaterial(Instantiate(m_pbrOpaqueMaterial));
}
}