From 121cfd1b48254b54730ba323f0b60872f1c782d9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 28 Jan 2019 20:28:36 +0100 Subject: more --- client/splash/face/index.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'client/splash/face/index.js') diff --git a/client/splash/face/index.js b/client/splash/face/index.js index 5e7792d3..31ce8f3b 100644 --- a/client/splash/face/index.js +++ b/client/splash/face/index.js @@ -17,7 +17,7 @@ export function startAnimation() { const face = faces[name] mesh.remove() mesh.load(name).then(meshes => { - meshes.wireframe.position.z -= 0.01 + meshes.wireframe.position.z -= 0.001 markers.swap(face) .then({ from: { n: 0 }, @@ -31,19 +31,23 @@ export function startAnimation() { .then({ from: { n: 0 }, to: { n: 1 }, + delay: 500, duration: 500, easing: oktween.easing.quad_in, update: (obj) => { meshes.blank.material.opacity = 1 - obj.n meshes.solid.material.opacity = obj.n }, + finished: () => { + mesh.removeMesh('blank') + } }) .then({ from: { n: 0 }, to: { n: 1 }, delay: 500, - duration: 500, - easing: oktween.easing.quad_in_out, + duration: 1000, + easing: oktween.easing.quad_in, update: (obj) => { meshes.solid.material.opacity = 1 - obj.n meshes.wireframe.material.opacity = obj.n -- cgit v1.2.3-70-g09d2