birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/RenderDll/XRenderD3D9/D3DREImposter.cpp
+1 -6
View File
@@ -267,7 +267,7 @@ bool CREImposter::PrepareForUpdate()
float fRadiusY = vUp.len() / 2 + fabsf(fDerivY);
Vec3 vNearest;
int nCollide = IntersectRayAABB(cam.vOrigin, vEye, m_WorldSpaceBV, vNearest);
IntersectRayAABB(cam.vOrigin, vEye, m_WorldSpaceBV, vNearest);
Vec4 v4Nearest = Vec4(vNearest, 1);
Vec4 v4Far = Vec4(vNearest + vEye * fRadius * 2, 1);
Vec4 v4ZRange = Vec4(0, 0, 0, 0);
@@ -386,7 +386,6 @@ bool CREImposter::PrepareForUpdate()
Matrix44A M;
CRenderObject* pInstObj = rd->m_RP.m_pCurObject;
m_LastViewParameters = cam;
m_vLastSunDir = gEnv->p3DEngine->GetSunDir().GetNormalized();
@@ -652,10 +651,6 @@ bool CREImposter::Display(bool bDisplayFrontOfSplit)
}
if IsCVarConstAccess(constexpr) (CRenderer::CV_r_impostersdraw & 2)
{
CRenderObject* pObj = rd->m_RP.m_pCurObject;
int colR = ((DWORD)((UINT_PTR)pObj) >> 4) & 0xf;
int colG = ((DWORD)((UINT_PTR)pObj) >> 8) & 0xf;
int colB = ((DWORD)((UINT_PTR)pObj) >> 12) & 0xf;
ColorB col = Col_Yellow; //ColorB(colR<<4, colG<<4, colB<<4, 255);
Vec3 v[4];
v[0] = vPos - y - x;