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

Address a bit more review feedback

Browse Source 
-Use aznumeric_cast for enum <-> int casts
-Short circuit logic a bit more nicely
This commit is contained in:
nvsickle
2021-05-14 13:01:46 -07:00
parent a8b29bf603
commit 1426052a5f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/ViewportTitleDlg.cpp
+2 -2
View File
@@ -187,8 +187,8 @@ void CViewportTitleDlg::OnToggleDisplayInfo()
state,
&AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState
);
state = static_cast<AZ::AtomBridge::ViewportInfoDisplayState>(
(static_cast<int>(state)+1) % static_cast<int>(AZ::AtomBridge::ViewportInfoDisplayState::Invalid));
state = aznumeric_cast<AZ::AtomBridge::ViewportInfoDisplayState>(
(aznumeric_cast<int>(state)+1) % aznumeric_cast<int>(AZ::AtomBridge::ViewportInfoDisplayState::Invalid));
// SetDisplayState will fire OnViewportInfoDisplayStateChanged and notify us, no need to call UpdateDisplayInfo.
AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
&AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState,
Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
+7 -7
View File
@@ -35,7 +35,7 @@ namespace AZ::Render
// This callback only gets triggered by console commands, so this will not recurse.
AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
&AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState,
static_cast<AtomBridge::ViewportInfoDisplayState>(newDisplayInfoVal)
aznumeric_cast<AtomBridge::ViewportInfoDisplayState>(newDisplayInfoVal)
);
}, AZ::ConsoleFunctorFlags::DontReplicate,
"Toggles debugging information display.\n"
@@ -184,12 +184,12 @@ namespace AZ::Render
AtomBridge::ViewportInfoDisplayState AtomViewportDisplayInfoSystemComponent::GetDisplayState() const
{
return static_cast<AtomBridge::ViewportInfoDisplayState>(r_displayInfo.operator int());
return aznumeric_cast<AtomBridge::ViewportInfoDisplayState>(r_displayInfo.operator int());
}
void AtomViewportDisplayInfoSystemComponent::SetDisplayState(AtomBridge::ViewportInfoDisplayState state)
{
r_displayInfo = static_cast<int>(state);
r_displayInfo = aznumeric_cast<int>(state);
AtomBridge::AtomViewportInfoDisplayNotificationBus::Broadcast(
&AtomBridge::AtomViewportInfoDisplayNotificationBus::Events::OnViewportInfoDisplayStateChanged,
state);
@@ -254,10 +254,10 @@ namespace AZ::Render
if (!m_tickRequests)
{
m_tickRequests = AZ::TickRequestBus::FindFirstHandler();
}
if (!m_tickRequests)
{
return;
if (!m_tickRequests)
{
return;
}
}
AZ::ScriptTimePoint currentTime = m_tickRequests->GetTimeAtCurrentTick();