handle crashes in Material_Compare

src/client/component/fastfiles.cpp

@@ -22,6 +22,7 @@ namespace fastfiles
 	{
 		utils::hook::detour db_try_load_x_file_internal_hook;
 		utils::hook::detour db_find_xasset_header_hook;
+
 		game::dvar_t* g_dump_scripts;
 
 		std::vector<HANDLE> fastfile_handles;

src/client/component/materials.cpp

@@ -22,6 +22,7 @@ namespace materials
 		utils::hook::detour db_material_streaming_fail_hook;
 		utils::hook::detour material_register_handle_hook;
 		utils::hook::detour db_get_material_index_hook;
+		utils::hook::detour material_compare_hook;
 
 		struct material_data_t
 		{
@@ -156,6 +157,27 @@ namespace materials
 
 			return db_get_material_index_hook.invoke<unsigned int>(material);
 		}
+
+#ifdef DEBUG
+		char material_compare_stub(unsigned int index_a, unsigned int index_b)
+		{
+			char result = 0;
+
+			__try
+			{
+				result = material_compare_hook.invoke<char>(index_a, index_b);
+			}
+			__except (EXCEPTION_EXECUTE_HANDLER)
+			{
+				const auto* material_a = utils::hook::invoke<game::Material*>(0x395FE0_b, index_a);
+				const auto* material_b = utils::hook::invoke<game::Material*>(0x395FE0_b, index_b);
+				console::error("Material_Compare: %s - %s (%d - %d)", 
+					material_a->name, material_b->name, material_a->info.sortKey, material_b->info.sortKey);
+			}
+
+			return result;
+		}
+#endif
 	}
 
 	void add(const std::string& name, const std::string& data)
@@ -205,6 +227,9 @@ namespace materials
 			material_register_handle_hook.create(game::Material_RegisterHandle, material_register_handle_stub);
 			db_material_streaming_fail_hook.create(SELECT_VALUE(0x1FB400_b, 0x3A1600_b), db_material_streaming_fail_stub);
 			db_get_material_index_hook.create(SELECT_VALUE(0x1F1D80_b, 0x396000_b), db_get_material_index_stub);
+#ifdef DEBUG
+			material_compare_hook.create(0x693D1E_b, material_compare_stub);
+#endif
 		}
 	};
 }

src/client/game/structs.hpp

@@ -1217,22 +1217,133 @@ namespace game
 		char rasterizerState;
 	};
 
-	struct Material
+	struct Packed128
+	{
+		std::uint64_t p0;
+		std::uint64_t p1;
+	};
+
+	struct GfxDrawSurfFields
+	{
+		unsigned __int64 objectId : 16; // p0 >> 0
+		unsigned __int64 pad0 : 20;
+		unsigned __int64 reflectionProbeIndex : 8;
+		unsigned __int64 hasGfxEntIndex : 1;
+		unsigned __int64 customIndex : 5; // p0 >> 45
+		unsigned __int64 materialSortedIndex : 14; // p0 >> 50
+		unsigned __int64 tessellation : 2; // p1 >> 0
+		unsigned __int64 prepass : 2; // p1 >> 2
+		unsigned __int64 pad1 : 4;
+		unsigned __int64 useHeroLighting : 1;
+		unsigned __int64 sceneLightEnvIndex : 16;
+		unsigned __int64 viewModelRender : 1;
+		unsigned __int64 surfType : 4;
+		unsigned __int64 primarySortKey : 6; // p1 >> 30
+		unsigned __int64 unused : 28;
+	};
+
+	union GfxDrawSurf
+	{
+		GfxDrawSurfFields fields;
+		Packed128 packed;
+	};
+
+	enum SurfaceTypeBits : std::uint64_t
+	{
+		SURFTYPE_BITS_DEFAULT = 0x0,
+		SURFTYPE_BITS_BARK = 0x1,
+		SURFTYPE_BITS_BRICK = 0x2,
+		SURFTYPE_BITS_CARPET = 0x4,
+		SURFTYPE_BITS_CLOTH = 0x8,
+		SURFTYPE_BITS_CONCRETE = 0x10,
+		SURFTYPE_BITS_DIRT = 0x20,
+		SURFTYPE_BITS_FLESH = 0x40,
+		SURFTYPE_BITS_FOLIAGE_DEBRIS = 0x80,
+		SURFTYPE_BITS_GLASS = 0x100,
+		SURFTYPE_BITS_GRASS = 0x200,
+		SURFTYPE_BITS_GRAVEL = 0x400,
+		SURFTYPE_BITS_ICE = 0x800,
+		SURFTYPE_BITS_METAL_SOLID = 0x1000,
+		SURFTYPE_BITS_METAL_GRATE = 0x2000,
+		SURFTYPE_BITS_MUD = 0x4000,
+		SURFTYPE_BITS_PAPER = 0x8000,
+		SURFTYPE_BITS_PLASTER = 0x10000,
+		SURFTYPE_BITS_ROCK = 0x20000,
+		SURFTYPE_BITS_SAND = 0x40000,
+		SURFTYPE_BITS_SNOW = 0x80000,
+		SURFTYPE_BITS_WATER_WAIST = 0x100000,
+		SURFTYPE_BITS_WOOD_SOLID = 0x200000,
+		SURFTYPE_BITS_ASPHALT = 0x400000,
+		SURFTYPE_BITS_CERAMIC = 0x800000,
+		SURFTYPE_BITS_PLASTIC_SOLID = 0x1000000,
+		SURFTYPE_BITS_RUBBER = 0x2000000,
+		SURFTYPE_BITS_FRUIT = 0x4000000,
+		SURFTYPE_BITS_PAINTEDMETAL = 0x8000000,
+		SURFTYPE_BITS_RIOTSHIELD = 0x10000000,
+		SURFTYPE_BITS_SLUSH = 0x20000000,
+		SURFTYPE_BITS_ASPHALT_WET = 0x40000000,
+		SURFTYPE_BITS_ASPHALT_DEBRIS = 0x80000000,
+		SURFTYPE_BITS_CONCRETE_WET = 0x100000000,
+		SURFTYPE_BITS_CONCRETE_DEBRIS = 0x200000000,
+		SURFTYPE_BITS_FOLIAGE_VEGETATION = 0x400000000,
+		SURFTYPE_BITS_FOLIAGE_LEAVES = 0x800000000,
+		SURFTYPE_BITS_GRASS_TALL = 0x1000000000,
+		SURFTYPE_BITS_METAL_HOLLOW = 0x2000000000,
+		SURFTYPE_BITS_METAL_VEHICLE = 0x4000000000,
+		SURFTYPE_BITS_METAL_THIN = 0x8000000000,
+		SURFTYPE_BITS_METAL_WET = 0x10000000000,
+		SURFTYPE_BITS_METAL_DEBRIS = 0x20000000000,
+		SURFTYPE_BITS_PLASTIC_HOLLOW = 0x40000000000,
+		SURFTYPE_BITS_PLASTIC_TARP = 0x80000000000,
+		SURFTYPE_BITS_ROCK_WET = 0x100000000000,
+		SURFTYPE_BITS_ROCK_DEBRIS = 0x200000000000,
+		SURFTYPE_BITS_WATER_ANKLE = 0x400000000000,
+		SURFTYPE_BITS_WATER_KNEE = 0x800000000000,
+		SURFTYPE_BITS_WOOD_HOLLOW = 0x1000000000000,
+		SURFTYPE_BITS_WOOD_WET = 0x2000000000000,
+		SURFTYPE_BITS_WOOD_DEBRIS = 0x4000000000000,
+		SURFTYPE_BITS_CUSHION = 0x8000000000000,
+	};
+
+	struct MaterialInfo
 	{
 		const char* name;
-		char __pad0[0x118];
+		unsigned char gameFlags;
-		char textureCount;
+		unsigned char sortKey;
-		char constantCount;
+		unsigned char textureAtlasRowCount;
-		char stateBitsCount;
+		unsigned char textureAtlasColumnCount;
-		char stateFlags;
+		unsigned char textureAtlasFrameBlend;
-		char cameraRegion;
+		unsigned char textureAtlasAsArray;
-		char materialType;
+		unsigned char renderFlags;
-		char assetFlags;
+		GfxDrawSurf drawSurf;
+		void* surfaceTypeBits;
+		unsigned int hashIndex;
+	};
+
+	struct Material
+	{
+		union
+		{
+			const char* name;
+			MaterialInfo info;
+		};
+		unsigned char stateBitsEntry[240];
+		unsigned char textureCount;
+		unsigned char constantCount;
+		unsigned char stateBitsCount;
+		unsigned char stateFlags;
+		unsigned char cameraRegion;
+		unsigned char materialType;
+		unsigned char layerCount;
+		unsigned char assetFlags;
 		MaterialTechniqueSet* techniqueSet;
 		MaterialTextureDef* textureTable;
 		void* constantTable;
 		GfxStateBits* stateBitsTable;
-		char __pad2[0x108];
+		unsigned char constantBufferIndex[240];
+		void* constantBufferTable;
+		unsigned char constantBufferCount;
+		const char** subMaterials;
 	};
 
 	static_assert(sizeof(Material) == 0x250);