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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-04-18 14:13:27 -07:00
commit 449e05fd2a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/SerialInterface.cpp
View file

@ -169,7 +169,6 @@ void SerialInterface::readData() {
int initialSamples = totalSamples; int initialSamples = totalSamples;
while (read(serialFd, &bufchar, 1) > 0) { while (read(serialFd, &bufchar, 1) > 0) {
//printLof("%c", bufchar[0]);
serialBuffer[serialBufferPos] = bufchar[0]; serialBuffer[serialBufferPos] = bufchar[0];
serialBufferPos++; serialBufferPos++;
// Have we reached end of a line of input? // Have we reached end of a line of input?
@ -209,7 +208,7 @@ void SerialInterface::readData() {
} }
if (totalSamples == GRAVITY_SAMPLES) { if (totalSamples == GRAVITY_SAMPLES) {
gravity = glm::normalize(gravity); gravity = glm::normalize(gravity);
//printLof("gravity: %f,%f,%f\n", gravity.x, gravity.y, gravity.z); printLog("gravity: %f,%f,%f\n", gravity.x, gravity.y, gravity.z);
} }
totalSamples++; totalSamples++;

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

@ -65,6 +65,8 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
memcpy(destinationBuffer, &_handPosition, sizeof(float) * 3); memcpy(destinationBuffer, &_handPosition, sizeof(float) * 3);
destinationBuffer += sizeof(float) * 3; destinationBuffer += sizeof(float) * 3;
//printLog("%f, %f, %f\n", _handPosition.x, _handPosition.y, _handPosition.z);
return destinationBuffer - bufferStart; return destinationBuffer - bufferStart;
} }