Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 01:03:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/worklist/hifi into pointy

Browse source
This commit is contained in:
Andrzej Kapolka 2013-07-14 18:21:50 -07:00
commit a59fbfbf3e
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Audio.cpp
View file

@ -318,6 +318,7 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) :
_lastAcceleration(0),
_totalPacketsReceived(0),
_firstPacketReceivedTime(),
_echoSamplesLeft(NULL),
_packetsReceivedThisPlayback(0),
_isSendingEchoPing(false),
_pingAnalysisPending(false),

2
interface/src/Webcam.cpp
View file

@ -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);

6
interface/src/avatar/Avatar.cpp
View file

@ -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);

3
libraries/shared/src/PacketHeaders.cpp
View file

@ -9,6 +9,7 @@
#include <stdio.h>
#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;
}
}