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

Others

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-10 21:08:10 -07:00
parent f914f7680a
commit 37663910c1
5 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Objects/DisplayContext.h
+5 -5
View File
@@ -83,12 +83,12 @@ struct SANDBOX_API DisplayContext
// Draw functions
//////////////////////////////////////////////////////////////////////////
//! Set current materialc color.
void SetColor(float r, float g, float b, float a = 1) { m_color4b = ColorB(int(r * 255.0f), int(g * 255.0f), int(b * 255.0f), int(a * 255.0f)); };
void SetColor(const Vec3& color, float a = 1) { m_color4b = ColorB(int(color.x * 255.0f), int(color.y * 255.0f), int(color.z * 255.0f), int(a * 255.0f)); };
void SetColor(const QColor& rgb, float a) { m_color4b = ColorB(rgb.red(), rgb.green(), rgb.blue(), int(a * 255.0f)); };
void SetColor(const QColor& color) { m_color4b = ColorB(color.red(), color.green(), color.blue(), color.alpha()); };
void SetColor(float r, float g, float b, float a = 1) { m_color4b = ColorB(aznumeric_cast<uint8>(r * 255.0f), aznumeric_cast<uint8>(g * 255.0f), aznumeric_cast<uint8>(b * 255.0f), aznumeric_cast<uint8>(a * 255.0f)); };
void SetColor(const Vec3& color, float a = 1) { m_color4b = ColorB(aznumeric_cast<uint8>(color.x * 255.0f), aznumeric_cast<uint8>(color.y * 255.0f), aznumeric_cast<uint8>(color.z * 255.0f), aznumeric_cast<uint8>(a * 255.0f)); };
void SetColor(const QColor& rgb, float a) { m_color4b = ColorB(aznumeric_cast<uint8>(rgb.red()), aznumeric_cast<uint8>(rgb.green()), aznumeric_cast<uint8>(rgb.blue()), aznumeric_cast<uint8>(a * 255.0f)); };
void SetColor(const QColor& color) { m_color4b = ColorB(aznumeric_cast<uint8>(color.red()), aznumeric_cast<uint8>(color.green()), aznumeric_cast<uint8>(color.blue()), aznumeric_cast<uint8>(color.alpha())); };
void SetColor(const ColorB& color) { m_color4b = color; };
void SetAlpha(float a = 1) { m_color4b.a = int(a * 255.0f); };
void SetAlpha(float a = 1) { m_color4b.a = aznumeric_cast<uint8>(a * 255.0f); };
ColorB GetColor() const { return m_color4b; }
void SetSelectedColor(float fAlpha = 1);
Code/Editor/Util/GuidUtil.h
+8 -8
View File
@@ -64,14 +64,14 @@ inline GUID GuidUtil::FromString(const char* guidString)
guid.Data3 = 0;
azsscanf(guidString, "{%8" SCNx32 "-%4hX-%4hX-%2X%2X-%2X%2X%2X%2X%2X%2X}",
&guid.Data1, &guid.Data2, &guid.Data3, &d[0], &d[1], &d[2], &d[3], &d[4], &d[5], &d[6], &d[7]);
guid.Data4[0] = d[0];
guid.Data4[1] = d[1];
guid.Data4[2] = d[2];
guid.Data4[3] = d[3];
guid.Data4[4] = d[4];
guid.Data4[5] = d[5];
guid.Data4[6] = d[6];
guid.Data4[7] = d[7];
guid.Data4[0] = aznumeric_cast<unsigned char>(d[0]);
guid.Data4[1] = aznumeric_cast<unsigned char>(d[1]);
guid.Data4[2] = aznumeric_cast<unsigned char>(d[2]);
guid.Data4[3] = aznumeric_cast<unsigned char>(d[3]);
guid.Data4[4] = aznumeric_cast<unsigned char>(d[4]);
guid.Data4[5] = aznumeric_cast<unsigned char>(d[5]);
guid.Data4[6] = aznumeric_cast<unsigned char>(d[6]);
guid.Data4[7] = aznumeric_cast<unsigned char>(d[7]);
return guid;
}
Code/Editor/Util/Variable.h
+1 -1
View File
@@ -405,7 +405,7 @@ public:
unsigned char GetDataType() const { return m_dataType; };
void SetDataType(unsigned char dataType) { m_dataType = dataType; }
void SetFlags(int flags) { m_flags = flags; }
void SetFlags(int flags) { m_flags = aznumeric_cast<uint16>(flags); }
int GetFlags() const { return m_flags; }
void SetFlagRecursive(EFlags flag) { m_flags |= flag; }