Synchronize changes from 1.6 master branch [ci skip]

e01c2b8 dxDrawModel3D lighting (#3904)

Author: github-actions[bot]

Client/game_sa/CRendererSA.cpp

@@ -15,6 +15,9 @@
 #include "CMatrix.h"
 #include "gamesa_renderware.h"
 
+#define SetLightColoursForPedsCarsAndObjects(fMult) ((RpLight*(__cdecl*)(float))0x735D90)(fMult)
+#define SetAmbientColours() ((RpLight*(__cdecl*)())0x735D30)()
+
 CRendererSA::CRendererSA()
 {
 }
@@ -23,7 +26,7 @@ CRendererSA::~CRendererSA()
 {
 }
 
-void CRendererSA::RenderModel(CModelInfo* pModelInfo, const CMatrix& matrix)
+void CRendererSA::RenderModel(CModelInfo* pModelInfo, const CMatrix& matrix, float lighting)
 {
     CBaseModelInfoSAInterface* pModelInfoSAInterface = pModelInfo->GetInterface();
     if (!pModelInfoSAInterface)
@@ -40,7 +43,10 @@ void CRendererSA::RenderModel(CModelInfo* pModelInfo, const CMatrix& matrix)
     rwMatrix.up = (RwV3d&)matrix.vFront;
     rwMatrix.at = (RwV3d&)matrix.vUp;
     rwMatrix.pos = (RwV3d&)matrix.vPos;
-    RwFrameTransform(pFrame, &rwMatrix, rwCOMBINEREPLACE);    
+    RwFrameTransform(pFrame, &rwMatrix, rwCOMBINEREPLACE);
+
+    // Setup ambient light multiplier
+    SetLightColoursForPedsCarsAndObjects(lighting);
 
     if (pRwObject->type == RP_TYPE_ATOMIC)
     {
@@ -52,4 +58,7 @@ void CRendererSA::RenderModel(CModelInfo* pModelInfo, const CMatrix& matrix)
         RpClump* pClump = reinterpret_cast<RpClump*>(pRwObject);
         RpClumpRender(pClump);
     }
+
+    // Restore ambient light
+    SetAmbientColours();
 }

Client/game_sa/CRendererSA.h

@@ -19,5 +19,5 @@ class CRendererSA : public CRenderer
     CRendererSA();
     ~CRendererSA();
 
-    void RenderModel(CModelInfo* pModelInfo, const CMatrix& matrix) override;
+    void RenderModel(CModelInfo* pModelInfo, const CMatrix& matrix, float lighting) override;
 };

Client/mods/deathmatch/logic/CModelRenderer.cpp

@@ -13,14 +13,14 @@
 #include "game\CRenderer.h"
 #include "game\CVisibilityPlugins.h"
 
-bool CModelRenderer::EnqueueModel(CModelInfo* pModelInfo, const CMatrix& matrix)
+bool CModelRenderer::EnqueueModel(CModelInfo* pModelInfo, const CMatrix& matrix, float lighting)
 {
     if (g_pCore->IsWindowMinimized())
         return false;
 
     if (pModelInfo && pModelInfo->IsLoaded())
     {
-        m_Queue.emplace_back(pModelInfo, matrix);
+        m_Queue.emplace_back(pModelInfo, matrix, lighting);
         return true;
     }
 
@@ -54,7 +54,7 @@ void CModelRenderer::Render()
     for (auto& modelDesc : m_Queue)
     {
         if (modelDesc.pModelInfo->IsLoaded() && !modelDesc.pModelInfo->GetIdeFlag(eModelIdeFlag::DRAW_LAST))
-            pRenderer->RenderModel(modelDesc.pModelInfo, modelDesc.matrix);
+            pRenderer->RenderModel(modelDesc.pModelInfo, modelDesc.matrix, modelDesc.lighting);
     }
 
     m_Queue.clear();
@@ -68,5 +68,5 @@ void CModelRenderer::RenderEntity(SModelToRender* modelDesc, float distance)
     CRenderer* pRenderer = g_pGame->GetRenderer();
     assert(pRenderer);
 
-    pRenderer->RenderModel(modelDesc->pModelInfo, modelDesc->matrix);
+    pRenderer->RenderModel(modelDesc->pModelInfo, modelDesc->matrix, modelDesc->lighting);
 }

Client/mods/deathmatch/logic/CModelRenderer.h

@@ -18,15 +18,17 @@ class CModelRenderer final
     {
         CModelInfo* pModelInfo;
         CMatrix matrix;
+        float lighting;
 
-        SModelToRender(CModelInfo* pModelInfo, const CMatrix& matrix) :
+        SModelToRender(CModelInfo* pModelInfo, const CMatrix& matrix, float lighting = 0.0f) :
             pModelInfo(pModelInfo),
-            matrix(matrix)
+            matrix(matrix),
+            lighting(lighting)
         {
         }
     };
 
-    bool EnqueueModel(CModelInfo* pModelInfo, const CMatrix& matrix);
+    bool EnqueueModel(CModelInfo* pModelInfo, const CMatrix& matrix, float lighting);
 
     void Update();
 

Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp

@@ -2123,7 +2123,7 @@ bool CLuaDrawingDefs::DxDrawWiredSphere(lua_State* const luaVM, const CVector po
     return true;
 }
 
-bool CLuaDrawingDefs::DxDrawModel3D(std::uint32_t modelID, CVector position, CVector rotation, const std::optional<CVector> scale)
+bool CLuaDrawingDefs::DxDrawModel3D(std::uint32_t modelID, CVector position, CVector rotation, const std::optional<CVector> scale, const std::optional<float> lighting)
 {
     CModelInfo* pModelInfo = g_pGame->GetModelInfo(modelID);
     if (!pModelInfo)
@@ -2138,5 +2138,5 @@ bool CLuaDrawingDefs::DxDrawModel3D(std::uint32_t modelID, CVector position, CVe
     ConvertDegreesToRadians(rotation);
 
     return g_pClientGame->GetModelRenderer()->EnqueueModel(pModelInfo,
-        CMatrix{position, rotation, scale.value_or(CVector{1.0f, 1.0f, 1.0f})});
+        CMatrix{position, rotation, scale.value_or(CVector{1.0f, 1.0f, 1.0f})}, lighting.value_or(0.0f));
 }

Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.h

@@ -82,7 +82,7 @@ class CLuaDrawingDefs : public CLuaDefs
     static bool DxDrawWiredSphere(lua_State* const luaVM, const CVector position, const float radius, const std::optional<SColor> color,
                                   const std::optional<float> lineWidth, const std::optional<unsigned int> iterations);
 
-    static bool DxDrawModel3D(std::uint32_t modelID, CVector position, CVector rotation, const std::optional<CVector> scale);
+    static bool DxDrawModel3D(std::uint32_t modelID, CVector position, CVector rotation, const std::optional<CVector> scale, const std::optional<float> lighting);
 
 private:
     static void AddDxMaterialClass(lua_State* luaVM);

Client/sdk/game/CRenderer.h

@@ -19,5 +19,5 @@ class CRenderer
 public:
     virtual ~CRenderer() {}
 
-    virtual void RenderModel(CModelInfo* pModelInfo, const CMatrix& matrix) = 0;
+    virtual void RenderModel(CModelInfo* pModelInfo, const CMatrix& matrix, float lighting) = 0;
 };