more fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 10:09:44 -07:00
parent cf6c7c4d8d
commit a35464ca08
43 changed files with 28 additions and 134 deletions
@@ -86,7 +86,7 @@ namespace AZ::AtomBridge
context.second->SetOutputScope(pipeline.get());
}
});
viewportData.m_viewportDestroyedHandler = AZ::Event<AzFramework::ViewportId>::Handler([this, viewportId](AzFramework::ViewportId id)
viewportData.m_viewportDestroyedHandler = AZ::Event<AzFramework::ViewportId>::Handler([this](AzFramework::ViewportId id)
{
AZStd::lock_guard lock(m_mutexDrawContexts);
m_viewportData.erase(id);
@@ -136,7 +136,6 @@ namespace AZ
FontMap m_fonts;
FontFamilyMap m_fontFamilies; //!< Map font family names to weak ptrs so we can construct shared_ptrs but not keep a ref ourselves.
FontFamilyReverseLookupMap m_fontFamilyReverseLookup; //<! FontFamily pointer reverse-lookup for quick removal
ISystem* m_system;
AzFramework::FontDrawInterface* m_defaultFontDrawInterface = nullptr;
@@ -327,12 +327,9 @@ namespace
}
AZ::AtomFont::AtomFont(ISystem* system)
: m_system(system)
, m_fonts()
AZ::AtomFont::AtomFont([[maybe_unused]] ISystem* system)
: m_fonts()
{
assert(m_system);
CryLogAlways("Using FreeType %d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
// Persist fonts for application lifetime to prevent unnecessary work
@@ -211,7 +211,6 @@ namespace AZ::Render
return;
}
auto viewportSize = viewportContext->GetViewportSize();
AzFramework::CameraState cameraState;
AzFramework::SetCameraClippingVolumeFromPerspectiveFovMatrixRH(cameraState, currentView->GetViewToClipMatrix());
const AZ::Transform transform = currentView->GetCameraTransform();