Merge pull request #4004 from Atlante45/modeluploader_scripting_interface

Entity upload

interface/src/Application.cpp

@@ -3626,16 +3626,6 @@ void Application::setMenuShortcutsEnabled(bool enabled) {
     setShortcutsEnabled(_window->menuBar(), enabled);
 }
 
-void Application::uploadModel(ModelType modelType) {
-    ModelUploader* uploader = new ModelUploader(modelType);
-    QThread* thread = new QThread();
-    thread->connect(uploader, SIGNAL(destroyed()), SLOT(quit()));
-    thread->connect(thread, SIGNAL(finished()), SLOT(deleteLater()));
-    uploader->connect(thread, SIGNAL(started()), SLOT(send()));
-
-    thread->start();
-}
-
 void Application::updateWindowTitle(){
 
     QString buildVersion = " (build " + applicationVersion() + ")";
@@ -4191,15 +4181,19 @@ void Application::toggleRunningScriptsWidget() {
 }
 
 void Application::uploadHead() {
-    uploadModel(HEAD_MODEL);
+    ModelUploader::uploadHead();
 }
 
 void Application::uploadSkeleton() {
-    uploadModel(SKELETON_MODEL);
+    ModelUploader::uploadSkeleton();
 }
 
 void Application::uploadAttachment() {
-    uploadModel(ATTACHMENT_MODEL);
+    ModelUploader::uploadAttachment();
+}
+
+void Application::uploadEntity() {
+    ModelUploader::uploadEntity();
 }
 
 void Application::openUrl(const QUrl& url) {

interface/src/Application.h

@@ -374,6 +374,7 @@ public slots:
     void uploadHead();
     void uploadSkeleton();
     void uploadAttachment();
+    void uploadEntity();
     
     void openUrl(const QUrl& url);
 
@@ -459,8 +460,6 @@ private:
 
     void setMenuShortcutsEnabled(bool enabled);
 
-    void uploadModel(ModelType modelType);
-
     static void attachNewHeadToNode(Node *newNode);
     static void* networkReceive(void* args); // network receive thread
 

interface/src/Menu.cpp

@@ -189,10 +189,14 @@ Menu::Menu() :
                                   SLOT(toggleAddressBar()));
 
     addDisabledActionAndSeparator(fileMenu, "Upload Avatar Model");
-    addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadHead, 0, Application::getInstance(), SLOT(uploadHead()));
+    addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadHead, 0,
-    addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadSkeleton, 0, Application::getInstance(), SLOT(uploadSkeleton()));
+                                  Application::getInstance(), SLOT(uploadHead()));
+    addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadSkeleton, 0,
+                                  Application::getInstance(), SLOT(uploadSkeleton()));
     addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadAttachment, 0,
                                   Application::getInstance(), SLOT(uploadAttachment()));
+    addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadEntity, 0,
+                                  Application::getInstance(), SLOT(uploadEntity()));
     addDisabledActionAndSeparator(fileMenu, "Settings");
     addActionToQMenuAndActionHash(fileMenu, MenuOption::SettingsImport, 0, this, SLOT(importSettings()));
     addActionToQMenuAndActionHash(fileMenu, MenuOption::SettingsExport, 0, this, SLOT(exportSettings()));

interface/src/Menu.h

@@ -482,6 +482,7 @@ namespace MenuOption {
     const QString TransmitterDrive = "Transmitter Drive";
     const QString TurnWithHead = "Turn using Head";
     const QString UploadAttachment = "Upload Attachment Model";
+    const QString UploadEntity = "Upload Entity Model";
     const QString UploadHead = "Upload Head Model";
     const QString UploadSkeleton = "Upload Skeleton Model";
     const QString UserInterface = "User Interface";

interface/src/ModelUploader.cpp

@@ -55,7 +55,8 @@ 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 BYTES_PER_MEGABYTES = 1024 * 1024;
+static const unsigned long MAX_SIZE = 50 * 1024 * BYTES_PER_MEGABYTES; // 50 GB (Virtually remove limit)
 static const int MAX_TEXTURE_SIZE = 1024;
 static const int TIMEOUT = 1000;
 static const int MAX_CHECK = 30;
@@ -63,6 +64,32 @@ static const int MAX_CHECK = 30;
 static const int QCOMPRESS_HEADER_POSITION = 0;
 static const int QCOMPRESS_HEADER_SIZE = 4;
 
+void ModelUploader::uploadModel(ModelType modelType) {
+    ModelUploader* uploader = new ModelUploader(modelType);
+    QThread* thread = new QThread();
+    thread->connect(uploader, SIGNAL(destroyed()), SLOT(quit()));
+    thread->connect(thread, SIGNAL(finished()), SLOT(deleteLater()));
+    uploader->connect(thread, SIGNAL(started()), SLOT(send()));
+    
+    thread->start();
+}
+
+void ModelUploader::uploadHead() {
+    uploadModel(HEAD_MODEL);
+}
+
+void ModelUploader::uploadSkeleton() {
+    uploadModel(SKELETON_MODEL);
+}
+
+void ModelUploader::uploadAttachment() {
+    uploadModel(ATTACHMENT_MODEL);
+}
+
+void ModelUploader::uploadEntity() {
+    uploadModel(ENTITY_MODEL);
+}
+
 ModelUploader::ModelUploader(ModelType modelType) :
     _lodCount(-1),
     _texturesCount(-1),
@@ -148,6 +175,91 @@ bool ModelUploader::zip() {
     FBXGeometry geometry = readFBX(fbxContents, QVariantHash());
     
     // make sure we have some basic mappings
+    populateBasicMapping(mapping, filename, geometry);
+    
+    // open the dialog to configure the rest
+    ModelPropertiesDialog properties(_modelType, mapping, basePath, geometry);
+    if (properties.exec() == QDialog::Rejected) {
+        return false;
+    }
+    mapping = properties.getMapping();
+    
+    QByteArray nameField = mapping.value(NAME_FIELD).toByteArray();
+    QString urlBase;
+    if (!nameField.isEmpty()) {
+        QHttpPart textPart;
+        textPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"model_name\"");
+        textPart.setBody(nameField);
+        _dataMultiPart->append(textPart);
+        urlBase = S3_URL + "/models/" + MODEL_TYPE_NAMES[_modelType] + "/" + nameField;
+        _url = urlBase + ".fst";
+       
+    } else {
+        QMessageBox::warning(NULL,
+                             QString("ModelUploader::zip()"),
+                             QString("Model name is missing in the .fst file."),
+                             QMessageBox::Ok);
+        qDebug() << "[Warning] " << QString("Model name is missing in the .fst file.");
+        return false;
+    }
+    
+    QByteArray texdirField = mapping.value(TEXDIR_FIELD).toByteArray();
+    QString texDir;
+    _textureBase = urlBase + "/textures/";
+    if (!texdirField.isEmpty()) {
+        texDir = basePath + "/" + texdirField;
+        QFileInfo texInfo(texDir);
+        if (!texInfo.exists() || !texInfo.isDir()) {
+            QMessageBox::warning(NULL,
+                                 QString("ModelUploader::zip()"),
+                                 QString("Texture directory could not be found."),
+                                 QMessageBox::Ok);
+            qDebug() << "[Warning] " << QString("Texture directory could not be found.");
+            return false;
+        }
+    }
+    
+    QVariantHash lodField = mapping.value(LOD_FIELD).toHash();
+    for (QVariantHash::const_iterator it = lodField.constBegin(); it != lodField.constEnd(); it++) {
+        QFileInfo lod(basePath + "/" + it.key());
+        if (!lod.exists() || !lod.isFile()) { // Check existence
+            QMessageBox::warning(NULL,
+                                 QString("ModelUploader::zip()"),
+                                 QString("LOD file %1 could not be found.").arg(lod.fileName()),
+                                 QMessageBox::Ok);
+            qDebug() << "[Warning] " << QString("FBX file %1 could not be found.").arg(lod.fileName());
+        }
+        // Compress and copy
+        if (!addPart(lod.filePath(), QString("lod%1").arg(++_lodCount))) {
+            return false;
+        }
+    }
+    
+    // Write out, compress and copy the fst
+    if (!addPart(*fst, writeMapping(mapping), QString("fst"))) {
+        return false;
+    }
+    
+    // Compress and copy the fbx
+    if (!addPart(fbx, fbxContents, "fbx")) {
+        return false;
+    }
+                
+    if (!addTextures(texDir, geometry)) {
+        return false;
+    }
+    
+    QHttpPart textPart;
+    textPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data;"
+                       " name=\"model_category\"");
+    textPart.setBody(MODEL_TYPE_NAMES[_modelType]);
+    _dataMultiPart->append(textPart);
+    
+    _readyToSend = true;
+    return true;
+}
+
+void ModelUploader::populateBasicMapping(QVariantHash& mapping, QString filename, FBXGeometry geometry) {
     if (!mapping.contains(NAME_FIELD)) {
         mapping.insert(NAME_FIELD, QFileInfo(filename).baseName());
     }
@@ -250,87 +362,6 @@ bool ModelUploader::zip() {
         blendshapes.insertMulti("Sneer", QVariantList() << "Squint_Right" << 0.5);
         mapping.insert(BLENDSHAPE_FIELD, blendshapes);
     }
-    
-    // open the dialog to configure the rest
-    ModelPropertiesDialog properties(_modelType, mapping, basePath, geometry);
-    if (properties.exec() == QDialog::Rejected) {
-        return false;
-    }
-    mapping = properties.getMapping();
-    
-    QByteArray nameField = mapping.value(NAME_FIELD).toByteArray();
-    QString urlBase;
-    if (!nameField.isEmpty()) {
-        QHttpPart textPart;
-        textPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"model_name\"");
-        textPart.setBody(nameField);
-        _dataMultiPart->append(textPart);
-        urlBase = S3_URL + "/models/" + MODEL_TYPE_NAMES[_modelType] + "/" + nameField;
-        _url = urlBase + ".fst";
-       
-    } else {
-        QMessageBox::warning(NULL,
-                             QString("ModelUploader::zip()"),
-                             QString("Model name is missing in the .fst file."),
-                             QMessageBox::Ok);
-        qDebug() << "[Warning] " << QString("Model name is missing in the .fst file.");
-        return false;
-    }
-    
-    QByteArray texdirField = mapping.value(TEXDIR_FIELD).toByteArray();
-    QString texDir;
-    _textureBase = urlBase + "/textures/";
-    if (!texdirField.isEmpty()) {
-        texDir = basePath + "/" + texdirField;
-        QFileInfo texInfo(texDir);
-        if (!texInfo.exists() || !texInfo.isDir()) {
-            QMessageBox::warning(NULL,
-                                 QString("ModelUploader::zip()"),
-                                 QString("Texture directory could not be found."),
-                                 QMessageBox::Ok);
-            qDebug() << "[Warning] " << QString("Texture directory could not be found.");
-            return false;
-        }
-    }
-    
-    QVariantHash lodField = mapping.value(LOD_FIELD).toHash();
-    for (QVariantHash::const_iterator it = lodField.constBegin(); it != lodField.constEnd(); it++) {
-        QFileInfo lod(basePath + "/" + it.key());
-        if (!lod.exists() || !lod.isFile()) { // Check existence
-            QMessageBox::warning(NULL,
-                                 QString("ModelUploader::zip()"),
-                                 QString("LOD file %1 could not be found.").arg(lod.fileName()),
-                                 QMessageBox::Ok);
-            qDebug() << "[Warning] " << QString("FBX file %1 could not be found.").arg(lod.fileName());
-        }
-        // Compress and copy
-        if (!addPart(lod.filePath(), QString("lod%1").arg(++_lodCount))) {
-            return false;
-        }
-    }
-    
-    // Write out, compress and copy the fst
-    if (!addPart(*fst, writeMapping(mapping), QString("fst"))) {
-        return false;
-    }
-    
-    // Compress and copy the fbx
-    if (!addPart(fbx, fbxContents, "fbx")) {
-        return false;
-    }
-                
-    if (!addTextures(texDir, geometry)) {
-        return false;
-    }
-    
-    QHttpPart textPart;
-    textPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data;"
-                       " name=\"model_category\"");
-    textPart.setBody(MODEL_TYPE_NAMES[_modelType]);
-    _dataMultiPart->append(textPart);
-    
-    _readyToSend = true;
-    return true;
 }
 
 void ModelUploader::send() {
@@ -590,9 +621,9 @@ bool ModelUploader::addPart(const QFile& file, const QByteArray& contents, const
     if (_totalSize > MAX_SIZE) {
         QMessageBox::warning(NULL,
                              QString("ModelUploader::zip()"),
-                             QString("Model too big, over %1 Bytes.").arg(MAX_SIZE),
+                             QString("Model too big, over %1 MB.").arg(MAX_SIZE / BYTES_PER_MEGABYTES),
                              QMessageBox::Ok);
-        qDebug() << "[Warning] " << QString("Model too big, over %1 Bytes.").arg(MAX_SIZE);
+        qDebug() << "[Warning] " << QString("Model too big, over %1 MB.").arg(MAX_SIZE / BYTES_PER_MEGABYTES);
         return false;
     }
     qDebug() << "Current model size: " << _totalSize;
@@ -613,8 +644,8 @@ ModelPropertiesDialog::ModelPropertiesDialog(ModelType modelType, const QVariant
     _modelType(modelType),
     _originalMapping(originalMapping),
     _basePath(basePath),
-    _geometry(geometry) {
+    _geometry(geometry)
-    
+{
     setWindowTitle("Set Model Properties");
     
     QFormLayout* form = new QFormLayout();
@@ -629,6 +660,7 @@ ModelPropertiesDialog::ModelPropertiesDialog(ModelType modelType, const QVariant
     _scale->setMaximum(FLT_MAX);
     _scale->setSingleStep(0.01);
     
+    if (_modelType != ENTITY_MODEL) {
         if (_modelType == ATTACHMENT_MODEL) {
             QHBoxLayout* translation = new QHBoxLayout();
             form->addRow("Translation:", translation);
@@ -657,6 +689,7 @@ ModelPropertiesDialog::ModelPropertiesDialog(ModelType modelType, const QVariant
             _freeJoints->addWidget(newFreeJoint);
             connect(newFreeJoint, SIGNAL(clicked(bool)), SLOT(createNewFreeJoint()));
         }
+    }
     
     QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok |
         QDialogButtonBox::Cancel | QDialogButtonBox::Reset);
@@ -683,6 +716,7 @@ QVariantHash ModelPropertiesDialog::getMapping() const {
     }
     mapping.insert(JOINT_INDEX_FIELD, jointIndices);
     
+    if (_modelType != ENTITY_MODEL) {
         QVariantHash joints = mapping.value(JOINT_FIELD).toHash();
         if (_modelType == ATTACHMENT_MODEL) {
             glm::vec3 pivot;
@@ -715,6 +749,7 @@ QVariantHash ModelPropertiesDialog::getMapping() const {
             }
         }
         mapping.insert(JOINT_FIELD, joints);
+    }
     
     return mapping;
 }
@@ -729,6 +764,8 @@ void ModelPropertiesDialog::reset() {
     _scale->setValue(_originalMapping.value(SCALE_FIELD).toDouble());
     
     QVariantHash jointHash = _originalMapping.value(JOINT_FIELD).toHash();
+    
+    if (_modelType != ENTITY_MODEL) {
         if (_modelType == ATTACHMENT_MODEL) {
             _translationX->setValue(_originalMapping.value(TRANSLATION_X_FIELD).toDouble());
             _translationY->setValue(_originalMapping.value(TRANSLATION_Y_FIELD).toDouble());
@@ -759,6 +796,7 @@ void ModelPropertiesDialog::reset() {
             }
         }
     }
+}
 
 void ModelPropertiesDialog::chooseTextureDirectory() {
     QString directory = QFileDialog::getExistingDirectory(this, "Choose Texture Directory",

interface/src/ModelUploader.h

@@ -33,13 +33,15 @@ class ModelUploader : public QObject {
     Q_OBJECT
     
 public:
-    ModelUploader(ModelType type);
+    static void uploadModel(ModelType modelType);
-    ~ModelUploader();
     
-public slots:
+    static void uploadHead();
-    void send();
+    static void uploadSkeleton();
+    static void uploadAttachment();
+    static void uploadEntity();
     
 private slots:
+    void send();
     void checkJSON(QNetworkReply& requestReply);
     void uploadUpdate(qint64 bytesSent, qint64 bytesTotal);
     void uploadSuccess(QNetworkReply& requestReply);
@@ -48,12 +50,21 @@ private slots:
     void processCheck();
     
 private:
+    ModelUploader(ModelType type);
+    ~ModelUploader();
+    
+    void populateBasicMapping(QVariantHash& mapping, QString filename, FBXGeometry geometry);
+    bool zip();
+    bool addTextures(const QString& texdir, const FBXGeometry& geometry);
+    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);
+    
     QString _url;
     QString _textureBase;
     QSet<QByteArray> _textureFilenames;
     int _lodCount;
     int _texturesCount;
-    int _totalSize;
+    unsigned long _totalSize;
     ModelType _modelType;
     bool _readyToSend;
     
@@ -64,12 +75,6 @@ private:
     
     QDialog* _progressDialog;
     QProgressBar* _progressBar;
-    
-    
-    bool zip();
-    bool addTextures(const QString& texdir, const FBXGeometry& geometry);
-    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.

interface/src/ui/ModelsBrowser.cpp

@@ -12,16 +12,19 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QGridLayout>
+#include <QFileInfo>
 #include <QHeaderView>
+#include <QLineEdit>
 #include <QMessageBox>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QThread>
 #include <QUrl>
-#include <qurlquery.h>
+#include <QUrlQuery>
 #include <QXmlStreamReader>
 
 #include <NetworkAccessManager.h>
 
-#include "Application.h"
-
 #include "ModelsBrowser.h"
 
 const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "attachments" };