Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed extraneous print statements

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2017-07-27 13:33:53 -07:00
parent c3d943ff72
commit c6d5b1a5e6
2 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
interface/src/Application.cpp
View file

@ -6265,9 +6265,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);
@ -6275,8 +6272,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;
@ -6295,35 +6291,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<NodeList>()->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<AssetClient>()->createGetMappingRequest(mapping);
@ -6683,7 +6650,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);

1
libraries/script-engine/src/FileScriptingInterface.cpp
View file

@ -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 != "") {