diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 7af42478d5..75c1198d58 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -318,6 +318,7 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) : _lastAcceleration(0), _totalPacketsReceived(0), _firstPacketReceivedTime(), + _echoSamplesLeft(NULL), _packetsReceivedThisPlayback(0), _isSendingEchoPing(false), _pingAnalysisPending(false), diff --git a/interface/src/Webcam.cpp b/interface/src/Webcam.cpp index 57517f06f0..33d09b8806 100644 --- a/interface/src/Webcam.cpp +++ b/interface/src/Webcam.cpp @@ -235,7 +235,7 @@ void Webcam::setFrame(const Mat& color, int format, const Mat& depth, const Mat& if (!_joints[i].isValid) { continue; } - const float JOINT_SMOOTHING = 0.9f; + const float JOINT_SMOOTHING = 0.5f; _estimatedJoints[i].isValid = true; _estimatedJoints[i].position = glm::mix(_joints[i].position - origin, _estimatedJoints[i].position, JOINT_SMOOTHING); diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 3a90b5489a..1114743ffb 100755 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -92,7 +92,7 @@ Avatar::Avatar(Node* owningNode) : _mouseRayOrigin(0.0f, 0.0f, 0.0f), _mouseRayDirection(0.0f, 0.0f, 0.0f), _interactingOther(NULL), - _isMouseTurningRight(false), + _isMouseTurningRight(false), _elapsedTimeMoving(0.0f), _elapsedTimeStopped(0.0f), _elapsedTimeSinceCollision(0.0f), @@ -1230,8 +1230,8 @@ glm::quat Avatar::computeRotationFromBodyToWorldUp(float proportion) const { } float Avatar::getBallRenderAlpha(int ball, bool lookingInMirror) const { - const float RENDER_OPAQUE_OUTSIDE = 1.25f; // render opaque if greater than this distance - const float DO_NOT_RENDER_INSIDE = 0.75f; // do not render if less than this distance + const float RENDER_OPAQUE_OUTSIDE = 0.25f; // render opaque if greater than this distance + const float DO_NOT_RENDER_INSIDE = 0.25f; // do not render if less than this distance float distanceToCamera = glm::length(Application::getInstance()->getCamera()->getPosition() - _bodyBall[ball].position); return (lookingInMirror || !isMyAvatar()) ? 1.0f : glm::clamp( (distanceToCamera - DO_NOT_RENDER_INSIDE) / (RENDER_OPAQUE_OUTSIDE - DO_NOT_RENDER_INSIDE), 0.f, 1.f); diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/shared/src/PacketHeaders.cpp index 9f8314e0b7..2345e62ec2 100644 --- a/libraries/shared/src/PacketHeaders.cpp +++ b/libraries/shared/src/PacketHeaders.cpp @@ -9,6 +9,7 @@ #include #include "PacketHeaders.h" +#include "Log.h" PACKET_VERSION versionForPacketType(PACKET_TYPE type) { switch (type) { @@ -24,7 +25,7 @@ bool packetVersionMatch(unsigned char* packetHeader) { if (packetHeader[1] == versionForPacketType(packetHeader[0])) { return true; } else { - printf("There is a packet version mismatch for packet with header %c\n", packetHeader[0]); + printLog("There is a packet version mismatch for packet with header %c\n", packetHeader[0]); return false; } }