Skip to content

Refactor Scene Setup #10

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.

Sign up for GitHub

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

Merged
freezy merged 2 commits into from
Jul 22, 2021
Merged

Refactor Scene Setup #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80477ae
import: Use explicit providers instead of table to obtain textures an…
freezy May 17, 2021
f7684bb
api: Update for scene refactor.
freezy Jul 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Runtime/MaterialConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class MaterialConverter : IMaterialConverter
{
public Material DotMatrixDisplay => UnityEngine.Resources.Load<Material>("Materials/DotMatrixDisplay");
public Material SegmentDisplay => UnityEngine.Resources.Load<Material>("Materials/SegmentDisplay");
public int NormalMapProperty => NormalMap;

#region Shader Properties

Expand Down Expand Up @@ -72,7 +73,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);

Expand Down Expand Up @@ -124,18 +125,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;
Expand Down