cvar_t r_font_postprocess_shadow_z = {CF_CLIENT | CF_ARCHIVE, "r_font_postprocess_shadow_z", "0", "font shadow Z shift amount, applied during blurring"};
cvar_t r_font_hinting = {CF_CLIENT | CF_ARCHIVE, "r_font_hinting", "3", "0 = no hinting, 1 = light autohinting, 2 = full autohinting, 3 = full hinting"};
cvar_t r_font_antialias = {CF_CLIENT | CF_ARCHIVE, "r_font_antialias", "1", "0 = monochrome, 1 = grey" /* , 2 = rgb, 3 = bgr" */};
+cvar_t r_font_always_reload = {CF_CLIENT | CF_ARCHIVE, "r_font_always_reload", "0", "reload a font even given the same loadfont command. useful for trying out different versions of the same font file"};
cvar_t r_nearest_2d = {CF_CLIENT | CF_ARCHIVE, "r_nearest_2d", "0", "use nearest filtering on all 2d textures (including conchars)"};
cvar_t r_nearest_conchars = {CF_CLIENT | CF_ARCHIVE, "r_nearest_conchars", "0", "use nearest filtering on conchars texture"};
Con_DPrintf("Draw_CachePic(\"%s\"): frame %i: loading pic%s\n", path, draw_frame, (cachepicflags & CACHEPICFLAG_NOTPERSISTENT) ? " notpersist" : "");
pic = cachepics + (numcachepics++);
memset(pic, 0, sizeof(*pic));
- strlcpy (pic->name, path, sizeof(pic->name));
+ dp_strlcpy (pic->name, path, sizeof(pic->name));
// link into list
pic->chain = cachepichash[hashkey];
cachepichash[hashkey] = pic;
if (pic->flags & CACHEPICFLAG_NEWPIC && pic->skinframe && pic->skinframe->base && pic->width == width && pic->height == height)
{
Con_DPrintf("Draw_NewPic(\"%s\"): frame %i: updating texture\n", picname, draw_frame);
- R_UpdateTexture(pic->skinframe->base, pixels_bgra, 0, 0, 0, width, height, 1);
+ R_UpdateTexture(pic->skinframe->base, pixels_bgra, 0, 0, 0, width, height, 1, 0);
R_SkinFrame_MarkUsed(pic->skinframe);
pic->lastusedframe = draw_frame;
return pic;
Con_DPrintf("Draw_NewPic(\"%s\"): frame %i: creating new cachepic\n", picname, draw_frame);
pic = cachepics + (numcachepics++);
memset(pic, 0, sizeof(*pic));
- strlcpy (pic->name, picname, sizeof(pic->name));
+ dp_strlcpy (pic->name, picname, sizeof(pic->name));
// link into list
pic->chain = cachepichash[hashkey];
cachepichash[hashkey] = pic;
if(override || !fnt->texpath[0])
{
- strlcpy(fnt->texpath, name, sizeof(fnt->texpath));
+ dp_strlcpy(fnt->texpath, name, sizeof(fnt->texpath));
// load the cvars when the font is FIRST loader
fnt->settings.scale = scale;
fnt->settings.voffset = voffset;
fnt->settings.shadowy = r_font_postprocess_shadow_y.value;
fnt->settings.shadowz = r_font_postprocess_shadow_z.value;
}
+
// fix bad scale
if (fnt->settings.scale <= 0)
fnt->settings.scale = 1;
if(fnt->ft2)
{
- // clear freetype font
+ // we are going to reload. clear old ft2 data
Font_UnloadFont(fnt->ft2);
Mem_Free(fnt->ft2);
fnt->ft2 = NULL;
if(!Draw_IsPicLoaded(fnt->pic))
{
fnt->pic = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION | (r_nearest_conchars.integer ? CACHEPICFLAG_NEAREST : 0));
- strlcpy(widthfile, "gfx/conchars.width", sizeof(widthfile));
+ dp_strlcpy(widthfile, "gfx/conchars.width", sizeof(widthfile));
}
else
dpsnprintf(widthfile, sizeof(widthfile), "%s.width", fnt->fallbacks[i]);
if (!map)
break;
for(ch = 0; ch < 256; ++ch)
- map->width_of[ch] = Font_SnapTo(fnt->width_of[ch], 1/map->size);
+ fnt->width_of_ft2[i][ch] = Font_SnapTo(fnt->width_of[ch], 1/map->size);
}
}
{
if(!strcmp(dp_fonts.f[i].title, ""))
{
- strlcpy(dp_fonts.f[i].title, title, sizeof(dp_fonts.f[i].title));
+ dp_strlcpy(dp_fonts.f[i].title, title, sizeof(dp_fonts.f[i].title));
return &dp_fonts.f[i];
}
}
if (dp_fonts.f[i].ft2)
dp_fonts.f[i].ft2->settings = &dp_fonts.f[i].settings;
// register a font in first expanded slot
- strlcpy(dp_fonts.f[oldsize].title, title, sizeof(dp_fonts.f[oldsize].title));
+ dp_strlcpy(dp_fonts.f[oldsize].title, title, sizeof(dp_fonts.f[oldsize].title));
return &dp_fonts.f[oldsize];
}
return NULL;
static float snap_to_pixel_x(float x, float roundUpAt)
{
- float pixelpos = x * vid.width / vid_conwidth.value;
+ float pixelpos = x * vid.mode.width / vid_conwidth.value;
int snap = (int) pixelpos;
if (pixelpos - snap >= roundUpAt) ++snap;
- return ((float)snap * vid_conwidth.value / vid.width);
+ return ((float)snap * vid_conwidth.value / vid.mode.width);
/*
x = (int)(x * vid.width / vid_conwidth.value);
x = (x * vid_conwidth.value / vid.width);
static float snap_to_pixel_y(float y, float roundUpAt)
{
- float pixelpos = y * vid.height / vid_conheight.value;
+ float pixelpos = y * vid.mode.height / vid_conheight.value;
int snap = (int) pixelpos;
if (pixelpos - snap > roundUpAt) ++snap;
- return ((float)snap * vid_conheight.value / vid.height);
+ return ((float)snap * vid_conheight.value / vid.mode.height);
/*
y = (int)(y * vid.height / vid_conheight.value);
y = (y * vid_conheight.value / vid.height);
Con_Printf("font function not found\n");
return;
}
+ else
+ {
+ if (strcmp(cmd->cmdline, f->cmdline) != 0 || r_font_always_reload.integer)
+ dp_strlcpy(f->cmdline, cmd->cmdline, MAX_FONT_CMDLINE);
+ else
+ {
+ Con_DPrintf("LoadFont: font %s is unchanged\n", Cmd_Argv(cmd, 1));
+ return;
+ }
+ }
if(Cmd_Argc(cmd) < 3)
filelist = "gfx/conchars";
c = cm;
}
- if(!c || (c - filelist) > MAX_QPATH)
- strlcpy(mainfont, filelist, sizeof(mainfont));
+ if(!c || (c - filelist) >= MAX_QPATH)
+ dp_strlcpy(mainfont, filelist, sizeof(mainfont));
else
{
memcpy(mainfont, filelist, c - filelist);
f->fallback_faces[i] = 0; // f->req_face; could make it stick to the default-font's face index
c = cm;
}
- if(!c || (c-filelist) > MAX_QPATH)
+ if(!c || (c-filelist) >= MAX_QPATH)
{
- strlcpy(f->fallbacks[i], filelist, sizeof(mainfont));
+ dp_strlcpy(f->fallbacks[i], filelist, sizeof(mainfont));
}
else
{
Cvar_RegisterVariable(&r_font_postprocess_shadow_z);
Cvar_RegisterVariable(&r_font_hinting);
Cvar_RegisterVariable(&r_font_antialias);
+ Cvar_RegisterVariable(&r_font_always_reload);
Cvar_RegisterVariable(&r_textshadow);
Cvar_RegisterVariable(&r_textbrightness);
Cvar_RegisterVariable(&r_textcontrast);
memset(dp_fonts.f, 0, sizeof(dp_font_t) * dp_fonts.maxsize);
// assign starting font names
- strlcpy(FONT_DEFAULT->title, "default", sizeof(FONT_DEFAULT->title));
- strlcpy(FONT_DEFAULT->texpath, "gfx/conchars", sizeof(FONT_DEFAULT->texpath));
- strlcpy(FONT_CONSOLE->title, "console", sizeof(FONT_CONSOLE->title));
- strlcpy(FONT_SBAR->title, "sbar", sizeof(FONT_SBAR->title));
- strlcpy(FONT_NOTIFY->title, "notify", sizeof(FONT_NOTIFY->title));
- strlcpy(FONT_CHAT->title, "chat", sizeof(FONT_CHAT->title));
- strlcpy(FONT_CENTERPRINT->title, "centerprint", sizeof(FONT_CENTERPRINT->title));
- strlcpy(FONT_INFOBAR->title, "infobar", sizeof(FONT_INFOBAR->title));
- strlcpy(FONT_MENU->title, "menu", sizeof(FONT_MENU->title));
+ dp_strlcpy(FONT_DEFAULT->title, "default", sizeof(FONT_DEFAULT->title));
+ dp_strlcpy(FONT_DEFAULT->texpath, "gfx/conchars", sizeof(FONT_DEFAULT->texpath));
+ dp_strlcpy(FONT_CONSOLE->title, "console", sizeof(FONT_CONSOLE->title));
+ dp_strlcpy(FONT_SBAR->title, "sbar", sizeof(FONT_SBAR->title));
+ dp_strlcpy(FONT_NOTIFY->title, "notify", sizeof(FONT_NOTIFY->title));
+ dp_strlcpy(FONT_CHAT->title, "chat", sizeof(FONT_CHAT->title));
+ dp_strlcpy(FONT_CENTERPRINT->title, "centerprint", sizeof(FONT_CENTERPRINT->title));
+ dp_strlcpy(FONT_INFOBAR->title, "infobar", sizeof(FONT_INFOBAR->title));
+ dp_strlcpy(FONT_MENU->title, "menu", sizeof(FONT_MENU->title));
for(i = 0, j = 0; i < MAX_USERFONTS; ++i)
if(!FONT_USER(i)->title[0])
dpsnprintf(FONT_USER(i)->title, sizeof(FONT_USER(i)->title), "user%d", j++);
void DrawQ_Start(void)
{
r_refdef.draw2dstage = 1;
- R_ResetViewRendering2D_Common(0, NULL, NULL, 0, 0, vid.width, vid.height, vid_conwidth.integer, vid_conheight.integer);
+ R_ResetViewRendering2D_Common(0, NULL, NULL, 0, 0, vid.mode.width, vid.mode.height, vid_conwidth.integer, vid_conheight.integer);
}
qbool r_draw2d_force = false;
void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
{
- dp_model_t *mod = CL_Mesh_UI();
+ model_t *mod = CL_Mesh_UI();
msurface_t *surf;
int e0, e1, e2, e3;
if (!pic)
float cosaf = cos(af);
float sinar = sin(ar);
float cosar = cos(ar);
- dp_model_t *mod = CL_Mesh_UI();
+ model_t *mod = CL_Mesh_UI();
msurface_t *surf;
int e0, e1, e2, e3;
if (!pic)
size_t bytes_left;
ft2_font_map_t *fontmap = NULL;
ft2_font_map_t *map = NULL;
- //ft2_font_map_t *prevmap = NULL;
ft2_font_t *ft2 = fnt->ft2;
// float ftbase_x;
qbool snap = true;
// x = snap_to_pixel_x(x, 0.4); // haha, it's 0 anyway
if (fontmap)
- width_of = fontmap->width_of;
+ width_of = fnt->width_of_ft2[map_index];
else
width_of = fnt->width_of;
if (ch == ' ' && !fontmap)
{
if(!least_one || i0) // never skip the first character
- if(x + width_of[(int) ' '] * dw > maxwidth)
- {
- i = i0;
- break; // oops, can't draw this
- }
+ if(x + width_of[(int) ' '] * dw > maxwidth)
+ {
+ i = i0;
+ break; // oops, can't draw this
+ }
x += width_of[(int) ' '] * dw;
continue;
}
map = ft2_oldstyle_map;
prevch = 0;
if(!least_one || i0) // never skip the first character
- if(x + width_of[ch] * dw > maxwidth)
- {
- i = i0;
- break; // oops, can't draw this
- }
+ if(x + width_of[ch] * dw > maxwidth)
+ {
+ i = i0;
+ break; // oops, can't draw this
+ }
x += width_of[ch] * dw;
} else {
- if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
+ if (!map || map == ft2_oldstyle_map || ch != prevch)
{
- map = FontMap_FindForChar(fontmap, ch);
+ Font_GetMapForChar(ft2, map_index, ch, &map, &mapch);
if (!map)
- {
- if (!Font_LoadMapForIndex(ft2, map_index, ch, &map))
- break;
- if (!map)
- break;
- }
+ break;
}
- mapch = ch - map->start;
if (prevch && Font_GetKerningForMap(ft2, map_index, w, h, prevch, ch, &kx, NULL))
x += kx * dw;
x += map->glyphs[mapch].advance_x * dw;
- //prevmap = map;
prevch = ch;
}
}
Uchar ch, mapch, nextch;
Uchar prevch = 0; // used for kerning
int map_index = 0;
- //ft2_font_map_t *prevmap = NULL; // the previous map
ft2_font_map_t *map = NULL; // the currently used map
ft2_font_map_t *fontmap = NULL; // the font map for the size
float ftbase_y;
size_t bytes_left;
float dw, dh;
const float *width_of;
- dp_model_t *mod = CL_Mesh_UI();
+ model_t *mod = CL_Mesh_UI();
msurface_t *surf = NULL;
int e0, e1, e2, e3;
int tw, th;
ftbase_y = snap_to_pixel_y(ftbase_y, 0.3);
}
- pix_x = vid.width / vid_conwidth.value;
- pix_y = vid.height / vid_conheight.value;
+ pix_x = vid.mode.width / vid_conwidth.value;
+ pix_y = vid.mode.height / vid_conheight.value;
if (fontmap)
- width_of = fontmap->width_of;
+ width_of = fnt->width_of_ft2[map_index];
else
width_of = fnt->width_of;
Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
x += width_of[ch] * dw;
} else {
- if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
+ if (!map || map == ft2_oldstyle_map || ch != prevch)
{
- // find the new map
- map = FontMap_FindForChar(fontmap, ch);
+ Font_GetMapForChar(ft2, map_index, ch, &map, &mapch);
if (!map)
{
- if (!Font_LoadMapForIndex(ft2, map_index, ch, &map))
- {
- shadow = -1;
- break;
- }
- if (!map)
- {
- // this shouldn't happen
- shadow = -1;
- break;
- }
+ shadow = -1;
+ break;
}
}
- mapch = ch - map->start;
thisw = map->glyphs[mapch].advance_x;
//x += ftbase_x;
void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
{
- dp_model_t *mod = CL_Mesh_UI();
+ model_t *mod = CL_Mesh_UI();
msurface_t *surf;
int e0, e1, e2, e3;
if (!pic)
void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
{
- dp_model_t *mod = CL_Mesh_UI();
+ model_t *mod = CL_Mesh_UI();
msurface_t *surf;
int e0, e1, e2, e3;
float offsetx, offsety;
if (fabs(x2 - x1) > fabs(y2 - y1))
{
offsetx = 0;
- offsety = 0.5f * width * vid_conheight.value / vid.height;
+ offsety = 0.5f * width * vid_conheight.value / vid.mode.height;
}
else
{
- offsetx = 0.5f * width * vid_conwidth.value / vid.width;
+ offsetx = 0.5f * width * vid_conwidth.value / vid.mode.width;
offsety = 0;
}
surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, "white", 0, 0, MATERIALFLAG_WALL | MATERIALFLAG_VERTEXCOLOR | MATERIALFLAG_ALPHAGEN_VERTEX | MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW), true);
{
case RENDERPATH_GL32:
case RENDERPATH_GLES2:
- GL_Scissor(ix, vid.height - iy - ih, iw, ih);
+ GL_Scissor(ix, vid.mode.height - iy - ih, iw, ih);
break;
}
void DrawQ_FlushUI(void)
{
- dp_model_t *mod = CL_Mesh_UI();
+ model_t *mod = CL_Mesh_UI();
if (mod->num_surfaces == 0)
return;
projects / xonotic / darkplaces.git / blobdiff