Browse Source

Renamed Extension projects

vpenades 2 years ago
parent
commit
be3d145dd2
27 changed files with 25 additions and 25 deletions
  1. 13 13
      SharpGLTF.sln
  2. 0 0
      src/SharpGLTF.Ext.3DTiles/Memory/BinaryTable.cs
  3. 5 5
      src/SharpGLTF.Ext.3DTiles/Schema2/3DTilesExtensions.cs
  4. 1 1
      src/SharpGLTF.Ext.3DTiles/Schema2/Ext.CESIUM_primitive_outline.cs
  5. 0 0
      src/SharpGLTF.Ext.3DTiles/Schema2/Ext.InstanceFeatures.cs
  6. 0 0
      src/SharpGLTF.Ext.3DTiles/Schema2/Ext.MeshFeatures.cs
  7. 1 1
      src/SharpGLTF.Ext.3DTiles/Schema2/Ext.StructuralMetadataPrimitive.cs
  8. 0 0
      src/SharpGLTF.Ext.3DTiles/Schema2/Ext.StructuralMetadataRoot.cs
  9. 0 0
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_instance_features.g.cs
  10. 0 0
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_mesh_features.g.cs
  11. 0 0
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_primitive.g.cs
  12. 0 0
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_root.g.cs
  13. 0 0
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_primitive_outline.g.cs
  14. 0 0
      src/SharpGLTF.Ext.3DTiles/SharpGLTF.Ext.3DTiles.csproj
  15. 0 0
      src/SharpGLTF.Ext.Agi/SharpGLTF.Ext.Agi.csproj
  16. 0 0
      src/SharpGLTF.Ext.Agi/schema2/AgiExtensions.cs
  17. 0 0
      src/SharpGLTF.Ext.Agi/schema2/agi.Articulations.cs
  18. 0 0
      src/SharpGLTF.Ext.Agi/schema2/agi.StkMetadata.cs
  19. 0 0
      src/SharpGLTF.Ext.Agi/schema2/generated/ext.AgiNodeArticulations.g.cs
  20. 0 0
      src/SharpGLTF.Ext.Agi/schema2/generated/ext.AgiNodeStkMetadata.g.cs
  21. 0 0
      src/SharpGLTF.Ext.Agi/schema2/generated/ext.AgiRootArticulations.g.cs
  22. 0 0
      src/SharpGLTF.Ext.Agi/schema2/generated/ext.AgiRootStkMetadata.g.cs
  23. 1 1
      tests/SharpGLTF.Cesium.Tests/ExtInstanceFeaturesTests.cs
  24. 1 1
      tests/SharpGLTF.Cesium.Tests/ExtMeshFeaturesTests.cs
  25. 1 1
      tests/SharpGLTF.Cesium.Tests/ExtPrimitiveOutlineTests.cs
  26. 1 1
      tests/SharpGLTF.Cesium.Tests/ExtStructuralMetadataTests.cs
  27. 1 1
      tests/SharpGLTF.Cesium.Tests/SharpGLTF.Cesium.Tests.csproj

+ 13 - 13
SharpGLTF.sln

@@ -59,11 +59,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Runtime", "src\Sh
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Runtime.Tests", "tests\SharpGLTF.Runtime.Tests\SharpGLTF.Runtime.Tests.csproj", "{3925E45C-E7AA-4396-9567-4D8B1D1EF1C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Cesium", "src\SharpGLTF.Cesium\SharpGLTF.Cesium.csproj", "{9FA2AFB3-B150-428D-9D6C-48F60010FFF3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Cesium.Tests", "tests\SharpGLTF.Cesium.Tests\SharpGLTF.Cesium.Tests.csproj", "{94011062-791E-4D34-ACA8-09AAAD49B299}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Agi", "src\SharpGLTF.Agi\SharpGLTF.Agi.csproj", "{6BEBBB6A-932F-4AF2-B1D9-3B533BE2C8F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Ext.3DTiles", "src\SharpGLTF.Ext.3DTiles\SharpGLTF.Ext.3DTiles.csproj", "{F98E7E4B-EF27-48A0-BA56-730F14CEEEE1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpGLTF.Ext.Agi", "src\SharpGLTF.Ext.Agi\SharpGLTF.Ext.Agi.csproj", "{6AB07AED-3DCE-422D-BE87-9379806F685C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -135,18 +135,18 @@ Global
 		{3925E45C-E7AA-4396-9567-4D8B1D1EF1C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3925E45C-E7AA-4396-9567-4D8B1D1EF1C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3925E45C-E7AA-4396-9567-4D8B1D1EF1C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9FA2AFB3-B150-428D-9D6C-48F60010FFF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FA2AFB3-B150-428D-9D6C-48F60010FFF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FA2AFB3-B150-428D-9D6C-48F60010FFF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9FA2AFB3-B150-428D-9D6C-48F60010FFF3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{94011062-791E-4D34-ACA8-09AAAD49B299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{94011062-791E-4D34-ACA8-09AAAD49B299}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{94011062-791E-4D34-ACA8-09AAAD49B299}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{94011062-791E-4D34-ACA8-09AAAD49B299}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6BEBBB6A-932F-4AF2-B1D9-3B533BE2C8F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BEBBB6A-932F-4AF2-B1D9-3B533BE2C8F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BEBBB6A-932F-4AF2-B1D9-3B533BE2C8F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6BEBBB6A-932F-4AF2-B1D9-3B533BE2C8F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F98E7E4B-EF27-48A0-BA56-730F14CEEEE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F98E7E4B-EF27-48A0-BA56-730F14CEEEE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F98E7E4B-EF27-48A0-BA56-730F14CEEEE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F98E7E4B-EF27-48A0-BA56-730F14CEEEE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AB07AED-3DCE-422D-BE87-9379806F685C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AB07AED-3DCE-422D-BE87-9379806F685C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AB07AED-3DCE-422D-BE87-9379806F685C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AB07AED-3DCE-422D-BE87-9379806F685C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -168,9 +168,9 @@ Global
 		{A09437F7-403C-44A2-B1FE-15CC535B64CA} = {0CBF510D-D836-40BA-95EC-E93FDBB90632}
 		{E06015B0-8DBC-4DC9-81A2-605DAFE36821} = {072B725F-773F-4751-9616-E9778897C1D2}
 		{3925E45C-E7AA-4396-9567-4D8B1D1EF1C6} = {0CBF510D-D836-40BA-95EC-E93FDBB90632}
-		{9FA2AFB3-B150-428D-9D6C-48F60010FFF3} = {072B725F-773F-4751-9616-E9778897C1D2}
 		{94011062-791E-4D34-ACA8-09AAAD49B299} = {0CBF510D-D836-40BA-95EC-E93FDBB90632}
-		{6BEBBB6A-932F-4AF2-B1D9-3B533BE2C8F3} = {072B725F-773F-4751-9616-E9778897C1D2}
+		{F98E7E4B-EF27-48A0-BA56-730F14CEEEE1} = {072B725F-773F-4751-9616-E9778897C1D2}
+		{6AB07AED-3DCE-422D-BE87-9379806F685C} = {072B725F-773F-4751-9616-E9778897C1D2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1D7BBAD9-834C-4981-AC96-0AA5226FC43F}

+ 0 - 0
src/SharpGLTF.Cesium/Memory/BinaryTable.cs → src/SharpGLTF.Ext.3DTiles/Memory/BinaryTable.cs


+ 5 - 5
src/SharpGLTF.Cesium/Schema2/CesiumExtensions.cs → src/SharpGLTF.Ext.3DTiles/Schema2/3DTilesExtensions.cs

@@ -1,20 +1,20 @@
 namespace SharpGLTF.Schema2
 {
     /// <summary>
-    /// Extension methods for Cesium glTF Extensions
+    /// Extension methods for 3DTiles glTF Extensions
     /// </summary>
-    public static partial class CesiumExtensions
+    public static partial class ThreeDTilesExtensions
     {
-        private static bool _CesiumRegistered;
+        private static bool _3DTilesRegistered;
 
         /// <summary>
         /// This method most be called once at application's startup to register the extensions.
         /// </summary>
         public static void RegisterExtensions()
         {
-            if (_CesiumRegistered) return;
+            if (_3DTilesRegistered) return;
 
-            _CesiumRegistered = true;
+            _3DTilesRegistered = true;
 
             ExtensionsFactory.RegisterExtension<MeshPrimitive, CesiumPrimitiveOutline>("CESIUM_primitive_outline");
             ExtensionsFactory.RegisterExtension<Node, MeshExtInstanceFeatures>("EXT_instance_features");

+ 1 - 1
src/SharpGLTF.Cesium/Schema2/Ext.CESIUM_primitive_outline.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Ext.CESIUM_primitive_outline.cs

@@ -89,7 +89,7 @@ namespace SharpGLTF.Schema2
         #endregion
     }
 
-    partial class CesiumExtensions
+    partial class ThreeDTilesExtensions
     {
         /// <summary>
         /// Sets Cesium outline vertex indices

+ 0 - 0
src/SharpGLTF.Cesium/Schema2/Ext.InstanceFeatures.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Ext.InstanceFeatures.cs


+ 0 - 0
src/SharpGLTF.Cesium/Schema2/Ext.MeshFeatures.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Ext.MeshFeatures.cs


+ 1 - 1
src/SharpGLTF.Cesium/Schema2/Ext.StructuralMetadataPrimitive.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Ext.StructuralMetadataPrimitive.cs

@@ -61,7 +61,7 @@ namespace SharpGLTF.Schema2
         }
     }
 
-    partial class CesiumExtensions
+    partial class ThreeDTilesExtensions
     {
         public static void SetPropertyTextures(this MeshPrimitive primitive, List<int> propertyTextures)
         {

+ 0 - 0
src/SharpGLTF.Cesium/Schema2/Ext.StructuralMetadataRoot.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Ext.StructuralMetadataRoot.cs


+ 0 - 0
src/SharpGLTF.Cesium/Schema2/Generated/Ext.CESIUM_ext_instance_features.g.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_instance_features.g.cs


+ 0 - 0
src/SharpGLTF.Cesium/Schema2/Generated/Ext.CESIUM_ext_mesh_features.g.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_mesh_features.g.cs


+ 0 - 0
src/SharpGLTF.Cesium/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_primitive.g.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_primitive.g.cs


+ 0 - 0
src/SharpGLTF.Cesium/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_root.g.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_root.g.cs


+ 0 - 0
src/SharpGLTF.Cesium/Schema2/Generated/Ext.CESIUM_primitive_outline.g.cs → src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_primitive_outline.g.cs


+ 0 - 0
src/SharpGLTF.Cesium/SharpGLTF.Cesium.csproj → src/SharpGLTF.Ext.3DTiles/SharpGLTF.Ext.3DTiles.csproj


+ 0 - 0
src/SharpGLTF.Agi/SharpGLTF.Agi.csproj → src/SharpGLTF.Ext.Agi/SharpGLTF.Ext.Agi.csproj


+ 0 - 0
src/SharpGLTF.Agi/schema2/AgiExtensions.cs → src/SharpGLTF.Ext.Agi/schema2/AgiExtensions.cs


+ 0 - 0
src/SharpGLTF.Agi/schema2/agi.Articulations.cs → src/SharpGLTF.Ext.Agi/schema2/agi.Articulations.cs


+ 0 - 0
src/SharpGLTF.Agi/schema2/agi.StkMetadata.cs → src/SharpGLTF.Ext.Agi/schema2/agi.StkMetadata.cs


+ 0 - 0
src/SharpGLTF.Agi/schema2/generated/ext.AgiNodeArticulations.g.cs → src/SharpGLTF.Ext.Agi/schema2/generated/ext.AgiNodeArticulations.g.cs


+ 0 - 0
src/SharpGLTF.Agi/schema2/generated/ext.AgiNodeStkMetadata.g.cs → src/SharpGLTF.Ext.Agi/schema2/generated/ext.AgiNodeStkMetadata.g.cs


+ 0 - 0
src/SharpGLTF.Agi/schema2/generated/ext.AgiRootArticulations.g.cs → src/SharpGLTF.Ext.Agi/schema2/generated/ext.AgiRootArticulations.g.cs


+ 0 - 0
src/SharpGLTF.Agi/schema2/generated/ext.AgiRootStkMetadata.g.cs → src/SharpGLTF.Ext.Agi/schema2/generated/ext.AgiRootStkMetadata.g.cs


+ 1 - 1
tests/SharpGLTF.Cesium.Tests/ExtInstanceFeaturesTests.cs

@@ -15,7 +15,7 @@ namespace SharpGLTF.Cesium
         [SetUp]
         public void SetUp()
         {
-            CesiumExtensions.RegisterExtensions();
+            ThreeDTilesExtensions.RegisterExtensions();
         }
 
         [Test(Description = "Creates a gpu_instancing glTF from a tree with Cesium EXT_Instance_Features")]

+ 1 - 1
tests/SharpGLTF.Cesium.Tests/ExtMeshFeaturesTests.cs

@@ -20,7 +20,7 @@ namespace SharpGLTF.Cesium
         [SetUp]
         public void SetUp()
         {
-            CesiumExtensions.RegisterExtensions();
+            ThreeDTilesExtensions.RegisterExtensions();
         }
 
         [Test(Description = "Test for settting the FeatureIds with vertex attributes. See sample https://github.com/CesiumGS/3d-tiles-samples/blob/main/glTF/EXT_mesh_features/FeatureIdAttribute")]

+ 1 - 1
tests/SharpGLTF.Cesium.Tests/ExtPrimitiveOutlineTests.cs

@@ -17,7 +17,7 @@ namespace SharpGLTF
         [SetUp]
         public void SetUp()
         {
-            CesiumExtensions.RegisterExtensions();
+            ThreeDTilesExtensions.RegisterExtensions();
         }
 
         [Test(Description = "Creates a simple triangle with Cesium outlining")]

+ 1 - 1
tests/SharpGLTF.Cesium.Tests/ExtStructuralMetadataTests.cs

@@ -19,7 +19,7 @@ namespace SharpGLTF.Cesium
         [SetUp]
         public void SetUp()
         {
-            CesiumExtensions.RegisterExtensions();
+            ThreeDTilesExtensions.RegisterExtensions();
         }
 
         [Test(Description = "ext_structural_metadata with FeatureId Texture and Property Table")]

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

@@ -8,7 +8,7 @@
   </PropertyGroup>  
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\SharpGLTF.Cesium\SharpGLTF.Cesium.csproj" />
+    <ProjectReference Include="..\..\src\SharpGLTF.Ext.3DTiles\SharpGLTF.Ext.3DTiles.csproj" />
     <ProjectReference Include="..\SharpGLTF.NUnit\SharpGLTF.NUnit.csproj" />
   </ItemGroup>