mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 06:18:52 +02:00
Removed extraneous print statements
This commit is contained in:
parent
c3d943ff72
commit
c6d5b1a5e6
2 changed files with 1 additions and 36 deletions
|
@ -6265,9 +6265,6 @@ void Application::addAssetToWorldUnzipFailure(QString filePath) {
|
||||||
|
|
||||||
void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBlocks) {
|
void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBlocks) {
|
||||||
// Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
|
// 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 mapping;
|
||||||
QString path = filePath;
|
QString path = filePath;
|
||||||
QString filename = filenameFromPath(filePath);
|
QString filename = filenameFromPath(filePath);
|
||||||
|
@ -6275,8 +6272,7 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBloc
|
||||||
QString assetFolder = zipFile.section("/", -1);
|
QString assetFolder = zipFile.section("/", -1);
|
||||||
assetFolder.remove(".zip");
|
assetFolder.remove(".zip");
|
||||||
mapping = "/" + assetFolder + "/" + filenameFromPath(filename);
|
mapping = "/" + assetFolder + "/" + filenameFromPath(filename);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
path = QUrl(filePath).toLocalFile();
|
path = QUrl(filePath).toLocalFile();
|
||||||
filename = filenameFromPath(path);
|
filename = filenameFromPath(path);
|
||||||
mapping = "/" + filename;
|
mapping = "/" + filename;
|
||||||
|
@ -6295,35 +6291,6 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBloc
|
||||||
addAssetToWorldWithNewMapping(path, mapping, 0);
|
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) {
|
void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy) {
|
||||||
auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(mapping);
|
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) {
|
void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isBlocks) {
|
||||||
if (autoAdd) {
|
if (autoAdd) {
|
||||||
if (!unzipFile.isEmpty()) {
|
if (!unzipFile.isEmpty()) {
|
||||||
qCDebug(interfaceapp) << "My folder contents: " << unzipFile;
|
|
||||||
for (int i = 0; i < unzipFile.length(); i++) {
|
for (int i = 0; i < unzipFile.length(); i++) {
|
||||||
qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i);
|
qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i);
|
||||||
addAssetToWorld(unzipFile.at(i), zipFile, isBlocks);
|
addAssetToWorld(unzipFile.at(i), zipFile, isBlocks);
|
||||||
|
|
|
@ -52,7 +52,6 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList fileList = unzipFile(path, tempDir);
|
QStringList fileList = unzipFile(path, tempDir);
|
||||||
qCDebug(scriptengine) << "Unzipped file list: " << fileList;
|
|
||||||
QString filename = QUrl::fromLocalFile(fileList.first()).toString();
|
QString filename = QUrl::fromLocalFile(fileList.first()).toString();
|
||||||
|
|
||||||
if (filename != "") {
|
if (filename != "") {
|
||||||
|
|
Loading…
Reference in a new issue