mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-08 23:17:08 +02:00
more work
This commit is contained in:
parent
12f206e2f0
commit
1e0b66a68f
3 changed files with 30 additions and 5 deletions
|
@ -92,8 +92,8 @@ void MessagesMixer::nodeKilled(SharedNodePointer killedNode) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MessagesMixer::handleMessagesPacket(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode) {
|
void MessagesMixer::handleMessagesPacketList(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode) {
|
||||||
qDebug() << "MessagesMixer::handleMessagesPacket()... senderNode:" << senderNode->getUUID();
|
qDebug() << "MessagesMixer::handleMessagesPacketList()... senderNode:" << senderNode->getUUID();
|
||||||
|
|
||||||
auto nodeList = DependencyManager::get<NodeList>();
|
auto nodeList = DependencyManager::get<NodeList>();
|
||||||
//nodeList->updateNodeWithDataFromPacket(packet, senderNode);
|
//nodeList->updateNodeWithDataFromPacket(packet, senderNode);
|
||||||
|
@ -114,6 +114,30 @@ void MessagesMixer::handleMessagesPacket(QSharedPointer<NLPacketList> packetList
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MessagesMixer::handleMessagesPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode) {
|
||||||
|
qDebug() << "MessagesMixer::handleMessagesPacket()... senderNode:" << sendingNode->getUUID();
|
||||||
|
|
||||||
|
/*
|
||||||
|
auto nodeList = DependencyManager::get<NodeList>();
|
||||||
|
//nodeList->updateNodeWithDataFromPacket(packet, senderNode);
|
||||||
|
|
||||||
|
QByteArray data = packetList->getMessage();
|
||||||
|
auto packetType = packetList->getType();
|
||||||
|
|
||||||
|
if (packetType == PacketType::MessagesData) {
|
||||||
|
QString message = QString::fromUtf8(data);
|
||||||
|
qDebug() << "got a messages packet:" << message;
|
||||||
|
|
||||||
|
// this was an avatar we were sending to other people
|
||||||
|
// send a kill packet for it to our other nodes
|
||||||
|
//auto killPacket = NLPacket::create(PacketType::KillAvatar, NUM_BYTES_RFC4122_UUID);
|
||||||
|
//killPacket->write(killedNode->getUUID().toRfc4122());
|
||||||
|
//nodeList->broadcastToNodes(std::move(killPacket), NodeSet() << NodeType::Agent);
|
||||||
|
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
void MessagesMixer::sendStatsPacket() {
|
void MessagesMixer::sendStatsPacket() {
|
||||||
QJsonObject statsObject;
|
QJsonObject statsObject;
|
||||||
statsObject["average_listeners_last_second"] = (float) _sumListeners / (float) _numStatFrames;
|
statsObject["average_listeners_last_second"] = (float) _sumListeners / (float) _numStatFrames;
|
||||||
|
|
|
@ -32,8 +32,9 @@ public slots:
|
||||||
void sendStatsPacket();
|
void sendStatsPacket();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void handleMessagesPacket(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode);
|
void handleMessagesPacketList(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode);
|
||||||
|
void handleMessagesPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void broadcastMessagesData();
|
void broadcastMessagesData();
|
||||||
void parseDomainServerSettings(const QJsonObject& domainSettings);
|
void parseDomainServerSettings(const QJsonObject& domainSettings);
|
||||||
|
|
|
@ -560,7 +560,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
|
||||||
|
|
||||||
// tell the NodeList instance who to tell the domain server we care about
|
// tell the NodeList instance who to tell the domain server we care about
|
||||||
nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
|
nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
|
||||||
<< NodeType::EntityServer << NodeType::AssetServer);
|
<< NodeType::EntityServer << NodeType::AssetServer << NodeType::MessagesMixer);
|
||||||
|
|
||||||
// connect to the packet sent signal of the _entityEditSender
|
// connect to the packet sent signal of the _entityEditSender
|
||||||
connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent);
|
connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent);
|
||||||
|
|
Loading…
Reference in a new issue