From 5d8ef56686fbda774f0ca7bd035c6ef3b9efc2ff Mon Sep 17 00:00:00 2001 From: mt Date: Wed, 8 Jan 2020 18:04:33 +0100 Subject: [PATCH] Restore script.js --- README.md | 3 - scanimation/interfaces/animation/script.js | 321 ++++----------------- 2 files changed, 56 insertions(+), 268 deletions(-) diff --git a/README.md b/README.md index d514728..df11378 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,3 @@ Listen 8888 ``` requires `a2enmod rewrite proxy proxy_http proxy_wstunnel` - - -s \ No newline at end of file diff --git a/scanimation/interfaces/animation/script.js b/scanimation/interfaces/animation/script.js index 75fecee..8ed9a37 100644 --- a/scanimation/interfaces/animation/script.js +++ b/scanimation/interfaces/animation/script.js @@ -1,288 +1,79 @@ - - - - - - - - - - - - - - - - - - - - -Sign in ยท GitLab - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- +let add_img = (new_img) => { + let img = new Image() + img.src = `${frames_folder}${new_img}` + img.onload = function(){ + console.log(`loaded ${new_img}`) + } + imgs.push(img) +} -
- -
-
-
-
-You need to sign in or sign up before continuing. -
- -
-
-
+// SOCKET ////////////////////////////////////////////////////////////////////// -
-
-

-GitLab.com -

-
-
-
-
+ let socket = io.connect('/') -

GitLab.com offers free unlimited (private) repositories and unlimited collaborators.

By signing up for and by signing in to this service you accept our:

+ socket.on('connection', function(){ + console.log('connected to node server') + socket.emit('animationInit') + makeAnimation() + }) -
-
-
- + socket.on('frameData', function(data){ + imgs.length < data.frames.length ? new_imgs = data.frames.slice(imgs.length) : new_imgs = [] + new_imgs.forEach(function(img){ add_img(img) }) + }) -
- - + let frames_per_sec = 7, + current_frame = 0, + forward = true -
-
-
- -
-
-
- -
-
+ function makeAnimation(){ + let now, + delta = 0, + last = timeStamp(), + step = 1/frames_per_sec -
-
+ function frame() { + now = timeStamp() + delta += Math.min(1, (now - last) / 1000) + while(delta > step){ + delta -= step + update(step) + } + last = now + requestAnimationFrame(frame) + } + requestAnimationFrame(frame) + } -
-
-
-
-
-
-
-Explore -Help -About GitLab -
-
+ function update(step){ + if (imgs.length < 1) return; + if (current_frame == (imgs.length-1)) forward = false + else if (current_frame == 0) forward = true + forward ? current_frame++ : current_frame-- -
- - + ctx.drawImage(imgs[current_frame], 0, 0) + // console.log(current_frame) + } + + + function timeStamp(){ return window.performance && window.performance.now ? window.performance.now() : new Date().getTime() }