diff --git a/CodeWalker.Core/GameFiles/FileTypes/VehicleLayoutsFile.cs b/CodeWalker.Core/GameFiles/FileTypes/VehicleLayoutsFile.cs index 825cc17..d5dcf8c 100644 --- a/CodeWalker.Core/GameFiles/FileTypes/VehicleLayoutsFile.cs +++ b/CodeWalker.Core/GameFiles/FileTypes/VehicleLayoutsFile.cs @@ -10,6 +10,8 @@ namespace CodeWalker.GameFiles [TypeConverter(typeof(ExpandableObjectConverter))] public class VehicleLayoutsFile : GameFile, PackedFile { + public string Xml { get; set; } + public VehicleLayoutsFile() : base(null, GameFileType.VehicleLayouts) { } public VehicleLayoutsFile(RpfFileEntry entry) : base(entry, GameFileType.VehicleLayouts) @@ -22,9 +24,11 @@ namespace CodeWalker.GameFiles Name = entry.Name; FilePath = Name; - //TODO //always XML .meta + Xml = Encoding.UTF8.GetString(data); + + //TODO: parse CVehicleMetadataMgr XML Loaded = true; diff --git a/CodeWalker.Core/GameFiles/GameFileCache.cs b/CodeWalker.Core/GameFiles/GameFileCache.cs index c657e67..54aa4f2 100644 --- a/CodeWalker.Core/GameFiles/GameFileCache.cs +++ b/CodeWalker.Core/GameFiles/GameFileCache.cs @@ -1534,6 +1534,8 @@ namespace CodeWalker.GameFiles if (entry.NameLower.StartsWith("vehiclelayouts") && entry.NameLower.EndsWith(".meta")) { var lf = RpfMan.GetFile(entry); + if (lf.Xml != null) + { } allVehicleLayouts.Add(lf); } } diff --git a/Rendering/Shaders/BasicShader.cs b/Rendering/Shaders/BasicShader.cs index 9cc5f52..39d85a5 100644 --- a/Rendering/Shaders/BasicShader.cs +++ b/Rendering/Shaders/BasicShader.cs @@ -543,9 +543,11 @@ namespace CodeWalker.Rendering switch (ihash) { case MetaName.DiffuseSampler: + case MetaName.PlateBgSampler: texture = itex; break; case MetaName.BumpSampler: + case MetaName.PlateBgBumpSampler: bumptex = itex; break; case MetaName.SpecSampler: