diff --git a/Texassemble/texassemble.cpp b/Texassemble/texassemble.cpp index 0df5485..52fe5a0 100644 --- a/Texassemble/texassemble.cpp +++ b/Texassemble/texassemble.cpp @@ -726,40 +726,48 @@ namespace { PrintLogo(); - wprintf(L"Usage: texassemble \n\n"); - wprintf(L" cube create cubemap\n"); - wprintf(L" volume create volume map\n"); - wprintf(L" array create texture array\n"); - wprintf(L" cubearray create cubemap array\n"); - wprintf(L" h-cross or v-cross create a cross image from a cubemap\n"); - wprintf(L" h-strip or v-strip create a strip image from a cubemap\n"); - wprintf(L" array-strip creates a strip image from a 1D/2D array\n"); - wprintf(L" merge create texture from rgb image and alpha image\n"); - wprintf(L" gif create array from animated gif\n\n"); - wprintf(L" -r wildcard filename search is recursive\n"); - wprintf(L" -flist use text file with a list of input files (one per line)\n"); - wprintf(L" -w width\n"); - wprintf(L" -h height\n"); - wprintf(L" -f format\n"); - wprintf(L" -if image filtering\n"); - wprintf(L" -srgb{i|o} sRGB {input, output}\n"); - wprintf(L" -o output filename\n"); - wprintf(L" -l force output filename to lower case\n"); - wprintf(L" -y overwrite existing output file (if any)\n"); - wprintf(L" -sepalpha resize alpha channel separately from color channels\n"); - wprintf(L" -nowic Force non-WIC filtering\n"); - wprintf(L" -wrap, -mirror texture addressing mode (wrap, mirror, or clamp)\n"); - wprintf(L" -alpha convert premultiplied alpha to straight alpha\n"); - wprintf(L" -dx10 Force use of 'DX10' extended header\n"); - wprintf(L" -nologo suppress copyright message\n"); - wprintf(L" -fl Set maximum feature level target (defaults to 11.0)\n"); - wprintf(L" -tonemap Apply a tonemap operator based on maximum luminance\n"); - wprintf(L"\n (gif only)\n"); - wprintf(L" -bgcolor Use background color instead of transparency\n"); - wprintf(L"\n (merge only)\n"); - wprintf(L" -swizzle Select channels for merge (defaults to rgbB)\n"); - wprintf(L"\n (cube, volume, array, cubearray, merge only)\n"); - wprintf(L" -stripmips Use only base image from input dds files\n"); + static const wchar_t* const s_usage = + L"Usage: texassemble \n" + L"\n" + L" cube create cubemap\n" + L" volume create volume map\n" + L" array create texture array\n" + L" cubearray create cubemap array\n" + L" h-cross or v-cross create a cross image from a cubemap\n" + L" h-strip or v-strip create a strip image from a cubemap\n" + L" array-strip creates a strip image from a 1D/2D array\n" + L" merge create texture from rgb image and alpha image\n" + L" gif create array from animated gif\n" + L"\n" + L" -r wildcard filename search is recursive\n" + L" -flist use text file with a list of input files (one per line)\n" + L" -w width\n" + L" -h height\n" + L" -f format\n" + L" -if image filtering\n" + L" -srgb{i|o} sRGB {input, output}\n" + L" -o output filename\n" + L" -l force output filename to lower case\n" + L" -y overwrite existing output file (if any)\n" + L" -sepalpha resize alpha channel separately from color channels\n" + L" -nowic Force non-WIC filtering\n" + L" -wrap, -mirror texture addressing mode (wrap, mirror, or clamp)\n" + L" -alpha convert premultiplied alpha to straight alpha\n" + L" -dx10 Force use of 'DX10' extended header\n" + L" -nologo suppress copyright message\n" + L" -fl Set maximum feature level target (defaults to 11.0)\n" + L" -tonemap Apply a tonemap operator based on maximum luminance\n" + L"\n" + L" (gif only)\n" + L" -bgcolor Use background color instead of transparency\n" + L"\n" + L" (merge only)\n" + L" -swizzle Select channels for merge (defaults to rgbB)\n" + L"\n" + L" (cube, volume, array, cubearray, merge only)\n" + L" -stripmips Use only base image from input dds files\n"; + + wprintf(L"%ls", s_usage); wprintf(L"\n : "); PrintList(13, g_pFormats); diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp index 38c1d51..56dacc0 100644 --- a/Texconv/texconv.cpp +++ b/Texconv/texconv.cpp @@ -876,79 +876,95 @@ namespace { PrintLogo(); - wprintf(L"Usage: texconv \n\n"); - wprintf(L" -r wildcard filename search is recursive\n"); - wprintf(L" -r:flatten flatten the directory structure (default)\n"); - wprintf(L" -r:keep keep the directory structure\n"); - wprintf(L" -flist use text file with a list of input files (one per line)\n"); - wprintf(L"\n -w width\n"); - wprintf(L" -h height\n"); - wprintf(L" -m miplevels\n"); - wprintf(L" -f format\n"); - wprintf(L"\n -if image filtering\n"); - wprintf(L" -srgb{i|o} sRGB {input, output}\n"); - wprintf(L"\n -px name prefix\n"); - wprintf(L" -sx name suffix\n"); - wprintf(L" -o output directory\n"); - wprintf(L" -l force output filename to lower case\n"); - wprintf(L" -y overwrite existing output file (if any)\n"); - wprintf(L" -ft output file type\n"); - wprintf(L"\n -hflip horizonal flip of source image\n"); - wprintf(L" -vflip vertical flip of source image\n"); - wprintf(L"\n -sepalpha resize/generate mips alpha channel separately\n"); - wprintf(L" from color channels\n"); - wprintf(L" -keepcoverage Preserve alpha coverage in mips for alpha test ref\n"); - wprintf(L"\n -nowic Force non-WIC filtering\n"); - wprintf(L" -wrap, -mirror texture addressing mode (wrap, mirror, or clamp)\n"); - wprintf(L" -pmalpha convert final texture to use premultiplied alpha\n"); - wprintf(L" -alpha convert premultiplied alpha to straight alpha\n"); - wprintf( + static const wchar_t* const s_usage = + L"Usage: texconv \n" + L"\n" + L" -r wildcard filename search is recursive\n" + L" -r:flatten flatten the directory structure (default)\n" + L" -r:keep keep the directory structure\n" + L" -flist use text file with a list of input files (one per line)\n" + L"\n" + L" -w width\n" + L" -h height\n" + L" -m miplevels\n" + L" -f format\n" + L"\n" + L" -if image filtering\n" + L" -srgb{i|o} sRGB {input, output}\n" + L"\n" + L" -px name prefix\n" + L" -sx name suffix\n" + L" -o output directory\n" + L" -l force output filename to lower case\n" + L" -y overwrite existing output file (if any)\n" + L" -ft output file type\n" + L"\n" + L" -hflip horizonal flip of source image\n" + L" -vflip vertical flip of source image\n" + L"\n" + L" -sepalpha resize/generate mips alpha channel separately\n" + L" from color channels\n" + L" -keepcoverage Preserve alpha coverage in mips for alpha test ref\n" + L"\n" + L" -nowic Force non-WIC filtering\n" + L" -wrap, -mirror texture addressing mode (wrap, mirror, or clamp)\n" + L" -pmalpha convert final texture to use premultiplied alpha\n" + L" -alpha convert premultiplied alpha to straight alpha\n" L" -at Alpha threshold used for BC1, RGBA5551, and WIC\n" - L" (defaults to 0.5)\n"); - wprintf(L"\n -fl Set maximum feature level target (defaults to 11.0)\n"); - wprintf(L" -pow2 resize to fit a power-of-2, respecting aspect ratio\n"); - wprintf( - L"\n -nmap converts height-map to normal-map\n" + L" (defaults to 0.5)\n" + L"\n" + L" -fl Set maximum feature level target (defaults to 11.0)\n" + L" -pow2 resize to fit a power-of-2, respecting aspect ratio\n" + L"\n" + L" -nmap converts height-map to normal-map\n" L" options must be one or more of\n" - L" r, g, b, a, l, m, u, v, i, o\n"); - wprintf(L" -nmapamp normal map amplitude (defaults to 1.0)\n"); - wprintf(L"\n (DDS input only)\n"); - wprintf(L" -t{u|f} TYPELESS format is treated as UNORM or FLOAT\n"); - wprintf(L" -dword Use DWORD instead of BYTE alignment\n"); - wprintf(L" -badtails Fix for older DXTn with bad mipchain tails\n"); - wprintf(L" -fixbc4x4 Fix for odd-sized BC files that Direct3D can't load\n"); - wprintf(L" -xlum expand legacy L8, L16, and A8P8 formats\n"); - wprintf(L"\n (DDS output only)\n"); - wprintf(L" -dx10 Force use of 'DX10' extended header\n"); - wprintf(L" -dx9 Force use of legacy DX9 header\n"); - wprintf(L"\n (TGA output only)\n"); - wprintf(L" -tga20 Write file including TGA 2.0 extension area\n"); - wprintf(L"\n (BMP, PNG, JPG, TIF, WDP output only)\n"); - wprintf(L" -wicq When writing images with WIC use quality (0.0 to 1.0)\n"); - wprintf(L" -wiclossless When writing images with WIC use lossless mode\n"); - wprintf(L" -wicmulti When writing images with WIC encode multiframe images\n"); - wprintf(L"\n -nologo suppress copyright message\n"); - wprintf(L" -timing Display elapsed processing time\n\n"); - #ifdef _OPENMP - wprintf(L" -singleproc Do not use multi-threaded compression\n"); - #endif - wprintf(L" -gpu Select GPU for DirectCompute-based codecs (0 is default)\n"); - wprintf(L" -nogpu Do not use DirectCompute-based codecs\n"); - wprintf( - L"\n -bc Sets options for BC compression\n" + L" r, g, b, a, l, m, u, v, i, o\n" + L" -nmapamp normal map amplitude (defaults to 1.0)\n" + L"\n" + L" (DDS input only)\n" + L" -t{u|f} TYPELESS format is treated as UNORM or FLOAT\n" + L" -dword Use DWORD instead of BYTE alignment\n" + L" -badtails Fix for older DXTn with bad mipchain tails\n" + L" -fixbc4x4 Fix for odd-sized BC files that Direct3D can't load\n" + L" -xlum expand legacy L8, L16, and A8P8 formats\n" + L"\n" + L" (DDS output only)\n" + L" -dx10 Force use of 'DX10' extended header\n" + L" -dx9 Force use of legacy DX9 header\n" + L"\n" + L" (TGA output only)\n" + L" -tga20 Write file including TGA 2.0 extension area\n" + L"\n" + L" (BMP, PNG, JPG, TIF, WDP output only)\n" + L" -wicq When writing images with WIC use quality (0.0 to 1.0)\n" + L" -wiclossless When writing images with WIC use lossless mode\n" + L" -wicmulti When writing images with WIC encode multiframe images\n" + L"\n" + L" -nologo suppress copyright message\n" + L" -timing Display elapsed processing time\n" + L"\n" +#ifdef _OPENMP + L" -singleproc Do not use multi-threaded compression\n" +#endif + L" -gpu Select GPU for DirectCompute-based codecs (0 is default)\n" + L" -nogpu Do not use DirectCompute-based codecs\n" + L"\n" + L" -bc Sets options for BC compression\n" L" options must be one or more of\n" - L" d, u, q, x\n"); - wprintf( + L" d, u, q, x\n" L" -aw BC7 GPU compressor weighting for alpha error metric\n" - L" (defaults to 1.0)\n"); - wprintf(L"\n -c colorkey (a.k.a. chromakey) transparency\n"); - wprintf(L" -rotatecolor rotates color primaries and/or applies a curve\n"); - wprintf(L" -nits paper-white value in nits to use for HDR10 (def: 200.0)\n"); - wprintf(L" -tonemap Apply a tonemap operator based on maximum luminance\n"); - wprintf(L" -x2bias Enable *2 - 1 conversion cases for unorm/pos-only-float\n"); - wprintf(L" -inverty Invert Y (i.e. green) channel values\n"); - wprintf(L" -reconstructz Rebuild Z (blue) channel assuming X/Y are normals\n"); - wprintf(L" -swizzle Swizzle image channels using HLSL-style mask\n"); + L" (defaults to 1.0)\n" + L"\n" + L" -c colorkey (a.k.a. chromakey) transparency\n" + L" -rotatecolor rotates color primaries and/or applies a curve\n" + L" -nits paper-white value in nits to use for HDR10 (def: 200.0)\n" + L" -tonemap Apply a tonemap operator based on maximum luminance\n" + L" -x2bias Enable *2 - 1 conversion cases for unorm/pos-only-float\n" + L" -inverty Invert Y (i.e. green) channel values\n" + L" -reconstructz Rebuild Z (blue) channel assuming X/Y are normals\n" + L" -swizzle Swizzle image channels using HLSL-style mask\n"; + + wprintf(L"%ls", s_usage); wprintf(L"\n : "); PrintList(13, g_pFormats); diff --git a/Texdiag/texdiag.cpp b/Texdiag/texdiag.cpp index 37bc46a..0b7f480 100644 --- a/Texdiag/texdiag.cpp +++ b/Texdiag/texdiag.cpp @@ -655,34 +655,44 @@ namespace { PrintLogo(); - wprintf(L"Usage: texdiag \n\n"); - wprintf(L" info Output image metadata\n"); - wprintf(L" analyze Analyze and summarize image information\n"); - wprintf(L" compare Compare two images with MSE error metric\n"); - wprintf(L" diff Generate difference image from two images\n"); - wprintf(L" dumpbc Dump out compressed blocks (DDS BC only)\n"); - wprintf(L" dumpdds Dump out all the images in a complex DDS\n\n"); - wprintf(L" -r wildcard filename search is recursive\n"); - wprintf(L" -if image filtering\n"); - wprintf(L"\n (DDS input only)\n"); - wprintf(L" -t{u|f} TYPELESS format is treated as UNORM or FLOAT\n"); - wprintf(L" -dword Use DWORD instead of BYTE alignment\n"); - wprintf(L" -badtails Fix for older DXTn with bad mipchain tails\n"); - wprintf(L" -xlum expand legacy L8, L16, and A8P8 formats\n"); - wprintf(L"\n (diff only)\n"); - wprintf(L" -f format\n"); - wprintf(L" -o output filename\n"); - wprintf(L" -l force output filename to lower case\n"); - wprintf(L" -y overwrite existing output file (if any)\n"); - wprintf(L" -c highlight difference color (defaults to off)\n"); - wprintf(L" -t highlight threshold (defaults to 0.25)\n"); - wprintf(L"\n (dumpbc only)\n"); - wprintf(L" -targetx dump pixels at location x (defaults to all)\n"); - wprintf(L" -targety dump pixels at location y (defaults to all)\n"); - wprintf(L"\n (dumpdds only)\n"); - wprintf(L" -ft output file type\n"); - wprintf(L"\n -nologo suppress copyright message\n"); - wprintf(L" -flist use text file with a list of input files (one per line)\n"); + static const wchar_t* const s_usage = + L"Usage: texdiag \n" + L"\n" + L" info Output image metadata\n" + L" analyze Analyze and summarize image information\n" + L" compare Compare two images with MSE error metric\n" + L" diff Generate difference image from two images\n" + L" dumpbc Dump out compressed blocks (DDS BC only)\n" + L" dumpdds Dump out all the images in a complex DDS\n" + L"\n" + L" -r wildcard filename search is recursive\n" + L" -if image filtering\n" + L"\n" + L" (DDS input only)\n" + L" -t{u|f} TYPELESS format is treated as UNORM or FLOAT\n" + L" -dword Use DWORD instead of BYTE alignment\n" + L" -badtails Fix for older DXTn with bad mipchain tails\n" + L" -xlum expand legacy L8, L16, and A8P8 formats\n" + L"\n" + L" (diff only)\n" + L" -f format\n" + L" -o output filename\n" + L" -l force output filename to lower case\n" + L" -y overwrite existing output file (if any)\n" + L" -c highlight difference color (defaults to off)\n" + L" -t highlight threshold (defaults to 0.25)\n" + L"\n" + L" (dumpbc only)\n" + L" -targetx dump pixels at location x (defaults to all)\n" + L" -targety dump pixels at location y (defaults to all)\n" + L"\n" + L" (dumpdds only)\n" + L" -ft output file type\n" + L"\n" + L" -nologo suppress copyright message\n" + L" -flist use text file with a list of input files (one per line)\n"; + + wprintf(L"%ls", s_usage); wprintf(L"\n : "); PrintList(13, g_pFormats);