Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Made the renderer modular and loadable

Browse source 
This removes coupling between the renderer and UI/client functions. An option USE_RENDERER_DLOPEN was added to specify whether a renderer module should be compiled and loaded, instead of integrating the renderer into the executable directly. This opens the door for a new renderer
This commit is contained in:
smallmodel 2024-12-06 00:09:07 +01:00
parent 35f40e949b
commit 28bdd1b2b3
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
31 changed files with 645 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

64
code/uilib/uifont.cpp
View file

@ -83,11 +83,23 @@ const unsigned char DBCS_Tokin_Korean[] = {
int UIFont::CodeSearch(unsigned short uch)
{
CheckRefreshFont();
if (!m_font) {
return -1;
}
return UI_FontCodeSearch(m_font, uch);
}
bool UIFont::DBCSIsLeadByte(unsigned short uch)
{
CheckRefreshFont();
if (!m_font) {
return false;
}
return UI_FontDBCSIsLeadByte(m_font, uch);
}
@ -97,6 +109,12 @@ bool UIFont::DBCSIsMaekin(unsigned short uch)
const unsigned char *p;
unsigned char ch;
CheckRefreshFont();
if (!m_font) {
return false;
}
if (uch < 0x100) {
return false;
}
@ -135,6 +153,12 @@ bool UIFont::DBCSIsAtokin(unsigned short uch)
const unsigned char *p;
unsigned char ch;
CheckRefreshFont();
if (!m_font) {
return false;
}
if (uch < 0x100) {
return false;
}
@ -249,6 +273,9 @@ UIFont::UIFont()
color = UBlack;
setColor(color);
refHandle = uii.GetRefSequence();
name = "verdana-14";
}
UIFont::UIFont(const char *fn)
@ -272,10 +299,19 @@ void UIFont::setFont(const char *fontname)
if (!m_font) {
uii.Sys_Error(ERR_DROP, "Couldn't load font %s\n", fontname);
}
refHandle = uii.GetRefSequence();
name = fontname;
}
void UIFont::Print(float x, float y, const char *text, size_t maxlen, const float *virtualScreen)
{
CheckRefreshFont();
if (!m_font) {
return;
}
uii.Rend_SetColor(color);
uii.Rend_DrawString(m_font, text, x, y, maxlen, virtualScreen);
}
@ -489,11 +525,23 @@ void UIFont::PrintOutlinedJustified(
int UIFont::getMaxWidthIndex(const char *text, int maxlen)
{
CheckRefreshFont();
if (!m_font) {
return 0;
}
return UI_FontStringMaxWidth(m_font, text, maxlen);
}
int UIFont::getWidth(const char *text, int maxlen)
{
CheckRefreshFont();
if (!m_font) {
return 0;
}
return UI_FontStringWidth(m_font, text, maxlen);
}
@ -503,8 +551,10 @@ int UIFont::getCharWidth(unsigned short ch)
int indirected;
float widthMul = 1.0f; // Added in OPM for easier readability
CheckRefreshFont();
if (!m_font) {
return 0;
return 4;
}
if (ch == '\t') {
@ -537,6 +587,8 @@ int UIFont::getHeight(const char *text, int maxlen, const float* virtualScale)
float height;
int i;
CheckRefreshFont();
if (!m_font) {
return 0;
}
@ -558,6 +610,8 @@ int UIFont::getHeight(const char *text, int maxlen, const float* virtualScale)
int UIFont::getHeight(const float* virtualScale)
{
CheckRefreshFont();
if (virtualScale) {
if (m_font) {
return (m_font->sgl[0]->height * virtualScale[0]);
@ -731,3 +785,11 @@ int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
return maxwidths * 256.0;
}
void UIFont::CheckRefreshFont() {
if (refHandle != uii.GetRefSequence()) {
setFont(name);
} else if (!uii.IsRendererRegistered()) {
m_font = NULL;
}
}