Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring World and Group to use Map and Set instead of arrays

Browse source
This commit is contained in:
David Négrier 2020-06-29 22:10:23 +02:00
parent 981fa84aa7
commit 4fee1ac206
3 changed files with 21 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

44
back/src/Model/Group.ts
View file

@ -7,13 +7,13 @@ export class Group {
static readonly MAX_PER_GROUP = 4;
private id: string;
private users: UserInterface[];
private users: Set<UserInterface>;
private connectCallback: ConnectCallback;
private disconnectCallback: DisconnectCallback;
constructor(users: UserInterface[], connectCallback: ConnectCallback, disconnectCallback: DisconnectCallback) {
this.users = [];
this.users = new Set<UserInterface>();
this.connectCallback = connectCallback;
this.disconnectCallback = disconnectCallback;
this.id = uuid();
@ -24,7 +24,7 @@ export class Group {
}
getUsers(): UserInterface[] {
return this.users;
return Array.from(this.users.values());
}
getId() : string{
@ -42,8 +42,8 @@ export class Group {
x += user.position.x;
y += user.position.y;
});
x /= this.users.length;
y /= this.users.length;
x /= this.users.size;
y /= this.users.size;
return {
x,
y
@ -51,45 +51,27 @@ export class Group {
}
isFull(): boolean {
return this.users.length >= Group.MAX_PER_GROUP;
return this.users.size >= Group.MAX_PER_GROUP;
}
isEmpty(): boolean {
return this.users.length <= 1;
return this.users.size <= 1;
}
join(user: UserInterface): void
{
// Broadcast on the right event
this.connectCallback(user.id, this);
this.users.push(user);
this.users.add(user);
user.group = this;
}
isPartOfGroup(user: UserInterface): boolean
{
return this.users.includes(user);
}
/*removeFromGroup(users: UserInterface[]): void
{
for(let i = 0; i < users.length; i++){
let user = users[i];
const index = this.users.indexOf(user, 0);
if (index > -1) {
this.users.splice(index, 1);
}
}
}*/
leave(user: UserInterface): void
{
const index = this.users.indexOf(user, 0);
if (index === -1) {
throw new Error("Could not find user in the group");
let success = this.users.delete(user);
if (success === false) {
throw new Error("Could not find user "+user.id+" in the group "+this.id);
}
this.users.splice(index, 1);
user.group = undefined;
// Broadcast on the right event
@ -102,8 +84,8 @@ export class Group {
*/
destroy(): void
{
this.users.forEach((user: UserInterface) => {
for (let user of this.users) {
this.leave(user);
})
}
}
}