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

Build fix, render body as balls if we don't have an avatar.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-06-06 10:17:57 -07:00
parent 80847b3884
commit e0189c9834
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
audio-mixer/src/InjectedAudioRingBuffer.cpp
View file

@ -6,6 +6,8 @@
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
// //
#include <cstring>
#include <PacketHeaders.h> #include <PacketHeaders.h>
#include "InjectedAudioRingBuffer.h" #include "InjectedAudioRingBuffer.h"
@ -38,4 +40,4 @@ int InjectedAudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes
currentBuffer += parseAudioSamples(currentBuffer, numBytes - (currentBuffer - sourceBuffer)); currentBuffer += parseAudioSamples(currentBuffer, numBytes - (currentBuffer - sourceBuffer));
return currentBuffer - sourceBuffer; return currentBuffer - sourceBuffer;
} }

4
audio-mixer/src/PositionalAudioRingBuffer.cpp
View file

@ -6,6 +6,8 @@
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
// //
#include <cstring>
#include <PacketHeaders.h> #include <PacketHeaders.h>
#include "PositionalAudioRingBuffer.h" #include "PositionalAudioRingBuffer.h"
@ -64,4 +66,4 @@ bool PositionalAudioRingBuffer::shouldBeAddedToMix(int numJitterBufferSamples) {
} }
return false; return false;
} }

2
interface/src/Avatar.cpp
View file

@ -1133,7 +1133,7 @@ void Avatar::renderBody(bool lookingInMirror, bool renderAvatarBalls) {
const float RENDER_TRANSLUCENT_BEYOND = 0.5f; const float RENDER_TRANSLUCENT_BEYOND = 0.5f;
// Render the body as balls and cones // Render the body as balls and cones
if (renderAvatarBalls) { if (renderAvatarBalls || !_voxels.getVoxelURL().isValid()) {
for (int b = 0; b < NUM_AVATAR_BODY_BALLS; b++) { for (int b = 0; b < NUM_AVATAR_BODY_BALLS; b++) {
float distanceToCamera = glm::length(_cameraPosition - _bodyBall[b].position); float distanceToCamera = glm::length(_cameraPosition - _bodyBall[b].position);