From 394ddd12f7e5895681e2be9f9bedda2524481713 Mon Sep 17 00:00:00 2001 From: ac-stef Date: Mon, 31 Aug 2015 15:15:29 +0200 Subject: [PATCH] allow chmenutexture to display pictures as well By specifying a title string in the second argument to chmenutexture, a picture is rendered instead of a texture. The title string is displayed instead of the texture resolution. The variable menupicturesize holds a size modifier for pictures, similar to menutexturesize. DOCREF chmenutexture menupicturesize --- source/src/menus.cpp | 20 +++++++++++++------- source/src/protos.h | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/source/src/menus.cpp b/source/src/menus.cpp index 4e389857..3cb266bd 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -1032,15 +1032,17 @@ void chmenumdl(char *menu, char *mdl, char *anim, int *rotspeed, int *scale) } COMMAND(chmenumdl, "sssii"); -void chmenutexture(char *menu, char *texname) +void chmenutexture(char *menu, char *texname, char *title) { if(!*menu || !menus.access(menu)) return; gmenu &m = menus[menu]; char *newtex = *texname ? newstring(texname) : NULL; DELETEA(m.previewtexture); m.previewtexture = newtex; + DELETEA(m.previewtexturetitle); + m.previewtexturetitle = *title ? newstring(title) : NULL; } -COMMAND(chmenutexture, "ss"); +COMMAND(chmenutexture, "sss"); bool parsecolor(color *col, const char *r, const char *g, const char *b, const char *a) { @@ -1316,26 +1318,30 @@ void gmenu::init() } FVAR(menutexturesize, 0.1f, 1.0f, 5.0f); +FVAR(menupicturesize, 0.1f, 1.6f, 5.0f); -void rendermenutexturepreview(char *previewtexture, int w) +void rendermenutexturepreview(char *previewtexture, int w, const char *title) { static Texture *pt = NULL; static char *last_pt = NULL; + bool ispicture = title != NULL; if(previewtexture != last_pt) { + silent_texture_load = ispicture; defformatstring(texpath)("packages/textures/%s", previewtexture); - pt = textureload(texpath); + pt = textureload(texpath, ispicture ? 3 : 0); last_pt = previewtexture; + silent_texture_load = false; } if(pt && pt != notexture && pt->xs && pt->ys) { - int xs = (VIRTW * menutexturesize) / 4, ys = (xs * pt->ys) / pt->xs, ysmax = (3 * VIRTH) / 2; + int xs = (VIRTW * (ispicture ? menupicturesize : menutexturesize)) / 4, ys = (xs * pt->ys) / pt->xs, ysmax = (3 * VIRTH) / 2; if(ys > ysmax) ys = ysmax, xs = (ys * pt->xs) / pt->ys; int x = (6 * VIRTW + w - 2 * xs) / 4, y = VIRTH - ys / 2 - 2 * FONTH; extern int fullbrightlevel; framedquadtexture(pt->id, x, y, xs, ys, FONTH / 2, fullbrightlevel); defformatstring(res)("%dx%d", pt->xs, pt->ys); - draw_text(res, x, y + ys + 2 * FONTH); + draw_text(title ? title : res, x, y + ys + 2 * FONTH); } } @@ -1420,7 +1426,7 @@ void gmenu::render() draw_text(items[menusel]->getdesc(), x, y); } - if(previewtexture && *previewtexture) rendermenutexturepreview(previewtexture, w); + if(previewtexture && *previewtexture) rendermenutexturepreview(previewtexture, w, previewtexturetitle); if(usefont) popfont(); // setfont("default"); ignoreblinkingbit = false; } diff --git a/source/src/protos.h b/source/src/protos.h index d43df3a6..5f217bdb 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -165,10 +165,10 @@ struct gmenu int anim, rotspeed, scale; int footlen; int xoffs, yoffs; - char *previewtexture; + char *previewtexture, *previewtexturetitle; mdirlist *dirlist; - gmenu() : name(0), title(0), header(0), footer(0), initaction(0), usefont(0), allowblink(false), persistentselection(false), mdl(0), footlen(0), xoffs(0), yoffs(0), previewtexture(NULL), dirlist(0) {} + gmenu() : name(0), title(0), header(0), footer(0), initaction(0), usefont(0), allowblink(false), persistentselection(false), mdl(0), footlen(0), xoffs(0), yoffs(0), previewtexture(NULL), previewtexturetitle(NULL), dirlist(0) {} virtual ~gmenu() { DELETEA(name);