From 581365f1f18108fa26ef272565989017fb094099 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Thu, 2 May 2013 20:51:17 -0700 Subject: [PATCH] Fixes per code review. --- interface/src/Avatar.cpp | 16 +++++++++------- interface/src/main.cpp | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 05450f64f2..b75e151a5b 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -375,9 +375,9 @@ _head.leanForward = 0.02 * sin( tt * 0.8 ); v -= otherAvatar->getBonePosition( AVATAR_BONE_RIGHT_SHOULDER ); float distance = glm::length( v ); - if ( distance < nearestAvatarDistance ) { nearestAvatarDistance = distance; } + if (distance < nearestAvatarDistance) { nearestAvatarDistance = distance; } - if ( distance < _maxArmLength + _maxArmLength ) { + if (distance < _maxArmLength + _maxArmLength) { _interactingOther = otherAvatar; _avatarTouch.setAbleToReachOtherAvatar(true); @@ -491,8 +491,10 @@ _head.leanForward = 0.02 * sin( tt * 0.8 ); // If someone is near, damp velocity as a function of closeness const float AVATAR_BRAKING_RANGE = 1.2f; const float AVATAR_BRAKING_STRENGTH = 25.f; - if (_isMine && (nearestAvatarDistance < AVATAR_BRAKING_RANGE )) { - _velocity *= (1.f - deltaTime * AVATAR_BRAKING_STRENGTH * (AVATAR_BRAKING_RANGE - nearestAvatarDistance)); + if (_isMine && (nearestAvatarDistance < AVATAR_BRAKING_RANGE)) { + _velocity *= + (1.f - deltaTime * AVATAR_BRAKING_STRENGTH * + (AVATAR_BRAKING_RANGE - nearestAvatarDistance)); } // update head information @@ -1421,8 +1423,8 @@ void Avatar::processTransmitterData(unsigned char* packetData, int numBytes) { printLog("Using Transmitter %s to drive head, springs OFF.\n", device); } - printLog("Packet: [%s]\n", packetData); - printLog("Version: %s\n", device); + //printLog("Packet: [%s]\n", packetData); + //printLog("Version: %s\n", device); _transmitterInitialReading = glm::vec3( rot3, rot2, @@ -1449,7 +1451,7 @@ void Avatar::processTransmitterData(unsigned char* packetData, int numBytes) { if (eulerAngles.x < -180.f) { eulerAngles.x += 360.f; } glm::vec3 angularVelocity; - if (!(deviceType == DEVICE_GLASS)) { + if (deviceType != DEVICE_GLASS) { angularVelocity = glm::vec3(glm::degrees(gyrZ), glm::degrees(-gyrX), glm::degrees(gyrY)); setHeadFromGyros( &eulerAngles, &angularVelocity, (_transmitterHz == 0.f) ? 0.f : 1.f / _transmitterHz, 1.0); diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 822bfe81f6..3edab8bfe9 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -229,16 +229,16 @@ void displayStats(void) std::stringstream voxelStats; voxelStats.precision(4); - voxelStats << "Voxels Rendered: " << voxels.getVoxelsRendered()/1000.f << "K Updated: " << voxels.getVoxelsUpdated()/1000.f << "K"; + voxelStats << "Voxels Rendered: " << voxels.getVoxelsRendered() / 1000.f << "K Updated: " << voxels.getVoxelsUpdated()/1000.f << "K"; drawtext(10, statsVerticalOffset + 230, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); voxelStats.str(""); - voxelStats << "Voxels Created: " << voxels.getVoxelsCreated()/1000.f << "K (" << voxels.getVoxelsCreatedPerSecondAverage()/1000.f + voxelStats << "Voxels Created: " << voxels.getVoxelsCreated() / 1000.f << "K (" << voxels.getVoxelsCreatedPerSecondAverage() / 1000.f << "Kps) "; drawtext(10, statsVerticalOffset + 250, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); voxelStats.str(""); - voxelStats << "Voxels Colored: " << voxels.getVoxelsColored()/1000.f << "K (" << voxels.getVoxelsColoredPerSecondAverage()/1000.f + voxelStats << "Voxels Colored: " << voxels.getVoxelsColored() / 1000.f << "K (" << voxels.getVoxelsColoredPerSecondAverage() / 1000.f << "Kps) "; drawtext(10, statsVerticalOffset + 270, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());