Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 21:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feedback changes

Browse source
This commit is contained in:
raveenajain 2019-02-05 09:23:10 -08:00
parent 9fe42a0549
commit d109c0fb1b
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -354,11 +354,9 @@ bool GLTFSerializer::addImage(const QJsonObject& object) {
getStringVal(object, "uri", image.uri, image.defined); getStringVal(object, "uri", image.uri, image.defined);
if (image.uri.contains("data:image/png;base64,")) { if (image.uri.contains("data:image/png;base64,")) {
image.mimeType = getImageMimeType("image/png"); image.mimeType = getImageMimeType("image/png");
} } else if (image.uri.contains("data:image/jpeg;base64,")) {
if (image.uri.contains("data:image/jpeg;base64,")) {
image.mimeType = getImageMimeType("image/jpeg"); image.mimeType = getImageMimeType("image/jpeg");
} } else if (getStringVal(object, "mimeType", mime, image.defined)) {
if (getStringVal(object, "mimeType", mime, image.defined)) {
image.mimeType = getImageMimeType(mime); image.mimeType = getImageMimeType(mime);
} }
getIntVal(object, "bufferView", image.bufferView, image.defined); getIntVal(object, "bufferView", image.bufferView, image.defined);
@ -948,7 +946,8 @@ bool GLTFSerializer::readBinary(const QString& url, QByteArray& outdata) {
bool success; bool success;
if (url.contains("data:application/octet-stream;base64,")) { if (url.contains("data:application/octet-stream;base64,")) {
std::tie<bool, QByteArray>(success, outdata) = std::make_tuple(true, requestEmbeddedData(url)); outdata = requestEmbeddedData(url);
success = outdata.isEmpty() ? false : true;
} else { } else {
QUrl binaryUrl = _url.resolved(url); QUrl binaryUrl = _url.resolved(url);
std::tie<bool, QByteArray>(success, outdata) = requestData(binaryUrl); std::tie<bool, QByteArray>(success, outdata) = requestData(binaryUrl);
@ -987,11 +986,7 @@ std::tuple<bool, QByteArray> GLTFSerializer::requestData(QUrl& url) {
QByteArray GLTFSerializer::requestEmbeddedData(const QString& url) { QByteArray GLTFSerializer::requestEmbeddedData(const QString& url) {
QString binaryUrl = url.split(",")[1]; QString binaryUrl = url.split(",")[1];
return binaryUrl.isEmpty() ? QByteArray() : QByteArray::fromBase64(binaryUrl.toUtf8());
QByteArray urlBin = binaryUrl.toUtf8();
QByteArray data = QByteArray::fromBase64(urlBin);
return data;
} }
@ -1033,8 +1028,7 @@ HFMTexture GLTFSerializer::getHFMTexture(const GLTFTexture& texture) {
fbxtex.filename = textureUrl.toEncoded(); fbxtex.filename = textureUrl.toEncoded();
if (url.contains("data:image/jpeg;base64,") || url.contains("data:image/png;base64,")) { if (url.contains("data:image/jpeg;base64,") || url.contains("data:image/png;base64,")) {
QByteArray result = requestEmbeddedData(url); fbxtex.content = requestEmbeddedData(url);
fbxtex.content = result;
} }
} }
return fbxtex; return fbxtex;