From f128dce185905cf930813f1611c119ba7df423b1 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Mon, 24 Jul 2017 17:10:45 -0700 Subject: [PATCH 01/24] Changed marketplaces message to be more discoverable --- scripts/system/html/js/marketplacesInject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 3b3d4b4937..45b2e99018 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -57,7 +57,7 @@ $("body").append( '
' + (!isInitialHiFiPage ? '' : '') + - (isInitialHiFiPage ? '🛈 See also other marketplaces.' : '') + + (isInitialHiFiPage ? '🛈 Get items from Blocks and Clara.io!' : '') + (!isDirectoryPage ? '' : '') + (isDirectoryPage ? '🛈 Select a marketplace to explore.' : '') + '
' From adda4f0598e6b7a916ab5ee14a6fbdb703c1a52d Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Tue, 25 Jul 2017 18:36:39 -0700 Subject: [PATCH 02/24] Added Blocks to marketplace window --- scripts/system/html/img/blocks-tile.png | Bin 0 -> 35130 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 scripts/system/html/img/blocks-tile.png diff --git a/scripts/system/html/img/blocks-tile.png b/scripts/system/html/img/blocks-tile.png new file mode 100644 index 0000000000000000000000000000000000000000..49de535c1c2e908165b7902e562daef419cbc4a2 GIT binary patch literal 35130 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 literal 0 HcmV?d00001 From 9cfc4dc91b7ff2651e300b7dbbcaf711dc11872a Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 26 Jul 2017 15:21:39 -0700 Subject: [PATCH 03/24] Can drag blocks zip folder into hifi and upload the .obj --- interface/src/Application.cpp | 18 ++++++- interface/src/Application.h | 3 ++ .../src/FileScriptingInterface.cpp | 50 +++++++++++-------- .../src/FileScriptingInterface.h | 2 +- scripts/system/html/js/marketplacesInject.js | 24 +++++++-- scripts/system/html/marketplaces.html | 36 ++++++++----- 6 files changed, 95 insertions(+), 38 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index dbb94cfdae..70ef794bfb 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -229,6 +229,9 @@ static const QString OBJ_EXTENSION = ".obj"; static const QString AVA_JSON_EXTENSION = ".ava.json"; static const QString WEB_VIEW_TAG = "noDownload=true"; +// temporary zip handling for Emily +static const QString ZIP_EXTENSION = ".zip"; + static const float MIRROR_FULLSCREEN_DISTANCE = 0.389f; static const quint64 TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS = 1 * USECS_PER_SECOND; @@ -259,7 +262,10 @@ const QHash Application::_acceptedExtensi { AVA_JSON_EXTENSION, &Application::askToWearAvatarAttachmentUrl }, { JSON_EXTENSION, &Application::importJSONFromURL }, { JS_EXTENSION, &Application::askToLoadScript }, - { FST_EXTENSION, &Application::askToSetAvatarUrl } + { FST_EXTENSION, &Application::askToSetAvatarUrl }, + + // temporary zip handling for Emily + { ZIP_EXTENSION, &Application::importFromZIP } }; class DeadlockWatchdogThread : public QThread { @@ -2738,6 +2744,14 @@ bool Application::importSVOFromURL(const QString& urlString) { return true; } +// temporary zip handling for Emily, not set to auto-add +bool Application::importFromZIP(const QString& filePath) { + qDebug() << "A zip file has been dropped in: " << filePath; + QUrl empty = ""; + qApp->getFileDownloadInterface()->runUnzip(filePath, empty, false, true); + return true; +} + bool _renderRequested { false }; bool Application::event(QEvent* event) { @@ -6156,7 +6170,7 @@ void Application::addAssetToWorldFromURLRequestFinished() { if (tempFile.open(QIODevice::WriteOnly)) { tempFile.write(request->getData()); addAssetToWorldInfoClear(filename); // Remove message from list; next one added will have a different key. - qApp->getFileDownloadInterface()->runUnzip(downloadPath, url, true); + qApp->getFileDownloadInterface()->runUnzip(downloadPath, url, true, false); } else { QString errorInfo = "Couldn't open temporary file for download"; qWarning(interfaceapp) << errorInfo; diff --git a/interface/src/Application.h b/interface/src/Application.h index ce27c4a70a..e6ae970b61 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -478,6 +478,9 @@ private: bool importJSONFromURL(const QString& urlString); bool importSVOFromURL(const QString& urlString); + // temporary zip handling for Emily + bool importFromZIP(const QString& filePath); + bool nearbyEntitiesAreReadyForPhysics(); int processOctreeStats(ReceivedMessage& message, SharedNodePointer sendingNode); void trackIncomingOctreePacket(ReceivedMessage& message, SharedNodePointer sendingNode, bool wasStatsPacket); diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp index 30d0a3a201..7d8458598d 100644 --- a/libraries/script-engine/src/FileScriptingInterface.cpp +++ b/libraries/script-engine/src/FileScriptingInterface.cpp @@ -32,12 +32,19 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent // nothing for now } -void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd) { +void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isBlocks) { qCDebug(scriptengine) << "Url that was downloaded: " + url.toString(); qCDebug(scriptengine) << "Path where download is saved: " + path; QString fileName = "/" + path.section("/", -1); QString tempDir = path; - tempDir.remove(fileName); + if (!isBlocks) { + tempDir.remove(fileName); + } else { + QTemporaryDir blocks; + tempDir = blocks.path(); + path.remove("file:///"); + } + qCDebug(scriptengine) << "Temporary directory at: " + tempDir; if (!isTempDir(tempDir)) { qCDebug(scriptengine) << "Temporary directory mismatch; risk of losing files"; @@ -45,6 +52,7 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd) { } QString file = unzipFile(path, tempDir); + qCDebug(scriptengine) << "Unzipped file: " << file; QString filename = QUrl::fromLocalFile(file).toString(); if (file != "") { qCDebug(scriptengine) << "File to upload: " + filename; @@ -54,6 +62,26 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd) { emit unzipResult(path, filename, autoAdd); } +QString FileScriptingInterface::unzipFile(QString path, QString tempDir) { + + QDir dir(path); + QString dirName = dir.path(); + qCDebug(scriptengine) << "Directory to unzip: " << dirName; + QString target = tempDir + "/model_repo"; + QStringList list = JlCompress::extractDir(dirName, target); + + qCDebug(scriptengine) << list; + + if (!list.isEmpty()) { + return list.front(); + } + else { + qCDebug(scriptengine) << "Extraction failed"; + return ""; + } + +} + // fix to check that we are only referring to a temporary directory bool FileScriptingInterface::isTempDir(QString tempDir) { QString folderName = "/" + tempDir.section("/", -1); @@ -92,24 +120,6 @@ void FileScriptingInterface::downloadZip(QString path, const QString link) { request->send(); } -QString FileScriptingInterface::unzipFile(QString path, QString tempDir) { - - QDir dir(path); - QString dirName = dir.path(); - QString target = tempDir + "/model_repo"; - QStringList list = JlCompress::extractDir(dirName, target); - - qCDebug(scriptengine) << list; - - if (!list.isEmpty()) { - return list.front(); - } else { - qCDebug(scriptengine) << "Extraction failed"; - return ""; - } - -} - // this function is not in use void FileScriptingInterface::recursiveFileScan(QFileInfo file, QString* dirName) { /*if (!file.isDir()) { diff --git a/libraries/script-engine/src/FileScriptingInterface.h b/libraries/script-engine/src/FileScriptingInterface.h index 5e9a6029e8..dc5ffdace8 100644 --- a/libraries/script-engine/src/FileScriptingInterface.h +++ b/libraries/script-engine/src/FileScriptingInterface.h @@ -24,7 +24,7 @@ public: public slots: QString convertUrlToPath(QUrl url); - void runUnzip(QString path, QUrl url, bool autoAdd); + void runUnzip(QString path, QUrl url, bool autoAdd, bool isBlocks); QString getTempDir(); signals: diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 45b2e99018..0ee337a2ef 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -33,8 +33,8 @@ $("head").append( '' + ); + } + function updateClaraCode() { // Have to repeatedly update Clara page because its content can change dynamically without location.href changing. @@ -322,10 +335,12 @@ var DIRECTORY = 0; var HIFI = 1; - var CLARA = 2; + var BLOCKS = 2; + var CLARA = 3; var pageType = DIRECTORY; if (location.href.indexOf("highfidelity.com/") !== -1) { pageType = HIFI; } + if (location.href.indexOf("google.com/") !== -1) { pageType = BLOCKS; } if (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; } injectCommonCode(pageType === DIRECTORY); @@ -336,6 +351,9 @@ case HIFI: injectHiFiCode(); break; + case BLOCKS: + injectBlocksCode(); + break; case CLARA: injectClaraCode(); break; diff --git a/scripts/system/html/marketplaces.html b/scripts/system/html/marketplaces.html index 6051a9df96..8c5fe15429 100644 --- a/scripts/system/html/marketplaces.html +++ b/scripts/system/html/marketplaces.html @@ -30,19 +30,31 @@
-
-
- +
+
+
+ +
+
+

Blocks, released by Google, allows anyone to create 3D models using just a few simple tools. Browse through other users' creations for low-poly assets to add to your world.

+
+
-
-

Clara.io has thousands of models available for importing into High Fidelity. Follow these steps for the best experience:

-
    -
  1. Create an account here or log in as an existing user.
    2. -
  2. Choose a model from the list and click “Download to High Fidelity”.
    3. -
-
- -
+
+
+
+
+
+ +
+
+

Clara.io has thousands of models available for importing into High Fidelity. Follow these steps for the best experience:

+
    +
  1. Create an account here or log in as an existing user.
    2. +
  2. Choose a model from the list and click “Download to High Fidelity”.
    3. +
+
+
From acb088b263bf1027b6c11eaf02eea8bc4d8c6993 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 26 Jul 2017 16:58:23 -0700 Subject: [PATCH 04/24] Blocks drag does not work yet --- interface/src/Application.cpp | 23 +++++++++++++++---- interface/src/Application.h | 4 ++-- .../src/FileScriptingInterface.cpp | 21 +++++++++-------- .../src/FileScriptingInterface.h | 4 ++-- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 70ef794bfb..fe75242c2f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6200,12 +6200,21 @@ void Application::addAssetToWorldUnzipFailure(QString filePath) { addAssetToWorldError(filename, "Couldn't unzip file " + filename + "."); } -void Application::addAssetToWorld(QString filePath) { +void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBlocks) { // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). + qCDebug(interfaceapp) << "File about to be uploaded: " << filePath; + qCDebug(interfaceapp) << "Original zip folder: " << zipFile; QString path = QUrl(filePath).toLocalFile(); QString filename = filenameFromPath(path); - QString mapping = "/" + filename; + QString mapping; + if (isBlocks) { + QString assetFolder = zipFile.section("/", -1); + assetFolder.remove(".zip"); + mapping = "/" + assetFolder + "/" + filename; + } else { + mapping = "/" + filename; + } // Test repeated because possibly different code paths. if (!DependencyManager::get()->getThisNodeCanWriteAssets()) { @@ -6576,15 +6585,19 @@ void Application::onAssetToWorldMessageBoxClosed() { } -void Application::handleUnzip(QString zipFile, QString unzipFile, bool autoAdd) { +void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isBlocks) { if (autoAdd) { if (!unzipFile.isEmpty()) { - addAssetToWorld(unzipFile); + qCDebug(interfaceapp) << "My folder contents: " << unzipFile; + for (int i = 0; i < unzipFile.length(); i++) { + qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i); + addAssetToWorld(unzipFile.at(i), zipFile, isBlocks); + } } else { addAssetToWorldUnzipFailure(zipFile); } } else { - showAssetServerWidget(unzipFile); + showAssetServerWidget(unzipFile.first()); } } diff --git a/interface/src/Application.h b/interface/src/Application.h index e6ae970b61..54d4a9ef90 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -331,14 +331,14 @@ public slots: // FIXME: Move addAssetToWorld* methods to own class? void addAssetToWorldFromURL(QString url); void addAssetToWorldFromURLRequestFinished(); - void addAssetToWorld(QString filePath); + void addAssetToWorld(QString filePath, QString zipFile, bool isBlocks); void addAssetToWorldUnzipFailure(QString filePath); void addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy); void addAssetToWorldUpload(QString filePath, QString mapping); void addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash); void addAssetToWorldAddEntity(QString filePath, QString mapping); - void handleUnzip(QString sourceFile, QString destinationFile, bool autoAdd); + void handleUnzip(QString sourceFile, QStringList destinationFile, bool autoAdd, bool isBlocks); FileScriptingInterface* getFileDownloadInterface() { return _fileDownload; } diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp index 7d8458598d..5ba2868365 100644 --- a/libraries/script-engine/src/FileScriptingInterface.cpp +++ b/libraries/script-engine/src/FileScriptingInterface.cpp @@ -51,18 +51,21 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool return; } - QString file = unzipFile(path, tempDir); - qCDebug(scriptengine) << "Unzipped file: " << file; - QString filename = QUrl::fromLocalFile(file).toString(); - if (file != "") { + QStringList fileList = unzipFile(path, tempDir); + qCDebug(scriptengine) << "Unzipped file list: " << fileList; + QString filename = QUrl::fromLocalFile(fileList.first()).toString(); + + if (filename != "") { qCDebug(scriptengine) << "File to upload: " + filename; - } else { + } + else { qCDebug(scriptengine) << "Unzip failed"; } - emit unzipResult(path, filename, autoAdd); + emit unzipResult(path, fileList, autoAdd, isBlocks); + } -QString FileScriptingInterface::unzipFile(QString path, QString tempDir) { +QStringList FileScriptingInterface::unzipFile(QString path, QString tempDir) { QDir dir(path); QString dirName = dir.path(); @@ -73,11 +76,11 @@ QString FileScriptingInterface::unzipFile(QString path, QString tempDir) { qCDebug(scriptengine) << list; if (!list.isEmpty()) { - return list.front(); + return list; } else { qCDebug(scriptengine) << "Extraction failed"; - return ""; + return list; } } diff --git a/libraries/script-engine/src/FileScriptingInterface.h b/libraries/script-engine/src/FileScriptingInterface.h index dc5ffdace8..806fa7fd9b 100644 --- a/libraries/script-engine/src/FileScriptingInterface.h +++ b/libraries/script-engine/src/FileScriptingInterface.h @@ -28,11 +28,11 @@ public slots: QString getTempDir(); signals: - void unzipResult(QString zipFile, QString unzipFile, bool autoAdd); + void unzipResult(QString zipFile, QStringList unzipFile, bool autoAdd, bool isBlocks); private: bool isTempDir(QString tempDir); - QString unzipFile(QString path, QString tempDir); + QStringList unzipFile(QString path, QString tempDir); void recursiveFileScan(QFileInfo file, QString* dirName); void downloadZip(QString path, const QString link); From bacd839d432fb525610319e856ebc07c9f604f62 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 26 Jul 2017 18:57:19 -0700 Subject: [PATCH 05/24] Drag zip folder works --- interface/src/Application.cpp | 36 +++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index fe75242c2f..d42453e191 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2748,7 +2748,7 @@ bool Application::importSVOFromURL(const QString& urlString) { bool Application::importFromZIP(const QString& filePath) { qDebug() << "A zip file has been dropped in: " << filePath; QUrl empty = ""; - qApp->getFileDownloadInterface()->runUnzip(filePath, empty, false, true); + qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true); return true; } @@ -6203,6 +6203,38 @@ void Application::addAssetToWorldUnzipFailure(QString filePath) { void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBlocks) { // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). + qCDebug(interfaceapp) << "File about to be uploaded: " << filePath; + qCDebug(interfaceapp) << "Original zip folder: " << zipFile; + QString mapping; + QString path = filePath; + QString filename = filenameFromPath(filePath); + if (isBlocks) { + QString assetFolder = zipFile.section("/", -1); + assetFolder.remove(".zip"); + mapping = "/" + assetFolder + "/" + filenameFromPath(filename); + } + else { + path = QUrl(filePath).toLocalFile(); + filename = filenameFromPath(path); + mapping = "/" + filename; + } + + // Test repeated because possibly different code paths. + if (!DependencyManager::get()->getThisNodeCanWriteAssets()) { + QString errorInfo = "You do not have permissions to write to the Asset Server."; + qWarning(interfaceapp) << "Error downloading model: " + errorInfo; + addAssetToWorldError(filename, errorInfo); + return; + } + + addAssetToWorldInfo(filename, "Adding " + mapping.mid(1) + " to the Asset Server."); + + addAssetToWorldWithNewMapping(path, mapping, 0); +} + +/**void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBlocks) { + // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). + qCDebug(interfaceapp) << "File about to be uploaded: " << filePath; qCDebug(interfaceapp) << "Original zip folder: " << zipFile; QString path = QUrl(filePath).toLocalFile(); @@ -6227,7 +6259,7 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBloc addAssetToWorldInfo(filename, "Adding " + mapping.mid(1) + " to the Asset Server."); addAssetToWorldWithNewMapping(path, mapping, 0); -} +}*/ void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy) { auto request = DependencyManager::get()->createGetMappingRequest(mapping); From d4a7e9188a3dced093719f3ae05cab53c7bf63d8 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Thu, 27 Jul 2017 13:33:53 -0700 Subject: [PATCH 06/24] Removed extraneous print statements --- interface/src/Application.cpp | 38 +------------------ .../src/FileScriptingInterface.cpp | 1 - 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 941b6447ba..7b6b83fedd 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2744,7 +2744,7 @@ bool Application::importSVOFromURL(const QString& urlString) { return true; } -// temporary zip handling for Emily, not set to auto-add +// temporary zip handling for Emily bool Application::importFromZIP(const QString& filePath) { qDebug() << "A zip file has been dropped in: " << filePath; QUrl empty = ""; @@ -6208,9 +6208,6 @@ void Application::addAssetToWorldUnzipFailure(QString filePath) { void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBlocks) { // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). - - qCDebug(interfaceapp) << "File about to be uploaded: " << filePath; - qCDebug(interfaceapp) << "Original zip folder: " << zipFile; QString mapping; QString path = filePath; QString filename = filenameFromPath(filePath); @@ -6218,8 +6215,7 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBloc QString assetFolder = zipFile.section("/", -1); assetFolder.remove(".zip"); mapping = "/" + assetFolder + "/" + filenameFromPath(filename); - } - else { + } else { path = QUrl(filePath).toLocalFile(); filename = filenameFromPath(path); mapping = "/" + filename; @@ -6238,35 +6234,6 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBloc addAssetToWorldWithNewMapping(path, mapping, 0); } -/**void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBlocks) { - // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). - - qCDebug(interfaceapp) << "File about to be uploaded: " << filePath; - qCDebug(interfaceapp) << "Original zip folder: " << zipFile; - QString path = QUrl(filePath).toLocalFile(); - QString filename = filenameFromPath(path); - QString mapping; - if (isBlocks) { - QString assetFolder = zipFile.section("/", -1); - assetFolder.remove(".zip"); - mapping = "/" + assetFolder + "/" + filename; - } else { - mapping = "/" + filename; - } - - // Test repeated because possibly different code paths. - if (!DependencyManager::get()->getThisNodeCanWriteAssets()) { - QString errorInfo = "You do not have permissions to write to the Asset Server."; - qWarning(interfaceapp) << "Error downloading model: " + errorInfo; - addAssetToWorldError(filename, errorInfo); - return; - } - - addAssetToWorldInfo(filename, "Adding " + mapping.mid(1) + " to the Asset Server."); - - addAssetToWorldWithNewMapping(path, mapping, 0); -}*/ - void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy) { auto request = DependencyManager::get()->createGetMappingRequest(mapping); @@ -6626,7 +6593,6 @@ void Application::onAssetToWorldMessageBoxClosed() { void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isBlocks) { if (autoAdd) { if (!unzipFile.isEmpty()) { - qCDebug(interfaceapp) << "My folder contents: " << unzipFile; for (int i = 0; i < unzipFile.length(); i++) { qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i); addAssetToWorld(unzipFile.at(i), zipFile, isBlocks); diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp index 5ba2868365..af1cf7994a 100644 --- a/libraries/script-engine/src/FileScriptingInterface.cpp +++ b/libraries/script-engine/src/FileScriptingInterface.cpp @@ -52,7 +52,6 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool } QStringList fileList = unzipFile(path, tempDir); - qCDebug(scriptengine) << "Unzipped file list: " << fileList; QString filename = QUrl::fromLocalFile(fileList.first()).toString(); if (filename != "") { From fcaebda04c3c1618e1ab587b099fb9e91350b1f9 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Fri, 28 Jul 2017 10:21:03 -0700 Subject: [PATCH 07/24] troubleshooting Blocks injection --- scripts/system/html/js/marketplacesInject.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 0ee337a2ef..0fbd9a778e 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -96,11 +96,13 @@ function injectBlocksCode() { // Make space for marketplaces footer in Blocks pages. - $("head").append( - '' + /*$("body").append( + '
' + + '' + + '
' + );*/ + $("body").append( + 'style= "bottom: 135px" ' ); } From 25d4d4dc93fb4c099833299edbec932d702ae7a5 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Fri, 28 Jul 2017 15:13:24 -0700 Subject: [PATCH 08/24] Clara download working again, still can drag in Blocks zip --- interface/src/Application.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 7c22e1bc55..3d784841d2 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6224,14 +6224,12 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBloc // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). QString mapping; QString path = filePath; - QString filename = filenameFromPath(filePath); + QString filename = filenameFromPath(path); if (isBlocks) { QString assetFolder = zipFile.section("/", -1); assetFolder.remove(".zip"); - mapping = "/" + assetFolder + "/" + filenameFromPath(filename); + mapping = "/" + assetFolder + "/" + filename; } else { - path = QUrl(filePath).toLocalFile(); - filename = filenameFromPath(path); mapping = "/" + filename; } From c03c1c80e12909e45238d22dd99f0200f50e53f7 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 2 Aug 2017 10:51:40 -0700 Subject: [PATCH 09/24] Drag zip cleaned up, marketplaces stylized, back button fixed --- interface/src/Application.cpp | 12 +++++----- interface/src/Application.h | 2 -- scripts/system/html/js/marketplacesInject.js | 16 +++++++++---- scripts/system/html/marketplaces.html | 24 +++++++++++--------- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4a4b6423b9..467614c8a8 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -229,8 +229,6 @@ static const QString FBX_EXTENSION = ".fbx"; static const QString OBJ_EXTENSION = ".obj"; static const QString AVA_JSON_EXTENSION = ".ava.json"; static const QString WEB_VIEW_TAG = "noDownload=true"; - -// temporary zip handling for Emily static const QString ZIP_EXTENSION = ".zip"; static const float MIRROR_FULLSCREEN_DISTANCE = 0.389f; @@ -264,8 +262,6 @@ const QHash Application::_acceptedExtensi { JSON_EXTENSION, &Application::importJSONFromURL }, { JS_EXTENSION, &Application::askToLoadScript }, { FST_EXTENSION, &Application::askToSetAvatarUrl }, - - // temporary zip handling for Emily { ZIP_EXTENSION, &Application::importFromZIP } }; @@ -2759,7 +2755,6 @@ bool Application::importSVOFromURL(const QString& urlString) { return true; } -// temporary zip handling for Emily bool Application::importFromZIP(const QString& filePath) { qDebug() << "A zip file has been dropped in: " << filePath; QUrl empty = ""; @@ -6315,7 +6310,12 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q qWarning(interfaceapp) << "Error downloading model: " + errorInfo; addAssetToWorldError(filenameFromPath(filePath), errorInfo); } else { - addAssetToWorldAddEntity(filePath, mapping); + // to prevent files that aren't models from being loaded into world automatically + if (filePath.endsWith(".obj") || filePath.endsWith(".fbx")) { + addAssetToWorldAddEntity(filePath, mapping); + } else { + addAssetToWorldInfoDone(filenameFromPath(filePath)); + } } request->deleteLater(); }); diff --git a/interface/src/Application.h b/interface/src/Application.h index 4f835d5525..9546c275dc 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -481,8 +481,6 @@ private: bool importJSONFromURL(const QString& urlString); bool importSVOFromURL(const QString& urlString); - - // temporary zip handling for Emily bool importFromZIP(const QString& filePath); bool nearbyEntitiesAreReadyForPhysics(); diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 0fbd9a778e..92fa869242 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -65,7 +65,10 @@ // Footer actions. $("#back-button").on("click", function () { - window.history.back(); + if (window.history.state != null) window.history.back(); + // to fix back button issue when in directory + //else window.location = "http://www.highfidelity.com/marketplace"; + else window.location = "https://metaverse.highfidelity.com/marketplace?"; }); $("#all-markets").on("click", function () { EventBridge.emitWebEvent(GOTO_DIRECTORY); @@ -79,9 +82,11 @@ letUsKnow.replaceWith(letUsKnow.html()); // Add button links. + + /* Blocks not yet implemented $('#exploreBlocksMarketplace').on('click', function () { window.location = "https://vr.google.com/objects"; - }); + });*/ $('#exploreClaraMarketplace').on('click', function () { window.location = "https://clara.io/library?gameCheck=true&public=true"; }); @@ -102,7 +107,7 @@ '
' );*/ $("body").append( - 'style= "bottom: 135px" ' + '

hello

' ); } @@ -345,6 +350,7 @@ if (location.href.indexOf("google.com/") !== -1) { pageType = BLOCKS; } if (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; } + //if (pageType != BLOCKS) injectCommonCode(pageType === DIRECTORY); switch (pageType) { case DIRECTORY: @@ -354,7 +360,9 @@ injectHiFiCode(); break; case BLOCKS: - injectBlocksCode(); + console.log("in Blocks"); + //injectBlocksCode(); + console.log("blocks injection"); break; case CLARA: injectClaraCode(); diff --git a/scripts/system/html/marketplaces.html b/scripts/system/html/marketplaces.html index 8c5fe15429..11c9e208ca 100644 --- a/scripts/system/html/marketplaces.html +++ b/scripts/system/html/marketplaces.html @@ -25,24 +25,26 @@

This is the default High Fidelity marketplace. Viewing and downloading content from here is fully supported in Interface.

-
- -
-
+
+ +
+
+
@@ -53,9 +55,9 @@
  • Create an account here or log in as an existing user.
  • Choose a model from the list and click “Download to High Fidelity”.
    • -
    - -
    +
    +
    +
    From 310a0eeecc54ab607e573506f618ba5008065eb8 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 2 Aug 2017 12:24:14 -0700 Subject: [PATCH 10/24] Renamed isBlocks to isZip, added debug print for non-entity files --- interface/src/Application.cpp | 9 +++++---- interface/src/Application.h | 4 ++-- libraries/script-engine/src/FileScriptingInterface.cpp | 6 +++--- libraries/script-engine/src/FileScriptingInterface.h | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 467614c8a8..c19635ef34 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6218,12 +6218,12 @@ void Application::addAssetToWorldUnzipFailure(QString filePath) { addAssetToWorldError(filename, "Couldn't unzip file " + filename + "."); } -void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBlocks) { +void Application::addAssetToWorld(QString filePath, QString zipFile, bool isZip) { // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). QString mapping; QString path = filePath; QString filename = filenameFromPath(path); - if (isBlocks) { + if (isZip) { QString assetFolder = zipFile.section("/", -1); assetFolder.remove(".zip"); mapping = "/" + assetFolder + "/" + filename; @@ -6314,6 +6314,7 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q if (filePath.endsWith(".obj") || filePath.endsWith(".fbx")) { addAssetToWorldAddEntity(filePath, mapping); } else { + qCDebug(interfaceapp) << "Zipped contents are not valid entity files"; addAssetToWorldInfoDone(filenameFromPath(filePath)); } } @@ -6605,12 +6606,12 @@ void Application::onAssetToWorldMessageBoxClosed() { } -void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isBlocks) { +void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip) { if (autoAdd) { if (!unzipFile.isEmpty()) { for (int i = 0; i < unzipFile.length(); i++) { qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i); - addAssetToWorld(unzipFile.at(i), zipFile, isBlocks); + addAssetToWorld(unzipFile.at(i), zipFile, isZip); } } else { addAssetToWorldUnzipFailure(zipFile); diff --git a/interface/src/Application.h b/interface/src/Application.h index 9546c275dc..975767d4fb 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -332,14 +332,14 @@ public slots: // FIXME: Move addAssetToWorld* methods to own class? void addAssetToWorldFromURL(QString url); void addAssetToWorldFromURLRequestFinished(); - void addAssetToWorld(QString filePath, QString zipFile, bool isBlocks); + void addAssetToWorld(QString filePath, QString zipFile, bool isZip); void addAssetToWorldUnzipFailure(QString filePath); void addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy); void addAssetToWorldUpload(QString filePath, QString mapping); void addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash); void addAssetToWorldAddEntity(QString filePath, QString mapping); - void handleUnzip(QString sourceFile, QStringList destinationFile, bool autoAdd, bool isBlocks); + void handleUnzip(QString sourceFile, QStringList destinationFile, bool autoAdd, bool isZip); FileScriptingInterface* getFileDownloadInterface() { return _fileDownload; } diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp index af1cf7994a..0baf3034e8 100644 --- a/libraries/script-engine/src/FileScriptingInterface.cpp +++ b/libraries/script-engine/src/FileScriptingInterface.cpp @@ -32,12 +32,12 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent // nothing for now } -void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isBlocks) { +void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isZip) { qCDebug(scriptengine) << "Url that was downloaded: " + url.toString(); qCDebug(scriptengine) << "Path where download is saved: " + path; QString fileName = "/" + path.section("/", -1); QString tempDir = path; - if (!isBlocks) { + if (!isZip) { tempDir.remove(fileName); } else { QTemporaryDir blocks; @@ -60,7 +60,7 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool else { qCDebug(scriptengine) << "Unzip failed"; } - emit unzipResult(path, fileList, autoAdd, isBlocks); + emit unzipResult(path, fileList, autoAdd, isZip); } diff --git a/libraries/script-engine/src/FileScriptingInterface.h b/libraries/script-engine/src/FileScriptingInterface.h index 806fa7fd9b..4069e7cc78 100644 --- a/libraries/script-engine/src/FileScriptingInterface.h +++ b/libraries/script-engine/src/FileScriptingInterface.h @@ -24,11 +24,11 @@ public: public slots: QString convertUrlToPath(QUrl url); - void runUnzip(QString path, QUrl url, bool autoAdd, bool isBlocks); + void runUnzip(QString path, QUrl url, bool autoAdd, bool isZip); QString getTempDir(); signals: - void unzipResult(QString zipFile, QStringList unzipFile, bool autoAdd, bool isBlocks); + void unzipResult(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip); private: bool isTempDir(QString tempDir); From d599753771c38df1d617e9e4c435c1bb979f837c Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Tue, 8 Aug 2017 18:43:35 -0700 Subject: [PATCH 11/24] Started blocks download catch, fixed a debug typo --- interface/src/Application.cpp | 19 ++++++++++------ .../src/FileScriptingInterface.cpp | 22 ++++++++++++++++--- .../src/FileScriptingInterface.h | 1 + scripts/system/html/js/marketplacesInject.js | 8 +++---- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e5fb9949db..c887007fae 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2774,6 +2774,18 @@ bool Application::importSVOFromURL(const QString& urlString) { return true; } +bool Application::importFromZIP(const QString& filePath) { + qDebug() << "A zip file has been dropped in: " << filePath; + QUrl empty; + // handle Blocks download from Marketplace + if (filePath.contains("vr.google.com/downloads")) { + qApp->getFileDownloadInterface()->runUnzip("", filePath, true, true); + } else { + qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true); + } + return true; +} + void Application::onPresent(quint32 frameCount) { if (shouldPaint()) { postEvent(this, new QEvent(static_cast(Idle)), Qt::HighEventPriority); @@ -2781,13 +2793,6 @@ void Application::onPresent(quint32 frameCount) { } } -bool Application::importFromZIP(const QString& filePath) { - qDebug() << "A zip file has been dropped in: " << filePath; - QUrl empty; - qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true); - return true; -} - bool _renderRequested { false }; bool Application::event(QEvent* event) { diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp index 5eaaea86a9..ba1e9bcddf 100644 --- a/libraries/script-engine/src/FileScriptingInterface.cpp +++ b/libraries/script-engine/src/FileScriptingInterface.cpp @@ -34,6 +34,10 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isZip) { qCDebug(scriptengine) << "Url that was downloaded: " + url.toString(); + if ((url.toString()).contains("vr.google.com/downloads")) { + + path = downloadBlocksZip(url); + } qCDebug(scriptengine) << "Path where download is saved: " + path; QString fileName = "/" + path.section("/", -1); QString tempDir = path; @@ -52,10 +56,10 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool } QStringList fileList = unzipFile(path, tempDir); - QString filename = QUrl::fromLocalFile(fileList.first()).toString(); + //QString filename = QUrl::fromLocalFile(fileList.first()).toString(); - if (filename != "") { - qCDebug(scriptengine) << "File to upload: " + filename; + if (!fileList.isEmpty()) { + qCDebug(scriptengine) << "File to upload: " + fileList.first(); } else { qCDebug(scriptengine) << "Unzip failed"; @@ -111,6 +115,18 @@ QString FileScriptingInterface::convertUrlToPath(QUrl url) { return newUrl; } +// handles a download from Blocks in the marketplace +QString FileScriptingInterface::downloadBlocksZip(QUrl url) { + qCDebug(scriptengine) << "Made it to the download blocks! " << url.toString(); + + /*auto request = DependencyManager::get()->createResourceRequest(nullptr, url); + connect(request, &ResourceRequest::finished, this, [this, url] { + unzipFile(url, ""); // so intellisense isn't mad + }); + request->send();*/ + return url.toString(); +} + // this function is not in use void FileScriptingInterface::downloadZip(QString path, const QString link) { QUrl url = QUrl(link); diff --git a/libraries/script-engine/src/FileScriptingInterface.h b/libraries/script-engine/src/FileScriptingInterface.h index 4069e7cc78..c2b309ce43 100644 --- a/libraries/script-engine/src/FileScriptingInterface.h +++ b/libraries/script-engine/src/FileScriptingInterface.h @@ -34,6 +34,7 @@ private: bool isTempDir(QString tempDir); QStringList unzipFile(QString path, QString tempDir); void recursiveFileScan(QFileInfo file, QString* dirName); + QString downloadBlocksZip(QUrl url); void downloadZip(QString path, const QString link); }; diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 8902a5deee..ca9e4aa2b6 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -80,10 +80,9 @@ // Add button links. - /* Blocks not yet implemented $('#exploreBlocksMarketplace').on('click', function () { window.location = "https://vr.google.com/objects"; - });*/ + }); $('#exploreClaraMarketplace').on('click', function () { window.location = "https://clara.io/library?gameCheck=true&public=true"; }); @@ -157,7 +156,7 @@ // One file request at a time. if (isPreparing) { - console.log("WARNIKNG: Clara.io FBX: Prepare only one download at a time"); + console.log("WARNING: Clara.io FBX: Prepare only one download at a time"); return; } @@ -347,7 +346,6 @@ if (location.href.indexOf("google.com/") !== -1) { pageType = BLOCKS; } if (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; } - //if (pageType != BLOCKS) injectCommonCode(pageType === DIRECTORY); switch (pageType) { case DIRECTORY: @@ -358,7 +356,7 @@ break; case BLOCKS: console.log("in Blocks"); - //injectBlocksCode(); + injectBlocksCode(); console.log("blocks injection"); break; case CLARA: From 17acf0520d5e682f6d4d666deb5f050cf26511f2 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 9 Aug 2017 11:08:14 -0700 Subject: [PATCH 12/24] Download from blocks in marketplace working --- interface/src/Application.cpp | 25 ++++++++++++++++--- .../src/FileScriptingInterface.cpp | 4 +-- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c887007fae..60b7477ac5 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2779,7 +2779,8 @@ bool Application::importFromZIP(const QString& filePath) { QUrl empty; // handle Blocks download from Marketplace if (filePath.contains("vr.google.com/downloads")) { - qApp->getFileDownloadInterface()->runUnzip("", filePath, true, true); + addAssetToWorldFromURL(filePath); + //qApp->getFileDownloadInterface()->runUnzip("", filePath, true, true); } else { qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true); } @@ -6220,8 +6221,16 @@ void Application::showAssetServerWidget(QString filePath) { void Application::addAssetToWorldFromURL(QString url) { qInfo(interfaceapp) << "Download model and add to world from" << url; - - QString filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL. + + QString filename; + if (url.contains("filename")) { + filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL. + } + if (url.contains("vr.google.com/downloads")) { + QRegExp blocksName("\/.*\.zip"); + //filename = url.section(blocksName); + filename = "blocks"; + } if (!DependencyManager::get()->getThisNodeCanWriteAssets()) { QString errorInfo = "You do not have permissions to write to the Asset Server."; @@ -6242,7 +6251,15 @@ void Application::addAssetToWorldFromURLRequestFinished() { auto url = request->getUrl().toString(); auto result = request->getResult(); - QString filename = url.section("filename=", 1, 1); // Filename from trailing "?filename=" URL parameter. + QString filename; + if (url.contains("filename")) { + filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL. + } + if (url.contains("vr.google.com/downloads")) { + QRegExp blocksName("\/.*\.zip"); + //filename = url.section(blocksName); + filename = "blocks"; + } if (result == ResourceRequest::Success) { qInfo(interfaceapp) << "Downloaded model from" << url; diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp index ba1e9bcddf..1a121f3059 100644 --- a/libraries/script-engine/src/FileScriptingInterface.cpp +++ b/libraries/script-engine/src/FileScriptingInterface.cpp @@ -34,10 +34,10 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isZip) { qCDebug(scriptengine) << "Url that was downloaded: " + url.toString(); - if ((url.toString()).contains("vr.google.com/downloads")) { + /*if ((url.toString()).contains("vr.google.com/downloads")) { path = downloadBlocksZip(url); - } + }*/ qCDebug(scriptengine) << "Path where download is saved: " + path; QString fileName = "/" + path.section("/", -1); QString tempDir = path; From 1ac9536f9572f93568ab7161df83a4c463d76348 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 9 Aug 2017 15:56:07 -0700 Subject: [PATCH 13/24] Downloading blocks from marketplace in own asset folder --- interface/src/Application.cpp | 29 +++++++++++-------- interface/src/Application.h | 4 +-- .../src/FileScriptingInterface.cpp | 28 +++++------------- .../src/FileScriptingInterface.h | 5 ++-- 4 files changed, 29 insertions(+), 37 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 60b7477ac5..efd6bd9f48 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2780,9 +2780,8 @@ bool Application::importFromZIP(const QString& filePath) { // handle Blocks download from Marketplace if (filePath.contains("vr.google.com/downloads")) { addAssetToWorldFromURL(filePath); - //qApp->getFileDownloadInterface()->runUnzip("", filePath, true, true); } else { - qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true); + qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true, false); } return true; } @@ -6227,9 +6226,8 @@ void Application::addAssetToWorldFromURL(QString url) { filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL. } if (url.contains("vr.google.com/downloads")) { - QRegExp blocksName("\/.*\.zip"); - //filename = url.section(blocksName); - filename = "blocks"; + filename = url.section('/', -1); + filename.remove(".zip?noDownload=false"); } if (!DependencyManager::get()->getThisNodeCanWriteAssets()) { @@ -6252,13 +6250,15 @@ void Application::addAssetToWorldFromURLRequestFinished() { auto result = request->getResult(); QString filename; + bool isBlocks = false; + if (url.contains("filename")) { filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL. } if (url.contains("vr.google.com/downloads")) { - QRegExp blocksName("\/.*\.zip"); - //filename = url.section(blocksName); - filename = "blocks"; + filename = url.section('/', -1); + filename.remove(".zip?noDownload=false"); + isBlocks = true; } if (result == ResourceRequest::Success) { @@ -6274,7 +6274,7 @@ void Application::addAssetToWorldFromURLRequestFinished() { if (tempFile.open(QIODevice::WriteOnly)) { tempFile.write(request->getData()); addAssetToWorldInfoClear(filename); // Remove message from list; next one added will have a different key. - qApp->getFileDownloadInterface()->runUnzip(downloadPath, url, true, false); + qApp->getFileDownloadInterface()->runUnzip(downloadPath, url, true, false, isBlocks); } else { QString errorInfo = "Couldn't open temporary file for download"; qWarning(interfaceapp) << errorInfo; @@ -6304,7 +6304,7 @@ void Application::addAssetToWorldUnzipFailure(QString filePath) { addAssetToWorldError(filename, "Couldn't unzip file " + filename + "."); } -void Application::addAssetToWorld(QString filePath, QString zipFile, bool isZip) { +void Application::addAssetToWorld(QString filePath, QString zipFile, bool isZip, bool isBlocks) { // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). QString mapping; QString path = filePath; @@ -6313,6 +6313,11 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool isZip) QString assetFolder = zipFile.section("/", -1); assetFolder.remove(".zip"); mapping = "/" + assetFolder + "/" + filename; + } else if (isBlocks) { + qCDebug(interfaceapp) << "Path to asset folder: " << zipFile; + QString assetFolder = zipFile.section('/', -1); + assetFolder.remove(".zip?noDownload=false"); + mapping = "/" + assetFolder + "/" + filename; } else { mapping = "/" + filename; } @@ -6692,12 +6697,12 @@ void Application::onAssetToWorldMessageBoxClosed() { } -void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip) { +void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip, bool isBlocks) { if (autoAdd) { if (!unzipFile.isEmpty()) { for (int i = 0; i < unzipFile.length(); i++) { qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i); - addAssetToWorld(unzipFile.at(i), zipFile, isZip); + addAssetToWorld(unzipFile.at(i), zipFile, isZip, isBlocks); } } else { addAssetToWorldUnzipFailure(zipFile); diff --git a/interface/src/Application.h b/interface/src/Application.h index f8eb393f9e..516ea6ed3a 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -331,14 +331,14 @@ public slots: // FIXME: Move addAssetToWorld* methods to own class? void addAssetToWorldFromURL(QString url); void addAssetToWorldFromURLRequestFinished(); - void addAssetToWorld(QString filePath, QString zipFile, bool isZip); + void addAssetToWorld(QString filePath, QString zipFile, bool isZip, bool isBlocks); void addAssetToWorldUnzipFailure(QString filePath); void addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy); void addAssetToWorldUpload(QString filePath, QString mapping); void addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash); void addAssetToWorldAddEntity(QString filePath, QString mapping); - void handleUnzip(QString sourceFile, QStringList destinationFile, bool autoAdd, bool isZip); + void handleUnzip(QString sourceFile, QStringList destinationFile, bool autoAdd, bool isZip, bool isBlocks); FileScriptingInterface* getFileDownloadInterface() { return _fileDownload; } diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp index 1a121f3059..681156973b 100644 --- a/libraries/script-engine/src/FileScriptingInterface.cpp +++ b/libraries/script-engine/src/FileScriptingInterface.cpp @@ -32,14 +32,11 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent // nothing for now } -void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isZip) { +void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isZip, bool isBlocks) { qCDebug(scriptengine) << "Url that was downloaded: " + url.toString(); - /*if ((url.toString()).contains("vr.google.com/downloads")) { - - path = downloadBlocksZip(url); - }*/ qCDebug(scriptengine) << "Path where download is saved: " + path; QString fileName = "/" + path.section("/", -1); + qCDebug(scriptengine) << "Filename: " << fileName; QString tempDir = path; if (!isZip) { tempDir.remove(fileName); @@ -60,11 +57,14 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool if (!fileList.isEmpty()) { qCDebug(scriptengine) << "File to upload: " + fileList.first(); - } - else { + } else { qCDebug(scriptengine) << "Unzip failed"; } - emit unzipResult(path, fileList, autoAdd, isZip); + + if (path.contains("vr.google.com/downloads")) { + isZip = true; + } + emit unzipResult(path, fileList, autoAdd, isZip, isBlocks); } @@ -115,18 +115,6 @@ QString FileScriptingInterface::convertUrlToPath(QUrl url) { return newUrl; } -// handles a download from Blocks in the marketplace -QString FileScriptingInterface::downloadBlocksZip(QUrl url) { - qCDebug(scriptengine) << "Made it to the download blocks! " << url.toString(); - - /*auto request = DependencyManager::get()->createResourceRequest(nullptr, url); - connect(request, &ResourceRequest::finished, this, [this, url] { - unzipFile(url, ""); // so intellisense isn't mad - }); - request->send();*/ - return url.toString(); -} - // this function is not in use void FileScriptingInterface::downloadZip(QString path, const QString link) { QUrl url = QUrl(link); diff --git a/libraries/script-engine/src/FileScriptingInterface.h b/libraries/script-engine/src/FileScriptingInterface.h index c2b309ce43..e4c27dbf7f 100644 --- a/libraries/script-engine/src/FileScriptingInterface.h +++ b/libraries/script-engine/src/FileScriptingInterface.h @@ -24,17 +24,16 @@ public: public slots: QString convertUrlToPath(QUrl url); - void runUnzip(QString path, QUrl url, bool autoAdd, bool isZip); + void runUnzip(QString path, QUrl url, bool autoAdd, bool isZip, bool isBlocks); QString getTempDir(); signals: - void unzipResult(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip); + void unzipResult(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip, bool isBlocks); private: bool isTempDir(QString tempDir); QStringList unzipFile(QString path, QString tempDir); void recursiveFileScan(QFileInfo file, QString* dirName); - QString downloadBlocksZip(QUrl url); void downloadZip(QString path, const QString link); }; From 74c90d632380c85fb24c4cd12b75a05ecf9b01b9 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 9 Aug 2017 16:08:47 -0700 Subject: [PATCH 14/24] minor typo --- scripts/system/html/js/marketplacesInject.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 179cefd205..9526bd051a 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -400,7 +400,8 @@ break; case CLARA: injectClaraCode(); - break; case BLOCKS: + break; + case BLOCKS: console.log("in Blocks"); injectBlocksCode(); console.log("blocks injection"); From 69a13052abaf305245bf8437b636eb90699aa598 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 9 Aug 2017 17:23:08 -0700 Subject: [PATCH 15/24] commented out blocks injection --- scripts/system/html/js/marketplacesInject.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 9526bd051a..644a1aa046 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -403,8 +403,9 @@ break; case BLOCKS: console.log("in Blocks"); - injectBlocksCode(); - console.log("blocks injection"); + //injectBlocksCode(); + //console.log("blocks injection"); + break; case HIFI_ITEM_PAGE: injectHiFiItemPageCode(); break; From d3c76c99c20ab8598dfea5ced9487b9920f95c2b Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Wed, 9 Aug 2017 17:28:05 -0700 Subject: [PATCH 16/24] See all markets button working again --- .../resources/qml/hifi/commerce/Checkout.qml | 17 +++++- scripts/system/html/js/marketplacesInject.js | 31 +++++++---- scripts/system/marketplaces/marketplaces.js | 52 +++++++++---------- 3 files changed, 61 insertions(+), 39 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/Checkout.qml b/interface/resources/qml/hifi/commerce/Checkout.qml index 0b5d5978dd..48d5f5b1d5 100644 --- a/interface/resources/qml/hifi/commerce/Checkout.qml +++ b/interface/resources/qml/hifi/commerce/Checkout.qml @@ -25,6 +25,7 @@ Rectangle { id: checkoutRoot; property string itemId; + property string itemHref; // Style color: hifi.colors.baseGray; Hifi.QmlCommerce { @@ -234,6 +235,7 @@ Rectangle { // "Cancel" button HifiControlsUit.Button { + id: cancelButton; color: hifi.buttons.black; colorScheme: hifi.colorSchemes.dark; anchors.top: parent.top; @@ -251,6 +253,8 @@ Rectangle { // "Buy" button HifiControlsUit.Button { + property bool buyFailed: false; + id: buyButton; color: hifi.buttons.black; colorScheme: hifi.colorSchemes.dark; anchors.top: parent.top; @@ -262,7 +266,11 @@ Rectangle { width: parent.width/2 - anchors.rightMargin*2; text: "Buy" onClicked: { - sendToScript({method: 'checkout_buyClicked', params: {success: commerce.buy(itemId, parseInt(itemPriceText.text))}}); + if (buyFailed) { + sendToScript({method: 'checkout_cancelClicked', params: itemId}); + } else { + sendToScript({method: 'checkout_buyClicked', success: commerce.buy(itemId, parseInt(itemPriceText.text)), itemId: itemId, itemHref: itemHref}); + } } } } @@ -293,6 +301,13 @@ Rectangle { itemNameText.text = message.params.itemName; itemAuthorText.text = message.params.itemAuthor; itemPriceText.text = message.params.itemPrice; + itemHref = message.params.itemHref; + buyButton.text = "Buy"; + buyButton.buyFailed = false; + break; + case 'buyFailed': + buyButton.text = "Buy Failed"; + buyButton.buyFailed = true; break; default: console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message)); diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 644a1aa046..e078112360 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -93,24 +93,29 @@ }); } - function buyButtonClicked(id, name, author, price) { + function buyButtonClicked(id, name, author, price, href) { EventBridge.emitWebEvent(JSON.stringify({ type: "CHECKOUT", itemId: id, itemName: name, itemAuthor: author, - itemPrice: price + itemPrice: price, + itemHref: href })); } function injectBuyButtonOnMainPage() { - $('.grid-item').find('#price-or-edit').find('a').attr('href', '#'); + $('.grid-item').find('#price-or-edit').find('a').each(function() { + $(this).attr('data-href', $(this).attr('href')); + $(this).attr('href', '#'); + }); $('.grid-item').find('#price-or-edit').find('.price').text("BUY"); $('.grid-item').find('#price-or-edit').find('a').on('click', function () { buyButtonClicked($(this).closest('.grid-item').attr('data-item-id'), $(this).closest('.grid-item').find('.item-title').text(), $(this).closest('.grid-item').find('.creator').find('.value').text(), - 10); + 10, + $(this).attr('data-href')); }); } @@ -137,13 +142,15 @@ function injectHiFiItemPageCode() { if (confirmAllPurchases) { + var href = $('#side-info').find('.btn').attr('href'); $('#side-info').find('.btn').attr('href', '#'); $('#side-info').find('.btn').html('Buy Item '); $('#side-info').find('.btn').on('click', function () { buyButtonClicked(window.location.pathname.split("/")[3], $('#top-center').find('h1').text(), $('#creator').find('.value').text(), - 10); + 10, + href); }); } } @@ -415,16 +422,18 @@ function onLoad() { EventBridge.scriptEventReceived.connect(function (message) { - var parsedJsonMessage = JSON.parse(message); - if (message.slice(0, CAN_WRITE_ASSETS.length) === CAN_WRITE_ASSETS) { canWriteAssets = message.slice(-4) === "true"; } else if (message.slice(0, CLARA_IO_CANCEL_DOWNLOAD.length) === CLARA_IO_CANCEL_DOWNLOAD) { cancelClaraDownload(); - } else if (parsedJsonMessage.type === "marketplaces") { - if (parsedJsonMessage.action === "inspectionModeSetting") { - confirmAllPurchases = !!parsedJsonMessage.data; - injectCode(); + } else { + var parsedJsonMessage = JSON.parse(message); + + if (parsedJsonMessage.type === "marketplaces") { + if (parsedJsonMessage.action === "inspectionModeSetting") { + confirmAllPurchases = !!parsedJsonMessage.data; + injectCode(); + } } } }); diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js index e29510b4c8..4dd7438ac2 100644 --- a/scripts/system/marketplaces/marketplaces.js +++ b/scripts/system/marketplaces/marketplaces.js @@ -101,31 +101,14 @@ Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged); function onMessage(message) { - var parsedJsonMessage = JSON.parse(message); - if (parsedJsonMessage.type === "CHECKOUT") { - tablet.sendToQml({ method: 'updateCheckoutQML', params: parsedJsonMessage }); - tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH); - } else if (parsedJsonMessage.type === "REQUEST_SETTING") { - tablet.emitScriptEvent(JSON.stringify({ - type: "marketplaces", - action: "inspectionModeSetting", - data: Settings.getValue("inspectionMode", false) - })); - } if (message === GOTO_DIRECTORY) { tablet.gotoWebScreen(MARKETPLACES_URL, MARKETPLACES_INJECT_SCRIPT_URL); - } - - if (message === QUERY_CAN_WRITE_ASSETS) { + } else if (message === QUERY_CAN_WRITE_ASSETS) { tablet.emitScriptEvent(CAN_WRITE_ASSETS + " " + Entities.canWriteAssets()); - } - - if (message === WARN_USER_NO_PERMISSIONS) { + } else if (message === WARN_USER_NO_PERMISSIONS) { Window.alert(NO_PERMISSIONS_ERROR_MESSAGE); - } - - if (message.slice(0, CLARA_IO_STATUS.length) === CLARA_IO_STATUS) { + } else if (message.slice(0, CLARA_IO_STATUS.length) === CLARA_IO_STATUS) { if (isDownloadBeingCancelled) { return; } @@ -137,18 +120,26 @@ Window.updateMessageBox(messageBox, CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON); } return; - } - - if (message.slice(0, CLARA_IO_DOWNLOAD.length) === CLARA_IO_DOWNLOAD) { + } else if (message.slice(0, CLARA_IO_DOWNLOAD.length) === CLARA_IO_DOWNLOAD) { if (messageBox !== null) { Window.closeMessageBox(messageBox); messageBox = null; } return; - } - - if (message === CLARA_IO_CANCELLED_DOWNLOAD) { + } else if (message === CLARA_IO_CANCELLED_DOWNLOAD) { isDownloadBeingCancelled = false; + } else { + var parsedJsonMessage = JSON.parse(message); + if (parsedJsonMessage.type === "CHECKOUT") { + tablet.sendToQml({ method: 'updateCheckoutQML', params: parsedJsonMessage }); + tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH); + } else if (parsedJsonMessage.type === "REQUEST_SETTING") { + tablet.emitScriptEvent(JSON.stringify({ + type: "marketplaces", + action: "inspectionModeSetting", + data: Settings.getValue("inspectionMode", false) + })); + } } } @@ -207,7 +198,14 @@ //tablet.popFromStack(); break; case 'checkout_buyClicked': - print("fromQml: " + JSON.stringify(message)); + if (message.success === true) { + tablet.gotoWebScreen(message.itemHref); + Script.setTimeout(function () { + tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.itemId, MARKETPLACES_INJECT_SCRIPT_URL); + }, 100); + } else { + tablet.sendToQml({ method: 'buyFailed' }); + } //tablet.popFromStack(); break; default: From b0c91547b421fb634353c1b54131e5bab460c109 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Thu, 10 Aug 2017 14:14:09 -0700 Subject: [PATCH 17/24] Fixed WebGL rendering --- interface/src/main.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index a19055d4da..084e540ff4 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -216,7 +216,17 @@ int main(int argc, const char* argv[]) { SandboxUtils::runLocalSandbox(serverContentPath, true, noUpdater); } - Application app(argc, const_cast(argv), startupTime, runningMarkerExisted); + // to enable WebGL rendering + char* additionalCommandLineArg = (char*)"--ignore-gpu-blacklist"; + int newArgc = argc + 1; + char** newArgv = new char*[newArgc]; + for (int i = 0; i < argc; ++i) { + newArgv[i] = (char*)argv[i]; + } + newArgv[argc] = additionalCommandLineArg; + + Application app(newArgc, const_cast(newArgv), startupTime, runningMarkerExisted); + delete[] newArgv; // If we failed the OpenGLVersion check, log it. if (override) { From 28476960bb3d6560e941e260c99e2a9b91ca9f73 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Thu, 10 Aug 2017 14:23:45 -0700 Subject: [PATCH 18/24] Moved Blocks to tablet app --- scripts/defaultScripts.js | 1 + scripts/system/html/js/marketplacesInject.js | 28 +++----------------- scripts/system/html/marketplaces.html | 12 --------- scripts/system/marketplaces/blocksApp.js | 22 +++++++++++++++ 4 files changed, 26 insertions(+), 37 deletions(-) create mode 100644 scripts/system/marketplaces/blocksApp.js diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 2270118861..bddb2ae703 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -24,6 +24,7 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/makeUserConnection.js", "system/tablet-goto.js", "system/marketplaces/marketplaces.js", + "system/marketplaces/blocksApp.js", // temporarily in default scripts for testing purposes "system/edit.js", "system/notifications.js", "system/dialTone.js", diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index e078112360..dd239463d2 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -59,7 +59,7 @@ $("body").append( '
    ' + (!isInitialHiFiPage ? '' : '') + - (isInitialHiFiPage ? '🛈 Get items from Blocks and Clara.io!' : '') + + (isInitialHiFiPage ? '🛈 Get items from Clara.io!' : '') + (!isDirectoryPage ? '' : '') + (isDirectoryPage ? '🛈 Select a marketplace to explore.' : '') + '
    ' @@ -82,9 +82,6 @@ // Add button links. - $('#exploreBlocksMarketplace').on('click', function () { - window.location = "https://vr.google.com/objects"; - }); $('#exploreClaraMarketplace').on('click', function () { window.location = "https://clara.io/library?gameCheck=true&public=true"; }); @@ -155,18 +152,6 @@ } } - function injectBlocksCode() { - // Make space for marketplaces footer in Blocks pages. - /*$("body").append( - '
    ' + - '' + - '
    ' - );*/ - $("body").append( - '

    hello

    ' - ); - } - function updateClaraCode() { // Have to repeatedly update Clara page because its content can change dynamically without location.href changing. @@ -387,13 +372,11 @@ function injectCode() { var DIRECTORY = 0; var HIFI = 1; - var BLOCKS = 2; - var CLARA = 3; - var HIFI_ITEM_PAGE = 4; + var CLARA = 2; + var HIFI_ITEM_PAGE = 3; var pageType = DIRECTORY; if (location.href.indexOf("highfidelity.com/") !== -1) { pageType = HIFI; } - if (location.href.indexOf("google.com/") !== -1) { pageType = BLOCKS; } if (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; } if (location.href.indexOf("highfidelity.com/marketplace/items/") !== -1) { pageType = HIFI_ITEM_PAGE; } @@ -408,11 +391,6 @@ case CLARA: injectClaraCode(); break; - case BLOCKS: - console.log("in Blocks"); - //injectBlocksCode(); - //console.log("blocks injection"); - break; case HIFI_ITEM_PAGE: injectHiFiItemPageCode(); break; diff --git a/scripts/system/html/marketplaces.html b/scripts/system/html/marketplaces.html index 10184ae101..9e001c064f 100644 --- a/scripts/system/html/marketplaces.html +++ b/scripts/system/html/marketplaces.html @@ -31,18 +31,6 @@
    -
    -
    - -
    -
    -

    Blocks, released by Google, allows anyone to create 3D models using just a few simple tools. Browse through other users' creations for low-poly assets to add to your world.

    -
    -
    - -
    -
    -
    diff --git a/scripts/system/marketplaces/blocksApp.js b/scripts/system/marketplaces/blocksApp.js new file mode 100644 index 0000000000..46a102042e --- /dev/null +++ b/scripts/system/marketplaces/blocksApp.js @@ -0,0 +1,22 @@ +(function() { + var APP_NAME = "BLOCKS"; + var APP_URL = "https://vr.google.com/objects/"; + var APP_ICON = "https://hifi-content.s3.amazonaws.com/faye/gemstoneMagicMaker/gemstoneAppIcon.svg"; + + var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); + var button = tablet.addButton({ + icon: APP_ICON, + text: APP_NAME + }); + + function onClicked() { + tablet.gotoWebScreen(APP_URL); + } + button.clicked.connect(onClicked); + + function cleanup() { + tablet.removeButton(button); + } + + Script.scriptEnding.connect(cleanup); +}()); \ No newline at end of file From da5bb03187431111156690788e17ef848a6989d4 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Thu, 10 Aug 2017 16:34:37 -0700 Subject: [PATCH 19/24] Trying to add in a back button --- interface/resources/qml/hifi/tablet/TabletRoot.qml | 5 +++++ interface/resources/qml/hifi/tablet/WindowRoot.qml | 5 +++++ libraries/ui/src/ui/TabletScriptingInterface.cpp | 8 ++++++-- libraries/ui/src/ui/TabletScriptingInterface.h | 2 +- scripts/system/marketplaces/blocksApp.js | 4 ++-- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml index c7df6ac64f..c89317c93c 100644 --- a/interface/resources/qml/hifi/tablet/TabletRoot.qml +++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml @@ -93,6 +93,11 @@ Item { loader.source = ""; loader.source = "TabletWebView.qml"; } + + function loadTabletWebBase() { + loader.source = ""; + loader.source = "../../controls/TabletWebView.qml"; + } function returnToPreviousApp() { tabletApps.remove(currentApp); diff --git a/interface/resources/qml/hifi/tablet/WindowRoot.qml b/interface/resources/qml/hifi/tablet/WindowRoot.qml index fdfcfcf806..0858b46b40 100644 --- a/interface/resources/qml/hifi/tablet/WindowRoot.qml +++ b/interface/resources/qml/hifi/tablet/WindowRoot.qml @@ -42,6 +42,11 @@ Windows.ScrollingWindow { loader.source = "WindowWebView.qml"; } + function loadTabletWebBase() { + loader.source = ""; + loader.source = "../../controls/TabletWebView.qml"; + } + function loadWebUrl(url, injectedJavaScriptUrl) { loader.item.url = url; loader.item.scriptURL = injectedJavaScriptUrl; diff --git a/libraries/ui/src/ui/TabletScriptingInterface.cpp b/libraries/ui/src/ui/TabletScriptingInterface.cpp index 984d743ebf..1331b47590 100644 --- a/libraries/ui/src/ui/TabletScriptingInterface.cpp +++ b/libraries/ui/src/ui/TabletScriptingInterface.cpp @@ -604,7 +604,7 @@ void TabletProxy::loadWebScreenOnTop(const QVariant& url, const QString& injectJ _state = State::Web; } -void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl) { +void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "gotoWebScreen", Q_ARG(QString, url), Q_ARG(QString, injectedJavaScriptUrl)); return; @@ -619,7 +619,11 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS if (root) { removeButtonsFromHomeScreen(); - QMetaObject::invokeMethod(root, "loadWebBase"); + if (loadOtherBase) { + QMetaObject::invokeMethod(root, "loadTabletWebBase"); + } else { + QMetaObject::invokeMethod(root, "loadWebBase"); + } QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true))); QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl))); } diff --git a/libraries/ui/src/ui/TabletScriptingInterface.h b/libraries/ui/src/ui/TabletScriptingInterface.h index af38cb9351..822bae839e 100644 --- a/libraries/ui/src/ui/TabletScriptingInterface.h +++ b/libraries/ui/src/ui/TabletScriptingInterface.h @@ -122,7 +122,7 @@ public: * @param [injectedJavaScriptUrl] {string} optional url to an additional JS script to inject into the web page. */ Q_INVOKABLE void gotoWebScreen(const QString& url); - Q_INVOKABLE void gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl); + Q_INVOKABLE void gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase = false); Q_INVOKABLE void loadQMLSource(const QVariant& path); // FIXME: This currently relies on a script initializing the tablet (hence the bool denoting success); diff --git a/scripts/system/marketplaces/blocksApp.js b/scripts/system/marketplaces/blocksApp.js index 46a102042e..520b3657b9 100644 --- a/scripts/system/marketplaces/blocksApp.js +++ b/scripts/system/marketplaces/blocksApp.js @@ -10,7 +10,7 @@ }); function onClicked() { - tablet.gotoWebScreen(APP_URL); + tablet.gotoWebScreen(APP_URL, "", true); } button.clicked.connect(onClicked); @@ -19,4 +19,4 @@ } Script.scriptEnding.connect(cleanup); -}()); \ No newline at end of file +}()); From 6c2bf633929b86cd723c26ea9d411706782e9ce3 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Thu, 10 Aug 2017 17:51:19 -0700 Subject: [PATCH 20/24] Back button works --- interface/resources/qml/controls/TabletWebView.qml | 2 ++ interface/resources/qml/hifi/tablet/TabletRoot.qml | 3 +++ interface/resources/qml/hifi/tablet/WindowRoot.qml | 3 +++ libraries/ui/src/ui/TabletScriptingInterface.cpp | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml index 0a5a68717e..59728c4157 100644 --- a/interface/resources/qml/controls/TabletWebView.qml +++ b/interface/resources/qml/controls/TabletWebView.qml @@ -24,6 +24,7 @@ Item { property alias webView: webview property alias profile: webview.profile property bool remove: false + property bool closeButtonVisible: true // Manage own browse history because WebEngineView history is wiped when a new URL is loaded via // onNewViewRequested, e.g., as happens when a social media share button is clicked. @@ -64,6 +65,7 @@ Item { disabledColor: hifi.colors.lightGrayText enabled: true text: "CLOSE" + visible: closeButtonVisible MouseArea { anchors.fill: parent diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml index c89317c93c..bbf56c7827 100644 --- a/interface/resources/qml/hifi/tablet/TabletRoot.qml +++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml @@ -126,6 +126,9 @@ Item { loader.item.url = url; loader.item.scriptURL = injectedJavaScriptUrl; tabletApps.append({"appUrl": "TabletWebView.qml", "isWebUrl": true, "scriptUrl": injectedJavaScriptUrl, "appWebUrl": url}); + if (loader.item.hasOwnProperty("closeButtonVisible")) { + loader.item.closeButtonVisible = false; + } } // used to send a message from qml to interface script. diff --git a/interface/resources/qml/hifi/tablet/WindowRoot.qml b/interface/resources/qml/hifi/tablet/WindowRoot.qml index 0858b46b40..8596007956 100644 --- a/interface/resources/qml/hifi/tablet/WindowRoot.qml +++ b/interface/resources/qml/hifi/tablet/WindowRoot.qml @@ -50,6 +50,9 @@ Windows.ScrollingWindow { function loadWebUrl(url, injectedJavaScriptUrl) { loader.item.url = url; loader.item.scriptURL = injectedJavaScriptUrl; + if (loader.item.hasOwnProperty("closeButtonVisible")) { + loader.item.closeButtonVisible = false; + } } // used to send a message from qml to interface script. diff --git a/libraries/ui/src/ui/TabletScriptingInterface.cpp b/libraries/ui/src/ui/TabletScriptingInterface.cpp index 1331b47590..adff219e0f 100644 --- a/libraries/ui/src/ui/TabletScriptingInterface.cpp +++ b/libraries/ui/src/ui/TabletScriptingInterface.cpp @@ -606,7 +606,7 @@ void TabletProxy::loadWebScreenOnTop(const QVariant& url, const QString& injectJ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "gotoWebScreen", Q_ARG(QString, url), Q_ARG(QString, injectedJavaScriptUrl)); + QMetaObject::invokeMethod(this, "gotoWebScreen", Q_ARG(QString, url), Q_ARG(QString, injectedJavaScriptUrl), Q_ARG(bool, loadOtherBase)); return; } From 072f3dfb03a203ac546acf631f5bdb484d1213c0 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Tue, 15 Aug 2017 10:25:14 -0700 Subject: [PATCH 21/24] removed commented out code, removed blocks from default scripts --- libraries/script-engine/src/FileScriptingInterface.cpp | 1 - scripts/defaultScripts.js | 1 - 2 files changed, 2 deletions(-) diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp index 681156973b..68a141ad97 100644 --- a/libraries/script-engine/src/FileScriptingInterface.cpp +++ b/libraries/script-engine/src/FileScriptingInterface.cpp @@ -53,7 +53,6 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool } QStringList fileList = unzipFile(path, tempDir); - //QString filename = QUrl::fromLocalFile(fileList.first()).toString(); if (!fileList.isEmpty()) { qCDebug(scriptengine) << "File to upload: " + fileList.first(); diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index bddb2ae703..2270118861 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -24,7 +24,6 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/makeUserConnection.js", "system/tablet-goto.js", "system/marketplaces/marketplaces.js", - "system/marketplaces/blocksApp.js", // temporarily in default scripts for testing purposes "system/edit.js", "system/notifications.js", "system/dialTone.js", From 4b1498f7270df125154813f9ccf41c3310d30b76 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Thu, 17 Aug 2017 10:18:29 -0700 Subject: [PATCH 22/24] moved blocksApp.js to unpublished scripts, added icon --- .../marketplace/blocks}/blocksApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename {scripts/system/marketplaces => unpublishedScripts/marketplace/blocks}/blocksApp.js (81%) diff --git a/scripts/system/marketplaces/blocksApp.js b/unpublishedScripts/marketplace/blocks/blocksApp.js similarity index 81% rename from scripts/system/marketplaces/blocksApp.js rename to unpublishedScripts/marketplace/blocks/blocksApp.js index 520b3657b9..6a48cdc101 100644 --- a/scripts/system/marketplaces/blocksApp.js +++ b/unpublishedScripts/marketplace/blocks/blocksApp.js @@ -1,7 +1,7 @@ (function() { var APP_NAME = "BLOCKS"; var APP_URL = "https://vr.google.com/objects/"; - var APP_ICON = "https://hifi-content.s3.amazonaws.com/faye/gemstoneMagicMaker/gemstoneAppIcon.svg"; + var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-i.svg"; var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var button = tablet.addButton({ From 4c28b9f09a5550c722fad1304014e00623765197 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Thu, 17 Aug 2017 18:16:41 -0700 Subject: [PATCH 23/24] attempt to check version of interface --- .../scripting/WindowScriptingInterface.cpp | 4 ++++ .../src/scripting/WindowScriptingInterface.h | 1 + .../marketplace/blocks/blocksApp.js | 23 ++++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp index 277989439c..4cfa68b0f5 100644 --- a/interface/src/scripting/WindowScriptingInterface.cpp +++ b/interface/src/scripting/WindowScriptingInterface.cpp @@ -264,6 +264,10 @@ void WindowScriptingInterface::showAssetServer(const QString& upload) { QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload)); } +int WindowScriptingInterface::checkVersion() { + return QCoreApplication::applicationVersion().toInt(); +} + int WindowScriptingInterface::getInnerWidth() { return qApp->getWindow()->geometry().width(); } diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h index 28f1bafa5d..0e1f156b27 100644 --- a/interface/src/scripting/WindowScriptingInterface.h +++ b/interface/src/scripting/WindowScriptingInterface.h @@ -58,6 +58,7 @@ public slots: QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); QScriptValue browseAssets(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); void showAssetServer(const QString& upload = ""); + int checkVersion(); void copyToClipboard(const QString& text); void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f); void takeSecondaryCameraSnapshot(); diff --git a/unpublishedScripts/marketplace/blocks/blocksApp.js b/unpublishedScripts/marketplace/blocks/blocksApp.js index 6a48cdc101..f8994d5c3d 100644 --- a/unpublishedScripts/marketplace/blocks/blocksApp.js +++ b/unpublishedScripts/marketplace/blocks/blocksApp.js @@ -1,8 +1,29 @@ -(function() { +/// +/// blocksApp.js +/// A tablet app for downloading 3D assets from Google Blocks +/// +/// Author: Elisa Lupin-Jimenez +/// Copyright High Fidelity 2017 +/// +/// Licensed under the Apache 2.0 License +/// See accompanying license file or http://apache.org/ +/// +/// All assets are under CC Attribution Non-Commerical +/// http://creativecommons.org/licenses/ +/// + +(function () { var APP_NAME = "BLOCKS"; var APP_URL = "https://vr.google.com/objects/"; var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-i.svg"; + try { + print("Current Interface version: " + Script.checkVersion()); + } catch(err) { + print("Outdated Interface version does not support Blocks"); + APP_URL = null; + } + var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var button = tablet.addButton({ icon: APP_ICON, From 65f876acf3274816f8b9baf46996752fae9a9d16 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Fri, 18 Aug 2017 10:49:40 -0700 Subject: [PATCH 24/24] enabled version check --- interface/src/scripting/WindowScriptingInterface.cpp | 4 ++-- interface/src/scripting/WindowScriptingInterface.h | 2 +- unpublishedScripts/marketplace/blocks/blocksApp.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp index 4cfa68b0f5..f63c128cf5 100644 --- a/interface/src/scripting/WindowScriptingInterface.cpp +++ b/interface/src/scripting/WindowScriptingInterface.cpp @@ -264,8 +264,8 @@ void WindowScriptingInterface::showAssetServer(const QString& upload) { QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload)); } -int WindowScriptingInterface::checkVersion() { - return QCoreApplication::applicationVersion().toInt(); +QString WindowScriptingInterface::checkVersion() { + return QCoreApplication::applicationVersion(); } int WindowScriptingInterface::getInnerWidth() { diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h index 0e1f156b27..4b5e2e81fc 100644 --- a/interface/src/scripting/WindowScriptingInterface.h +++ b/interface/src/scripting/WindowScriptingInterface.h @@ -58,7 +58,7 @@ public slots: QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); QScriptValue browseAssets(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); void showAssetServer(const QString& upload = ""); - int checkVersion(); + QString checkVersion(); void copyToClipboard(const QString& text); void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f); void takeSecondaryCameraSnapshot(); diff --git a/unpublishedScripts/marketplace/blocks/blocksApp.js b/unpublishedScripts/marketplace/blocks/blocksApp.js index f8994d5c3d..2c20e13005 100644 --- a/unpublishedScripts/marketplace/blocks/blocksApp.js +++ b/unpublishedScripts/marketplace/blocks/blocksApp.js @@ -18,10 +18,10 @@ var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-i.svg"; try { - print("Current Interface version: " + Script.checkVersion()); + print("Current Interface version: " + Window.checkVersion()); } catch(err) { print("Outdated Interface version does not support Blocks"); - APP_URL = null; + APP_URL = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/updateToBlocks.html"; } var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");