Showing the changes to interface/src/scripting/GooglePolyScriptingInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | QString listPolyUrl = "https://poly.googleapis.com/v1/assets?"; |
| 30 | 30 | QString getPolyUrl = "https://poly.googleapis.com/v1/assets/model?"; |
| 31 | 31 | |
| 32 | −//authCode = "broke"; | |
| 32 | +QString authCode = "broke"; | |
| 33 | 33 | |
| 34 | 34 | QStringList validFormats = QStringList() << "BLOCKS" << "FBX" << "GLTF" << "GLTF2" << "OBJ" << "TILT" << ""; |
| 35 | 35 | QStringList validCategories = QStringList() << "animals" << "architecture" << "art" << "food" << |
| @@ -112,7 +112,6 @@ QByteArray GooglePolyScriptingInterface::getHTTPRequest(QUrl url) { · 76 unmodified lines | ||
| 112 | 112 | event.exec(); |
| 113 | 113 | |
| 114 | 114 | return response->readAll(); |
| 115 | − | |
| 116 | 115 | } |
| 117 | 116 | |
| 118 | 117 | // since the list is a QJsonArray and a single model is a QJsonObject |
| @@ -148,10 +147,6 @@ QVariant GooglePolyScriptingInterface::parseJSON(QByteArray* response, int fileT · 29 unmodified lines | ||
| 148 | 147 | } |
| 149 | 148 | |
| 150 | 149 | |
| 151 | − | |
| 152 | − | |
| 153 | − | |
| 154 | − | |
| 155 | 150 | /*void GooglePolyScriptingInterface::getAssetList() { |
| 156 | 151 | authCode = "AIzaSyDamk7Vth52j7aU9JVKn3ungFS0kGJYc8A"; |
| 157 | 152 | QUrl url(listPolyUrl + "key=" + authCode); |
| @@ -269,4 +264,5 @@ or this :(( http://blog.mathieu-leplatre.info/access-a-json-webservice-with-qt-c · 111 unmodified lines | ||
| 269 | 264 | qCDebug(scriptengine) << "first item: " << firstItem; |
| 270 | 265 | } |
| 271 | 266 | |
| 272 | −*/ | |
| 267 | +<<<<<<< HEAD | |
| 268 | +*/ | |