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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.cpp
+8 -6
View File
@@ -83,16 +83,21 @@ namespace AZ
m_entityId = entityId;
m_dirty = true;
RPI::ScenePtr scene = RPI::RPISystemInterface::Get()->GetDefaultScene();
if (scene)
{
AZ::RPI::SceneNotificationBus::Handler::BusConnect(scene->GetId());
}
GridComponentRequestBus::Handler::BusConnect(m_entityId);
AZ::TransformNotificationBus::Handler::BusConnect(m_entityId);
AZ::TickBus::Handler::BusConnect();
}
void GridComponentController::Deactivate()
{
AZ::TickBus::Handler::BusDisconnect();
AZ::TransformNotificationBus::Handler::BusDisconnect();
GridComponentRequestBus::Handler::BusDisconnect();
AZ::RPI::SceneNotificationBus::Handler::BusDisconnect();
m_entityId = EntityId(EntityId::InvalidEntityId);
}
@@ -171,11 +176,8 @@ namespace AZ
return m_configuration.m_secondaryColor;
}
void GridComponentController::OnTick(float deltaTime, AZ::ScriptTimePoint time)
void GridComponentController::OnBeginPrepareRender()
{
AZ_UNUSED(time);
AZ_UNUSED(deltaTime);
auto* auxGeomFP = AZ::RPI::Scene::GetFeatureProcessorForEntity<AZ::RPI::AuxGeomFeatureProcessorInterface>(m_entityId);
if (auto auxGeom = auxGeomFP->GetDrawQueue())
{