Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 02:56:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #101 from birarda/atp-mappings

Browse source 
fix add to world after upload name change
This commit is contained in:
Clément Brisset 2016-03-10 17:15:13 -08:00
commit 4d2797c25a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/AssetServer.qml
View file

@ -238,7 +238,7 @@ Window {
var directory = path ? path.slice(0, path.lastIndexOf('/') + 1) : "/"; var directory = path ? path.slice(0, path.lastIndexOf('/') + 1) : "/";
var filename = fileUrl.slice(fileUrl.lastIndexOf('/') + 1); var filename = fileUrl.slice(fileUrl.lastIndexOf('/') + 1);
Assets.uploadFile(fileUrl, directory + filename, function(err) { Assets.uploadFile(fileUrl, directory + filename, function(err, path) {
if (err) { if (err) {
console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err); console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err);
var box = errorMessage("There was an error uploading:\n" + fileUrl + "\n" + Assets.getErrorString(err)); var box = errorMessage("There was an error uploading:\n" + fileUrl + "\n" + Assets.getErrorString(err));
@ -247,7 +247,7 @@ Window {
console.log("Asset Browser - finished uploading: ", fileUrl); console.log("Asset Browser - finished uploading: ", fileUrl);
if (shouldAddToWorld) { if (shouldAddToWorld) {
addToWorld("atp:" + directory + filename); addToWorld("atp:" + path);
} }
reload(); reload();

4
interface/src/scripting/AssetMappingsScriptingInterface.cpp
View file

@ -54,7 +54,7 @@ void AssetMappingsScriptingInterface::setMapping(QString path, QString hash, QJS
connect(request, &SetMappingRequest::finished, this, [this, callback](SetMappingRequest* request) mutable { connect(request, &SetMappingRequest::finished, this, [this, callback](SetMappingRequest* request) mutable {
if (callback.isCallable()) { if (callback.isCallable()) {
QJSValueList args { uint8_t(request->getError()) }; QJSValueList args { uint8_t(request->getError()), request->getPath() };
callback.call(args); callback.call(args);
} }
@ -150,7 +150,7 @@ void AssetMappingsScriptingInterface::getAllMappings(QJSValue callback) {
} }
if (callback.isCallable()) { if (callback.isCallable()) {
QJSValueList args { uint8_t(request->getError()) }; QJSValueList args { uint8_t(request->getError()), map };
callback.call(args); callback.call(args);
} }