Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 16:50:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #488 from ZappoMan/master

Browse source 
support file:// urls for avitar voxles
This commit is contained in:
birarda 2013-06-05 09:37:24 -07:00
commit 69ed86de59
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/AvatarVoxelSystem.cpp
View file

@ -83,6 +83,15 @@ void AvatarVoxelSystem::loadVoxelsFromURL(const QUrl& url) {
killLocalVoxels(); killLocalVoxels();
// handle "file://" urls...
if (url.isLocalFile()) {
QString pathString = url.path();
QByteArray pathAsAscii = pathString.toAscii();
const char* path = pathAsAscii.data();
readFromSVOFile(path);
return;
}
// load the URL data asynchronously // load the URL data asynchronously
if (!url.isValid()) { if (!url.isValid()) {
return; return;
@ -186,6 +195,15 @@ void AvatarVoxelSystem::handleVoxelDownloadProgress(qint64 bytesReceived, qint64
if (bytesReceived < bytesTotal) { if (bytesReceived < bytesTotal) {
return; return;
} }
// XXXBHG - I don't know why this can happen, but when I was testing this, I used a dropbox URL
// and it resulted in a case where the bytesTotal == bytesReceived, but the _voxelReply was NULL
// which needless to say caused crashes below. I've added this quick guard to protect against
// this case, but it probably should be investigated.
if (!_voxelReply) {
return;
}
QByteArray entirety = _voxelReply->readAll(); QByteArray entirety = _voxelReply->readAll();
_voxelReply->deleteLater(); _voxelReply->deleteLater();
_voxelReply = 0; _voxelReply = 0;