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

Merge pull request #14173 from sethalves/fix-linux-build

Browse source 
fix build on clang 7
This commit is contained in:
John Conklin II 2018-10-19 11:13:43 -07:00 committed by GitHub
commit 9750cc2416
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -497,7 +497,7 @@ void AudioMixerClientData::processStreamPacket(ReceivedMessage& message, Concurr
if (newStream) { if (newStream) {
// whenever a stream is added, push it to the concurrent vector of streams added this frame // whenever a stream is added, push it to the concurrent vector of streams added this frame
addedStreams.emplace_back(getNodeID(), getNodeLocalID(), matchingStream->getStreamIdentifier(), matchingStream.get()); addedStreams.push_back(AddedStream(getNodeID(), getNodeLocalID(), matchingStream->getStreamIdentifier(), matchingStream.get()));
} }
} }

1
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -173,7 +173,6 @@ AvatarTransit::Status AvatarTransit::updatePosition(float deltaTime) {
Status status = Status::IDLE; Status status = Status::IDLE;
if (_isTransiting) { if (_isTransiting) {
float nextTime = _currentTime + deltaTime; float nextTime = _currentTime + deltaTime;
glm::vec3 newPosition;
if (nextTime >= _totalTime) { if (nextTime >= _totalTime) {
_currentPosition = _endPosition; _currentPosition = _endPosition;
_isTransiting = false; _isTransiting = false;