From a852b97060727428b8be55717b9dca4149f4368a Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 29 Jan 2019 20:39:26 +0100 Subject: add modal --- client/splash/face/index.js | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'client/splash/face/index.js') 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,9 +16,17 @@ 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 }, @@ -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({ -- cgit v1.2.3-70-g09d2