Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 20:44:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

read in embedded data

Browse source
This commit is contained in:
raveenajain 2019-02-01 11:27:43 -08:00
parent f73296182c
commit d1d8832e7a
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -352,9 +352,15 @@ bool GLTFSerializer::addImage(const QJsonObject& object) {
QString mime;
getStringVal(object, "uri", image.uri, image.defined);
if (image.uri.contains("data:image/png;base64,")) {
image.mimeType = getImageMimeType("image/png");
}
if (image.uri.contains("data:image/jpeg;base64,")) {
image.mimeType = getImageMimeType("image/jpeg");
}
if (getStringVal(object, "mimeType", mime, image.defined)) {
image.mimeType = getImageMimeType(mime);
}
}
getIntVal(object, "bufferView", image.bufferView, image.defined);
_file.images.push_back(image);
@ -941,9 +947,8 @@ HFMModel::Pointer GLTFSerializer::read(const QByteArray& data, const QVariantHas
bool GLTFSerializer::readBinary(const QString& url, QByteArray& outdata) {
bool success;
if (url.contains("data:application/octet-stream;base64,") || url.contains("data:image/png;base64,") || url.contains("data:image/jpeg;base64,")) {
QString binaryUrl = url.split(",")[1];
std::tie<bool, QByteArray>(success, outdata) = requestEmbeddedData(binaryUrl);
if (url.contains("data:application/octet-stream;base64,")) {
std::tie<bool, QByteArray>(success, outdata) = std::make_tuple(true, requestEmbeddedData(url));
} else {
QUrl binaryUrl = _url.resolved(url);
std::tie<bool, QByteArray>(success, outdata) = requestData(binaryUrl);
@ -980,11 +985,13 @@ std::tuple<bool, QByteArray> GLTFSerializer::requestData(QUrl& url) {
}
}
std::tuple<bool, QByteArray> GLTFSerializer::requestEmbeddedData(QString binaryUrl) {
QByteArray urlBin = binaryUrl.toUtf8();
QByteArray result = QByteArray::fromBase64(urlBin);
QByteArray GLTFSerializer::requestEmbeddedData(const QString& url) {
QString binaryUrl = url.split(",")[1];
return std::make_tuple(true, result);
QByteArray urlBin = binaryUrl.toUtf8();
QByteArray data = QByteArray::fromBase64(urlBin);
return data;
}
@ -1018,11 +1025,17 @@ HFMTexture GLTFSerializer::getHFMTexture(const GLTFTexture& texture) {
if (texture.defined["source"]) {
QString url = _file.images[texture.source].uri;
QString fname = QUrl(url).fileName();
QUrl textureUrl = _url.resolved(url);
qCDebug(modelformat) << "fname: " << fname;
fbxtex.name = fname;
fbxtex.filename = textureUrl.toEncoded();
if (url.contains("data:image/jpeg;base64,") || url.contains("data:image/png;base64,")) {
QByteArray result = requestEmbeddedData(url);
fbxtex.content = result;
}
}
return fbxtex;
}

3
libraries/fbx/src/GLTFSerializer.h
View file

@ -772,7 +772,8 @@ private:
QVector<glm::vec3>& out_vertices, QVector<glm::vec3>& out_normals);
std::tuple<bool, QByteArray> requestData(QUrl& url);
std::tuple<bool, QByteArray> requestEmbeddedData(QString binaryUrl);
QByteArray requestEmbeddedData(const QString& url);
QNetworkReply* request(QUrl& url, bool isTest);
bool doesResourceExist(const QString& url);