Merge pull request #339 from birarda/no-copy

remove ability to copy AgentData and subclasses

eve/src/main.cpp

@@ -93,7 +93,7 @@ int main(int argc, const char* argv[]) {
     pthread_create(&receiveAgentDataThread, NULL, receiveAgentData, NULL);
     
     // create an AvatarData object, "eve"
-    AvatarData eve = AvatarData();
+    AvatarData eve;
     
     // move eve away from the origin
     // pick a random point inside a 10x10 grid

interface/src/Application.cpp

@@ -786,14 +786,14 @@ void Application::idle() {
         if (_myAvatar.isTransmitterV2Connected()) {
             const float HAND_FORCE_SCALING = 0.05f;
             const float* handAcceleration = _myAvatar.getTransmitterHandLastAcceleration();
-            _myAvatar.setHandMovementValues(glm::vec3(-handAcceleration[0] * HAND_FORCE_SCALING,
+            _myAvatar.setMovedHandOffset(glm::vec3(-handAcceleration[0] * HAND_FORCE_SCALING,
                                                        handAcceleration[1] * HAND_FORCE_SCALING,
                                                        handAcceleration[2] * HAND_FORCE_SCALING));
         } else {
             // update behaviors for avatar hand movement: handControl takes mouse values as input,
             // and gives back 3D values modulated for smooth transitioning between interaction modes.
             _handControl.update(_mouseX, _mouseY);
-            _myAvatar.setHandMovementValues(_handControl.getValues());
+            _myAvatar.setMovedHandOffset(_handControl.getValues());
         }
         
         // tell my avatar if the mouse is being pressed...

interface/src/Avatar.cpp

@@ -58,7 +58,6 @@ bool usingBigSphereCollisionTest = true;
 float chatMessageScale = 0.0015;
 float chatMessageHeight = 0.45;
 
-
 Avatar::Avatar(bool isMine) {
     _orientation.setToIdentity();
     
@@ -107,49 +106,6 @@ Avatar::Avatar(bool isMine) {
     else            { _balls = NULL; }
 }
 
-Avatar::Avatar(const Avatar &otherAvatar) : _head(otherAvatar._head) { //include the copy constructor for head
-
-    _velocity                    = otherAvatar._velocity;
-    _thrust                      = otherAvatar._thrust;
-    _rotation                    = otherAvatar._rotation;
-    _bodyYaw                     = otherAvatar._bodyYaw;
-    _bodyPitch                   = otherAvatar._bodyPitch;
-    _bodyRoll                    = otherAvatar._bodyRoll;
-    _bodyPitchDelta              = otherAvatar._bodyPitchDelta;
-    _bodyYawDelta                = otherAvatar._bodyYawDelta;
-    _bodyRollDelta               = otherAvatar._bodyRollDelta;
-    _mousePressed                = otherAvatar._mousePressed;
-    _mode                        = otherAvatar._mode;
-    _isMine                      = otherAvatar._isMine;
-    _renderYaw                   = otherAvatar._renderYaw;
-    _maxArmLength                = otherAvatar._maxArmLength;
-    _transmitterTimer            = otherAvatar._transmitterTimer;
-    _transmitterIsFirstData      = otherAvatar._transmitterIsFirstData;
-    _transmitterTimeLastReceived = otherAvatar._transmitterTimeLastReceived;
-    _transmitterHz               = otherAvatar._transmitterHz;
-    _transmitterInitialReading   = otherAvatar._transmitterInitialReading;
-    _transmitterPackets          = otherAvatar._transmitterPackets;
-    _isTransmitterV2Connected    = otherAvatar._isTransmitterV2Connected;
-    _TEST_bigSphereRadius        = otherAvatar._TEST_bigSphereRadius;
-    _TEST_bigSpherePosition      = otherAvatar._TEST_bigSpherePosition;
-    _movedHandOffset             = otherAvatar._movedHandOffset;
-    
-    _orientation.set(otherAvatar._orientation);
-    
-    initializeSkeleton();
-    
-    for (int i = 0; i < MAX_DRIVE_KEYS; i++) _driveKeys[i] = otherAvatar._driveKeys[i];
-    
-    _distanceToNearestAvatar = otherAvatar._distanceToNearestAvatar;
-    
-    initializeSkeleton();
-
-}
-
-Avatar* Avatar::clone() const {
-    return new Avatar(*this);
-}
-
 void Avatar::reset() {
     _headPitch = _headYaw = _headRoll = 0;
     _head.leanForward = _head.leanSideways = 0;
@@ -460,8 +416,6 @@ void Avatar::simulate(float deltaTime) {
 	}
 }
 
-
-
 void Avatar::checkForMouseRayTouching() {
 
     for (int b = 0; b < NUM_AVATAR_JOINTS; b++) {
@@ -477,13 +431,10 @@ void Avatar::checkForMouseRayTouching() {
     }
 }
 
-
 void Avatar::setMouseRay(const glm::vec3 &origin, const glm::vec3 &direction ) {
     _mouseRayOrigin = origin; _mouseRayDirection = direction;    
 }
 
-
-
 void Avatar::updateHandMovementAndTouching(float deltaTime) {
 
     // reset hand and arm positions according to hand movement
@@ -600,12 +551,6 @@ void Avatar::updateHandMovementAndTouching(float deltaTime) {
     }
 }
 
-
-float Avatar::getHeight() {
-    return _height;
-}
-
-
 void Avatar::updateCollisionWithSphere(glm::vec3 position, float radius, float deltaTime) {
     float myBodyApproximateBoundingRadius = 1.0f;
     glm::vec3 vectorFromMyBodyToBigSphere(_position - position);
@@ -644,9 +589,6 @@ void Avatar::updateCollisionWithSphere(glm::vec3 position, float radius, float d
     }
 }
 
-
-
-
 void Avatar::updateAvatarCollisions(float deltaTime) {
         
     //  Reset detector for nearest avatar
@@ -677,9 +619,6 @@ void Avatar::updateAvatarCollisions(float deltaTime) {
     }
 }
 
-
-
-
 //detect collisions with other avatars and respond
 void Avatar::applyCollisionWithOtherAvatar(Avatar * otherAvatar, float deltaTime) {
         
@@ -735,8 +674,6 @@ void Avatar::applyCollisionWithOtherAvatar(Avatar * otherAvatar, float deltaTime
     otherAvatar->_velocity *= bodyMomentum;        
 }
 
-
-
 void Avatar::setDisplayingHead(bool displayingHead) {
     _displayingHead = displayingHead;
 }
@@ -839,16 +776,6 @@ void Avatar::render(bool lookingInMirror, glm::vec3 cameraPosition) {
     }
 }
 
-
-
-void Avatar::setHandMovementValues(glm::vec3 handOffset) {
-	_movedHandOffset = handOffset;
-}
-
-AvatarMode Avatar::getMode() {
-	return _mode;
-}
-
 void Avatar::initializeSkeleton() {
     
 	for (int b=0; b<NUM_AVATAR_JOINTS; b++) {
@@ -1131,14 +1058,10 @@ const glm::vec3& Avatar::getHeadPosition() const {
     return _joint[ AVATAR_JOINT_HEAD_BASE ].position;
 }
 
-
 glm::vec3 Avatar::getApproximateEyePosition() {
     return _head.getApproximateEyePosition();
 }
 
-
-
-
 void Avatar::updateArmIKAndConstraints(float deltaTime) {
     
     // determine the arm vector
@@ -1389,7 +1312,6 @@ void Avatar::transmitterV2RenderLevels(int width, int height) {
     glEnd();
 }
 
-
 void Avatar::setHeadFromGyros(glm::vec3* eulerAngles, glm::vec3* angularVelocity, float deltaTime, float smoothingTime) {
     //
     //  Given absolute position and angular velocity information, update the avatar's head angles
@@ -1428,8 +1350,6 @@ void Avatar::setHeadFromGyros(glm::vec3* eulerAngles, glm::vec3* angularVelocity
     }
 }
 
-
-
 const char AVATAR_DATA_FILENAME[] = "avatar.ifd";
 
 void Avatar::writeAvatarDataToFile() {
@@ -1457,5 +1377,4 @@ void Avatar::readAvatarDataFromFile() {
         }
         fclose(avatarFile);
     }
-}
+}
-

interface/src/Avatar.h

@@ -76,9 +76,7 @@ enum AvatarJointID
 class Avatar : public AvatarData {
 public:
     Avatar(bool isMine);
-    Avatar(const Avatar &otherAvatar);
+    
-    Avatar* clone() const;
-
     void  reset();
     void  updateHeadFromGyros(float frametime, SerialInterface * serialInterface, glm::vec3 * gravity);
     void  updateFromMouse(int mouseX, int mouseY, int screenWidth, int screenHeight);
@@ -101,18 +99,18 @@ public:
     const glm::vec3& getSpringyHeadPosition() const ;   // get the springy position of the avatar's head
     const glm::vec3& getJointPosition(AvatarJointID j) const { return _joint[j].springyPosition; }; 
     const glm::vec3& getBodyUpDirection() const { return _orientation.getUp(); };
-    float getSpeed() const { return _speed; };
+    float getSpeed() const { return _speed; }
     const glm::vec3& getVelocity() const { return _velocity; };
     float getGirth();
-    float getHeight();
+    float getHeight() const { return _height; }
     
-    AvatarMode getMode();
+    AvatarMode getMode() const { return _mode; }
     
     void setMousePressed(bool pressed); 
     void render(bool lookingInMirror, glm::vec3 cameraPosition);
     void renderBody(bool lookingInMirror);
     void simulate(float);
-    void setHandMovementValues( glm::vec3 movement );
+    void setMovedHandOffset(glm::vec3 movedHandOffset) { _movedHandOffset = movedHandOffset; }
     void updateArmIKAndConstraints( float deltaTime );
     void setDisplayingHead( bool displayingHead );
     
@@ -139,6 +137,9 @@ public:
     void readAvatarDataFromFile();
 
 private:
+    // privatize copy constructor and assignment operator to avoid copying
+    Avatar(const Avatar&);
+    Avatar& operator= (const Avatar&);
 
     struct AvatarJoint
     {

interface/src/VoxelSystem.cpp

@@ -417,11 +417,6 @@ int VoxelSystem::updateNodeInArraysAsPartialVBO(VoxelNode* node) {
     return 0; // not-updated
 }
 
-VoxelSystem* VoxelSystem::clone() const {
-    // this still needs to be implemented, will need to be used if VoxelSystem is attached to agent
-    return NULL;
-}
-
 void VoxelSystem::init() {
 
     _renderWarningsOn = false;

interface/src/VoxelSystem.h

@@ -31,7 +31,6 @@ public:
     ~VoxelSystem();
 
     int parseData(unsigned char* sourceBuffer, int numBytes);
-    VoxelSystem* clone() const;
     
     void setViewFrustum(ViewFrustum* viewFrustum) { _viewFrustum = viewFrustum; };
 
@@ -82,6 +81,10 @@ public:
                       creationMode mode, bool destructive = false, bool debug = false);
     
 private:
+    // disallow copying of VoxelSystem objects
+    VoxelSystem(const VoxelSystem&);
+    VoxelSystem& operator= (const VoxelSystem&);
+    
     int  _callsToTreesToArrays;
     VoxelNodeBag _removedVoxels;
 

libraries/audio/src/AudioRingBuffer.cpp

@@ -24,28 +24,10 @@ AudioRingBuffer::AudioRingBuffer(int ringSamples, int bufferSamples) :
     _nextOutput = _buffer;
 };
 
-AudioRingBuffer::AudioRingBuffer(const AudioRingBuffer &otherRingBuffer) {
-    _ringBufferLengthSamples = otherRingBuffer._ringBufferLengthSamples;
-    _bufferLengthSamples = otherRingBuffer._bufferLengthSamples;
-    _started = otherRingBuffer._started;
-    _shouldBeAddedToMix = otherRingBuffer._shouldBeAddedToMix;
-    _shouldLoopbackForAgent = otherRingBuffer._shouldLoopbackForAgent;
-    
-    _buffer = new int16_t[_ringBufferLengthSamples];
-    memcpy(_buffer, otherRingBuffer._buffer, sizeof(int16_t) * _ringBufferLengthSamples);
-    
-    _nextOutput = _buffer + (otherRingBuffer._nextOutput - otherRingBuffer._buffer);
-    _endOfLastWrite = _buffer + (otherRingBuffer._endOfLastWrite - otherRingBuffer._buffer);
-}
-
 AudioRingBuffer::~AudioRingBuffer() {
     delete[] _buffer;
 };
 
-AudioRingBuffer* AudioRingBuffer::clone() const {
-    return new AudioRingBuffer(*this);
-}
-
 const int AGENT_LOOPBACK_MODIFIER = 307;
 
 int AudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) {

libraries/audio/src/AudioRingBuffer.h

@@ -22,10 +22,8 @@ class AudioRingBuffer : public AgentData {
 public:
     AudioRingBuffer(int ringSamples, int bufferSamples);
     ~AudioRingBuffer();
-    AudioRingBuffer(const AudioRingBuffer &otherRingBuffer);
 
     int parseData(unsigned char* sourceBuffer, int numBytes);
-    AudioRingBuffer* clone() const;
 
     int16_t* getNextOutput() const { return _nextOutput; }
     void setNextOutput(int16_t* nextOutput) { _nextOutput = nextOutput; }
@@ -48,6 +46,10 @@ public:
 
     short diffLastWriteNextOutput();
 private:
+    // disallow copying of AudioRingBuffer objects
+    AudioRingBuffer(const AudioRingBuffer&);
+    AudioRingBuffer& operator= (const AudioRingBuffer&);
+    
     int _ringBufferLengthSamples;
     int _bufferLengthSamples;
     Position _position;

libraries/avatars/src/AvatarData.cpp

@@ -34,14 +34,6 @@ int unpackFloatAngleFromTwoByte(uint16_t* byteAnglePointer, float* destinationPo
     return sizeof(uint16_t);
 }
 
-AvatarData::~AvatarData() {
-    
-}
-
-AvatarData* AvatarData::clone() const {
-    return new AvatarData(*this);
-}
-
 int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
     unsigned char* bufferStart = destinationBuffer;
     
@@ -200,49 +192,9 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
     return sourceBuffer - startPosition;
 }
 
-const glm::vec3& AvatarData::getPosition() const {
-    return _position;
-}
-
-void AvatarData::setPosition(glm::vec3 position) {
-    _position = position;
-}
-
-void AvatarData::setHandPosition(glm::vec3 handPosition) {
-    _handPosition = handPosition;
-}
-
-float AvatarData::getBodyYaw() {
-    return _bodyYaw;
-}
-
-void AvatarData::setBodyYaw(float bodyYaw) {
-    _bodyYaw = bodyYaw;
-}
-
-float AvatarData::getBodyPitch() {
-    return _bodyPitch;
-}
-
-void AvatarData::setBodyPitch(float bodyPitch) {
-    _bodyPitch = bodyPitch;
-}
-
-float AvatarData::getBodyRoll() {
-    return _bodyRoll;
-}
-
-void AvatarData::setBodyRoll(float bodyRoll) {
-    _bodyRoll = bodyRoll;
-}
-
 void AvatarData::setHeadPitch(float p) {
     // Set head pitch and apply limits
     const float MAX_PITCH = 60;
     const float MIN_PITCH = -60;
     _headPitch = glm::clamp(p, MIN_PITCH, MAX_PITCH);
-}
+}
-
-
-
-

libraries/avatars/src/AvatarData.h

@@ -52,25 +52,23 @@ public:
     _wantResIn(false),
     _wantColor(true) { };
     
+    const glm::vec3& getPosition() const { return _position; }
+    void setPosition(const glm::vec3 position) { _position = position; }
     
-    ~AvatarData();
+    void setHandPosition(const glm::vec3 handPosition) { _handPosition = handPosition; }
-    
-    AvatarData* clone() const;
-    
-    const glm::vec3& getPosition() const;
-    void setPosition(glm::vec3 position);
-    void setHandPosition(glm::vec3 handPosition);
     
     int getBroadcastData(unsigned char* destinationBuffer);
     int parseData(unsigned char* sourceBuffer, int numBytes);
     
     //  Body Rotation
-    float getBodyYaw();
+    float getBodyYaw() const { return _bodyYaw; }
-    float getBodyPitch();
+    void setBodyYaw(float bodyYaw) { _bodyYaw = bodyYaw; }
-    float getBodyRoll();
+    
-    void  setBodyYaw(float bodyYaw);
+    float getBodyPitch() const { return _bodyPitch; }
-    void  setBodyPitch(float bodyPitch);
+    void setBodyPitch(float bodyPitch) { _bodyPitch = bodyPitch; }
-    void  setBodyRoll(float bodyRoll);
+    
+    float getBodyRoll() const {return _bodyRoll; }
+    void setBodyRoll(float bodyRoll) { _bodyRoll = bodyRoll; }
 
     // Head Rotation
     void setHeadPitch(float p);
@@ -134,6 +132,10 @@ public:
     void setWantDelta(bool wantDelta) { _wantDelta = wantDelta; }
     
 protected:
+    // privatize the copy constructor and assignment operator so they cannot be called
+    AvatarData(const AvatarData&);
+    AvatarData& operator= (const AvatarData&);
+    
     glm::vec3 _position;
     glm::vec3 _handPosition;
     

libraries/shared/src/Agent.cpp

@@ -55,67 +55,6 @@ Agent::Agent(sockaddr* publicSocket, sockaddr* localSocket, char type, uint16_t
     }
 }
 
-Agent::Agent(const Agent &otherAgent) :
-    _type(otherAgent._type),
-    _agentID(otherAgent._agentID),
-    _wakeMicrostamp(otherAgent._wakeMicrostamp),
-    _lastHeardMicrostamp(otherAgent._lastHeardMicrostamp),
-    _isAlive(otherAgent._isAlive)
-{
-    if (otherAgent._publicSocket) {
-        _publicSocket = new sockaddr(*otherAgent._localSocket);
-    } else {
-        _publicSocket = NULL;
-    }
-    
-    if (otherAgent._localSocket) {
-        _localSocket = new sockaddr(*otherAgent._localSocket);
-    } else {
-        _localSocket = NULL;
-    }
-    
-    if (otherAgent._activeSocket == otherAgent._publicSocket) {
-        _activeSocket = _publicSocket;
-    } else if (otherAgent._activeSocket == otherAgent._localSocket) {
-        _activeSocket = _localSocket;
-    } else {
-        _activeSocket = NULL;
-    }
-    
-    if (otherAgent._linkedData) {
-        _linkedData = otherAgent._linkedData->clone();
-    } else {
-        _linkedData = NULL;
-    }
-    
-    if (otherAgent._bytesReceivedMovingAverage != NULL) {
-        _bytesReceivedMovingAverage = new SimpleMovingAverage(100);
-        memcpy(_bytesReceivedMovingAverage, otherAgent._bytesReceivedMovingAverage, sizeof(SimpleMovingAverage));
-    } else {
-        _bytesReceivedMovingAverage = NULL;
-    }
-}
-
-Agent& Agent::operator=(Agent otherAgent) {
-    swap(*this, otherAgent);
-    return *this;
-}
-
-void Agent::swap(Agent &first, Agent &second) {
-    using std::swap;
-    
-    swap(first._isAlive, second._isAlive);
-    swap(first._publicSocket, second._publicSocket);
-    swap(first._localSocket, second._localSocket);
-    swap(first._activeSocket, second._activeSocket);
-    swap(first._type, second._type);
-    swap(first._linkedData, second._linkedData);
-    swap(first._agentID, second._agentID);
-    swap(first._wakeMicrostamp, second._wakeMicrostamp);
-    swap(first._lastHeardMicrostamp, second._lastHeardMicrostamp);
-    swap(first._bytesReceivedMovingAverage, second._bytesReceivedMovingAverage);
-}
-
 Agent::~Agent() {
     delete _publicSocket;
     delete _localSocket;

libraries/shared/src/Agent.h

@@ -24,9 +24,8 @@
 class Agent {    
 public:
     Agent(sockaddr* publicSocket, sockaddr* localSocket, char type, uint16_t agentID);
-    Agent(const Agent &otherAgent);
     ~Agent();
-    Agent& operator=(Agent otherAgent);
+    
     bool operator==(const Agent& otherAgent);
     
     bool matches(sockaddr* otherPublicSocket, sockaddr* otherLocalSocket, char otherAgentType);
@@ -66,7 +65,9 @@ public:
 
     static void printLog(Agent const&);
 private:
-    void swap(Agent &first, Agent &second);
+    // privatize copy and assignment operator to disallow Agent copying
+    Agent(const Agent &otherAgent);
+    Agent& operator=(Agent otherAgent);
     
     char _type;
     uint16_t _agentID;

libraries/shared/src/AgentData.h

@@ -10,10 +10,9 @@
 #define hifi_AgentData_h
 
 class AgentData {
-    public:
+public:
-        virtual ~AgentData() = 0;
+    virtual ~AgentData() = 0;
-        virtual int parseData(unsigned char* sourceBuffer, int numBytes) = 0;
+    virtual int parseData(unsigned char* sourceBuffer, int numBytes) = 0;
-        virtual AgentData* clone() const = 0;
 };
 
 #endif

voxel-server/src/VoxelAgentData.cpp

@@ -11,19 +11,18 @@
 #include <cstring>
 #include <cstdio>
 
-VoxelAgentData::VoxelAgentData() {
+VoxelAgentData::VoxelAgentData() :
-    init();
+    _viewSent(false),
+    _voxelPacketAvailableBytes(MAX_VOXEL_PACKET_SIZE),
+    _maxSearchLevel(1),
+    _maxLevelReachedInLastSearch(1)
+{
+    _voxelPacket = new unsigned char[MAX_VOXEL_PACKET_SIZE];
+    _voxelPacketAt = _voxelPacket;
+    
+    resetVoxelPacket();
 }
 
-void VoxelAgentData::init() {
-    _voxelPacket = new unsigned char[MAX_VOXEL_PACKET_SIZE];
-    _voxelPacketAvailableBytes = MAX_VOXEL_PACKET_SIZE;
-    _voxelPacketAt = _voxelPacket;
-    _maxSearchLevel = 1;
-    _maxLevelReachedInLastSearch = 1;
-    resetVoxelPacket();
-    _viewSent = false;
-}
 
 void VoxelAgentData::resetVoxelPacket() {
     _voxelPacket[0] = getWantColor() ? PACKET_HEADER_VOXEL_DATA : PACKET_HEADER_VOXEL_DATA_MONOCHROME;
@@ -43,15 +42,6 @@ VoxelAgentData::~VoxelAgentData() {
     delete[] _voxelPacket;
 }
 
-VoxelAgentData::VoxelAgentData(const VoxelAgentData &otherAgentData) {
-    memcpy(&_position, &otherAgentData._position, sizeof(_position));
-    init();
-}
-
-VoxelAgentData* VoxelAgentData::clone() const {
-    return new VoxelAgentData(*this);
-}
-
 bool VoxelAgentData::updateCurrentViewFrustum() {
     bool currentViewFrustumChanged = false;
     ViewFrustum newestViewFrustum;

voxel-server/src/VoxelAgentData.h

@@ -19,11 +19,7 @@ class VoxelAgentData : public AvatarData {
 public:
     VoxelAgentData();
     ~VoxelAgentData();
-    VoxelAgentData(const VoxelAgentData &otherAgentData);
-    
-    VoxelAgentData* clone() const;
 
-    void init(); // sets up data internals
     void resetVoxelPacket();  // resets voxel packet to after "V" header
 
     void writeToPacket(unsigned char* buffer, int bytes); // writes to end of packet
@@ -52,7 +48,10 @@ public:
     bool getViewSent() const        { return _viewSent; };
     void setViewSent(bool viewSent) { _viewSent = viewSent; }
 
-private:    
+private:
+    VoxelAgentData(const VoxelAgentData &);
+    VoxelAgentData& operator= (const VoxelAgentData&);
+    
     bool _viewSent;
     unsigned char* _voxelPacket;
     unsigned char* _voxelPacketAt;