Skip to content

Commit d7e173b

Browse files
committed
refactor(app): remove position getters/setters and streamline player info handling
1 parent 49b0ccd commit d7e173b

2 files changed

Lines changed: 13 additions & 26 deletions

File tree

packages/app/lib/classes/Player.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,6 @@ export default class Player {
5454
console.log('Player unit set:', this.unit.name);
5555
}
5656

57-
get position() {
58-
if (this.unit) {
59-
return this.unit.root.position;
60-
} else {
61-
throw new Error('Player unit is not set, cannot get position');
62-
}
63-
}
64-
65-
set position(position: Vector3) {
66-
if (this.unit) {
67-
this.unit.setPosition(position);
68-
} else {
69-
throw new Error('Player unit is not set, cannot update position');
70-
}
71-
}
72-
7357
moveTo(position: Vector3) {
7458
if (this.unit) {
7559
this.unit.modules.movement.moveTo(position);

packages/app/lib/classes/appModule/Multiplayer.ts

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ interface PlayerInfo {
5656
peerId: string;
5757
name: string;
5858
color: PLAYER_COLOR;
59-
position?: [number, number, number];
59+
position: [number, number, number];
6060
}
6161
export default class MultiplayerAppModule extends AppModule<State> {
6262
static override TYPE = 'multiplayer';
@@ -253,7 +253,7 @@ export default class MultiplayerAppModule extends AppModule<State> {
253253
// userId: userCredential.user.uid
254254
// }
255255
});
256-
console.log(player);
256+
257257
return player;
258258
}
259259

@@ -307,6 +307,7 @@ export default class MultiplayerAppModule extends AppModule<State> {
307307
const room = this.state.room;
308308

309309
// #region player moveTo action
310+
310311
const [setMoveTo, getMoveTo] =
311312
room.makeAction<MoveToPayload>('playerMoveTo');
312313

@@ -321,7 +322,7 @@ export default class MultiplayerAppModule extends AppModule<State> {
321322
// #region send message action
322323

323324
const [sendMessage, getMessage] = room.makeAction<Message & DataPayload>(
324-
'plyMessage'
325+
'messaging'
325326
);
326327

327328
getMessage((data, peerId) =>
@@ -341,13 +342,7 @@ export default class MultiplayerAppModule extends AppModule<State> {
341342
getPlayerInfo((data, peerId) => {
342343
const player = this.players.get(peerId);
343344
if (player) {
344-
debugger;
345-
player.name = data.name;
346-
player.setColor(data.color);
347-
// übernehme position
348-
if (data.position) {
349-
player.unit?.setPosition(new Vector3().fromArray(data.position));
350-
}
345+
this.setPlayerInfo(player, data);
351346
}
352347
});
353348

@@ -356,6 +351,14 @@ export default class MultiplayerAppModule extends AppModule<State> {
356351
// #endregion
357352
}
358353

354+
setPlayerInfo(player: Player, info: PlayerInfo) {
355+
player.name = info.name;
356+
player.setColor(info.color);
357+
// set position if available
358+
const position = new Vector3().fromArray(info.position);
359+
player.unit?.setPosition(position);
360+
}
361+
359362
sendMessage(message: Omit<Message, 'timestamp' | 'playerId'>) {
360363
const player = this.app.modules.player.getCurrentPlayer();
361364
if (!player) {

0 commit comments

Comments
 (0)