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

Jump to bottom

feat: smoother movement, some clean up #23

Merged
merged 2 commits into from
Dec 18, 2023
Merged

feat: smoother movement, some clean up #23

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
2017163
feat: smoother movement, some clean up
jdshaeffer Dec 15, 2023
50e8c22
remove ci on prs for now
jdshaeffer Dec 15, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ on:
push:
branches:
- master
pull_request:
branches:
- master
# pull_request:
# branches:
# - master
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removing pr ci for now - may bring it back in for other workflows


jobs:
build:
Expand Down
5 changes: 4 additions & 1 deletion server/socketServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ const socketConfig =

const io = new Server(socketConfig);
let playerCount = 0;
// the Map object holds key-value pairs and remembers the original insertion order of the keys

// NOTE: the Map object holds key-value pairs
// and remembers the original insertion order of the keys
const socketToPlayerId = new Map<number, string>();

io.on('connection', (socket: SocketData) => {
Expand All @@ -46,6 +48,7 @@ io.on('connection', (socket: SocketData) => {
socket.on('disconnect', () => {
playerCount -= 1;
socketToPlayerId.set(playerCount, socket.id);

// need to emit to the remaining player that they're now player1
socket.broadcast.emit('assignPlayerId', playerCount);
io.emit('playerCountUpdate', playerCount);
Expand Down
121 changes: 55 additions & 66 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,73 +5,53 @@ import './App.css';

let socket: Socket<DefaultEventsMap, DefaultEventsMap>;

function Game() {
function App() {
// player position state
const [posX1, setPosX1] = useState(150);
const [posY1, setPosY1] = useState(150);
const [posX2, setPosX2] = useState(50);
const [posY2, setPosY2] = useState(50);

// collision refs
const player1Ref = useRef<HTMLDivElement>(null);
const player2Ref = useRef<HTMLDivElement>(null);
const borderRef = useRef<HTMLDivElement>(null);

// other state
const [moving, setMoving] = useState(false);
const [direction, setDirection] = useState('');
const [playerCount, setPlayerCount] = useState(0);
const [playerId, setPlayerId] = useState(0);

const player1Ref = useRef<HTMLDivElement>(null);
const player2Ref = useRef<HTMLDivElement>(null);
const borderRef = useRef<HTMLDivElement>(null);
const directionMap: { [key: string]: string } = {
ArrowUp: 'n',
ArrowDown: 's',
ArrowRight: 'e',
ArrowLeft: 'w',
w: 'n',
a: 'w',
s: 's',
d: 'e',
};

const validKeys = new Set([
'ArrowUp',
'ArrowDown',
'ArrowRight',
'ArrowLeft',
'w',
'a',
's',
'd',
]);
const isValidDirection = (key: string, dir: string) =>
((key === 'ArrowUp' || key === 'w') && !dir.includes('n')) ||
((key === 'ArrowDown' || key === 's') && !dir.includes('s')) ||
((key === 'ArrowRight' || key === 'd') && !dir.includes('e')) ||
((key === 'ArrowLeft' || key === 'a') && !dir.includes('w'));

const handleKeyDown = (e: KeyboardEvent) => {
if (validKeys.has(e.key)) {
if (isValidDirection(e.key, direction)) {
setMoving(true);
if (
(e.key === 'ArrowUp' || e.key === 'w') &&
direction.indexOf('n') === -1
) {
setDirection(direction + 'n');
} else if (
(e.key === 'ArrowDown' || e.key === 's') &&
direction.indexOf('s') === -1
) {
setDirection(direction + 's');
} else if (
(e.key === 'ArrowRight' || e.key === 'd') &&
direction.indexOf('e') === -1
) {
setDirection(direction + 'e');
} else if (
(e.key === 'ArrowLeft' || e.key === 'a') &&
direction.indexOf('w') === -1
) {
setDirection(direction + 'w');
}
setDirection(direction + directionMap[e.key]);
}
};

const handleKeyUp = (e: KeyboardEvent) => {
if (validKeys.has(e.key)) {
if (e.key === 'ArrowUp' || e.key === 'w') {
const i = direction.indexOf('n');
setDirection(direction.substring(0, i) + direction.substring(i + 1));
} else if (e.key === 'ArrowDown' || e.key === 's') {
const i = direction.indexOf('s');
setDirection(direction.substring(0, i) + direction.substring(i + 1));
} else if (e.key === 'ArrowRight' || e.key === 'd') {
const i = direction.indexOf('e');
setDirection(direction.substring(0, i) + direction.substring(i + 1));
} else if (e.key === 'ArrowLeft' || e.key === 'a') {
const i = direction.indexOf('w');
setDirection(direction.substring(0, i) + direction.substring(i + 1));
}
const mappedDirection = directionMap[e.key];
if (mappedDirection) {
const i = direction.indexOf(mappedDirection);
setDirection(direction.slice(0, i) + direction.slice(i + 1));
if (direction.length === 0) {
setMoving(false);
}
Expand All @@ -86,30 +66,48 @@ function Game() {
const playerHitBox = playerDiv!.getBoundingClientRect();
const borderHitBox = borderDiv!.getBoundingClientRect();

const checkCollision = (side: keyof DOMRect) =>
playerHitBox[side] <= +borderHitBox[side] + borderBuffer;

const checkCollisionAlt = (side: keyof DOMRect) =>
playerHitBox[side] >= +borderHitBox[side] - borderBuffer;

let borderDetected = new Set<string>();
if (playerHitBox.left <= borderHitBox.left + borderBuffer) {
if (checkCollision('left')) {
borderDetected.add('w');
} else {
borderDetected.delete('w');
}
if (playerHitBox.right >= borderHitBox.right - borderBuffer) {
if (checkCollisionAlt('right')) {
borderDetected.add('e');
} else {
borderDetected.delete('e');
}
if (playerHitBox.bottom >= borderHitBox.bottom - borderBuffer) {
if (checkCollisionAlt('bottom')) {
borderDetected.add('s');
} else {
borderDetected.delete('s');
}
if (playerHitBox.top <= borderHitBox.top + borderBuffer) {
if (checkCollision('top')) {
borderDetected.add('n');
} else {
borderDetected.delete('n');
}
return borderDetected;
};

const updatePlayerPosition = (dx: number, dy: number) => {
if (playerId === 1) {
setPosX1(posX1 + dx);
setPosY1(posY1 + dy);
socket.emit('updatePlayer1', { x: posX1, y: posY1 });
} else {
setPosX2(posX2 + dx);
setPosY2(posY2 + dy);
socket.emit('updatePlayer2', { x: posX2, y: posY2 });
}
};

const move = () => {
let dx = 0;
let dy = 0;
Expand Down Expand Up @@ -166,22 +164,13 @@ function Game() {
dy += diagspd;
dx -= diagspd;
}
} else {
setMoving(false);
}
} else if (l === 0 || l > 2) {
setMoving(false);
return;
}

if (playerId === 1) {
setPosX1(posX1 + dx);
setPosY1(posY1 + dy);
socket.emit('updatePlayer1', { x: posX1, y: posY1 });
} else {
setPosX2(posX2 + dx);
setPosY2(posY2 + dy);
socket.emit('updatePlayer2', { x: posX2, y: posY2 });
}
updatePlayerPosition(dx, dy);
};

// socket listener
Expand Down Expand Up @@ -264,4 +253,4 @@ function Game() {
}
}

export default Game;
export default App;