From 0f7a1f909f65794905b4627c5443bffde8a6e763 Mon Sep 17 00:00:00 2001 From: Jerome Etienne Date: Tue, 11 Jul 2017 13:03:29 +0100 Subject: [PATCH] more work --- TODO.md | 2 +- docs/misc/EXAMPLES.md | 4 +- ...witch.html => trackingbackend-switch.html} | 35 +++-- three.js/threex-arsmoothedcontrols-old.js | 130 ------------------ 4 files changed, 20 insertions(+), 151 deletions(-) rename three.js/examples/{arbackend-switch.html => trackingbackend-switch.html} (90%) delete mode 100644 three.js/threex-arsmoothedcontrols-old.js diff --git a/TODO.md b/TODO.md index 83ca149..d3b1998 100644 --- a/TODO.md +++ b/TODO.md @@ -49,7 +49,7 @@ - maybe cached in a ARtoolkit specific function - projectionAxisTransformMatrix renamed as artoolkitprojectionAxisTransformMatrix - simple, no risk and make it clear it is artoolkit - -- DONE in arbackend-switch put the backend in hash. and offer to switch +- DONE in trackingbackend-switch put the backend in hash. and offer to switch - good for testing - DONE all this testing about aruco or jsartoolkit it crappy - in artoolkitContext.backend === 'aruco' || 'artoolkit' diff --git a/docs/misc/EXAMPLES.md b/docs/misc/EXAMPLES.md index a5dcb83..3434358 100644 --- a/docs/misc/EXAMPLES.md +++ b/docs/misc/EXAMPLES.md @@ -48,9 +48,9 @@ - [parameters-tunning](https://jeromeetienne.github.io/AR.js/three.js/examples/parameters-tunning.html) : three.js example for parameters-tunning ([source](https://github.com/jeromeetienne/AR.js/blob/master/three.js/examples/parameters-tunning.html)) -- [backend switcher](https://jeromeetienne.github.io/AR.js/three.js/examples/arbackend-switch.html) : +- [backend switcher](https://jeromeetienne.github.io/AR.js/three.js/examples/trackingbackend-switch.html) : Show to easily switch between arBackend 'aruco' or 'jsartoolkit' - ([source](https://github.com/jeromeetienne/AR.js/blob/master/three.js/examples/arbackend-switch.html)) + ([source](https://github.com/jeromeetienne/AR.js/blob/master/three.js/examples/trackingbackend-switch.html)) - [multi-markers](https://jeromeetienne.github.io/AR.js/three.js/examples/multi-markers/examples/player.html) : multi markers examples - it shows how to dynamically learn a multi markers and then how to use it. learner.html is a example of dynamic learning of a multi markers configuration. It has been designed diff --git a/three.js/examples/arbackend-switch.html b/three.js/examples/trackingbackend-switch.html similarity index 90% rename from three.js/examples/arbackend-switch.html rename to three.js/examples/trackingbackend-switch.html index d90c636..a9b5f1f 100644 --- a/three.js/examples/arbackend-switch.html +++ b/three.js/examples/trackingbackend-switch.html @@ -21,7 +21,6 @@ -
AR.js - switching between backend by @jerome_etienne @@ -31,7 +30,7 @@ / 1001 for aruco
- Backend: + Tracking Backend: switch to : artoolkit / @@ -41,8 +40,8 @@ - current : unknown