Updated Schema Builder to match the renaming of the extensions

build/SharpGLTF.CodeGen/Ext.KHR_ClearCoat.cs

@@ -8,7 +8,9 @@ namespace SharpGLTF
 {
     class ClearCoatExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_clearcoat", "glTF.KHR_materials_clearcoat.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_clearcoat", "material.KHR_materials_clearcoat.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_materials_clearcoat glTF Material Extension";
 
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
@@ -23,7 +25,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_materials_clearcoat glTF extension", "MaterialClearCoat");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "MaterialClearCoat");
         }        
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_EmissiveStrength.cs

@@ -7,7 +7,9 @@ namespace SharpGLTF
 {
     class EmissiveStrengthExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_emissive_strength", "glTF.KHR_materials_emissive_strength.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_emissive_strength", "material.KHR_materials_emissive_strength.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_materials_emissive_strength glTF Material Extension";
 
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
@@ -16,7 +18,7 @@ namespace SharpGLTF
             ctx.IgnoredByCodeEmitter("glTF Child of Root Property");
             ctx.IgnoredByCodeEmitter("Texture Info");
 
-            var cls = ctx.FindClass("KHR_materials_emissive_strength glTF extension");
+            var cls = ctx.FindClass(ExtensionRootClassName);
             
             // straightforward extension, nothing to do
 
@@ -25,7 +27,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_materials_emissive_strength glTF extension", "MaterialEmissiveStrength");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "MaterialEmissiveStrength");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_IOR.cs

@@ -8,7 +8,10 @@ namespace SharpGLTF
 {
     class IorExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_ior", "glTF.KHR_materials_ior.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_ior", "material.KHR_materials_ior.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_materials_ior glTF Material Extension";
+
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
             var ctx = SchemaProcessing.LoadSchemaContext(SchemaUri);
@@ -22,7 +25,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_materials_ior glTF extension", "MaterialIOR");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "MaterialIOR");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_Iridescence.cs

@@ -10,7 +10,10 @@ namespace SharpGLTF
 {
     class IridescenceExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_iridescence", "glTF.KHR_materials_iridescence.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_iridescence", "material.KHR_materials_iridescence.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_materials_iridescence glTF Material Extension";
+
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
             var ctx = SchemaProcessing.LoadSchemaContext(SchemaUri);
@@ -24,7 +27,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_materials_iridescence glTF extension", "MaterialIridescence");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "MaterialIridescence");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_LightsPunctual.cs

@@ -11,6 +11,11 @@ namespace SharpGLTF
         private static string RootSchemaUri => Constants.KhronosExtensionPath("KHR_lights_punctual", "glTF.KHR_lights_punctual.schema.json");
         private static string NodeSchemaUri => Constants.KhronosExtensionPath("KHR_lights_punctual", "node.KHR_lights_punctual.schema.json");
 
+        private const string ExtensionRootClassName = "KHR_lights_punctual glTF Document Extension";
+        private const string ExtensionNodeClassName = "KHR_lights_punctual glTF Node Extension";
+        private const string ExtensionLightClassName = "KHR_lights_punctual Light Properties";
+        private const string ExtensionLightSpotClassName = "KHR_lights_punctual Light Spot Properties";
+
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {            
             yield return ("ext.ModelLightsPunctual.g", ProcessModel());
@@ -22,7 +27,7 @@ namespace SharpGLTF
             ctx.IgnoredByCodeEmitter("glTF Property");
             ctx.IgnoredByCodeEmitter("glTF Child of Root Property");
 
-            ctx.FindClass("light")
+            ctx.FindClass(ExtensionLightClassName)
                 .GetField("color")
                 .SetDataType(typeof(System.Numerics.Vector3), true)
                 .SetDefaultValue("Vector3.One")
@@ -40,10 +45,10 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("light", "PunctualLight");
-            newEmitter.SetRuntimeName("light/spot", "PunctualLightSpot");
-            newEmitter.SetRuntimeName("KHR_lights_punctual glTF extension", "_ModelPunctualLights");
-            newEmitter.SetRuntimeName("KHR_lights_punctual node extension", "_NodePunctualLight");
+            newEmitter.SetRuntimeName(ExtensionLightClassName, "PunctualLight");
+            newEmitter.SetRuntimeName(ExtensionLightSpotClassName, "PunctualLightSpot");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "_ModelPunctualLights");
+            newEmitter.SetRuntimeName(ExtensionNodeClassName, "_NodePunctualLight");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_Sheen.cs

@@ -8,7 +8,10 @@ namespace SharpGLTF
 {
     class SheenExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_sheen", "glTF.KHR_materials_sheen.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_sheen", "material.KHR_materials_sheen.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_materials_sheen glTF Material Extension";
+
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
             var ctx = SchemaProcessing.LoadSchemaContext(SchemaUri);
@@ -18,13 +21,13 @@ namespace SharpGLTF
             ctx.IgnoredByCodeEmitter("Material Normal Texture Info");
 
 
-            ctx.FindClass("KHR_materials_sheen glTF extension")
+            ctx.FindClass(ExtensionRootClassName)
                 .GetField("sheenColorFactor")
                 .SetDataType(typeof(System.Numerics.Vector3), true)
                 .SetDefaultValue("Vector3.Zero")
                 .SetItemsRange(0);
 
-            ctx.FindClass("KHR_materials_sheen glTF extension")
+            ctx.FindClass(ExtensionRootClassName)
                 .GetField("sheenRoughnessFactor")
                 .SetDataType(typeof(float), true)
                 .SetItemsRange(0);
@@ -34,7 +37,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_materials_sheen glTF extension", "MaterialSheen");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "MaterialSheen");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_Specular.cs

@@ -8,7 +8,10 @@ namespace SharpGLTF
 {
     class SpecularExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_specular", "glTF.KHR_materials_specular.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_specular", "material.KHR_materials_specular.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_materials_specular glTF Material Extension";
+
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
             var ctx = SchemaProcessing.LoadSchemaContext(SchemaUri);
@@ -17,7 +20,7 @@ namespace SharpGLTF
             ctx.IgnoredByCodeEmitter("Texture Info");
             ctx.IgnoredByCodeEmitter("Material Normal Texture Info");
 
-            ctx.FindClass("KHR_materials_specular glTF extension")
+            ctx.FindClass(ExtensionRootClassName)
                 .GetField("specularColorFactor")
                 .SetDataType(typeof(System.Numerics.Vector3), true)
                 .SetDefaultValue("Vector3.One")
@@ -28,7 +31,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_materials_specular glTF extension", "MaterialSpecular");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "MaterialSpecular");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_TextureBasisU.cs

@@ -10,6 +10,8 @@ namespace SharpGLTF
     {
         private static string SchemaUri => Constants.KhronosExtensionPath("KHR_texture_basisu", "texture.KHR_texture_basisu.schema.json");
 
+        private const string ExtensionRootClassName = "KHR_texture_basisu glTF Texture Extension";
+
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
             var ctx = SchemaProcessing.LoadSchemaContext(SchemaUri);
@@ -20,7 +22,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_texture_basisu glTF extension", "TextureKTX2");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "TextureKTX2");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_TextureTransform.cs

@@ -8,7 +8,9 @@ namespace SharpGLTF
 {
     class TextureTransformExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_texture_transform", "KHR_texture_transform.textureInfo.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_texture_transform", "textureInfo.KHR_texture_transform.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_texture_transform glTF TextureInfo Extension";
 
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
@@ -16,7 +18,7 @@ namespace SharpGLTF
             ctx.IgnoredByCodeEmitter("glTF Property");
             ctx.IgnoredByCodeEmitter("glTF Child of Root Property");
 
-            var tex = ctx.FindClass("KHR_texture_transform textureInfo extension");
+            var tex = ctx.FindClass(ExtensionRootClassName);
 
             tex.GetField("offset")
                 .SetDataType(typeof(System.Numerics.Vector2), true)
@@ -33,7 +35,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_texture_transform textureInfo extension", "TextureTransform");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "TextureTransform");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_Transmission.cs

@@ -8,7 +8,10 @@ namespace SharpGLTF
 {
     class TransmissionExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_transmission", "glTF.KHR_materials_transmission.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_transmission", "material.KHR_materials_transmission.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_materials_transmission glTF Material Extension";
+
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
             var ctx = SchemaProcessing.LoadSchemaContext(SchemaUri);
@@ -22,7 +25,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_materials_transmission glTF extension", "MaterialTransmission");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "MaterialTransmission");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_Unlit.cs

@@ -8,7 +8,9 @@ namespace SharpGLTF
 {
     class UnlitExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_unlit", "glTF.KHR_materials_unlit.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_unlit", "material.KHR_materials_unlit.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_materials_unlit glTF Material Extension";
 
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
@@ -21,7 +23,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_materials_unlit glTF extension", "MaterialUnlit");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "MaterialUnlit");
         }
     }
 }

build/SharpGLTF.CodeGen/Ext.KHR_Volume.cs

@@ -7,7 +7,9 @@ namespace SharpGLTF
 {
     class VolumeExtension : SchemaProcessor
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_volume", "glTF.KHR_materials_volume.schema.json");
+        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_volume", "material.KHR_materials_volume.schema.json");
+
+        private const string ExtensionRootClassName = "KHR_materials_volume glTF Material Extension";
 
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
@@ -16,7 +18,7 @@ namespace SharpGLTF
             ctx.IgnoredByCodeEmitter("glTF Child of Root Property");
             ctx.IgnoredByCodeEmitter("Texture Info");
 
-            var cls = ctx.FindClass("KHR_materials_volume glTF extension");
+            var cls = ctx.FindClass(ExtensionRootClassName);
 
             cls.GetField("attenuationColor")
                 .SetDataType(typeof(System.Numerics.Vector3), true)
@@ -28,7 +30,7 @@ namespace SharpGLTF
 
         public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
-            newEmitter.SetRuntimeName("KHR_materials_volume glTF extension", "MaterialVolume");
+            newEmitter.SetRuntimeName(ExtensionRootClassName, "MaterialVolume");
         }
     }
 }