Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-24 17:00:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR round 1

Browse source
This commit is contained in:
Zach Fox 2018-11-08 10:05:57 -08:00
parent 1ab1cb95d8
commit 142dfab9ac
8 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/resources/qml/hifi/AssetServer.qml
View file

@ -81,14 +81,16 @@ Windows.ScrollingWindow {
} }
function doDeleteFile(paths) { function doDeleteFile(paths) {
console.log("Deleting " + paths);
Assets.deleteMappings(paths, function(err) { Assets.deleteMappings(paths, function(err) {
if (err) { if (err) {
console.log("Asset browser - error deleting paths: ", err); console.log("Asset browser - error deleting paths: ", paths, err);
box = errorMessageBox("There was an error deleting:\n" + err); box = errorMessageBox("There was an error deleting:\n" + paths + "\n" + err);
box.selected.connect(reload); box.selected.connect(reload);
} else { } else {
console.log("Asset browser - finished deleting paths"); console.log("Asset browser - finished deleting paths: ", paths);
reload(); reload();
} }
}); });
@ -115,11 +117,11 @@ Windows.ScrollingWindow {
Assets.renameMapping(oldPath, newPath, function(err) { Assets.renameMapping(oldPath, newPath, function(err) {
if (err) { if (err) {
console.log("Asset browser - error renaming:", err); console.log("Asset browser - error renaming: ", oldPath, "=>", newPath, " - error ", err);
box = errorMessageBox("There was an error renaming:\n" + oldPath + " to " + newPath + "\n" + err); box = errorMessageBox("There was an error renaming:\n" + oldPath + " to " + newPath + "\n" + err);
box.selected.connect(reload); box.selected.connect(reload);
} else { } else {
console.log("Asset browser - finished rename"); console.log("Asset browser - finished rename: ", oldPath, "=>", newPath);
} }
reload(); reload();
@ -278,7 +280,7 @@ Windows.ScrollingWindow {
gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0); gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
} }
print("Asset browser - adding asset " + name + " to world."); print("Asset browser - adding asset " + url + " (" + name + ") to world.");
// Entities.addEntity doesn't work from QML, so we use this. // Entities.addEntity doesn't work from QML, so we use this.
Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, grabbable, addPosition, gravity); Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, grabbable, addPosition, gravity);
@ -424,7 +426,7 @@ Windows.ScrollingWindow {
uploadProgressLabel.text = "In progress..."; uploadProgressLabel.text = "In progress...";
}, },
function(err, path) { function(err, path) {
print(err); print(err, path);
if (err === "") { if (err === "") {
uploadProgressLabel.text = "Upload Complete"; uploadProgressLabel.text = "Upload Complete";
timer.interval = 1000; timer.interval = 1000;
@ -435,7 +437,7 @@ Windows.ScrollingWindow {
uploadOpen = false; uploadOpen = false;
}); });
timer.start(); timer.start();
console.log("Asset Browser - finished uploading"); console.log("Asset Browser - finished uploading: ", fileUrl);
reload(); reload();
} else { } else {
uploadSpinner.visible = false; uploadSpinner.visible = false;
@ -443,7 +445,7 @@ Windows.ScrollingWindow {
uploadOpen = false; uploadOpen = false;
if (err !== -1) { if (err !== -1) {
console.log("Asset Browser - error uploading:", err); console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err);
var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + err); var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + err);
box.selected.connect(reload); box.selected.connect(reload);
} }

2
interface/resources/qml/hifi/RootHttpRequest.qml
View file

@ -20,7 +20,6 @@ Item {
// Public function for initiating an http request. // Public function for initiating an http request.
// REQUIRES parent to be root to have sendToScript! // REQUIRES parent to be root to have sendToScript!
function request(options, callback) { function request(options, callback) {
console.debug('HttpRequest');
httpCalls[httpCounter] = callback; httpCalls[httpCounter] = callback;
var message = {method: 'http.request', params: options, id: httpCounter++, jsonrpc: "2.0"}; var message = {method: 'http.request', params: options, id: httpCounter++, jsonrpc: "2.0"};
parent.sendToScript(message); parent.sendToScript(message);
@ -33,7 +32,6 @@ Item {
return; return;
} }
delete httpCalls[message.id]; delete httpCalls[message.id];
console.debug('HttpRequest response');
callback(message.error, message.response); callback(message.error, message.response);
} }
} }

2
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -1009,7 +1009,7 @@ Rectangle {
try { // Not all calls to onFileOpenChanged() connect an event. try { // Not all calls to onFileOpenChanged() connect an event.
Window.browseChanged.disconnect(onFileOpenChanged); Window.browseChanged.disconnect(onFileOpenChanged);
} catch (e) { } catch (e) {
console.log('Purchases.qml ignoring'); console.log('Purchases.qml ignoring', e);
} }
if (filename) { if (filename) {
Commerce.installApp(filename); Commerce.installApp(filename);

20
interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
View file

@ -81,16 +81,16 @@ Rectangle {
} }
function doDeleteFile(paths) { function doDeleteFile(paths) {
console.log("Deleting paths"); console.log("Deleting " + paths);
Assets.deleteMappings(paths, function(err) { Assets.deleteMappings(paths, function(err) {
if (err) { if (err) {
console.log("Asset browser - error deleting paths: ", err); console.log("Asset browser - error deleting paths: ", paths, err);
box = errorMessageBox("There was an error deleting:\n" + err); box = errorMessageBox("There was an error deleting:\n" + paths + "\n" + err);
box.selected.connect(reload); box.selected.connect(reload);
} else { } else {
console.log("Asset browser - finished deleting paths"); console.log("Asset browser - finished deleting paths: ", paths);
reload(); reload();
} }
}); });
@ -113,10 +113,15 @@ Rectangle {
box.selected.connect(reload); box.selected.connect(reload);
} }
console.log("Asset browser - renaming " + oldPath + " to " + newPath);
Assets.renameMapping(oldPath, newPath, function(err) { Assets.renameMapping(oldPath, newPath, function(err) {
if (err) { if (err) {
console.log("Asset browser - error renaming: ", oldPath, "=>", newPath, " - error ", err);
box = errorMessageBox("There was an error renaming:\n" + oldPath + " to " + newPath + "\n" + err); box = errorMessageBox("There was an error renaming:\n" + oldPath + " to " + newPath + "\n" + err);
box.selected.connect(reload); box.selected.connect(reload);
} else {
console.log("Asset browser - finished rename: ", oldPath, "=>", newPath);
} }
reload(); reload();
@ -275,7 +280,7 @@ Rectangle {
gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0); gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
} }
print("Asset browser - adding asset " + name + " to world."); print("Asset browser - adding asset " + url + " (" + name + ") to world.");
// Entities.addEntity doesn't work from QML, so we use this. // Entities.addEntity doesn't work from QML, so we use this.
Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, grabbable, addPosition, gravity); Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, grabbable, addPosition, gravity);
@ -421,7 +426,7 @@ Rectangle {
uploadProgressLabel.text = "In progress..."; uploadProgressLabel.text = "In progress...";
}, },
function(err, path) { function(err, path) {
print(err); print(err, path);
if (err === "") { if (err === "") {
uploadProgressLabel.text = "Upload Complete"; uploadProgressLabel.text = "Upload Complete";
timer.interval = 1000; timer.interval = 1000;
@ -432,6 +437,7 @@ Rectangle {
uploadOpen = false; uploadOpen = false;
}); });
timer.start(); timer.start();
console.log("Asset Browser - finished uploading: ", fileUrl);
reload(); reload();
} else { } else {
uploadSpinner.visible = false; uploadSpinner.visible = false;
@ -439,7 +445,7 @@ Rectangle {
uploadOpen = false; uploadOpen = false;
if (err !== -1) { if (err !== -1) {
console.log("Asset Browser - error uploading:", err); console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err);
var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + err); var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + err);
box.selected.connect(reload); box.selected.connect(reload);
} }

4
interface/src/ModelPackager.cpp
View file

@ -83,7 +83,7 @@ bool ModelPackager::loadModel() {
QString("ModelPackager::loadModel()"), QString("ModelPackager::loadModel()"),
QString("Could not open FST file %1").arg(_modelFile.filePath()), QString("Could not open FST file %1").arg(_modelFile.filePath()),
QMessageBox::Ok); QMessageBox::Ok);
qWarning() << "ModelPackager::loadModel(): Could not open FST file"; qWarning() << QString("ModelPackager::loadModel(): Could not open FST file %1").arg(_modelFile.filePath());
return false; return false;
} }
qCDebug(interfaceapp) << "Reading FST file"; qCDebug(interfaceapp) << "Reading FST file";
@ -106,7 +106,7 @@ bool ModelPackager::loadModel() {
return false; return false;
} }
try { try {
qCDebug(interfaceapp) << "Reading FBX file"; qCDebug(interfaceapp) << "Reading FBX file : " << _fbxInfo.filePath();
QByteArray fbxContents = fbx.readAll(); QByteArray fbxContents = fbx.readAll();
_hfmModel.reset(readFBX(fbxContents, QVariantHash(), _fbxInfo.filePath())); _hfmModel.reset(readFBX(fbxContents, QVariantHash(), _fbxInfo.filePath()));

6
libraries/entities/src/EntityEditFilters.cpp
View file

@ -222,7 +222,7 @@ static bool hasCorrectSyntax(const QScriptProgram& program) {
const auto error = syntaxCheck.errorMessage(); const auto error = syntaxCheck.errorMessage();
const auto line = QString::number(syntaxCheck.errorLineNumber()); const auto line = QString::number(syntaxCheck.errorLineNumber());
const auto column = QString::number(syntaxCheck.errorColumnNumber()); const auto column = QString::number(syntaxCheck.errorColumnNumber());
const auto message = QString("[SyntaxError] %1 in %2(%3)").arg(error, line, column); const auto message = QString("[SyntaxError] %1 in %2:%3(%4)").arg(error, program.fileName(), line, column);
qCritical() << qPrintable(message); qCritical() << qPrintable(message);
return false; return false;
} }
@ -235,8 +235,8 @@ static bool hadUncaughtExceptions(QScriptEngine& engine, const QString& fileName
const auto line = QString::number(engine.uncaughtExceptionLineNumber()); const auto line = QString::number(engine.uncaughtExceptionLineNumber());
engine.clearExceptions(); engine.clearExceptions();
static const QString SCRIPT_EXCEPTION_FORMAT = "[UncaughtException] %1 on line %2"; static const QString SCRIPT_EXCEPTION_FORMAT = "[UncaughtException] %1 in %2:%3";
auto message = QString(SCRIPT_EXCEPTION_FORMAT).arg(exception, line); auto message = QString(SCRIPT_EXCEPTION_FORMAT).arg(exception, fileName, line);
if (!backtrace.empty()) { if (!backtrace.empty()) {
static const auto lineSeparator = "\n "; static const auto lineSeparator = "\n ";
message += QString("\n[Backtrace]%1%2").arg(lineSeparator, backtrace.join(lineSeparator)); message += QString("\n[Backtrace]%1%2").arg(lineSeparator, backtrace.join(lineSeparator));

2
libraries/octree/src/Octree.cpp
View file

@ -696,12 +696,14 @@ bool Octree::readFromFile(const char* fileName) {
bool Octree::readJSONFromGzippedFile(QString qFileName) { bool Octree::readJSONFromGzippedFile(QString qFileName) {
QFile file(qFileName); QFile file(qFileName);
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
qCritical() << "Cannot open gzipped json file for reading: " << qFileName;
return false; return false;
} }
QByteArray compressedJsonData = file.readAll(); QByteArray compressedJsonData = file.readAll();
QByteArray jsonData; QByteArray jsonData;
if (!gunzip(compressedJsonData, jsonData)) { if (!gunzip(compressedJsonData, jsonData)) {
qCritical() << "json File not in gzip format: " << qFileName;
return false; return false;
} }

6
scripts/modules/request.js
View file

@ -75,3 +75,9 @@ module.exports = {
httpRequest.send(options.body || null); httpRequest.send(options.body || null);
} }
}; };
// ===========================================================================================
// @function - debug logging
function debug() {
print('RequestModule | ' + [].slice.call(arguments).join(' '));
}