Cleaned up some of the package names for exporting/importing models.

FinModelUtility/Fin/Fin/Fin.csproj

@@ -13,10 +13,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Remove="src\model\io\exporter\assimp\AssimpConverter.cs" />
-    <Compile Remove="src\model\io\exporter\assimp\AssimpDirectExporter.cs" />
-    <Compile Remove="src\model\io\exporter\assimp\AssimpMeshBuilder.cs" />
-    <Compile Remove="src\model\io\exporter\assimp\AssimpSkeletonBuilder.cs" />
+    <Compile Remove="src\model\io\exporters\assimp\AssimpConverter.cs" />
+    <Compile Remove="src\model\io\exporters\assimp\AssimpDirectExporter.cs" />
+    <Compile Remove="src\model\io\exporters\assimp\AssimpMeshBuilder.cs" />
+    <Compile Remove="src\model\io\exporters\assimp\AssimpSkeletonBuilder.cs" />
     <Compile Remove="src\schema\sequences\PointerSections.cs" />
   </ItemGroup>
 

FinModelUtility/Fin/Fin/src/model/io/exporter/ExporterInterfaces.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/ModelExporterInterfaces.cs

@@ -1,6 +1,6 @@
 using fin.io;
 
-namespace fin.model.io.exporter {
+namespace fin.model.io.exporters {
   public interface IModelExporterParams {
     ISystemFile OutputFile { get; }
     IModel Model { get; }

FinModelUtility/Fin/Fin/src/model/io/exporter/assimp/AssimpUtil.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/assimp/AssimpUtil.cs

@@ -3,7 +3,7 @@
 
 using Assimp;
 
-namespace fin.model.io.exporter.assimp {
+namespace fin.model.io.exporters.assimp {
   public static class AssimpUtil {
     static AssimpUtil() {
       using var ctx = new AssimpContext();

FinModelUtility/Fin/Fin/src/model/io/exporter/assimp/indirect/AssimpIndirectAnimationFixer.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/assimp/indirect/AssimpIndirectAnimationFixer.cs

@@ -2,7 +2,7 @@
 
 using Assimp;
 
-namespace fin.model.io.exporter.assimp.indirect {
+namespace fin.model.io.exporters.assimp.indirect {
   public class AssimpIndirectAnimationFixer {
     public void Fix(IModel model, Scene sc) {
       var finAnimations = model.AnimationManager.Animations;

FinModelUtility/Fin/Fin/src/model/io/exporter/assimp/indirect/AssimpIndirectExporter.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/assimp/indirect/AssimpIndirectExporter.cs

@@ -5,8 +5,8 @@
 using Assimp;
 
 using fin.io;
-using fin.model.io.exporter.gltf;
-using fin.model.io.exporter.gltf.lowlevel;
+using fin.model.io.exporters.gltf;
+using fin.model.io.exporters.gltf.lowlevel;
 using fin.shaders.glsl;
 using fin.util.asserts;
 using fin.util.gc;
@@ -15,7 +15,7 @@
 using SharpGLTF.Schema2;
 using SharpGLTF.Validation;
 
-namespace fin.model.io.exporter.assimp.indirect {
+namespace fin.model.io.exporters.assimp.indirect {
   public class AssimpIndirectModelExporter : IModelExporter {
     // You can bet your ass I'm gonna prefix everything with ass.
 

FinModelUtility/Fin/Fin/src/model/io/exporter/assimp/indirect/AssimpIndirectTextureFixer.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/assimp/indirect/AssimpIndirectTextureFixer.cs

@@ -8,7 +8,7 @@
 using fin.image;
 using fin.model.util;
 
-namespace fin.model.io.exporter.assimp.indirect {
+namespace fin.model.io.exporters.assimp.indirect {
   public class AssimpIndirectTextureFixer {
     public void Fix(IModel model, Scene sc) {
       // Imports the textures

FinModelUtility/Fin/Fin/src/model/io/exporter/assimp/indirect/AssimpIndirectUvFixer.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/assimp/indirect/AssimpIndirectUvFixer.cs

@@ -5,7 +5,7 @@
 
 using fin.color;
 
-namespace fin.model.io.exporter.assimp.indirect {
+namespace fin.model.io.exporters.assimp.indirect {
   public class AssimpIndirectUvFixer {
     public void Fix(IModel model, Scene sc) {
       var finVertices = model.Skin.Vertices;

FinModelUtility/Fin/Fin/src/model/io/exporter/gltf/GltfAnimationBuilder.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/GltfAnimationBuilder.cs

@@ -3,7 +3,7 @@
 
 using SharpGLTF.Schema2;
 
-namespace fin.model.io.exporter.gltf {
+namespace fin.model.io.exporters.gltf {
   using GltfNode = Node;
 
   public class GltfAnimationBuilder {

FinModelUtility/Fin/Fin/src/model/io/exporter/gltf/GltfExporter.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/GltfExporter.cs

@@ -13,7 +13,7 @@
 
 using AlphaMode = SharpGLTF.Materials.AlphaMode;
 
-namespace fin.model.io.exporter.gltf {
+namespace fin.model.io.exporters.gltf {
   public interface IGltfModelExporter : IModelExporter {
     bool UvIndices { get; set; }
     bool Embedded { get; set; }

FinModelUtility/Fin/Fin/src/model/io/exporter/gltf/GltfMeshBuilder.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/GltfMeshBuilder.cs

@@ -14,7 +14,7 @@
 using SharpGLTF.Schema2;
 using SharpGLTF.Transforms;
 
-namespace fin.model.io.exporter.gltf {
+namespace fin.model.io.exporters.gltf {
   using VERTEX =
       VertexBuilder<VertexPositionNormal, VertexColor2Texture2, VertexJoints4>;
 

FinModelUtility/Fin/Fin/src/model/io/exporter/gltf/GltfSkeletonBuilder.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/GltfSkeletonBuilder.cs

@@ -6,7 +6,7 @@
 
 using SharpGLTF.Schema2;
 
-namespace fin.model.io.exporter.gltf {
+namespace fin.model.io.exporters.gltf {
   using GltfNode = Node;
   using GltfSkin = Skin;
 

FinModelUtility/Fin/Fin/src/model/io/exporter/gltf/GltfTextureUtil.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/GltfTextureUtil.cs

@@ -6,7 +6,7 @@
 using SharpGLTF.Memory;
 using SharpGLTF.Schema2;
 
-namespace fin.model.io.exporter.gltf {
+namespace fin.model.io.exporters.gltf {
   public static class GltfTextureUtil {
     public static TextureBuilder UseTexture(this ChannelBuilder channelBuilder,
                                             ITexture finTexture) {

FinModelUtility/Fin/Fin/src/model/io/exporter/gltf/lowlevel/LowLevelGltfExporter.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/lowlevel/LowLevelGltfExporter.cs

@@ -13,7 +13,7 @@
 
 using AlphaMode = SharpGLTF.Materials.AlphaMode;
 
-namespace fin.model.io.exporter.gltf.lowlevel {
+namespace fin.model.io.exporters.gltf.lowlevel {
   public class LowLevelGltfModelExporter : IGltfModelExporter {
     private readonly ILogger logger_ = Logging.Create<GltfModelExporter>();
 

FinModelUtility/Fin/Fin/src/model/io/exporter/gltf/lowlevel/LowLevelGltfMeshBuilder.cs → FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/lowlevel/LowLevelGltfMeshBuilder.cs

@@ -12,7 +12,7 @@
 using GltfPrimitiveType = SharpGLTF.Schema2.PrimitiveType;
 
 
-namespace fin.model.io.exporter.gltf.lowlevel {
+namespace fin.model.io.exporters.gltf.lowlevel {
   public class LowLevelGltfMeshBuilder {
     public bool UvIndices { get; set; }
 

FinModelUtility/Fin/Fin/src/model/io/importer/assimp/AssimpModelFileBundle.cs → FinModelUtility/Fin/Fin/src/model/io/importers/assimp/AssimpModelFileBundle.cs

@@ -1,6 +1,6 @@
 using fin.io;
 
-namespace fin.model.io.importer.assimp {
+namespace fin.model.io.importers.assimp {
   public class AssimpModelFileBundle : IModelFileBundle {
     public string? GameName { get; }
     public required IReadOnlyTreeFile MainFile { get; init; }

FinModelUtility/Fin/Fin/src/model/io/importer/assimp/AssimpModelImporterPlugin.cs → FinModelUtility/Fin/Fin/src/model/io/importers/assimp/AssimpModelImporterPlugin.cs

@@ -3,7 +3,7 @@
 
 using fin.io;
 
-namespace fin.model.io.importer.assimp {
+namespace fin.model.io.importers.assimp {
   public class AssimpModelImporterPlugin : IModelImporterPlugin {
     public string DisplayName => "Assimp";
     public string Description => "Loads standard model formats via Assimp.";

FinModelUtility/Fin/Fin/src/testing/model/IModelGoldenTests.cs

@@ -1,7 +1,7 @@
 using fin.io;
 using fin.io.bundles;
 using fin.model.io;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 namespace fin.testing.model {
   public abstract class BGoldenTests<TFileBundle>

FinModelUtility/Fin/Fin/src/testing/model/ModelGoldenAssert.cs

@@ -6,11 +6,11 @@
 
 using CommunityToolkit.HighPerformance;
 
-using fin.model.io.exporter;
-using fin.model.io.exporter.assimp.indirect;
+using fin.model.io.exporters;
+using fin.model.io.exporters.assimp.indirect;
 using fin.io;
 using fin.model.io;
-using fin.model.io.importer;
+using fin.model.io.importers;
 using fin.util.asserts;
 using fin.util.strings;
 

FinModelUtility/Formats/Dat/src/api/DatModelImporter.cs

@@ -2,7 +2,7 @@
 
 using fin.model;
 using fin.model.impl;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 using schema.binary;
 

FinModelUtility/Formats/Glo/Glo/src/api/GloModelImporter.cs

@@ -8,7 +8,7 @@
 using fin.io;
 using fin.model;
 using fin.model.impl;
-using fin.model.io.importer;
+using fin.model.io.importers;
 using fin.util.asserts;
 
 using glo.schema;

FinModelUtility/Formats/J3d/J3d/src/api/BmdModelImporter.cs

@@ -9,7 +9,7 @@
 using fin.math.matrix.four;
 using fin.model;
 using fin.model.impl;
-using fin.model.io.importer;
+using fin.model.io.importers;
 using fin.schema.matrix;
 using fin.util.asserts;
 

FinModelUtility/Formats/Modl/Modl/src/api/BattalionWarsModelImporter.cs

@@ -1,5 +1,5 @@
 using fin.model;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 namespace modl.api {
   public class BattalionWarsModelImporter 

FinModelUtility/Formats/Modl/Modl/src/api/ModlModelReader.cs

@@ -6,7 +6,7 @@
 using fin.math.rotations;
 using fin.model;
 using fin.model.impl;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 using modl.schema.anim;
 using modl.schema.anim.bw1;

FinModelUtility/Formats/Modl/Modl/src/api/OutModelReader.cs

@@ -11,7 +11,7 @@
 using fin.model;
 using fin.model.impl;
 using fin.model.io;
-using fin.model.io.importer;
+using fin.model.io.importers;
 using fin.util.asserts;
 using fin.util.enumerables;
 

FinModelUtility/Formats/Visceral/Visceral/src/api/GeoModelImporter.cs

@@ -6,7 +6,7 @@
 using fin.model;
 using fin.model.impl;
 using fin.model.io;
-using fin.model.io.importer;
+using fin.model.io.importers;
 using fin.schema.matrix;
 
 using visceral.schema.geo;

FinModelUtility/Formats/Xmod/src/api/PedModelImporter.cs

@@ -1,5 +1,5 @@
 using fin.model;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 namespace xmod.api {
   public class PedModelImporter : IModelImporter<PedModelFileBundle> {

FinModelUtility/Games/HaloWarsTools/Program.cs

@@ -3,8 +3,8 @@
 using System.Linq;
 
 using fin.data.queue;
-using fin.model.io.exporter;
-using fin.model.io.exporter.assimp.indirect;
+using fin.model.io.exporters;
+using fin.model.io.exporters.assimp.indirect;
 using fin.io;
 using fin.util.gc;
 

FinModelUtility/Games/HaloWarsTools/src/api/HaloWarsModelImporter.cs

@@ -1,5 +1,5 @@
 using fin.model;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 namespace hw.api {
   public class HaloWarsModelImporter : IModelImporter<IHaloWarsModelFileBundle> {

FinModelUtility/Games/HaloWarsTools/src/api/VisModeIImporter.cs

@@ -1,5 +1,5 @@
 using fin.model;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 using HaloWarsTools;
 

FinModelUtility/Games/HaloWarsTools/src/api/XtdModelImporter.cs

@@ -1,5 +1,5 @@
 using fin.model;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 using HaloWarsTools;
 

FinModelUtility/ModelPluginWrappers/NoesisProgram.cs

@@ -1,5 +1,5 @@
-using fin.model.io.exporter;
-using fin.model.io.exporter.assimp.indirect;
+using fin.model.io.exporters;
+using fin.model.io.exporters.assimp.indirect;
 using fin.io;
 using fin.model;
 using fin.model.impl;

FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/cli/Cli.cs

@@ -6,9 +6,9 @@
 using fin.io;
 using fin.model;
 using fin.model.io;
-using fin.model.io.exporter;
-using fin.model.io.exporter.assimp.indirect;
-using fin.model.io.importer.assimp;
+using fin.model.io.exporters;
+using fin.model.io.exporters.assimp.indirect;
+using fin.model.io.importers.assimp;
 
 using j3d.api;
 

FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/cli/PluginUtil.cs

@@ -1,7 +1,7 @@
 using cmb.api;
 
 using fin.model.io;
-using fin.model.io.importer.assimp;
+using fin.model.io.importers.assimp;
 
 using glo.api;
 

FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/ExtractorUtil.cs

@@ -1,14 +1,14 @@
 using Assimp;
 
-using fin.model.io.exporter.assimp;
+using fin.model.io.exporters.assimp;
 using fin.io;
 using fin.io.bundles;
 using fin.log;
 using fin.model;
 using fin.model.io;
-using fin.model.io.exporter;
-using fin.model.io.exporter.assimp.indirect;
-using fin.model.io.importer;
+using fin.model.io.exporters;
+using fin.model.io.exporters.assimp.indirect;
+using fin.model.io.importers;
 using fin.util.asserts;
 using fin.util.linq;
 

FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/GlobalModelLoader.cs

@@ -4,7 +4,7 @@
 
 using fin.model;
 using fin.model.io;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 using glo.api;
 

FinModelUtility/Utility of Time CSharp/api/OotModelImporter.cs

@@ -12,7 +12,7 @@
 
 using fin.data.queue;
 using fin.model;
-using fin.model.io.importer;
+using fin.model.io.importers;
 
 using schema.binary;