Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-10 10:34:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed print statements and removed the setting of procedural head variables in avatarData.cpp

Browse source
This commit is contained in:
amantley 2018-06-06 17:50:50 -07:00
parent dca93ca61f
commit 6a11ddc349
2 changed files with 51 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/avatars-renderer/src/avatars-renderer/Head.cpp
View file

@ -45,12 +45,12 @@ void Head::reset() {
void Head::simulate(float deltaTime) {
const float NORMAL_HZ = 60.0f; // the update rate the constant values were tuned for
qCDebug(avatars_renderer) << "name " << _owningAvatar->getName();
if (_owningAvatar->isMyAvatar()) {
qCDebug(avatars_renderer) << "my avatar";
} else {
qCDebug(avatars_renderer) << "not my avatar " << _owningAvatar->getAudioLoudness();
}
//qCDebug(avatars_renderer) << "name " << _owningAvatar->getName();
//if (_owningAvatar->isMyAvatar()) {
// qCDebug(avatars_renderer) << "my avatar";
//} else {
// qCDebug(avatars_renderer) << "not my avatar " << _owningAvatar->getAudioLoudness();
//}
// grab the audio loudness from the owning avatar, if we have one
float audioLoudness = _owningAvatar ? _owningAvatar->getAudioLoudness() : 0.0f;
@ -93,7 +93,7 @@ void Head::simulate(float deltaTime) {
const float FULLY_OPEN = 0.0f;
const float FULLY_CLOSED = 1.0f;
if (getHasProceduralBlinkFaceMovement()) {
qCDebug(avatars_renderer) << "in the blink code " << _owningAvatar->getName();
//qCDebug(avatars_renderer) << "in the blink code " << _owningAvatar->getName();
// Detect transition from talking to not; force blink after that and a delay
bool forceBlink = false;
const float TALKING_LOUDNESS = 100.0f;

55
libraries/avatars/src/AvatarData.cpp
View file

@ -532,7 +532,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
faceTrackerInfo->browAudioLift = _headData->_browAudioLift;
faceTrackerInfo->numBlendshapeCoefficients = blendshapeCoefficients.size();
destinationBuffer += sizeof(AvatarDataPacket::FaceTrackerInfo);
qCWarning(avatars) << "face tracker info left eye blink " << faceTrackerInfo->leftEyeBlink;
//qCWarning(avatars) << "face tracker info left eye blink " << faceTrackerInfo->leftEyeBlink;
memcpy(destinationBuffer, blendshapeCoefficients.data(), blendshapeCoefficients.size() * sizeof(float));
destinationBuffer += blendshapeCoefficients.size() * sizeof(float);
@ -1014,11 +1014,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
auto newHasProceduralEyeFaceMovement = oneAtBit16(bitItems, PROCEDURAL_EYE_FACE_MOVEMENT);
auto newHasProceduralBlinkFaceMovement = oneAtBit16(bitItems, PROCEDURAL_BLINK_FACE_MOVEMENT);
if (newHasAudioEnabledFaceMovement) {
qCWarning(avatars) << "name " << getName() << "audio enabled flag is true";
} else {
qCWarning(avatars) << "name " << getName() << "audio enabled flag is false";
}
bool keyStateChanged = (_keyState != newKeyState);
bool handStateChanged = (_handState != newHandState);
bool faceStateChanged = (_headData->_isFaceTrackerConnected != newFaceTrackerConnected);
@ -1040,6 +1036,43 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
if (somethingChanged) {
_additionalFlagsChanged = usecTimestampNow();
if (newHasAudioEnabledFaceMovement) {
qCWarning(avatars) << "name " << getName() << "audio enabled flag is true";
} else {
qCWarning(avatars) << "name " << getName() << "audio enabled flag is false";
}
if (newHasProceduralEyeFaceMovement) {
qCWarning(avatars) << "name " << getName() << "eye face enabled flag is true";
} else {
qCWarning(avatars) << "name " << getName() << "eye face flag is false";
}
if (newHasProceduralBlinkFaceMovement) {
qCWarning(avatars) << "name " << getName() << "blink flag is true";
} else {
qCWarning(avatars) << "name " << getName() << "blink flag is false";
}
if (newFaceTrackerConnected) {
qCWarning(avatars) << "name " << getName() << "face tracker flag is true";
} else {
qCWarning(avatars) << "name " << getName() << "face tracker flag is false";
}
if (newEyeTrackerConnected) {
qCWarning(avatars) << "name " << getName() << "eye tracker flag is true";
} else {
qCWarning(avatars) << "name " << getName() << "eye tracker flag is false";
}
if (newHandState) {
qCWarning(avatars) << "name " << getName() << "hand state flag is true";
} else {
qCWarning(avatars) << "name " << getName() << "hand state flag is false";
}
if (newKeyState) {
qCWarning(avatars) << "name " << getName() << "key state flag is true";
} else {
qCWarning(avatars) << "name " << getName() << "key state flag is false";
}
}
int numBytesRead = sourceBuffer - startSection;
_additionalFlagsRate.increment(numBytesRead);
@ -1096,12 +1129,12 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
PACKET_READ_CHECK(FaceTrackerInfo, sizeof(AvatarDataPacket::FaceTrackerInfo));
auto faceTrackerInfo = reinterpret_cast<const AvatarDataPacket::FaceTrackerInfo*>(sourceBuffer);
sourceBuffer += sizeof(AvatarDataPacket::FaceTrackerInfo);
qCWarning(avatars) << "parse data left eye blink " << faceTrackerInfo->leftEyeBlink;
//qCWarning(avatars) << "parse data left eye blink " << faceTrackerInfo->leftEyeBlink;
_headData->_leftEyeBlink = faceTrackerInfo->leftEyeBlink;
_headData->_rightEyeBlink = faceTrackerInfo->rightEyeBlink;
_headData->_averageLoudness = faceTrackerInfo->averageLoudness;
_headData->_browAudioLift = faceTrackerInfo->browAudioLift;
//_headData->_leftEyeBlink = faceTrackerInfo->leftEyeBlink;
//_headData->_rightEyeBlink = faceTrackerInfo->rightEyeBlink;
//_headData->_averageLoudness = faceTrackerInfo->averageLoudness;
//_headData->_browAudioLift = faceTrackerInfo->browAudioLift;
int numCoefficients = faceTrackerInfo->numBlendshapeCoefficients;
const int coefficientsSize = sizeof(float) * numCoefficients;