Jean-Yves Didier

added main app with aruco_video; errors are more verbose.

......@@ -65,6 +65,8 @@ module.exports = function (grunt) {
options : {
verbose: true,
targetDir: './deps',
copy: true,
cleanBowerDir: true,
layout: 'byComponent'
},
install : {
......
......@@ -11,7 +11,7 @@
"license": "GPL",
"dependencies": {
"requirejs": "*",
"tracking.js": "*",
"tracking.js": "*",
"three.js": "https://raw.githubusercontent.com/mrdoob/three.js/r68/build/three.min.js",
"objloader" : "https://raw.githubusercontent.com/mrdoob/three.js/r68/examples/js/loaders/OBJLoader.js",
"mtlloader": "https://raw.githubusercontent.com/mrdoob/three.js/r68/examples/js/loaders/MTLLoader.js",
......
......@@ -526,7 +526,7 @@ ARCS.Context = function( ctx ) {
this.instanciate = function () {
return loadLibraries().then(function() { return Promise.all(depLibPromises); })
.then(instanciateComponents)
.catch(function(msg) { console.log("[ARCS] Trouble instanciating context" + msg); });
.catch(function(msg) { console.log("[ARCS] Trouble instanciating context", msg); });
};
......@@ -2270,6 +2270,8 @@ arcs_module = function(moduleDefinition, deps) {
ARCS.Context.currentContext.setFactory(p,mdef[p]); //.setFactory(ARCS.Application.currentApplication, p, mdef[p]);
}
}
return Promise.resolve();
};
// until now, it is the very same code.
......
This diff is collapsed. Click to expand it.
......@@ -29,7 +29,7 @@ arcs_module = function(moduleDefinition, deps) {
moduleDefinition.apply(this, deps) : moduleDefinition;
if (mdef === undefined) {
throw new Error("[ARCS] Your module is undefined. Did you forget to export components?\nCode of module follows:\n"+moduleDefinition);
throw new Error("[ARCS] Your module is undefined. Did you forget to export components?\nCode of module follows:\n" +moduleDefinition);
}
for (p in mdef) {
......@@ -37,6 +37,8 @@ arcs_module = function(moduleDefinition, deps) {
ARCS.Context.currentContext.setFactory(p,mdef[p]); //.setFactory(ARCS.Application.currentApplication, p, mdef[p]);
}
}
return Promise.resolve();
};
// until now, it is the very same code.
......@@ -81,7 +83,7 @@ arcs_module = function(moduleDefinition, deps) {
ARCS.Context.currentContext.addLibraryPromise(
Promise.all(depResolves).then(storeComponents,
function(reason) { console.error("[ARCS] Failed to load dependency " + reason ); })
function(reason) { console.error("[ARCS] Failed to load dependency ", reason ); })
);
......
......@@ -294,7 +294,7 @@ ARCS.Context = function( ctx ) {
this.instanciate = function () {
return loadLibraries().then(function() { return Promise.all(depLibPromises); })
.then(instanciateComponents)
.catch(function(msg) { console.log("[ARCS] Trouble instanciating context" + msg); });
.catch(function(msg) { console.log("[ARCS] Trouble instanciating context", msg); });
};
......