From 747cfc04bec88ee9c8576c85983f4e86c0d35973 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 30 Apr 2013 11:21:50 -0700 Subject: [PATCH] cr cleanup --- voxel-server/src/VoxelAgentData.cpp | 2 +- voxel-server/src/VoxelAgentData.h | 2 +- voxel-server/src/main.cpp | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/voxel-server/src/VoxelAgentData.cpp b/voxel-server/src/VoxelAgentData.cpp index e4b2a38774..7eba95364b 100644 --- a/voxel-server/src/VoxelAgentData.cpp +++ b/voxel-server/src/VoxelAgentData.cpp @@ -27,7 +27,7 @@ void VoxelAgentData::init() { void VoxelAgentData::resetVoxelPacket() { _voxelPacket[0] = PACKET_HEADER_VOXEL_DATA; _voxelPacketAt = &_voxelPacket[1]; - _voxelPacketAvailableBytes = MAX_VOXEL_PACKET_SIZE-1; + _voxelPacketAvailableBytes = MAX_VOXEL_PACKET_SIZE - 1; _voxelPacketWaiting = false; } diff --git a/voxel-server/src/VoxelAgentData.h b/voxel-server/src/VoxelAgentData.h index d0afd5d3e3..74a402bb78 100644 --- a/voxel-server/src/VoxelAgentData.h +++ b/voxel-server/src/VoxelAgentData.h @@ -29,7 +29,7 @@ public: void writeToPacket(unsigned char* buffer, int bytes); // writes to end of packet const unsigned char* getPacket() const { return _voxelPacket; } - int getPacketLength() const { return (MAX_VOXEL_PACKET_SIZE-_voxelPacketAvailableBytes); } + int getPacketLength() const { return (MAX_VOXEL_PACKET_SIZE - _voxelPacketAvailableBytes); } bool isPacketWaiting() const { return _voxelPacketWaiting; } int getAvailable() const { return _voxelPacketAvailableBytes; } int getMaxSearchLevel() const { return _maxSearchLevel; }; diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp index a14085c924..452c6d272f 100644 --- a/voxel-server/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -82,36 +82,36 @@ void addSphereScene(VoxelTree * tree, bool wantColorRandomizer) { int sphereBaseSize = 256; - tree->createSphere(0.25,0.5,0.5,0.5,(1.0/sphereBaseSize),true,wantColorRandomizer); + tree->createSphere(0.25, 0.5, 0.5, 0.5, (1.0 / sphereBaseSize), true, wantColorRandomizer); printf("one sphere added...\n"); - tree->createSphere(0.030625,0.5,0.5,(0.25-0.06125),(1.0/(sphereBaseSize*2)),true,true); + tree->createSphere(0.030625, 0.5, 0.5, (0.25-0.06125), (1.0 / (sphereBaseSize * 2)), true, true); printf("two spheres added...\n"); - tree->createSphere(0.030625,(1.0-0.030625),(1.0-0.030625),(1.0-0.06125),(1.0/(sphereBaseSize*2)),true,true); + tree->createSphere(0.030625, (1.0 - 0.030625), (1.0 - 0.030625), (1.0 - 0.06125), (1.0 / (sphereBaseSize * 2)), true, true); printf("three spheres added...\n"); - tree->createSphere(0.030625,(1.0-0.030625),(1.0-0.030625),0.06125,(1.0/(sphereBaseSize*2)),true,true); + tree->createSphere(0.030625, (1.0 - 0.030625), (1.0 - 0.030625), 0.06125, (1.0 / (sphereBaseSize * 2)), true, true); printf("four spheres added...\n"); - tree->createSphere(0.030625,(1.0-0.030625),0.06125,(1.0-0.06125),(1.0/(sphereBaseSize*2)),true,true); + tree->createSphere(0.030625, (1.0 - 0.030625), 0.06125, (1.0 - 0.06125), (1.0 / (sphereBaseSize * 2)), true, true); printf("five spheres added...\n"); - tree->createSphere(0.06125,0.125,0.125,(1.0-0.125),(1.0/(sphereBaseSize*2)),true,true); + tree->createSphere(0.06125, 0.125, 0.125, (1.0 - 0.125), (1.0 / (sphereBaseSize * 2)), true, true); float radius = 0.0125f; printf("6 spheres added...\n"); - tree->createSphere(radius,0.25,radius*5.0f,0.25,(1.0/(4096)),true,true); + tree->createSphere(radius, 0.25, radius * 5.0f, 0.25, (1.0 / 4096), true, true); printf("7 spheres added...\n"); - tree->createSphere(radius,0.125,radius*5.0f,0.25,(1.0/(4096)),true,true); + tree->createSphere(radius, 0.125, radius * 5.0f, 0.25, (1.0 / 4096), true, true); printf("8 spheres added...\n"); - tree->createSphere(radius,0.075,radius*5.0f,0.25,(1.0/(4096)),true,true); + tree->createSphere(radius, 0.075, radius * 5.0f, 0.25, (1.0 / 4096), true, true); printf("9 spheres added...\n"); - tree->createSphere(radius,0.05,radius*5.0f,0.25,(1.0/(4096)),true,true); + tree->createSphere(radius, 0.05, radius * 5.0f, 0.25, (1.0 / 4096), true, true); printf("10 spheres added...\n"); - tree->createSphere(radius,0.025,radius*5.0f,0.25,(1.0/(4096)),true,true); + tree->createSphere(radius, 0.025, radius * 5.0f, 0.25, (1.0 / 4096), true, true); printf("11 spheres added...\n"); _nodeCount=0; tree->recurseTreeWithOperation(countVoxelsOperation); - printf("Nodes after adding scene %d nodes\n",_nodeCount); + printf("Nodes after adding scene %d nodes\n", _nodeCount); printf("DONE adding scene of spheres...\n");