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

One more broken component causing atom tests to crash + some extra PR feedback

Browse Source
This commit is contained in:
karlberg
2021-04-27 16:54:01 -07:00
parent 618d80e738
commit a73d25dfe6
2 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LmbrCentral/Code/Source/Rendering/DecalComponent.cpp
-39
View File
@@ -100,49 +100,10 @@ namespace LmbrCentral
void DecalComponent::Activate()
{
AZ::Transform transform = AZ::Transform::CreateIdentity();
EBUS_EVENT_ID_RESULT(transform, GetEntityId(), AZ::TransformBus, GetWorldTM);
SDecalProperties decalProperties = m_configuration.GetDecalProperties(transform);
m_decalRenderNode = static_cast<IDecalRenderNode*>(gEnv->p3DEngine->CreateRenderNode(eERType_Decal));
if (m_decalRenderNode)
{
m_decalRenderNode->SetRndFlags(m_decalRenderNode->GetRndFlags() | ERF_COMPONENT_ENTITY);
m_decalRenderNode->SetDecalProperties(decalProperties);
m_decalRenderNode->SetMinSpec(static_cast<int>(decalProperties.m_minSpec));
m_decalRenderNode->SetMatrix(AZTransformToLYTransform(transform));
m_decalRenderNode->SetViewDistanceMultiplier(m_configuration.m_viewDistanceMultiplier);
const int configSpec = gEnv->pSystem->GetConfigSpec(true);
if (!m_configuration.m_visible || static_cast<AZ::u32>(configSpec) < static_cast<AZ::u32>(m_configuration.m_minSpec))
{
Hide();
}
}
m_materialBusHandler->Activate(m_decalRenderNode, m_entity->GetId());
DecalComponentRequestBus::Handler::BusConnect(GetEntityId());
RenderNodeRequestBus::Handler::BusConnect(GetEntityId());
AZ::TransformNotificationBus::Handler::BusConnect(GetEntityId());
MaterialOwnerRequestBus::Handler::BusConnect(GetEntityId());
}
void DecalComponent::Deactivate()
{
DecalComponentRequestBus::Handler::BusDisconnect();
RenderNodeRequestBus::Handler::BusDisconnect();
AZ::TransformNotificationBus::Handler::BusDisconnect();
MaterialOwnerRequestBus::Handler::BusDisconnect();
m_materialBusHandler->Deactivate();
if (m_decalRenderNode)
{
gEnv->p3DEngine->DeleteRenderNode(m_decalRenderNode);
m_decalRenderNode = nullptr;
}
}
void DecalComponent::OnTransformChanged([[maybe_unused]] const AZ::Transform& local, const AZ::Transform& world)
Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityRpcMessage.cpp
+2 -2
View File
@@ -98,10 +98,10 @@ namespace Multiplayer
static constexpr uint32_t sizeOfFields = sizeof(RpcDeliveryType)
+ sizeof(NetEntityId)
+ sizeof(NetComponentId)
+ sizeof(uint16_t);
+ sizeof(RpcIndex);
// 2-byte size header + the actual blob payload itself
const uint32_t sizeOfBlob = (m_data != nullptr) ? sizeof(RpcIndex) + m_data->GetSize() : 0;
const uint32_t sizeOfBlob = (m_data != nullptr) ? sizeof(uint16_t) + m_data->GetSize() : 0;
// No sliceId, remote replicator already exists so we don't need to know what type of entity this is
return sizeOfFields + sizeOfBlob;