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

Code/Editor

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-16 15:56:36 -07:00
parent e6b5342c07
commit 2963739288
51 changed files with 286 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
+14 -14
View File
@@ -39,20 +39,20 @@ namespace {
hardMin = desc.m_bHardMin;
hardMax = desc.m_bHardMax;
}
reflectedVar->m_softMinVal = min;
reflectedVar->m_softMaxVal = max;
reflectedVar->m_softMinVal = static_cast<R>(min);
reflectedVar->m_softMaxVal = static_cast<R>(max);
if (hardMin)
{
reflectedVar->m_minVal = min;
reflectedVar->m_minVal = static_cast<R>(min);
}
else
{
reflectedVar->m_minVal = std::numeric_limits<int>::lowest();
reflectedVar->m_minVal = std::numeric_limits<R>::lowest();
}
if (hardMax)
{
reflectedVar->m_maxVal = max;
reflectedVar->m_maxVal = static_cast<R>(max);
}
else
{
@@ -64,9 +64,9 @@ namespace {
../Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp:59:38: error: implicit conversion from 'int' to 'float' changes value from 2147483647 to 2147483648 [-Werror,-Wimplicit-int-float-conversion]
reflectedVar->m_maxVal = std::numeric_limits<int>::max();
*/
reflectedVar->m_maxVal = static_cast<float>(std::numeric_limits<int>::max());
reflectedVar->m_maxVal = static_cast<R>(std::numeric_limits<int>::max());
}
reflectedVar->m_stepSize = step;
reflectedVar->m_stepSize = static_cast<R>(step);
}
}
@@ -95,9 +95,9 @@ void ReflectedVarIntAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
{
int intValue;
pVariable->Get(intValue);
value = intValue;
value = static_cast<float>(intValue);
}
m_reflectedVar->m_value = std::round(value * m_valueMultiplier);
m_reflectedVar->m_value = static_cast<int>(std::round(value * m_valueMultiplier));
}
void ReflectedVarIntAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
@@ -362,14 +362,14 @@ void ReflectedVarColorAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
Vec3 v(0, 0, 0);
pVariable->Get(v);
const QColor col = ColorLinearToGamma(ColorF(v.x, v.y, v.z));
m_reflectedVar->m_color.Set(col.redF(), col.greenF(), col.blueF());
m_reflectedVar->m_color.Set(static_cast<float>(col.redF()), static_cast<float>(col.greenF()), static_cast<float>(col.blueF()));
}
else
{
int col(0);
pVariable->Get(col);
const QColor qcolor = ColorToQColor((uint32)col);
m_reflectedVar->m_color.Set(qcolor.redF(), qcolor.greenF(), qcolor.blueF());
m_reflectedVar->m_color.Set(static_cast<float>(qcolor.redF()), static_cast<float>(qcolor.greenF()), static_cast<float>(qcolor.blueF()));
}
}
@@ -382,9 +382,9 @@ void ReflectedVarColorAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
}
else
{
int ir = m_reflectedVar->m_color.GetX() * 255.0f;
int ig = m_reflectedVar->m_color.GetY() * 255.0f;
int ib = m_reflectedVar->m_color.GetZ() * 255.0f;
int ir = static_cast<int>(m_reflectedVar->m_color.GetX() * 255.0f);
int ig = static_cast<int>(m_reflectedVar->m_color.GetY() * 255.0f);
int ib = static_cast<int>(m_reflectedVar->m_color.GetZ() * 255.0f);
pVariable->Set(static_cast<int>(RGB(ir, ig, ib)));
}