Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve Rendering #186

Merged
merged 6 commits into from
Jul 9, 2020
Merged

Improve Rendering #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d3aaf8
Unify Rendering
Jul 9, 2020
231d94e
Merge branch 'master' into batchrender
kanurag94 Jul 9, 2020
a0d8960
Resolve Conflicts
kanurag94 Jul 9, 2020
f9dc073
Resolve Conflicts
kanurag94 Jul 9, 2020
8440f69
Resolve Conflicts
kanurag94 Jul 9, 2020
3baae1c
Resolve Conflicts
kanurag94 Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/include/xmenu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef XMENU_H
#ifndef XMENU_H
#define XMENU_H
#include "xio.h"
#include "config.h"
Expand Down Expand Up @@ -32,6 +32,7 @@ typedef char *(*tokenfunc)(struct uih_context *c);
#define DIALOG_ONOFF 8
#define DIALOG_COORD 9
#define DIALOG_PALSLIDER 10
#define DIALOG_IFILES 11

#define DIALOGIFILE(question, filename) \
{ \
Expand Down Expand Up @@ -73,6 +74,10 @@ typedef char *(*tokenfunc)(struct uih_context *c);
{ \
question, DIALOG_SLIDER, default \
}
#define DIALOGIFILES(question, filenames) \
{ \
question, DIALOG_IFILES, 0, filenames \
}

#define DIALOGIFILE_I(_question, _filename) \
menudialogs_i18n[no_menudialogs_i18n].question = _question; \
Expand Down Expand Up @@ -146,6 +151,13 @@ typedef char *(*tokenfunc)(struct uih_context *c);
menudialogs_i18n[no_menudialogs_i18n].defint = _default; \
++no_menudialogs_i18n;

#define DIALOGIFILES_I(_question, _filenames) \
menudialogs_i18n[no_menudialogs_i18n].question = _question; \
menudialogs_i18n[no_menudialogs_i18n].type = DIALOG_IFILES; \
menudialogs_i18n[no_menudialogs_i18n].defint = 0; \
menudialogs_i18n[no_menudialogs_i18n].defstr = _filenames; \
++no_menudialogs_i18n;

#define NULL_I() \
menudialogs_i18n[no_menudialogs_i18n].question = NULL; \
menudialogs_i18n[no_menudialogs_i18n].type = 0; \
Expand Down
47 changes: 35 additions & 12 deletions src/ui-hlp/menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <cerrno>
#include <cerrno>
#include <cstring>
#include <cstdlib>
#include <QMessageBox>
Expand All @@ -13,6 +13,7 @@
#include "play.h"
#include "i18n.h"
#include "xthread.h"
#include "customdialog.h"

#define LANG(name, name2) \
MENUSTRING("lang", NULL, name, name2, 0, \
Expand Down Expand Up @@ -62,7 +63,7 @@ const char *const uih_colornames[] = {"white", "black", "red", NULL};
* Zoltan Kovacs <[email protected]>, 2003-01-05
*/

#define MAX_MENUDIALOGS_I18N 104
#define MAX_MENUDIALOGS_I18N 115
#define Register(variable) variable = &menudialogs_i18n[no_menudialogs_i18n]
static menudialog menudialogs_i18n[MAX_MENUDIALOGS_I18N];
// static int no_menudialogs_i18n;
Expand Down Expand Up @@ -116,7 +117,7 @@ void uih_registermenudialogs_i18n(void)
NULL_I();

Register(uih_renderdialog);
DIALOGIFILE_I(TR("Dialog", "File to render:"), "fract*.xaf");
DIALOGIFILES_I(TR("Dialog", "Files to render:"), 0);
DIALOGOFILE_I(TR("Dialog", "Basename:"), "anim");
DIALOGINT_I(TR("Dialog", "Width:"), 640);
DIALOGINT_I(TR("Dialog", "Height:"), 480);
Expand Down Expand Up @@ -339,6 +340,11 @@ static void uih_smoothmorph(struct uih_context *c, dialogparam *p)

static void uih_render(struct uih_context *c, dialogparam *d)
{

if(fnames.size() == 0) {
uih_error(c, "No file Selected");
return;
}
if (d[2].dint <= 0 || d[2].dint > 4096) {
uih_error(
c,
Expand Down Expand Up @@ -369,15 +375,31 @@ static void uih_render(struct uih_context *c, dialogparam *d)
"renderanim: antialiasing not supported in 256 color mode"));
return;
}
uih_renderanimation(c, d[1].dstring, (xio_path)d[0].dstring, d[2].dint,
d[3].dint, d[4].number, d[5].number,
(int)(1000000 / d[6].number),
#ifdef STRUECOLOR24
d[7].dint ? C256 : TRUECOLOR24,
#else
d[7].dint ? C256 : TRUECOLOR,
#endif
d[8].dint, d[9].dint, c->letterspersec, NULL);
for(int i=0; i < (int)fnames.size(); i++) {

QString hlpmsg = "Rendering (" + QString::number(i) + "/" +
QString::number(fnames.size()) + ") " + fnames[i];
uih_message(c, hlpmsg.toStdString().c_str());

char* curr_file = strdup(fnames[i].toStdString().c_str());

QString file_number = "_" + fnames[i].split("/").back().split(".").front() + "_";
char* file_suffix = strdup(file_number.toStdString().c_str());
char* base_name = (char *)malloc(strlen(d[1].dstring) + strlen(file_suffix) + 2);
strcpy(base_name, d[1].dstring);
strcat(base_name, file_suffix);

uih_renderanimation(c, base_name, (xio_path)curr_file, d[2].dint,
d[3].dint, d[4].number, d[5].number,
(int)(1000000 / d[6].number),
#ifdef STRUECOLOR24
d[7].dint ? C256 : TRUECOLOR24,
#else
d[7].dint ? C256 : TRUECOLOR,
#endif
d[8].dint, d[9].dint, c->letterspersec, NULL);
free(base_name);
}
}

static menudialog *uih_getcolordialog(struct uih_context *c)
Expand Down Expand Up @@ -1037,6 +1059,7 @@ void uih_registermenus_i18n(void)
MENUFLAG_INTERRUPT, uih_loadpngfile, loadimgdialog);
MENUDIALOG_I("file", NULL, TR("Menu", "Save image"), "saveimg", 0,
uih_savepngfile, saveimgdialog);
MENUSEPARATOR_I("file");
MENUDIALOG_I("file", NULL, TR("Menu", "Render"), "renderanim", UI,
uih_render, uih_renderdialog);
MENUSEPARATOR_I("file");
Expand Down
Loading