Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:17:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Root cause of crash isolated to setRaveGloveMode(), so some disabled code has been re-enabled

Browse source
This commit is contained in:
Eric Johnston 2013-08-05 15:56:49 -07:00
parent 002a62d31e
commit 858738a10a
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/avatars/src/HandData.cpp
View file

@ -111,8 +111,6 @@ int HandData::encodeRemoteData(unsigned char* destinationBuffer) {
return destinationBuffer - startPosition; return destinationBuffer - startPosition;
} }
#define DISABLE_RECEIVE // Temporary measure while a crash is being traced
int HandData::decodeRemoteData(unsigned char* sourceBuffer) { int HandData::decodeRemoteData(unsigned char* sourceBuffer) {
const unsigned char* startPosition = sourceBuffer; const unsigned char* startPosition = sourceBuffer;
@ -121,10 +119,8 @@ int HandData::decodeRemoteData(unsigned char* sourceBuffer) {
unsigned int numHands = *sourceBuffer++; unsigned int numHands = *sourceBuffer++;
for (unsigned int handIndex = 0; handIndex < numHands; ++handIndex) { for (unsigned int handIndex = 0; handIndex < numHands; ++handIndex) {
#ifndef DISABLE_RECEIVE
if (handIndex >= getNumPalms()) if (handIndex >= getNumPalms())
addNewPalm(); addNewPalm();
#endif
if (handIndex < getNumPalms()) { if (handIndex < getNumPalms()) {
PalmData& palm = getPalms()[handIndex]; PalmData& palm = getPalms()[handIndex];
@ -134,11 +130,9 @@ int HandData::decodeRemoteData(unsigned char* sourceBuffer) {
sourceBuffer += unpackFloatVec3FromSignedTwoByteFixed(sourceBuffer, handNormal, fingerVectorRadix); sourceBuffer += unpackFloatVec3FromSignedTwoByteFixed(sourceBuffer, handNormal, fingerVectorRadix);
unsigned int numFingers = *sourceBuffer++; unsigned int numFingers = *sourceBuffer++;
#ifndef DISABLE_RECEIVE
palm.setRawPosition(handPosition); palm.setRawPosition(handPosition);
palm.setRawNormal(handNormal); palm.setRawNormal(handNormal);
palm.setActive(true); palm.setActive(true);
#endif
for (unsigned int fingerIndex = 0; fingerIndex < numFingers; ++fingerIndex) { for (unsigned int fingerIndex = 0; fingerIndex < numFingers; ++fingerIndex) {
if (fingerIndex < palm.getNumFingers()) { if (fingerIndex < palm.getNumFingers()) {
FingerData& finger = palm.getFingers()[fingerIndex]; FingerData& finger = palm.getFingers()[fingerIndex];
@ -148,34 +142,27 @@ int HandData::decodeRemoteData(unsigned char* sourceBuffer) {
sourceBuffer += unpackFloatVec3FromSignedTwoByteFixed(sourceBuffer, tipPosition, fingerVectorRadix); sourceBuffer += unpackFloatVec3FromSignedTwoByteFixed(sourceBuffer, tipPosition, fingerVectorRadix);
sourceBuffer += unpackFloatVec3FromSignedTwoByteFixed(sourceBuffer, rootPosition, fingerVectorRadix); sourceBuffer += unpackFloatVec3FromSignedTwoByteFixed(sourceBuffer, rootPosition, fingerVectorRadix);
#ifndef DISABLE_RECEIVE
finger.setRawTipPosition(tipPosition); finger.setRawTipPosition(tipPosition);
finger.setRawRootPosition(rootPosition); finger.setRawRootPosition(rootPosition);
finger.setActive(true); finger.setActive(true);
#endif
} }
} }
// Turn off any fingers which weren't used. // Turn off any fingers which weren't used.
for (unsigned int fingerIndex = numFingers; fingerIndex < palm.getNumFingers(); ++fingerIndex) { for (unsigned int fingerIndex = numFingers; fingerIndex < palm.getNumFingers(); ++fingerIndex) {
FingerData& finger = palm.getFingers()[fingerIndex]; FingerData& finger = palm.getFingers()[fingerIndex];
#ifndef DISABLE_RECEIVE
finger.setActive(false); finger.setActive(false);
#endif
} }
} }
} }
// Turn off any hands which weren't used. // Turn off any hands which weren't used.
for (unsigned int handIndex = numHands; handIndex < getNumPalms(); ++handIndex) { for (unsigned int handIndex = numHands; handIndex < getNumPalms(); ++handIndex) {
PalmData& palm = getPalms()[handIndex]; PalmData& palm = getPalms()[handIndex];
#ifndef DISABLE_RECEIVE
palm.setActive(false); palm.setActive(false);
#endif
} }
#ifndef DISABLE_RECEIVE
setRaveGloveActive((gloveFlags & GLOVE_FLAG_RAVE) != 0); setRaveGloveActive((gloveFlags & GLOVE_FLAG_RAVE) != 0);
setRaveGloveMode(effectsMode); // This is disabled for crash tracing.
#endif // setRaveGloveMode(effectsMode);
// One byte for error checking safety. // One byte for error checking safety.
unsigned char requiredLength = (unsigned char)(sourceBuffer - startPosition); unsigned char requiredLength = (unsigned char)(sourceBuffer - startPosition);