noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adding TODO comment

Browse Source
This commit is contained in:
David Négrier 2020-04-28 23:23:50 +02:00
parent 7da8a6138f
commit abeac558fd
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
back/src/Model/World.ts
View File

@ -14,13 +14,13 @@ export class World {
private connectCallback: (user1: string, user2: string) => void; private connectCallback: (user1: string, user2: string) => void;
private disconnectCallback: (user1: string, user2: string) => void; private disconnectCallback: (user1: string, user2: string) => void;
constructor(connectCallback: (user1: string, user2: string) => void, disconnectCallback: (user1: string, user2: string) => void) constructor(connectCallback: (user1: string, user2: string) => void, disconnectCallback: (user1: string, user2: string) => void)
{ {
this.users = new Map<string, UserInterface>(); this.users = new Map<string, UserInterface>();
this.groups = []; this.groups = [];
this.connectCallback = connectCallback; this.connectCallback = connectCallback;
this.disconnectCallback = disconnectCallback; this.disconnectCallback = disconnectCallback;
} }
public join(userPosition: MessageUserPosition): void { public join(userPosition: MessageUserPosition): void {
this.users.set(userPosition.userId, { this.users.set(userPosition.userId, {
@ -55,9 +55,17 @@ export class World {
closestUser.group.join(user); closestUser.group.join(user);
} }
} }
} else {
// If the user is part of a group:
// should we split the group?
// TODO: analyze the group of the user:
// => take one user. "walk the tree of users, each branch being a link<MIN_DISTANCE"
// If some users are not in the subgroup, take the other user and loop
// At the end, we will have a list of subgroups. From this list, we can send disconnect messages
} }
// TODO : vérifier qu'ils ne sont pas déja dans un groupe plein
} }
/** /**
@ -96,7 +104,7 @@ export class World {
} }
let distance = World.computeDistance(user, currentUser); // compute distance between peers. let distance = World.computeDistance(user, currentUser); // compute distance between peers.
if(distance <= minimumDistanceFound) { if(distance <= minimumDistanceFound) {
if (typeof currentUser.group === 'undefined' || !currentUser.group.isFull()) { if (typeof currentUser.group === 'undefined' || !currentUser.group.isFull()) {
@ -107,11 +115,11 @@ export class World {
} }
/* /*
if(context.groups.length > 0) { if(context.groups.length > 0) {
context.groups.forEach(group => { context.groups.forEach(group => {
if(group.isPartOfGroup(userPosition)) { // Is the user in a group ? if(group.isPartOfGroup(userPosition)) { // Is the user in a group ?
if(group.isStillIn(userPosition)) { // Is the user leaving the group ? (is the user at more than max distance of each player) if(group.isStillIn(userPosition)) { // Is the user leaving the group ? (is the user at more than max distance of each player)
// Should we split the group? (is each player reachable from the current player?) // Should we split the group? (is each player reachable from the current player?)
// This is needed if // This is needed if
// A <==> B <==> C <===> D // A <==> B <==> C <===> D
@ -136,7 +144,7 @@ export class World {
} }
*/ */
} }
}, this.users); }, this.users);
return matchingUser; return matchingUser;
@ -164,7 +172,7 @@ export class World {
} }
}); });
}); });
distances.sort(World.compareDistances); distances.sort(World.compareDistances);
return distances; return distances;
@ -190,7 +198,7 @@ export class World {
// Detecte le ou les users qui se sont fait sortir du groupe // Detecte le ou les users qui se sont fait sortir du groupe
let difference = users.filter(x => !groupTmp.includes(x)); let difference = users.filter(x => !groupTmp.includes(x));
// TODO : Notify users un difference that they have left the group // TODO : Notify users un difference that they have left the group
} }
let newgroup = new Group(groupTmp); let newgroup = new Group(groupTmp);
@ -207,4 +215,4 @@ export class World {
} }
return 0; return 0;
}*/ }*/
} }