Showing the changes to interface/src/scripting/GooglePolyScriptingInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -40,14 +40,13 @@ void GooglePolyScriptingInterface::setAPIKey(QString key) { · 39 unmodified lines | ||
| 40 | 40 | authCode = key; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | −QByteArray GooglePolyScriptingInterface::getAssetList(QString keyword, QString category, QString format) { | |
| 43 | +QString GooglePolyScriptingInterface::getAssetList(QString keyword, QString category, QString format) { | |
| 44 | 44 | QUrl url = formatURLQuery(keyword, category, format); |
| 45 | 45 | if (!url.isEmpty()) { |
| 46 | 46 | //QJsonArray json = parseJSON(url, 0).toJsonArray(); |
| 47 | 47 | //qCDebug(scriptengine) << "first asset name: " << json.at(0).toObject().value("displayName"); |
| 48 | 48 | QByteArray json = parseJSON(url, 0).toJsonDocument().toJson(); |
| 49 | − qCDebug(scriptengine) << "asset list as string is: " << json; | |
| 50 | − return json; | |
| 49 | + return (QString) json; | |
| 51 | 50 | } else { |
| 52 | 51 | qCDebug(scriptengine) << "Invalid filters were specified."; |
| 53 | 52 | //return QJsonArray(); |
| @@ -55,21 +54,6 @@ QByteArray GooglePolyScriptingInterface::getAssetList(QString keyword, QString c · 1 unmodified line | ||
| 55 | 54 | } |
| 56 | 55 | } |
| 57 | 56 | |
| 58 | −/*QJsonArray GooglePolyScriptingInterface::getAssetList(QString keyword, QString category, QString format) { | |
| 59 | − QUrl url = formatURLQuery(keyword, category, format); | |
| 60 | − if (!url.isEmpty()) { | |
| 61 | − //QJsonArray json = parseJSON(url, 0).toJsonArray(); | |
| 62 | − //qCDebug(scriptengine) << "first asset name: " << json.at(0).toObject().value("displayName"); | |
| 63 | − QJsonArray json = parseJSON(url, 0).toJsonArray(); | |
| 64 | − qCDebug(scriptengine) << "asset list as array is: " << json; | |
| 65 | − return json; | |
| 66 | − } else { | |
| 67 | − qCDebug(scriptengine) << "Invalid filters were specified."; | |
| 68 | − return QJsonArray(); | |
| 69 | − //return ""; | |
| 70 | − } | |
| 71 | −}*/ | |
| 72 | − | |
| 73 | 57 | QString GooglePolyScriptingInterface::getFBX(QString keyword, QString category) { |
| 74 | 58 | QUrl url = formatURLQuery(keyword, category, "FBX"); |
| 75 | 59 | return getModelURL(url); |