From 80477aebff7dfffc999170cc971b8adc1c8abad8 Mon Sep 17 00:00:00 2001 From: freezy Date: Mon, 17 May 2021 23:48:57 +0200 Subject: [PATCH 1/2] import: Use explicit providers instead of table to obtain textures and materials. --- Runtime/MaterialConverter.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Runtime/MaterialConverter.cs b/Runtime/MaterialConverter.cs index d27f81a..b81bfa2 100644 --- a/Runtime/MaterialConverter.cs +++ b/Runtime/MaterialConverter.cs @@ -72,7 +72,7 @@ public static Material GetDefaultMaterial(BlendMode blendMode) } } - public Material CreateMaterial(PbrMaterial vpxMaterial, TableAuthoring table, Type objectType, StringBuilder debug = null) + public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider textureProvider, Type objectType, StringBuilder debug = null) { Material defaultMaterial = GetDefaultMaterial(vpxMaterial.MapBlendMode); @@ -124,18 +124,16 @@ public Material CreateMaterial(PbrMaterial vpxMaterial, TableAuthoring table, Ty unityMaterial.SetFloat(Smoothness, vpxMaterial.Roughness); // map - if (table != null && vpxMaterial.HasMap) - { - unityMaterial.SetTexture(BaseColorMap,table.GetTexture(vpxMaterial.Map.Name)); + if (vpxMaterial.HasMap) { + unityMaterial.SetTexture(BaseColorMap,textureProvider.GetTexture(vpxMaterial.Map.Name)); } // normal map - if (table != null && vpxMaterial.HasNormalMap) - { + if (vpxMaterial.HasNormalMap) { unityMaterial.EnableKeyword("_NORMALMAP"); unityMaterial.EnableKeyword("_NORMALMAP_TANGENT_SPACE"); - unityMaterial.SetTexture( NormalMap, table.GetTexture(vpxMaterial.NormalMap.Name)); + unityMaterial.SetTexture( NormalMap, textureProvider.GetTexture(vpxMaterial.NormalMap.Name)); } return unityMaterial; From f7684bbfa055ef282082e41021daca69965760b3 Mon Sep 17 00:00:00 2001 From: freezy Date: Mon, 19 Jul 2021 00:03:00 +0200 Subject: [PATCH 2/2] api: Update for scene refactor. --- Runtime/MaterialConverter.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Runtime/MaterialConverter.cs b/Runtime/MaterialConverter.cs index b81bfa2..2a86812 100644 --- a/Runtime/MaterialConverter.cs +++ b/Runtime/MaterialConverter.cs @@ -32,6 +32,7 @@ public class MaterialConverter : IMaterialConverter { public Material DotMatrixDisplay => UnityEngine.Resources.Load("Materials/DotMatrixDisplay"); public Material SegmentDisplay => UnityEngine.Resources.Load("Materials/SegmentDisplay"); + public int NormalMapProperty => NormalMap; #region Shader Properties