Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 03:41:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use more correct method name

Browse source
This commit is contained in:
Andrew Meadows 2017-08-18 13:35:13 -07:00
parent 65cf7b4f61
commit 8ad41227ce
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -458,7 +458,7 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
return _truePacketsSent; return _truePacketsSent;
} }
bool OctreeSendThread::traverseAndBuildPacket(EncodeBitstreamParams& params) { bool OctreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstreamParams& params) {
bool somethingToSend = false; bool somethingToSend = false;
OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(params.nodeData); OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(params.nodeData);
if (!nodeData->elementBag.isEmpty()) { if (!nodeData->elementBag.isEmpty()) {
@ -520,7 +520,7 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
bool lastNodeDidntFit = false; // assume each node fits bool lastNodeDidntFit = false; // assume each node fits
params.stopReason = EncodeBitstreamParams::UNKNOWN; // reset params.stopReason before traversal params.stopReason = EncodeBitstreamParams::UNKNOWN; // reset params.stopReason before traversal
somethingToSend = traverseAndBuildPacket(params); somethingToSend = traverseTreeAndBuildNextPacketPayload(params);
if (params.stopReason == EncodeBitstreamParams::DIDNT_FIT) { if (params.stopReason == EncodeBitstreamParams::DIDNT_FIT) {
lastNodeDidntFit = true; lastNodeDidntFit = true;

2
assignment-client/src/octree/OctreeSendThread.h
View file

@ -55,7 +55,7 @@ protected:
virtual void preDistributionProcessing() {}; virtual void preDistributionProcessing() {};
virtual void traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData, virtual void traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData,
bool viewFrustumChanged, bool isFullScene); bool viewFrustumChanged, bool isFullScene);
virtual bool traverseAndBuildPacket(EncodeBitstreamParams& params); virtual bool traverseTreeAndBuildNextPacketPayload(EncodeBitstreamParams& params);
OctreeServer* _myServer { nullptr }; OctreeServer* _myServer { nullptr };
QWeakPointer<Node> _node; QWeakPointer<Node> _node;