Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Recode textures on upload if they're uncompressed or bigger than our maximum

Browse source 
size.
This commit is contained in:
Andrzej Kapolka 2014-05-01 18:51:57 -07:00
parent 5e1f18635f
commit 28b9033373
2 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
interface/src/ModelUploader.cpp
View file

@ -19,6 +19,7 @@
#include <QGridLayout>
#include <QHBoxLayout>
#include <QHttpMultiPart>
#include <QImage>
#include <QLineEdit>
#include <QMessageBox>
#include <QProgressBar>
@ -51,6 +52,7 @@ static const QString MODEL_URL = "/api/v1/models";
static const QString SETTING_NAME = "LastModelUploadLocation";
static const int MAX_SIZE = 10 * 1024 * 1024; // 10 MB
static const int MAX_TEXTURE_SIZE = 1024;
static const int TIMEOUT = 1000;
static const int MAX_CHECK = 30;
@ -429,13 +431,13 @@ bool ModelUploader::addTextures(const QString& texdir, const FBXGeometry& geomet
foreach (FBXMeshPart part, mesh.parts) {
if (!part.diffuseTexture.filename.isEmpty() && part.diffuseTexture.content.isEmpty()) {
if (!addPart(texdir + "/" + part.diffuseTexture.filename,
QString("texture%1").arg(++_texturesCount))) {
QString("texture%1").arg(++_texturesCount), true)) {
return false;
}
}
if (!part.normalTexture.filename.isEmpty() && part.normalTexture.content.isEmpty()) {
if (!addPart(texdir + "/" + part.normalTexture.filename,
QString("texture%1").arg(++_texturesCount))) {
QString("texture%1").arg(++_texturesCount), true)) {
return false;
}
}
@ -445,7 +447,7 @@ bool ModelUploader::addTextures(const QString& texdir, const FBXGeometry& geomet
return true;
}
bool ModelUploader::addPart(const QString &path, const QString& name) {
bool ModelUploader::addPart(const QString &path, const QString& name, bool isTexture) {
QFile file(path);
if (!file.open(QIODevice::ReadOnly)) {
QMessageBox::warning(NULL,
@ -455,11 +457,29 @@ bool ModelUploader::addPart(const QString &path, const QString& name) {
qDebug() << "[Warning] " << QString("Could not open %1").arg(path);
return false;
}
return addPart(file, file.readAll(), name);
return addPart(file, file.readAll(), name, isTexture);
}
bool ModelUploader::addPart(const QFile& file, const QByteArray& contents, const QString& name) {
QByteArray buffer = qCompress(contents);
bool ModelUploader::addPart(const QFile& file, const QByteArray& contents, const QString& name, bool isTexture) {
QFileInfo fileInfo(file);
QByteArray recodedContents = contents;
if (isTexture) {
QString extension = fileInfo.suffix().toLower();
bool isJpeg = (extension == "jpg");
bool mustRecode = !(isJpeg || extension == "png");
QImage image = QImage::fromData(contents);
if (image.width() > MAX_TEXTURE_SIZE || image.height() > MAX_TEXTURE_SIZE) {
image = image.scaled(MAX_TEXTURE_SIZE, MAX_TEXTURE_SIZE, Qt::KeepAspectRatio);
mustRecode = true;
}
if (mustRecode) {
QBuffer buffer;
buffer.open(QIODevice::WriteOnly);
image.save(&buffer, isJpeg ? "JPG" : "PNG");
recodedContents = buffer.data();
}
}
QByteArray buffer = qCompress(recodedContents);
// Qt's qCompress() default compression level (-1) is the standard zLib compression.
// Here remove Qt's custom header that prevent the data server from uncompressing the files with zLib.
@ -475,7 +495,7 @@ bool ModelUploader::addPart(const QFile& file, const QByteArray& contents, const
qDebug() << "File " << QFileInfo(file).fileName() << " added to model.";
_totalSize += file.size();
_totalSize += recodedContents.size();
if (_totalSize > MAX_SIZE) {
QMessageBox::warning(NULL,
QString("ModelUploader::zip()"),
@ -597,7 +617,10 @@ void ModelPropertiesDialog::reset() {
delete _freeJoints->itemAt(0)->widget();
}
foreach (const QVariant& joint, _originalMapping.values(FREE_JOINT_FIELD)) {
createNewFreeJoint(joint.toString());
QString jointName = joint.toString();
if (_geometry.jointIndices.contains(jointName)) {
createNewFreeJoint(jointName);
}
}
}
}

4
interface/src/ModelUploader.h
View file

@ -64,8 +64,8 @@ private:
bool zip();
bool addTextures(const QString& texdir, const FBXGeometry& geometry);
bool addPart(const QString& path, const QString& name);
bool addPart(const QFile& file, const QByteArray& contents, const QString& name);
bool addPart(const QString& path, const QString& name, bool isTexture = false);
bool addPart(const QFile& file, const QByteArray& contents, const QString& name, bool isTexture = false);
};
/// A dialog that allows customization of various model properties.