Fixed ftexs and chunk count for 4096x4096 textures

Atvaark · Sep 11, 2015 · 92b3f82 · 92b3f82
1 parent 1a2e7f8
commit 92b3f82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/FtexTool/Ftex/FtexFile.cs b/FtexTool/Ftex/FtexFile.cs
@@ -172,7 +172,7 @@ public void UpdateOffsets()
                 {
                     FtexFileMipMapInfo ftexMipMapInfo = MipMapInfos.ElementAt(mipMapIndex);
                     ftexMipMapInfo.CompressedFileSize = ftexsFileMipMap.CompressedDataSize;
-                    ftexMipMapInfo.ChunkCount = Convert.ToByte(ftexsFileMipMap.Chunks.Count());
+                    ftexMipMapInfo.ChunkCount = Convert.ToInt16(ftexsFileMipMap.Chunks.Count());
                     ftexMipMapInfo.Offset = ftexsFileMipMap.Offset;
                     ++mipMapIndex;
                 }

diff --git a/FtexTool/FtexDdsConverter.cs b/FtexTool/FtexDdsConverter.cs
@@ -120,7 +120,7 @@ private static List<FtexsFile> GetFtexsFiles(List<FtexFileMipMapInfo> mipMapInfo
         private static List<FtexsFileChunk> GetFtexsChunks(FtexFileMipMapInfo mipMapInfo, byte[] mipMapData)
         {
             List<FtexsFileChunk> ftexsFileChunks = new List<FtexsFileChunk>();
-            const int maxChunkSize = short.MaxValue;
+            const int maxChunkSize = short.MaxValue/2 + 1;
             int requiredChunks = (int) Math.Ceiling((double) mipMapData.Length/maxChunkSize);
             int mipMapDataOffset = 0;
             for (int i = 0; i < requiredChunks; i++)
@@ -180,7 +180,9 @@ private static byte GetFtexsFileNumber(int fileSize)
                 return 3;
             if (fileSize <= 1398128)
                 return 4;
-            return 5;
+            if (fileSize <= 11180000)
+                return 5;
+            return 6;
         }
 
         private static List<byte[]> GetMipMapData(DdsFile file)