Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-15 14:30:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code review feedaback for texassemble array-strip

Browse Source
This commit is contained in:
Chuck Walbourn 2019-01-28 16:26:46 -08:00
parent e08dfc0681
commit a5f02c3a75
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Texassemble/texassemble.cpp
View File

@ -62,7 +62,7 @@ enum COMMANDS
CMD_V_STRIP, CMD_V_STRIP,
CMD_MERGE, CMD_MERGE,
CMD_GIF, CMD_GIF,
CMD_2D_ARRAY_H_STRIP, CMD_ARRAY_STRIP,
CMD_MAX CMD_MAX
}; };
@ -110,18 +110,18 @@ struct SValue
const SValue g_pCommands[] = const SValue g_pCommands[] =
{ {
{ L"cube", CMD_CUBE }, { L"cube", CMD_CUBE },
{ L"volume", CMD_VOLUME }, { L"volume", CMD_VOLUME },
{ L"array", CMD_ARRAY }, { L"array", CMD_ARRAY },
{ L"cubearray", CMD_CUBEARRAY }, { L"cubearray", CMD_CUBEARRAY },
{ L"h-cross", CMD_H_CROSS }, { L"h-cross", CMD_H_CROSS },
{ L"v-cross", CMD_V_CROSS }, { L"v-cross", CMD_V_CROSS },
{ L"h-strip", CMD_H_STRIP }, { L"h-strip", CMD_H_STRIP },
{ L"v-strip", CMD_V_STRIP }, { L"v-strip", CMD_V_STRIP },
{ L"merge", CMD_MERGE }, { L"merge", CMD_MERGE },
{ L"gif", CMD_GIF }, { L"gif", CMD_GIF },
{ L"2d-strip", CMD_2D_ARRAY_H_STRIP }, { L"array-strip", CMD_ARRAY_STRIP },
{ nullptr, 0 } { nullptr, 0 }
}; };
const SValue g_pOptions [] = const SValue g_pOptions [] =
@ -512,6 +512,7 @@ namespace
wprintf(L" cubearray create cubemap 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-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" 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" merge create texture from rgb image and alpha image\n");
wprintf(L" gif create array from animated gif\n\n"); wprintf(L" gif create array from animated gif\n\n");
wprintf(L" -r wildcard filename search is recursive\n"); wprintf(L" -r wildcard filename search is recursive\n");
@ -960,11 +961,11 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
case CMD_V_STRIP: case CMD_V_STRIP:
case CMD_MERGE: case CMD_MERGE:
case CMD_GIF: case CMD_GIF:
case CMD_2D_ARRAY_H_STRIP: case CMD_ARRAY_STRIP:
break; break;
default: default:
wprintf(L"Must use one of: cube, volume, array, cubearray,\n h-cross, v-cross, h-strip, v-strip\n merge, gif\n\n"); wprintf(L"Must use one of: cube, volume, array, cubearray,\n h-cross, v-cross, h-strip, v-strip, array-strip\n merge, gif\n\n");
return 1; return 1;
} }
@ -1093,6 +1094,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
case CMD_H_STRIP: case CMD_H_STRIP:
case CMD_V_STRIP: case CMD_V_STRIP:
case CMD_MERGE: case CMD_MERGE:
case CMD_ARRAY_STRIP:
break; break;
default: default:
@ -1211,7 +1213,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
case CMD_H_STRIP: case CMD_H_STRIP:
case CMD_V_STRIP: case CMD_V_STRIP:
case CMD_GIF: case CMD_GIF:
case CMD_2D_ARRAY_H_STRIP: case CMD_ARRAY_STRIP:
if (conversion.size() > 1) if (conversion.size() > 1)
{ {
wprintf(L"ERROR: cross/strip/gif output only accepts 1 input file\n"); wprintf(L"ERROR: cross/strip/gif output only accepts 1 input file\n");
@ -1273,6 +1275,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
case CMD_V_CROSS: case CMD_V_CROSS:
case CMD_H_STRIP: case CMD_H_STRIP:
case CMD_V_STRIP: case CMD_V_STRIP:
case CMD_ARRAY_STRIP:
_wmakepath_s(szOutputFile, nullptr, nullptr, fname, L".bmp"); _wmakepath_s(szOutputFile, nullptr, nullptr, fname, L".bmp");
break; break;
@ -1330,7 +1333,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
return 1; return 1;
} }
break; break;
case CMD_2D_ARRAY_H_STRIP:
case CMD_ARRAY_STRIP:
if (_wcsicmp(ext, L".dds") == 0) if (_wcsicmp(ext, L".dds") == 0)
{ {
hr = LoadFromDDSFile(pConv->szSrc, DDS_FLAGS_NONE, &info, *image); hr = LoadFromDDSFile(pConv->szSrc, DDS_FLAGS_NONE, &info, *image);
@ -1340,18 +1344,19 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
return 1; return 1;
} }
if (info.dimension != TEX_DIMENSION_TEXTURE2D || info.arraySize < 2) if (info.dimension == TEX_DIMENSION_TEXTURE3D || info.arraySize < 2 || info.IsCubemap())
{ {
wprintf(L"\nERROR: Input must be a 2d array\n"); wprintf(L"\nERROR: Input must be a 1D/2D array\n");
return 1; return 1;
} }
} }
else else
{ {
wprintf(L"\nERROR: Input must be a dds of a 2d array\n"); wprintf(L"\nERROR: Input must be a dds of a 1D/2D array\n");
return 1; return 1;
} }
break; break;
default: default:
if (_wcsicmp(ext, L".dds") == 0) if (_wcsicmp(ext, L".dds") == 0)
{ {
@ -1963,13 +1968,10 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
break; break;
} }
case CMD_2D_ARRAY_H_STRIP: case CMD_ARRAY_STRIP:
{ {
size_t twidth = 0; size_t twidth = width;
size_t theight = 0; size_t theight = height * images;
twidth = width;
theight = height * images;
ScratchImage result; ScratchImage result;
hr = result.Initialize2D(format, twidth, theight, 1, 1); hr = result.Initialize2D(format, twidth, theight, 1, 1);
@ -1998,10 +2000,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
size_t offsetx = 0; size_t offsetx = 0;
size_t offsety = 0; size_t offsety = 0;
// posx, negx, posy, negy, posz, negz
offsety = index * height; offsety = index * height;
hr = CopyRectangle(*img, rect, *dest, dwFilter | dwFilterOpts, offsetx, offsety); hr = CopyRectangle(*img, rect, *dest, dwFilter | dwFilterOpts, offsetx, offsety);
if (FAILED(hr)) if (FAILED(hr))
{ {
@ -2010,7 +2010,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
} }
} }
// Write cross/strip // Write array strip
wprintf(L"\nWriting %ls ", szOutputFile); wprintf(L"\nWriting %ls ", szOutputFile);
PrintInfo(result.GetMetadata()); PrintInfo(result.GetMetadata());
wprintf(L"\n"); wprintf(L"\n");