From 363f545f7cdc0d166af2649c30437b68478b5259 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 9 May 2014 17:50:08 -0700 Subject: [PATCH 1/3] After uploading, refresh the uploaded files so that they are immediately redownloaded. --- interface/src/ModelUploader.cpp | 25 +++++++---- interface/src/ModelUploader.h | 2 + interface/src/renderer/GeometryCache.cpp | 9 ++++ interface/src/renderer/GeometryCache.h | 1 + interface/src/renderer/Model.cpp | 3 ++ libraries/shared/src/ResourceCache.cpp | 55 ++++++++++++++++++------ libraries/shared/src/ResourceCache.h | 7 +++ 7 files changed, 79 insertions(+), 23 deletions(-) diff --git a/interface/src/ModelUploader.cpp b/interface/src/ModelUploader.cpp index ce8691998d..ec7fcee6f2 100644 --- a/interface/src/ModelUploader.cpp +++ b/interface/src/ModelUploader.cpp @@ -49,7 +49,7 @@ static const QString TRANSLATION_Z_FIELD = "tz"; static const QString JOINT_FIELD = "joint"; static const QString FREE_JOINT_FIELD = "freeJoint"; -static const QString S3_URL = "http://highfidelity-public.s3-us-west-1.amazonaws.com"; +static const QString S3_URL = "http://public.highfidelity.io"; static const QString DATA_SERVER_URL = "https://data-web.highfidelity.io"; static const QString MODEL_URL = "/api/v1/models"; @@ -201,12 +201,15 @@ bool ModelUploader::zip() { 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); - _url = S3_URL + "/models/" + MODEL_TYPE_NAMES[_modelType] + "/" + nameField + ".fst"; + urlBase = S3_URL + "/models/" + MODEL_TYPE_NAMES[_modelType] + "/" + nameField; + _url = urlBase + ".fst"; + } else { QMessageBox::warning(NULL, QString("ModelUploader::zip()"), @@ -218,6 +221,7 @@ bool ModelUploader::zip() { QByteArray texdirField = mapping.value(TEXDIR_FIELD).toByteArray(); QString texDir; + _textureBase = urlBase + "/textures/"; if (!texdirField.isEmpty()) { texDir = basePath + "/" + texdirField; QFileInfo texInfo(texDir); @@ -407,6 +411,10 @@ void ModelUploader::processCheck() { QString("ModelUploader::processCheck()"), QString("Your model is now available in the browser."), QMessageBox::Ok); + Application::getInstance()->getGeometryCache()->refresh(_url); + foreach (const QByteArray& filename, _textureFilenames) { + Application::getInstance()->getTextureCache()->refresh(_textureBase + filename); + } deleteLater(); break; case QNetworkReply::ContentNotFoundError: @@ -428,32 +436,31 @@ void ModelUploader::processCheck() { } bool ModelUploader::addTextures(const QString& texdir, const FBXGeometry& geometry) { - QSet added; foreach (FBXMesh mesh, geometry.meshes) { foreach (FBXMeshPart part, mesh.parts) { if (!part.diffuseTexture.filename.isEmpty() && part.diffuseTexture.content.isEmpty() && - !added.contains(part.diffuseTexture.filename)) { + !_textureFilenames.contains(part.diffuseTexture.filename)) { if (!addPart(texdir + "/" + part.diffuseTexture.filename, QString("texture%1").arg(++_texturesCount), true)) { return false; } - added.insert(part.diffuseTexture.filename); + _textureFilenames.insert(part.diffuseTexture.filename); } if (!part.normalTexture.filename.isEmpty() && part.normalTexture.content.isEmpty() && - !added.contains(part.normalTexture.filename)) { + !_textureFilenames.contains(part.normalTexture.filename)) { if (!addPart(texdir + "/" + part.normalTexture.filename, QString("texture%1").arg(++_texturesCount), true)) { return false; } - added.insert(part.normalTexture.filename); + _textureFilenames.insert(part.normalTexture.filename); } if (!part.specularTexture.filename.isEmpty() && part.specularTexture.content.isEmpty() && - !added.contains(part.specularTexture.filename)) { + !_textureFilenames.contains(part.specularTexture.filename)) { if (!addPart(texdir + "/" + part.specularTexture.filename, QString("texture%1").arg(++_texturesCount), true)) { return false; } - added.insert(part.specularTexture.filename); + _textureFilenames.insert(part.specularTexture.filename); } } } diff --git a/interface/src/ModelUploader.h b/interface/src/ModelUploader.h index 766bd55318..634de05640 100644 --- a/interface/src/ModelUploader.h +++ b/interface/src/ModelUploader.h @@ -49,6 +49,8 @@ private slots: private: QString _url; + QString _textureBase; + QSet _textureFilenames; int _lodCount; int _texturesCount; int _totalSize; diff --git a/interface/src/renderer/GeometryCache.cpp b/interface/src/renderer/GeometryCache.cpp index 8d31cdce1d..ec68c87a76 100644 --- a/interface/src/renderer/GeometryCache.cpp +++ b/interface/src/renderer/GeometryCache.cpp @@ -506,6 +506,15 @@ void GeometryReader::run() { _reply->deleteLater(); } +void NetworkGeometry::init() { + _mapping = QVariantHash(); + _geometry = FBXGeometry(); + _meshes.clear(); + _lods.clear(); + _request.setUrl(_url); + Resource::init(); +} + void NetworkGeometry::downloadFinished(QNetworkReply* reply) { QUrl url = reply->url(); if (url.path().toLower().endsWith(".fst")) { diff --git a/interface/src/renderer/GeometryCache.h b/interface/src/renderer/GeometryCache.h index a9b274fedc..deecfd56c5 100644 --- a/interface/src/renderer/GeometryCache.h +++ b/interface/src/renderer/GeometryCache.h @@ -96,6 +96,7 @@ public: protected: + virtual void init(); virtual void downloadFinished(QNetworkReply* reply); virtual void reinsert(); diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index f46fd48beb..e1bfd21bba 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -319,6 +319,9 @@ bool Model::updateGeometry() { _jointStates = createJointStates(fbxGeometry); needToRebuild = true; } + } else if (!geometry->isLoaded()) { + deleteGeometry(); + _dilatedTextures.clear(); } _geometry->setLoadPriority(this, -_lodDistance); _geometry->ensureLoading(); diff --git a/libraries/shared/src/ResourceCache.cpp b/libraries/shared/src/ResourceCache.cpp index 2f26e344fd..14998232d6 100644 --- a/libraries/shared/src/ResourceCache.cpp +++ b/libraries/shared/src/ResourceCache.cpp @@ -30,6 +30,13 @@ ResourceCache::~ResourceCache() { } } +void ResourceCache::refresh(const QUrl& url) { + QSharedPointer resource = _resources.value(url); + if (!resource.isNull()) { + resource->refresh(); + } +} + QSharedPointer ResourceCache::getResource(const QUrl& url, const QUrl& fallback, bool delayLoad, void* extra) { if (!url.isValid() && !url.isEmpty() && fallback.isValid()) { return getResource(fallback, QUrl(), delayLoad); @@ -107,25 +114,15 @@ QList ResourceCache::_loadingRequests; Resource::Resource(const QUrl& url, bool delayLoad) : _url(url), _request(url), - _startedLoading(false), - _failedToLoad(false), - _loaded(false), _lruKey(0), - _reply(NULL), - _attempts(0) { + _reply(NULL) { + + init(); - if (url.isEmpty()) { - _startedLoading = _loaded = true; - return; - - } else if (!(url.isValid() && ResourceCache::getNetworkAccessManager())) { - _startedLoading = _failedToLoad = true; - return; - } _request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache); // start loading immediately unless instructed otherwise - if (!delayLoad) { + if (!(_startedLoading || delayLoad)) { attemptRequest(); } } @@ -178,6 +175,22 @@ float Resource::getLoadPriority() { return highestPriority; } +void Resource::refresh() { + if (_reply == NULL && !(_loaded || _failedToLoad)) { + return; + } + if (_reply) { + ResourceCache::requestCompleted(this); + delete _reply; + _reply = NULL; + } + init(); + _request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork); + if (!_startedLoading) { + attemptRequest(); + } +} + void Resource::allReferencesCleared() { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "allReferencesCleared"); @@ -197,6 +210,20 @@ void Resource::allReferencesCleared() { } } +void Resource::init() { + _startedLoading = false; + _failedToLoad = false; + _loaded = false; + _attempts = 0; + + if (_url.isEmpty()) { + _startedLoading = _loaded = true; + + } else if (!(_url.isValid() && ResourceCache::getNetworkAccessManager())) { + _startedLoading = _failedToLoad = true; + } +} + void Resource::attemptRequest() { _startedLoading = true; ResourceCache::attemptRequest(this); diff --git a/libraries/shared/src/ResourceCache.h b/libraries/shared/src/ResourceCache.h index 0cfabd26fc..2404485c46 100644 --- a/libraries/shared/src/ResourceCache.h +++ b/libraries/shared/src/ResourceCache.h @@ -47,6 +47,8 @@ public: ResourceCache(QObject* parent = NULL); virtual ~ResourceCache(); + void refresh(const QUrl& url); + protected: QMap > _unusedResources; @@ -119,6 +121,9 @@ public: /// For loading resources, returns the load progress. float getProgress() const { return (_bytesTotal == 0) ? 0.0f : (float)_bytesReceived / _bytesTotal; } + /// Refreshes the resource. + void refresh(); + void setSelf(const QWeakPointer& self) { _self = self; } void setCache(ResourceCache* cache) { _cache = cache; } @@ -131,6 +136,8 @@ protected slots: protected: + virtual void init(); + /// Called when the download has finished. The recipient should delete the reply when done with it. virtual void downloadFinished(QNetworkReply* reply) = 0; From 47268fef32e264cd1d09af83c832d109b1b55276 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 12 May 2014 11:06:14 -0700 Subject: [PATCH 2/3] Fixed kooky conditional. --- interface/src/avatar/MyAvatar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 52eff6e2ce..6778460ec0 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1490,7 +1490,7 @@ void MyAvatar::updateMotionBehaviorsFromMenu() { } void MyAvatar::renderAttachments(RenderMode renderMode) { - if (!Application::getInstance()->getCamera()->getMode() == CAMERA_MODE_FIRST_PERSON || renderMode == MIRROR_RENDER_MODE) { + if (Application::getInstance()->getCamera()->getMode() != CAMERA_MODE_FIRST_PERSON || renderMode == MIRROR_RENDER_MODE) { Avatar::renderAttachments(renderMode); return; } From 8541df9c32093360cfd4b8aa5bbdf9cb2853864c Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 12 May 2014 12:16:30 -0700 Subject: [PATCH 3/3] Remember attachment parameters per joint (as well as the last joint used) so that the gun script correctly allows both guns' positions to be tweaked. --- interface/src/avatar/MyAvatar.cpp | 40 ++++++++++++------- interface/src/avatar/MyAvatar.h | 2 +- interface/src/ui/AttachmentsDialog.cpp | 55 ++++++++++++++++++++------ interface/src/ui/AttachmentsDialog.h | 4 ++ libraries/avatars/src/AvatarData.h | 2 + 5 files changed, 77 insertions(+), 26 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 6778460ec0..36c51dc9fd 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -520,8 +520,9 @@ void MyAvatar::saveAttachmentData(const AttachmentData& attachment) const { settings->beginGroup("savedAttachmentData"); settings->beginGroup(_skeletonModel.getURL().toString()); settings->beginGroup(attachment.modelURL.toString()); - settings->setValue("jointName", attachment.jointName); + + settings->beginGroup(attachment.jointName); settings->setValue("translation_x", attachment.translation.x); settings->setValue("translation_y", attachment.translation.y); settings->setValue("translation_z", attachment.translation.z); @@ -534,10 +535,11 @@ void MyAvatar::saveAttachmentData(const AttachmentData& attachment) const { settings->endGroup(); settings->endGroup(); settings->endGroup(); + settings->endGroup(); Application::getInstance()->unlockSettings(); } -AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL) const { +AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString& jointName) const { QSettings* settings = Application::getInstance()->lockSettings(); settings->beginGroup("savedAttachmentData"); settings->beginGroup(_skeletonModel.getURL().toString()); @@ -545,20 +547,30 @@ AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL) const { AttachmentData attachment; attachment.modelURL = modelURL; - attachment.jointName = settings->value("jointName").toString(); - attachment.translation.x = loadSetting(settings, "translation_x", 0.0f); - attachment.translation.y = loadSetting(settings, "translation_y", 0.0f); - attachment.translation.z = loadSetting(settings, "translation_z", 0.0f); - glm::vec3 eulers; - eulers.x = loadSetting(settings, "rotation_x", 0.0f); - eulers.y = loadSetting(settings, "rotation_y", 0.0f); - eulers.z = loadSetting(settings, "rotation_z", 0.0f); - attachment.rotation = glm::quat(eulers); - attachment.scale = loadSetting(settings, "scale", 1.0f); + if (jointName.isEmpty()) { + attachment.jointName = settings->value("jointName").toString(); + } else { + attachment.jointName = jointName; + } + settings->beginGroup(attachment.jointName); + if (settings->contains("translation_x")) { + attachment.translation.x = loadSetting(settings, "translation_x", 0.0f); + attachment.translation.y = loadSetting(settings, "translation_y", 0.0f); + attachment.translation.z = loadSetting(settings, "translation_z", 0.0f); + glm::vec3 eulers; + eulers.x = loadSetting(settings, "rotation_x", 0.0f); + eulers.y = loadSetting(settings, "rotation_y", 0.0f); + eulers.z = loadSetting(settings, "rotation_z", 0.0f); + attachment.rotation = glm::quat(eulers); + attachment.scale = loadSetting(settings, "scale", 1.0f); + } else { + attachment = AttachmentData(); + } settings->endGroup(); settings->endGroup(); settings->endGroup(); + settings->endGroup(); Application::getInstance()->unlockSettings(); return attachment; @@ -650,8 +662,8 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName, const g return; } if (useSaved) { - AttachmentData attachment = loadAttachmentData(modelURL); - if (!attachment.jointName.isEmpty()) { + AttachmentData attachment = loadAttachmentData(modelURL, jointName); + if (attachment.isValid()) { Avatar::attach(modelURL, attachment.jointName, attachment.translation, attachment.rotation, attachment.scale, allowDuplicates, useSaved); return; diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 2e47d9c973..d446c2e895 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -67,7 +67,7 @@ public: void loadData(QSettings* settings); void saveAttachmentData(const AttachmentData& attachment) const; - AttachmentData loadAttachmentData(const QUrl& modelURL) const; + AttachmentData loadAttachmentData(const QUrl& modelURL, const QString& jointName = QString()) const; // Set what driving keys are being pressed to control thrust levels void setDriveKeys(int key, float val) { _driveKeys[key] = val; }; diff --git a/interface/src/ui/AttachmentsDialog.cpp b/interface/src/ui/AttachmentsDialog.cpp index f9f49738e9..44dd2452e6 100644 --- a/interface/src/ui/AttachmentsDialog.cpp +++ b/interface/src/ui/AttachmentsDialog.cpp @@ -97,7 +97,8 @@ static QDoubleSpinBox* createRotationBox(AttachmentPanel* panel, float value) { } AttachmentPanel::AttachmentPanel(AttachmentsDialog* dialog, const AttachmentData& data) : - _dialog(dialog) { + _dialog(dialog), + _applying(false) { setFrameStyle(QFrame::StyledPanel); QFormLayout* layout = new QFormLayout(); @@ -121,7 +122,7 @@ AttachmentPanel::AttachmentPanel(AttachmentsDialog* dialog, const AttachmentData } } _jointName->setCurrentText(data.jointName); - connect(_jointName, SIGNAL(currentIndexChanged(int)), SLOT(updateAttachmentData())); + connect(_jointName, SIGNAL(currentIndexChanged(int)), SLOT(jointNameChanged())); QHBoxLayout* translationBox = new QHBoxLayout(); translationBox->addWidget(_translationX = createTranslationBox(this, data.translation.x)); @@ -171,25 +172,57 @@ void AttachmentPanel::setModelURL(const QString& url) { void AttachmentPanel::modelURLChanged() { // check for saved attachment data + if (_modelURL->text().isEmpty()) { + _dialog->updateAttachmentData(); + return; + } AttachmentData attachment = Application::getInstance()->getAvatar()->loadAttachmentData(_modelURL->text()); - if (!attachment.jointName.isEmpty()) { + if (attachment.isValid()) { + _applying = true; _jointName->setCurrentText(attachment.jointName); - _translationX->setValue(attachment.translation.x); - _translationY->setValue(attachment.translation.y); - _translationZ->setValue(attachment.translation.z); - glm::vec3 eulers = glm::degrees(safeEulerAngles(attachment.rotation)); - _rotationX->setValue(eulers.x); - _rotationY->setValue(eulers.y); - _rotationZ->setValue(eulers.z); - _scale->setValue(attachment.scale); + applyAttachmentData(attachment); } _dialog->updateAttachmentData(); } +void AttachmentPanel::jointNameChanged() { + if (_applying) { + return; + } + // check for saved attachment data specific to this joint + if (_modelURL->text().isEmpty()) { + _dialog->updateAttachmentData(); + return; + } + AttachmentData attachment = Application::getInstance()->getAvatar()->loadAttachmentData( + _modelURL->text(), _jointName->currentText()); + if (attachment.isValid()) { + applyAttachmentData(attachment); + } + updateAttachmentData(); +} + void AttachmentPanel::updateAttachmentData() { + if (_applying) { + return; + } // save the attachment data under the model URL (if any) if (!_modelURL->text().isEmpty()) { Application::getInstance()->getAvatar()->saveAttachmentData(getAttachmentData()); } _dialog->updateAttachmentData(); } + +void AttachmentPanel::applyAttachmentData(const AttachmentData& attachment) { + _applying = true; + _translationX->setValue(attachment.translation.x); + _translationY->setValue(attachment.translation.y); + _translationZ->setValue(attachment.translation.z); + glm::vec3 eulers = glm::degrees(safeEulerAngles(attachment.rotation)); + _rotationX->setValue(eulers.x); + _rotationY->setValue(eulers.y); + _rotationZ->setValue(eulers.z); + _scale->setValue(attachment.scale); + _applying = false; + _dialog->updateAttachmentData(); +} diff --git a/interface/src/ui/AttachmentsDialog.h b/interface/src/ui/AttachmentsDialog.h index 7e9319fba8..59696c96f1 100644 --- a/interface/src/ui/AttachmentsDialog.h +++ b/interface/src/ui/AttachmentsDialog.h @@ -61,10 +61,13 @@ private slots: void chooseModelURL(); void setModelURL(const QString& url); void modelURLChanged(); + void jointNameChanged(); void updateAttachmentData(); private: + void applyAttachmentData(const AttachmentData& attachment); + AttachmentsDialog* _dialog; QLineEdit* _modelURL; QComboBox* _jointName; @@ -75,6 +78,7 @@ private: QDoubleSpinBox* _rotationY; QDoubleSpinBox* _rotationZ; QDoubleSpinBox* _scale; + bool _applying; }; #endif // hifi_AttachmentsDialog_h diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index dd604d06f5..072070e98c 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -352,6 +352,8 @@ public: AttachmentData(); + bool isValid() const { return modelURL.isValid(); } + bool operator==(const AttachmentData& other) const; };