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

fix coding standard issues

Browse source
This commit is contained in:
ZappoMan 2013-05-22 13:57:33 -07:00
parent cd1f07231f
commit 3e37c956c6
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
voxel-server/src/main.cpp
View file

@ -568,18 +568,18 @@ int main(int argc, const char * argv[]) {
destructive ? "PACKET_HEADER_SET_VOXEL_DESTRUCTIVE" : "PACKET_HEADER_SET_VOXEL", destructive ? "PACKET_HEADER_SET_VOXEL_DESTRUCTIVE" : "PACKET_HEADER_SET_VOXEL",
receivedBytes,itemNumber); receivedBytes,itemNumber);
} }
int atByte = 3; int atByte = sizeof(PACKET_HEADER) + sizeof(itemNumber);
unsigned char* pVoxelData = (unsigned char*)&packetData[3]; unsigned char* voxelData = (unsigned char*)&packetData[atByte];
while (atByte < receivedBytes) { while (atByte < receivedBytes) {
unsigned char octets = (unsigned char)*pVoxelData; unsigned char octets = (unsigned char)*voxelData;
int voxelDataSize = bytesRequiredForCodeLength(octets)+3; // 3 for color! int voxelDataSize = bytesRequiredForCodeLength(octets)+3; // 3 for color!
int voxelCodeSize = bytesRequiredForCodeLength(octets); int voxelCodeSize = bytesRequiredForCodeLength(octets);
// color randomization on insert // color randomization on insert
int colorRandomizer = ::wantColorRandomizer ? randIntInRange (-50, 50) : 0; int colorRandomizer = ::wantColorRandomizer ? randIntInRange (-50, 50) : 0;
int red = pVoxelData[voxelCodeSize+0]; int red = voxelData[voxelCodeSize+0];
int green = pVoxelData[voxelCodeSize+1]; int green = voxelData[voxelCodeSize+1];
int blue = pVoxelData[voxelCodeSize+2]; int blue = voxelData[voxelCodeSize+2];
if (::shouldShowAnimationDebug) { if (::shouldShowAnimationDebug) {
printf("insert voxels - wantColorRandomizer=%s old r=%d,g=%d,b=%d \n", printf("insert voxels - wantColorRandomizer=%s old r=%d,g=%d,b=%d \n",
@ -594,20 +594,20 @@ int main(int argc, const char * argv[]) {
printf("insert voxels - wantColorRandomizer=%s NEW r=%d,g=%d,b=%d \n", printf("insert voxels - wantColorRandomizer=%s NEW r=%d,g=%d,b=%d \n",
(::wantColorRandomizer?"yes":"no"),red,green,blue); (::wantColorRandomizer?"yes":"no"),red,green,blue);
} }
pVoxelData[voxelCodeSize+0]=red; voxelData[voxelCodeSize+0]=red;
pVoxelData[voxelCodeSize+1]=green; voxelData[voxelCodeSize+1]=green;
pVoxelData[voxelCodeSize+2]=blue; voxelData[voxelCodeSize+2]=blue;
if (::shouldShowAnimationDebug) { if (::shouldShowAnimationDebug) {
float* vertices = firstVertexForCode(pVoxelData); float* vertices = firstVertexForCode(voxelData);
printf("inserting voxel at: %f,%f,%f\n",vertices[0],vertices[1],vertices[2]); printf("inserting voxel at: %f,%f,%f\n",vertices[0],vertices[1],vertices[2]);
delete []vertices; delete []vertices;
} }
randomTree.readCodeColorBufferToTree(pVoxelData, destructive); randomTree.readCodeColorBufferToTree(voxelData, destructive);
// skip to next // skip to next
pVoxelData+=voxelDataSize; voxelData += voxelDataSize;
atByte+=voxelDataSize; atByte += voxelDataSize;
} }
} }
if (packetData[0] == PACKET_HEADER_ERASE_VOXEL) { if (packetData[0] == PACKET_HEADER_ERASE_VOXEL) {