2
0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-05 12:33:02 +00:00

chore: improve game shader types

This commit is contained in:
Jan Laupetin
2026-02-27 22:06:08 +01:00
parent 2d2912741b
commit e66030a5df
3 changed files with 41 additions and 28 deletions

View File

@@ -1448,8 +1448,8 @@ namespace T5
struct MaterialArgumentCodeConst struct MaterialArgumentCodeConst
{ {
uint16_t index; uint16_t index;
char firstRow; unsigned char firstRow;
char rowCount; unsigned char rowCount;
}; };
union MaterialArgumentDef union MaterialArgumentDef
@@ -1465,11 +1465,15 @@ namespace T5
MTL_ARG_MATERIAL_VERTEX_CONST = 0x0, MTL_ARG_MATERIAL_VERTEX_CONST = 0x0,
MTL_ARG_LITERAL_VERTEX_CONST = 0x1, MTL_ARG_LITERAL_VERTEX_CONST = 0x1,
MTL_ARG_MATERIAL_PIXEL_SAMPLER = 0x2, MTL_ARG_MATERIAL_PIXEL_SAMPLER = 0x2,
MTL_ARG_CODE_PRIM_BEGIN = 0x3, MTL_ARG_CODE_PRIM_BEGIN = 0x3,
MTL_ARG_CODE_VERTEX_CONST = 0x3, MTL_ARG_CODE_VERTEX_CONST = 0x3,
MTL_ARG_CODE_PIXEL_SAMPLER = 0x4, MTL_ARG_CODE_PIXEL_SAMPLER = 0x4,
MTL_ARG_CODE_PIXEL_CONST = 0x5, MTL_ARG_CODE_PIXEL_CONST = 0x5,
MTL_ARG_CODE_PRIM_END = 0x6, MTL_ARG_CODE_PRIM_END = 0x6,
MTL_ARG_MATERIAL_PIXEL_CONST = 0x6, MTL_ARG_MATERIAL_PIXEL_CONST = 0x6,
MTL_ARG_LITERAL_PIXEL_CONST = 0x7, MTL_ARG_LITERAL_PIXEL_CONST = 0x7,

View File

@@ -3001,6 +3001,15 @@ namespace T6
VERTEX_SHADER_MODEL_UNLIT, VERTEX_SHADER_MODEL_UNLIT,
}; };
enum CustomSamplers
{
CUSTOM_SAMPLER_REFLECTION_PROBE = 0,
CUSTOM_SAMPLER_LIGHTMAP_PRIMARY,
CUSTOM_SAMPLER_LIGHTMAP_SECONDARY,
CUSTOM_SAMPLER_COUNT
};
enum MaterialType : unsigned char enum MaterialType : unsigned char
{ {
MTL_TYPE_DEFAULT = 0x0, MTL_TYPE_DEFAULT = 0x0,
@@ -3035,6 +3044,20 @@ namespace T6
MaterialShaderArgument* args; MaterialShaderArgument* args;
}; };
enum TechniqueFlags
{
TECHNIQUE_FLAG_1 = 0x1,
TECHNIQUE_FLAG_2 = 0x2,
TECHNIQUE_FLAG_4 = 0x4,
TECHNIQUE_FLAG_8 = 0x8,
TECHNIQUE_FLAG_10 = 0x10,
TECHNIQUE_FLAG_20 = 0x20,
TECHNIQUE_FLAG_40 = 0x40,
TECHNIQUE_FLAG_80 = 0x80,
TECHNIQUE_FLAG_100 = 0x100,
TECHNIQUE_FLAG_200 = 0x200,
};
struct MaterialTechnique struct MaterialTechnique
{ {
const char* name; const char* name;
@@ -3043,14 +3066,6 @@ namespace T6
MaterialPass passArray[1]; MaterialPass passArray[1];
}; };
/* struct __cppobj ID3D11View : ID3D11DeviceChild
{
};*/
/* struct __cppobj ID3D11ShaderResourceView : ID3D11View
{
};*/
struct type_align32(4) GfxImageLoadDef struct type_align32(4) GfxImageLoadDef
{ {
char levelCount; char levelCount;
@@ -3719,14 +3734,6 @@ namespace T6
GfxImage* secondary; GfxImage* secondary;
}; };
/* struct __cppobj ID3D11Resource : ID3D11DeviceChild
{
};*/
/* struct __cppobj ID3D11Buffer : ID3D11Resource
{
};*/
struct type_align(4) GfxLightGridEntry struct type_align(4) GfxLightGridEntry
{ {
uint16_t colorsIndex; uint16_t colorsIndex;
@@ -5793,8 +5800,8 @@ namespace T6
struct MaterialStreamRouting struct MaterialStreamRouting
{ {
char source; unsigned char source;
char dest; unsigned char dest;
}; };
struct MaterialVertexStreamRouting struct MaterialVertexStreamRouting
@@ -5805,7 +5812,7 @@ namespace T6
struct MaterialVertexDeclaration struct MaterialVertexDeclaration
{ {
char streamCount; unsigned char streamCount;
bool hasOptionalSource; bool hasOptionalSource;
bool isLoaded; bool isLoaded;
MaterialVertexStreamRouting routing; MaterialVertexStreamRouting routing;
@@ -6160,8 +6167,8 @@ namespace T6
struct MaterialArgumentCodeConst struct MaterialArgumentCodeConst
{ {
uint16_t index; uint16_t index;
char firstRow; unsigned char firstRow;
char rowCount; unsigned char rowCount;
}; };
union MaterialArgumentDef union MaterialArgumentDef
@@ -6177,14 +6184,19 @@ namespace T6
MTL_ARG_MATERIAL_VERTEX_CONST = 0x0, MTL_ARG_MATERIAL_VERTEX_CONST = 0x0,
MTL_ARG_LITERAL_VERTEX_CONST = 0x1, MTL_ARG_LITERAL_VERTEX_CONST = 0x1,
MTL_ARG_MATERIAL_PIXEL_SAMPLER = 0x2, MTL_ARG_MATERIAL_PIXEL_SAMPLER = 0x2,
MTL_ARG_CODE_PRIM_BEGIN = 0x3, MTL_ARG_CODE_PRIM_BEGIN = 0x3,
MTL_ARG_CODE_VERTEX_CONST = 0x3, MTL_ARG_CODE_VERTEX_CONST = 0x3,
MTL_ARG_CODE_PIXEL_SAMPLER = 0x4, MTL_ARG_CODE_PIXEL_SAMPLER = 0x4,
MTL_ARG_CODE_PIXEL_CONST = 0x5, MTL_ARG_CODE_PIXEL_CONST = 0x5,
MTL_ARG_CODE_PRIM_END = 0x6, MTL_ARG_CODE_PRIM_END = 0x6,
MTL_ARG_MATERIAL_PIXEL_CONST = 0x6, MTL_ARG_MATERIAL_PIXEL_CONST = 0x6,
MTL_ARG_LITERAL_PIXEL_CONST = 0x7, MTL_ARG_LITERAL_PIXEL_CONST = 0x7,
MLT_ARG_COUNT = 0x8,
MLT_ARG_COUNT,
}; };
struct MaterialShaderArgument struct MaterialShaderArgument
@@ -6895,10 +6907,6 @@ namespace T6
vec3_t halfLengths; vec3_t halfLengths;
}; };
/* struct __cppobj ID3D11InputLayout : ID3D11DeviceChild
{
};*/
struct GfxLightRegionAxis struct GfxLightRegionAxis
{ {
vec3_t dir; vec3_t dir;

View File

@@ -1,4 +1,5 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <string> #include <string>
#include <vector> #include <vector>