From 57aa92bf83ef99b65183508493680bcab6480e32 Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Sat, 19 Aug 2017 13:39:10 -0400 Subject: [PATCH 1/3] Fix onload event --- js/proximity.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/proximity.js b/js/proximity.js index 7c95bbf..6b06a6b 100644 --- a/js/proximity.js +++ b/js/proximity.js @@ -875,7 +875,7 @@ window.PIXI.loader .add(nodeImg) .load(loopStart); -window.onload = function () { +window.addEventListener('load', function () { var canvas, tweeningInputs, debugCheckbox, fpsCheckbox, nodeCheckbox, linesCheckbox; canvas = document.getElementsByTagName('canvas')[0]; canvas.setAttribute('tabindex', 0); @@ -1150,4 +1150,4 @@ window.onload = function () { linesCheckbox.addEventListener('change', function (e) { toggleLines(); }); -}; +}, false); From b8b0e5dfb40e1622e8894beac9caa5487b8e139d Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Sat, 19 Aug 2017 13:53:59 -0400 Subject: [PATCH 2/3] Fix scrollbar bug on certain viewport sizes --- css/style.css | 12 ++++++++++++ js/proximity.js | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/css/style.css b/css/style.css index 08e909b..526244f 100644 --- a/css/style.css +++ b/css/style.css @@ -7,6 +7,18 @@ html { background-color: #1e1e1e; } +html, body, canvas { + overflow: none; +} + +canvas { + position: fixed !important; + left: 0 !important; + right: 0 !important; + bottom: 0 !important; + top: 0 !important; +} + html, button { font-family: "Arial", sans-serif; font-size: 10pt; diff --git a/js/proximity.js b/js/proximity.js index 6b06a6b..f0bc809 100644 --- a/js/proximity.js +++ b/js/proximity.js @@ -702,8 +702,8 @@ function drawPolygon (polygon, points, counter, tweeningFns) { /* MAIN LOOP */ function loop () { - screenWidth = document.body.clientWidth; - screenHeight = document.body.clientHeight; + screenWidth = window.innerWidth; + screenHeight = window.innerHeight; renderer.resize(screenWidth, screenHeight); polygon.clear(); @@ -819,8 +819,8 @@ function loop () { } function loopStart () { - screenWidth = document.body.clientWidth; - screenHeight = document.body.clientHeight; + screenWidth = window.innerWidth; + screenHeight = window.innerHeight; // Create the renderer renderer = window.PIXI.autoDetectRenderer(screenWidth, screenHeight, {antialias: true, resolution: resolution}); From 18594955be22dd8d912223605859b6c306e10871 Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Sat, 19 Aug 2017 15:19:54 -0400 Subject: [PATCH 3/3] Change default tweening function to overshoot --- js/proximity.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/proximity.js b/js/proximity.js index f0bc809..b13a244 100644 --- a/js/proximity.js +++ b/js/proximity.js @@ -75,7 +75,7 @@ var tweeningSets = { // numbers refer to indicies into the allTweeningsFns array elastic: [19, 20, 21], back: [24] }; -var tweeningFns = tweeningSets.meandering; // the actual set of tweening functions points will randomly choose from +var tweeningFns = tweeningSets.back; // the actual set of tweening functions points will randomly choose from // click effect related config vars var clickPullRateStart = 0.01; // initial value for the ratio of a point's distance from the click position to travel in one cycle var clickPullRateInc = 0.005; // amount to increase clickPullRate every tick that a click is held