Technique parameter values may be arrays

javagl · Dec 29, 2016 · a728240 · a728240
1 parent 16cccc6
commit a728240
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/jgltf-validator/src/main/java/de/javagl/jgltf/validator/TechniqueValidator.java b/jgltf-validator/src/main/java/de/javagl/jgltf/validator/TechniqueValidator.java
@@ -26,6 +26,7 @@
  */
 package de.javagl.jgltf.validator;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
@@ -265,15 +266,32 @@ private ValidatorResult validateTechniqueParameters(
             Object value = techniqueParameters.getValue();
             if (value != null)
             {
-                if (!(value instanceof String))
+                String textureId = null;
+                if (value instanceof String)
+                {
+                    textureId = (String)value;
+                }
+                else if (value instanceof Collection<?>)
+                {
+                    Collection<?> collection = (Collection<?>)value;
+                    if (collection.size() == 0)
+                    {
+                        validatorResult.addError(
+                            "The value of techniqueParameters " 
+                            + techniqueParametersId + " is empty", context);
+                        return validatorResult;
+                    }
+                    textureId = String.valueOf(collection.iterator().next());
+                }
+                else
                 {
                     validatorResult.addWarning(
                         "The value of techniqueParameters "
                         + techniqueParametersId + " is "
                         + value.getClass().getSimpleName()
-                        + ", but should be String", context);
+                        + ", but should be String or an array of strings", 
+                        context);
                 }
-                String textureId = String.valueOf(value);
                 validatorResult.add(textureValidator.validateTexture(
                     textureId, context));
                 if (validatorResult.hasErrors())