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

Merge remote-tracking branch 'upstream/main' into MoveDebugDisplayGlobalID

Browse Source
This commit is contained in:
rgba16f
2021-05-04 14:40:31 -05:00
parent 593528532f 6988843d89
commit 1c1a9aeab4
484 changed files with 10665 additions and 27293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
-55
View File
@@ -46,9 +46,7 @@
#include <LmbrCentral/Rendering/MaterialOwnerBus.h>
#include <IDisplayViewport.h>
#include <Material/MaterialManager.h>
#include <MathConversion.h>
#include <Objects/StatObjValidator.h>
#include <TrackView/TrackViewAnimNode.h>
#include <ViewManager.h>
#include <Viewport.h>
@@ -1096,56 +1094,3 @@ void CComponentEntityObject::DrawAccent(DisplayContext& dc)
dc.DrawWireBox(box.min, box.max);
}
}
void CComponentEntityObject::SetMaterial(CMaterial* material)
{
AZ::Entity* entity = nullptr;
EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityId);
if (entity)
{
if (material)
{
EBUS_EVENT_ID(m_entityId, LmbrCentral::MaterialOwnerRequestBus, SetMaterial, material->GetMatInfo());
}
else
{
EBUS_EVENT_ID(m_entityId, LmbrCentral::MaterialOwnerRequestBus, SetMaterial, nullptr);
}
}
ValidateMeshStatObject();
}
CMaterial* CComponentEntityObject::GetMaterial() const
{
_smart_ptr<IMaterial> material = nullptr;
EBUS_EVENT_ID_RESULT(material, m_entityId, LmbrCentral::MaterialOwnerRequestBus, GetMaterial);
return GetIEditor()->GetMaterialManager()->FromIMaterial(material);
}
CMaterial* CComponentEntityObject::GetRenderMaterial() const
{
AZ::Entity* entity = nullptr;
EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityId);
if (entity)
{
_smart_ptr<IMaterial> material = nullptr;
EBUS_EVENT_ID_RESULT(material, m_entityId, LmbrCentral::MaterialOwnerRequestBus, GetMaterial);
if (material)
{
return GetIEditor()->GetMaterialManager()->LoadMaterial(material->GetName(), false);
}
}
return nullptr;
}
void CComponentEntityObject::ValidateMeshStatObject()
{
IStatObj* statObj = GetIStatObj();
CMaterial* editorMaterial = GetMaterial();
CStatObjValidator statValidator;
statValidator.Validate(statObj, editorMaterial);
}