added gltf import feature, getAssetList() not working

Elisa Lupin-Jimenez committed 8 years ago

Commit 1ee84451 parent e7fad052 files · +46 −19Browse files

Showing the changes to interface/src/scripting/GooglePolyScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

interface/src/scripting/GooglePolyScriptingInterface.cpp+42−18

     // nothing to be implemented
 }
-QJsonArray GooglePolyScriptingInterface::getAssetList(QString keyword, QString category, QString format) {
+void GooglePolyScriptingInterface::setAPIKey(QString key) {
+    authCode = key;
+}
+QByteArray GooglePolyScriptingInterface::getAssetList(QString keyword, QString category, QString format) {
+    QUrl url = formatURLQuery(keyword, category, format);
+    if (!url.isEmpty()) {
+        //QJsonArray json = parseJSON(url, 0).toJsonArray();
+        //qCDebug(scriptengine) << "first asset name: " << json.at(0).toObject().value("displayName");
+        QByteArray json = parseJSON(url, 0).toJsonDocument().toJson();
+        qCDebug(scriptengine) << "asset list as string is: " << json;
+        return json;
+    } else {
+        qCDebug(scriptengine) << "Invalid filters were specified.";
+        //return QJsonArray();
+        return "";
+    }
+}
+/*QJsonArray GooglePolyScriptingInterface::getAssetList(QString keyword, QString category, QString format) {
     QUrl url = formatURLQuery(keyword, category, format);
     if (!url.isEmpty()) {
+        //QJsonArray json = parseJSON(url, 0).toJsonArray();
+        //qCDebug(scriptengine) << "first asset name: " << json.at(0).toObject().value("displayName");
         QJsonArray json = parseJSON(url, 0).toJsonArray();
-        qCDebug(scriptengine) << "first asset name: " << json.at(0).toObject().value("displayName");
+        qCDebug(scriptengine) << "asset list as array is: " << json;
         return json;
     } else {
         qCDebug(scriptengine) << "Invalid filters were specified.";
         return QJsonArray();
+        //return "";
     }
-}
+}*/
 QString GooglePolyScriptingInterface::getFBX(QString keyword, QString category) {
     QUrl url = formatURLQuery(keyword, category, "FBX");
 QString GooglePolyScriptingInterface::getBlocks(QString keyword, QString category) {
     QUrl url = formatURLQuery(keyword, category, "BLOCKS");
-    qCDebug(scriptengine) << "Google url request: " << url;
+    return getModelURL(url);
+}
+QString GooglePolyScriptingInterface::getGLTF(QString keyword, QString category) {
+    QUrl url = formatURLQuery(keyword, category, "GLTF");
+    return getModelURL(url);
+}
+QString GooglePolyScriptingInterface::getGLTF2(QString keyword, QString category) {
+    QUrl url = formatURLQuery(keyword, category, "GLTF2");
     return getModelURL(url);
 }
 // can provide asset name or full URL to model
 QString GooglePolyScriptingInterface::getModelInfo(QString name) {
-    if (name.contains("poly.googleapis")) {
+    if (name.contains("poly.googleapis") || name.contains("poly.google.com")) {
         QStringList list = name.split("/");
         name = list[4];
     }
     QString urlString = QString(getPolyUrl);
     urlString = urlString.replace("model", name) + "key=" + authCode;
-    qCDebug(scriptengine) << "google get url: " << urlString;
+    qCDebug(scriptengine) << "Google URL request: " << urlString;
     QUrl url(urlString);
-    QByteArray json = parseJSON(url, 2).toByteArray();
+    QString json = parseJSON(url, 2).toString();
     return json;
 }
     qCDebug(scriptengine) << "Google message: " << input;
 }
-void GooglePolyScriptingInterface::setAPIKey(QString key) {
-    authCode = key;
-}
 int GooglePolyScriptingInterface::getRandIntInRange(int length) {
     QTime time = QTime::currentTime();
     qsrand((uint)time.msec());
 }
 QString GooglePolyScriptingInterface::getModelURL(QUrl url) {
-    qCDebug(scriptengine) << "Google url request: " << url;
+    qCDebug(scriptengine) << "Google URL request: " << url;
     if (!url.isEmpty()) {
         return parseJSON(url, 1).toString();
     } else {
     if (obj.keys().first() == "error") {
         QString error = obj.value("error").toObject().value("message").toString();
         qCDebug(scriptengine) << error;
-        return QJsonObject();
+        return "";
     }
-    qCDebug(scriptengine) << "the assets: " << obj.value("assets");
     if (fileType == 0 || fileType == 1) {
         QJsonArray arr = obj.value("assets").toArray();
         // return model url
             return json.value("formats").toArray().at(0).toObject().value("root").toObject().value("url");
         }
         // return whole asset list
-        return arr;
+        //return arr;
+        return QJsonDocument(arr);
     // return specific object
     } else {
-        //return obj;
-        //return doc.toJson();
         return jsonString;
     }
 }
     qCDebug(scriptengine) << "first item: " << firstItem;
     }
-<<<<<<< HEAD
 */