Skip to content

Best score bug solution #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stefanpribicevic wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Best score bug solution #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0a1e2c
Remove unnecessary commented code.
stefan-pribicevic Jul 25, 2020
4015366
Make best score work.
stefan-pribicevic Jul 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
class="score"
id="best"
v-if="state === 'stopped'"
v-html="'Best: '+score"
v-html="`Best: ${window.localStorage.bestScore}`"
></text>
<g id="tip" v-if="state === 'init'">
<text x="50" y="68" text-anchor="middle" class="tip">
Expand Down
132 changes: 2 additions & 130 deletions script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const loopTapApp = new Vue({
stopPlay: function() {
if (this.state === 'started') {
this.state = 'stopped';
if (this.score > window.localStorage.best) window.localStorage.best = this.score;
if (this.score > window.localStorage.getItem('bestScore')) window.localStorage.setItem('bestScore', this.score);
}
},

Expand Down Expand Up @@ -124,135 +124,7 @@ if ('ontouchstart' in window) {
};
}

// loopTapApp.setArc();

// let arc = [];
// let score = 0;

// let state = 'init';

// const compose = (...fs) => x => fs.reduce((acc, f) => f(acc), x);

// function polarToCartesian(centerX, centerY, radius, angleInDegrees) {
// const angleInRadians = ((angleInDegrees - 90) * Math.PI) / 180.0;
// return {
// x: centerX + radius * Math.cos(angleInRadians),
// y: centerY + radius * Math.sin(angleInRadians)
// };
// }

// function describeArc(x, y, radius, startAngle, endAngle) {
// const start = polarToCartesian(x, y, radius, endAngle);
// const end = polarToCartesian(x, y, radius, startAngle);
// const arcFlag = endAngle - startAngle <= 180 ? '0' : '1';
// const d = ['M', start.x, start.y, 'A', radius, radius, 0, arcFlag, 0, end.x, end.y].join(' ');
// return d;
// }

// function angle(cx, cy, ex, ey) {
// const dy = ey - cy;
// const dx = ex - cx;
// let theta = Math.atan2(dx, -dy);
// theta *= 180 / Math.PI;
// theta = theta < 0 ? theta + 360 : theta;
// return theta;
// }

// function getBallAngle() {
// const bg = document.getElementById('bg').getBoundingClientRect();
// const bgCenter = { x: bg.left + bg.width / 2, y: bg.top + bg.height / 2 };
// const ball = document.getElementById('ball').getBoundingClientRect();
// const ballCenter = { x: ball.left + ball.width / 2, y: ball.top + ball.height / 2 };
// return angle(bgCenter.x, bgCenter.y, ballCenter.x, ballCenter.y);
// }

// function setArc() {
// const random = (i, j) => Math.floor(Math.random() * (j - i)) + i;
// arc = [];
// arc.push(random(0, 300));
// arc.push(random(arc[0] + 10, arc[0] + 110));
// arc[1] = arc[1] > 360 ? 360 : arc[1];
// document.getElementById('arc').setAttribute('d', describeArc(50, 50, 40, arc[0], arc[1]));
// document.getElementById('arc').style.stroke = colors[Math.floor(score / 10)];
// }

// function playBtn() {
// document.getElementById('play').style.display = state == 'started' ? 'none' : 'block';
// }

// function scoreField() {
// const scoreEle = document.getElementById('score');

// scoreEle.textContent = score;
// scoreEle.style.display = state == 'started' ? 'block' : 'none';
// }

// function animateBall() {
// const ballEle = document.getElementById('ball');
// if (state == 'started') {
// ballEle.style.animationDuration = 2000 - score * 100 + 'ms';
// } else {
// ballEle.style.animationPlayState = 'paused';
// }
// }

// function finalScore() {
// const finalScoreEle = document.getElementById('finalscore');
// finalScoreEle.textContent = score;
// finalScoreEle.style.display = state == 'stopped' ? 'block' : 'none';
// }

// function best() {
// const bestEle = document.getElementById('best');
// if (window.localStorage.best > 0) {
// bestEle.textContent = 'Best: ' + window.localStorage.best;
// bestEle.style.display = state == 'started' ? 'none' : 'block';
// }
// }
// function hideTip() {
// document.getElementById('tip').style.display = 'none';
// document.getElementById('about').style.display = 'none';
// }

// function startPlay() {
// state = 'started';
// score = 0;
// compose(hideTip, setArc, playBtn, animateBall, scoreField, finalScore, best)();
// document.getElementById('ball').style.animationPlayState = 'running';

// // Add the event listnerers for tap sensing
// if (is_touch_device()) {
// window.addEventListener('touchstart', tap);
// } else {
// window.addEventListener('mousedown', tap);
// window.onkeypress = e => {
// if (e.keyCode == 32) tap(e);
// };
// }
// }
// function stopPlay() {
// state = 'stopped';
// if (score > window.localStorage.best) window.localStorage.best = score;
// compose(playBtn, animateBall, scoreField, finalScore, best)();
// }

// function tap(e) {
// e.preventDefault();
// e.stopPropagation();
// const ballAngle = getBallAngle();
// // adding a 5 for better accuracy as the arc stroke extends beyond the angle.
// if (ballAngle + 6 > arc[0] && ballAngle - 6 < arc[1]) {
// score++;
// compose(scoreField, animateBall, setArc)();
// } else stopPlay();
// }
// document.getElementById('play').addEventListener('click', startPlay);

// // Set an initial arc just for aesthetics
// setArc();

// // set best localstorage if there is not localstorage variable
// if (!window.localStorage.best) window.localStorage.best = 0;
window.localStorage.setItem('bestScore', 0);

if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('/sw.js');
Expand Down