Browse Source

Merge branch 'add_cesium_ext_instance_features' of https://github.com/bertt/SharpGLTF into add_cesium_ext_instance_features

Bert Temme 2 years ago
parent
commit
4c8f09c102

+ 3 - 3
build/SharpGLTF.CodeGen/Ext.EXT_InstanceFeatures.cs

@@ -8,7 +8,7 @@ namespace SharpGLTF
     {
     {
         public override string GetTargetProject() { return Constants.CesiumProjectDirectory; }
         public override string GetTargetProject() { return Constants.CesiumProjectDirectory; }
 
 
-        private static string RootSchemaUri => Constants.CustomExtensionsPath("EXT_instance_features", "node.EXT_instance_features.schema.json");
+        private static string NodeSchemaUri => Constants.CustomExtensionsPath("EXT_instance_features", "node.EXT_instance_features.schema.json");
 
 
         public override void PrepareTypes(CSharpEmitter newEmitter, SchemaType.Context ctx)
         public override void PrepareTypes(CSharpEmitter newEmitter, SchemaType.Context ctx)
         {
         {
@@ -23,11 +23,11 @@ namespace SharpGLTF
 
 
         private static SchemaType.Context ProcessNode()
         private static SchemaType.Context ProcessNode()
         {
         {
-            var ctx = SchemaProcessing.LoadSchemaContext(RootSchemaUri);
+            var ctx = SchemaProcessing.LoadSchemaContext(NodeSchemaUri);
             ctx.IgnoredByCodeEmitter("glTF Property");
             ctx.IgnoredByCodeEmitter("glTF Property");
             ctx.IgnoredByCodeEmitter("glTF Child of Root Property");
             ctx.IgnoredByCodeEmitter("glTF Child of Root Property");
             ctx.IgnoredByCodeEmitter("Texture Info");
             ctx.IgnoredByCodeEmitter("Texture Info");
             return ctx;
             return ctx;
         }
         }
     }
     }
-}
+}

+ 1 - 1
tests/SharpGLTF.Cesium.Tests/SharpGLTF.Cesium.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
 
 
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net471;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net471;net6.0-windows;net8.0-windows</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <IsPackable>false</IsPackable>
     <RootNamespace>SharpGLTF</RootNamespace>
     <RootNamespace>SharpGLTF</RootNamespace>
     <LangVersion>latest</LangVersion>
     <LangVersion>latest</LangVersion>