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

Refactor: 토너먼트 로직 추가 #99

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Refactor: 토너먼트 로직 추가 #99

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
eef5893
Refactor: remoteGame인자 변경
Hosung99 Jun 27, 2024
7346552
Refactor: 구조 수정
Hosung99 Jun 27, 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
202 changes: 139 additions & 63 deletions frontend/static/js/game/remoteGame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ import { postGameResult } from '../api/postAPI.js';
import { addBlurBackground } from '../utility/blurBackGround.js';

export const remoteGame = {
async init(socket, nickname, gameMode, first_user) {
async init(socket, nickname, gameMode) {
addBlurBackground();
const root = document.getElementById('app');
while (root.childNodes.length > 0) {
root.removeChild(root.firstChild);
}
const $app = document.getElementById('app');
const $canvas = document.createElement('canvas');
const context = $canvas.getContext('2d');
Expand All @@ -17,6 +14,7 @@ export const remoteGame = {
let running = false;
let grid = 15;
let paddleWidth = grid * 6;
let role = false;
let user = {
player1: { name: 'player1', score: 0 },
player2: { name: 'player2', score: 0 },
Expand Down Expand Up @@ -57,6 +55,8 @@ export const remoteGame = {
}

async function gameEnd(data) {
role = false;
removeKeyboardEvent();
await postGameResult(gameMode, user);
const $win = document.createElement('div');
$win.classList.add('win');
Expand Down Expand Up @@ -131,18 +131,23 @@ export const remoteGame = {
function gameStart() {
let responseMessage = {
type: 'start_game',
running_user: false,
};
if (nickname === first_user) {
responseMessage.running_user = true;
}
socket.send(JSON.stringify(responseMessage));
}

async function settingGame(data) {
if (running) {
return;
}
while (root.childNodes.length > 0) {
root.removeChild(root.firstChild);
}
data.players.forEach((player) => {
if (player === nickname) {
role = true;
}
});
addKeyboardEvent();
running = true;
targetBall.x = data.ball_position.x;
targetBall.y = data.ball_position.y;
Expand Down Expand Up @@ -195,42 +200,101 @@ export const remoteGame = {
document.getElementById('player2Score').innerText = user.player2.score;
}

function waitNextGame() {
running = false;
const $wait = document.createElement('div');
$wait.classList.add('loading_spinner');

const spinner = document.createElement('div');
spinner.classList.add('spinner');

const waitText = document.createElement('p');
waitText.innerText = 'Wait for next game...';

$wait.appendChild(spinner);
$wait.appendChild(waitText);
root.appendChild($wait);
}

async function setSocket() {
socket.onmessage = function (event) {
const data = JSON.parse(event.data);
if (data.type === 'game_start') {
settingGame(data.data).then(animate());
} else if (data.type == 'update_score') {
gameStop();
updateScore(data.data);
running = true;
} else if (data.type == 'ball_position') {
targetBall.x = data.data.x;
targetBall.y = data.data.y;
} else if (data.type === 'game_restart') {
targetBall.x = data.data.ball_position.x;
targetBall.y = data.data.ball_position.y;
topPaddle.x = data.data.paddles[1].x;
topPaddle.y = data.data.paddles[1].y;
bottomPaddle.x = data.data.paddles[0].x;
bottomPaddle.y = data.data.paddles[0].y;
} else if (data.type == 'end_game') {
updateScore(data.data);
gameEnd(data.data);
} else if (data.type == 'paddle_position') {
data.data.forEach((paddleData) => {
if (paddleData.nickname === topPaddle.name) {
topPaddle.x = paddleData.x;
topPaddle.y = paddleData.y;
} else if (paddleData.nickname === bottomPaddle.name) {
bottomPaddle.x = paddleData.x;
bottomPaddle.y = paddleData.y;
}
});

switch (data.type) {
case 'game_start':
handleGameStart(data.data);
break;
case 'update_score':
handleUpdateScore(data.data);
break;
case 'ball_position':
handleBallPosition(data.data);
break;
case 'next_round':
handleNextRound(data.data);
break;
case 'game_restart':
handleGameRestart(data.data);
break;
case 'end_game':
handleEndGame(data.data);
break;
case 'paddle_position':
handlePaddlePosition(data.data);
break;
}
};
}

async function handleGameStart(data) {
await settingGame(data);
animate();
}

function handleUpdateScore(data) {
gameStop();
updateScore(data);
running = true;
}

function handleBallPosition(data) {
targetBall.x = data.x;
targetBall.y = data.y;
}

async function handleNextRound(data) {
waitNextGame();
await settingGame(data);
animate();
}

function handleGameRestart(data) {
targetBall.x = data.ball_position.x;
targetBall.y = data.ball_position.y;
topPaddle.x = data.paddles[1].x;
topPaddle.y = data.paddles[1].y;
bottomPaddle.x = data.paddles[0].x;
bottomPaddle.y = data.paddles[0].y;
}

function handleEndGame(data) {
updateScore(data);
gameEnd(data);
waitNextGame();
}

function handlePaddlePosition(data) {
data.forEach((paddleData) => {
if (paddleData.nickname === topPaddle.name) {
topPaddle.x = paddleData.x;
topPaddle.y = paddleData.y;
} else if (paddleData.nickname === bottomPaddle.name) {
bottomPaddle.x = paddleData.x;
bottomPaddle.y = paddleData.y;
}
});
}

function animate() {
if (running) {
ball.x = targetBall.x;
Expand All @@ -241,34 +305,46 @@ export const remoteGame = {
}

function addKeyboardEvent() {
document.addEventListener('keydown', function (e) {
let responseMessage = {};
if (e.code === 'ArrowLeft') {
e.preventDefault();
responseMessage = {
type: 'move_paddle',
paddle: nickname,
direction: 'left',
};
socket.send(JSON.stringify(responseMessage));
} else if (e.code === 'ArrowRight') {
e.preventDefault();
responseMessage = {
type: 'move_paddle',
paddle: nickname,
direction: 'right',
};
socket.send(JSON.stringify(responseMessage));
}
});
document.addEventListener('keyup', function (e) {
if (e.key == 'ArrowUp' || e.key == 'ArrowDown') {
e.preventDefault();
}
});
if (role === true) {
document.addEventListener('keydown', keydownHandler);
document.addEventListener('keyup', keyupHandler);
}
}

function removeKeyboardEvent() {
if (role === true) {
document.removeEventListener('keydown', keydownHandler);
document.removeEventListener('keyup', keyupHandler);
}
}

function keydownHandler(e) {
let responseMessage = {};
if (e.code === 'ArrowLeft') {
e.preventDefault();
responseMessage = {
type: 'move_paddle',
paddle: nickname,
direction: 'left',
};
socket.send(JSON.stringify(responseMessage));
} else if (e.code === 'ArrowRight') {
e.preventDefault();
responseMessage = {
type: 'move_paddle',
paddle: nickname,
direction: 'right',
};
socket.send(JSON.stringify(responseMessage));
}
}

function keyupHandler(e) {
if (e.key == 'ArrowUp' || e.key == 'ArrowDown') {
e.preventDefault();
}
}

addKeyboardEvent();
setSocket();
gameStart();
},
Expand Down
5 changes: 2 additions & 3 deletions frontend/static/js/view/Play.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ export default class extends AbstractView {
const token = localStorage.getItem('2FA');
WebSocketManager.connectGameSocket(`ws://localhost:8000/ws/play/${mode}/${roomName}/${nickname}/?token=${token}`);
let socket = WebSocketManager.returnGameSocket();
let first_user;

const loadingSpinner = document.getElementById('loading_spinner');

Expand Down Expand Up @@ -163,7 +162,6 @@ export default class extends AbstractView {
const data = JSON.parse(event.data);
loadingSpinner.style.display = 'none';
if (data.type === 'start_game') {
first_user = data.data.first_user;
const countdownContainer = document.querySelector('#countdown_container');
countdownContainer.style.display = 'flex';

Expand All @@ -186,7 +184,8 @@ export default class extends AbstractView {
countdownContainer.innerText = 'Go!';
setTimeout(() => {
countdownContainer.style.display = 'none';
remoteGame.init(socket, nickname, 'REMOTE', first_user);
if (mode === 'REMOTE') remoteGame.init(socket, nickname, 'REMOTE');
else if (mode === 'TOURNAMENT') remoteGame.init(socket, nickname, 'TOURNAMENT');
}, 1000);
}
}, 1000);
Expand Down