mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 13:58:51 +02:00
fix warnings
This commit is contained in:
parent
1c2c37ff44
commit
e7a8df306c
7 changed files with 3 additions and 13 deletions
|
@ -112,7 +112,6 @@ int EntityServer::sendSpecialPackets(const SharedNodePointer& node, OctreeQueryN
|
||||||
quint64 deletePacketSentAt = usecTimestampNow();
|
quint64 deletePacketSentAt = usecTimestampNow();
|
||||||
EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree);
|
EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree);
|
||||||
auto recentlyDeleted = tree->getRecentlyDeletedEntityIDs();
|
auto recentlyDeleted = tree->getRecentlyDeletedEntityIDs();
|
||||||
bool hasMoreToSend = true;
|
|
||||||
|
|
||||||
packetsSent = 0;
|
packetsSent = 0;
|
||||||
|
|
||||||
|
|
|
@ -135,8 +135,6 @@ void MessagesMixer::sendStatsPacket() {
|
||||||
void MessagesMixer::run() {
|
void MessagesMixer::run() {
|
||||||
ThreadedAssignment::commonInit(MESSAGES_MIXER_LOGGING_NAME, NodeType::MessagesMixer);
|
ThreadedAssignment::commonInit(MESSAGES_MIXER_LOGGING_NAME, NodeType::MessagesMixer);
|
||||||
|
|
||||||
NodeType_t owningNodeType = DependencyManager::get<NodeList>()->getOwnerType();
|
|
||||||
|
|
||||||
auto nodeList = DependencyManager::get<NodeList>();
|
auto nodeList = DependencyManager::get<NodeList>();
|
||||||
nodeList->addNodeTypeToInterestSet(NodeType::Agent);
|
nodeList->addNodeTypeToInterestSet(NodeType::Agent);
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,6 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isMine) {
|
if (isMine) {
|
||||||
MyAvatar* myAvatar = static_cast<MyAvatar*>(_owningAvatar);
|
|
||||||
auto player = DependencyManager::get<recording::Deck>();
|
auto player = DependencyManager::get<recording::Deck>();
|
||||||
// Only use face trackers when not playing back a recording.
|
// Only use face trackers when not playing back a recording.
|
||||||
if (!player->isPlaying()) {
|
if (!player->isPlaying()) {
|
||||||
|
|
|
@ -247,7 +247,6 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
|
||||||
return; // only simulate for own avatar
|
return; // only simulate for own avatar
|
||||||
}
|
}
|
||||||
|
|
||||||
MyAvatar* myAvatar = static_cast<MyAvatar*>(_owningAvatar);
|
|
||||||
auto player = DependencyManager::get<recording::Deck>();
|
auto player = DependencyManager::get<recording::Deck>();
|
||||||
if (player->isPlaying()) {
|
if (player->isPlaying()) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -909,13 +909,8 @@ void AudioClient::handleRecordedAudioInput(const QByteArray& audio) {
|
||||||
// we don't have an audioPacket yet - set that up now
|
// we don't have an audioPacket yet - set that up now
|
||||||
_audioPacket = NLPacket::create(PacketType::MicrophoneAudioWithEcho);
|
_audioPacket = NLPacket::create(PacketType::MicrophoneAudioWithEcho);
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME either discard stereo in the recording or record a stereo flag
|
// FIXME either discard stereo in the recording or record a stereo flag
|
||||||
const int numNetworkBytes = _isStereoInput
|
|
||||||
? AudioConstants::NETWORK_FRAME_BYTES_STEREO
|
|
||||||
: AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL;
|
|
||||||
const int numNetworkSamples = _isStereoInput
|
|
||||||
? AudioConstants::NETWORK_FRAME_SAMPLES_STEREO
|
|
||||||
: AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL;
|
|
||||||
|
|
||||||
auto nodeList = DependencyManager::get<NodeList>();
|
auto nodeList = DependencyManager::get<NodeList>();
|
||||||
SharedNodePointer audioMixer = nodeList->soloNodeOfType(NodeType::AudioMixer);
|
SharedNodePointer audioMixer = nodeList->soloNodeOfType(NodeType::AudioMixer);
|
||||||
|
|
|
@ -26,7 +26,8 @@ public:
|
||||||
private:
|
private:
|
||||||
virtual FrameConstPointer readFrame(size_t index) const override;
|
virtual FrameConstPointer readFrame(size_t index) const override;
|
||||||
QString _name { QUuid().toString() };
|
QString _name { QUuid().toString() };
|
||||||
mutable size_t _frameIndex { 0 };
|
|
||||||
|
//mutable size_t _frameIndex { 0 }; // FIXME - not in use
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,6 @@ QJsonValue glmToJson(const T& t) {
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
T glmFromJson(const QJsonValue& json) {
|
T glmFromJson(const QJsonValue& json) {
|
||||||
static const T DEFAULT_VALUE = T();
|
|
||||||
T result;
|
T result;
|
||||||
if (json.isArray()) {
|
if (json.isArray()) {
|
||||||
QJsonArray array = json.toArray();
|
QJsonArray array = json.toArray();
|
||||||
|
|
Loading…
Reference in a new issue