Skip to content

Commit

Permalink
Merge pull request overte-org#1137 from Armored-Dragon/remove/googlePoly
Browse files Browse the repository at this point in the history
Remove Google Poly
  • Loading branch information
ksuprynowicz authored Oct 22, 2024
2 parents 5b3cd71 + 7d08640 commit 6babfa4
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 324 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ module.exports = {
"EventBridge": false,
"FaceTracker": false,
"GlobalServices": false,
"GooglePoly": false,
"Graphics": false,
"HifiAbout": false,
"HMD": false,
Expand Down
29 changes: 2 additions & 27 deletions interface/src/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@

#include <GPUIdent.h>
#include <gl/GLHelpers.h>
#include <src/scripting/GooglePolyScriptingInterface.h>
#include <EntityScriptClient.h>
#include <ModelScriptingInterface.h>

Expand Down Expand Up @@ -906,7 +905,6 @@ bool setupEssentials(const QCommandLineParser& parser, bool runningMarkerExisted
auto entityScriptServerLog = DependencyManager::get<EntityScriptServerLogClient>();
QObject::connect(scriptEngines.data(), &ScriptEngines::requestingEntityScriptServerLog, entityScriptServerLog.data(), &EntityScriptServerLogClient::requestMessagesForScriptEngines);

DependencyManager::set<GooglePolyScriptingInterface>();
DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats());
DependencyManager::set<AvatarBookmarks>();
DependencyManager::set<LocationBookmarks>();
Expand Down Expand Up @@ -4083,11 +4081,8 @@ 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("poly.google.com/downloads")) {
addAssetToWorldFromURL(filePath);
} else {
qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true, false);
}
qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true, false);

return true;
}

Expand Down Expand Up @@ -7657,8 +7652,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptManagerPoint
scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());

//scriptEngine->registerGlobalObject("GooglePoly", DependencyManager::get<GooglePolyScriptingInterface>().data());

if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptManager.get(), steamClient.get()));
}
Expand Down Expand Up @@ -7984,15 +7977,6 @@ void Application::addAssetToWorldFromURL(QString url) {
if (url.contains("filename")) {
filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL.
}
if (url.contains("poly.google.com/downloads")) {
filename = url.section('/', -1);
if (url.contains("noDownload")) {
filename.remove(".zip?noDownload=false");
} else {
filename.remove(".zip");
}

}

if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
QString errorInfo = "You do not have permissions to write to the Asset Server.";
Expand Down Expand Up @@ -8021,15 +8005,6 @@ void Application::addAssetToWorldFromURLRequestFinished() {
if (url.contains("filename")) {
filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL.
}
if (url.contains("poly.google.com/downloads")) {
filename = url.section('/', -1);
if (url.contains("noDownload")) {
filename.remove(".zip?noDownload=false");
} else {
filename.remove(".zip");
}
isBlocks = true;
}

if (result == ResourceRequest::Success) {
QTemporaryDir temporaryDir;
Expand Down
180 changes: 0 additions & 180 deletions interface/src/scripting/GooglePolyScriptingInterface.cpp

This file was deleted.

116 changes: 0 additions & 116 deletions interface/src/scripting/GooglePolyScriptingInterface.h

This file was deleted.

0 comments on commit 6babfa4

Please sign in to comment.