From 67799b965b4acb200ad74c0bf906a221cdef3c8e Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Sun, 15 Nov 2015 15:43:17 -0800
Subject: [PATCH 1/2] Wad: support loading WAD2 (Quake) texture wads.

WAD2 is the same as WAD3 except that the miptex entries don't have a
palette after the pixel data, the palette needs to be supplied externally.
---
 Sledge.DataStructures/GameData/Palette.cs     | 12 +++++++++
 .../Sledge.DataStructures.csproj              |  1 +
 Sledge.Editor/Documents/Document.cs           | 21 +++++++++++++++-
 Sledge.Editor/Extensions/ModelExtensions.cs   |  2 +-
 Sledge.Packages/Sledge.Packages.csproj        |  7 +++++-
 Sledge.Packages/Wad/WadEntryType.cs           |  2 +-
 Sledge.Packages/Wad/WadImageStream.cs         | 13 ++++++++--
 Sledge.Packages/Wad/WadPackage.cs             | 25 ++++++++++++++-----
 Sledge.Providers/Model/MdlProvider.cs         | 10 ++++----
 Sledge.Providers/Model/ModelProvider.cs       | 10 ++++----
 Sledge.Providers/Texture/SprProvider.cs       |  5 ++--
 Sledge.Providers/Texture/TexturePackage.cs    |  5 +++-
 Sledge.Providers/Texture/TextureProvider.cs   |  7 +++---
 Sledge.Providers/Texture/VmtProvider.cs       |  5 ++--
 Sledge.Providers/Texture/WadProvider.cs       | 15 +++++------
 Sledge.Tests/Vtf/VtfTest.cs                   |  2 +-
 16 files changed, 104 insertions(+), 38 deletions(-)
 create mode 100644 Sledge.DataStructures/GameData/Palette.cs

diff --git a/Sledge.DataStructures/GameData/Palette.cs b/Sledge.DataStructures/GameData/Palette.cs
new file mode 100644
index 000000000..2eed3798e
--- /dev/null
+++ b/Sledge.DataStructures/GameData/Palette.cs
@@ -0,0 +1,12 @@
+namespace Sledge.DataStructures.GameData
+{
+    public class Palette
+    {
+        public byte[] ByteArray { get; private set; }
+
+        public Palette(byte[] pal)
+        {
+            ByteArray = pal;
+        }
+    }
+}
diff --git a/Sledge.DataStructures/Sledge.DataStructures.csproj b/Sledge.DataStructures/Sledge.DataStructures.csproj
index 47e19582e..7ee826f3f 100644
--- a/Sledge.DataStructures/Sledge.DataStructures.csproj
+++ b/Sledge.DataStructures/Sledge.DataStructures.csproj
@@ -47,6 +47,7 @@
   <ItemGroup>
     <Compile Include="GameData\AutoVisgroup.cs" />
     <Compile Include="GameData\AutoVisgroupSection.cs" />
+    <Compile Include="GameData\Palette.cs" />
     <Compile Include="Geometric\Box.cs" />
     <Compile Include="Geometric\Cloud.cs" />
     <Compile Include="Geometric\CoordinateF.cs" />
diff --git a/Sledge.Editor/Documents/Document.cs b/Sledge.Editor/Documents/Document.cs
index b9a70e5e6..3ca9ed192 100644
--- a/Sledge.Editor/Documents/Document.cs
+++ b/Sledge.Editor/Documents/Document.cs
@@ -44,6 +44,7 @@ public class Document
         public Game Game { get; set; }
         public GameEnvironment Environment { get; private set; }
         public GameData GameData { get; set; }
+        public Palette Palette { get; set; }
 
         public Pointfile Pointfile { get; set; }
 
@@ -107,7 +108,25 @@ public Document(string mapFile, Map map, Game game)
                 GameData.MapSizeHigh = game.OverrideMapSizeHigh;
             }
 
-            TextureCollection = TextureProvider.CreateCollection(Environment.GetGameDirectories(), Game.AdditionalPackages, Game.GetTextureBlacklist(), Game.GetTextureWhitelist());
+            // Set up Quake 1/Hexen 2 palette
+            var palpath = Environment.Root.TraversePath("gfx/palette.lmp");
+            var paldata = new byte[768];
+            if (palpath != null)
+            {
+                try
+                {
+                    using (var br = new BinaryReader(palpath.Open()))
+                    {
+                        paldata = br.ReadBytes(768);
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
+            Palette = new Palette(paldata);
+            
+            TextureCollection = TextureProvider.CreateCollection(Environment.GetGameDirectories(), Game.AdditionalPackages, Game.GetTextureBlacklist(), Game.GetTextureWhitelist(), Palette);
             /* .Union(GameData.MaterialExclusions) */ // todo material exclusions
 
             var texList = Map.GetAllTextures();
diff --git a/Sledge.Editor/Extensions/ModelExtensions.cs b/Sledge.Editor/Extensions/ModelExtensions.cs
index 3ff087974..bdd2a9200 100644
--- a/Sledge.Editor/Extensions/ModelExtensions.cs
+++ b/Sledge.Editor/Extensions/ModelExtensions.cs
@@ -83,7 +83,7 @@ private static bool UpdateModels(Document document, MapObject mo, Dictionary<str
 
                 try
                 {
-                    var mr = ModelProvider.CreateModelReference(file);
+                    var mr = ModelProvider.CreateModelReference(file, document.Palette);
                     SetModel(e, mr);
                     cache.Add(model, mr);
                     return true;
diff --git a/Sledge.Packages/Sledge.Packages.csproj b/Sledge.Packages/Sledge.Packages.csproj
index a465901c8..8b6a75581 100644
--- a/Sledge.Packages/Sledge.Packages.csproj
+++ b/Sledge.Packages/Sledge.Packages.csproj
@@ -58,7 +58,12 @@
     <Compile Include="Wad\WadPackage.cs" />
     <Compile Include="Wad\WadPackageStreamSource.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Sledge.DataStructures\Sledge.DataStructures.csproj">
+      <Project>{26a974c9-e495-4fa3-8e87-1e00019d04f5}</Project>
+      <Name>Sledge.DataStructures</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Sledge.Packages/Wad/WadEntryType.cs b/Sledge.Packages/Wad/WadEntryType.cs
index c997fac3c..0289835d1 100644
--- a/Sledge.Packages/Wad/WadEntryType.cs
+++ b/Sledge.Packages/Wad/WadEntryType.cs
@@ -7,7 +7,7 @@ public enum WadEntryType : byte
         // ColorMap = 0x41,
         Image = 0x42, // Simple image with any size
         Texture = 0x43, // Power-of-16-sized world textures with 4 mipmaps
-        // Raw = 0x44,
+        QuakeTexture = 0x44, // Same as Texture but without the palette following the mipmaps
         // ColorMap2 = 0x45,
         // Font = 0x46, // Fixed-height font. Contains an image and font data (row, X offset and width of a character) for 256 ASCII characters. 
     }
diff --git a/Sledge.Packages/Wad/WadImageStream.cs b/Sledge.Packages/Wad/WadImageStream.cs
index e4784fa71..14e117b82 100644
--- a/Sledge.Packages/Wad/WadImageStream.cs
+++ b/Sledge.Packages/Wad/WadImageStream.cs
@@ -81,8 +81,17 @@ private void PrepareData(BinaryReader br)
                 bw.Write(_entry.PaletteSize); // Colours used
                 bw.Write(_entry.PaletteSize); // "Important" colours used
 
-                br.BaseStream.Position = startIndex + (_entry.PaletteDataOffset - _entry.Offset);
-                var paletteData = br.ReadBytes((int)(_entry.PaletteSize * 3));
+                byte[] paletteData;
+                if (_entry.Type == WadEntryType.QuakeTexture)
+                {
+                    paletteData = _entry.Package.Palette.ByteArray;
+                }
+                else
+                {
+                    br.BaseStream.Position = startIndex + (_entry.PaletteDataOffset - _entry.Offset);
+                    paletteData = br.ReadBytes((int)(_entry.PaletteSize * 3));
+                }
+
                 for (var i = 0; i < _entry.PaletteSize; i++)
                 {
                     // Wad palettes are RGB, bitmap is BGRX
diff --git a/Sledge.Packages/Wad/WadPackage.cs b/Sledge.Packages/Wad/WadPackage.cs
index d32caece0..7f4de334d 100644
--- a/Sledge.Packages/Wad/WadPackage.cs
+++ b/Sledge.Packages/Wad/WadPackage.cs
@@ -1,4 +1,5 @@
-using System;
+using Sledge.DataStructures.GameData;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -11,23 +12,26 @@ namespace Sledge.Packages.Wad
     // https://developer.valvesoftware.com/wiki/WAD
     public class WadPackage : IPackage
     {
-        private const string Signature = "WAD3";
+        private const string WAD2Signature = "WAD2";
+        private const string WAD3Signature = "WAD3";
 
         public FileInfo PackageFile { get; private set; }
         internal uint NumTextures { get; private set; }
         internal uint LumpOffset { get; private set; }
         internal List<WadEntry> Entries { get; private set; }
+        public Palette Palette { get; private set; }
 
-        public WadPackage(FileInfo packageFile)
+        public WadPackage(FileInfo packageFile, Palette pal)
         {
             PackageFile = packageFile;
             Entries = new List<WadEntry>();
+            Palette = pal;
 
             // Read the data from the wad
             using (var br = new BinaryReader(OpenFile(packageFile)))
             {
                 var sig = br.ReadFixedLengthString(Encoding.ASCII, 4);
-                if (sig != Signature) throw new PackageException("Unknown package signature: Expected '" + Signature + "', got '" + sig + "'.");
+                if (sig != WAD2Signature && sig != WAD3Signature) throw new PackageException("Unknown package signature: Expected [WAD2,WAD3], got '" + sig + "'.");
 
                 NumTextures = br.ReadUInt32();
                 LumpOffset = br.ReadUInt32();
@@ -129,6 +133,7 @@ private void SetEntryData(WadEntry e, BinaryReader br)
                     paletteDataOffset = br.BaseStream.Position;
                     break;
                 case WadEntryType.Texture:
+                case WadEntryType.QuakeTexture:
                     br.BaseStream.Position += 16; // Skip name
                     width = br.ReadUInt32();
                     height = br.ReadUInt32();
@@ -136,8 +141,16 @@ private void SetEntryData(WadEntry e, BinaryReader br)
                     var num = (int)(width * height);
                     var skipMapData = (num / 4) + (num / 16) + (num / 64);
                     br.BaseStream.Position += 16 + num + skipMapData; // Skip mipmap offsets, texture data, mipmap texture data
-                    paletteSize = br.ReadUInt16();
-                    paletteDataOffset = br.BaseStream.Position;
+                    if (e.Type == WadEntryType.QuakeTexture)
+                    {
+                        paletteSize = 256;
+                        paletteDataOffset = 0;
+                    }
+                    else
+                    {
+                        paletteSize = br.ReadUInt16();
+                        paletteDataOffset = br.BaseStream.Position;
+                    }
                     break;
                     /*
                 case WadEntryType.Font:
diff --git a/Sledge.Providers/Model/MdlProvider.cs b/Sledge.Providers/Model/MdlProvider.cs
index 6f1dde331..c426c12b0 100644
--- a/Sledge.Providers/Model/MdlProvider.cs
+++ b/Sledge.Providers/Model/MdlProvider.cs
@@ -39,19 +39,19 @@ protected override bool IsValidForFile(IFile file)
             return file.Extension.ToLowerInvariant() == "mdl";
         }
 
-        protected override DataStructures.Models.Model LoadFromFile(IFile file)
+        protected override DataStructures.Models.Model LoadFromFile(IFile file, DataStructures.GameData.Palette pal)
         {
-            return LoadMDL(file, ModelLoadItems.AllStatic | ModelLoadItems.Animations);
+            return LoadMDL(file, ModelLoadItems.AllStatic | ModelLoadItems.Animations, pal);
         }
 
         // Model loader for MDL files. Reference Valve's studiohdr_t struct definition for the most part.
-        public DataStructures.Models.Model LoadMDL(IFile file, ModelLoadItems loadItems)
+        public DataStructures.Models.Model LoadMDL(IFile file, ModelLoadItems loadItems, DataStructures.GameData.Palette pal)
         {
             using (var fs = new MemoryStream(file.ReadAll()))
             {
                 using(var br = new BinaryReader(fs))
                 {
-                    return ReadModel(br, file, loadItems);
+                    return ReadModel(br, file, loadItems, pal);
                 }
             }
         }
@@ -73,7 +73,7 @@ public DataStructures.Models.Model LoadMDL(IFile file, ModelLoadItems loadItems)
         private const byte VTXStripGroupTriListFlag = 0x01;
         private const byte VTXStripGroupTriStripFlag = 0x02;
 
-        private static DataStructures.Models.Model ReadModel(BinaryReader br, IFile file, ModelLoadItems loadItems)
+        private static DataStructures.Models.Model ReadModel(BinaryReader br, IFile file, ModelLoadItems loadItems, DataStructures.GameData.Palette pal)
         {
             // int id - Not really an int. This is a magic string, either "IDST" or "IDSQ".
             var magicString = br.ReadFixedLengthString(Encoding.UTF8, 4);
diff --git a/Sledge.Providers/Model/ModelProvider.cs b/Sledge.Providers/Model/ModelProvider.cs
index 792cf95dd..c449d1f0d 100644
--- a/Sledge.Providers/Model/ModelProvider.cs
+++ b/Sledge.Providers/Model/ModelProvider.cs
@@ -37,9 +37,9 @@ public static void DeregisterAll()
             RegisteredProviders.Clear();
         }
 
-        public static ModelReference CreateModelReference(IFile file)
+        public static ModelReference CreateModelReference(IFile file, DataStructures.GameData.Palette pal)
         {
-            var model = LoadModel(file);
+            var model = LoadModel(file, pal);
             var reference = new ModelReference(file.FullPathName, model);
             References.Add(reference);
             return reference;
@@ -59,7 +59,7 @@ public static bool CanLoad(IFile file)
             return RegisteredProviders.Any(p => p.IsValidForFile(file));
         }
 
-        private static DataStructures.Models.Model LoadModel(IFile file)
+        private static DataStructures.Models.Model LoadModel(IFile file, DataStructures.GameData.Palette pal)
         {
             var path = file.FullPathName;
             if (Models.ContainsKey(path)) return Models[path];
@@ -68,7 +68,7 @@ private static DataStructures.Models.Model LoadModel(IFile file)
             var provider = RegisteredProviders.FirstOrDefault(p => p.IsValidForFile(file));
             if (provider != null)
             {
-                var model = provider.LoadFromFile(file);
+                var model = provider.LoadFromFile(file, pal);
                 model.PreprocessModel();
                 for (var i = 0; i < model.Textures.Count; i++)
                 {
@@ -88,6 +88,6 @@ private static void UnloadModel(DataStructures.Models.Model model)
         }
 
         protected abstract bool IsValidForFile(IFile file);
-        protected abstract DataStructures.Models.Model LoadFromFile(IFile file);
+        protected abstract DataStructures.Models.Model LoadFromFile(IFile file, DataStructures.GameData.Palette pal);
     }
 }
diff --git a/Sledge.Providers/Texture/SprProvider.cs b/Sledge.Providers/Texture/SprProvider.cs
index 81106242a..2efc7b1dd 100644
--- a/Sledge.Providers/Texture/SprProvider.cs
+++ b/Sledge.Providers/Texture/SprProvider.cs
@@ -9,6 +9,7 @@
 using Sledge.Common;
 using Sledge.FileSystem;
 using Sledge.Graphics.Helpers;
+using Sledge.DataStructures.GameData;
 
 namespace Sledge.Providers.Texture
 {
@@ -137,11 +138,11 @@ public override void LoadTextures(IEnumerable<TextureItem> items)
             }
         }
 
-        public override IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist)
+        public override IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist, Palette pal)
         {
             // Sprite provider ignores the black/whitelists
             var dirs = sourceRoots.Union(additionalPackages).Where(Directory.Exists).Select(Path.GetFullPath).Select(x => x.ToLowerInvariant()).Distinct().ToList();
-            var tp = new TexturePackage(String.Join(";", dirs), "sprites", this) {IsBrowsable = false};
+            var tp = new TexturePackage(String.Join(";", dirs), "sprites", this, pal) {IsBrowsable = false};
             foreach (var dir in dirs)
             {
                 var sprs = Directory.GetFiles(dir, "*.spr", SearchOption.AllDirectories);
diff --git a/Sledge.Providers/Texture/TexturePackage.cs b/Sledge.Providers/Texture/TexturePackage.cs
index 564e33e89..eba765a81 100644
--- a/Sledge.Providers/Texture/TexturePackage.cs
+++ b/Sledge.Providers/Texture/TexturePackage.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Sledge.Graphics.Helpers;
+using Sledge.DataStructures.GameData;
 
 namespace Sledge.Providers.Texture
 {
@@ -12,8 +13,9 @@ public class TexturePackage : IDisposable
         public Dictionary<string, TextureItem> Items { get; private set; }
         private readonly Dictionary<string, TextureItem> _loadedItems;
         public bool IsBrowsable { get; set; }
+        public Palette Palette { get; private set; }
 
-        public TexturePackage(string packageRoot, string packageRelativePath, TextureProvider provider)
+        public TexturePackage(string packageRoot, string packageRelativePath, TextureProvider provider, Palette pal)
         {
             Provider = provider;
             PackageRoot = packageRoot;
@@ -21,6 +23,7 @@ public TexturePackage(string packageRoot, string packageRelativePath, TexturePro
             Items = new Dictionary<string, TextureItem>();
             _loadedItems = new Dictionary<string, TextureItem>();
             IsBrowsable = true;
+            Palette = pal;
         }
 
         public void AddTexture(TextureItem item)
diff --git a/Sledge.Providers/Texture/TextureProvider.cs b/Sledge.Providers/Texture/TextureProvider.cs
index 58c5e0ece..d99787116 100644
--- a/Sledge.Providers/Texture/TextureProvider.cs
+++ b/Sledge.Providers/Texture/TextureProvider.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Sledge.Graphics.Helpers;
+using Sledge.DataStructures.GameData;
 
 namespace Sledge.Providers.Texture
 {
@@ -41,12 +42,12 @@ public static void Deregister(TextureProvider provider)
         #endregion
 
         protected string CachePath { get; private set; }
-        public abstract IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist);
+        public abstract IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist, Palette pal);
         public abstract void DeletePackages(IEnumerable<TexturePackage> packages);
         public abstract void LoadTextures(IEnumerable<TextureItem> items);
         public abstract ITextureStreamSource GetStreamSource(int maxWidth, int maxHeight, IEnumerable<TexturePackage> packages);
 
-        public static TextureCollection CreateCollection(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist)
+        public static TextureCollection CreateCollection(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist, Palette pal)
         {
             var list = sourceRoots.ToList();
             var additional = additionalPackages == null ? new List<string>() : additionalPackages.ToList();
@@ -55,7 +56,7 @@ public static TextureCollection CreateCollection(IEnumerable<string> sourceRoots
             var pkgs = new List<TexturePackage>();
             foreach (var provider in RegisteredProviders)
             {
-                pkgs.AddRange(provider.CreatePackages(list, additional, bl, wl));
+                pkgs.AddRange(provider.CreatePackages(list, additional, bl, wl, pal));
             }
             var tc = new TextureCollection(pkgs);
             Packages.AddRange(pkgs);
diff --git a/Sledge.Providers/Texture/VmtProvider.cs b/Sledge.Providers/Texture/VmtProvider.cs
index f0963355f..8adfd77b3 100644
--- a/Sledge.Providers/Texture/VmtProvider.cs
+++ b/Sledge.Providers/Texture/VmtProvider.cs
@@ -8,6 +8,7 @@
 using Sledge.Graphics.Helpers;
 using Sledge.Packages;
 using Sledge.Packages.Vpk;
+using Sledge.DataStructures.GameData;
 
 namespace Sledge.Providers.Texture
 {
@@ -15,7 +16,7 @@ public class VmtProvider : TextureProvider
     {
         private readonly Dictionary<TexturePackage, QuickRoot> _roots = new Dictionary<TexturePackage, QuickRoot>();
 
-        public override IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist)
+        public override IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist, Palette pal)
         {
             var blist = blacklist.Select(x => x.TrimEnd('/', '\\')).Where(x => !String.IsNullOrWhiteSpace(x)).ToList();
             var wlist = whitelist.Select(x => x.TrimEnd('/', '\\')).Where(x => !String.IsNullOrWhiteSpace(x)).ToList();
@@ -59,7 +60,7 @@ public override IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> s
                     continue;
                 }
 
-                if (!packages.ContainsKey(dir)) packages.Add(dir, new TexturePackage(packageRoot, dir, this));
+                if (!packages.ContainsKey(dir)) packages.Add(dir, new TexturePackage(packageRoot, dir, this, pal));
                 if (packages[dir].HasTexture(vmt)) continue;
 
                 var gs = GenericStructure.Parse(new StreamReader(vmtRoot.OpenFile(vmt))).FirstOrDefault();
diff --git a/Sledge.Providers/Texture/WadProvider.cs b/Sledge.Providers/Texture/WadProvider.cs
index 71d48d32d..c2292a85b 100644
--- a/Sledge.Providers/Texture/WadProvider.cs
+++ b/Sledge.Providers/Texture/WadProvider.cs
@@ -9,6 +9,7 @@
 using System.Drawing;
 using Sledge.Packages;
 using Sledge.Packages.Wad;
+using Sledge.DataStructures.GameData;
 
 namespace Sledge.Providers.Texture
 {
@@ -132,20 +133,20 @@ private void SaveToCache(TexturePackage package)
 
         private readonly Dictionary<TexturePackage, WadStream> _roots = new Dictionary<TexturePackage, WadStream>();
 
-        private TexturePackage CreatePackage(string package)
+        private TexturePackage CreatePackage(string package, Palette pal)
         {
             try
             {
                 var fi = new FileInfo(package);
                 if (!fi.Exists) return null;
 
-                var tp = new TexturePackage(package, Path.GetFileNameWithoutExtension(package), this);
+                var tp = new TexturePackage(package, Path.GetFileNameWithoutExtension(package), this, pal);
                 if (LoadFromCache(tp)) return tp;
 
                 var list = new List<TextureItem>();
 
                 var pack = _roots.Values.FirstOrDefault(x => x.Package.PackageFile.FullName == fi.FullName);
-                if (pack == null) _roots.Add(tp, pack = new WadStream(new WadPackage(fi)));
+                if (pack == null) _roots.Add(tp, pack = new WadStream(new WadPackage(fi, pal)));
 
                 list.AddRange(pack.Package.GetEntries().OfType<WadEntry>().Select(x => new TextureItem(tp, x.Name, GetFlags(x.Name), (int) x.Width, (int) x.Height)));
                 foreach (var ti in list)
@@ -161,7 +162,7 @@ private TexturePackage CreatePackage(string package)
             }
         }
 
-        public override IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist)
+        public override IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> sourceRoots, IEnumerable<string> additionalPackages, IEnumerable<string> blacklist, IEnumerable<string> whitelist, Palette pal)
         {
             var blist = blacklist.Select(x => x.EndsWith(".wad") ? x.Substring(0, x.Length - 4) : x).Where(x => !String.IsNullOrWhiteSpace(x)).ToList();
             var wlist = whitelist.Select(x => x.EndsWith(".wad") ? x.Substring(0, x.Length - 4) : x).Where(x => !String.IsNullOrWhiteSpace(x)).ToList();
@@ -176,7 +177,7 @@ public override IEnumerable<TexturePackage> CreatePackages(IEnumerable<string> s
             {
                 wads = wads.Where(x => wlist.Contains(Path.GetFileNameWithoutExtension(x) ?? x, StringComparer.InvariantCultureIgnoreCase));
             }
-            return wads.AsParallel().Select(CreatePackage).Where(x => x != null);
+            return wads.AsParallel().Select(x => CreatePackage(x, pal)).Where(x => x != null);
         }
 
         public override void DeletePackages(IEnumerable<TexturePackage> packages)
@@ -201,7 +202,7 @@ public override void LoadTextures(IEnumerable<TextureItem> items)
             {
                 if (!_roots.ContainsKey(x))
                 {
-                    var wp = new WadStream(new WadPackage(new FileInfo(x.PackageRoot)));
+                    var wp = new WadStream(new WadPackage(new FileInfo(x.PackageRoot), x.Palette));
                     _roots.Add(x, wp);
                 }
                 return _roots[x];
@@ -247,7 +248,7 @@ public override ITextureStreamSource GetStreamSource(int maxWidth, int maxHeight
             {
                 if (!_roots.ContainsKey(x))
                 {
-                    var wp = new WadStream(new WadPackage(new FileInfo(x.PackageRoot)));
+                    var wp = new WadStream(new WadPackage(new FileInfo(x.PackageRoot), x.Palette));
                     _roots.Add(x, wp);
                 }
                 return _roots[x];
diff --git a/Sledge.Tests/Vtf/VtfTest.cs b/Sledge.Tests/Vtf/VtfTest.cs
index 636d40d42..eae35e775 100644
--- a/Sledge.Tests/Vtf/VtfTest.cs
+++ b/Sledge.Tests/Vtf/VtfTest.cs
@@ -91,7 +91,7 @@ public void VpkVtfCollectionTest()
             var collection = TextureProvider.CreateCollection(new[]
             {
                 @"F:\Steam\SteamApps\common\Team Fortress 2\tf"
-            }, null, null, null);
+            }, null, null, null, null);
         }
 
         [TestMethod]

From 73aa377d47add8cd6e23ec6a48ab96d5548626ca Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Sun, 27 Dec 2015 19:26:52 -0800
Subject: [PATCH 2/2] WadPackage: Refactor handling of WadEntryType.Texture and
 WadEntryType.QuakeTexture

---
 Sledge.Packages/Wad/WadPackage.cs | 36 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/Sledge.Packages/Wad/WadPackage.cs b/Sledge.Packages/Wad/WadPackage.cs
index 7f4de334d..ac3e3537a 100644
--- a/Sledge.Packages/Wad/WadPackage.cs
+++ b/Sledge.Packages/Wad/WadPackage.cs
@@ -133,24 +133,14 @@ private void SetEntryData(WadEntry e, BinaryReader br)
                     paletteDataOffset = br.BaseStream.Position;
                     break;
                 case WadEntryType.Texture:
+                    textureDataOffset = MoveToTextureData(br, out width, out height);
+                    paletteSize = br.ReadUInt16();
+                    paletteDataOffset = br.BaseStream.Position;
+                    break;
                 case WadEntryType.QuakeTexture:
-                    br.BaseStream.Position += 16; // Skip name
-                    width = br.ReadUInt32();
-                    height = br.ReadUInt32();
-                    textureDataOffset = br.BaseStream.Position + 16;
-                    var num = (int)(width * height);
-                    var skipMapData = (num / 4) + (num / 16) + (num / 64);
-                    br.BaseStream.Position += 16 + num + skipMapData; // Skip mipmap offsets, texture data, mipmap texture data
-                    if (e.Type == WadEntryType.QuakeTexture)
-                    {
-                        paletteSize = 256;
-                        paletteDataOffset = 0;
-                    }
-                    else
-                    {
-                        paletteSize = br.ReadUInt16();
-                        paletteDataOffset = br.BaseStream.Position;
-                    }
+                    textureDataOffset = MoveToTextureData(br, out width, out height);
+                    paletteSize = 256;
+                    paletteDataOffset = 0; // Ignored for Quake textures, since the palette is in a separate file
                     break;
                     /*
                 case WadEntryType.Font:
@@ -171,6 +161,18 @@ private void SetEntryData(WadEntry e, BinaryReader br)
             e.PaletteDataOffset = paletteDataOffset;
         }
 
+        private long MoveToTextureData(BinaryReader br, out uint width, out uint height)
+        {
+            br.BaseStream.Position += 16; // Skip name
+            width = br.ReadUInt32();
+            height = br.ReadUInt32();
+            var textureDataOffset = br.BaseStream.Position + 16;
+            var num = (int)(width * height);
+            var skipMapData = (num / 4) + (num / 16) + (num / 64);
+            br.BaseStream.Position += 16 + num + skipMapData; // Skip mipmap offsets, texture data, mipmap texture data
+            return textureDataOffset;
+        }
+
         private Dictionary<string, WadEntry> _files;
 
         private void BuildDirectories()