xrRender/D3DUtils.cpp: replaced D3DPT_TRIANGLEFAN with D3DPT_TRIANGLE…

…STRIP xrRender/r__sector.cpp: removed unnecessary macro usage, it's better to directly use xr_vector.
OpenXRay · Oct 6, 2018 · 94e0a7a · 94e0a7a
1 parent e5d87a1
commit 94e0a7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Layers/xrRender/D3DUtils.cpp b/src/Layers/xrRender/D3DUtils.cpp
@@ -1409,15 +1409,15 @@ void CDrawUtilities::DrawSelectionRect(const Ivector2& m_SelStart, const Ivector
     pv++;
     pv->set(m_SelStart.x * SCREEN_QUALITY, m_SelEnd.y * SCREEN_QUALITY, m_SelectionRect, 0.f, 0.f);
     pv++;
-    pv->set(m_SelEnd.x * SCREEN_QUALITY, m_SelEnd.y * SCREEN_QUALITY, m_SelectionRect, 0.f, 0.f);
-    pv++;
     pv->set(m_SelEnd.x * SCREEN_QUALITY, m_SelStart.y * SCREEN_QUALITY, m_SelectionRect, 0.f, 0.f);
     pv++;
+    pv->set(m_SelEnd.x * SCREEN_QUALITY, m_SelEnd.y * SCREEN_QUALITY, m_SelectionRect, 0.f, 0.f);
+    pv++;
     Stream->Unlock(4, vs_TL->vb_stride);
     // Render it as triangle list
     DU_DRAW_RS(D3DRS_CULLMODE, D3DCULL_NONE);
     DU_DRAW_SH(RImplementation.m_SelectionShader);
-    DU_DRAW_DP(D3DPT_TRIANGLEFAN, vs_TL, vBase, 2);
+    DU_DRAW_DP(D3DPT_TRIANGLESTRIP, vs_TL, vBase, 2);
     DU_DRAW_RS(D3DRS_CULLMODE, D3DCULL_CCW);
 }
 

diff --git a/src/Layers/xrRender/r__sector.cpp b/src/Layers/xrRender/r__sector.cpp
@@ -33,8 +33,7 @@ void CPortal::OnRender()
     {
         VERIFY(poly.size());
         // draw rect
-        DEFINE_VECTOR(FVF::L, LVec, LVecIt);
-        static LVec V;
+        static xr_vector<FVF::L> V;
         V.resize(poly.size() + 2);
         Fvector C = {0, 0, 0};
         for (u32 k = 0; k < poly.size(); k++)