Metal non-MSAA fixes

This commit is contained in:
Jack Andersen 2018-01-11 15:34:16 -10:00
parent 70f5328974
commit e683fc223f
3 changed files with 4 additions and 4 deletions

View File

@ -588,7 +588,7 @@ zeus::CFrustum CStateManager::SetupViewForDraw(const SViewport& vp) const
//int vpTop = (vp.xc_height - vpHeight) / 2 + vp.x4_top; //int vpTop = (vp.xc_height - vpHeight) / 2 + vp.x4_top;
//g_Renderer->SetViewport(vpLeft, vpTop, vpWidth, vpHeight); //g_Renderer->SetViewport(vpLeft, vpTop, vpWidth, vpHeight);
CGraphics::SetDepthRange(DEPTH_WORLD, DEPTH_FAR); CGraphics::SetDepthRange(DEPTH_WORLD, DEPTH_FAR);
float fov = std::atan(std::tan(zeus::degToRad(cam->GetFov()) * 0.5f) * (1.f / xf2c_viewportScale.y) * 2.f); float fov = std::atan(std::tan(zeus::degToRad(cam->GetFov()) * 0.5f) * xf2c_viewportScale.y * 2.f);
float width = xf2c_viewportScale.x * vp.x8_width; float width = xf2c_viewportScale.x * vp.x8_width;
float height = xf2c_viewportScale.y * vp.xc_height; float height = xf2c_viewportScale.y * vp.xc_height;
g_Renderer->SetPerspective(zeus::radToDeg(fov), width, height, g_Renderer->SetPerspective(zeus::radToDeg(fov), width, height,

View File

@ -556,8 +556,8 @@ void CPlayerVisor::BeginTransitionIn(const CStateManager&)
{ {
case CPlayerState::EPlayerVisor::XRay: case CPlayerState::EPlayerVisor::XRay:
x90_xrayBlur.SetBlur(EBlurType::Xray, 0.f, 0.f); x90_xrayBlur.SetBlur(EBlurType::Xray, 0.f, 0.f);
xc4_vpScaleX = 0.95f; xc4_vpScaleX = 0.9f;
xc8_vpScaleY = 0.95f; xc8_vpScaleY = 0.9f;
CSfxManager::SfxStart(1383, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId); CSfxManager::SfxStart(1383, x24_visorSfxVol, 0.f, false, 0x7f, false, kInvalidAreaId);
break; break;
case CPlayerState::EPlayerVisor::Scan: case CPlayerState::EPlayerVisor::Scan:

2
hecl

@ -1 +1 @@
Subproject commit fcbd33141ce6f649d8597187d1495a2e79f36610 Subproject commit 4347e83abb61f8036406a7783836b7a3f8139309