fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't use case-sensitive extensions for imgtool outputs (silly windows users). Also tweak usage text.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5714 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-06-27 19:32:21 +00:00
parent 27cf81cde7
commit d40c125223
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
imgtool.c
View file

@ -1171,7 +1171,7 @@ static void ImgTool_Convert(struct opts_s *args, struct pendingtextureinfo *in,
} }
#endif #endif
#ifdef IMAGEFMT_TGA #ifdef IMAGEFMT_TGA
else if (!strcmp(outext, ".tga")) else if (!strcasecmp(outext, ".tga"))
{ {
qboolean outformats[PTI_MAX]; qboolean outformats[PTI_MAX];
for (k = 0; k < PTI_MAX; k++) for (k = 0; k < PTI_MAX; k++)
@ -1192,7 +1192,7 @@ static void ImgTool_Convert(struct opts_s *args, struct pendingtextureinfo *in,
} }
#endif #endif
#ifdef IMAGEFMT_PCX #ifdef IMAGEFMT_PCX
else if (!strcmp(outext, ".pcx")) else if (!strcasecmp(outext, ".pcx"))
{ {
qboolean outformats[PTI_MAX]; qboolean outformats[PTI_MAX];
for (k = 0; k < PTI_MAX; k++) for (k = 0; k < PTI_MAX; k++)
@ -1608,7 +1608,7 @@ static void ImgTool_TreeConvert(struct opts_s *args, const char *destpath, const
size_t newfiles=0, skippedfiles=0, processedfiles=0; size_t newfiles=0, skippedfiles=0, processedfiles=0;
char file[MAX_OSPATH]; char file[MAX_OSPATH];
char dest[MAX_OSPATH]; char dest[MAX_OSPATH];
const char *exts[] = {".png", ".bmp", ".tga", ".jpg", ".exr", ".hdr", NULL}; const char *exts[] = {".png", ".bmp", ".tga", ".jpg", ".exr", ".hdr", ".pcx", NULL};
struct filelist_s list = {exts}; struct filelist_s list = {exts};
size_t i, destlen = strlen(destpath)+1; size_t i, destlen = strlen(destpath)+1;
ImgTool_TreeScan(&list, srcpath, ""); ImgTool_TreeScan(&list, srcpath, "");
@ -2217,14 +2217,14 @@ int main(int argc, const char **argv)
{ {
showhelp: showhelp:
Con_Printf(DISTRIBUTION " Image Tool\n"); Con_Printf(DISTRIBUTION " Image Tool\n");
Con_Printf("show info : %s -i *.ktx\n", argv[0]); Con_Printf("show info : %s [-i] in.ktx [in2.ext ...]\n", argv[0]);
Con_Printf("compress : %s --astc_6x6_ldr [--nomips] --ext ktx in.png [in2.png ...]\n", argv[0]); Con_Printf("compress : %s [-c] --ext ktx --astc_6x6_ldr [--nomips] in.png [in2.png ...]\n", argv[0]);
Con_Printf("compress : %s --bc3 [--premul] [--nomips] in.png\n\tConvert pixel format (to bc3 aka dxt5) before writing to output file.\n", argv[0]); Con_Printf("compress : %s [-c] --ext dds --bc3 [--premul] [--nomips] in.png\n\tConvert pixel format (to bc3 aka dxt5) before writing to output file.\n", argv[0]);
Con_Printf("convert : %s --convert in.exr\n\tConvert to different file format, while trying to preserve pixel formats.\n", argv[0]); Con_Printf("convert : %s [-c] --ext png in.exr [in2.pcx ...]\n\tConvert input file(s) to different file format, while trying to preserve pixel formats.\n", argv[0]);
Con_Printf("merge : %s -o output [--cube|--3d|--2darray|--cubearray] [--bc1] foo_*.png\n\tConvert to different file format, while trying to preserve pixel formats.\n", argv[0]); Con_Printf("merge : %s -o output [--cube|--3d|--2darray|--cubearray] [--bc1] foo_*.png\n\tConvert to different file format, while trying to preserve pixel formats.\n", argv[0]);
Con_Printf("recursive : %s --auto --astc_6x6_ldr destdir srcdir\n\tCompresses the files to dds (writing to an optionally different directory)\n", argv[0]); Con_Printf("recursive : %s -r [--ext dds] --astc_6x6_ldr destdir srcdir\n\tCompresses the files to dds (writing to an optionally different directory)\n", argv[0]);
Con_Printf("decompress : %s --decompress [--exportmip 0] [--nomips] in.ktx out.png\n\tDecompresses any block-compressed pixel data.\n", argv[0]); Con_Printf("decompress : %s --decompress [--exportmip 0] [--nomips] in.ktx out.png\n\tDecompresses any block-compressed pixel data.\n", argv[0]);
Con_Printf("create mips: %s --ext mip [--bc1] [--resize width height] [--exportmip 2] *.dds\n", argv[0]); Con_Printf("create mips: %s [-c] --ext mip [--bc1] [--resize width height] [--exportmip 2] *.dds\n", argv[0]);
Con_Printf("create xwad: %s --genwadx [--exportmip 2] [--bc1] out.wad srcdir\n", argv[0]); Con_Printf("create xwad: %s --genwadx [--exportmip 2] [--bc1] out.wad srcdir\n", argv[0]);
Con_Printf("create wad : %s -w [--exportmip 2] out.wad *.mipsrcdir\n", argv[0]); Con_Printf("create wad : %s -w [--exportmip 2] out.wad *.mipsrcdir\n", argv[0]);
Con_Printf("extract wad: %s -x [--ext png] src.wad\n", argv[0]); Con_Printf("extract wad: %s -x [--ext png] src.wad\n", argv[0]);