History

more work on voxelEctomy

ZappoMan committed 11 years ago

Commit 49d8f2b1 parent 141e23113 files · +5 −81Browse files

Showing the changes to interface/src/DatagramProcessor.cpp (1 of 13 files). Show all

Unified · Split

interface/src/DatagramProcessor.cpp+2−18
@@ -81,31 +81,15 @@ void DatagramProcessor::processDatagrams() { · 80 unmodified lines
81 break;81 break;
82 case PacketTypeEntityData:82 case PacketTypeEntityData:
83 case PacketTypeEntityErase:83 case PacketTypeEntityErase:
84 case PacketTypeVoxelData:
85 case PacketTypeVoxelErase:
86 case PacketTypeOctreeStats:84 case PacketTypeOctreeStats:
87 case PacketTypeEnvironmentData: {85 case PacketTypeEnvironmentData: {
88 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),86 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
89 "Application::networkReceive()... _octreeProcessor.queueReceivedPacket()");87 "Application::networkReceive()... _octreeProcessor.queueReceivedPacket()");
90 bool wantExtraDebugging = application->getLogger()->extraDebugging();88
91 if (wantExtraDebugging && packetTypeForPacket(incomingPacket) == PacketTypeVoxelData) {
92 int numBytesPacketHeader = numBytesForPacketHeader(incomingPacket);
93 unsigned char* dataAt = reinterpret_cast<unsigned char*>(incomingPacket.data()) + numBytesPacketHeader;
94 dataAt += sizeof(OCTREE_PACKET_FLAGS);
95 OCTREE_PACKET_SEQUENCE sequence = (*(OCTREE_PACKET_SEQUENCE*)dataAt);
96 dataAt += sizeof(OCTREE_PACKET_SEQUENCE);
97 OCTREE_PACKET_SENT_TIME sentAt = (*(OCTREE_PACKET_SENT_TIME*)dataAt);
98 dataAt += sizeof(OCTREE_PACKET_SENT_TIME);
99 OCTREE_PACKET_SENT_TIME arrivedAt = usecTimestampNow();
100 int flightTime = arrivedAt - sentAt;
101
102 qDebug("got an Octree data or erase message, sequence:%d flightTime:%d", sequence, flightTime);
103 }
104
105 SharedNodePointer matchedNode = NodeList::getInstance()->sendingNodeForPacket(incomingPacket);89 SharedNodePointer matchedNode = NodeList::getInstance()->sendingNodeForPacket(incomingPacket);
106 90
107 if (matchedNode) {91 if (matchedNode) {
108 // add this packet to our list of voxel packets and process them on the voxel processing92 // add this packet to our list of octree packets and process them on the octree data processing
109 application->_octreeProcessor.queueReceivedPacket(matchedNode, incomingPacket);93 application->_octreeProcessor.queueReceivedPacket(matchedNode, incomingPacket);
110 }94 }
111 95

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t