Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 00:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

disallow copying of VoxelAgentData objects

Browse source
This commit is contained in:
Stephen Birarda 2013-05-17 12:31:00 -07:00
parent fcfe5c9e25
commit c26a05ff97
2 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
voxel-server/src/VoxelAgentData.cpp
View file

@ -11,19 +11,18 @@
#include <cstring> #include <cstring>
#include <cstdio> #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() { void VoxelAgentData::resetVoxelPacket() {
_voxelPacket[0] = getWantColor() ? PACKET_HEADER_VOXEL_DATA : PACKET_HEADER_VOXEL_DATA_MONOCHROME; _voxelPacket[0] = getWantColor() ? PACKET_HEADER_VOXEL_DATA : PACKET_HEADER_VOXEL_DATA_MONOCHROME;
@ -43,15 +42,6 @@ VoxelAgentData::~VoxelAgentData() {
delete[] _voxelPacket; 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 VoxelAgentData::updateCurrentViewFrustum() {
bool currentViewFrustumChanged = false; bool currentViewFrustumChanged = false;
ViewFrustum newestViewFrustum; ViewFrustum newestViewFrustum;

9
voxel-server/src/VoxelAgentData.h
View file

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