Merge branch 'master' of github.com:adamhrv/megapixels_dev

1 files changed, 19 insertions, 7 deletions

diff --git a/client/splash/face/index.js b/client/splash/face/index.js
index 31ce8f3b..46b7b847 100644
--- a/client/splash/face/index.js
+++ b/client/splash/face/index.js
@@ -16,10 +16,18 @@ export function startAnimation() {
   const name = choice(names)
   const face = faces[name]
   mesh.remove()
-  mesh.load(name).then(meshes => {
-    meshes.wireframe.position.z -= 0.001
+  mesh.load(name).then(geometry => {
+    let meshes
     markers.swap(face)
       .then({
+        obj: {},
+        duration: 0,
+        finished: () => {
+          meshes = mesh.createFaceMeshes(geometry)
+          meshes.wireframe.position.z -= 0.001
+        }
+      })
+      .then({
         from: { n: 0 },
         to: { n: 1 },
         duration: 500,
@@ -43,27 +51,31 @@ export function startAnimation() {
         }
       })
       .then({
-        from: { n: 0 },
-        to: { n: 1 },
+        from: { n: 0, lines: 1, cubes: 1, },
+        to: { n: 1, lines: 0, cubes: 0.5 },
         delay: 500,
         duration: 1000,
         easing: oktween.easing.quad_in,
         update: (obj) => {
           meshes.solid.material.opacity = 1 - obj.n
           meshes.wireframe.material.opacity = obj.n
+          markers.fadePointsTo(obj.cubes)
+          markers.fadeLinesTo(obj.lines)
         },
         finished: () => {
           mesh.removeMesh('solid')
         }
       })
       .then({
-        from: { n: 1 },
-        to: { n: 0 },
+        from: { n: 1, lines: 0, cubes: 0 },
+        to: { n: 0, lines: 1, cubes: 1 },
         delay: 5000,
         duration: 500,
-        easing: oktween.easing.quad_in_out,
+        easing: oktween.easing.quad_out,
         update: (obj) => {
           meshes.wireframe.material.opacity = obj.n
+          markers.fadePointsTo(obj.cubes)
+          markers.fadeLinesTo(obj.lines)
         },
       })
       .then({