Skip to content

Commit

Permalink
fix converter fallback when shader doesn't have glossiness
Browse files Browse the repository at this point in the history 
added null checks for textures
  • Loading branch information
@hybridherbst
hybridherbst committed Aug 7, 2023
1 parent 97dbe3c commit 2647bbb
Show file tree
Hide file tree
Showing 2 changed files with 157 additions and 122 deletions.
3 changes: 2 additions & 1 deletion UnityGLTF/Assets/UnityGLTF/Editor/Scripts/ShaderGraph/ShaderConverters.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ private static bool ConvertStandardAndURPLit(Material material, Shader oldShader
var isTransparent = material.GetTag("RenderType", false) == "Transparent" || sourceIsTransparent;

var metallic = material.GetFloat(_Metallic, 0);
var smoothness = material.HasProperty(_Smoothness) ? material.GetFloat(_Smoothness, 0) : material.GetFloat(_Glossiness, 0);
var smoothness = material.HasProperty(_Smoothness) ? material.GetFloat(_Smoothness, 0) :
material.HasProperty(_Glossiness) ? material.GetFloat(_Glossiness, 0) : 0.5f;
var metallicGloss = material.GetTexture(_MetallicGlossMap, null);
var normal = material.GetTexture(_BumpMap, null);
var normalStrength = material.GetFloat(_BumpScale, 1);
Expand Down
276 changes: 155 additions & 121 deletions UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/SceneImporter/ImporterMaterials.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,24 +275,28 @@ void SetTransformKeyword()
if (transmission != null)
{
transmissionMapper.TransmissionFactor = transmission.transmissionFactor;
var td = await FromTextureInfo(transmission.transmissionTexture);
transmissionMapper.TransmissionTexture = td.Texture;
transmissionMapper.TransmissionTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(transmission.transmissionTexture);
if (ext != null)

if (transmission.transmissionTexture != null)
{
CalculateYOffsetAndScale(transmission.transmissionTexture.Index, ext, out var scale, out var offset);
transmissionMapper.TransmissionTextureOffset = offset;
transmissionMapper.TransmissionTextureScale = scale;
transmissionMapper.TransmissionTextureRotation = td.Rotation;
transmissionMapper.TransmissionTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
}
else
if (transmission.transmissionTexture != null && IsTextureFlipped(transmission.transmissionTexture.Index.Value))
{
transmissionMapper.TransmissionTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
var td = await FromTextureInfo(transmission.transmissionTexture);
transmissionMapper.TransmissionTexture = td.Texture;
transmissionMapper.TransmissionTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(transmission.transmissionTexture);
if (ext != null)
{
CalculateYOffsetAndScale(transmission.transmissionTexture.Index, ext, out var scale, out var offset);
transmissionMapper.TransmissionTextureOffset = offset;
transmissionMapper.TransmissionTextureScale = scale;
transmissionMapper.TransmissionTextureRotation = td.Rotation;
transmissionMapper.TransmissionTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
}
else
if (IsTextureFlipped(transmission.transmissionTexture.Index.Value))
{
transmissionMapper.TransmissionTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
}
}

mapper.Material.renderQueue = 3000;
Expand All @@ -310,24 +314,27 @@ void SetTransformKeyword()
volumeMapper.AttenuationColor = QualitySettings.activeColorSpace == ColorSpace.Linear ? volume.attenuationColor.ToUnityColorLinear() : volume.attenuationColor.ToUnityColorRaw();
volumeMapper.AttenuationDistance = volume.attenuationDistance;
volumeMapper.ThicknessFactor = volume.thicknessFactor;
var td = await FromTextureInfo(volume.thicknessTexture);
volumeMapper.ThicknessTexture = td.Texture;
volumeMapper.ThicknessTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(volume.thicknessTexture);
if (ext != null)
{
CalculateYOffsetAndScale(volume.thicknessTexture.Index, ext, out var scale, out var offset);
volumeMapper.ThicknessTextureOffset = offset;
volumeMapper.ThicknessTextureScale = scale;
volumeMapper.ThicknessTextureRotation = td.Rotation;
volumeMapper.ThicknessTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
}
else
if (volume.thicknessTexture != null && IsTextureFlipped(volume.thicknessTexture.Index.Value))
if (volume.thicknessTexture != null)
{
volumeMapper.ThicknessTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
var td = await FromTextureInfo(volume.thicknessTexture);
volumeMapper.ThicknessTexture = td.Texture;
volumeMapper.ThicknessTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(volume.thicknessTexture);
if (ext != null)
{
CalculateYOffsetAndScale(volume.thicknessTexture.Index, ext, out var scale, out var offset);
volumeMapper.ThicknessTextureOffset = offset;
volumeMapper.ThicknessTextureScale = scale;
volumeMapper.ThicknessTextureRotation = td.Rotation;
volumeMapper.ThicknessTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
}
else
if (IsTextureFlipped(volume.thicknessTexture.Index.Value))
{
volumeMapper.ThicknessTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
}
}

mapper.Material.renderQueue = 3000;
Expand All @@ -345,44 +352,51 @@ void SetTransformKeyword()
iridescenceMapper.IridescenceIor = iridescence.iridescenceIor;
iridescenceMapper.IridescenceThicknessMinimum = iridescence.iridescenceThicknessMinimum;
iridescenceMapper.IridescenceThicknessMaximum = iridescence.iridescenceThicknessMaximum;
var td = await FromTextureInfo(iridescence.iridescenceTexture);
iridescenceMapper.IridescenceTexture = td.Texture;
iridescenceMapper.IridescenceTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(iridescence.iridescenceTexture);
if (ext != null)
if (iridescence.iridescenceTexture != null)
{
CalculateYOffsetAndScale(iridescence.iridescenceTexture.Index, ext, out var scale, out var offset);
iridescenceMapper.IridescenceTextureOffset = offset;
iridescenceMapper.IridescenceTextureScale = scale;
iridescenceMapper.IridescenceTextureRotation = td.Rotation;
iridescenceMapper.IridescenceTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
}
else
if (iridescence.iridescenceTexture != null && IsTextureFlipped(iridescence.iridescenceTexture.Index.Value))
{
iridescenceMapper.IridescenceTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
var td = await FromTextureInfo(iridescence.iridescenceTexture);
iridescenceMapper.IridescenceTexture = td.Texture;
iridescenceMapper.IridescenceTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(iridescence.iridescenceTexture);
if (ext != null)
{
CalculateYOffsetAndScale(iridescence.iridescenceTexture.Index, ext, out var scale, out var offset);
iridescenceMapper.IridescenceTextureOffset = offset;
iridescenceMapper.IridescenceTextureScale = scale;
iridescenceMapper.IridescenceTextureRotation = td.Rotation;
iridescenceMapper.IridescenceTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
}
else
if (IsTextureFlipped(iridescence.iridescenceTexture.Index.Value))
{
iridescenceMapper.IridescenceTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
}
}

var td2 = await FromTextureInfo(iridescence.iridescenceThicknessTexture);
iridescenceMapper.IridescenceThicknessTexture = td2.Texture;
iridescenceMapper.IridescenceThicknessTextureTexCoord = td2.TexCoord;
var ext2 = GetTextureTransform(iridescence.iridescenceThicknessTexture);
if (ext2 != null)
if (iridescence.iridescenceThicknessTexture != null)
{
CalculateYOffsetAndScale(iridescence.iridescenceThicknessTexture.Index, ext2, out var scale, out var offset);
iridescenceMapper.IridescenceThicknessTextureOffset = offset;
iridescenceMapper.IridescenceThicknessTextureScale = scale;
iridescenceMapper.IridescenceThicknessTextureRotation = td2.Rotation;
iridescenceMapper.IridescenceThicknessTextureTexCoord = td2.TexCoordExtra;
SetTransformKeyword();
}
else
if (iridescence.iridescenceThicknessTexture != null && IsTextureFlipped(iridescence.iridescenceThicknessTexture.Index.Value))
{
iridescenceMapper.IridescenceThicknessTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
var td2 = await FromTextureInfo(iridescence.iridescenceThicknessTexture);
iridescenceMapper.IridescenceThicknessTexture = td2.Texture;
iridescenceMapper.IridescenceThicknessTextureTexCoord = td2.TexCoord;
var ext2 = GetTextureTransform(iridescence.iridescenceThicknessTexture);
if (ext2 != null)
{
CalculateYOffsetAndScale(iridescence.iridescenceThicknessTexture.Index, ext2, out var scale,
out var offset);
iridescenceMapper.IridescenceThicknessTextureOffset = offset;
iridescenceMapper.IridescenceThicknessTextureScale = scale;
iridescenceMapper.IridescenceThicknessTextureRotation = td2.Rotation;
iridescenceMapper.IridescenceThicknessTextureTexCoord = td2.TexCoordExtra;
SetTransformKeyword();
}
else
if (IsTextureFlipped(iridescence.iridescenceThicknessTexture.Index.Value))
{
iridescenceMapper.IridescenceThicknessTextureScale *= new Vector2(1f, -1f);
SetTransformKeyword();
}
}

mapper.Material.SetKeyword("_IRIDESCENCE", true);
Expand All @@ -397,44 +411,52 @@ void SetTransformKeyword()
{
specularMapper.SpecularFactor = specular.specularFactor;
specularMapper.SpecularColorFactor = specular.specularColorFactor.ToUnityColorLinear();
var td = await FromTextureInfo(specular.specularTexture);
specularMapper.SpecularTexture = td.Texture;
specularMapper.SpecularTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(specular.specularTexture);
if (ext != null)
if (specular.specularTexture != null)
{
CalculateYOffsetAndScale(specular.specularTexture.Index, ext, out var scale, out var offset);
specularMapper.SpecularTextureOffset = offset;
specularMapper.SpecularTextureScale = scale;
specularMapper.SpecularTextureRotation = td.Rotation;
specularMapper.SpecularTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
}
else
if (specular.specularTexture != null && IsTextureFlipped(specular.specularTexture.Index.Value))
{
specularMapper.SpecularTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
var td = await FromTextureInfo(specular.specularTexture);
specularMapper.SpecularTexture = td.Texture;
specularMapper.SpecularTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(specular.specularTexture);
if (ext != null)
{
CalculateYOffsetAndScale(specular.specularTexture.Index, ext, out var scale,
out var offset);
specularMapper.SpecularTextureOffset = offset;
specularMapper.SpecularTextureScale = scale;
specularMapper.SpecularTextureRotation = td.Rotation;
specularMapper.SpecularTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
}
else
if (IsTextureFlipped(specular.specularTexture.Index.Value))
{
specularMapper.SpecularTextureScale *= new Vector2(1f, -1f);
SetTransformKeyword();
}
}

var td2 = await FromTextureInfo(specular.specularColorTexture);
specularMapper.SpecularColorTexture = td2.Texture;
specularMapper.SpecularColorTextureTexCoord = td2.TexCoord;
var ext2 = GetTextureTransform(specular.specularColorTexture);
if (ext2 != null)
if (specular.specularColorTexture != null)
{
CalculateYOffsetAndScale(specular.specularColorTexture.Index, ext2, out var scale, out var offset);
specularMapper.SpecularColorTextureOffset = offset;
specularMapper.SpecularColorTextureScale = scale;
specularMapper.SpecularColorTextureRotation = td2.Rotation;
specularMapper.SpecularColorTextureTexCoord = td2.TexCoordExtra;
SetTransformKeyword();
}
else
if (specular.specularColorTexture != null && IsTextureFlipped(specular.specularColorTexture.Index.Value))
{
specularMapper.SpecularColorTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
var td2 = await FromTextureInfo(specular.specularColorTexture);
specularMapper.SpecularColorTexture = td2.Texture;
specularMapper.SpecularColorTextureTexCoord = td2.TexCoord;
var ext2 = GetTextureTransform(specular.specularColorTexture);
if (ext2 != null)
{
CalculateYOffsetAndScale(specular.specularColorTexture.Index, ext2, out var scale,
out var offset);
specularMapper.SpecularColorTextureOffset = offset;
specularMapper.SpecularColorTextureScale = scale;
specularMapper.SpecularColorTextureRotation = td2.Rotation;
specularMapper.SpecularColorTextureTexCoord = td2.TexCoordExtra;
SetTransformKeyword();
}
else
if (IsTextureFlipped(specular.specularColorTexture.Index.Value))
{
specularMapper.SpecularColorTextureScale *= new Vector2(1f, -1f);
SetTransformKeyword();
}
}

mapper.Material.SetKeyword("_SPECULAR", true);
Expand All @@ -449,29 +471,41 @@ void SetTransformKeyword()
{
clearcoatMapper.ClearcoatFactor = clearcoat.clearcoatFactor;
clearcoatMapper.ClearcoatRoughnessFactor = clearcoat.clearcoatRoughnessFactor;
var td = await FromTextureInfo(clearcoat.clearcoatTexture);
clearcoatMapper.ClearcoatTexture = td.Texture;
clearcoatMapper.ClearcoatTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(clearcoat.clearcoatTexture);
if (ext != null)
if (clearcoat.clearcoatTexture != null)
{
CalculateYOffsetAndScale(clearcoat.clearcoatTexture.Index, ext, out var scale, out var offset);
clearcoatMapper.ClearcoatTextureOffset = offset;
clearcoatMapper.ClearcoatTextureScale = scale;
clearcoatMapper.ClearcoatTextureRotation = td.Rotation;
clearcoatMapper.ClearcoatTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
var td = await FromTextureInfo(clearcoat.clearcoatTexture);
clearcoatMapper.ClearcoatTexture = td.Texture;
clearcoatMapper.ClearcoatTextureTexCoord = td.TexCoord;
var ext = GetTextureTransform(clearcoat.clearcoatTexture);
if (ext != null)
{
CalculateYOffsetAndScale(clearcoat.clearcoatTexture.Index, ext, out var scale,
out var offset);
clearcoatMapper.ClearcoatTextureOffset = offset;
clearcoatMapper.ClearcoatTextureScale = scale;
clearcoatMapper.ClearcoatTextureRotation = td.Rotation;
clearcoatMapper.ClearcoatTextureTexCoord = td.TexCoordExtra;
SetTransformKeyword();
}
else
if (IsTextureFlipped(clearcoat.clearcoatTexture.Index.Value))
{
clearcoatMapper.ClearcoatTextureScale *= new Vector2(1f, -1f);
SetTransformKeyword();
}
}
else
if (clearcoat.clearcoatTexture != null && IsTextureFlipped(clearcoat.clearcoatTexture.Index.Value))

if (clearcoat.clearcoatRoughnessTexture != null)
{
clearcoatMapper.ClearcoatTextureScale *= new Vector2(1f,-1f);
SetTransformKeyword();
var td2 = await FromTextureInfo(clearcoat.clearcoatRoughnessTexture);
clearcoatMapper.ClearcoatRoughnessTexture = td2.Texture;
}

if (clearcoat.clearcoatNormalTexture != null)
{
var td3 = await FromTextureInfo(clearcoat.clearcoatNormalTexture);
clearcoatMapper.ClearcoatNormalTexture = td3.Texture;
}
var td2 = await FromTextureInfo(clearcoat.clearcoatRoughnessTexture);
clearcoatMapper.ClearcoatRoughnessTexture = td2.Texture;
var td3 = await FromTextureInfo(clearcoat.clearcoatNormalTexture);
clearcoatMapper.ClearcoatNormalTexture = td3.Texture;

mapper.Material.SetKeyword("_CLEARCOAT", true);
}
Expand Down

0 comments on commit 2647bbb

Please sign in to comment.