mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-07-07 19:51:56 +00:00
feat: add json material loading/writing for iw3
This commit is contained in:
Jan
@ -21,6 +21,11 @@ namespace IW3
|
||||
return result;
|
||||
}
|
||||
|
||||
static constexpr uint32_t R_HashString(const char* string)
|
||||
{
|
||||
return R_HashString(string, 0u);
|
||||
}
|
||||
|
||||
static PackedTexCoords Vec2PackTexCoords(const float (&in)[2]);
|
||||
static PackedUnitVec Vec3PackUnitVec(const float (&in)[3]);
|
||||
static GfxColor Vec4PackGfxColor(const float (&in)[4]);
|
||||
|
||||
@ -566,7 +566,8 @@ namespace IW3
|
||||
GFXS_BLEND_INVDESTALPHA = 0x8,
|
||||
GFXS_BLEND_DESTCOLOR = 0x9,
|
||||
GFXS_BLEND_INVDESTCOLOR = 0xA,
|
||||
GFXS_BLEND_MASK = 0xF,
|
||||
|
||||
GFXS_BLEND_COUNT
|
||||
};
|
||||
|
||||
enum GfxBlendOp
|
||||
@ -577,7 +578,40 @@ namespace IW3
|
||||
GFXS_BLENDOP_REVSUBTRACT = 0x3,
|
||||
GFXS_BLENDOP_MIN = 0x4,
|
||||
GFXS_BLENDOP_MAX = 0x5,
|
||||
GFXS_BLENDOP_MASK = 0x7,
|
||||
|
||||
GFXS_BLENDOP_COUNT
|
||||
};
|
||||
|
||||
enum GfxAlphaTest_e
|
||||
{
|
||||
GFXS_ALPHA_TEST_GT_0 = 1,
|
||||
GFXS_ALPHA_TEST_LT_128 = 2,
|
||||
GFXS_ALPHA_TEST_GE_128 = 3,
|
||||
|
||||
GFXS_ALPHA_TEST_COUNT
|
||||
};
|
||||
|
||||
enum GfxCullFace_e
|
||||
{
|
||||
GFXS_CULL_NONE = 1,
|
||||
GFXS_CULL_BACK = 2,
|
||||
GFXS_CULL_FRONT = 3,
|
||||
};
|
||||
|
||||
enum GfxDepthTest_e
|
||||
{
|
||||
GFXS_DEPTHTEST_ALWAYS = 0,
|
||||
GFXS_DEPTHTEST_LESS = 1,
|
||||
GFXS_DEPTHTEST_EQUAL = 2,
|
||||
GFXS_DEPTHTEST_LESSEQUAL = 3
|
||||
};
|
||||
|
||||
enum GfxPolygonOffset_e
|
||||
{
|
||||
GFXS_POLYGON_OFFSET_0 = 0,
|
||||
GFXS_POLYGON_OFFSET_1 = 1,
|
||||
GFXS_POLYGON_OFFSET_2 = 2,
|
||||
GFXS_POLYGON_OFFSET_SHADOWMAP = 3
|
||||
};
|
||||
|
||||
enum GfxStencilOp
|
||||
@ -589,10 +623,19 @@ namespace IW3
|
||||
GFXS_STENCILOP_DECRSAT = 0x4,
|
||||
GFXS_STENCILOP_INVERT = 0x5,
|
||||
GFXS_STENCILOP_INCR = 0x6,
|
||||
GFXS_STENCILOP_DECR = 0x7,
|
||||
GFXS_STENCILOP_DECR = 0x7
|
||||
};
|
||||
|
||||
GFXS_STENCILOP_COUNT,
|
||||
GFXS_STENCILOP_MASK = 0x7
|
||||
enum GfxStencilFunc
|
||||
{
|
||||
GFXS_STENCILFUNC_NEVER = 0x0,
|
||||
GFXS_STENCILFUNC_LESS = 0x1,
|
||||
GFXS_STENCILFUNC_EQUAL = 0x2,
|
||||
GFXS_STENCILFUNC_LESSEQUAL = 0x3,
|
||||
GFXS_STENCILFUNC_GREATER = 0x4,
|
||||
GFXS_STENCILFUNC_NOTEQUAL = 0x5,
|
||||
GFXS_STENCILFUNC_GREATEREQUAL = 0x6,
|
||||
GFXS_STENCILFUNC_ALWAYS = 0x7
|
||||
};
|
||||
|
||||
enum GfxStateBitsEnum : unsigned int
|
||||
@ -613,10 +656,10 @@ namespace IW3
|
||||
GFXS0_ATEST_GE_128 = 0x3000,
|
||||
GFXS0_ATEST_MASK = 0x3000,
|
||||
|
||||
GFXS0_CULL_SHIFT = 0xE,
|
||||
GFXS0_CULL_NONE = 0x4000,
|
||||
GFXS0_CULL_BACK = 0x8000,
|
||||
GFXS0_CULL_FRONT = 0xC000,
|
||||
GFXS0_CULL_SHIFT = 0xE,
|
||||
GFXS0_CULL_MASK = 0xC000,
|
||||
|
||||
GFXS0_SRCBLEND_ALPHA_SHIFT = 0x10,
|
||||
@ -638,18 +681,18 @@ namespace IW3
|
||||
GFXS1_DEPTHWRITE = 0x1,
|
||||
|
||||
GFXS1_DEPTHTEST_DISABLE = 0x2,
|
||||
GFXS1_DEPTHTEST_SHIFT = 0x2,
|
||||
GFXS1_DEPTHTEST_ALWAYS = 0x0,
|
||||
GFXS1_DEPTHTEST_LESS = 0x4,
|
||||
GFXS1_DEPTHTEST_EQUAL = 0x8,
|
||||
GFXS1_DEPTHTEST_LESSEQUAL = 0xC,
|
||||
GFXS1_DEPTHTEST_SHIFT = 0x2,
|
||||
GFXS1_DEPTHTEST_MASK = 0xC,
|
||||
|
||||
GFXS1_POLYGON_OFFSET_SHIFT = 0x4,
|
||||
GFXS1_POLYGON_OFFSET_0 = 0x0,
|
||||
GFXS1_POLYGON_OFFSET_1 = 0x10,
|
||||
GFXS1_POLYGON_OFFSET_2 = 0x20,
|
||||
GFXS1_POLYGON_OFFSET_SHADOWMAP = 0x30,
|
||||
GFXS1_POLYGON_OFFSET_SHIFT = 0x4,
|
||||
GFXS1_POLYGON_OFFSET_MASK = 0x30,
|
||||
|
||||
GFXS1_STENCIL_FRONT_ENABLE = 0x40,
|
||||
@ -672,16 +715,61 @@ namespace IW3
|
||||
GFXS1_STENCILOP_FRONTBACK_MASK = 0x1FF1FF00,
|
||||
};
|
||||
|
||||
struct GfxStateBitsLoadBitsStructured
|
||||
{
|
||||
// Byte 0
|
||||
unsigned int srcBlendRgb : 4; // 0-3
|
||||
unsigned int dstBlendRgb : 4; // 4-7
|
||||
unsigned int blendOpRgb : 3; // 8-10
|
||||
unsigned int alphaTestDisabled : 1; // 11
|
||||
unsigned int alphaTest : 2; // 12-13
|
||||
unsigned int cullFace : 2; // 14-15
|
||||
unsigned int srcBlendAlpha : 4; // 16-19
|
||||
unsigned int dstBlendAlpha : 4; // 20-23
|
||||
unsigned int blendOpAlpha : 3; // 24-26
|
||||
unsigned int colorWriteRgb : 1; // 27
|
||||
unsigned int colorWriteAlpha : 1; // 28
|
||||
unsigned int unused1 : 2; // 29-30
|
||||
unsigned int polymodeLine : 1; // 31
|
||||
|
||||
// Byte 1
|
||||
unsigned int depthWrite : 1; // 0
|
||||
unsigned int depthTestDisabled : 1; // 1
|
||||
unsigned int depthTest : 2; // 2-3
|
||||
unsigned int polygonOffset : 2; // 4-5
|
||||
unsigned int stencilFrontEnabled : 1; // 6
|
||||
unsigned int stencilBackEnabled : 1; // 7
|
||||
unsigned int stencilFrontPass : 3; // 8-10
|
||||
unsigned int stencilFrontFail : 3; // 11-13
|
||||
unsigned int stencilFrontZFail : 3; // 14-16
|
||||
unsigned int stencilFrontFunc : 3; // 17-19
|
||||
unsigned int stencilBackPass : 3; // 20-22
|
||||
unsigned int stencilBackFail : 3; // 23-25
|
||||
unsigned int stencilBackZFail : 3; // 26-28
|
||||
unsigned int stencilBackFunc : 3; // 29-31
|
||||
};
|
||||
|
||||
union GfxStateBitsLoadBits
|
||||
{
|
||||
unsigned int raw[2];
|
||||
GfxStateBitsLoadBitsStructured structured;
|
||||
};
|
||||
|
||||
#ifndef __zonecodegenerator
|
||||
static_assert(sizeof(GfxStateBitsLoadBits) == 8);
|
||||
static_assert(sizeof(GfxStateBitsLoadBitsStructured) == 8);
|
||||
#endif
|
||||
|
||||
struct GfxStateBits
|
||||
{
|
||||
unsigned int loadBits[2];
|
||||
GfxStateBitsLoadBits loadBits;
|
||||
};
|
||||
|
||||
struct type_align(16) MaterialConstantDef
|
||||
{
|
||||
unsigned int nameHash;
|
||||
char name[12];
|
||||
float literal[4];
|
||||
vec4_t literal;
|
||||
};
|
||||
|
||||
struct complex_s
|
||||
@ -718,6 +806,26 @@ namespace IW3
|
||||
water_t* water;
|
||||
};
|
||||
|
||||
enum TextureFilter
|
||||
{
|
||||
TEXTURE_FILTER_DISABLED = 0x0,
|
||||
TEXTURE_FILTER_NEAREST = 0x1,
|
||||
TEXTURE_FILTER_LINEAR = 0x2,
|
||||
TEXTURE_FILTER_ANISO2X = 0x3,
|
||||
TEXTURE_FILTER_ANISO4X = 0x4,
|
||||
|
||||
TEXTURE_FILTER_COUNT
|
||||
};
|
||||
|
||||
enum SamplerStateBitsMipMap_e
|
||||
{
|
||||
SAMPLER_MIPMAP_ENUM_DISABLED,
|
||||
SAMPLER_MIPMAP_ENUM_NEAREST,
|
||||
SAMPLER_MIPMAP_ENUM_LINEAR,
|
||||
|
||||
SAMPLER_MIPMAP_ENUM_COUNT
|
||||
};
|
||||
|
||||
enum SamplerStateBits_e
|
||||
{
|
||||
SAMPLER_FILTER_SHIFT = 0x0,
|
||||
@ -743,13 +851,26 @@ namespace IW3
|
||||
SAMPLER_CLAMP_MASK = 0xE0,
|
||||
};
|
||||
|
||||
struct MaterialTextureDefSamplerState
|
||||
{
|
||||
unsigned char filter : 3;
|
||||
unsigned char mipMap : 2;
|
||||
unsigned char clampU : 1;
|
||||
unsigned char clampV : 1;
|
||||
unsigned char clampW : 1;
|
||||
};
|
||||
|
||||
#ifndef __zonecodegenerator
|
||||
static_assert(sizeof(MaterialTextureDefSamplerState) == 1u);
|
||||
#endif
|
||||
|
||||
struct MaterialTextureDef
|
||||
{
|
||||
unsigned int nameHash;
|
||||
char nameStart;
|
||||
char nameEnd;
|
||||
unsigned char samplerState; // SamplerStateBits_e
|
||||
unsigned char semantic; // TextureSemantic
|
||||
MaterialTextureDefSamplerState samplerState; // SamplerStateBits_e
|
||||
unsigned char semantic; // TextureSemantic
|
||||
MaterialTextureDefInfo u;
|
||||
};
|
||||
|
||||
@ -842,8 +963,9 @@ namespace IW3
|
||||
CAMERA_REGION_LIT = 0x0,
|
||||
CAMERA_REGION_DECAL = 0x1,
|
||||
CAMERA_REGION_EMISSIVE = 0x2,
|
||||
CAMERA_REGION_COUNT = 0x3,
|
||||
CAMERA_REGION_NONE = 0x3,
|
||||
|
||||
CAMERA_REGION_COUNT,
|
||||
CAMERA_REGION_NONE = CAMERA_REGION_COUNT,
|
||||
};
|
||||
|
||||
enum MaterialStateFlags
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
#options GAME (IW4, IW5, T6)
|
||||
#options GAME (IW3, IW4, IW5, T6)
|
||||
|
||||
#filename "Game/" + GAME + "/Material/JsonMaterial" + GAME + ".h"
|
||||
|
||||
#if GAME == "IW4"
|
||||
#if GAME == "IW3"
|
||||
#define FEATURE_IW3
|
||||
#define HAS_WATER
|
||||
#elif GAME == "IW4"
|
||||
#define FEATURE_IW4
|
||||
#define HAS_WATER
|
||||
#elif GAME == "IW5"
|
||||
@ -75,7 +78,7 @@ namespace GAME
|
||||
INVALID,
|
||||
DISABLED,
|
||||
GT0,
|
||||
#if defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
#if defined(FEATURE_IW3) || defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
LT128,
|
||||
#endif
|
||||
GE128
|
||||
@ -85,7 +88,7 @@ namespace GAME
|
||||
{JsonAlphaTest::INVALID, nullptr },
|
||||
{JsonAlphaTest::DISABLED, "disabled"},
|
||||
{JsonAlphaTest::GT0, "gt0" },
|
||||
#if defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
#if defined(FEATURE_IW3) || defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
{JsonAlphaTest::LT128, "lt128" },
|
||||
#endif
|
||||
{JsonAlphaTest::GE128, "ge128" }
|
||||
@ -315,52 +318,46 @@ namespace GAME
|
||||
#endif
|
||||
|
||||
NLOHMANN_JSON_SERIALIZE_ENUM(TextureSemantic, {
|
||||
#if defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
{TS_2D, "2D" },
|
||||
{TS_FUNCTION, "function" },
|
||||
{TS_COLOR_MAP, "colorMap" },
|
||||
{TS_2D, "2D" },
|
||||
{TS_FUNCTION, "function" },
|
||||
{TS_COLOR_MAP, "colorMap" },
|
||||
#if defined(FEATURE_IW3) || defined(FEATURE_T6)
|
||||
{TS_UNUSED_1, "unused1" },
|
||||
#else
|
||||
{TS_DETAIL_MAP, "detailMap" },
|
||||
#endif
|
||||
{TS_UNUSED_2, "unused2" },
|
||||
{TS_NORMAL_MAP, "normalMap" },
|
||||
{TS_UNUSED_3, "unused3" },
|
||||
{TS_UNUSED_4, "unused4" },
|
||||
{TS_SPECULAR_MAP, "specularMap" },
|
||||
{TS_UNUSED_5, "unused5" },
|
||||
#if defined(FEATURE_IW3) || defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
{TS_UNUSED_6, "unused6" },
|
||||
{TS_WATER_MAP, "waterMap" },
|
||||
#ifdef FEATURE_IW5
|
||||
{TS_DISPLACEMENT_MAP, "displacementMap"},
|
||||
#endif
|
||||
#elif defined(FEATURE_T6)
|
||||
{TS_2D, "2D" },
|
||||
{TS_FUNCTION, "function" },
|
||||
{TS_COLOR_MAP, "colorMap" },
|
||||
{TS_UNUSED_1, "unused1" },
|
||||
{TS_UNUSED_2, "unused2" },
|
||||
{TS_NORMAL_MAP, "normalMap" },
|
||||
{TS_UNUSED_3, "unused3" },
|
||||
{TS_UNUSED_4, "unused4" },
|
||||
{TS_SPECULAR_MAP, "specularMap" },
|
||||
{TS_UNUSED_5, "unused5" },
|
||||
{TS_OCCLUSION_MAP, "occlusionMap"},
|
||||
{TS_UNUSED_6, "unused6" },
|
||||
{TS_COLOR0_MAP, "color0Map" },
|
||||
{TS_COLOR1_MAP, "color1Map" },
|
||||
{TS_COLOR2_MAP, "color2Map" },
|
||||
{TS_COLOR3_MAP, "color3Map" },
|
||||
{TS_COLOR4_MAP, "color4Map" },
|
||||
{TS_COLOR5_MAP, "color5Map" },
|
||||
{TS_COLOR6_MAP, "color6Map" },
|
||||
{TS_COLOR7_MAP, "color7Map" },
|
||||
{TS_COLOR8_MAP, "color8Map" },
|
||||
{TS_COLOR9_MAP, "color9Map" },
|
||||
{TS_COLOR10_MAP, "color10Map" },
|
||||
{TS_COLOR11_MAP, "color11Map" },
|
||||
{TS_COLOR12_MAP, "color12Map" },
|
||||
{TS_COLOR13_MAP, "color13Map" },
|
||||
{TS_COLOR14_MAP, "color14Map" },
|
||||
{TS_COLOR15_MAP, "color15Map" },
|
||||
{TS_THROW_MAP, "throwMap" },
|
||||
{TS_OCCLUSION_MAP, "occlusionMap" },
|
||||
{TS_UNUSED_6, "unused6" },
|
||||
{TS_COLOR0_MAP, "color0Map" },
|
||||
{TS_COLOR1_MAP, "color1Map" },
|
||||
{TS_COLOR2_MAP, "color2Map" },
|
||||
{TS_COLOR3_MAP, "color3Map" },
|
||||
{TS_COLOR4_MAP, "color4Map" },
|
||||
{TS_COLOR5_MAP, "color5Map" },
|
||||
{TS_COLOR6_MAP, "color6Map" },
|
||||
{TS_COLOR7_MAP, "color7Map" },
|
||||
{TS_COLOR8_MAP, "color8Map" },
|
||||
{TS_COLOR9_MAP, "color9Map" },
|
||||
{TS_COLOR10_MAP, "color10Map" },
|
||||
{TS_COLOR11_MAP, "color11Map" },
|
||||
{TS_COLOR12_MAP, "color12Map" },
|
||||
{TS_COLOR13_MAP, "color13Map" },
|
||||
{TS_COLOR14_MAP, "color14Map" },
|
||||
{TS_COLOR15_MAP, "color15Map" },
|
||||
{TS_THROW_MAP, "throwMap" },
|
||||
#endif
|
||||
});
|
||||
|
||||
@ -437,26 +434,25 @@ namespace GAME
|
||||
);
|
||||
|
||||
NLOHMANN_JSON_SERIALIZE_ENUM(MaterialGameFlags, {
|
||||
#if defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
{MTL_GAMEFLAG_1, "1" },
|
||||
{MTL_GAMEFLAG_2, "2" },
|
||||
{MTL_GAMEFLAG_4, "4" },
|
||||
{MTL_GAMEFLAG_8, "8" },
|
||||
{MTL_GAMEFLAG_10, "10" },
|
||||
{MTL_GAMEFLAG_20, "20" },
|
||||
{MTL_GAMEFLAG_40, "40" },
|
||||
{MTL_GAMEFLAG_80, "80" },
|
||||
#elif defined(FEATURE_T6)
|
||||
{MTL_GAMEFLAG_1, "1" },
|
||||
{MTL_GAMEFLAG_2, "2" },
|
||||
#ifdef FEATURE_T6
|
||||
{MTL_GAMEFLAG_NO_MARKS, "NO_MARKS" },
|
||||
{MTL_GAMEFLAG_NO_MARKS, "4" },
|
||||
#else
|
||||
{MTL_GAMEFLAG_4, "4" },
|
||||
#endif
|
||||
{MTL_GAMEFLAG_8, "8" },
|
||||
{MTL_GAMEFLAG_10, "10" },
|
||||
{MTL_GAMEFLAG_20, "20" },
|
||||
#if defined(FEATURE_IW3) || defined(FEATURE_T6)
|
||||
{MTL_GAMEFLAG_CASTS_SHADOW, "CASTS_SHADOW"},
|
||||
{MTL_GAMEFLAG_CASTS_SHADOW, "40" },
|
||||
#else
|
||||
{MTL_GAMEFLAG_40, "40" },
|
||||
#endif
|
||||
{MTL_GAMEFLAG_80, "80" },
|
||||
#ifdef FEATURE_T6
|
||||
{MTL_GAMEFLAG_100, "100" },
|
||||
{MTL_GAMEFLAG_200, "200" },
|
||||
{MTL_GAMEFLAG_400, "400" },
|
||||
@ -466,7 +462,11 @@ namespace GAME
|
||||
});
|
||||
|
||||
NLOHMANN_JSON_SERIALIZE_ENUM(GfxCameraRegionType, {
|
||||
#if defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
#if defined(FEATURE_IW3)
|
||||
{CAMERA_REGION_LIT, "lit" },
|
||||
{CAMERA_REGION_DECAL, "decal" },
|
||||
{CAMERA_REGION_EMISSIVE, "emissive" },
|
||||
#elif defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
{CAMERA_REGION_LIT_OPAQUE, "litOpaque" },
|
||||
{CAMERA_REGION_LIT_TRANS, "litTrans" },
|
||||
{CAMERA_REGION_EMISSIVE, "emissive" },
|
||||
@ -474,7 +474,6 @@ namespace GAME
|
||||
#ifdef FEATURE_IW5
|
||||
{CAMERA_REGION_LIGHT_MAP_OPAQUE, "lightMapOpaque"},
|
||||
#endif
|
||||
{CAMERA_REGION_NONE, "none" },
|
||||
#elif defined(FEATURE_T6)
|
||||
{CAMERA_REGION_LIT_OPAQUE, "litOpaque" },
|
||||
{CAMERA_REGION_LIT_TRANS, "litTrans" },
|
||||
@ -486,8 +485,8 @@ namespace GAME
|
||||
{CAMERA_REGION_DEPTH_HACK, "depthHack" },
|
||||
{CAMERA_REGION_UNUSED, "unused" },
|
||||
{CAMERA_REGION_SONAR, "sonar" },
|
||||
{CAMERA_REGION_NONE, "none" },
|
||||
#endif
|
||||
{CAMERA_REGION_NONE, "none" },
|
||||
});
|
||||
|
||||
class JsonMaterial
|
||||
|
||||
54
src/ObjLoading/Game/IW3/Material/LoaderMaterialIW3.cpp
Normal file
54
src/ObjLoading/Game/IW3/Material/LoaderMaterialIW3.cpp
Normal file
@ -0,0 +1,54 @@
|
||||
#include "LoaderMaterialIW3.h"
|
||||
|
||||
#include "Game/IW3/IW3.h"
|
||||
#include "Game/IW3/Material/JsonMaterialLoaderIW3.h"
|
||||
#include "Material/MaterialCommon.h"
|
||||
|
||||
#include <format>
|
||||
#include <iostream>
|
||||
|
||||
using namespace IW3;
|
||||
|
||||
namespace
|
||||
{
|
||||
class MaterialLoader final : public AssetCreator<AssetMaterial>
|
||||
{
|
||||
public:
|
||||
MaterialLoader(MemoryManager& memory, ISearchPath& searchPath)
|
||||
: m_memory(memory),
|
||||
m_search_path(searchPath)
|
||||
{
|
||||
}
|
||||
|
||||
AssetCreationResult CreateAsset(const std::string& assetName, AssetCreationContext& context) override
|
||||
{
|
||||
const auto file = m_search_path.Open(material::GetFileNameForAssetName(assetName));
|
||||
if (!file.IsOpen())
|
||||
return AssetCreationResult::NoAction();
|
||||
|
||||
auto* material = m_memory.Alloc<Material>();
|
||||
material->info.name = m_memory.Dup(assetName.c_str());
|
||||
|
||||
AssetRegistration<AssetMaterial> registration(assetName, material);
|
||||
if (!LoadMaterialAsJson(*file.m_stream, *material, m_memory, context, registration))
|
||||
{
|
||||
std::cerr << std::format("Failed to load material \"{}\"\n", assetName);
|
||||
return AssetCreationResult::Failure();
|
||||
}
|
||||
|
||||
return AssetCreationResult::Success(context.AddAsset(std::move(registration)));
|
||||
}
|
||||
|
||||
private:
|
||||
MemoryManager& m_memory;
|
||||
ISearchPath& m_search_path;
|
||||
};
|
||||
} // namespace
|
||||
|
||||
namespace IW3
|
||||
{
|
||||
std::unique_ptr<AssetCreator<AssetMaterial>> CreateMaterialLoader(MemoryManager& memory, ISearchPath& searchPath)
|
||||
{
|
||||
return std::make_unique<MaterialLoader>(memory, searchPath);
|
||||
}
|
||||
} // namespace IW3
|
||||
12
src/ObjLoading/Game/IW3/Material/LoaderMaterialIW3.h
Normal file
12
src/ObjLoading/Game/IW3/Material/LoaderMaterialIW3.h
Normal file
@ -0,0 +1,12 @@
|
||||
#pragma once
|
||||
|
||||
#include "Asset/IAssetCreator.h"
|
||||
#include "Game/IW3/IW3.h"
|
||||
#include "Gdt/IGdtQueryable.h"
|
||||
#include "SearchPath/ISearchPath.h"
|
||||
#include "Utils/MemoryManager.h"
|
||||
|
||||
namespace IW3
|
||||
{
|
||||
std::unique_ptr<AssetCreator<AssetMaterial>> CreateMaterialLoader(MemoryManager& memory, ISearchPath& searchPath);
|
||||
} // namespace IW3
|
||||
@ -5,6 +5,7 @@
|
||||
#include "Game/IW3/IW3.h"
|
||||
#include "Image/AssetLoaderImageIW3.h"
|
||||
#include "Localize/AssetLoaderLocalizeIW3.h"
|
||||
#include "Material/LoaderMaterialIW3.h"
|
||||
#include "ObjLoading.h"
|
||||
#include "RawFile/AssetLoaderRawFileIW3.h"
|
||||
#include "StringTable/AssetLoaderStringTableIW3.h"
|
||||
@ -90,7 +91,7 @@ namespace
|
||||
// collection.AddAssetCreator(std::make_unique<AssetLoaderPhysPreset>(memory));
|
||||
// collection.AddAssetCreator(std::make_unique<AssetLoaderXAnim>(memory));
|
||||
// collection.AddAssetCreator(std::make_unique<AssetLoaderXModel>(memory));
|
||||
// collection.AddAssetCreator(std::make_unique<AssetLoaderMaterial>(memory));
|
||||
collection.AddAssetCreator(CreateMaterialLoader(memory, searchPath));
|
||||
// collection.AddAssetCreator(std::make_unique<AssetLoaderTechniqueSet>(memory));
|
||||
collection.AddAssetCreator(CreateImageLoader(memory, searchPath));
|
||||
// collection.AddAssetCreator(std::make_unique<AssetLoaderSound>(memory));
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
#options GAME (IW4, IW5, T6)
|
||||
#options GAME (IW3, IW4, IW5, T6)
|
||||
|
||||
#filename "Game/" + GAME + "/Material/JsonMaterialLoader" + GAME + ".cpp"
|
||||
|
||||
#if GAME == "IW4"
|
||||
#if GAME == "IW3"
|
||||
#define FEATURE_IW3
|
||||
#define HAS_WATER
|
||||
#define GAME_LOWER "iw3"
|
||||
#elif GAME == "IW4"
|
||||
#define FEATURE_IW4
|
||||
#define HAS_WATER
|
||||
#define GAME_LOWER "iw4"
|
||||
@ -94,7 +98,7 @@ namespace
|
||||
std::cerr << std::format("Cannot load material \"{}\": {}\n", material.info.name, message);
|
||||
}
|
||||
|
||||
#if defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
#if defined(FEATURE_IW3) || defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
static bool CreateGameFlagsFromJson(const JsonMaterial& jMaterial, unsigned char& gameFlags)
|
||||
#elif defined(FEATURE_T6)
|
||||
static bool CreateGameFlagsFromJson(const JsonMaterial& jMaterial, unsigned& gameFlags)
|
||||
@ -304,7 +308,7 @@ namespace
|
||||
structured.alphaTestDisabled = 0;
|
||||
structured.alphaTest = GFXS_ALPHA_TEST_GT_0;
|
||||
}
|
||||
#if defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
#if defined(FEATURE_IW3) || defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
else if (jStateBitsTableEntry.alphaTest == JsonAlphaTest::LT128)
|
||||
{
|
||||
structured.alphaTestDisabled = 0;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#options GAME (IW4, IW5, T6)
|
||||
#options GAME (IW3, IW4, IW5, T6)
|
||||
|
||||
#filename "Game/" + GAME + "/Material/JsonMaterialLoader" + GAME + ".h"
|
||||
|
||||
|
||||
@ -1,467 +0,0 @@
|
||||
#include "AssetDumperMaterial.h"
|
||||
|
||||
#include "Game/IW3/MaterialConstantsIW3.h"
|
||||
#include "Game/IW3/TechsetConstantsIW3.h"
|
||||
|
||||
#include <iomanip>
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <sstream>
|
||||
|
||||
// #define FLAGS_DEBUG 1
|
||||
|
||||
using namespace IW3;
|
||||
using json = nlohmann::json;
|
||||
|
||||
namespace IW3
|
||||
{
|
||||
const char* AssetName(const char* name)
|
||||
{
|
||||
if (name && name[0] == ',')
|
||||
return &name[1];
|
||||
return name;
|
||||
}
|
||||
|
||||
template<size_t S> json ArrayEntry(const char* (&a)[S], const size_t index)
|
||||
{
|
||||
assert(index < S);
|
||||
if (index < S)
|
||||
return a[index];
|
||||
|
||||
return json{};
|
||||
}
|
||||
|
||||
json BuildComplexTableJson(const complex_s* complexTable, const size_t count)
|
||||
{
|
||||
auto jArray = json::array();
|
||||
|
||||
if (complexTable)
|
||||
{
|
||||
for (auto index = 0u; index < count; index++)
|
||||
{
|
||||
const auto& entry = complexTable[index];
|
||||
jArray.emplace_back(json{
|
||||
{"real", entry.real},
|
||||
{"imag", entry.imag},
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return jArray;
|
||||
}
|
||||
|
||||
json BuildWaterJson(water_t* water)
|
||||
{
|
||||
if (!water)
|
||||
return json{};
|
||||
|
||||
return json{
|
||||
{"floatTime", water->writable.floatTime},
|
||||
{"H0", BuildComplexTableJson(water->H0, water->M * water->N)},
|
||||
{"wTerm", water->wTerm ? json{std::vector(water->wTerm, water->wTerm + (water->M * water->N))} : json::array()},
|
||||
{"M", water->M},
|
||||
{"N", water->N},
|
||||
{"Lx", water->Lx},
|
||||
{"Lz", water->Lz},
|
||||
{"windvel", water->windvel},
|
||||
{"winddir", std::vector(std::begin(water->winddir), std::end(water->winddir))},
|
||||
{"amplitude", water->amplitude},
|
||||
{"codeConstant", std::vector(std::begin(water->codeConstant), std::end(water->codeConstant))},
|
||||
{"image", water->image && water->image->name ? AssetName(water->image->name) : nullptr},
|
||||
};
|
||||
}
|
||||
|
||||
json BuildSamplerStateJson(unsigned char samplerState)
|
||||
{
|
||||
static const char* samplerFilterNames[]{
|
||||
"none",
|
||||
"nearest",
|
||||
"linear",
|
||||
"aniso2x",
|
||||
"aniso4x",
|
||||
};
|
||||
static const char* samplerMipmapNames[]{
|
||||
"disabled",
|
||||
"nearest",
|
||||
"linear",
|
||||
};
|
||||
|
||||
return json{
|
||||
{"filter", ArrayEntry(samplerFilterNames, (samplerState & SAMPLER_FILTER_MASK) >> SAMPLER_FILTER_SHIFT)},
|
||||
{"mipmap", ArrayEntry(samplerMipmapNames, (samplerState & SAMPLER_MIPMAP_MASK) >> SAMPLER_MIPMAP_SHIFT)},
|
||||
{"clampU", (samplerState & SAMPLER_CLAMP_U) ? true : false},
|
||||
{"clampV", (samplerState & SAMPLER_CLAMP_V) ? true : false},
|
||||
{"clampW", (samplerState & SAMPLER_CLAMP_W) ? true : false},
|
||||
};
|
||||
}
|
||||
|
||||
json BuildTextureTableJson(const MaterialTextureDef* textureTable, const size_t count)
|
||||
{
|
||||
static const char* semanticNames[]{
|
||||
"2d",
|
||||
"function",
|
||||
"colorMap",
|
||||
"unused1",
|
||||
"unused2",
|
||||
"normalMap",
|
||||
"unused3",
|
||||
"unused4",
|
||||
"specularMap",
|
||||
"unused5",
|
||||
"unused6",
|
||||
"waterMap",
|
||||
};
|
||||
|
||||
auto jArray = json::array();
|
||||
|
||||
if (textureTable)
|
||||
{
|
||||
for (auto index = 0u; index < count; index++)
|
||||
{
|
||||
const auto& entry = textureTable[index];
|
||||
|
||||
json jEntry = {
|
||||
{"samplerState", BuildSamplerStateJson(entry.samplerState)},
|
||||
{"semantic", ArrayEntry(semanticNames, entry.semantic)},
|
||||
};
|
||||
|
||||
const auto knownMaterialSourceName = knownMaterialSourceNames.find(entry.nameHash);
|
||||
if (knownMaterialSourceName != knownMaterialSourceNames.end())
|
||||
{
|
||||
jEntry["name"] = knownMaterialSourceName->second;
|
||||
}
|
||||
else
|
||||
{
|
||||
jEntry.merge_patch({
|
||||
{"nameHash", entry.nameHash },
|
||||
{"nameStart", entry.nameStart},
|
||||
{"nameEnd", entry.nameEnd },
|
||||
});
|
||||
}
|
||||
|
||||
if (entry.semantic == TS_WATER_MAP)
|
||||
{
|
||||
jEntry["water"] = BuildWaterJson(entry.u.water);
|
||||
}
|
||||
else
|
||||
{
|
||||
jEntry["image"] = entry.u.image && entry.u.image->name ? AssetName(entry.u.image->name) : nullptr;
|
||||
}
|
||||
|
||||
jArray.emplace_back(std::move(jEntry));
|
||||
}
|
||||
}
|
||||
|
||||
return jArray;
|
||||
}
|
||||
|
||||
json BuildConstantTableJson(const MaterialConstantDef* constantTable, const size_t count)
|
||||
{
|
||||
auto jArray = json::array();
|
||||
|
||||
if (constantTable)
|
||||
{
|
||||
for (auto index = 0u; index < count; index++)
|
||||
{
|
||||
const auto& entry = constantTable[index];
|
||||
json jEntry = {
|
||||
{"literal", std::vector(std::begin(entry.literal), std::end(entry.literal))},
|
||||
};
|
||||
|
||||
const auto nameLen = strnlen(entry.name, std::extent_v<decltype(MaterialConstantDef::name)>);
|
||||
if (nameLen == std::extent_v<decltype(MaterialConstantDef::name)>)
|
||||
{
|
||||
std::string fullLengthName(entry.name, std::extent_v<decltype(MaterialConstantDef::name)>);
|
||||
const auto fullLengthHash = Common::R_HashString(fullLengthName.c_str(), 0);
|
||||
|
||||
if (fullLengthHash == entry.nameHash)
|
||||
{
|
||||
jEntry["name"] = fullLengthName;
|
||||
}
|
||||
else
|
||||
{
|
||||
const auto knownMaterialSourceName = knownMaterialSourceNames.find(entry.nameHash);
|
||||
if (knownMaterialSourceName != knownMaterialSourceNames.end())
|
||||
{
|
||||
jEntry["name"] = knownMaterialSourceName->second;
|
||||
}
|
||||
else
|
||||
{
|
||||
jEntry.merge_patch({
|
||||
{"nameHash", entry.nameHash},
|
||||
{"namePart", fullLengthName},
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
jEntry["name"] = std::string(entry.name, nameLen);
|
||||
}
|
||||
|
||||
jArray.emplace_back(std::move(jEntry));
|
||||
}
|
||||
}
|
||||
|
||||
return jArray;
|
||||
}
|
||||
|
||||
json BuildStateBitsTableJson(const GfxStateBits* stateBitsTable, const size_t count)
|
||||
{
|
||||
static const char* blendNames[]{
|
||||
"disabled",
|
||||
"zero",
|
||||
"one",
|
||||
"srcColor",
|
||||
"invSrcColor",
|
||||
"srcAlpha",
|
||||
"invSrcAlpha",
|
||||
"destAlpha",
|
||||
"invDestAlpha",
|
||||
"destColor",
|
||||
"invDestColor",
|
||||
};
|
||||
static const char* blendOpNames[]{
|
||||
"disabled",
|
||||
"add",
|
||||
"subtract",
|
||||
"revSubtract",
|
||||
"min",
|
||||
"max",
|
||||
};
|
||||
static const char* depthTestNames[]{
|
||||
"always",
|
||||
"less",
|
||||
"equal",
|
||||
"lessEqual",
|
||||
};
|
||||
static const char* polygonOffsetNames[]{
|
||||
"0",
|
||||
"1",
|
||||
"2",
|
||||
"shadowMap",
|
||||
};
|
||||
static const char* stencilOpNames[]{
|
||||
"keep",
|
||||
"zero",
|
||||
"replace",
|
||||
"incrSat",
|
||||
"decrSat",
|
||||
"invert",
|
||||
"incr",
|
||||
"decr",
|
||||
};
|
||||
|
||||
auto jArray = json::array();
|
||||
|
||||
if (stateBitsTable)
|
||||
{
|
||||
for (auto index = 0u; index < count; index++)
|
||||
{
|
||||
const auto& entry = stateBitsTable[index];
|
||||
|
||||
const auto srcBlendRgb = (entry.loadBits[0] & GFXS0_SRCBLEND_RGB_MASK) >> GFXS0_SRCBLEND_RGB_SHIFT;
|
||||
const auto dstBlendRgb = (entry.loadBits[0] & GFXS0_DSTBLEND_RGB_MASK) >> GFXS0_DSTBLEND_RGB_SHIFT;
|
||||
const auto blendOpRgb = (entry.loadBits[0] & GFXS0_BLENDOP_RGB_MASK) >> GFXS0_BLENDOP_RGB_SHIFT;
|
||||
const auto srcBlendAlpha = (entry.loadBits[0] & GFXS0_SRCBLEND_ALPHA_MASK) >> GFXS0_SRCBLEND_ALPHA_SHIFT;
|
||||
const auto dstBlendAlpha = (entry.loadBits[0] & GFXS0_DSTBLEND_ALPHA_MASK) >> GFXS0_DSTBLEND_ALPHA_SHIFT;
|
||||
const auto blendOpAlpha = (entry.loadBits[0] & GFXS0_BLENDOP_ALPHA_MASK) >> GFXS0_BLENDOP_ALPHA_SHIFT;
|
||||
const auto depthTest = (entry.loadBits[1] & GFXS1_DEPTHTEST_MASK) >> GFXS1_DEPTHTEST_SHIFT;
|
||||
const auto polygonOffset = (entry.loadBits[1] & GFXS1_POLYGON_OFFSET_MASK) >> GFXS1_POLYGON_OFFSET_SHIFT;
|
||||
|
||||
const auto* alphaTest = "disable";
|
||||
if (entry.loadBits[0] & GFXS0_ATEST_GT_0)
|
||||
alphaTest = "gt0";
|
||||
else if (entry.loadBits[0] & GFXS0_ATEST_LT_128)
|
||||
alphaTest = "lt128";
|
||||
else if (entry.loadBits[0] & GFXS0_ATEST_GE_128)
|
||||
alphaTest = "ge128";
|
||||
else
|
||||
assert(entry.loadBits[0] & GFXS0_ATEST_DISABLE);
|
||||
|
||||
const auto* cullFace = "none";
|
||||
if ((entry.loadBits[0] & GFXS0_CULL_MASK) == GFXS0_CULL_BACK)
|
||||
cullFace = "back";
|
||||
else if ((entry.loadBits[0] & GFXS0_CULL_MASK) == GFXS0_CULL_FRONT)
|
||||
cullFace = "front";
|
||||
else
|
||||
assert((entry.loadBits[0] & GFXS0_CULL_MASK) == GFXS0_CULL_NONE);
|
||||
|
||||
jArray.emplace_back(json{
|
||||
{"srcBlendRgb", ArrayEntry(blendNames, srcBlendRgb)},
|
||||
{"dstBlendRgb", ArrayEntry(blendNames, dstBlendRgb)},
|
||||
{"blendOpRgb", ArrayEntry(blendOpNames, blendOpRgb)},
|
||||
{"alphaTest", alphaTest},
|
||||
{"cullFace", cullFace},
|
||||
{"srcBlendAlpha", ArrayEntry(blendNames, srcBlendAlpha)},
|
||||
{"dstBlendAlpha", ArrayEntry(blendNames, dstBlendAlpha)},
|
||||
{"blendOpAlpha", ArrayEntry(blendOpNames, blendOpAlpha)},
|
||||
{"colorWriteRgb", (entry.loadBits[0] & GFXS0_COLORWRITE_RGB) ? true : false},
|
||||
{"colorWriteAlpha", (entry.loadBits[0] & GFXS0_COLORWRITE_ALPHA) ? true : false},
|
||||
{"polymodeLine", (entry.loadBits[0] & GFXS0_POLYMODE_LINE) ? true : false},
|
||||
|
||||
{"depthWrite", (entry.loadBits[1] & GFXS1_DEPTHWRITE) ? true : false},
|
||||
{"depthTest", (entry.loadBits[1] & GFXS1_DEPTHTEST_DISABLE) ? json("disable") : ArrayEntry(depthTestNames, depthTest)},
|
||||
{"polygonOffset", ArrayEntry(polygonOffsetNames, polygonOffset)},
|
||||
{"stencilFrontEnabled", (entry.loadBits[1] & GFXS1_STENCIL_FRONT_ENABLE) ? true : false},
|
||||
{"stencilBackEnabled", (entry.loadBits[1] & GFXS1_STENCIL_BACK_ENABLE) ? true : false},
|
||||
{"stencilFrontPass", ArrayEntry(stencilOpNames, (entry.loadBits[1] >> GFXS1_STENCIL_FRONT_PASS_SHIFT) & GFXS_STENCILOP_MASK)},
|
||||
{"stencilFrontFail", ArrayEntry(stencilOpNames, (entry.loadBits[1] >> GFXS1_STENCIL_FRONT_FAIL_SHIFT) & GFXS_STENCILOP_MASK)},
|
||||
{"stencilFrontZFail", ArrayEntry(stencilOpNames, (entry.loadBits[1] >> GFXS1_STENCIL_FRONT_ZFAIL_SHIFT) & GFXS_STENCILOP_MASK)},
|
||||
{"stencilFrontFunc", ArrayEntry(stencilOpNames, (entry.loadBits[1] >> GFXS1_STENCIL_FRONT_FUNC_SHIFT) & GFXS_STENCILOP_MASK)},
|
||||
{"stencilBackPass", ArrayEntry(stencilOpNames, (entry.loadBits[1] >> GFXS1_STENCIL_BACK_PASS_SHIFT) & GFXS_STENCILOP_MASK)},
|
||||
{"stencilBackFail", ArrayEntry(stencilOpNames, (entry.loadBits[1] >> GFXS1_STENCIL_BACK_FAIL_SHIFT) & GFXS_STENCILOP_MASK)},
|
||||
{"stencilBackZFail", ArrayEntry(stencilOpNames, (entry.loadBits[1] >> GFXS1_STENCIL_BACK_ZFAIL_SHIFT) & GFXS_STENCILOP_MASK)},
|
||||
{"stencilBackFunc", ArrayEntry(stencilOpNames, (entry.loadBits[1] >> GFXS1_STENCIL_BACK_FUNC_SHIFT) & GFXS_STENCILOP_MASK)},
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return jArray;
|
||||
}
|
||||
|
||||
json BuildSurfaceTypeBitsJson(const unsigned surfaceTypeBits)
|
||||
{
|
||||
if (!surfaceTypeBits)
|
||||
return json(surfaceTypeNames[SURF_TYPE_DEFAULT]);
|
||||
|
||||
static constexpr auto NON_SURFACE_TYPE_BITS =
|
||||
~(std::numeric_limits<unsigned>::max() >> ((sizeof(unsigned) * 8) - (static_cast<unsigned>(SURF_TYPE_NUM) - 1)));
|
||||
assert((surfaceTypeBits & NON_SURFACE_TYPE_BITS) == 0);
|
||||
|
||||
std::ostringstream ss;
|
||||
auto firstSurfaceType = true;
|
||||
for (auto surfaceTypeIndex = static_cast<unsigned>(SURF_TYPE_BARK); surfaceTypeIndex < SURF_TYPE_NUM; surfaceTypeIndex++)
|
||||
{
|
||||
if ((surfaceTypeBits & (1 << (surfaceTypeIndex - 1))) == 0)
|
||||
continue;
|
||||
|
||||
if (firstSurfaceType)
|
||||
firstSurfaceType = false;
|
||||
else
|
||||
ss << ",";
|
||||
ss << surfaceTypeNames[surfaceTypeIndex];
|
||||
}
|
||||
|
||||
if (firstSurfaceType)
|
||||
return json(surfaceTypeNames[SURF_TYPE_DEFAULT]);
|
||||
|
||||
return json(ss.str());
|
||||
}
|
||||
|
||||
json BuildCharFlagsJson(const std::string& prefix, const unsigned char gameFlags)
|
||||
{
|
||||
std::vector<std::string> values;
|
||||
|
||||
for (auto i = 0u; i < (sizeof(gameFlags) * 8u); i++)
|
||||
{
|
||||
if (gameFlags & (1 << i))
|
||||
{
|
||||
std::ostringstream ss;
|
||||
ss << prefix << " 0x" << std::hex << (1 << i);
|
||||
values.emplace_back(ss.str());
|
||||
}
|
||||
}
|
||||
|
||||
return json(values);
|
||||
}
|
||||
} // namespace IW3
|
||||
|
||||
bool AssetDumperMaterial::ShouldDump(XAssetInfo<Material>* asset)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void AssetDumperMaterial::DumpAsset(AssetDumpingContext& context, XAssetInfo<Material>* asset)
|
||||
{
|
||||
auto* material = asset->Asset();
|
||||
|
||||
std::ostringstream ss;
|
||||
ss << "materials/" << asset->m_name << ".json";
|
||||
const auto assetFile = context.OpenAssetFile(ss.str());
|
||||
|
||||
if (!assetFile)
|
||||
return;
|
||||
|
||||
auto& stream = *assetFile;
|
||||
|
||||
static const char* cameraRegionNames[]{"lit", "decal", "emissive", "none"};
|
||||
static std::unordered_map<size_t, std::string> sortKeyNames{
|
||||
{0, "distortion" },
|
||||
{1, "opaque water" },
|
||||
{2, "boat hull" },
|
||||
{3, "opaque ambient" },
|
||||
{4, "opaque" },
|
||||
{5, "sky" },
|
||||
{6, "skybox - sun / moon" },
|
||||
{7, "skybox - clouds" },
|
||||
{8, "skybox - horizon" },
|
||||
{9, "decal - bottom 1" },
|
||||
{10, "decal - bottom 2" },
|
||||
{11, "decal - bottom 3" },
|
||||
{12, "decal - static decal" },
|
||||
{13, "decal - middle 1" },
|
||||
{14, "decal - middle 2" },
|
||||
{15, "decal - middle 3" },
|
||||
{24, "decal - weapon impact" },
|
||||
{29, "decal - top 1" },
|
||||
{30, "decal - top 2" },
|
||||
{31, "decal - top 3" },
|
||||
{32, "multiplicative" },
|
||||
{33, "banner / curtain" },
|
||||
{34, "hair" },
|
||||
{35, "underwater" },
|
||||
{36, "transparent water" },
|
||||
{37, "corona" },
|
||||
{38, "window inside" },
|
||||
{39, "window outside" },
|
||||
{40, "before effects - bottom"},
|
||||
{41, "before effects - middle"},
|
||||
{42, "before effects - top" },
|
||||
{43, "blend / additive" },
|
||||
{48, "effect - auto sort" },
|
||||
{56, "after effects - bottom" },
|
||||
{57, "after effects - middle" },
|
||||
{58, "after effects - top" },
|
||||
{59, "viewmodel effect" },
|
||||
};
|
||||
|
||||
const auto foundSortKeyName = sortKeyNames.find(material->info.sortKey);
|
||||
assert(foundSortKeyName != sortKeyNames.end());
|
||||
|
||||
const json j = {
|
||||
{"info",
|
||||
{
|
||||
#if defined(FLAGS_DEBUG) && FLAGS_DEBUG == 1
|
||||
{"gameFlags", BuildCharFlagsJson("gameFlag", material->info.gameFlags)}, // TODO: Find out what gameflags mean
|
||||
#else
|
||||
{"gameFlags", material->info.gameFlags}, // TODO: Find out what gameflags mean
|
||||
#endif
|
||||
{"sortKey", foundSortKeyName != sortKeyNames.end() ? foundSortKeyName->second : std::to_string(material->info.sortKey)},
|
||||
{"textureAtlasRowCount", material->info.textureAtlasRowCount},
|
||||
{"textureAtlasColumnCount", material->info.textureAtlasColumnCount},
|
||||
{"drawSurf",
|
||||
{{"objectId", static_cast<unsigned>(material->info.drawSurf.fields.objectId)},
|
||||
{"reflectionProbeIndex", static_cast<unsigned>(material->info.drawSurf.fields.reflectionProbeIndex)},
|
||||
{"customIndex", static_cast<unsigned>(material->info.drawSurf.fields.customIndex)},
|
||||
{"materialSortedIndex", static_cast<unsigned>(material->info.drawSurf.fields.materialSortedIndex)},
|
||||
{"prepass", static_cast<unsigned>(material->info.drawSurf.fields.prepass)},
|
||||
{"useHeroLighting", static_cast<unsigned>(material->info.drawSurf.fields.primaryLightIndex)},
|
||||
{"surfType", static_cast<unsigned>(material->info.drawSurf.fields.surfType)},
|
||||
{"primarySortKey", static_cast<unsigned>(material->info.drawSurf.fields.primarySortKey)}}},
|
||||
{"surfaceTypeBits", BuildSurfaceTypeBitsJson(material->info.surfaceTypeBits)},
|
||||
{"hashIndex", material->info.hashIndex}}},
|
||||
{"stateBitsEntry", std::vector(std::begin(material->stateBitsEntry), std::end(material->stateBitsEntry))},
|
||||
#if defined(FLAGS_DEBUG) && FLAGS_DEBUG == 1
|
||||
{"stateFlags", BuildCharFlagsJson("stateFlag", material->stateFlags)},
|
||||
#else
|
||||
{"stateFlags", material->stateFlags},
|
||||
#endif
|
||||
{"cameraRegion", ArrayEntry(cameraRegionNames, material->cameraRegion)},
|
||||
{"techniqueSet", material->techniqueSet && material->techniqueSet->name ? AssetName(material->techniqueSet->name) : nullptr},
|
||||
{"textureTable", BuildTextureTableJson(material->textureTable, material->textureCount)},
|
||||
{"constantTable", BuildConstantTableJson(material->constantTable, material->constantCount)},
|
||||
{"stateBitsTable", BuildStateBitsTableJson(material->stateBitsTable, material->stateBitsCount)},
|
||||
};
|
||||
|
||||
stream << std::setw(4) << j;
|
||||
}
|
||||
30
src/ObjWriting/Game/IW3/Material/DumperMaterialIW3.cpp
Normal file
30
src/ObjWriting/Game/IW3/Material/DumperMaterialIW3.cpp
Normal file
@ -0,0 +1,30 @@
|
||||
#include "DumperMaterialIW3.h"
|
||||
|
||||
#include "Game/IW3/Material/JsonMaterialWriterIW3.h"
|
||||
#include "Game/IW3/Material/MaterialConstantZoneStateIW3.h"
|
||||
#include "Material/MaterialCommon.h"
|
||||
|
||||
using namespace IW3;
|
||||
|
||||
void AssetDumperMaterial::DumpPool(AssetDumpingContext& context, AssetPool<Material>* pool)
|
||||
{
|
||||
auto* materialConstantState = context.GetZoneAssetDumperState<MaterialConstantZoneState>();
|
||||
materialConstantState->ExtractNamesFromZone();
|
||||
|
||||
AbstractAssetDumper::DumpPool(context, pool);
|
||||
}
|
||||
|
||||
bool AssetDumperMaterial::ShouldDump(XAssetInfo<Material>* asset)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void AssetDumperMaterial::DumpAsset(AssetDumpingContext& context, XAssetInfo<Material>* asset)
|
||||
{
|
||||
const auto assetFile = context.OpenAssetFile(material::GetFileNameForAssetName(asset->m_name));
|
||||
|
||||
if (!assetFile)
|
||||
return;
|
||||
|
||||
DumpMaterialAsJson(*assetFile, *asset->Asset(), context);
|
||||
}
|
||||
@ -7,6 +7,9 @@ namespace IW3
|
||||
{
|
||||
class AssetDumperMaterial final : public AbstractAssetDumper<Material>
|
||||
{
|
||||
public:
|
||||
void DumpPool(AssetDumpingContext& context, AssetPool<Material>* pool) override;
|
||||
|
||||
protected:
|
||||
bool ShouldDump(XAssetInfo<Material>* asset) override;
|
||||
void DumpAsset(AssetDumpingContext& context, XAssetInfo<Material>* asset) override;
|
||||
@ -0,0 +1,250 @@
|
||||
#include "MaterialConstantZoneStateIW3.h"
|
||||
|
||||
#include "Game/IW3/CommonIW3.h"
|
||||
#include "Game/IW3/GameAssetPoolIW3.h"
|
||||
#include "Game/IW3/GameIW3.h"
|
||||
#include "ObjWriting.h"
|
||||
|
||||
namespace IW3
|
||||
{
|
||||
const char* KNOWN_CONSTANT_NAMES[]{
|
||||
"worldViewProjectionMatrix",
|
||||
"worldViewMatrix2",
|
||||
"worldViewMatrix1",
|
||||
"worldViewMatrix",
|
||||
"worldOutdoorLookupMatrix",
|
||||
"worldMatrix",
|
||||
"waterColor",
|
||||
"viewportDimensions",
|
||||
"viewProjectionMatrix",
|
||||
"uvScale",
|
||||
"uvAnimParms",
|
||||
"thermalColorOffset",
|
||||
"sunShadowmapPixelAdjust",
|
||||
"ssaoParms",
|
||||
"spotShadowmapPixelAdjust",
|
||||
"shadowmapSwitchPartition",
|
||||
"shadowmapScale",
|
||||
"shadowmapPolygonOffset",
|
||||
"shadowLookupMatrix",
|
||||
"renderTargetSize",
|
||||
"renderSourceSize",
|
||||
"projectionMatrix",
|
||||
"playlistPopulationParams",
|
||||
"pixelCostFracs",
|
||||
"pixelCostDecode",
|
||||
"particleCloudSparkColor2",
|
||||
"particleCloudSparkColor1",
|
||||
"particleCloudSparkColor0",
|
||||
"particleCloudMatrix2",
|
||||
"particleCloudMatrix1",
|
||||
"particleCloudMatrix",
|
||||
"particleCloudColor",
|
||||
"outdoorFeatherParms",
|
||||
"oceanUVAnimParmPaintedFoam",
|
||||
"oceanUVAnimParmOctave2",
|
||||
"oceanUVAnimParmOctave1",
|
||||
"oceanUVAnimParmOctave0",
|
||||
"oceanUVAnimParmFoam",
|
||||
"oceanUVAnimParmDetail1",
|
||||
"oceanUVAnimParmDetail0",
|
||||
"oceanScrollParms",
|
||||
"oceanMiscParms",
|
||||
"oceanFoamParms",
|
||||
"oceanAmplitude",
|
||||
"materialColor",
|
||||
"lightprobeAmbient",
|
||||
"lightingLookupScale",
|
||||
"lightSpotFactors",
|
||||
"lightSpotDir",
|
||||
"lightSpecular",
|
||||
"lightPosition",
|
||||
"lightFalloffPlacement",
|
||||
"lightDiffuse",
|
||||
"inverseWorldViewMatrix",
|
||||
"inverseViewProjectionMatrix",
|
||||
"inverseTransposeWorldViewMatrix",
|
||||
"heatMapDetail",
|
||||
"glowSetup",
|
||||
"glowApply",
|
||||
"gameTime",
|
||||
"fullscreenDistortion",
|
||||
"fogSunDir",
|
||||
"fogSunConsts",
|
||||
"fogSunColorLinear",
|
||||
"fogSunColorGamma",
|
||||
"fogConsts",
|
||||
"fogColorLinear",
|
||||
"fogColorGamma",
|
||||
"flagParms",
|
||||
"filterTap",
|
||||
"featherParms",
|
||||
"falloffParms",
|
||||
"falloffEndColor",
|
||||
"falloffBeginColor",
|
||||
"fadeEffect",
|
||||
"eyeOffsetParms",
|
||||
"eyeOffset",
|
||||
"envMapParms",
|
||||
"dustTint",
|
||||
"dustParms",
|
||||
"dustEyeParms",
|
||||
"dofRowDelta",
|
||||
"dofLerpScale",
|
||||
"dofLerpBias",
|
||||
"dofEquationViewModelAndFarBlur",
|
||||
"dofEquationScene",
|
||||
"distortionScale",
|
||||
"detailScale",
|
||||
"depthFromClip",
|
||||
"debugBumpmap",
|
||||
"colorTintQuadraticDelta",
|
||||
"colorTintDelta",
|
||||
"colorTintBase",
|
||||
"colorSaturationR",
|
||||
"colorSaturationG",
|
||||
"colorSaturationB",
|
||||
"colorObjMin",
|
||||
"colorObjMax",
|
||||
"colorMatrixR",
|
||||
"colorMatrixG",
|
||||
"colorMatrixB",
|
||||
"colorBias",
|
||||
"codeMeshArg",
|
||||
"clipSpaceLookupScale",
|
||||
"clipSpaceLookupOffset",
|
||||
"baseLightingCoords",
|
||||
};
|
||||
|
||||
const char* KNOWN_TEXTURE_DEF_NAMES[]{
|
||||
"attenuation",
|
||||
"attenuationSampler",
|
||||
"cinematicA",
|
||||
"cinematicASampler",
|
||||
"cinematicCb",
|
||||
"cinematicCbSampler",
|
||||
"cinematicCr",
|
||||
"cinematicCrSampler",
|
||||
"cinematicY",
|
||||
"cinematicYSampler",
|
||||
"colorMap",
|
||||
"colorMap1",
|
||||
"colorMap2",
|
||||
"colorMapPostSun",
|
||||
"colorMapPostSunSampler",
|
||||
"colorMapSampler",
|
||||
"colorMapSampler1",
|
||||
"colorMapSampler2",
|
||||
"cucoloris",
|
||||
"cucolorisSampler",
|
||||
"detailMap",
|
||||
"detailMapSampler",
|
||||
"dust",
|
||||
"dustSampler",
|
||||
"fadeMap",
|
||||
"fadeMapSampler",
|
||||
"floatZ",
|
||||
"floatZSampler",
|
||||
"grainMap",
|
||||
"grainMapSampler",
|
||||
"halfParticleColor",
|
||||
"halfParticleColorSampler",
|
||||
"halfParticleDepth",
|
||||
"halfParticleDepthSampler",
|
||||
"heatmap",
|
||||
"heatmapSampler",
|
||||
"lightmapPrimary",
|
||||
"lightmapSamplerPrimary",
|
||||
"lightmapSamplerSecondary",
|
||||
"lightmapSecondary",
|
||||
"lookupMap",
|
||||
"lookupMapSampler",
|
||||
"modelLighting",
|
||||
"modelLightingSampler",
|
||||
"normalMap",
|
||||
"normalMapSampler",
|
||||
"oceanColorRamp",
|
||||
"oceanColorRampSampler",
|
||||
"oceanDetailNormal",
|
||||
"oceanDetailNormalSampler",
|
||||
"oceanDisplacement",
|
||||
"oceanDisplacementSampler",
|
||||
"oceanEnv",
|
||||
"oceanEnvSampler",
|
||||
"oceanFoam",
|
||||
"oceanFoamSampler",
|
||||
"oceanHeightNormal",
|
||||
"oceanHeightNormalSampler",
|
||||
"oceanPaintedFoam",
|
||||
"oceanPaintedFoamSampler",
|
||||
"outdoorMap",
|
||||
"outdoorMapSampler",
|
||||
"population",
|
||||
"populationSampler",
|
||||
"reflectionProbe",
|
||||
"reflectionProbeSampler",
|
||||
"shadowmapSamplerSpot",
|
||||
"shadowmapSamplerSun",
|
||||
"shadowmapSpot",
|
||||
"shadowmapSun",
|
||||
"skyMap",
|
||||
"skyMapSampler",
|
||||
"specularMap",
|
||||
"specularMapSampler",
|
||||
"ssao",
|
||||
"ssaoSampler",
|
||||
"worldMap",
|
||||
"worldMapSampler",
|
||||
};
|
||||
|
||||
void MaterialConstantZoneState::ExtractNamesFromZoneInternal()
|
||||
{
|
||||
for (const auto* zone : IGame::GetGameById(GameId::IW3)->GetZones())
|
||||
{
|
||||
const auto* assetPools = dynamic_cast<const GameAssetPoolIW3*>(zone->m_pools.get());
|
||||
if (!assetPools)
|
||||
return;
|
||||
|
||||
for (const auto* techniqueSetInfo : *assetPools->m_technique_set)
|
||||
{
|
||||
const auto* techniqueSet = techniqueSetInfo->Asset();
|
||||
|
||||
for (const auto* technique : techniqueSet->techniques)
|
||||
{
|
||||
if (technique)
|
||||
ExtractNamesFromTechnique(technique);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unsigned MaterialConstantZoneState::HashString(const std::string& str)
|
||||
{
|
||||
return Common::R_HashString(str.c_str());
|
||||
}
|
||||
|
||||
void MaterialConstantZoneState::ExtractNamesFromTechnique(const MaterialTechnique* technique)
|
||||
{
|
||||
if (!ShouldDumpFromStruct(technique))
|
||||
return;
|
||||
|
||||
for (auto passIndex = 0u; passIndex < technique->passCount; passIndex++)
|
||||
{
|
||||
const auto& pass = technique->passArray[passIndex];
|
||||
|
||||
if (pass.vertexShader && pass.vertexShader->prog.loadDef.program)
|
||||
ExtractNamesFromShader(pass.vertexShader->prog.loadDef.program, pass.vertexShader->prog.loadDef.programSize);
|
||||
|
||||
if (pass.pixelShader && pass.pixelShader->prog.loadDef.program)
|
||||
ExtractNamesFromShader(pass.pixelShader->prog.loadDef.program, pass.pixelShader->prog.loadDef.programSize);
|
||||
}
|
||||
}
|
||||
|
||||
void MaterialConstantZoneState::AddStaticKnownNames()
|
||||
{
|
||||
for (const auto* knownConstantName : KNOWN_CONSTANT_NAMES)
|
||||
AddConstantName(knownConstantName);
|
||||
for (const auto* knownTextureDefName : KNOWN_TEXTURE_DEF_NAMES)
|
||||
AddTextureDefName(knownTextureDefName);
|
||||
}
|
||||
} // namespace IW3
|
||||
@ -0,0 +1,18 @@
|
||||
#pragma once
|
||||
|
||||
#include "Game/IW3/IW3.h"
|
||||
#include "Material/AbstractMaterialConstantZoneState.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace IW3
|
||||
{
|
||||
class MaterialConstantZoneState final : public AbstractMaterialConstantZoneStateDx9
|
||||
{
|
||||
protected:
|
||||
void ExtractNamesFromZoneInternal() override;
|
||||
void ExtractNamesFromTechnique(const MaterialTechnique* technique);
|
||||
void AddStaticKnownNames() override;
|
||||
unsigned HashString(const std::string& str) override;
|
||||
};
|
||||
} // namespace IW3
|
||||
@ -4,12 +4,12 @@
|
||||
#include "AssetDumpers/AssetDumperLoadedSound.h"
|
||||
#include "AssetDumpers/AssetDumperLocalizeEntry.h"
|
||||
#include "AssetDumpers/AssetDumperMapEnts.h"
|
||||
#include "AssetDumpers/AssetDumperMaterial.h"
|
||||
#include "AssetDumpers/AssetDumperRawFile.h"
|
||||
#include "AssetDumpers/AssetDumperStringTable.h"
|
||||
#include "AssetDumpers/AssetDumperWeapon.h"
|
||||
#include "AssetDumpers/AssetDumperXModel.h"
|
||||
#include "Game/IW3/GameAssetPoolIW3.h"
|
||||
#include "Material/DumperMaterialIW3.h"
|
||||
#include "ObjWriting.h"
|
||||
|
||||
using namespace IW3;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include "IObjWriter.h"
|
||||
|
||||
namespace IW3
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
#options GAME (IW4, IW5, T6)
|
||||
#options GAME (IW3, IW4, IW5, T6)
|
||||
|
||||
#filename "Game/" + GAME + "/Material/JsonMaterialWriter" + GAME + ".cpp"
|
||||
|
||||
#if GAME == "IW4"
|
||||
#if GAME == "IW3"
|
||||
#define FEATURE_IW3
|
||||
#define HAS_WATER
|
||||
#define GAME_LOWER "iw3"
|
||||
#elif GAME == "IW4"
|
||||
#define FEATURE_IW4
|
||||
#define HAS_WATER
|
||||
#define GAME_LOWER "iw4"
|
||||
@ -218,7 +222,7 @@ namespace
|
||||
|
||||
assert(structured.alphaTestDisabled
|
||||
|| structured.alphaTest == GFXS_ALPHA_TEST_GT_0
|
||||
#if defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
#if defined(FEATURE_IW3) || defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
|| structured.alphaTest == GFXS_ALPHA_TEST_LT_128
|
||||
#endif
|
||||
|| structured.alphaTest == GFXS_ALPHA_TEST_GE_128);
|
||||
@ -226,7 +230,7 @@ namespace
|
||||
jStateBitsTableEntry.alphaTest = JsonAlphaTest::DISABLED;
|
||||
else if (structured.alphaTest == GFXS_ALPHA_TEST_GT_0)
|
||||
jStateBitsTableEntry.alphaTest = JsonAlphaTest::GT0;
|
||||
#if defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
#if defined(FEATURE_IW3) || defined(FEATURE_IW4) || defined(FEATURE_IW5)
|
||||
else if (structured.alphaTest == GFXS_ALPHA_TEST_LT_128)
|
||||
jStateBitsTableEntry.alphaTest = JsonAlphaTest::LT128;
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#options GAME (IW4, IW5, T6)
|
||||
#options GAME (IW3, IW4, IW5, T6)
|
||||
|
||||
#filename "Game/" + GAME + "/Material/JsonMaterialWriter" + GAME + ".h"
|
||||
|
||||
|
||||
@ -14,9 +14,6 @@ public:
|
||||
std::unique_ptr<AssetPool<IW3::XAnimParts>> m_xanim_parts;
|
||||
std::unique_ptr<AssetPool<IW3::XModel>> m_xmodel;
|
||||
std::unique_ptr<AssetPool<IW3::Material>> m_material;
|
||||
std::unique_ptr<AssetPool<IW3::MaterialPixelShader>> m_material_pixel_shader;
|
||||
std::unique_ptr<AssetPool<IW3::MaterialVertexShader>> m_material_vertex_shader;
|
||||
std::unique_ptr<AssetPool<IW3::MaterialVertexDeclaration>> m_material_vertex_decl;
|
||||
std::unique_ptr<AssetPool<IW3::MaterialTechniqueSet>> m_technique_set;
|
||||
std::unique_ptr<AssetPool<IW3::GfxImage>> m_image;
|
||||
std::unique_ptr<AssetPool<IW3::snd_alias_list_t>> m_sound;
|
||||
|
||||
Reference in New Issue
Block a user