Merge branch 'master' into discordintegration

Author: qaisjp

Client/core/CClientVariables.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        core/CClientVariables.cpp
  *  PURPOSE:     Managed storage of client variables (cvars)
@@ -331,6 +331,7 @@ void CClientVariables::LoadDefaults()
     DEFAULT("high_detail_peds", 0);                                                   // Disable rendering high detail peds all the time
     DEFAULT("fast_clothes_loading", 1);                                               // 0-off 1-auto 2-on
     DEFAULT("allow_screen_upload", 1);                                                // 0-off 1-on
+    DEFAULT("allow_external_sounds", 1);                                              // 0-off 1-on
     DEFAULT("max_clientscript_log_kb", 5000);                                         // Max size in KB (0-No limit)
     DEFAULT("display_fullscreen_style", 0);                                           // 0-standard 1-borderless 2-borderless keep res 3-borderless stretch
     DEFAULT("display_windowed", 0);                                                   // 0-off 1-on

Client/core/CCore.cpp

@@ -1863,6 +1863,10 @@ void CCore::OnDeviceRestore()
 void CCore::OnPreFxRender()
 {
     // Don't do nothing if nothing won't be drawn
+
+    if (CGraphics::GetSingleton().HasPrimitive3DPreGUIQueueItems())
+        CGraphics::GetSingleton().DrawPrimitive3DPreGUIQueue();
+
     if (!CGraphics::GetSingleton().HasLine3DPreGUIQueueItems())
         return;
 

Client/core/CGUI.cpp

@@ -10,6 +10,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include "CNewsBrowser.h"
 #include <game/CGame.h>
 #include <windowsx.h>
 

Client/core/CGUI.h

@@ -29,7 +29,6 @@ class CLocalGUI;
 #include "CSetCursorPosHook.h"
 #include "CSingleton.h"
 #include "CVersionUpdater.h"
-#include "CNewsBrowser.h"
 
 #include <windows.h>
 

Client/core/CNewsBrowser.cpp

@@ -167,9 +167,16 @@ void CNewsBrowser::CreateGUI()
     m_pButtonOK->SetPosition(CVector2D(560.0f - 60, 480.0f - 30));
     m_pButtonOK->SetZOrderingEnabled(false);
 
+    // News link
+    m_pButtonNewsLink = reinterpret_cast<CGUIButton*>(pManager->CreateButton(m_pWindow, _("Visit latest news article")));
+    m_pButtonNewsLink->SetSize(CVector2D(180, 40), false);
+    m_pButtonNewsLink->SetPosition(CVector2D(560.0f - 250, 480.0f - 30));
+    m_pButtonNewsLink->SetZOrderingEnabled(false);
+
     // Set up the events
     m_pWindow->SetEnterKeyHandler(GUI_CALLBACK(&CNewsBrowser::OnOKButtonClick, this));
     m_pButtonOK->SetClickHandler(GUI_CALLBACK(&CNewsBrowser::OnOKButtonClick, this));
+    m_pButtonNewsLink->SetClickHandler(GUI_CALLBACK(&CNewsBrowser::OnNewsLinkButtonClick, this));
 
     // Create the tab panel and necessary tabs
     m_pTabPanel = reinterpret_cast<CGUITabPanel*>(pManager->CreateTabPanel(m_pWindow));
@@ -375,3 +382,13 @@ bool CNewsBrowser::OnOKButtonClick(CGUIElement* pElement)
     m_pWindow->SetVisible(false);
     return true;
 }
+
+bool CNewsBrowser::OnNewsLinkButtonClick(CGUIElement* pElement)
+{
+    // Visit the website
+    ShellExecuteNonBlocking("open", "https://mtasa.com/news");
+
+    // Close the window
+    m_pWindow->SetVisible(false);
+    return true;
+}

Client/core/CNewsBrowser.h

@@ -39,11 +39,13 @@ class CNewsBrowser
     void        CreateGUI();
     void        DestroyGUI();
     bool        OnOKButtonClick(CGUIElement* pElement);
+    bool        OnNewsLinkButtonClick(CGUIElement* pElement);
 
     std::vector<SNewsItem>   m_NewsitemList;
     CGUIWindow*              m_pWindow;
     CGUITabPanel*            m_pTabPanel;
     CGUIButton*              m_pButtonOK;
+    CGUIButton*              m_pButtonNewsLink;
     std::vector<CGUITab*>    m_TabList;
     std::vector<CGUIWindow*> m_TabContentList;
 };

Client/core/CSettings.cpp

@@ -376,6 +376,11 @@ void CSettings::CreateGUI()
     m_pCheckBoxAllowScreenUpload->GetPosition(vecTemp, false);
     m_pCheckBoxAllowScreenUpload->AutoSize(NULL, 20.0f);
 
+    m_pCheckBoxAllowExternalSounds = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabMultiplayer, _("Allow external sounds"), true));
+    m_pCheckBoxAllowExternalSounds->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + 20.0f));
+    m_pCheckBoxAllowExternalSounds->GetPosition(vecTemp, false);
+    m_pCheckBoxAllowExternalSounds->AutoSize(NULL, 20.0f);
+
     m_pDiscordCheck = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabMultiplayer, _("Enable Discord Rich Presence"), true));
     m_pDiscordCheck->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + 20.0f));
     m_pDiscordCheck->GetPosition(vecTemp, false);
@@ -1218,6 +1223,7 @@ void CSettings::CreateGUI()
     m_pComboFxQuality->SetSelectionHandler(GUI_CALLBACK(&CSettings::OnFxQualityChanged, this));
     m_pCheckBoxVolumetricShadows->SetClickHandler(GUI_CALLBACK(&CSettings::OnVolumetricShadowsClick, this));
     m_pCheckBoxAllowScreenUpload->SetClickHandler(GUI_CALLBACK(&CSettings::OnAllowScreenUploadClick, this));
+    m_pCheckBoxAllowExternalSounds->SetClickHandler(GUI_CALLBACK(&CSettings::OnAllowExternalSoundsClick, this));
     m_pCheckBoxCustomizedSAFiles->SetClickHandler(GUI_CALLBACK(&CSettings::OnCustomizedSAFilesClick, this));
     m_pCheckBoxWindowed->SetClickHandler(GUI_CALLBACK(&CSettings::OnWindowedClick, this));
     m_pCheckBoxDPIAware->SetClickHandler(GUI_CALLBACK(&CSettings::OnDPIAwareClick, this));
@@ -1516,6 +1522,11 @@ void CSettings::UpdateVideoTab()
     CVARS_GET("discord_rich_presence", discordRichPresence);
     m_pDiscordCheck->SetSelected(discordRichPresence);
 
+    // Allow external sounds
+    bool bAllowExternalSoundsEnabled;
+    CVARS_GET("allow_external_sounds", bAllowExternalSoundsEnabled);
+    m_pCheckBoxAllowExternalSounds->SetSelected(bAllowExternalSoundsEnabled);
+
     // Customized sa files
     m_pCheckBoxCustomizedSAFiles->SetSelected(GetApplicationSettingInt("customized-sa-files-request") != 0);
     m_pCheckBoxCustomizedSAFiles->SetVisible(GetApplicationSettingInt("customized-sa-files-show") != 0);
@@ -3352,6 +3363,10 @@ void CSettings::SaveData()
         g_pCore->GetDiscordManager()->Disconnect();
     }
 
+    // Allow external sounds
+    bool bAllowExternalSoundsEnabled = m_pCheckBoxAllowExternalSounds->GetSelected();
+    CVARS_SET("allow_external_sounds", bAllowExternalSoundsEnabled);
+
     // Grass
     bool bGrassEnabled = m_pCheckBoxGrass->GetSelected();
     CVARS_SET("grass", bGrassEnabled);
@@ -4355,6 +4370,24 @@ bool CSettings::OnAllowScreenUploadClick(CGUIElement* pElement)
     return true;
 }
 
+//
+// AllowExternalSounds
+//
+bool CSettings::OnAllowExternalSoundsClick(CGUIElement* pElement)
+{
+    if (!m_pCheckBoxAllowExternalSounds->GetSelected() && !m_bShownAllowExternalSoundsMessage)
+    {
+        m_bShownAllowExternalSoundsMessage = true;
+        SString strMessage;
+        strMessage +=
+            _("Some scripts may play sounds, such as radio, from the internet."
+              "\n\nDisabling this setting may decrease network"
+              "\nbandwidth consumption.\n");
+        CCore::GetSingleton().ShowMessageBox(_("EXTERNAL SOUNDS"), strMessage, MB_BUTTON_OK | MB_ICON_INFO);
+    }
+    return true;
+}
+
 //
 // CustomizedSAFiles
 //

Client/core/CSettings.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        core/CSettings.h
  *  PURPOSE:     Header file for in-game settings window class
@@ -153,6 +153,7 @@ class CSettings
     CGUICheckBox*  m_pCheckBoxShowUnsafeResolutions;
     CGUICheckBox*  m_pCheckBoxAllowScreenUpload;
     CGUICheckBox*  m_pDiscordCheck = nullptr;
+    CGUICheckBox*  m_pCheckBoxAllowExternalSounds;
     CGUICheckBox*  m_pCheckBoxCustomizedSAFiles;
     CGUICheckBox*  m_pCheckBoxGrass;
     CGUICheckBox*  m_pCheckBoxHeatHaze;
@@ -378,6 +379,7 @@ class CSettings
     bool OnFxQualityChanged(CGUIElement* pElement);
     bool OnVolumetricShadowsClick(CGUIElement* pElement);
     bool OnAllowScreenUploadClick(CGUIElement* pElement);
+    bool OnAllowExternalSoundsClick(CGUIElement* pElement);
     bool OnCustomizedSAFilesClick(CGUIElement* pElement);
     bool ShowUnsafeResolutionsClick(CGUIElement* pElement);
     bool OnWindowedClick(CGUIElement* pElement);
@@ -444,6 +446,7 @@ class CSettings
     DWORD m_dwFrameCount;
     bool  m_bShownVolumetricShadowsWarning;
     bool  m_bShownAllowScreenUploadMessage;
+    bool  m_bShownAllowExternalSoundsMessage;
     int   m_iMaxAnisotropic;
 
     std::list<SKeyBindSection*> m_pKeyBindSections;

Client/core/Graphics/CGraphics.cpp

@@ -15,6 +15,8 @@
 #include "CMaterialLine3DBatcher.h"
 #include "CPrimitiveBatcher.h"
 #include "CPrimitiveMaterialBatcher.h"
+#include "CPrimitive3DBatcher.h"
+#include "CMaterialPrimitive3DBatcher.h"
 #include "CAspectRatioConverter.h"
 extern CCore* g_pCore;
 extern bool   g_bInGTAScene;
@@ -58,6 +60,10 @@ CGraphics::CGraphics(CLocalGUI* pGUI)
     m_pLine3DBatcherPostGUI = new CLine3DBatcher(false);
     m_pMaterialLine3DBatcherPreGUI = new CMaterialLine3DBatcher(true);
     m_pMaterialLine3DBatcherPostGUI = new CMaterialLine3DBatcher(false);
+    m_pPrimitive3DBatcherPreGUI = new CPrimitive3DBatcher(true);
+    m_pPrimitive3DBatcherPostGUI = new CPrimitive3DBatcher(false);
+    m_pMaterialPrimitive3DBatcherPreGUI = new CMaterialPrimitive3DBatcher(true, this);
+    m_pMaterialPrimitive3DBatcherPostGUI = new CMaterialPrimitive3DBatcher(false, this);
     m_pPrimitiveBatcher = new CPrimitiveBatcher();
     m_pPrimitiveMaterialBatcher = new CPrimitiveMaterialBatcher(this);
 
@@ -84,6 +90,10 @@ CGraphics::~CGraphics()
     SAFE_DELETE(m_pMaterialLine3DBatcherPostGUI);
     SAFE_DELETE(m_pPrimitiveBatcher);
     SAFE_DELETE(m_pPrimitiveMaterialBatcher);
+    SAFE_DELETE(m_pPrimitive3DBatcherPreGUI);
+    SAFE_DELETE(m_pPrimitive3DBatcherPostGUI);
+    SAFE_DELETE(m_pMaterialPrimitive3DBatcherPreGUI);
+    SAFE_DELETE(m_pMaterialPrimitive3DBatcherPostGUI);
     SAFE_DELETE(m_pScreenGrabber);
     SAFE_DELETE(m_pPixelsManager);
     SAFE_DELETE(m_pAspectRatioConverter);
@@ -855,13 +865,13 @@ void CGraphics::DrawCircleQueued(float fX, float fY, float fRadius, float fStart
     fStartAngle = D3DXToRadian(fStartAngle);
     fStopAngle = D3DXToRadian(fStopAngle);
     // Calculate each segment angle
-    const float kfSegmentAngle = (fStopAngle - fStartAngle) / (siSegments - 1);
+    const float kfSegmentAngle = (fStopAngle - fStartAngle) / siSegments;
 
     // Add center point
     pVecVertices->push_back({fX, fY, 0.0f, ulColorCenter});
 
     // And calculate all other vertices
-    for (short siSeg = 0; siSeg < siSegments; siSeg++)
+    for (short siSeg = 0; siSeg <= siSegments; siSeg++)
     {
         PrimitiveVertice vert;
         float            curAngle = fStartAngle + siSeg * kfSegmentAngle;
@@ -898,6 +908,44 @@ void CGraphics::DrawPrimitiveQueued(std::vector<PrimitiveVertice>* pVecVertices,
     AddQueueItem(Item, bPostGUI);
 }
 
+void CGraphics::DrawPrimitive3DQueued(std::vector<PrimitiveVertice>* pVecVertices, D3DPRIMITIVETYPE eType, bool bPostGUI)
+{
+    // Prevent queuing when minimized
+    if (g_pCore->IsWindowMinimized())
+    {
+        delete pVecVertices;
+        return;
+    }
+
+    // Add it to the queue
+    if (bPostGUI && !CCore::GetSingleton().IsMenuVisible())
+        m_pPrimitive3DBatcherPostGUI->AddPrimitive(eType, pVecVertices);
+    else
+        m_pPrimitive3DBatcherPreGUI->AddPrimitive(eType, pVecVertices);
+}
+
+void CGraphics::DrawMaterialPrimitive3DQueued(std::vector<PrimitiveMaterialVertice>* pVecVertices, D3DPRIMITIVETYPE eType, CMaterialItem* pMaterial, bool bPostGUI)
+{
+    // Prevent queuing when minimized
+    if (g_pCore->IsWindowMinimized())
+    {
+        delete pVecVertices;
+        return;
+    }
+
+    if (CShaderItem* pShaderItem = DynamicCast<CShaderItem>(pMaterial))
+    {
+        // If material is a shader, use its current instance
+        pMaterial = pShaderItem->m_pShaderInstance;
+    }
+
+    // Add it to the queue
+    if (bPostGUI && !CCore::GetSingleton().IsMenuVisible())
+        m_pMaterialPrimitive3DBatcherPostGUI->AddPrimitive(eType, pMaterial, pVecVertices);
+    else
+        m_pMaterialPrimitive3DBatcherPreGUI->AddPrimitive(eType, pMaterial, pVecVertices);
+}
+
 void CGraphics::DrawMaterialPrimitiveQueued(std::vector<PrimitiveMaterialVertice>* pVecVertices, D3DPRIMITIVETYPE eType, CMaterialItem* pMaterial,
                                             bool bPostGUI)
 {
@@ -1437,7 +1485,10 @@ void CGraphics::OnDeviceCreate(IDirect3DDevice9* pDevice)
     m_pMaterialLine3DBatcherPreGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
     m_pMaterialLine3DBatcherPostGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
     m_pPrimitiveBatcher->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
-    m_pPrimitiveMaterialBatcher->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
+    m_pPrimitive3DBatcherPreGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
+    m_pPrimitive3DBatcherPostGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
+    m_pMaterialPrimitive3DBatcherPreGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
+    m_pMaterialPrimitive3DBatcherPostGUI->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
     m_pRenderItemManager->OnDeviceCreate(pDevice, GetViewportWidth(), GetViewportHeight());
     m_pScreenGrabber->OnDeviceCreate(pDevice);
     m_pPixelsManager->OnDeviceCreate(pDevice);
@@ -1513,6 +1564,8 @@ void CGraphics::DrawPostGUIQueue()
     DrawQueue(m_PostGUIQueue);
     m_pLine3DBatcherPostGUI->Flush();
     m_pMaterialLine3DBatcherPostGUI->Flush();
+    m_pPrimitive3DBatcherPostGUI->Flush();
+    m_pMaterialPrimitive3DBatcherPostGUI->Flush();
 
     // Both queues should be empty now, and there should be no outstanding refs
     assert(m_PreGUIQueue.empty() && m_iDebugQueueRefs == 0);
@@ -1524,11 +1577,22 @@ void CGraphics::DrawLine3DPreGUIQueue()
     m_pMaterialLine3DBatcherPreGUI->Flush();
 }
 
-bool CGraphics::HasLine3DPreGUIQueueItems()
+void CGraphics::DrawPrimitive3DPreGUIQueue(void)
+{
+    m_pPrimitive3DBatcherPreGUI->Flush();
+    m_pMaterialPrimitive3DBatcherPreGUI->Flush();
+}
+
+bool CGraphics::HasLine3DPreGUIQueueItems(void)
 {
     return m_pLine3DBatcherPreGUI->HasItems() || m_pMaterialLine3DBatcherPreGUI->HasItems();
 }
 
+bool CGraphics::HasPrimitive3DPreGUIQueueItems(void)
+{
+    return m_pMaterialPrimitive3DBatcherPreGUI->HasItems() || m_pPrimitive3DBatcherPreGUI->HasItems();
+}
+
 void CGraphics::DrawQueue(std::vector<sDrawQueueItem>& Queue)
 {
     BeginDrawBatch();