finish the 7 generic tests

src/SharpGLTF.Ext.3DTiles/Schema2/Ext.Features.cs

@@ -24,7 +24,7 @@ namespace SharpGLTF.Schema2
 
         internal static void ValidateFeatureIdContent(this IMeshFeatureIDInfo featureId)
         {
-            Guard.MustBeGreaterThanOrEqualTo((int)featureId.FeatureCount, 1, nameof(featureId.FeatureCount));
+            Guard.MustBeGreaterThanOrEqualTo(featureId.FeatureCount, 1, nameof(featureId.FeatureCount));
 
             if (featureId.NullFeatureId.HasValue)
             {
@@ -35,7 +35,6 @@ namespace SharpGLTF.Schema2
                 var regex = "^[a-zA-Z_][a-zA-Z0-9_]*$";
                 Guard.IsTrue(System.Text.RegularExpressions.Regex.IsMatch(featureId.Label, regex), nameof(featureId.Label));
             }
-
             if (featureId.Attribute.HasValue)
             {
                 Guard.MustBeGreaterThanOrEqualTo((int)featureId.Attribute, 0, nameof(featureId.Attribute));
@@ -269,7 +268,6 @@ namespace SharpGLTF.Schema2
                         var expectedVertexAttribute = $"_FEATURE_ID_{featureId.Attribute}";
                         var featureIdVertex = _meshPrimitive.GetVertexAccessor(expectedVertexAttribute);
                         Guard.NotNull(featureIdVertex, expectedVertexAttribute, $"The primitive should have custom vertex attribute {expectedVertexAttribute}.");
-                        Guard.IsTrue(!featureIdVertex.Normalized, expectedVertexAttribute, $"The custom vertex attribute {expectedVertexAttribute} should not be normalized.");
                     }
 
                     featureId.ValidateFeatureIdReferences(_meshPrimitive.LogicalParent.LogicalParent);
@@ -283,28 +281,6 @@ namespace SharpGLTF.Schema2
 
                         var modelRoot = _meshPrimitive.LogicalParent.LogicalParent;
                         validate.IsNullOrIndex(nameof(texture), texture.TextureCoordinate, modelRoot.LogicalTextures);
-
-                        var samplers = modelRoot.LogicalTextureSamplers;
-                        foreach(var sampler in samplers)
-                        {
-                            Guard.IsTrue(sampler.MagFilter == TextureInterpolationFilter.NEAREST, $"Texture magnification filter must be 9728 (NEAREST) but is set to {sampler.MagFilter}");
-                            Guard.IsTrue(sampler.MinFilter == TextureMipMapFilter.NEAREST, $"Texture minification filtering must be 9728 (NEAREST) but is set to {sampler.MinFilter}");
-                        }
-
-                        // check on channels as workaround
-                        // better solution: read the channels of the used texture
-                        // var logicalTexture = modelRoot.LogicalTextures[texture.TextureCoordinate];
-                        // var image = logicalTexture.PrimaryImage;
-                        var channels = texture.GetChannels();
-
-                        // chack that the length of channels list is maximum 4
-                        Guard.IsTrue(channels.Count <= 4, $"The number of channels must be maximum 4 but is {channels.Count}");
-
-                        // check that value in channels is minimum 0 and maximum 3
-                        foreach (var channel in channels)
-                        {
-                            Guard.IsTrue(channel >= 0 && channel <= 3, $"Channel value must be between 0 and 3 but has channel {channel}");
-                        }
                     }
                 }
 
@@ -313,8 +289,6 @@ namespace SharpGLTF.Schema2
 
             protected override void OnValidateContent(ValidationContext validate)
             {
-                var extMeshFeatures = _meshPrimitive.Extensions.Where(item => item is MeshExtMeshFeatures).FirstOrDefault();
-                validate.NotNull(nameof(extMeshFeatures), extMeshFeatures);
                 validate.NotNull(nameof(FeatureIds), _featureIds);
                 validate.IsTrue(nameof(FeatureIds), _featureIds.Count > 0, "FeatureIds has items");
 
@@ -326,6 +300,8 @@ namespace SharpGLTF.Schema2
                     {
                         var expectedVertexAttribute = $"_FEATURE_ID_{featureId.Attribute}";
                         var vertex = _meshPrimitive.GetVertexAccessor(expectedVertexAttribute);
+                        Guard.IsTrue(!vertex.Normalized, expectedVertexAttribute, $"The custom vertex attribute {expectedVertexAttribute} should not be normalized.");
+
                         var distinctFeatureIds = vertex.AsScalarArray().Distinct().ToList();
 
                         if (featureId.NullFeatureId.HasValue)
@@ -333,9 +309,27 @@ namespace SharpGLTF.Schema2
                             distinctFeatureIds.Remove(featureId.NullFeatureId.Value);
                         }
 
+                        if (distinctFeatureIds.Min() < 0)
+                        {
+                            Guard.IsTrue(distinctFeatureIds.Min() >= 0, nameof(distinctFeatureIds), $"FeatureIds must be equal or larger than 0, but contains {distinctFeatureIds.Min()}");
+                        }
+
                         var count = distinctFeatureIds.Count();
+
                         // FeatureCount must be greater or equal to the number of distinct feature ids
                         Guard.IsTrue(featureId.FeatureCount >= count, $"Mismatch between FeatureCount ({featureId.FeatureCount}) and Feature Attribute ({count})");
+
+                        if (featureId.PropertyTableIndex.HasValue)
+                        {
+                            var root = _meshPrimitive.LogicalParent.LogicalParent;
+                            var metadataExtension = root.GetExtension<EXTStructuralMetadataRoot>();
+                            var propertyTable = metadataExtension.PropertyTables[featureId.PropertyTableIndex.Value];
+                            var propertyCount = propertyTable.Count;
+                            Guard.IsTrue(distinctFeatureIds.Max() <= propertyCount - 1, nameof(propertyCount),
+                                $"The feature ID refers to a property table with {propertyCount} rows, so the feature IDs must be in the range [0,{propertyCount-1}], but the feature ID attribute contains values [{distinctFeatureIds.Min()},{distinctFeatureIds.Max()}]");
+                        }
+
+
                     }
                     var texture = featureId.GetTexture();
                     if (texture != null)
@@ -345,9 +339,31 @@ namespace SharpGLTF.Schema2
                         var distinctFeatureIds = vertex.AsVector2Array().Count();
 
                         Guard.IsTrue(featureId.FeatureCount == distinctFeatureIds, $"Mismatch between FeatureCount ({featureId.FeatureCount}) and Feature Texture ({distinctFeatureIds})");
-                    }
 
+                        var modelRoot = _meshPrimitive.LogicalParent.LogicalParent;
+
+                        var samplers = modelRoot.LogicalTextureSamplers;
+                        foreach (var sampler in samplers)
+                        {
+                            Guard.IsTrue(sampler.MagFilter == TextureInterpolationFilter.NEAREST, $"Texture magnification filter must be 9728 (NEAREST) but is set to {sampler.MagFilter}");
+                            Guard.IsTrue(sampler.MinFilter == TextureMipMapFilter.NEAREST, $"Texture minification filtering must be 9728 (NEAREST) but is set to {sampler.MinFilter}");
+                        }
+
+                        // check on channels as workaround
+                        // better solution: read the channels of the used texture
+                        var logicalTexture = modelRoot.LogicalTextures[texture.TextureCoordinate];
+                        // var image = logicalTexture.PrimaryImage;
+                        var channels = texture.GetChannels();
+
+                        // chack that the length of channels list is maximum 4
+                        Guard.IsTrue(channels.Count <= 4, $"The number of channels must be maximum 4 but is {channels.Count}");
 
+                        // check that value in channels is minimum 0 and maximum 3
+                        foreach (var channel in channels)
+                        {
+                            Guard.IsTrue(channel >= 0 && channel <= 3, $"Channel value must be between 0 and 3 but has channel {channel}");
+                        }
+                    }
                 }
 
                 base.OnValidateContent(validate);

tests/SharpGLTF.Cesium.Tests/GenericTests.cs

@@ -1,9 +1,7 @@
 using NUnit.Framework;
 using SharpGLTF.Schema2;
-using SharpGLTF.Schema2.Tiles3D;
 using SharpGLTF.Validation;
 using System;
-using System.IO;
 
 namespace SharpGLTF
 {
@@ -20,7 +18,7 @@ namespace SharpGLTF
         // Test files are from https://github.com/CesiumGS/3d-tiles-validator/tree/main/specs/data/gltfExtensions/
 
         [Test(Description = "Reads generic 3D Tiles glTF's")]
-        // todo: [TestCase("FeatureIdAttributeAndPropertyTableFeatureIdNotInRange.gltf, typeof(ModelException)")]
+        [TestCase("FeatureIdAttributeAndPropertyTableFeatureIdNotInRange.gltf", typeof(ModelException))]
         [TestCase("FeatureIdAttributePropertyTableInvalidValue.gltf", typeof(ModelException))]
         [TestCase("FeatureIdAttributePropertyTableWithoutPropertyTables.gltf", typeof(ModelException))]
         [TestCase("FeatureIdAttributePropertyTableWithoutStructuralMetadata.gltf", typeof(ModelException))]