Improved support for modifying glTF models

.gitignore

@@ -24,6 +24,8 @@
 /jgltf-experiments-extensions
 /jgltf-impl-v2-ext-draco-mesh-compression
 /jgltf-draco-test
+/jgltf-impl-v2-ext-meshopt-compression
+/jgltf-model-ext-meshopt-compression
 # ---
 
 # Preliminary for extension experiments:
@@ -37,6 +39,12 @@
 #/jgltf-model-khr-materials-variants
 #/jgltf-model-khr-materials-clearcoat/
 #/jgltf-model-khr-texture-transform
+
+/jgltf-model-transform/.classpath
+/jgltf-model-transform/.settings
+/jgltf-model-transform/.project
+/jgltf-model-transform/target
+
 # ---
 
 /jgltf-impl-v2-ext-mesh-gpu-instancing/.classpath

jgltf-impl-v2/src/main/java/de/javagl/jgltf/impl/v2/Accessor.java

@@ -168,8 +168,8 @@ public void setComponentType(Integer componentType) {
         if (componentType == null) {
             throw new NullPointerException((("Invalid value for componentType: "+ componentType)+", may not be null"));
         }
-        if ((((((componentType!= 5120)&&(componentType!= 5121))&&(componentType!= 5122))&&(componentType!= 5123))&&(componentType!= 5125))&&(componentType!= 5126)) {
-            throw new IllegalArgumentException((("Invalid value for componentType: "+ componentType)+", valid: [5120, 5121, 5122, 5123, 5125, 5126]"));
+        if ((((((componentType!= 5120)&&(componentType!= 5121))&&(componentType!= 5122))&&(componentType!= 5123))&&(componentType!= 5125))&&(componentType!= 5126)&&(componentType!= 5130)&&(componentType!= 5131)) {
+            throw new IllegalArgumentException((("Invalid value for componentType: "+ componentType)+", valid: [5120, 5121, 5122, 5123, 5125, 5126, 5130, 5131]"));
         }
         this.componentType = componentType;
     }

jgltf-model-ext-mesh-gpu-instancing/src/main/java/de/javagl/jgltf/model/ext/mesh_gpu_instancing/DefaultMeshGpuInstancingModel.java

@@ -26,9 +26,12 @@
  */
 package de.javagl.jgltf.model.ext.mesh_gpu_instancing;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
 
@@ -92,4 +95,27 @@ public Set<ModelElement> getReferencedModelElements()
         return modelElements;
     }
 
+    @Override
+    public boolean removeModelElements(
+        Collection<? extends ModelElement> modelElementsToRemove) 
+    {
+        removeExtensionModelElements(modelElementsToRemove);
+        Set<String> keysToRemove = new LinkedHashSet<String>();
+        for (Entry<String, AccessorModel> entry : attributes.entrySet())
+        {
+            String key = entry.getKey();
+            AccessorModel value = entry.getValue();
+            if (modelElementsToRemove.contains(value))
+            {
+                keysToRemove.add(key);
+            }
+        }
+        for (String keyToRemove : keysToRemove)
+        {
+            attributes.remove(keyToRemove);
+        }
+        return attributes.isEmpty();
+    }
+
+
 }

jgltf-model-khr-lights-punctual/src/main/java/de/javagl/jgltf/model/khr/lights_punctual/DefaultLightModel.java

@@ -26,6 +26,7 @@
  */
 package de.javagl.jgltf.model.khr.lights_punctual;
 
+import java.util.Collection;
 import java.util.Set;
 
 import de.javagl.jgltf.model.ModelElement;
@@ -114,4 +115,12 @@ public Set<ModelElement> getReferencedModelElements()
         return modelElements;
     }
 
+    @Override
+    public boolean removeModelElements(
+        Collection<? extends ModelElement> modelElementsToRemove) 
+    {
+        removeExtensionModelElements(modelElementsToRemove);
+        return false;
+    }
+
 }

jgltf-model-khr-lights-punctual/src/main/java/de/javagl/jgltf/model/khr/lights_punctual/DefaultLightsPunctualModel.java

@@ -27,6 +27,7 @@
 package de.javagl.jgltf.model.khr.lights_punctual;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -88,4 +89,13 @@ public Set<ModelElement> getReferencedModelElements()
         return modelElements;
     }
 
+    @Override
+    public boolean removeModelElements(
+        Collection<? extends ModelElement> modelElementsToRemove) 
+    {
+        removeExtensionModelElements(modelElementsToRemove);
+        lightModels.removeAll(modelElementsToRemove);
+        return lightModels.isEmpty();
+    }
+
 }

jgltf-model-khr-materials-clearcoat/src/main/java/de/javagl/jgltf/model/khr/materials_clearcoat/DefaultMaterialsClearcoatModel.java

@@ -26,6 +26,7 @@
  */
 package de.javagl.jgltf.model.khr.materials_clearcoat;
 
+import java.util.Collection;
 import java.util.Set;
 
 import de.javagl.jgltf.model.ModelElement;
@@ -149,4 +150,25 @@ public Set<ModelElement> getReferencedModelElements()
         return modelElements;
     }
 
+    @Override
+    public boolean removeModelElements(
+        Collection<? extends ModelElement> modelElementsToRemove) 
+    {
+        removeExtensionModelElements(modelElementsToRemove);
+        if (modelElementsToRemove.contains(clearcoatTextureInfoModel)) 
+        {
+            setClearcoatTextureInfoModel(null);
+        }
+        if (modelElementsToRemove.contains(clearcoatRoughnessTextureInfoModel)) 
+        {
+            setClearcoatRoughnessTextureInfoModel(null);
+        }
+        if (modelElementsToRemove.contains(clearcoatNormalTextureInfoModel)) 
+        {
+            setClearcoatNormalTextureInfoModel(null);
+        }
+        return false;
+    }
+
+
 }

jgltf-model-khr-materials-variants/src/main/java/de/javagl/jgltf/model/khr/materials_variants/DefaultMaterialsVariantsModel.java

@@ -27,6 +27,7 @@
 package de.javagl.jgltf.model.khr.materials_variants;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -88,5 +89,13 @@ public Set<ModelElement> getReferencedModelElements()
         return modelElements;
     }
 
+    @Override
+    public boolean removeModelElements(
+        Collection<? extends ModelElement> modelElementsToRemove) 
+    {
+        removeExtensionModelElements(modelElementsToRemove);
+        return false;
+    }
+
 }
 

jgltf-model-khr-materials-variants/src/main/java/de/javagl/jgltf/model/khr/materials_variants/DefaultMeshPrimitiveMaterialsVariantsModel.java

@@ -26,8 +26,11 @@
  */
 package de.javagl.jgltf.model.khr.materials_variants;
 
+import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import de.javagl.jgltf.model.MaterialModel;
@@ -110,4 +113,27 @@ public Set<ModelElement> getReferencedModelElements()
         return modelElements;
     }
 
+    @Override
+    public boolean removeModelElements(
+        Collection<? extends ModelElement> modelElementsToRemove) 
+    {
+        removeExtensionModelElements(modelElementsToRemove);
+        Set<String> keysToRemove = new LinkedHashSet<String>();
+        for (Entry<String, MaterialModel> entry : materials.entrySet())
+        {
+            String key = entry.getKey();
+            MaterialModel value = entry.getValue();
+            if (modelElementsToRemove.contains(value))
+            {
+                keysToRemove.add(key);
+            }
+        }
+        for (String keyToRemove : keysToRemove)
+        {
+            materials.remove(keyToRemove);
+        }
+        return materials.isEmpty();
+    }
+
+
 }

jgltf-model-khr-texture-transform/src/main/java/de/javagl/jgltf/model/khr/texture_transform/DefaultTextureTransformModel.java

@@ -26,6 +26,7 @@
  */
 package de.javagl.jgltf.model.khr.texture_transform;
 
+import java.util.Collection;
 import java.util.Set;
 
 import de.javagl.jgltf.model.ModelElement;
@@ -122,5 +123,13 @@ public Set<ModelElement> getReferencedModelElements()
         return modelElements;
     }
 
+    @Override
+    public boolean removeModelElements(
+        Collection<? extends ModelElement> modelElementsToRemove) 
+    {
+        removeExtensionModelElements(modelElementsToRemove);
+        return false;
+    }
+
 
 }

jgltf-model-transform/README.md

@@ -0,0 +1,6 @@
+# jgltf-model-transform 
+
+Classes for transforming glTF model instances
+
+**Note:** This library is still subject to change.
+

jgltf-model-transform/pom.xml

@@ -0,0 +1,50 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>de.javagl</groupId>
+    <artifactId>jgltf-parent</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>jgltf-model-transform</artifactId>
+  <packaging>jar</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>de.javagl</groupId>
+      <artifactId>jgltf-model</artifactId>
+      <version>2.0.5-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>de.javagl</groupId>
+      <artifactId>jgltf-impl-v1</artifactId>
+      <version>2.0.5-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>de.javagl</groupId>
+      <artifactId>jgltf-impl-v2</artifactId>
+      <version>2.0.5-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>