Toggle navigation
Toggle navigation
This project
Loading...
Sign in
arcs
/
arcs.js
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
3
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
Jean-Yves Didier
2017-05-24 23:13:57 +0200
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b49183912a99a8b7a563631efb5693853e94ff9c
b4918391
1 parent
5289b7e5
added main app with aruco_video; errors are more verbose.
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
5 deletions
Gruntfile.js
bower.json
build/arcs.js
build/arcs.min.js
src/arcs_module.js
src/context.js
Gruntfile.js
View file @
b491839
...
...
@@ -65,6 +65,8 @@ module.exports = function (grunt) {
options
:
{
verbose
:
true
,
targetDir
:
'./deps'
,
copy
:
true
,
cleanBowerDir
:
true
,
layout
:
'byComponent'
},
install
:
{
...
...
bower.json
View file @
b491839
...
...
@@ -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"
,
...
...
build/arcs.js
View file @
b491839
...
...
@@ -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.
...
...
build/arcs.min.js
View file @
b491839
This diff is collapsed. Click to expand it.
src/arcs_module.js
View file @
b491839
...
...
@@ -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
);
})
);
...
...
src/context.js
View file @
b491839
...
...
@@ -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
);
});
};
...
...
Please
register
or
login
to post a comment