From 5988d7ea820038d59d5f5b200fa4535d66a1d437 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Tue, 29 Nov 2016 20:47:33 +0100
Subject: [PATCH] Changed: Support PNG for Snapshot Tool

--HG--
branch : develop
---
 .../3d/object_viewer/snapshot_tool_dlg.cpp    | 34 +++++++++++++------
 .../3d/object_viewer/snapshot_tool_dlg.h      |  7 ++--
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp b/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
index 8cbb869de..89830cd5b 100644
--- a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
+++ b/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
@@ -224,15 +224,6 @@ void CSnapshotToolDlg::toRegistry()
 		RegSetValueEx(hKey, _T("Filters"), 0, REG_SZ, (BYTE*) (LPCTSTR) filters, filters.GetLength() + 1);
 		DWORD recurseSubFolder = m_RecurseSubFolder;
 		DWORD dumpTextureSets = m_DumpTextureSets;
-		DWORD views [] = 
-		{ 
-			m_ViewBack,
-			m_ViewBottom,
-			m_ViewFront,
-			m_ViewLeft,
-			m_ViewRight,
-			m_ViewTop
-		};
 		DWORD width = (DWORD) m_OutputWidth;
 		DWORD height = (DWORD) m_OutputHeight;		
 		DWORD format = m_Format;
@@ -710,7 +701,25 @@ void CSnapshotToolDlg::OnTimer(UINT_PTR nIDEvent)
 							{
 								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)
 							{
 								case OutputPath_Custom: // custom output path
@@ -724,10 +733,15 @@ void CSnapshotToolDlg::OnTimer(UINT_PTR nIDEvent)
 								break;
 							}
 							COFile output(outputFilename);
+
 							if (m_Format == OutputFormat_Tga)
 							{
 								snapshot.writeTGA(output);
 							}
+							else if (m_Format == OutputFormat_Png)
+							{
+								snapshot.writePNG(output);
+							}
 							else
 							{
 								snapshot.writeJPG(output);
diff --git a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.h b/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.h
index 72df1dea5..a9b1d476a 100644
--- a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.h
+++ b/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.h
@@ -42,20 +42,21 @@ public:
 
 	enum 
 	{
-		OutputFormat_Tga = 0,
+		OutputFormat_Tga,
+		OutputFormat_Png,
 		OutputFormat_Jpg
 	};
 
 	enum
 	{
-		OutputPath_Custom = 0,
+		OutputPath_Custom,
 		OutputPath_SameAsInput,
 		OutputPath_CurrShapeDirectory,
 	};
 
 	enum
 	{
-		SnapshotAngle_Front = 0,
+		SnapshotAngle_Front,
 		SnapshotAngle_Right,
 		SnapshotAngle_Left,
 		SnapshotAngle_Top,