Skip to content

Commit

Permalink
MW3 OBJ fix & COD4 SP support
Browse files Browse the repository at this point in the history
  • Loading branch information
@sheilan102
sheilan102 committed Jul 23, 2019
1 parent 8c6cd14 commit 2b0a3c6
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 118 deletions.
10 changes: 9 additions & 1 deletion src/Husky/Husky/Games/ModernWarfare3.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,14 @@ public static void ExportBSPData(ProcessReader reader, long assetPoolsAddress, l
// Create new OBJ
var obj = new WavefrontOBJ();

// Append Vertex Data
foreach (var vertex in vertices)
{
obj.Vertices.Add(vertex.Position);
obj.Normals.Add(vertex.Normal);
obj.UVs.Add(vertex.UV);
}

// Image Names (for Search String)
HashSet<string> imageNames = new HashSet<string>();

Expand Down Expand Up @@ -436,7 +444,7 @@ public static WavefrontOBJ.Material ReadMaterial(ProcessReader reader, long addr
var materialImage = reader.ReadStruct<MaterialImage32B>(material.ImageTablePointer + i * Marshal.SizeOf<MaterialImage32B>());
// Check for color map for now
if (materialImage.SemanticHash == 0xA0AB1041)
objMaterial.DiffuseMap = "_images\\\\" + reader.ReadNullTerminatedString(reader.ReadInt32(materialImage.ImagePointer + 0x1C)) + ".png";
objMaterial.DiffuseMap = "_images\\\\" + reader.ReadNullTerminatedString(reader.ReadInt32(materialImage.ImagePointer + 0x1C));
}
// Done
return objMaterial;
Expand Down
223 changes: 110 additions & 113 deletions src/Husky/Husky/HuskyUtil.cs
View file
Original file line number Diff line number Diff line change
@@ -1,113 +1,110 @@
// ------------------------------------------------------------------------
// Husky - Call of Duty BSP Extractor
// Copyright (C) 2018 Philip/Scobalula
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
// ------------------------------------------------------------------------
// TODO: Write converters for other formats (like SEModel) for now we're just writing OBJ
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using PhilLibX;
using PhilLibX.IO;

namespace Husky
{
/// <summary>
/// Game Definition (AssetDB Address, Sizes Address, Game Type ID (MP, SP, ZM, etc.), Export Method
/// </summary>
using GameDefinition = Tuple<long, long, string, Action<ProcessReader, long, long, string, Action<object>>>;

/// <summary>
/// Main Program Class
/// </summary>
public class HuskyUtil
{
/// <summary>
/// Game Addresses & Methods (Asset DB and Asset Pool Sizes) (Some are relative due to ASLR)
/// </summary>
static readonly Dictionary<string, GameDefinition> Games = new Dictionary<string, GameDefinition>()
{
// Call of Duty: World At War
{ "CoDWaWmp", new GameDefinition(0x8D0958, 0x8D06E8, "mp", WorldatWar.ExportBSPData) },
{ "CoDWaW", new GameDefinition(0x8DC828, 0x8DC5D0, "sp", WorldatWar.ExportBSPData) },
// Call of Duty: Modern Warfare
{ "iw3mp", new GameDefinition(0x7265E0, 0x7263A0, "mp", ModernWarfare.ExportBSPData) },
{ "iw3sp", new GameDefinition(0x7307F8, 0x730510, "sp", ModernWarfare.ExportBSPData) },
// Call of Duty: Modern Warfare 2
{ "iw4mp", new GameDefinition(0x6F81D0, 0x6F7F08, "mp", ModernWarfare2.ExportBSPData) },
{ "iw4sp", new GameDefinition(0x7307F8, 0x730510, "sp", ModernWarfare2.ExportBSPData) },
// Call of Duty: Modern Warfare 3
{ "iw5mp", new GameDefinition(0x8AB258, 0x8AAF78, "mp", ModernWarfare3.ExportBSPData) },
{ "iw5sp", new GameDefinition(0x92AD20, 0x92AA40, "sp", ModernWarfare3.ExportBSPData) },
// Call of Duty: Black Ops
{ "BlackOps", new GameDefinition(0xB741B8, 0xB73EF8, "sp", BlackOps.ExportBSPData) },
{ "BlackOpsMP", new GameDefinition(0xBF2C30, 0xBF2970, "mp", BlackOps.ExportBSPData) },
// Call of Duty: Black Ops 2
{ "t6zm", new GameDefinition(0xD41240, 0xD40E80, "zm", BlackOps2.ExportBSPData) },
{ "t6mp", new GameDefinition(0xD4B340, 0xD4AF80, "mp", BlackOps2.ExportBSPData) },
{ "t6sp", new GameDefinition(0xBD46B8, 0xBD42F8, "sp", BlackOps2.ExportBSPData) },
// Call of Duty: Ghosts
{ "iw6mp64_ship", new GameDefinition(0x1409E4F20, 0x1409E4E20, "mp", Ghosts.ExportBSPData) },
{ "iw6sp64_ship", new GameDefinition(0x14086DCB0, 0x14086DBB0, "sp", Ghosts.ExportBSPData) },
// Call of Duty: Infinite Warfare
{ "iw7_ship", new GameDefinition(0x1414663D0, 0x141466290, "core", InfiniteWarfare.ExportBSPData) },
// Call of Duty: Advanced Warfare
{ "s1_mp64_ship", new GameDefinition(0x1409B40D0, 0x1409B4B90, "mp", AdvancedWarfare.ExportBSPData) },
{ "s1_sp64_ship", new GameDefinition(0x140804690, 0x140804140, "sp", AdvancedWarfare.ExportBSPData) },
// Call of Duty: World War II
{ "s2_mp64_ship", new GameDefinition(0xC05370, 0xC05370, "mp", WorldWarII.ExportBSPData) },
{ "s2_sp64_ship", new GameDefinition(0x9483F0, 0xBCC5E0, "sp", WorldWarII.ExportBSPData) },
// Call of Duty: Modern Warfare Remastered
{ "h1_mp64_ship", new GameDefinition(0x10B4460, 0x10B3C80, "mp", ModernWarfareRM.ExportBSPData) },
{ "h1_sp64_ship", new GameDefinition(0xEC9FB0, 0xEC97D0, "sp", ModernWarfareRM.ExportBSPData) },
};

/// <summary>
/// Looks for matching game and loads BSP from it
/// </summary>
public static void LoadGame(Action<object> printCallback = null)
{
try
{
// Get all processes
var processes = Process.GetProcesses();

// Loop through them, find match
foreach (var process in processes)
{
// Check for it in dictionary
if (Games.TryGetValue(process.ProcessName, out var game))
{
// Export it
game.Item4(new ProcessReader(process), game.Item1, game.Item2, game.Item3, printCallback);

// Done
return;
}
}

// Failed
printCallback?.Invoke("Failed to find a supported game, please ensure one of them is running.");
}
catch(Exception e)
{
printCallback?.Invoke("An unhandled exception has occured:");
printCallback?.Invoke(e);
}
}
}
}
// ------------------------------------------------------------------------
// Husky - Call of Duty BSP Extractor
// Copyright (C) 2018 Philip/Scobalula
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
// ------------------------------------------------------------------------
// TODO: Write converters for other formats (like SEModel) for now we're just writing OBJ
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using PhilLibX.IO;

namespace Husky
{
/// <summary>
/// Game Definition (AssetDB Address, Sizes Address, Game Type ID (MP, SP, ZM, etc.), Export Method
/// </summary>
using GameDefinition = Tuple<long, long, string, Action<ProcessReader, long, long, string, Action<object>>>;

/// <summary>
/// Main Program Class
/// </summary>
public class HuskyUtil
{
/// <summary>
/// Game Addresses & Methods (Asset DB and Asset Pool Sizes) (Some are relative due to ASLR)
/// </summary>
static readonly Dictionary<string, GameDefinition> Games = new Dictionary<string, GameDefinition>()
{
// Call of Duty: World At War
{ "CoDWaWmp", new GameDefinition(0x8D0958, 0x8D06E8, "mp", WorldatWar.ExportBSPData) },
{ "CoDWaW", new GameDefinition(0x8DC828, 0x8DC5D0, "sp", WorldatWar.ExportBSPData) },
// Call of Duty: Modern Warfare
{ "iw3mp", new GameDefinition(0x7265E0, 0x7263A0, "mp", ModernWarfare.ExportBSPData) },
{ "iw3sp", new GameDefinition(0x6DF200, 0x730510, "sp", ModernWarfare.ExportBSPData) },
// Call of Duty: Modern Warfare 2
{ "iw4mp", new GameDefinition(0x6F81D0, 0x6F7F08, "mp", ModernWarfare2.ExportBSPData) },
{ "iw4sp", new GameDefinition(0x7307F8, 0x730510, "sp", ModernWarfare2.ExportBSPData) },
// Call of Duty: Modern Warfare 3
{ "iw5mp", new GameDefinition(0x8AB258, 0x8AAF78, "mp", ModernWarfare3.ExportBSPData) },
{ "iw5sp", new GameDefinition(0x92AD20, 0x92AA40, "sp", ModernWarfare3.ExportBSPData) },
// Call of Duty: Black Ops
{ "BlackOps", new GameDefinition(0xB741B8, 0xB73EF8, "sp", BlackOps.ExportBSPData) },
{ "BlackOpsMP", new GameDefinition(0xBF2C30, 0xBF2970, "mp", BlackOps.ExportBSPData) },
// Call of Duty: Black Ops 2
{ "t6zm", new GameDefinition(0xD41240, 0xD40E80, "zm", BlackOps2.ExportBSPData) },
{ "t6mp", new GameDefinition(0xD4B340, 0xD4AF80, "mp", BlackOps2.ExportBSPData) },
{ "t6sp", new GameDefinition(0xBD46B8, 0xBD42F8, "sp", BlackOps2.ExportBSPData) },
// Call of Duty: Ghosts
{ "iw6mp64_ship", new GameDefinition(0x1409E4F20, 0x1409E4E20, "mp", Ghosts.ExportBSPData) },
{ "iw6sp64_ship", new GameDefinition(0x14086DCB0, 0x14086DBB0, "sp", Ghosts.ExportBSPData) },
// Call of Duty: Infinite Warfare
{ "iw7_ship", new GameDefinition(0x1414663D0, 0x141466290, "core", InfiniteWarfare.ExportBSPData) },
// Call of Duty: Advanced Warfare
{ "s1_mp64_ship", new GameDefinition(0x1409B40D0, 0x1409B4B90, "mp", AdvancedWarfare.ExportBSPData) },
{ "s1_sp64_ship", new GameDefinition(0x140804690, 0x140804140, "sp", AdvancedWarfare.ExportBSPData) },
// Call of Duty: World War II
{ "s2_mp64_ship", new GameDefinition(0xC05370, 0xC05370, "mp", WorldWarII.ExportBSPData) },
{ "s2_sp64_ship", new GameDefinition(0x9483F0, 0xBCC5E0, "sp", WorldWarII.ExportBSPData) },
// Call of Duty: Modern Warfare Remastered
{ "h1_mp64_ship", new GameDefinition(0x10B4460, 0x10B3C80, "mp", ModernWarfareRM.ExportBSPData) },
{ "h1_sp64_ship", new GameDefinition(0xEC9FB0, 0xEC97D0, "sp", ModernWarfareRM.ExportBSPData) },
};

/// <summary>
/// Looks for matching game and loads BSP from it
/// </summary>
public static void LoadGame(Action<object> printCallback = null)
{
try
{
// Get all processes
var processes = Process.GetProcesses();

// Loop through them, find match
foreach (var process in processes)
{
// Check for it in dictionary
if (Games.TryGetValue(process.ProcessName, out var game))
{
// Export it
game.Item4(new ProcessReader(process), game.Item1, game.Item2, game.Item3, printCallback);
// Done
return;
}
}

// Failed
printCallback?.Invoke("Failed to find a supported game, please ensure one of them is running.");
}
catch(Exception e)
{
printCallback?.Invoke("An unhandled exception has occured:");
printCallback?.Invoke(e);
}
}
}
}
4 changes: 2 additions & 2 deletions src/Husky/Husky/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.3.6")]
[assembly: AssemblyFileVersion("1.0.3.6")]
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: AssemblyFileVersion("1.0.4.2")]
4 changes: 2 additions & 2 deletions src/Husky/HuskyUI/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.3.6")]
[assembly: AssemblyFileVersion("1.0.3.6")]
[assembly: AssemblyVersion("1.0.4.2")]
[assembly: AssemblyFileVersion("1.0.4.2")]

0 comments on commit 2b0a3c6

Please sign in to comment.