Move and optimize mesh example

jure · Dec 16, 2020 · c279d84 · c279d84
1 parent e279501
commit c279d84
Show file tree

Hide file tree

Showing 32 changed files with 29 additions and 47 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -12,58 +12,47 @@
         font-size: 20px;
         padding: 10px 20px;
       }
-      h1 {
-        /* font-weight: 300; */
-      }
       a {
         color: #fdf6e3;
-        display: block;
         padding: 15px 0;
       }
+      p { 
+        max-width: 80em;
+      }
       img {
         max-width: 320px;
       }
-      ul {
-        display: flex;
-        list-style: none;
-        flex-wrap: wrap;
-        padding: 5px 0 0;
-      }
-      ul li {
-        margin-right: 30px;
-        padding: 5px 0 30px;
-      }
-      ul a {
-        background-size: cover;
-        display: block;
-        padding: 0;
-        height: 320px;
-        width: 320px;
-      }
-      ul h3,
-      ul p {
-        max-width: 320px;
+      body { 
+        max-width: 50em;
+        margin: 0 auto;
+        text-align: center;
       }
     </style>
   </head>
   <body>
     <h1>aframe-blink-controls component</h1>
+    <p>A blink (teleport) component for <a href="https://aframe.io/docs/1.1.0/introduction/">A-Frame</a>, based on
+    <a href="https://github.com/fernandojsg/aframe-teleport-controls">@fernandojsg's aframe-teleport-controls</a> but
+    with added support for rotation & <a href="https://github.com/jure/aframe-blink-controls#aframe-blink-controls">additional fixes</a>.</p>   
     <p>Warning: This is a WIP teleport with rotation component. Currently only tested with the Oculus Quest 1.</p>
-    <ul>
-      <li>
-        <a href="basic/" style="background-image: url(shots/basic.jpg)"></a>
-        <h3>Basic</h3>
-        <p>This is a basic example.</p>
-      </li>
-    </ul>
-
-    <ul>
-      <li>
-        <a href="simple/" style="background-image: url(shots/mesh.jpg)"></a>
-        <h3>Mesh</h3>
-        <p>This is an example with a mesh for collision.</p>
-      </li>
-    </ul>
+    <section>
+      <h3>Usage</h3>
+      Detailed instructions can be found in the <a href="https://github.com/jure/aframe-blink-controls#aframe-blink-controls">README</a>.
+    </section>
+    <section>
+      <h3>Basic example</h3>
+      <a href="basic/">
+      <img src="shots/basic.jpg" />
+      <p>This is a basic example.</p>
+    </a>
+    </section>
+    <section>
+      <h3>Mesh collision example</h3>
+      <a href="mesh/">
+      <img src="shots/mesh.jpg" />
+      <p>This is an example with a mesh for collision.</p>
+      </a>
+    </section>
 
     <!-- GitHub Corner. -->
     <a href="https://github.com/jure/aframe-blink-controls" class="github-corner">

diff --git a/docs/simple/assets/Circle.001.gltf → docs/mesh/assets/Circle.001.gltf b/docs/simple/assets/Circle.001.gltf → docs/mesh/assets/Circle.001.gltf
diff --git a/docs/simple/assets/Circle.gltf → docs/mesh/assets/Circle.gltf b/docs/simple/assets/Circle.gltf → docs/mesh/assets/Circle.gltf
diff --git a/docs/simple/assets/Cube.001.gltf → docs/mesh/assets/Cube.001.gltf b/docs/simple/assets/Cube.001.gltf → docs/mesh/assets/Cube.001.gltf
diff --git a/docs/simple/assets/Cube.gltf → docs/mesh/assets/Cube.gltf b/docs/simple/assets/Cube.gltf → docs/mesh/assets/Cube.gltf
diff --git a/docs/simple/cert.pem → docs/mesh/cert.pem b/docs/simple/cert.pem → docs/mesh/cert.pem
diff --git a/docs/simple/favicon.ico → docs/mesh/favicon.ico b/docs/simple/favicon.ico → docs/mesh/favicon.ico
diff --git a/docs/simple/index.html → docs/mesh/index.html b/docs/simple/index.html → docs/mesh/index.html
@@ -23,13 +23,6 @@
 				<a-asset-item id="Circle" src="./assets/Circle.gltf"></a-asset-item>
 				<a-asset-item id="Circle001" src="./assets/Circle.001.gltf"></a-asset-item>
 				<a-asset-item id="Cube" src="./assets/Cube.gltf"></a-asset-item>
-                <img id="sky"                 src="./resources/sky.jpg">
-                <img id="icon-play"           src="./resources/play.png">
-                <img id="icon-pause"          src="./resources/pause.png">
-                <img id="icon-play-skip-back" src="./resources/play-skip-back.png">
-                <img id="icon-mute"           src="./resources/mute.png">
-                <img id="icon-volume-low"     src="./resources/volume-low.png">
-                <img id="icon-volume-high"    src="./resources/volume-high.png">
             </a-assets>
 
             <!-- Entities -->
@@ -44,7 +37,7 @@
             >
                 <a-entity id="camera" 
                     camera="near: 0.001; far: 1000;" 
-                    position="0 1.7 0" 
+                    position="0 1.7 0"
                     look-controls="pointerLockEnabled: true">
                         <a-entity id="cursor" cursor="fuse: false;" animation__click="property: scale; startEvents: click; easing: easeInCubic; dur: 50; from: 	0.1 0.1 0.1; to: 1 1 1"
                             position="0 0 -0.1"

diff --git a/docs/simple/js/camera-cube-env.js → docs/mesh/js/camera-cube-env.js b/docs/simple/js/camera-cube-env.js → docs/mesh/js/camera-cube-env.js
diff --git a/docs/simple/js/joystick.js → docs/mesh/js/joystick.js b/docs/simple/js/joystick.js → docs/mesh/js/joystick.js
diff --git a/docs/simple/js/webxr.js → docs/mesh/js/webxr.js b/docs/simple/js/webxr.js → docs/mesh/js/webxr.js
diff --git a/docs/simple/key.pem → docs/mesh/key.pem b/docs/simple/key.pem → docs/mesh/key.pem
diff --git a/docs/simple/lightmaps/Circle.001_baked.png → docs/mesh/lightmaps/Circle.001_baked.png b/docs/simple/lightmaps/Circle.001_baked.png → docs/mesh/lightmaps/Circle.001_baked.png
diff --git a/docs/simple/lightmaps/Circle_baked.png → docs/mesh/lightmaps/Circle_baked.png b/docs/simple/lightmaps/Circle_baked.png → docs/mesh/lightmaps/Circle_baked.png
diff --git a/docs/simple/lightmaps/Cube_baked.png → docs/mesh/lightmaps/Cube_baked.png b/docs/simple/lightmaps/Cube_baked.png → docs/mesh/lightmaps/Cube_baked.png
diff --git a/docs/simple/resources/mute.png → docs/mesh/resources/mute.png b/docs/simple/resources/mute.png → docs/mesh/resources/mute.png
diff --git a/docs/simple/resources/pause.png → docs/mesh/resources/pause.png b/docs/simple/resources/pause.png → docs/mesh/resources/pause.png
diff --git a/docs/simple/resources/play-skip-back.png → docs/mesh/resources/play-skip-back.png b/docs/simple/resources/play-skip-back.png → docs/mesh/resources/play-skip-back.png
diff --git a/docs/simple/resources/play.png → docs/mesh/resources/play.png b/docs/simple/resources/play.png → docs/mesh/resources/play.png
diff --git a/docs/simple/resources/sky.jpg → docs/mesh/resources/sky.jpg b/docs/simple/resources/sky.jpg → docs/mesh/resources/sky.jpg
diff --git a/docs/simple/resources/volume-high.png → docs/mesh/resources/volume-high.png b/docs/simple/resources/volume-high.png → docs/mesh/resources/volume-high.png
diff --git a/docs/simple/resources/volume-low.png → docs/mesh/resources/volume-low.png b/docs/simple/resources/volume-low.png → docs/mesh/resources/volume-low.png
diff --git a/docs/simple/serve.py → docs/mesh/serve.py b/docs/simple/serve.py → docs/mesh/serve.py
diff --git a/docs/simple/style.css → docs/mesh/style.css b/docs/simple/style.css → docs/mesh/style.css
diff --git a/docs/simple/env/negx.jpg b/docs/simple/env/negx.jpg
diff --git a/docs/simple/env/negy.jpg b/docs/simple/env/negy.jpg
diff --git a/docs/simple/env/negz.jpg b/docs/simple/env/negz.jpg
diff --git a/docs/simple/env/posx.jpg b/docs/simple/env/posx.jpg
diff --git a/docs/simple/env/posy.jpg b/docs/simple/env/posy.jpg
diff --git a/docs/simple/env/posz.jpg b/docs/simple/env/posz.jpg
diff --git a/docs/simple/media/image1.png b/docs/simple/media/image1.png
diff --git a/docs/simple/media/image2.png b/docs/simple/media/image2.png