BFRES : Fix some more importing bugs

Only align buffers when using a single buffer.

File_Format_Library/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL.cs

@@ -386,7 +386,8 @@ namespace Bfres.Structs
                 bool UseUVLayer2 = false;
 
                 //for BOTW if it uses UV layer 2 for normal maps use second UV map
-                if (shp.GetFMAT().shaderassign.options.ContainsKey("uking_texture2_texcoord")) {
+                if (shp.GetFMAT().shaderassign.options.ContainsKey("uking_texture2_texcoord"))
+                {
                     float value = float.Parse(shp.GetFMAT().shaderassign.options["uking_texture2_texcoord"]);
 
                     if (value == 1)
@@ -505,7 +506,8 @@ namespace Bfres.Structs
             }
             else
             {
-                foreach (var shape in shapes) {
+                foreach (var shape in shapes)
+                {
                     shape.SaveVertexBuffer(GetResFileU() != null);
                 }
                 UpdateVertexData();
@@ -580,16 +582,18 @@ namespace Bfres.Structs
             return textures;
         }
 
-        public override void Replace(string FileName) {
+        public override void Replace(string FileName)
+        {
             AddOjects(FileName, GetResFile(), GetResFileU());
         }
 
-        public void Replace(string FileName, ResFile resFileNX, ResU.ResFile resFileU) {
+        public void Replace(string FileName, ResFile resFileNX, ResU.ResFile resFileU)
+        {
             AddOjects(FileName, resFileNX, resFileU);
         }
 
         //Function addes shapes, vertices and meshes
-        public void AddOjects(string FileName, ResFile resFileNX, ResU.ResFile resFileU,  bool Replace = true)
+        public void AddOjects(string FileName, ResFile resFileNX, ResU.ResFile resFileU, bool Replace = true)
         {
             //If using original attributes, this to look them up
             Dictionary<string, List<FSHP.VertexAttribute>> AttributeMatcher = new Dictionary<string, List<FSHP.VertexAttribute>>();
@@ -684,7 +688,8 @@ namespace Bfres.Structs
                     {
                         if (csvsettings.LimitSkinCount ||
                             csvsettings.MapOriginalMaterials ||
-                            csvsettings.UseOriginalAttributes) {
+                            csvsettings.UseOriginalAttributes)
+                        {
                             for (int i = 0; i < csvModel.objects.Count; i++)
                             {
                                 //Only one match should be found as shapes can't have duped names
@@ -699,7 +704,7 @@ namespace Bfres.Structs
                                 }
 
                                 if (csvsettings.MapOriginalMaterials && match != null)
-                                    {
+                                {
                                     csvModel.objects[i].MaterialIndex = match.MaterialIndex;
                                 }
 
@@ -750,15 +755,6 @@ namespace Bfres.Structs
                             else
                                 shape.vertexAttributes = csvsettings.CreateNewAttributes();
 
-                            Console.WriteLine($"ForceSkinInfluence {ForceSkinInfluence}");
-
-                            if (!ForceSkinInfluence)
-                                shape.VertexSkinCount = obj.GetMaxSkinInfluenceCount();
-                            else
-                                shape.VertexSkinCount = (byte)ForceSkinInfluenceMax;
-
-                            Console.WriteLine($"VertexSkinCount { shape.VertexSkinCount}");
-
                             shape.BoneIndex = 0;
                             shape.Text = obj.ObjectName;
                             shape.lodMeshes = obj.lodMeshes;
@@ -768,6 +764,15 @@ namespace Bfres.Structs
                             shape.ApplyImportSettings(csvsettings, GetMaterial(shape.MaterialIndex));
                             shape.BoneIndices = shape.GetIndices(Skeleton);
 
+                            Console.WriteLine($"ForceSkinInfluence {ForceSkinInfluence}");
+
+                            if (!ForceSkinInfluence)
+                                shape.VertexSkinCount = obj.GetMaxSkinInfluenceCount();
+                            else
+                                shape.VertexSkinCount = (byte)ForceSkinInfluenceMax;
+
+                            Console.WriteLine($"VertexSkinCount { shape.VertexSkinCount}");
+
                             if (shape.VertexSkinCount == 1)
                             {
                                 int boneIndex = shape.BoneIndices[0];
@@ -827,7 +832,7 @@ namespace Bfres.Structs
 
 
                     string[] shapeSortCheck = shapes.Select(o => o.Text).ToArray();
-                  //  assimp.objects = assimp.objects.SortBy(shapeSortCheck, c => c.ObjectName).ToList();
+                    //  assimp.objects = assimp.objects.SortBy(shapeSortCheck, c => c.ObjectName).ToList();
 
                     if (ImportedObjects.Count == 0)
                     {
@@ -1178,6 +1183,8 @@ namespace Bfres.Structs
                             else
                                 shape.vertexAttributes = settings.CreateNewAttributes();
 
+                            shape.BoneIndex = obj.BoneIndex;
+
                             if (obj.MaterialIndex + MatStartIndex < materials.Count && obj.MaterialIndex > 0)
                                 shape.MaterialIndex = obj.MaterialIndex + MatStartIndex;
                             else
@@ -1205,8 +1212,6 @@ namespace Bfres.Structs
                             shape.SaveShape(IsWiiU);
                             shape.SaveVertexBuffer(IsWiiU);
 
-                            shape.BoneIndex = obj.BoneIndex;
-
                             if (IsWiiU)
                             {
                                 shape.ShapeU.SubMeshBoundingIndices = new List<ushort>();
@@ -1298,7 +1303,8 @@ namespace Bfres.Structs
             UpdateEditor();
         }
 
-        public void UpdateEditor(){
+        public void UpdateEditor()
+        {
             ((BFRES)Parent?.Parent)?.LoadEditors(this);
         }
 
@@ -1317,10 +1323,10 @@ namespace Bfres.Structs
             bn.Name = bone.Text;
             bn.RigidMatrixIndex = 0;
             bn.Rotation = new Syroot.Maths.Vector4F(
-                bone.Rotation.X,
+                       bone.Rotation.X,
-                bone.Rotation.Y,
+                       bone.Rotation.Y,
-                bone.Rotation.Z,
+                       bone.Rotation.Z,
-                bone.Rotation.W);
+                       bone.Rotation.W);
             bn.Position = new Syroot.Maths.Vector3F(
                 bone.Position.X,
                 bone.Position.Y,

Switch_Toolbox_Library/HashCalculate/SimpleHash.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Toolbox.Library.Hash
+{
+    //https://github.com/IcySon55/Kuriimu/blob/master/src/Cetera/Hash/SimpleHash.cs
+    public class SimpleHash
+    {
+        public static uint Create(string input, uint magic, uint hashCount)
+        {
+            return Create(input, magic) % hashCount;
+        }
+
+        public static uint Create(string input, uint magic)
+        {
+            return input.Aggregate(0u, (hash, c) => hash * magic + c);
+        }
+    }
+}

Switch_Toolbox_Library/Toolbox_Library.csproj

@@ -389,6 +389,7 @@
     <Compile Include="Generics\Texture\ImageParameters.cs" />
     <Compile Include="Generics\Texture\STTextureFolder.cs" />
     <Compile Include="HashCalculate\FNV64A1.cs" />
+    <Compile Include="HashCalculate\SimpleHash.cs" />
     <Compile Include="Helpers\ArchiveNodeMenuHelper.cs" />
     <Compile Include="Helpers\DirectoryHelper.cs" />
     <Compile Include="Helpers\DragHelper.cs" />

Toolbox/Toolbox.csproj

@@ -25,6 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>