Merge branch 'master' of https://github.com/awe-media/awe.js

awe-media · Feb 23, 2017 · df2154a · df2154a
2 parents 6164925 + e89975e
commit df2154a
Show file tree

Hide file tree

Showing 7 changed files with 153 additions and 359 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 awe.js
 ======
 
+awe.media is hiring
+-------------------
+If you're an experienced javascript developer and you're interested in pushing the boundaries of Virtual and Augmented Reality or Computer Vision then contact us through `jobs [ at ] awe.media`.
+
 What is awe.js?
 ---------------
 It's the quickest and easiest way to create Augmented Web applications.
@@ -19,7 +23,9 @@ Or checkout some of our older demos showing showing different uses of awe.js
 - Leap Motion Sensor AR http://youtu.be/mDbvPU4aokQ
 - Google Glass AR http://youtu.be/M97E2m6dRO4
 
-Then checkout the docs in our [wiki](https://github.com/awe-media/awe.js/wiki).
+awe.js docs
+-----------
+Checkout the docs in our [wiki](https://github.com/awe-media/awe.js/wiki).
 
 What is the Augmented Web?
 --------------------------
@@ -46,7 +52,7 @@ awe.init({
 
 Once the `awe_ready` event is fired then your `awe.js` app is ready to start. Then you can call `awe.setup_scene()` to setup your scene. NOTE: This must be called after `awe_ready` has been fired.
 
-To see this working try loading `examples/basic_ar/index.html` in a suitable standards compliant browser.
+To see this working try loading `examples/basic/index.html` in a suitable standards compliant browser.
 
 How do you add objects to your scene?
 -------------------------------------

diff --git a/examples/basic/ar.html b/examples/basic/ar.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>AWE GEO AR demo</title>
+<title>AWE basic AR demo</title>
 <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0" />
 <meta charset="utf-8"/>
 <style type="text/css">

diff --git a/examples/basic/vr.html b/examples/basic/vr.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>AWE GEO AR demo</title>
+<title>AWE basic VR demo</title>
 <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0" />
 <meta charset="utf-8"/>
 <style type="text/css">

diff --git a/examples/basic_ar/awe.geo_ar.js b/examples/basic_ar/awe.geo_ar.js
diff --git a/examples/basic_ar/index.html b/examples/basic_ar/index.html