Removed collision mesh aabb color from render option
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
This commit is contained in:
Benjamin Jillich
-23
@@ -55,7 +55,6 @@ namespace EMStudio
|
||||
const char* RenderOptions::s_nodeAABBColorOptionName = "nodeAABBColor";
|
||||
const char* RenderOptions::s_staticAABBColorOptionName = "staticAABBColor";
|
||||
const char* RenderOptions::s_meshAABBColorOptionName = "meshAABBColor";
|
||||
const char* RenderOptions::s_collisionMeshAABBColorOptionName = "collisionMeshAABBColor";
|
||||
const char* RenderOptions::s_OBBsColorOptionName = "OBBsColor";
|
||||
const char* RenderOptions::s_lineSkeletonColorOptionName = "lineSkeletonColor_v2";
|
||||
const char* RenderOptions::s_skeletonColorOptionName = "skeletonColor";
|
||||
@@ -108,7 +107,6 @@ namespace EMStudio
|
||||
, m_nodeAABBColor(1.0f, 0.0f, 0.0f, 1.0f)
|
||||
, m_staticAABBColor(0.0f, 0.7f, 0.7f, 1.0f)
|
||||
, m_meshAABBColor(0.0f, 0.0f, 0.7f, 1.0f)
|
||||
, m_collisionMeshAABBColor(0.0f, 0.7f, 0.0f, 1.0f)
|
||||
, m_OBBsColor(1.0f, 1.0f, 0.0f, 1.0f)
|
||||
, m_lineSkeletonColor(0.33333f, 1.0f, 0.0f, 1.0f)
|
||||
, m_skeletonColor(0.19f, 0.58f, 0.19f, 1.0f)
|
||||
@@ -169,7 +167,6 @@ namespace EMStudio
|
||||
SetNodeAABBColor(other.GetNodeAABBColor());
|
||||
SetStaticAABBColor(other.GetStaticAABBColor());
|
||||
SetMeshAABBColor(other.GetMeshAABBColor());
|
||||
SetCollisionMeshAABBColor(other.GetCollisionMeshAABBColor());
|
||||
SetOBBsColor(other.GetOBBsColor());
|
||||
SetLineSkeletonColor(other.GetLineSkeletonColor());
|
||||
SetSkeletonColor(other.GetSkeletonColor());
|
||||
@@ -206,7 +203,6 @@ namespace EMStudio
|
||||
settings->setValue(s_nodeAABBColorOptionName, ColorToString(m_nodeAABBColor));
|
||||
settings->setValue(s_staticAABBColorOptionName, ColorToString(m_staticAABBColor));
|
||||
settings->setValue(s_meshAABBColorOptionName, ColorToString(m_meshAABBColor));
|
||||
settings->setValue(s_collisionMeshAABBColorOptionName, ColorToString(m_collisionMeshAABBColor));
|
||||
settings->setValue(s_collisionMeshColorOptionName, ColorToString(m_collisionMeshColor));
|
||||
settings->setValue(s_OBBsColorOptionName, ColorToString(m_OBBsColor));
|
||||
settings->setValue(s_lineSkeletonColorOptionName, ColorToString(m_lineSkeletonColor));
|
||||
@@ -275,7 +271,6 @@ namespace EMStudio
|
||||
options.m_nodeAABBColor = StringToColor(settings->value(s_nodeAABBColorOptionName, ColorToString(options.m_nodeAABBColor)).toString());
|
||||
options.m_staticAABBColor = StringToColor(settings->value(s_staticAABBColorOptionName, ColorToString(options.m_staticAABBColor)).toString());
|
||||
options.m_meshAABBColor = StringToColor(settings->value(s_meshAABBColorOptionName, ColorToString(options.m_meshAABBColor)).toString());
|
||||
options.m_collisionMeshAABBColor = StringToColor(settings->value(s_collisionMeshAABBColorOptionName, ColorToString(options.m_collisionMeshAABBColor)).toString());
|
||||
options.m_collisionMeshColor = StringToColor(settings->value(s_collisionMeshColorOptionName, ColorToString(options.m_collisionMeshColor)).toString());
|
||||
options.m_OBBsColor = StringToColor(settings->value(s_OBBsColorOptionName, ColorToString(options.m_OBBsColor)).toString());
|
||||
options.m_lineSkeletonColor = StringToColor(settings->value(s_lineSkeletonColorOptionName, ColorToString(options.m_lineSkeletonColor)).toString());
|
||||
@@ -393,7 +388,6 @@ namespace EMStudio
|
||||
->Field(s_nodeAABBColorOptionName, &RenderOptions::m_nodeAABBColor)
|
||||
->Field(s_staticAABBColorOptionName, &RenderOptions::m_staticAABBColor)
|
||||
->Field(s_meshAABBColorOptionName, &RenderOptions::m_meshAABBColor)
|
||||
->Field(s_collisionMeshAABBColorOptionName, &RenderOptions::m_collisionMeshAABBColor)
|
||||
->Field(s_OBBsColorOptionName, &RenderOptions::m_OBBsColor)
|
||||
->Field(s_lineSkeletonColorOptionName, &RenderOptions::m_lineSkeletonColor)
|
||||
->Field(s_skeletonColorOptionName, &RenderOptions::m_skeletonColor)
|
||||
@@ -552,9 +546,6 @@ namespace EMStudio
|
||||
->DataElement(AZ::Edit::UIHandlers::Default, &RenderOptions::m_meshAABBColor, "Mesh based AABB color",
|
||||
"Color for the runtime-updated AABB calculated based on the deformed meshes.")
|
||||
->Attribute(AZ::Edit::Attributes::ChangeNotify, &RenderOptions::OnMeshAABBColorChangedCallback)
|
||||
->DataElement(AZ::Edit::UIHandlers::Default, &RenderOptions::m_collisionMeshAABBColor, "CollisionMesh based AABB color",
|
||||
"Color for the runtime-updated AABB calculated based on the deformed collision meshes.")
|
||||
->Attribute(AZ::Edit::Attributes::ChangeNotify, &RenderOptions::OnCollisionMeshAABBColorChangedCallback)
|
||||
->DataElement(AZ::Edit::UIHandlers::Default, &RenderOptions::m_OBBsColor, "Joint OBB color",
|
||||
"Color used for the pre-calculated joint oriented bounding boxes.")
|
||||
->Attribute(AZ::Edit::Attributes::ChangeNotify, &RenderOptions::OnOBBsColorChangedCallback)
|
||||
@@ -903,15 +894,6 @@ namespace EMStudio
|
||||
}
|
||||
}
|
||||
|
||||
void RenderOptions::SetCollisionMeshAABBColor(const AZ::Color& collisionMeshAABBColor)
|
||||
{
|
||||
if (!collisionMeshAABBColor.IsClose(m_collisionMeshAABBColor))
|
||||
{
|
||||
m_collisionMeshAABBColor = collisionMeshAABBColor;
|
||||
OnCollisionMeshAABBColorChangedCallback();
|
||||
}
|
||||
}
|
||||
|
||||
void RenderOptions::SetOBBsColor(const AZ::Color& OBBsColor)
|
||||
{
|
||||
if (!OBBsColor.IsClose(m_OBBsColor))
|
||||
@@ -1258,11 +1240,6 @@ namespace EMStudio
|
||||
PluginOptionsNotificationsBus::Event(s_meshAABBColorOptionName, &PluginOptionsNotificationsBus::Events::OnOptionChanged, s_meshAABBColorOptionName);
|
||||
}
|
||||
|
||||
void RenderOptions::OnCollisionMeshAABBColorChangedCallback() const
|
||||
{
|
||||
PluginOptionsNotificationsBus::Event(s_collisionMeshAABBColorOptionName, &PluginOptionsNotificationsBus::Events::OnOptionChanged, s_collisionMeshAABBColorOptionName);
|
||||
}
|
||||
|
||||
void RenderOptions::OnOBBsColorChangedCallback() const
|
||||
{
|
||||
PluginOptionsNotificationsBus::Event(s_OBBsColorOptionName, &PluginOptionsNotificationsBus::Events::OnOptionChanged, s_OBBsColorOptionName);
|
||||
|
||||
-6
@@ -59,7 +59,6 @@ namespace EMStudio
|
||||
static const char* s_nodeAABBColorOptionName;
|
||||
static const char* s_staticAABBColorOptionName;
|
||||
static const char* s_meshAABBColorOptionName;
|
||||
static const char* s_collisionMeshAABBColorOptionName;
|
||||
static const char* s_OBBsColorOptionName;
|
||||
static const char* s_lineSkeletonColorOptionName;
|
||||
static const char* s_skeletonColorOptionName;
|
||||
@@ -191,9 +190,6 @@ namespace EMStudio
|
||||
AZ::Color GetMeshAABBColor() const { return m_meshAABBColor; }
|
||||
void SetMeshAABBColor(const AZ::Color& meshAABBColor);
|
||||
|
||||
AZ::Color GetCollisionMeshAABBColor() const { return m_collisionMeshAABBColor; }
|
||||
void SetCollisionMeshAABBColor(const AZ::Color& collisionMeshAABBColor);
|
||||
|
||||
AZ::Color GetOBBsColor() const { return m_OBBsColor; }
|
||||
void SetOBBsColor(const AZ::Color& OBBsColor);
|
||||
|
||||
@@ -303,7 +299,6 @@ namespace EMStudio
|
||||
void OnNodeAABBColorChangedCallback() const;
|
||||
void OnStaticAABBColorChangedCallback() const;
|
||||
void OnMeshAABBColorChangedCallback() const;
|
||||
void OnCollisionMeshAABBColorChangedCallback() const;
|
||||
void OnOBBsColorChangedCallback() const;
|
||||
void OnLineSkeletonColorChangedCallback() const;
|
||||
void OnSkeletonColorChangedCallback() const;
|
||||
@@ -361,7 +356,6 @@ namespace EMStudio
|
||||
AZ::Color m_nodeAABBColor;
|
||||
AZ::Color m_staticAABBColor;
|
||||
AZ::Color m_meshAABBColor;
|
||||
AZ::Color m_collisionMeshAABBColor;
|
||||
AZ::Color m_OBBsColor;
|
||||
AZ::Color m_lineSkeletonColor;
|
||||
AZ::Color m_skeletonColor;
|
||||
|
||||
Reference in New Issue
Block a user