Skip to content
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

feat: 로컬 게임 벽에서 벽으로 튕길 때 너무 많이 튕기지 않게 함 #497

Merged
merged 9 commits into from
Mar 13, 2024
Merged

feat: 로컬 게임 벽에서 벽으로 튕길 때 너무 많이 튕기지 않게 함 #497

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3437681
refactor(games): 공이 튕길 때, 보정치 계수의 최대값과 최소값을 인자로 받아옴
nyj001012 Mar 13, 2024
cf1283b
feat(games): 공이 벽에 연속해서 튕길 때 6번 튕기면 x방향 랜덤으로 크기 늘림
nyj001012 Mar 13, 2024
639b935
feat(games): moveBallEventId를 this로 관리
nyj001012 Mar 13, 2024
15c2994
refactor(games): bounce 게임 롤백
nyj001012 Mar 13, 2024
394639e
feat(games): 방향벡터 y 성분이 0.001보다 작을 때 hitCountOfWall 증가
nyj001012 Mar 13, 2024
83d2fed
feat(games): 방향벡터 x 성분이 0.001보다 작을 때 hitCountOfWall 증가
nyj001012 Mar 13, 2024
b9e7099
feat(games): 방향벡터 x 성분이 0.01보다 작을 때 hitCountOfWall 증가
nyj001012 Mar 13, 2024
090352c
feat(games): 방향벡터 x 성분의 크기에 따라 계수 가산 분기
nyj001012 Mar 13, 2024
903dd34
feat(games): 게임 리셋 시, 방향벡터의 초기값을 특정 범위 내에서 할당
nyj001012 Mar 13, 2024
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
24 changes: 19 additions & 5 deletions frontend/src/pages/local-game/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import scoreBar from "./scoreBar.js";
import toast from "./toast.js";
import { navigate } from "../../utils/navigate.js";
import deepCopy from "../../utils/deepCopy.js";

/**
*
* @param {HTMLElement} $container
Expand Down Expand Up @@ -40,6 +41,7 @@ export default function LocalGame($container, info = null) {
clearInterval(this.timeIntervalId);
cancelAnimationFrame(this.gameAnimationId);
cancelAnimationFrame(this.barAnimationId);
cancelAnimationFrame(this.moveBallEventId);
document.querySelector("#header").style.display = "block";
document.removeEventListener("keydown", keyEventHandler);
};
Expand Down Expand Up @@ -200,12 +202,23 @@ export default function LocalGame($container, info = null) {
*/
const runGame = (canvas, bar1, bar2, ball, drawFunction) => {
let isBounced = false;
let hitCountOfWall = 0;

const moveBall = () => {
if (isBallInsideBar(bar1, ball) || isBallInsideBar(bar2, ball)) {
bounce(true, false);
hitCountOfWall = 0;
} else if (isBallHitWall(canvas, ball)) {
bounce(false, true);
Math.abs(ball.direction.x) <= 0.2 ? hitCountOfWall++ : hitCountOfWall;
if (hitCountOfWall % 5 === 4) {
Math.abs(ball.direction.x) <= 0.01
? (ball.direction.x *= getRandomCoefficient(60, 80))
: (ball.direction.x *= getRandomCoefficient(3, 4));
bounce(false, true);
hitCountOfWall = 0;
} else {
bounce(false, true);
}
} else {
isBounced = false;
}
Expand All @@ -219,9 +232,9 @@ export default function LocalGame($container, info = null) {
pause(1000);
}
drawFunction(bar1, bar2, ball);
let moveBallEventId = window.requestAnimationFrame(moveBall);
this.moveBallEventId = window.requestAnimationFrame(moveBall);
if (getScore().player1 + getScore().player2 >= 5) {
cancelAnimationFrame(moveBallEventId);
cancelAnimationFrame(this.moveBallEventId);
// 게임 종료
if (info.finalPlayer1 === null) {
info.finalPlayer1 =
Expand Down Expand Up @@ -357,12 +370,13 @@ export default function LocalGame($container, info = null) {
ball.x = canvas.width / 2;
ball.y = canvas.height / 2;
ball.direction = {
x: Math.random() * 2 - 1,
y: Math.random() * 2 - 1,
x: (Math.random() * 2 - 1) * getRandomCoefficient(0.7, 0.9),
y: (Math.random() * 2 - 1) * getRandomCoefficient(0.7, 0.9),
};
normalizeVector(ball.direction.x, ball.direction.y);
ball.speed = BALL_SPEED;
isBounced = false;
hitCountOfWall = 0;
};

/**
Expand Down
Loading