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

More fixes after merge

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-19 09:37:45 -07:00
parent f8e99cd7dd
commit d0238a5977
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp
+2 -2
View File
@@ -791,8 +791,8 @@ namespace AzFramework
AZ_Assert(position, "Expected PositionData2D but found nullptr");
return CursorEvent{ ScreenPoint(
position->m_normalizedPosition.GetX() * windowSize.m_width,
position->m_normalizedPosition.GetY() * windowSize.m_height) };
static_cast<int>(position->m_normalizedPosition.GetX() * windowSize.m_width),
static_cast<int>(position->m_normalizedPosition.GetY() * windowSize.m_height)) };
}
else if (inputChannelId == InputDeviceMouse::Movement::X)
{
Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
+2 -2
View File
@@ -297,8 +297,8 @@ namespace AzToolsFramework
GetInputChannel<AzFramework::InputChannelDeltaWithSharedPosition2D>(AzFramework::InputDeviceMouse::Movement::Z);
systemCursorChannel->ProcessRawInputEvent(m_mouseDevice->m_cursorPositionData2D->m_normalizedPositionDelta.GetLength());
movementXChannel->ProcessRawInputEvent(cursorDelta.x());
movementYChannel->ProcessRawInputEvent(cursorDelta.y());
movementXChannel->ProcessRawInputEvent(static_cast<float>(cursorDelta.x()));
movementYChannel->ProcessRawInputEvent(static_cast<float>(cursorDelta.y()));
mouseWheelChannel->ProcessRawInputEvent(0.0f);
NotifyUpdateChannelIfNotIdle(systemCursorChannel, nullptr);
Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
+3 -3
View File
@@ -326,7 +326,7 @@ namespace AZ
one_over[curLutIndex] = 1.f;
}
int current = 0;
uint32_t current = 0;
for (size_t lutIndex = 0; lutIndex < numLuts; lutIndex++)
{
LutBlendItem& lutBlendItem = settings->GetLutBlendItem(lutIndex);
@@ -378,7 +378,7 @@ namespace AZ
{
// Compute all the weights
// First compute the weight of the ungraded color value
for (int lutIndex = 0; lutIndex < current; lutIndex++)
for (uint32_t lutIndex = 0; lutIndex < current; lutIndex++)
{
float weight = one_intensity[lutIndex] * over[lutIndex];
for (int overrideLutIndex = lutIndex + 1; overrideLutIndex < LookModificationSettings::MaxBlendLuts; overrideLutIndex++)
@@ -388,7 +388,7 @@ namespace AZ
m_weights[0] += weight;
}
// Then compute the weights for the LUTs
for (int weightIndex = 0; weightIndex < current; weightIndex++)
for (uint32_t weightIndex = 0; weightIndex < current; weightIndex++)
{
m_weights[weightIndex + 1] = intensity[weightIndex] * over[weightIndex];
for (int lutIndex = weightIndex + 1; lutIndex < LookModificationSettings::MaxBlendLuts; lutIndex++)