diff --git a/balls/package-lock.json b/balls/package-lock.json index 19f8204..8b36200 100644 --- a/balls/package-lock.json +++ b/balls/package-lock.json @@ -12,7 +12,7 @@ "canvas-common": "file:../canvas-common" }, "devDependencies": { - "vite": "5.2.7" + "vite": "^5.1.5" } }, "../canvas-common": { diff --git a/balls/src/js/main.js b/balls/src/js/main.js index 26afa7d..a2fb204 100644 --- a/balls/src/js/main.js +++ b/balls/src/js/main.js @@ -360,22 +360,9 @@ function rectsAct(){ config.balls.balls++; toSpawn = config.balls.balls; spawnStuff(); - updateCookieStorage(); spawning = false; } -function updateCookieStorage(){ - var objectToStore = { - rects: rects, - balls: config.balls.balls, - buffs: buffs, - portals: portals - }; - - Cookies.remove('balls'); - Cookies.set('balls', objectToStore); -} - function paintBalls(){ balls.forEach(paintBall) } @@ -817,35 +804,7 @@ docReady(function () { y: touchEvent.touches[0].clientY - rect.top }; } - var possibleBalls = Cookies.getJSON('balls'); - if(possibleBalls == undefined){ - spawnStuff(); - } else { - buffs = possibleBalls.buffs; - portals = possibleBalls.portals; - rects = possibleBalls.rects; - - // it doesnt store functions - buffs.forEach(function(buff){ - buff.effect = function(ball) { - reboundBalls += buff.duration; - } - }); - - portals.forEach(function(portal){ - portal.source.effect = function(ball) { - collisionWithPortal(ball, portal.source, portal.target); - }; - - //blue - portal.target.effect = function(ball) { - collisionWithPortal(ball, portal.target, portal.source); - }; - }); - - - config.balls.balls = possibleBalls.balls; - } + spawnStuff(); requestAnimationFrame(updateCanvas); setInterval(function(){ diff --git a/canvas-common/common.js b/canvas-common/common.js index cf0e6d8..e4ba660 100644 --- a/canvas-common/common.js +++ b/canvas-common/common.js @@ -142,177 +142,3 @@ export function angleBetweenTwoVectors(vectorA, vectorB){ export function dotProduct(vector1, vector2) { return vector1.x * vector2.x + vector1.y * vector2.y; } - - -/*! - * JavaScript Cookie v2.2.0 - * https://github.com/js-cookie/js-cookie - * - * Copyright 2006, 2015 Klaus Hartl & Fagner Brack - * Released under the MIT license - */ -/*! - * JavaScript Cookie v2.2.0 - * https://github.com/js-cookie/js-cookie - * - * Copyright 2006, 2015 Klaus Hartl & Fagner Brack - * Released under the MIT license - */ -;(function (factory) { - var registeredInModuleLoader = false; - if (typeof define === 'function' && define.amd) { - define(factory); - registeredInModuleLoader = true; - } - if (typeof exports === 'object') { - module.exports = factory(); - registeredInModuleLoader = true; - } - if (!registeredInModuleLoader) { - var OldCookies = window.Cookies; - var api = window.Cookies = factory(); - api.noConflict = function () { - window.Cookies = OldCookies; - return api; - }; - } -}(function () { - function extend () { - var i = 0; - var result = {}; - for (; i < arguments.length; i++) { - var attributes = arguments[ i ]; - for (var key in attributes) { - result[key] = attributes[key]; - } - } - return result; - } - - function init (converter) { - function api (key, value, attributes) { - var result; - if (typeof document === 'undefined') { - return; - } - - // Write - - if (arguments.length > 1) { - attributes = extend({ - path: '/' - }, api.defaults, attributes); - - if (typeof attributes.expires === 'number') { - var expires = new Date(); - expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5); - attributes.expires = expires; - } - - // We're using "expires" because "max-age" is not supported by IE - attributes.expires = attributes.expires ? attributes.expires.toUTCString() : ''; - - try { - result = JSON.stringify(value); - if (/^[\{\[]/.test(result)) { - value = result; - } - } catch (e) {} - - if (!converter.write) { - value = encodeURIComponent(String(value)) - .replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent); - } else { - value = converter.write(value, key); - } - - key = encodeURIComponent(String(key)); - key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent); - key = key.replace(/[\(\)]/g, escape); - - var stringifiedAttributes = ''; - - for (var attributeName in attributes) { - if (!attributes[attributeName]) { - continue; - } - stringifiedAttributes += '; ' + attributeName; - if (attributes[attributeName] === true) { - continue; - } - stringifiedAttributes += '=' + attributes[attributeName]; - } - return (document.cookie = key + '=' + value + stringifiedAttributes); - } - - // Read - - if (!key) { - result = {}; - } - - // To prevent the for loop in the first place assign an empty array - // in case there are no cookies at all. Also prevents odd result when - // calling "get()" - var cookies = document.cookie ? document.cookie.split('; ') : []; - var rdecode = /(%[0-9A-Z]{2})+/g; - var i = 0; - - for (; i < cookies.length; i++) { - var parts = cookies[i].split('='); - var cookie = parts.slice(1).join('='); - - if (!this.json && cookie.charAt(0) === '"') { - cookie = cookie.slice(1, -1); - } - - try { - var name = parts[0].replace(rdecode, decodeURIComponent); - cookie = converter.read ? - converter.read(cookie, name) : converter(cookie, name) || - cookie.replace(rdecode, decodeURIComponent); - - if (this.json) { - try { - cookie = JSON.parse(cookie); - } catch (e) {} - } - - if (key === name) { - result = cookie; - break; - } - - if (!key) { - result[name] = cookie; - } - } catch (e) {} - } - - return result; - } - - api.set = api; - api.get = function (key) { - return api.call(api, key); - }; - api.getJSON = function () { - return api.apply({ - json: true - }, [].slice.call(arguments)); - }; - api.defaults = {}; - - api.remove = function (key, attributes) { - api(key, '', extend(attributes, { - expires: -1 - })); - }; - - api.withConverter = init; - - return api; - } - - return init(function () {}); -}));