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

have AssignmentFactory return a ThreadedAssignment

Browse source
This commit is contained in:
Stephen Birarda 2013-12-03 12:14:24 -08:00
parent bdf9f9eb22
commit 3d14fba7ab
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClient.cpp
View file

@ -85,7 +85,7 @@ void AssignmentClient::readPendingDatagrams() {
qDebug() << "Dropping received assignment since we are currently running one.\n"; qDebug() << "Dropping received assignment since we are currently running one.\n";
} else { } else {
// construct the deployed assignment from the packet data // construct the deployed assignment from the packet data
_currentAssignment = (ThreadedAssignment*) AssignmentFactory::unpackAssignment(packetData, receivedBytes); _currentAssignment = AssignmentFactory::unpackAssignment(packetData, receivedBytes);
qDebug() << "Received an assignment -" << *_currentAssignment << "\n"; qDebug() << "Received an assignment -" << *_currentAssignment << "\n";

4
assignment-client/src/AssignmentFactory.cpp
View file

@ -15,7 +15,7 @@
#include "AssignmentFactory.h" #include "AssignmentFactory.h"
Assignment* AssignmentFactory::unpackAssignment(const unsigned char* dataBuffer, int numBytes) { ThreadedAssignment* AssignmentFactory::unpackAssignment(const unsigned char* dataBuffer, int numBytes) {
int headerBytes = numBytesForPacketHeader(dataBuffer); int headerBytes = numBytesForPacketHeader(dataBuffer);
Assignment::Type assignmentType = Assignment::AllTypes; Assignment::Type assignmentType = Assignment::AllTypes;
@ -31,6 +31,6 @@ Assignment* AssignmentFactory::unpackAssignment(const unsigned char* dataBuffer,
case Assignment::VoxelServerType: case Assignment::VoxelServerType:
return new VoxelServer(dataBuffer, numBytes); return new VoxelServer(dataBuffer, numBytes);
default: default:
return new Assignment(dataBuffer, numBytes); return NULL;
} }
} }

4
assignment-client/src/AssignmentFactory.h
View file

@ -9,11 +9,11 @@
#ifndef __hifi__AssignmentFactory__ #ifndef __hifi__AssignmentFactory__
#define __hifi__AssignmentFactory__ #define __hifi__AssignmentFactory__
#include "Assignment.h" #include <ThreadedAssignment.h>
class AssignmentFactory { class AssignmentFactory {
public: public:
static Assignment* unpackAssignment(const unsigned char* dataBuffer, int numBytes); static ThreadedAssignment* unpackAssignment(const unsigned char* dataBuffer, int numBytes);
}; };
#endif /* defined(__hifi__AssignmentFactory__) */ #endif /* defined(__hifi__AssignmentFactory__) */

3
libraries/voxel-server-library/src/VoxelServer.cpp
View file

@ -692,9 +692,6 @@ void VoxelServer::run() {
} }
HifiSockAddr senderSockAddr; HifiSockAddr senderSockAddr;
unsigned char* packetData = new unsigned char[MAX_PACKET_SIZE];
ssize_t packetLength;
// set up our jurisdiction broadcaster... // set up our jurisdiction broadcaster...
_jurisdictionSender = new JurisdictionSender(_jurisdiction); _jurisdictionSender = new JurisdictionSender(_jurisdiction);