Fixed Material Volume Extension default values. Closes #215

vpenades · Jan 24, 2024 · 8a7e74d · 8a7e74d
1 parent 6a7a68b
commit 8a7e74d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/SharpGLTF.Core/Schema2/gltf.MaterialsFactory.cs b/src/SharpGLTF.Core/Schema2/gltf.MaterialsFactory.cs
@@ -593,7 +593,7 @@ private TextureInfo _GetThicknessTexture(bool create)
         public float ThicknessFactor
         {
             get => (float)_thicknessFactor.AsValue(_thicknessFactorDefault);
-            set => _thicknessFactor = ((double)value).AsNullable(_thicknessFactorDefault);
+            set => _thicknessFactor = ((double)value).AsNullable(_thicknessFactorDefault, _thicknessFactorMinimum, double.PositiveInfinity);
         }
 
         public Vector3 AttenuationColor
@@ -604,8 +604,8 @@ public Vector3 AttenuationColor
 
         public float AttenuationDistance
         {
-            get => (float)_attenuationDistance.AsValue(0);
-            set => _attenuationDistance = value > _attenuationDistanceExclusiveMinimum ? value : throw new ArgumentOutOfRangeException(nameof(value));
+            get => (float)_attenuationDistance.AsValue(float.PositiveInfinity);
+            set => _attenuationDistance = ((double)value).AsNullable(double.PositiveInfinity, _attenuationDistanceExclusiveMinimum, double.PositiveInfinity);
         }
 
         public IEnumerable<MaterialChannel> GetChannels(Material material)

diff --git a/src/SharpGLTF.Toolkit/Materials/MaterialEnums.cs b/src/SharpGLTF.Toolkit/Materials/MaterialEnums.cs
@@ -189,7 +189,7 @@ private static IEnumerable<_Property> _CreateDefaultProperties(KnownChannel key)
                 case KnownChannel.VolumeThickness: yield return new _Property(KnownProperty.ThicknessFactor, 0f); break;
                 case KnownChannel.VolumeAttenuation:
                     yield return new _Property(KnownProperty.RGB, Vector3.One);
-                    yield return new _Property(KnownProperty.AttenuationDistance, 0f);
+                    yield return new _Property(KnownProperty.AttenuationDistance, float.PositiveInfinity);
                     break;
 
                 default: throw new NotImplementedException();