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

fix baking

Browse source
This commit is contained in:
SamGondelman 2019-04-25 15:56:56 -07:00
parent 6ce6877dfa
commit cde84982d0
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/oven/src/DomainBaker.cpp
View file

@ -222,7 +222,7 @@ void DomainBaker::addTextureBaker(const QString& property, const QString& url, i
// add this QJsonValueRef to our multi hash so that it can re-write the texture URL // add this QJsonValueRef to our multi hash so that it can re-write the texture URL
// to the baked version once the baker is complete // to the baked version once the baker is complete
// it doesn't really matter what this key is as long as it's consistent // it doesn't really matter what this key is as long as it's consistent
_entitiesNeedingRewrite.insert(textureURL.toDisplayString() + "^" + type, { property, jsonRef }); _entitiesNeedingRewrite.insert(textureURL.toDisplayString() + "^" + QString::number(type), { property, jsonRef });
} else { } else {
qDebug() << "Texture extension not supported: " << extension; qDebug() << "Texture extension not supported: " << extension;
} }
@ -502,7 +502,7 @@ void DomainBaker::handleFinishedTextureBaker() {
auto baker = qobject_cast<TextureBaker*>(sender()); auto baker = qobject_cast<TextureBaker*>(sender());
if (baker) { if (baker) {
QUrl rewriteKey = baker->getTextureURL().toDisplayString() + "^" + baker->getTextureType(); QUrl rewriteKey = baker->getTextureURL().toDisplayString() + "^" + QString::number(baker->getTextureType());
if (!baker->hasErrors()) { if (!baker->hasErrors()) {
// this TextureBaker is done and everything went according to plan // this TextureBaker is done and everything went according to plan
@ -756,10 +756,11 @@ void DomainBaker::writeNewEntitiesFile() {
// time to write out a main models.json.gz file // time to write out a main models.json.gz file
// first setup a document with the entities array below the entities key // first setup a document with the entities array below the entities key
_json.object()[ENTITIES_OBJECT_KEY] = _entities; QJsonObject json = _json.object();
json[ENTITIES_OBJECT_KEY] = _entities;
// turn that QJsonDocument into a byte array ready for compression // turn that QJsonDocument into a byte array ready for compression
QByteArray jsonByteArray = _json.toJson(); QByteArray jsonByteArray = QJsonDocument(json).toJson();
// compress the json byte array using gzip // compress the json byte array using gzip
QByteArray compressedJson; QByteArray compressedJson;