This commit is contained in:
ousttrue
2025-02-04 16:38:40 +09:00
parent 5137c15051
commit ffbbd63311
2 changed files with 6 additions and 6 deletions

View File

@@ -14,11 +14,11 @@ namespace UniVRM10.VRM10Viewer
public UrpGltfPbrMaterialImporter PbrMaterialImporter { get; } = new();
public UrpGltfDefaultMaterialImporter DefaultMaterialImporter { get; } = new();
public Material CustomMaterial { get; set; }
public Material Material { get; set; }
public TinyPbrDescriptorGenerator(Material customMaterial)
public TinyPbrDescriptorGenerator(Material material)
{
CustomMaterial = customMaterial;
Material = material;
}
public MaterialDescriptor Get(GltfData data, int i)
@@ -52,7 +52,7 @@ namespace UniVRM10.VRM10Viewer
var src = data.GLTF.materials[i];
matDesc = new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, src),
CustomMaterial.shader,
Material.shader,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

View File

@@ -4736,7 +4736,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_primitiveType: 4
_urpMaterial: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4,
_urpMaterialForGrayscale: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4,
type: 3}
--- !u!1 &325720722
GameObject:
@@ -13432,7 +13432,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_primitiveType: 0
_urpMaterial: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4,
_urpMaterialForGrayscale: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4,
type: 3}
--- !u!1 &806723448
GameObject: