Merge remote-tracking branch 'upstream/dev' into 20180619-update-dev

README.md

@@ -13,9 +13,9 @@
 I am focusing hard on making AR for the web a reality.
 This repository is where I publish the code.
 Contact me anytime [@jerome_etienne](https://twitter.com/jerome_etienne).
-Stuff are still moving fast, We reached a good status tho.
+Stuff is still moving fast, we have reached a good status though.
 An article has been published on [uploadvr](https://uploadvr.com/ar-js-efficient-augmented-reality-for-the-web/).
-So I wanted to publish thus people can try it and have fun with it :)
+So I wanted to publish this so people can try it and have fun with it :)
 
 - **Very Fast** : it runs efficiently even on phones. [60 fps on my 2 year-old phone](https://twitter.com/jerome_etienne/status/831333879810236421)!
 - **Web-based** : It is a pure web solution, so no installation required. Full javascript based on three.js + jsartoolkit5
@@ -26,58 +26,57 @@ So I wanted to publish thus people can try it and have fun with it :)
 
 # Try it on Mobile
 
-It works on all platforms. Android, IOS and window phone. It run **any browser with WebGL and WebRTC**.
-(for IOS, you need to update to ios11)
+It works on all platforms. Android, iOS and window phone. It runs on **any browser with WebGL and WebRTC** (for iOS, you need to update to iOS 11).
 
-To try on your phone is only 2 easy steps, check it out!
+To try it on your phone, it is only 2 easy steps, check it out!
 
 1. Open this [hiro marker image](https://jeromeetienne.github.io/AR.js/data/images/HIRO.jpg) in your desktop browser.
-1. Open this [augmented reality webapps](https://jeromeetienne.github.io/AR.js/three.js/examples/mobile-performance.html) in your phone browser, and point it
-to your screen.
+1. Open this [augmented reality webapps](https://jeromeetienne.github.io/AR.js/three.js/examples/mobile-performance.html) in your phone browser, and point it at your screen.
+
+![qrcode pointing to the webapp](https://raw.githubusercontent.com/aloisdg/Documents/master/Image/qrcode.png)
 
 **You are done!** It will open a webpage which read the phone webcam, localize a hiro marker and add 3d on top of it, as you can see below.
 
 ![screenshot](https://cloud.githubusercontent.com/assets/252962/23072106/73a0656c-f528-11e6-9fcd-3c900d1d47d3.jpg)
 
 # Standing on the Shoulders of Giants
 
-So we shown it is now possible to do 60fps web-based augmented reality on a phone.
-This is great for sure but how did we get here ? **By standing on the shoulders of giants!**
-It is thanks to the hard work from others, that we can today reach this mythic 60fps AR.
-So i would like to thanks :
+So we have shown it is now possible to do 60fps web-based augmented reality on a phone.
+This is great for sure, but how did we get here ? **By standing on the shoulders of giants!**
+It is thanks to the hard work of others, that we can today reach this mythic 60fps AR.
+So I would like to thank :
 
 - **three.js** for being a great library to do 3d on the web.
-- **artoolkit**! years of development and experiences on doing augmented reality
+- **artoolkit**! for years of development and experiences on doing augmented reality
 - **emscripten and asm.js**! thus we could compile artoolkit c into javascript
 - **chromium**! thanks for being so fast!
 
-Only thanks to all of them, i could do my part : Optimizing performance from 5fps on high-end
+Only thanks to all of them, I could do my part : Optimizing performance from 5fps on high-end
 phone, to 60fps on 2years old phone.
 
-After all this work done by a lot of people, we have a *web-based augmented reality solution fast enough for mobile*!
+After all this work that has been done by a lot of people, we have a *web-based augmented reality solution fast enough for mobile*!
 
-Now, many people got a phone powerful enough to do web AR in their pocket.
+Now, many people have a phone powerful enough to do web AR in their pocket.
 I think this performance improvement makes web AR a reality.
-i am all exited by what people are gonna with it :)
+I am very excited to see what people are going to do with it :)
 
 # Performance
 
-We are still early in the project but here are some initial numbers to give you an idea.
+We are still early in the project, but here are some initial numbers to give you an idea.
 
-- I got 60fps stable on nexus6p
-- Some reports [Sony Xperia Z2 (2.5 years old) runs around 50fps](https://twitter.com/leinadkalpot/status/834121238087925763) - this is a 170euro phone
+- I've gotten 60fps stable on nexus6p
+- Some reports [Sony Xperia Z2 (2.5 years old) runs around 50fps](https://twitter.com/leinadkalpot/status/834121238087925763) - This is a 170 Euro phone
 - Some reports [~50fps on a old nexus5, and ~60fps on nexus 9](https://twitter.com/Ellyll/status/834312442926751744) - nexus5 is 3.5 years old!
-- Some reports it working on windows phone edge!! [13fps on Lumia 950](https://twitter.com/leinadkalpot/status/834299384510763012) for some.
+- Some report it working on Edge on Windows phone!! [13fps on Lumia 950](https://twitter.com/leinadkalpot/status/834299384510763012) for some.
   [40-45fps on lumia 930](https://twitter.com/fastclemmy/status/834817155665391616) for others.
 
-Obviously you mileage may vary. The performance you get will depend on 3 things: How heavy your 3D is, How you tune your parameters
-and the hardware that you are using.
+Obviously your mileage may vary. The performance you get will depend on 3 things: How heavy your 3D is, How you tune your parameters and the hardware that you are using.
 
 ![screenshot](https://cloud.githubusercontent.com/assets/252962/23068128/40343608-f51a-11e6-8cb3-900e37a7f658.jpg)
 
 # Full Featured Marker based
 With this project, we bring more performance to artoolkit.
-artoolkit is a software with years of experience doing augmented reality. It is able to do a lot!
+artoolkit is software with years of experience doing augmented reality. It is able to do a lot!
 
 It is marker based. It supports a wide range of markers: multiple types of markers [pattern](https://artoolkit.org/documentation/doku.php?id=3_Marker_Training:marker_training)/[barcode](https://artoolkit.org/documentation/doku.php?id=3_Marker_Training:marker_barcode)
 multiple independent markers at the same time, or [multiple markers acting as a single marker](https://artoolkit.org/documentation/doku.php?id=3_Marker_Training:marker_multi)
@@ -221,7 +220,7 @@ Demo tested on the following browser setups:
 - **Android native 5.0** (doesn't work, doesn't ask for permission, I see white background and text)
 - **Chrome on Android 4.4.2** (works!)
 - **Chrome on Android 5.0** (doesn't work, asks for permission, I see black background, text and a chart)
-- **Safari and Chrome on iOS 8.2 (iPad)** (doesn't work, doesn't ask for permission, I see white background and text)
+- **Safari and Chrome on iOS < 11** (doesn't work, doesn't ask for permission, I see white background and text)
 - **Microsoft Edge on Windows 10** (Chrome on Google Pixel phone to view hologram)
 
 Credits: @HelloDeadline, @sorianog
@@ -239,7 +238,7 @@ Credits: @HelloDeadline, @sorianog
 
 # How To Release ?
 
-This one is mainly for [me](@jerome_etienne) to remember :)
+This one is mainly for [me](https://twitter.com/jerome_etienne) to remember :)
 
 ```bash
 # Update CHANGELOG.md - remove the -dev into version