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

fix warnings

Browse source
This commit is contained in:
Brad Hefta-Gaub 2017-02-17 21:58:35 -08:00
parent 4570b3439d
commit d233430809
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/Agent.cpp
View file

@ -546,7 +546,7 @@ void Agent::processAgentAvatar() {
auto scriptedAvatar = DependencyManager::get<ScriptableAvatar>(); auto scriptedAvatar = DependencyManager::get<ScriptableAvatar>();
AvatarData::AvatarDataDetail dataDetail = (randFloat() < AVATAR_SEND_FULL_UPDATE_RATIO) ? AvatarData::SendAllData : AvatarData::CullSmallData; AvatarData::AvatarDataDetail dataDetail = (randFloat() < AVATAR_SEND_FULL_UPDATE_RATIO) ? AvatarData::SendAllData : AvatarData::CullSmallData;
QByteArray avatarByteArray = scriptedAvatar->toByteArray(dataDetail); QByteArray avatarByteArray = scriptedAvatar->toByteArrayStateful(dataDetail);
scriptedAvatar->doneEncoding(true); scriptedAvatar->doneEncoding(true);
static AvatarDataSequenceNumber sequenceNumber = 0; static AvatarDataSequenceNumber sequenceNumber = 0;

1
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -132,6 +132,7 @@ void AvatarMixer::start() {
// DONE --- 10) FIXME on sending identity packets // DONE --- 10) FIXME on sending identity packets
// DONE --- 12) FIXME _maxKbpsPerNode // DONE --- 12) FIXME _maxKbpsPerNode
// DONE --- 11) FIXME ++_sumListeners; // DONE --- 11) FIXME ++_sumListeners;
// DONE --- 14) fix toByteArray() virtual hiding!!!
// //
// 4) Error in PacketList::writeData - attempted to write a segment to an unordered packet that is larger than the payload size. // 4) Error in PacketList::writeData - attempted to write a segment to an unordered packet that is larger than the payload size.
// 4b) some kind of a better approach to handling otherAvatar.toByteArray() for content that is larger than MTU // 4b) some kind of a better approach to handling otherAvatar.toByteArray() for content that is larger than MTU

4
assignment-client/src/avatars/ScriptableAvatar.cpp
View file

@ -14,9 +14,9 @@
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include "ScriptableAvatar.h" #include "ScriptableAvatar.h"
QByteArray ScriptableAvatar::toByteArray(AvatarDataDetail dataDetail) { QByteArray ScriptableAvatar::toByteArrayStateful(AvatarDataDetail dataDetail) {
_globalPosition = getPosition(); _globalPosition = getPosition();
return AvatarData::toByteArray(dataDetail); return AvatarData::toByteArrayStateful(dataDetail);
} }

2
assignment-client/src/avatars/ScriptableAvatar.h
View file

@ -28,7 +28,7 @@ public:
Q_INVOKABLE AnimationDetails getAnimationDetails(); Q_INVOKABLE AnimationDetails getAnimationDetails();
virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override; virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override;
virtual QByteArray toByteArray(AvatarDataDetail dataDetail) override; virtual QByteArray toByteArrayStateful(AvatarDataDetail dataDetail) override;
private slots: private slots: