Merge branch 'master' into feature/additional-weapon-customization

Author: DeValdi

Client/core/CConsole.cpp

@@ -123,7 +123,7 @@ bool CConsole::IsEnabled()
 
 void CConsole::SetEnabled(bool bEnabled)
 {
-    // Hide it if neccessary
+    // Hide it if necessary
     if (!bEnabled && m_pWindow->IsVisible())
     {
         SetVisible(false);

Client/core/CGUI.cpp

@@ -745,7 +745,7 @@ bool CLocalGUI::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
                 return true;
             case WM_IME_KEYDOWN:
             {
-                // Handle space/return seperately in this case
+                // Handle space/return separately in this case
                 if (wParam == VK_SPACE)
                     pGUI->ProcessCharacter(MapVirtualKey(wParam, MAPVK_VK_TO_CHAR));
 

Client/core/CScreenShot.cpp

@@ -26,7 +26,7 @@ static bool ms_bBeforeGUI = false;
 
 static SString ms_strScreenDirectoryPath;
 
-// Last save time, seperated per given type
+// Last save time, separated per given type
 // (normal screenshot or camera weapon initiated)
 static long long ms_lLastSaveTime[2] = {0, 0};
 

Client/core/CTrayIcon.cpp

@@ -69,7 +69,7 @@ bool CTrayIcon::CreateTrayIcon()
         return false;
     }
 
-    // The handle to the core.dll is neccessary here,
+    // The handle to the core.dll is necessary here,
     // because Windows will search for the ICON in the executable and not in the DLL
     // Note: Changing the size will not show a higher quality icon in the balloon
     auto hIcon = LoadImage(g_hModule, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, LR_DEFAULTSIZE, LR_DEFAULTSIZE, LR_SHARED | LR_LOADTRANSPARENT);

Client/core/DXHook/CDirect3DHookManager.cpp

@@ -3,7 +3,7 @@
  *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        Client/core/DXHook/CDirect3DHookManager.cpp
- *  PURPOSE:     Direct3D version independant hook manager
+ *  PURPOSE:     Direct3D version independent hook manager
  *
  *  Multi Theft Auto is available from https://multitheftauto.com/
  *

Client/core/DXHook/CProxyDirect3D9.cpp

@@ -1194,7 +1194,7 @@ namespace
 //
 // Hook CCore::OnPreCreateDevice
 //
-// Modify paramters
+// Modify parameters
 //
 ////////////////////////////////////////////////
 void CCore::OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD& BehaviorFlags,
@@ -1224,7 +1224,7 @@ void CCore::OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE De
     BehaviorFlagsOrig = BehaviorFlags;
     presentationParametersOrig = *pPresentationParameters;
 
-    WriteDebugEvent("  Original paramters:");
+    WriteDebugEvent("  Original parameters:");
     WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters));
 
     // Make sure DirectX Get...() calls will work
@@ -1235,7 +1235,7 @@ void CCore::OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE De
 
     GetVideoModeManager()->PreCreateDevice(pPresentationParameters);
 
-    WriteDebugEvent("  Modified paramters:");
+    WriteDebugEvent("  Modified parameters:");
     WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters));
 }
 
@@ -1309,7 +1309,7 @@ HRESULT CCore::OnPostCreateDevice(HRESULT hResult, IDirect3D9* pDirect3D, UINT A
     BehaviorFlagsOrig = BehaviorFlags;
     presentationParametersOrig = *pPresentationParameters;
 
-    WriteDebugEvent("  Original paramters:");
+    WriteDebugEvent("  Original parameters:");
     WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters));
 
     // Make sure DirectX Get...() calls will work
@@ -1320,7 +1320,7 @@ HRESULT CCore::OnPostCreateDevice(HRESULT hResult, IDirect3D9* pDirect3D, UINT A
 
     GetVideoModeManager()->PreCreateDevice(pPresentationParameters);
 
-    WriteDebugEvent("  Modified paramters:");
+    WriteDebugEvent("  Modified parameters:");
     WriteDebugEvent(ToString(Adapter, DeviceType, hFocusWindow, BehaviorFlags, *pPresentationParameters));
 
     hResult = CreateDeviceInsist(2, 1000, pDirect3D, Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface);

Client/core/DXHook/CProxyDirect3DEffect.cpp

@@ -173,7 +173,7 @@ HRESULT CProxyDirect3DEffect::CloneEffect(LPDIRECT3DDEVICE9 pDevice, LPD3DXEFFEC
 //
 // MyD3DXCreateEffectFromFile
 //
-// Wrap result of orignal function
+// Wrap result of original function
 //
 /////////////////////////////////////////////////////////////
 HRESULT WINAPI MyD3DXCreateEffectFromFile(LPDIRECT3DDEVICE9 pDevice, LPCSTR pSrcFile, CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, DWORD Flags,
@@ -192,7 +192,7 @@ HRESULT WINAPI MyD3DXCreateEffectFromFile(LPDIRECT3DDEVICE9 pDevice, LPCSTR pSrc
 //
 // D3DXCreateEffect
 //
-// Wrap result of orignal function
+// Wrap result of original function
 //
 /////////////////////////////////////////////////////////////
 HRESULT WINAPI MyD3DXCreateEffect(LPDIRECT3DDEVICE9 pDevice, LPCVOID pSrcData, UINT SrcDataLen, CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, DWORD Flags,

Client/core/DXHook/CProxyDirectInput8.cpp

@@ -15,7 +15,7 @@ CProxyDirectInput8::CProxyDirectInput8(IDirectInput8* pDevice)
 {
     WriteDebugEvent(SString("CProxyDirectInput8::CProxyDirectInput8 %08x", this));
 
-    // Initalize our local variable.
+    // Initialize our local variable.
     m_pDevice = pDevice;
 }
 

Client/core/Graphics/CGraphics.cpp

@@ -27,6 +27,40 @@ extern std::atomic<bool> g_bInMTAScene;
 
 using namespace std;
 
+namespace
+{
+    // Convert a straight-alpha ARGB tint into its premultiplied form:
+    //
+    //     (R, G, B, A)  ->  (R*A/255, G*A/255, B*A/255, A)
+    //
+    // Needed when routing a translucent draw onto the (ONE, INVSRCALPHA)
+    // pipeline. That pipeline computes
+    //
+    //     out.rgb = src.rgb + dst.rgb * (1 - src.a)
+    //
+    // with src.rgb = tex.rgb * diff.rgb and src.a = tex.a * diff.a, so
+    // diff.a never enters the source rgb term. For a PM texel tex.rgb =
+    // R*A_tex, that leaves
+    //
+    //     out.rgb = R * A_tex * diff.rgb + dst.rgb * (1 - A_tex * diff.a)
+    //
+    // which is brighter than the correct PM composite by a factor of
+    // 1/diff.a during a fade. Premultiplying the diffuse here
+    // (diff.rgb *= diff.a) restores the missing factor and the equation
+    // reduces exactly to the PM "over" operator.
+    inline SColor PremultiplyAlpha(SColor c) noexcept
+    {
+        if (c.A == 0xFF)
+            return c;
+
+        const uint a = c.A;
+        c.R = static_cast<unsigned char>((c.R * a + 127) / 255);
+        c.G = static_cast<unsigned char>((c.G * a + 127) / 255);
+        c.B = static_cast<unsigned char>((c.B * a + 127) / 255);
+        return c;
+    }
+}  // namespace
+
 template <>
 CGraphics* CSingleton<CGraphics>::m_pSingleton = NULL;
 
@@ -1080,6 +1114,15 @@ void CGraphics::DrawMaterialPrimitiveQueued(std::vector<PrimitiveMaterialVertice
     sDrawQueueItem Item;
     Item.eType = QUEUE_PRIMITIVEMATERIAL;
     Item.blendMode = m_ActiveBlendMode;
+    // Same PM auto-route as DrawTextureQueued, so dxDrawMaterialPrimitive
+    // composites SVG (premultiplied) textures correctly under default blend.
+    if (Item.blendMode == EBlendMode::BLEND && pMaterial && pMaterial->m_bPremultipliedAlpha)
+    {
+        Item.blendMode = EBlendMode::ADD;
+        // See PremultiplyAlpha for the diffuse premultiply rationale (#3828).
+        for (auto& vert : *pVecVertices)
+            vert.Color = PremultiplyAlpha(vert.Color);
+    }
     Item.PrimitiveMaterial.eType = eType;
     Item.PrimitiveMaterial.pMaterial = pMaterial;
     Item.PrimitiveMaterial.pVecVertices = pVecVertices;
@@ -1134,6 +1177,16 @@ void CGraphics::DrawTextureQueued(float fX, float fY, float fWidth, float fHeigh
     // Set up a queue item
     sDrawQueueItem Item;
     Item.blendMode = m_ActiveBlendMode;
+    // Premultiplied-alpha textures (SVG) need the (ONE, INVSRCALPHA) pipeline,
+    // not the straight-alpha BLEND mode. Route the default blend to ADD when
+    // the script hasn't asked for a specific mode (issue #4891), and convert
+    // the diffuse tint to PM so a translucent dxDrawImage call still fades
+    // correctly through that pipeline (issue #3828).
+    if (Item.blendMode == EBlendMode::BLEND && pMaterial && pMaterial->m_bPremultipliedAlpha)
+    {
+        Item.blendMode = EBlendMode::ADD;
+        ulColor = PremultiplyAlpha(ulColor);
+    }
     Item.Texture.fX = fX;
     Item.Texture.fY = fY;
     Item.Texture.fWidth = fWidth;

Client/core/Graphics/CMaterialLine3DBatcher.cpp

@@ -128,7 +128,7 @@ void CMaterialLine3DBatcher::Flush()
     std::vector<uint> indexList;
     indexList.resize(uiNumLines);
     uint* pIndices = &indexList[0];
-    uint  uiNumIndicies = 0;
+    uint  uiNumIndices = 0;
 
     // Calculate distances
     for (uint i = 0; i < uiNumLines; i++)
@@ -149,12 +149,12 @@ void CMaterialLine3DBatcher::Flush()
                 continue;
         }
         // Add the index for this line to the draw list
-        pIndices[uiNumIndicies++] = i;
+        pIndices[uiNumIndices++] = i;
     }
 
-    if (uiNumIndicies > 0)
+    if (uiNumIndices > 0)
     {
-        indexList.resize(uiNumIndicies);
+        indexList.resize(uiNumIndices);
 
         // Sort index list by distance
         ms_pLines = &m_LineList[0];
@@ -164,12 +164,12 @@ void CMaterialLine3DBatcher::Flush()
 
         // Draw index list, batching by material
         uint uiBatchFirstIndex = 0;
-        for (uint i = 0; i < uiNumIndicies; i++)
+        for (uint i = 0; i < uiNumIndices; i++)
         {
             const SMaterialLine3DItem& item = ms_pLines[pIndices[i]];
 
             // Flush batch if this is the last index, or the next one uses a different material
-            if ((i == uiNumIndicies - 1) || item.pMaterial != ms_pLines[pIndices[i + 1]].pMaterial)
+            if ((i == uiNumIndices - 1) || item.pMaterial != ms_pLines[pIndices[i + 1]].pMaterial)
             {
                 uint* pBatchIndices = &pIndices[uiBatchFirstIndex];
                 uint  uiNumBatchLines = i - uiBatchFirstIndex + 1;