Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add conceptional fonticon in text rendering

Browse Source
This commit is contained in:
Jan
2021-09-05 02:25:24 +02:00
parent 52748b4cbe
commit 5020d82f68
9 changed files with 626 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/Game/Functions.cpp
View File

@ -272,6 +272,7 @@ namespace Game
SE_Load_t SE_Load = SE_Load_t(0x502A30);
SEH_StringEd_GetString_t SEH_StringEd_GetString = SEH_StringEd_GetString_t(0x44BB30);
SEH_ReadCharFromString_t SEH_ReadCharFromString = SEH_ReadCharFromString_t(0x486560);
Dvar_SetFromStringByName_t Dvar_SetFromStringByName = Dvar_SetFromStringByName_t(0x4F52E0);
Dvar_SetFromStringByNameFromSource_t Dvar_SetFromStringByNameFromSource = Dvar_SetFromStringByNameFromSource_t(0x4FC770);
@ -332,6 +333,10 @@ namespace Game
unzClose_t unzClose = unzClose_t(0x41BF20);
RB_DrawCursor_t RB_DrawCursor = RB_DrawCursor_t(0x534EA0);
Byte4PackRgba_t Byte4PackRgba = Byte4PackRgba_t(0x4FE910);
XAssetHeader* DB_XAssetPool = reinterpret_cast<XAssetHeader*>(0x7998A8);
unsigned int* g_poolSize = reinterpret_cast<unsigned int*>(0x7995E8);
@ -1195,5 +1200,99 @@ namespace Game
retn
}
}
__declspec(naked) Glyph* R_GetCharacterGlyph(Font_s* /*font*/, unsigned int /*letter*/)
{
__asm
{
mov edi, [esp + 0x8] // letter
push [esp + 0x4] // font
mov eax, 0x5055C0
call eax
add esp, 4
ret
}
}
__declspec(naked) bool SetupPulseFXVars(const char* /*text*/, int /*maxLength*/, int /*fxBirthTime*/, int /*fxLetterTime*/, int /*fxDecayStartTime*/, int /*fxDecayDuration*/, bool* /*resultDrawRandChar*/, int* /*resultRandSeed*/, int* /*resultMaxLength*/, bool* /*resultDecaying*/, int* /*resultDecayTimeElapsed*/)
{
__asm
{
mov eax, [esp + 0x08] // maxLength
push [esp + 0x2C] // resultDecayTimeElapsed
push [esp + 0x2C] // resultDecaying
push [esp + 0x2C] // resultMaxLength
push [esp + 0x2C] // resultRandSeed
push [esp + 0x2C] // resultDrawRandChar
push [esp + 0x2C] // fxDecayDuration
push [esp + 0x2C] // fxDecayStartTime
push [esp + 0x2C] // fxLetterTime
push [esp + 0x2C] // fxBirthTime
push [esp + 0x28] // text
mov ebx, 0x535050
call ebx
add esp, 0x28
ret
}
}
__declspec(naked) void RB_DrawChar(Material* /*material*/, float /*x*/, float /*y*/, float /*w*/, float /*h*/, float /*sinAngle*/, float /*cosAngle*/, Glyph* /*glyph*/, unsigned int /*color*/)
{
__asm
{
mov eax, [esp + 0x4] // material
mov edx, [esp + 0x20] // glyph
push [esp + 0x24] // color
push [esp + 0x20] // cosAngle
push [esp + 0x20] // sinAngle
push [esp + 0x20] // h
push [esp + 0x20] // w
push [esp + 0x20] // y
push [esp + 0x20] // x
mov ebx, 0x534E20
call ebx
add esp, 0x1C
ret
}
}
__declspec(naked) void RB_DrawStretchPicRotate(Material* /*material*/, float /*x*/, float /*y*/, float /*w*/, float /*h*/, float /*s0*/, float /*t0*/, float /*s1*/, float /*t1*/, float /*sinAngle*/, float /*cosAngle*/, unsigned int /*color*/)
{
__asm
{
mov eax, [esp + 0x4] // material
push [esp + 0x30] // color
push [esp + 0x30] // cosAngle
push [esp + 0x30] // sinAngle
push [esp + 0x30] // t1
push [esp + 0x30] // s1
push [esp + 0x30] // t0
push [esp + 0x30] // s0
push [esp + 0x30] // h
push [esp + 0x30] // w
push [esp + 0x30] // y
push [esp + 0x30] // x
mov ebx, 0x5310F0
call ebx
add esp, 0x2C
ret
}
}
__declspec(naked) char ModulateByteColors(char /*colorA*/, char /*colorB*/)
{
__asm
{
mov eax, [esp + 0x4] // colorA
mov ecx, [esp + 0x8] // colorB
mov ebx, 0x5353C0
call ebx
ret
}
}
#pragma optimize("", on)
}

15
src/Game/Functions.hpp
View File

@ -645,6 +645,9 @@ namespace Game
typedef char* (__cdecl * SEH_StringEd_GetString_t)(const char* string);
extern SEH_StringEd_GetString_t SEH_StringEd_GetString;
typedef unsigned int(__cdecl* SEH_ReadCharFromString_t)(const char** text, int* isTrailingPunctuation);
extern SEH_ReadCharFromString_t SEH_ReadCharFromString;
typedef char* (__cdecl * SL_ConvertToString_t)(unsigned short stringValue);
extern SL_ConvertToString_t SL_ConvertToString;
@ -773,6 +776,12 @@ namespace Game
typedef void(__cdecl * unzClose_t)(void* handle);
extern unzClose_t unzClose;
typedef void(__cdecl* RB_DrawCursor_t)(Material* material, char cursor, float x, float y, float sinAngle, float cosAngle, Font_s* font, float xScale, float yScale, unsigned int color);
extern RB_DrawCursor_t RB_DrawCursor;
typedef void(__cdecl* Byte4PackRgba_t)(const float* from, char* to);
extern Byte4PackRgba_t Byte4PackRgba;
extern XAssetHeader* DB_XAssetPool;
extern unsigned int* g_poolSize;
@ -919,4 +928,10 @@ namespace Game
void R_AddDebugString(float *color, float *pos, float scale, const char *str);
void R_AddDebugBounds(float* color, Bounds* b);
void R_AddDebugBounds(float* color, Bounds* b, const float(*quat)[4]);
Glyph* R_GetCharacterGlyph(Font_s* font, unsigned int letter);
bool SetupPulseFXVars(const char* text, int maxLength, int fxBirthTime, int fxLetterTime, int fxDecayStartTime, int fxDecayDuration, bool* resultDrawRandChar, int* resultRandSeed, int* resultMaxLength, bool* resultDecaying, int* resultDecayTimeElapsed);
void RB_DrawChar(Material* material, float x, float y, float w, float h, float sinAngle, float cosAngle, Glyph* glyph, unsigned int color);
void RB_DrawStretchPicRotate(Material* material, float x, float y, float w, float h, float s0, float t0, float s1, float t1, float sinAngle, float cosAngle, unsigned int color);
char ModulateByteColors(char colorA, char colorB);
}

30
src/Game/Structs.hpp
View File

@ -735,9 +735,9 @@ namespace Game
{
MaterialInfo info;
char stateBitsEntry[48];
char textureCount;
char constantCount;
char stateBitsCount;
unsigned char textureCount;
unsigned char constantCount;
unsigned char stateBitsCount;
char stateFlags;
char cameraRegion;
MaterialTechniqueSet *techniqueSet;
@ -5263,6 +5263,30 @@ namespace Game
int allowAddDObj;
};
enum TextRenderFlags
{
TEXT_RENDERFLAG_FORCEMONOSPACE = 0x1,
TEXT_RENDERFLAG_CURSOR = 0x2,
TEXT_RENDERFLAG_DROPSHADOW = 0x4,
TEXT_RENDERFLAG_DROPSHADOW_EXTRA = 0x8,
TEXT_RENDERFLAG_GLOW = 0x10,
TEXT_RENDERFLAG_GLOW_FORCE_COLOR = 0x20,
TEXT_RENDERFLAG_FX_DECODE = 0x40,
TEXT_RENDERFLAG_PADDING = 0x80,
TEXT_RENDERFLAG_SUBTITLETEXT = 0x100,
TEXT_RENDERFLAG_CINEMATIC = 0x200,
TEXT_RENDERFLAG_OUTLINE = 0x400,
TEXT_RENDERFLAG_OUTLINE_EXTRA = 0x800,
};
enum FontPassType
{
FONTPASS_NORMAL = 0x0,
FONTPASS_GLOW = 0x1,
FONTPASS_OUTLINE = 0x2,
FONTPASS_COUNT = 0x3,
};
#pragma endregion
#ifndef IDA