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
5757 Particle::handleAddParticleResponse(incomingPacket);
5858 application->getParticles()->getTree()->handleAddParticleResponse(incomingPacket);
5959 break;
60− case PacketTypeModelAddResponse:
60+ case PacketTypeEntityAddResponse:
6161 // this will keep creatorTokenIDs to IDs mapped correctly
62− ModelItem::handleAddModelResponse(incomingPacket);
63− application->getModels()->getTree()->handleAddModelResponse(incomingPacket);
62+ EntityItem::handleAddEntityResponse(incomingPacket);
63+ application->getEntities()->getTree()->handleAddEntityResponse(incomingPacket);
6464 break;
6565 case PacketTypeParticleData:
6666 case PacketTypeParticleErase:
67− case PacketTypeModelData:
68− case PacketTypeModelErase:
67+ case PacketTypeEntityData:
68+ case PacketTypeEntityErase:
6969 case PacketTypeVoxelData:
7070 case PacketTypeVoxelErase:
7171 case PacketTypeOctreeStats:
@@ -151,8 +151,8 @@ void DatagramProcessor::processDatagrams() { · 79 unmodified lines
151151 case PacketTypeParticleEditNack:
152152 application->_particleEditSender.processNackPacket(incomingPacket);
153153 break;
154− case PacketTypeModelEditNack:
155− application->_modelEditSender.processNackPacket(incomingPacket);
154+ case PacketTypeEntityEditNack:
155+ application->_entityEditSender.processNackPacket(incomingPacket);
156156 break;
157157 default:
158158 nodeList->processNodeData(senderSockAddr, incomingPacket);