Ignore Original Resolution added

This commit is contained in:
Syping 2018-08-14 01:50:59 +02:00
parent fe4a6cd081
commit dc5f1dc84b
3 changed files with 86 additions and 74 deletions

@ -1 +1 @@
Subproject commit dc101a66dad3bf09336556bfd9fc92bb6f723212 Subproject commit feabaac48eadfcc5a7ccc998884f1f96432d3f7c

View File

@ -32,6 +32,8 @@ HEADERS += \
INCLUDEPATH += ./gta5view INCLUDEPATH += ./gta5view
DEFINES += GTA5SYNC_NOASSIST
# WINDOWS ONLY # WINDOWS ONLY
win32: DEFINES += GTA5SYNC_WIN win32: DEFINES += GTA5SYNC_WIN

View File

@ -37,6 +37,7 @@ int main(int argc, char *argv[])
QString format = "jpg"; QString format = "jpg";
bool isDefault = true; bool isDefault = true;
bool avatarMode = false; bool avatarMode = false;
bool ignoreORes = false;
bool convertToGTA = false; bool convertToGTA = false;
bool customFormat = false; bool customFormat = false;
bool formatSwitch = false; bool formatSwitch = false;
@ -77,6 +78,11 @@ int main(int argc, char *argv[])
{ {
isDefault = true; isDefault = true;
} }
else if (args.at(4) == "-fs")
{
convertToGTA = false;
formatSwitch = true;
}
else if (args.at(4) == "-aiar") else if (args.at(4) == "-aiar")
{ {
isDefault = false; isDefault = false;
@ -111,10 +117,11 @@ int main(int argc, char *argv[])
isDefault = true; isDefault = true;
keepAspectRatio = true; keepAspectRatio = true;
} }
else if (args.at(4) == "-fs") else if (args.at(4) == "-ior")
{ {
convertToGTA = false; isDefault = false;
formatSwitch = true; ignoreORes = true;
keepAspectRatio = false;
} }
else else
{ {
@ -248,6 +255,8 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
if (!image.isNull()) if (!image.isNull())
{
if (!ignoreORes)
{ {
QSize snapmaticRes(960, 536); QSize snapmaticRes(960, 536);
QSize avatarRes(470, 470); QSize avatarRes(470, 470);
@ -333,6 +342,7 @@ int main(int argc, char *argv[])
snapmaticPainter.end(); snapmaticPainter.end();
image = snapmaticImage; image = snapmaticImage;
} }
}
if (picture.setImage(image)) if (picture.setImage(image))
{ {
@ -510,7 +520,7 @@ int main(int argc, char *argv[])
cout << "Convert-only: <autodef> (auto file name at convert)" << endl; cout << "Convert-only: <autodef> (auto file name at convert)" << endl;
cout << "Convert-only: <autoext> (auto file extension at convert)" << endl; cout << "Convert-only: <autoext> (auto file extension at convert)" << endl;
cout << "Formats: jpg pgta g5e" << endl; cout << "Formats: jpg pgta g5e" << endl;
cout << "Snapmatic Modes: a p d fs aiar akar piar pkar diar dkar" << endl; cout << "Snapmatic Modes: a p d fs aiar akar piar pkar diar dkar ior" << endl;
cout << "Snapmatic Flags: crew=int players=int[] position=double[] title=string" << endl; cout << "Snapmatic Flags: crew=int players=int[] position=double[] title=string" << endl;
cout << "Global Flags: output=string" << endl; cout << "Global Flags: output=string" << endl;
} }