History

revert type squish, spacing, code review comment

Stephen Birarda committed 13 years ago

Commit 9be92ce1 parent d5d94792 files · +6 −6Browse files

Showing the changes to interface/src/main.cpp (1 of 2 files). Show all

Unified · Split

interface/src/main.cpp+4−4
@@ -429,7 +429,7 @@ void updateAvatar(float frametime) { · 428 unmodified lines
429 myAvatar.setCameraNearClip(::viewFrustum.getNearClip());429 myAvatar.setCameraNearClip(::viewFrustum.getNearClip());
430 myAvatar.setCameraFarClip(::viewFrustum.getFarClip());430 myAvatar.setCameraFarClip(::viewFrustum.getFarClip());
431 431
432 AgentList *agentList = AgentList::getInstance();432 AgentList* agentList = AgentList::getInstance();
433 433
434 if (agentList->getOwnerID() != UNKNOWN_AGENT_ID) {434 if (agentList->getOwnerID() != UNKNOWN_AGENT_ID) {
435 // if I know my ID, send head/hand data to the avatar mixer and voxel server435 // if I know my ID, send head/hand data to the avatar mixer and voxel server
@@ -451,9 +451,9 @@ void updateAvatar(float frametime) { · 15 unmodified lines
451 glm::vec3 avatarPos = myAvatar.getPosition();451 glm::vec3 avatarPos = myAvatar.getPosition();
452 452
453 // For some reason, we don't want to flip X and Z here.453 // For some reason, we don't want to flip X and Z here.
454 ::paintingVoxel.x = avatarPos.x/10.0; 454 ::paintingVoxel.x = avatarPos.x / 10.0;
455 ::paintingVoxel.y = avatarPos.y/10.0; 455 ::paintingVoxel.y = avatarPos.y / 10.0;
456 ::paintingVoxel.z = avatarPos.z/10.0;456 ::paintingVoxel.z = avatarPos.z / 10.0;
457 457
458 unsigned char* bufferOut;458 unsigned char* bufferOut;
459 int sizeOut;459 int sizeOut;