Sprays - Initial commit

* Integrate stb_image.h library
* fixes NeotokyoRebuild#602

mp/src/game/client/CMakeLists.txt

@@ -19,6 +19,7 @@ target_include_directories(client
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons
     ${CMAKE_SOURCE_DIR}/public
     ${CMAKE_SOURCE_DIR}/thirdparty/sixensesdk/include
+    ${CMAKE_SOURCE_DIR}/vendor
     game_controls
     hl2
     hl2/elements
@@ -1486,6 +1487,14 @@ target_sources_grouped(
     neo/neo_fixup_glshaders.h
 )
 
+target_sources_grouped(
+    TARGET client
+    NAME "Source Files\\NEO_Vendor"
+    FILES
+    neo/vendor_impl.cpp
+    ${CMAKE_SOURCE_DIR}/vendor/stb_image.h
+)
+
 target_sources_grouped(
     TARGET client
     NAME "Source Files\\NEO\\Game_Controls"

mp/src/game/client/neo/ui/neo_root.cpp

@@ -1502,8 +1502,18 @@ void CNeoRoot::ReadNewsFile(CUtlBuffer &buf)
 
 void CNeoRoot::OnFileSelected(const char *szFullpath)
 {
-	((m_ns.crosshair.eFileIOMode == vgui::FOD_OPEN) ?
-				&ImportCrosshair : &ExportCrosshair)(&m_ns.crosshair.info, szFullpath);
+	switch (m_eFileIOMode)
+	{
+	case FILEIODLGMODE_CROSSHAIR:
+		((m_ns.crosshair.eFileIOMode == vgui::FOD_OPEN) ?
+					&ImportCrosshair : &ExportCrosshair)(&m_ns.crosshair.info, szFullpath);
+		break;
+	case FILEIODLGMODE_SPRAY:
+		NeoUI::ConvertToVTF(szFullpath);
+		break;
+	default:
+		break;
+	}
 }
 
 // NEO NOTE (nullsystem): NeoRootCaptureESC is so that ESC keybinds can be recognized by non-root states, but root

mp/src/game/client/neo/ui/neo_root.h

@@ -186,6 +186,14 @@ class CNeoRoot : public vgui::EditablePanel, public CGameEventListener
 	void ReadNewsFile(CUtlBuffer &buf);
 	bool m_bShowBrowserLabel = false;
 
+	enum FileIODialogMode
+	{
+		FILEIODLGMODE_CROSSHAIR = 0,
+		FILEIODLGMODE_SPRAY,
+
+		FILEIODLGMODE__TOTAL,
+	};
+	FileIODialogMode m_eFileIOMode;
 	vgui::FileOpenDialog *m_pFileIODialog = nullptr;
 	MESSAGE_FUNC_CHARPTR(OnFileSelected, "FileSelected", fullpath);
 };

mp/src/game/client/neo/ui/neo_root_settings.cpp

@@ -628,6 +628,23 @@ void NeoSettings_General(NeoSettings *ns)
 	NeoUI::RingBoxBool(L"Show position", &pGeneral->bShowPos);
 	NeoUI::RingBox(L"Show FPS", SHOWFPS_LABELS, ARRAYSIZE(SHOWFPS_LABELS), &pGeneral->iShowFps);
 	NeoUI::RingBox(L"Download filter", DLFILTER_LABELS, ARRAYSIZE(DLFILTER_LABELS), &pGeneral->iDlFilter);
+
+	NeoUI::Pad();
+	if (NeoUI::Button(L"", L"Import spray").bPressed)
+	{
+		if (g_pNeoRoot->m_pFileIODialog)
+		{
+			g_pNeoRoot->m_pFileIODialog->MarkForDeletion();
+		}
+		g_pNeoRoot->m_pFileIODialog = new vgui::FileOpenDialog(g_pNeoRoot, "Import spray", vgui::FOD_OPEN);
+		g_pNeoRoot->m_eFileIOMode = CNeoRoot::FILEIODLGMODE_SPRAY;
+		g_pNeoRoot->m_pFileIODialog->AddFilter("*.jpg;*.jpeg;*.png;*.vtf", "Images (JPEG, PNG, VTF)", true);
+		g_pNeoRoot->m_pFileIODialog->AddFilter("*.jpg;*.jpeg", "JPEG Image", false);
+		g_pNeoRoot->m_pFileIODialog->AddFilter("*.png", "PNG Image", false);
+		g_pNeoRoot->m_pFileIODialog->AddFilter("*.vtf", "VTF Image", false);
+		g_pNeoRoot->m_pFileIODialog->DoModal();
+	}
+	NeoUI::Pad();
 }
 
 void NeoSettings_Keys(NeoSettings *ns)
@@ -786,6 +803,7 @@ void NeoSettings_Crosshair(NeoSettings *ns)
 					g_pNeoRoot->m_pFileIODialog->MarkForDeletion();
 				}
 				pCrosshair->eFileIOMode = bPresImport ? vgui::FOD_OPEN : vgui::FOD_SAVE;
+				g_pNeoRoot->m_eFileIOMode = CNeoRoot::FILEIODLGMODE_CROSSHAIR;
 				g_pNeoRoot->m_pFileIODialog = new vgui::FileOpenDialog(g_pNeoRoot,
 																	   bPresImport ? "Import crosshair" : "Export crosshair",
 																	   pCrosshair->eFileIOMode);

mp/src/game/client/neo/ui/neo_ui.cpp

@@ -5,6 +5,8 @@
 #include <vgui/IInput.h>
 #include <vgui_controls/Controls.h>
 
+#include "stb_image.h"
+
 using namespace vgui;
 
 static const wchar_t *ENABLED_LABELS[] = {
@@ -1020,4 +1022,46 @@ void OpenURL(const char *szBaseUrl, const char *szPath)
 	system(syscmd);
 }
 
+void ConvertToVTF(const char *szFullpath)
+{
+	if (!szFullpath)
+	{
+		return;
+	}
+
+	// TODO: See: CViewRender::WriteSaveGameScreenshotOfSize
+	int x, y, n;
+	unsigned char *data = stbi_load(szFullpath, &x, &y, &n, 0);
+
+#if 0
+	// Create and initialize a VTF texture
+	IVTFTexture *pVTFTexture = CreateVTFTexture();
+	const int nFlags = TEXTUREFLAGS_NOMIP | TEXTUREFLAGS_NOLOD | TEXTUREFLAGS_SRGB;
+	if ( pVTFTexture->Init( nSrcWidth, nSrcHeight, 1, IMAGE_FORMAT_RGB888, nFlags, 1, 1 ) )
+	{
+		// Copy the image data over to the VTF
+		unsigned char *pDestBits = pVTFTexture->ImageData();
+		int nDstSize = nSrcWidth * nSrcHeight * 3;
+		V_memcpy( pDestBits, pSrcImage, nDstSize );
+
+		// Allocate output buffer
+		int iMaxVTFSize = 1024 + ( nSrcWidth * nSrcHeight * 3 );
+		void *pVTF = malloc( iMaxVTFSize );
+		buffer.SetExternalBuffer( pVTF, iMaxVTFSize, 0 );
+
+		// Serialize to the buffer
+		bWriteResult = pVTFTexture->Serialize( buffer );
+
+		// Free the VTF texture
+		DestroyVTFTexture( pVTFTexture );
+	}
+	else
+	{
+		bWriteResult = false;
+	}
+#endif
+
+	stbi_image_free(data);
+}
+
 }  // namespace NeoUI

mp/src/game/client/neo/ui/neo_ui.h

@@ -225,4 +225,6 @@ void SliderU8(const wchar_t *wszLeftLabel, uint8 *ucValue, const uint8 iMin, con
 void TextEdit(const wchar_t *wszLeftLabel, wchar_t *wszText, const int iMaxSize);
 bool Bind(const ButtonCode_t eCode);
 void OpenURL(const char *szBaseUrl, const char *szPath);
+
+void ConvertToVTF(const char *szFullpath);
 }

mp/src/game/client/neo/vendor_impl.cpp

@@ -0,0 +1,3 @@
+#define STB_IMAGE_IMPLEMENTATION
+#include "stb_image.h"
+