aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-26 08:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Support PNG for Snapshot Tool

Browse source
This commit is contained in:
kervala 2016-11-29 20:47:33 +01:00
parent 5cd37cb3cd
commit fa30da556c
2 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
View file

@ -224,15 +224,6 @@ void CSnapshotToolDlg::toRegistry()
RegSetValueEx(hKey, _T("Filters"), 0, REG_SZ, (BYTE*) (LPCTSTR) filters, filters.GetLength() + 1); RegSetValueEx(hKey, _T("Filters"), 0, REG_SZ, (BYTE*) (LPCTSTR) filters, filters.GetLength() + 1);
DWORD recurseSubFolder = m_RecurseSubFolder; DWORD recurseSubFolder = m_RecurseSubFolder;
DWORD dumpTextureSets = m_DumpTextureSets; DWORD dumpTextureSets = m_DumpTextureSets;
DWORD views [] =
{
m_ViewBack,
m_ViewBottom,
m_ViewFront,
m_ViewLeft,
m_ViewRight,
m_ViewTop
};
DWORD width = (DWORD) m_OutputWidth; DWORD width = (DWORD) m_OutputWidth;
DWORD height = (DWORD) m_OutputHeight; DWORD height = (DWORD) m_OutputHeight;
DWORD format = m_Format; DWORD format = m_Format;
@ -710,7 +701,25 @@ void CSnapshotToolDlg::OnTimer(UINT_PTR nIDEvent)
{ {
outputFilename += "_" + viewToString(viewIndex); outputFilename += "_" + viewToString(viewIndex);
} }
outputFilename += (m_Format == OutputFormat_Tga ? ".tga" : ".jpg");
std::string ext;
switch (m_Format)
{
case OutputFormat_Tga:
ext = "tga";
break;
case OutputFormat_Png:
ext = "png";
break;
case OutputFormat_Jpg:
ext = "jpg";
break;
default:
nlerror("Unsupported format %d", m_Format);
break;
}
outputFilename += "." + ext;
switch(m_OutputPathOption) switch(m_OutputPathOption)
{ {
case OutputPath_Custom: // custom output path case OutputPath_Custom: // custom output path
@ -724,10 +733,15 @@ void CSnapshotToolDlg::OnTimer(UINT_PTR nIDEvent)
break; break;
} }
COFile output(outputFilename); COFile output(outputFilename);
if (m_Format == OutputFormat_Tga) if (m_Format == OutputFormat_Tga)
{ {
snapshot.writeTGA(output); snapshot.writeTGA(output);
} }
else if (m_Format == OutputFormat_Png)
{
snapshot.writePNG(output);
}
else else
{ {
snapshot.writeJPG(output); snapshot.writeJPG(output);

7
code/nel/tools/3d/object_viewer/snapshot_tool_dlg.h
View file

@ -42,20 +42,21 @@ public:
enum enum
{ {
OutputFormat_Tga = 0, OutputFormat_Tga,
OutputFormat_Png,
OutputFormat_Jpg OutputFormat_Jpg
}; };
enum enum
{ {
OutputPath_Custom = 0, OutputPath_Custom,
OutputPath_SameAsInput, OutputPath_SameAsInput,
OutputPath_CurrShapeDirectory, OutputPath_CurrShapeDirectory,
}; };
enum enum
{ {
SnapshotAngle_Front = 0, SnapshotAngle_Front,
SnapshotAngle_Right, SnapshotAngle_Right,
SnapshotAngle_Left, SnapshotAngle_Left,
SnapshotAngle_Top, SnapshotAngle_Top,