Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 05:09:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

code review cleanup

Browse source
This commit is contained in:
ZappoMan 2013-04-22 15:07:46 -07:00
parent 1b52bb4e20
commit 7c73964836
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/avatars/src/AvatarData.cpp
View file

@ -90,19 +90,12 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
destinationBuffer += sizeof(_cameraNearClip); destinationBuffer += sizeof(_cameraNearClip);
memcpy(destinationBuffer, &_cameraFarClip, sizeof(_cameraFarClip)); memcpy(destinationBuffer, &_cameraFarClip, sizeof(_cameraFarClip));
destinationBuffer += sizeof(_cameraFarClip); destinationBuffer += sizeof(_cameraFarClip);
//printLog("%f, %f, %f\n", _handPosition.x, _handPosition.y, _handPosition.z);
//printf("AvatarData::getBroadcastData() numBytes=%ld\n",(destinationBuffer - bufferStart));
return destinationBuffer - bufferStart; return destinationBuffer - bufferStart;
} }
// called on the other agents - assigns it to my views of the others // called on the other agents - assigns it to my views of the others
void AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) { void AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
//printf("AvatarData::parseData() numBytes=%d\n",numBytes);
// increment to push past the packet header // increment to push past the packet header
sourceBuffer++; sourceBuffer++;
@ -133,11 +126,6 @@ void AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
sourceBuffer += sizeof(_cameraNearClip); sourceBuffer += sizeof(_cameraNearClip);
memcpy(&_cameraFarClip, sourceBuffer, sizeof(_cameraFarClip)); memcpy(&_cameraFarClip, sourceBuffer, sizeof(_cameraFarClip));
sourceBuffer += sizeof(_cameraFarClip); sourceBuffer += sizeof(_cameraFarClip);
//printLog( "_bodyYaw = %f", _bodyYaw );
//printLog("%f, %f, %f\n", _handPosition.x, _handPosition.y, _handPosition.z);
//printLog("%f, %f, %f\n", _bodyPosition.x, _bodyPosition.y, _bodyPosition.z);
} }
glm::vec3 AvatarData::getBodyPosition() { glm::vec3 AvatarData::getBodyPosition() {

8
libraries/voxels/src/VoxelTree.cpp
View file

@ -306,7 +306,7 @@ unsigned char * VoxelTree::loadBitstreamBuffer(unsigned char *& bitstreamBuffer,
/**** not yet working properly at this level! ************************************************************************** /**** not yet working properly at this level! **************************************************************************
if (viewFrustumCulling) { if (viewFrustumCulling) {
float fullUnitForVoxel = halfUnitForVoxel*2.0f; float fullUnitForVoxel = halfUnitForVoxel * 2.0f;
AABox voxelBox; AABox voxelBox;
voxelBox.setBox(glm::vec3(thisNodePosition[0],thisNodePosition[1],thisNodePosition[2]), voxelBox.setBox(glm::vec3(thisNodePosition[0],thisNodePosition[1],thisNodePosition[2]),
fullUnitForVoxel,fullUnitForVoxel,fullUnitForVoxel); fullUnitForVoxel,fullUnitForVoxel,fullUnitForVoxel);
@ -379,10 +379,10 @@ unsigned char * VoxelTree::loadBitstreamBuffer(unsigned char *& bitstreamBuffer,
powf(agentPosition[1] - childPosition[1] - halfChildVoxel, 2) + powf(agentPosition[1] - childPosition[1] - halfChildVoxel, 2) +
powf(agentPosition[2] - childPosition[2] - halfChildVoxel, 2)); powf(agentPosition[2] - childPosition[2] - halfChildVoxel, 2));
float fullChildVoxel = halfChildVoxel*2.0f; float fullChildVoxel = halfChildVoxel * 2.0f;
AABox childBox; AABox childBox;
childBox.setBox(glm::vec3(childPosition[0],childPosition[1],childPosition[2]), childBox.setBox(glm::vec3(childPosition[0], childPosition[1], childPosition[2]),
fullChildVoxel,fullChildVoxel,fullChildVoxel); fullChildVoxel, fullChildVoxel, fullChildVoxel);
//printf("VoxelTree::loadBitstreamBuffer() childBox.corner=(%f,%f,%f) x=%f \n", //printf("VoxelTree::loadBitstreamBuffer() childBox.corner=(%f,%f,%f) x=%f \n",
// childBox.getCorner().x,childBox.getCorner().y,childBox.getCorner().z, childBox.getSize().x); // childBox.getCorner().x,childBox.getCorner().y,childBox.getCorner().z, childBox.getSize().x);