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

Fix style in NetworkTexture

Browse source
This commit is contained in:
Ryan Huffman 2017-04-27 12:01:55 -07:00
parent 42da429414
commit 149f87e734
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -473,19 +473,16 @@ void NetworkTexture::ktxMipRequestFinished() {
texture->assignStoredMip(_ktxMipLevelRangeInFlight.first, texture->assignStoredMip(_ktxMipLevelRangeInFlight.first,
_ktxMipRequest->getData().size(), reinterpret_cast<uint8_t*>(_ktxMipRequest->getData().data())); _ktxMipRequest->getData().size(), reinterpret_cast<uint8_t*>(_ktxMipRequest->getData().data()));
_lowestKnownPopulatedMip = _textureSource->getGPUTexture()->minAvailableMipLevel(); _lowestKnownPopulatedMip = _textureSource->getGPUTexture()->minAvailableMipLevel();
} } else {
else {
qWarning(networking) << "Trying to update mips but texture is null"; qWarning(networking) << "Trying to update mips but texture is null";
} }
finishedLoading(true); finishedLoading(true);
_ktxResourceState = WAITING_FOR_MIP_REQUEST; _ktxResourceState = WAITING_FOR_MIP_REQUEST;
} } else {
else {
finishedLoading(false); finishedLoading(false);
if (handleFailedRequest(_ktxMipRequest->getResult())) { if (handleFailedRequest(_ktxMipRequest->getResult())) {
_ktxResourceState = PENDING_MIP_REQUEST; _ktxResourceState = PENDING_MIP_REQUEST;
} } else {
else {
qWarning(networking) << "Failed to load mip: " << _url; qWarning(networking) << "Failed to load mip: " << _url;
_ktxResourceState = FAILED_TO_LOAD; _ktxResourceState = FAILED_TO_LOAD;
} }
@ -497,8 +494,7 @@ void NetworkTexture::ktxMipRequestFinished() {
if (_ktxResourceState == WAITING_FOR_MIP_REQUEST && _lowestRequestedMipLevel < _lowestKnownPopulatedMip) { if (_ktxResourceState == WAITING_FOR_MIP_REQUEST && _lowestRequestedMipLevel < _lowestKnownPopulatedMip) {
startRequestForNextMipLevel(); startRequestForNextMipLevel();
} }
} } else {
else {
qWarning() << "Mip request finished in an unexpected state: " << _ktxResourceState; qWarning() << "Mip request finished in an unexpected state: " << _ktxResourceState;
} }
} }