Merge pull request #1310 from CesiumGS/gsplat-rc-autogen

Added support in the glTF codegen to force optional props as required

Author: j9liu

CesiumGltfWriter/generated/src/ModelJsonWriter.cpp

@@ -1198,17 +1198,11 @@ void writeJson(
   jsonWriter.Key("colorSpace");
   writeJson(obj.colorSpace, jsonWriter, context);
 
-  if (obj.projection !=
-      CesiumGltf::ExtensionKhrGaussianSplatting::Projection::perspective) {
-    jsonWriter.Key("projection");
-    writeJson(obj.projection, jsonWriter, context);
-  }
+  jsonWriter.Key("projection");
+  writeJson(obj.projection, jsonWriter, context);
 
-  if (obj.sortingMethod != CesiumGltf::ExtensionKhrGaussianSplatting::
-                               SortingMethod::cameraDistance) {
-    jsonWriter.Key("sortingMethod");
-    writeJson(obj.sortingMethod, jsonWriter, context);
-  }
+  jsonWriter.Key("sortingMethod");
+  writeJson(obj.sortingMethod, jsonWriter, context);
 
   writeExtensibleObject(obj, jsonWriter, context);
 

tools/generate-classes/generate.js

@@ -48,6 +48,25 @@ function generate(options, schema, writers) {
 
   const required = schema.required || [];
 
+  // Allows us to force specific optional props as required to meet occasional extension recommendations.
+  const requireOptionalProperties = thisConfig.requireOptionalProperties;
+  if (Array.isArray(requireOptionalProperties) && requireOptionalProperties.length > 0) {
+    const validProperties = Object.keys(schema.properties || {});
+    for (const property of requireOptionalProperties) {
+      if (!validProperties.includes(property)) {
+        // Skip invalid properties.
+        continue;
+      }
+
+      if (required.includes(property)) {
+        // Don't add properties to list if they're already in `required`.
+        continue;
+      }
+
+      required.push(property);
+    }
+  }
+
   const properties = Object.keys(schema.properties || {})
     .map((key) =>
       resolveProperty(

tools/generate-classes/glTF.json

@@ -165,7 +165,11 @@
       "overrideName": "ExtensionExtPrimitiveVoxels"
     },
     "KHR_gaussian_splatting glTF Mesh Primitive Extension": {
-      "overrideName": "ExtensionKhrGaussianSplatting"
+      "overrideName": "ExtensionKhrGaussianSplatting",
+      "requireOptionalProperties": [
+        "projection",
+        "sortingMethod"
+      ]
     },
     "KHR_gaussian_splatting_compression_spz_2 glTF Mesh Primitive Extension": {
       "overrideName": "ExtensionKhrGaussianSplattingCompressionSpz2"