History

first cut at renaming Models to Entities

ZappoMan committed 12 years ago

Commit ccc9eab1 parent f7820ce42 files · +1426 −1424Browse files

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

Unified · Split

interface/src/DatagramProcessor.cpp+7−7
@@ -57,15 +57,15 @@ void DatagramProcessor::processDatagrams() { · 56 unmodified lines
57 Particle::handleAddParticleResponse(incomingPacket);57 Particle::handleAddParticleResponse(incomingPacket);
58 application->getParticles()->getTree()->handleAddParticleResponse(incomingPacket);58 application->getParticles()->getTree()->handleAddParticleResponse(incomingPacket);
59 break;59 break;
60 case PacketTypeModelAddResponse:60 case PacketTypeEntityAddResponse:
61 // this will keep creatorTokenIDs to IDs mapped correctly61 // this will keep creatorTokenIDs to IDs mapped correctly
62 ModelItem::handleAddModelResponse(incomingPacket);62 EntityItem::handleAddEntityResponse(incomingPacket);
63 application->getModels()->getTree()->handleAddModelResponse(incomingPacket);63 application->getEntities()->getTree()->handleAddEntityResponse(incomingPacket);
64 break;64 break;
65 case PacketTypeParticleData:65 case PacketTypeParticleData:
66 case PacketTypeParticleErase:66 case PacketTypeParticleErase:
67 case PacketTypeModelData:67 case PacketTypeEntityData:
68 case PacketTypeModelErase:68 case PacketTypeEntityErase:
69 case PacketTypeVoxelData:69 case PacketTypeVoxelData:
70 case PacketTypeVoxelErase:70 case PacketTypeVoxelErase:
71 case PacketTypeOctreeStats:71 case PacketTypeOctreeStats:
@@ -151,8 +151,8 @@ void DatagramProcessor::processDatagrams() { · 79 unmodified lines
151 case PacketTypeParticleEditNack:151 case PacketTypeParticleEditNack:
152 application->_particleEditSender.processNackPacket(incomingPacket);152 application->_particleEditSender.processNackPacket(incomingPacket);
153 break;153 break;
154 case PacketTypeModelEditNack:154 case PacketTypeEntityEditNack:
155 application->_modelEditSender.processNackPacket(incomingPacket);155 application->_entityEditSender.processNackPacket(incomingPacket);
156 break;156 break;
157 default:157 default:
158 nodeList->processNodeData(senderSockAddr, incomingPacket);158 nodeList->processNodeData(senderSockAddr, incomingPacket);