Browse Source

SpecularGlossiness precedes MetallicRoughness

Vicente Penades 6 years ago
parent
commit
eb766bed4c

+ 6 - 2
examples/SharpGLTF.Runtime.MonoGame/ResourceManager.cs

@@ -267,7 +267,9 @@ namespace SharpGLTF.Runtime
 
 
         private static Vector3 GetDiffuseColor(Schema2.Material srcMaterial)
         private static Vector3 GetDiffuseColor(Schema2.Material srcMaterial)
         {
         {
-            var diffuse = srcMaterial.FindChannel("BaseColor");
+            var diffuse = srcMaterial.FindChannel("Diffuse");
+
+            if (diffuse == null) diffuse = srcMaterial.FindChannel("BaseColor");
 
 
             if (diffuse == null) return Vector3.One;
             if (diffuse == null) return Vector3.One;
 
 
@@ -315,7 +317,9 @@ namespace SharpGLTF.Runtime
 
 
         private Texture2D GetDiffuseTexture(Schema2.Material srcMaterial)
         private Texture2D GetDiffuseTexture(Schema2.Material srcMaterial)
         {
         {
-            var diffuse = srcMaterial.FindChannel("BaseColor");
+            var diffuse = srcMaterial.FindChannel("Diffuse");
+
+            if (diffuse == null) diffuse = srcMaterial.FindChannel("BaseColor");
 
 
             if (diffuse == null) return null;
             if (diffuse == null) return null;
 
 

+ 4 - 4
src/SharpGLTF.Toolkit/Schema2/MaterialExtensions.cs

@@ -398,10 +398,10 @@ namespace SharpGLTF.Schema2
         {
         {
             if (material == null) return defaultColor;
             if (material == null) return defaultColor;
 
 
-            var channel = material.FindChannel("BaseColor");
+            var channel = material.FindChannel("Diffuse");
             if (channel.HasValue) return channel.Value.Parameter;
             if (channel.HasValue) return channel.Value.Parameter;
 
 
-            channel = material.FindChannel("Diffuse");
+            channel = material.FindChannel("BaseColor");
             if (channel.HasValue) return channel.Value.Parameter;
             if (channel.HasValue) return channel.Value.Parameter;
 
 
             return defaultColor;
             return defaultColor;
@@ -411,10 +411,10 @@ namespace SharpGLTF.Schema2
         {
         {
             if (material == null) return null;
             if (material == null) return null;
 
 
-            var channel = material.FindChannel("BaseColor");
+            var channel = material.FindChannel("Diffuse");
             if (channel.HasValue) return channel.Value.Texture;
             if (channel.HasValue) return channel.Value.Texture;
 
 
-            channel = material.FindChannel("Diffuse");
+            channel = material.FindChannel("BaseColor");
             if (channel.HasValue) return channel.Value.Texture;
             if (channel.HasValue) return channel.Value.Texture;
 
 
             return null;
             return null;