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

Merge branch 'main' into cgalvan/EntityHelperRefactor

Browse Source
This commit is contained in:
Chris Galvan
2021-04-19 13:18:27 -05:00
parent 06d6ab9715 dc7cc77be6
commit 7f169855f3
1385 changed files with 16306 additions and 25761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
+1 -38
View File
@@ -438,45 +438,8 @@ void CComponentEntityObject::OnEntityIconChanged(const AZ::Data::AssetId& entity
SetupEntityIcon();
}
void CComponentEntityObject::OnParentChanged([[maybe_unused]] AZ::EntityId oldParent, AZ::EntityId newParent)
void CComponentEntityObject::OnParentChanged([[maybe_unused]] AZ::EntityId oldParent, [[maybe_unused]] AZ::EntityId newParent)
{
return;
if (m_parentingReentryGuard) // Ignore if action originated from Sandbox.
{
EditorActionScope parentChange(m_parentingReentryGuard);
CComponentEntityObject* currentParent = static_cast<CComponentEntityObject*>(GetParent());
if (!currentParent && !newParent.IsValid())
{
// No change in parent.
return;
}
if (currentParent && currentParent->GetAssociatedEntityId() == newParent)
{
// No change in parent.
return;
}
DetachThis();
if (newParent.IsValid())
{
CComponentEntityObject* componentEntity = CComponentEntityObject::FindObjectForEntity(newParent);
if (componentEntity)
{
// The action is originating from Sandbox, so ignore the return events.
EditorActionScope transformChange(m_transformReentryGuard);
componentEntity->AttachChild(this);
}
}
InvalidateTM(0);
}
}
void CComponentEntityObject::OnMeshCreated(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
-20
View File
@@ -2785,26 +2785,6 @@ AZ::u32 SandboxIntegrationManager::SetState(AZ::u32 state)
return 0;
}
AZ::u32 SandboxIntegrationManager::SetStateFlag(AZ::u32 state)
{
if (m_dc)
{
return m_dc->SetStateFlag(state);
}
return 0;
}
AZ::u32 SandboxIntegrationManager::ClearStateFlag(AZ::u32 state)
{
if (m_dc)
{
return m_dc->ClearStateFlag(state);
}
return 0;
}
void SandboxIntegrationManager::PushMatrix(const AZ::Transform& tm)
{
if (m_dc)
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
-2
View File
@@ -268,8 +268,6 @@ private:
bool SetDrawInFrontMode(bool bOn) override;
AZ::u32 GetState() override;
AZ::u32 SetState(AZ::u32 state) override;
AZ::u32 SetStateFlag(AZ::u32 state) override;
AZ::u32 ClearStateFlag(AZ::u32 state) override;
void PushMatrix(const AZ::Transform& tm) override;
void PopMatrix() override;