Browse Source

Removed archived KHR_Xmp extension

Vicente Penades 4 years ago
parent
commit
52da197fef

+ 8 - 2
build/SharpGLTF.CodeGen/Constants.cs

@@ -32,14 +32,20 @@ namespace SharpGLTF
         #endregion
         #endregion
 
 
         #region extension paths        
         #region extension paths        
+        private static string ArchivedSchemaDir => System.IO.Path.Combine(LocalRepoDirectory, "extensions", "2.0", "Archived");
         private static string KhronosSchemaDir => System.IO.Path.Combine(LocalRepoDirectory, "extensions", "2.0", "Khronos");
         private static string KhronosSchemaDir => System.IO.Path.Combine(LocalRepoDirectory, "extensions", "2.0", "Khronos");
         private static string VendorSchemaDir => System.IO.Path.Combine(LocalRepoDirectory, "extensions", "2.0", "Vendor");
         private static string VendorSchemaDir => System.IO.Path.Combine(LocalRepoDirectory, "extensions", "2.0", "Vendor");
 
 
+        internal static string ArchivedExtensionPath(string ext, string json)
+        {
+            return System.IO.Path.Combine(ArchivedSchemaDir, ext, "schema", json);
+        }
+
         internal static string KhronosExtensionPath(string ext, string json)
         internal static string KhronosExtensionPath(string ext, string json)
         {
         {
             return System.IO.Path.Combine(KhronosSchemaDir, ext, "schema", json);
             return System.IO.Path.Combine(KhronosSchemaDir, ext, "schema", json);
-        }        
-
+        }
+        
         internal static string VendorExtensionPath(string ext, string json)
         internal static string VendorExtensionPath(string ext, string json)
         {
         {
             return System.IO.Path.Combine(VendorSchemaDir, ext, "schema", json);
             return System.IO.Path.Combine(VendorSchemaDir, ext, "schema", json);

+ 1 - 1
build/SharpGLTF.CodeGen/Ext.KHR_SpecularGlossiness.cs

@@ -8,7 +8,7 @@ namespace SharpGLTF
 {
 {
     class SpecularGlossinessExtension : SchemaProcessor
     class SpecularGlossinessExtension : SchemaProcessor
     {
     {
-        private static string SchemaUri => Constants.KhronosExtensionPath("KHR_materials_pbrSpecularGlossiness", "glTF.KHR_materials_pbrSpecularGlossiness.schema.json");
+        private static string SchemaUri => Constants.ArchivedExtensionPath("KHR_materials_pbrSpecularGlossiness", "glTF.KHR_materials_pbrSpecularGlossiness.schema.json");
         public override IEnumerable<(string, SchemaType.Context)> Process()
         public override IEnumerable<(string, SchemaType.Context)> Process()
         {
         {
             var ctx = SchemaProcessing.LoadSchemaContext(SchemaUri);
             var ctx = SchemaProcessing.LoadSchemaContext(SchemaUri);

+ 0 - 57
build/SharpGLTF.CodeGen/Ext.KHR_Xmp.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using SharpGLTF.SchemaReflection;
-
-namespace SharpGLTF
-{
-    class XMPExtension : SchemaProcessor
-    {
-        private static string RootSchemaUri => Constants.KhronosExtensionPath("KHR_xmp", "glTF.KHR_xmp.schema.json");
-        private static string NodeSchemaUri => Constants.KhronosExtensionPath("KHR_xmp", "node.KHR_xmp.schema.json");
-
-        public override IEnumerable<(string, SchemaType.Context)> Process()
-        {
-            // Model extension
-
-            var ctx = SchemaProcessing.LoadSchemaContext(RootSchemaUri);
-            ctx.IgnoredByCodeEmitter("glTF Property");
-            ctx.IgnoredByCodeEmitter("glTF Child of Root Property");
-
-            /*
-            var jdict = ctx.UseClass("JsonDictionary");
-            var jlist = ctx.UseClass("JsonList");
-
-            ctx.FindClass("KHR_xmp glTF extension")
-                .GetField("@context")
-                .SetDataType(jdict);
-
-            ctx.FindClass("KHR_xmp glTF extension")
-                .GetField("packets")
-                .SetDataType(jlist);*/
-
-            /*
-            ctx.FindClass("KHR_xmp glTF extension")
-                .GetField("@context")
-                .SetDataType(typeof(Dictionary<string,Object>), true);
-            */
-
-            yield return ("ext.XMP.Model.g", ctx);
-
-            // Node extension
-
-            ctx = SchemaProcessing.LoadSchemaContext(NodeSchemaUri);
-            ctx.IgnoredByCodeEmitter("glTF Property");
-            ctx.IgnoredByCodeEmitter("glTF Child of Root Property");
-
-            yield return ("ext.XMP.Node.g", ctx);
-        }
-
-        public override void PrepareTypes(CodeGen.CSharpEmitter newEmitter, SchemaType.Context ctx)
-        {
-            newEmitter.SetRuntimeName("KHR_xmp glTF extension", "XMPPacketsCollection");
-            newEmitter.SetRuntimeName("KHR_xmp node extension", "XMPPacketReference");
-        }
-    }
-}

+ 1 - 4
build/SharpGLTF.CodeGen/Program.cs

@@ -28,10 +28,7 @@ namespace SharpGLTF
 
 
             processors.Add(new MainSchemaProcessor());
             processors.Add(new MainSchemaProcessor());
 
 
-            // ---------------------------------------------- Add extensions
-
-            // XMP
-            processors.Add(new XMPExtension());
+            // ---------------------------------------------- Add extensions            
 
 
             // material extensions       
             // material extensions       
             processors.Add(new UnlitExtension());
             processors.Add(new UnlitExtension());

+ 0 - 61
src/SharpGLTF.Core/Schema2/Generated/ext.XMP.Model.g.cs

@@ -1,61 +0,0 @@
-// <auto-generated/>
-
-//------------------------------------------------------------------------------------------------
-//      This file has been programatically generated; DON´T EDIT!
-//------------------------------------------------------------------------------------------------
-
-#pragma warning disable SA1001
-#pragma warning disable SA1027
-#pragma warning disable SA1028
-#pragma warning disable SA1121
-#pragma warning disable SA1205
-#pragma warning disable SA1309
-#pragma warning disable SA1402
-#pragma warning disable SA1505
-#pragma warning disable SA1507
-#pragma warning disable SA1508
-#pragma warning disable SA1652
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Numerics;
-using System.Text.Json;
-
-namespace SharpGLTF.Schema2
-{
-	using Collections;
-
-	/// <summary>
-	/// Metadata about the glTF asset.
-	/// </summary>
-	partial class XMPPacketsCollection : ExtraProperties
-	{
-	
-		private Object _atcontext;
-		
-		private const int _packetsMinItems = 1;
-		private List<Object> _packets;
-		
-	
-		protected override void SerializeProperties(Utf8JsonWriter writer)
-		{
-			base.SerializeProperties(writer);
-			SerializeProperty(writer, "@context", _atcontext);
-			SerializeProperty(writer, "packets", _packets, _packetsMinItems);
-		}
-	
-		protected override void DeserializeProperty(string jsonPropertyName, ref Utf8JsonReader reader)
-		{
-			switch (jsonPropertyName)
-			{
-				case "@context": _atcontext = DeserializePropertyValue<Object>(ref reader); break;
-				case "packets": DeserializePropertyList<Object>(ref reader, _packets); break;
-				default: base.DeserializeProperty(jsonPropertyName,ref reader); break;
-			}
-		}
-	
-	}
-
-}

+ 0 - 56
src/SharpGLTF.Core/Schema2/Generated/ext.XMP.Node.g.cs

@@ -1,56 +0,0 @@
-// <auto-generated/>
-
-//------------------------------------------------------------------------------------------------
-//      This file has been programatically generated; DON´T EDIT!
-//------------------------------------------------------------------------------------------------
-
-#pragma warning disable SA1001
-#pragma warning disable SA1027
-#pragma warning disable SA1028
-#pragma warning disable SA1121
-#pragma warning disable SA1205
-#pragma warning disable SA1309
-#pragma warning disable SA1402
-#pragma warning disable SA1505
-#pragma warning disable SA1507
-#pragma warning disable SA1508
-#pragma warning disable SA1652
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Numerics;
-using System.Text.Json;
-
-namespace SharpGLTF.Schema2
-{
-	using Collections;
-
-	/// <summary>
-	/// References an XMP packet listed in `KHR_xmp glTF extension`
-	/// </summary>
-	partial class XMPPacketReference : ExtraProperties
-	{
-	
-		private Int32 _packet;
-		
-	
-		protected override void SerializeProperties(Utf8JsonWriter writer)
-		{
-			base.SerializeProperties(writer);
-			SerializeProperty(writer, "packet", _packet);
-		}
-	
-		protected override void DeserializeProperty(string jsonPropertyName, ref Utf8JsonReader reader)
-		{
-			switch (jsonPropertyName)
-			{
-				case "packet": _packet = DeserializePropertyValue<Int32>(ref reader); break;
-				default: base.DeserializeProperty(jsonPropertyName,ref reader); break;
-			}
-		}
-	
-	}
-
-}