Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixes from review

Browse source
This commit is contained in:
Simon Walton 2019-03-28 17:54:35 -07:00
parent e62270fccf
commit bc7fb10ab9
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -262,7 +262,7 @@ void AvatarMixer::start() {
{ {
if (_dirtyHeroStatus) { if (_dirtyHeroStatus) {
_dirtyHeroStatus = false; _dirtyHeroStatus = false;
nodeList->nestedEach([&](NodeList::const_iterator cbegin, NodeList::const_iterator cend) { nodeList->nestedEach([](NodeList::const_iterator cbegin, NodeList::const_iterator cend) {
std::for_each(cbegin, cend, [](const SharedNodePointer& node) { std::for_each(cbegin, cend, [](const SharedNodePointer& node) {
if (node->getType() == NodeType::Agent) { if (node->getType() == NodeType::Agent) {
NodeData* nodeData = node->getLinkedData(); NodeData* nodeData = node->getLinkedData();
@ -1108,7 +1108,7 @@ void AvatarMixer::entityAdded(EntityItem* entity) {
if (entity->getType() == EntityTypes::Zone) { if (entity->getType() == EntityTypes::Zone) {
_dirtyHeroStatus = true; _dirtyHeroStatus = true;
entity->registerChangeHandler([this](const EntityItemID& entityItemID) { entity->registerChangeHandler([this](const EntityItemID& entityItemID) {
this->entityChange(); entityChange();
}); });
} }
} }

11
assignment-client/src/avatars/AvatarMixer.h
View file

@ -46,6 +46,11 @@ public slots:
void sendStatsPacket() override; void sendStatsPacket() override;
// Avatar zone possibly changed
void entityAdded(EntityItem* entity);
void entityRemoved(EntityItem* entity);
void entityChange();
private slots: private slots:
void queueIncomingPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node); void queueIncomingPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node);
void handleAdjustAvatarSorting(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode); void handleAdjustAvatarSorting(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
@ -147,12 +152,6 @@ private:
AvatarMixerSlavePool _slavePool; AvatarMixerSlavePool _slavePool;
SlaveSharedData _slaveSharedData; SlaveSharedData _slaveSharedData;
public slots:
// Avatar zone possibly changed
void entityAdded(EntityItem* entity);
void entityRemoved(EntityItem* entity);
void entityChange();
}; };
#endif // hifi_AvatarMixer_h #endif // hifi_AvatarMixer_h