Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-12 22:10:11 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

MetallicRoughness

Browse Source
This commit is contained in:
ousttrue
2025-02-05 16:21:03 +09:00
parent 1086db9be0
commit b477694298
3 changed files with 1139 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1090
Assets/VRM10_Samples/VRM10Viewer/Assets/TinyPbr.shadergraph
View File

File diff suppressed because it is too large Load Diff

47
Assets/VRM10_Samples/VRM10Viewer/TinyPbrMaterialContext.cs
View File

@@ -13,15 +13,22 @@ namespace UniVRM10.VRM10Viewer
/// Texture2D = White
/// When using shadergraph, require "Set as Main Texture"
/// </summary>
private static readonly int BaseMap = Shader.PropertyToID("_BaseMap");
private static readonly int BaseMapProp = Shader.PropertyToID("_BaseMap");
/// <summary>
/// float = 1
/// float = 1.0
/// </summary>
private static readonly int OcclusionStrengthProp = Shader.PropertyToID("_OcclusionStrength");
/// <summary>
/// Texture2D = White
/// Texture2D.Red = 1.0.
/// </summary>
private static readonly int OcclusionMap = Shader.PropertyToID("_OcclusionMap");
private static readonly int OcclusionMapProp = Shader.PropertyToID("_OcclusionMap");
private static readonly int RoughnessProp = Shader.PropertyToID("_Roughness");
private static readonly int MetallicProp = Shader.PropertyToID("_Metallic");
/// <summary>
/// Texture2D.Green = 1.0. The roughness
/// Texture2D.Blue = 1.0. The metalness
/// </summary>
private static readonly int MetallicRoughnessMapProp = Shader.PropertyToID("_MetallicRoughnessMap");
public readonly Material Material;
public TinyPbrMaterialContext(Material material)
@@ -36,18 +43,18 @@ namespace UniVRM10.VRM10Viewer
}
public Texture BaseTexture
{
get => Material.GetTexture(BaseMap);
set => Material.SetTexture(BaseMap, value);
get => Material.GetTexture(BaseMapProp);
set => Material.SetTexture(BaseMapProp, value);
}
public Vector2 BaseTextureOffset
{
get => Material.GetTextureOffset(BaseMap);
set => Material.SetTextureOffset(BaseMap, value);
get => Material.GetTextureOffset(BaseMapProp);
set => Material.SetTextureOffset(BaseMapProp, value);
}
public Vector2 BaseTextureScale
{
get => Material.GetTextureScale(BaseMap);
set => Material.SetTextureScale(BaseMap, value);
get => Material.GetTextureScale(BaseMapProp);
set => Material.SetTextureScale(BaseMapProp, value);
}
public float OcclusionStrength
@@ -57,11 +64,27 @@ namespace UniVRM10.VRM10Viewer
}
public Texture OcclusionTexture
{
get => Material.GetTexture(OcclusionMap);
get => Material.GetTexture(OcclusionMapProp);
set
{
Material.SetTexture(OcclusionMap, value);
Material.SetTexture(OcclusionMapProp, value);
}
}
public float Roughness
{
get => Material.GetFloat(RoughnessProp);
set => Material.SetFloat(RoughnessProp, value);
}
public float Metallic
{
get => Material.GetFloat(MetallicProp);
set => Material.SetFloat(MetallicProp, value);
}
public Texture MetallicRoughnessMap
{
get => Material.GetTexture(MetallicRoughnessMapProp);
set => Material.SetTexture(MetallicRoughnessMapProp, value);
}
}
}

23
Assets/VRM10_Samples/VRM10Viewer/TinyPbrMaterialDescriptorGenerator.cs
View File

@@ -70,7 +70,7 @@ namespace UniVRM10.VRM10Viewer
// ImportSurfaceSettings(src, context);
await ImportBaseColorAsync(data, src, context, getTextureAsync, awaitCaller);
// await ImportMetallicSmoothnessAsync(data, src, context, getTextureAsync, awaitCaller);
await ImportMetallicRoughnessAsync(data, src, context, getTextureAsync, awaitCaller);
await ImportOcclusionAsync(data, src, context, getTextureAsync, awaitCaller);
// await ImportNormalAsync(data, src, context, getTextureAsync, awaitCaller);
// await ImportEmissionAsync(data, src, context, getTextureAsync, awaitCaller);
@@ -96,11 +96,30 @@ namespace UniVRM10.VRM10Viewer
}
}
}
public static async Task ImportMetallicRoughnessAsync(GltfData data, glTFMaterial src, TinyPbrMaterialContext context, GetTextureAsyncFunc getTextureAsync, IAwaitCaller awaitCaller)
{
context.Metallic = src.pbrMetallicRoughness.metallicFactor;
context.Roughness = src.pbrMetallicRoughness.roughnessFactor;
if (src is { pbrMetallicRoughness: { metallicRoughnessTexture: { index: >= 0 } } })
{
var (offset, scale) = GltfTextureImporter.GetTextureOffsetAndScale(src.pbrMetallicRoughness.metallicRoughnessTexture);
if (GltfTextureImporter.TryCreateLinear(data, src.pbrMetallicRoughness.metallicRoughnessTexture.index, offset, scale, out var _, out var desc))
{
context.MetallicRoughnessMap = await getTextureAsync(desc, awaitCaller);
context.Metallic = 1;
context.Roughness = 1;
}
}
}
public static async Task ImportOcclusionAsync(GltfData data, glTFMaterial src, TinyPbrMaterialContext context, GetTextureAsyncFunc getTextureAsync, IAwaitCaller awaitCaller)
{
if (src is { occlusionTexture: { index: >= 0 } })
{
if (GltfPbrTextureImporter.TryStandardTexture(data, src, out _, out var desc))
var (offset, scale) = GltfTextureImporter.GetTextureOffsetAndScale(src.occlusionTexture);
if (GltfTextureImporter.TryCreateLinear(data, src.occlusionTexture.index, offset, scale, out var _, out var desc))
{
context.OcclusionTexture = await getTextureAsync(desc, awaitCaller);
context.OcclusionStrength = src.occlusionTexture.strength;