lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #83 from thecodingmachine/cleanup_rename_frame

Browse source 
Cleanup: renaming "frame" to "character"
This commit is contained in:
David Négrier 2020-05-08 16:21:16 +02:00 committed by GitHub
parent e4824fe34d 8e9c1cac1e
commit c59d693f6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
back/src/Controller/IoSocketController.ts
View file

@ -250,7 +250,7 @@ export class IoSocketController {
socket.roomId = message.roomId;
socket.userId = message.userId;
socket.name = message.name;
socket.frame = message.frame;
socket.character = message.character;
}
refreshUserPosition() {

4
back/src/Model/Websocket/ExSocketInterface.ts
View file

@ -7,6 +7,6 @@ export interface ExSocketInterface extends Socket {
webRtcRoomId: string;
userId: string;
name: string;
frame: string;
character: string;
position: PointInterface;
}
}

4
back/src/Model/Websocket/ExtRoom.ts
View file

@ -27,7 +27,7 @@ let RefreshUserPositionFunction = function(rooms : ExtRooms, Io: socketIO.Server
roomId: socket.roomId,
position: socket.position,
name: socket.name,
frame: socket.frame,
character: socket.character,
};
let dataArray = <any>[];
if (mapPositionUserByRoom.get(data.roomId)) {
@ -47,4 +47,4 @@ let RefreshUserPositionFunction = function(rooms : ExtRooms, Io: socketIO.Server
export {
RefreshUserPositionFunction
}
}

8
back/src/Model/Websocket/Message.ts
View file

@ -2,7 +2,7 @@ export class Message {
userId: string;
roomId: string;
name: string;
frame: string;
character: string;
constructor(data: any) {
if (!data.userId || !data.roomId) {
@ -11,7 +11,7 @@ export class Message {
this.userId = data.userId;
this.roomId = data.roomId;
this.name = data.name;
this.frame = data.frame;
this.character = data.character;
}
toJson() {
@ -19,7 +19,7 @@ export class Message {
userId: this.userId,
roomId: this.roomId,
name: this.name,
frame: this.frame
character: this.character
}
}
}
}

10
back/tests/MessageTest.ts
View file

@ -3,18 +3,18 @@ import {Message} from "../src/Model/Websocket/Message";
describe("Message Model", () => {
it("should find userId and roomId", () => {
let message = {userId: "test1", roomId: "test2", name: "foo", frame: "user"};
let message = {userId: "test1", roomId: "test2", name: "foo", character: "user"};
let messageObject = new Message(message);
expect(messageObject.userId).toBe("test1");
expect(messageObject.roomId).toBe("test2");
expect(messageObject.name).toBe("foo");
expect(messageObject.frame).toBe("user");
expect(messageObject.character).toBe("user");
})
it("should expose a toJson method", () => {
let message = {userId: "test1", roomId: "test2", name: "foo", frame: "user"};
let message = {userId: "test1", roomId: "test2", name: "foo", character: "user"};
let messageObject = new Message(message);
expect(messageObject.toJson()).toEqual({userId: "test1", roomId: "test2", name: "foo", frame: "user"});
expect(messageObject.toJson()).toEqual({userId: "test1", roomId: "test2", name: "foo", character: "user"});
});
it("should find throw error when no userId", () => {
@ -37,4 +37,4 @@ describe("Message Model", () => {
let messageObject = new Message(message);
}).toThrow(new Error("userId or roomId cannot be null"));
});
})
})

40
front/src/Connexion.ts
View file

@ -20,13 +20,13 @@ class Message {
userId: string;
roomId: string;
name: string;
frame: string;
character: string;
constructor(userId : string, roomId : string, name: string, frame: string) {
constructor(userId : string, roomId : string, name: string, character: string) {
this.userId = userId;
this.roomId = roomId;
this.name = name;
this.frame = frame;
this.character = character;
}
toJson() {
@ -34,7 +34,7 @@ class Message {
userId: this.userId,
roomId: this.roomId,
name: this.name,
frame: this.frame
character: this.character
}
}
}
@ -73,15 +73,15 @@ export interface MessageUserPositionInterface {
userId: string;
roomId: string;
name: string;
frame: string;
character: string;
position: PointInterface;
}
class MessageUserPosition extends Message implements MessageUserPositionInterface{
position: PointInterface;
constructor(userId : string, roomId : string, point : Point, name: string, frame: string) {
super(userId, roomId, name, frame);
constructor(userId : string, roomId : string, point : Point, name: string, character: string) {
super(userId, roomId, name, character);
this.position = point;
}
@ -118,7 +118,7 @@ class ListMessageUserPosition {
userPosition.position.direction
),
userPosition.name,
userPosition.frame
userPosition.character
));
});
}
@ -141,11 +141,11 @@ export interface ConnexionInterface {
userId: string;
startedRoom: string;
createConnexion(frameSelected: string): Promise<any>;
createConnexion(characterSelected: string): Promise<any>;
joinARoom(roomId: string, frame: string): void;
joinARoom(roomId: string, character: string): void;
sharePosition(x: number, y: number, direction: string, frame: string): void;
sharePosition(x: number, y: number, direction: string, character: string): void;
positionOfAllUser(): void;
@ -173,7 +173,7 @@ export class Connexion implements ConnexionInterface {
this.GameManager = GameManager;
}
createConnexion(frameSelected: string): Promise<ConnexionInterface> {
createConnexion(characterSelected: string): Promise<ConnexionInterface> {
return Axios.post(`${API_URL}/login`, {email: this.email})
.then((res) => {
this.token = res.data.token;
@ -187,10 +187,10 @@ export class Connexion implements ConnexionInterface {
});
//join the room
this.joinARoom(this.startedRoom, frameSelected);
this.joinARoom(this.startedRoom, characterSelected);
//share your first position
this.sharePosition(0, 0, frameSelected);
this.sharePosition(0, 0, characterSelected);
this.positionOfAllUser();
@ -210,15 +210,15 @@ export class Connexion implements ConnexionInterface {
/**
*
* @param roomId
* @param frame
* @param character
*/
joinARoom(roomId: string, frame: string): void {
joinARoom(roomId: string, character: string): void {
let messageUserPosition = new MessageUserPosition(
this.userId,
this.startedRoom,
new Point(0, 0),
this.email,
frame
character
);
this.socket.emit(EventMessage.JOIN_ROOM, messageUserPosition.toString());
}
@ -227,10 +227,10 @@ export class Connexion implements ConnexionInterface {
*
* @param x
* @param y
* @param frame
* @param character
* @param direction
*/
sharePosition(x : number, y : number, frame : string, direction : string = "none") : void{
sharePosition(x : number, y : number, character : string, direction : string = "none") : void{
if(!this.socket){
return;
}
@ -239,7 +239,7 @@ export class Connexion implements ConnexionInterface {
ROOM[0],
new Point(x, y, direction),
this.email,
frame
character
);
this.socket.emit(EventMessage.USER_POSITION, messageUserPosition.toString());
}

16
front/src/Phaser/Game/GameManager.ts
View file

@ -18,7 +18,7 @@ export interface HasMovedEvent {
direction: string;
x: number;
y: number;
frame: string;
character: string;
}
export class GameManager {
@ -27,17 +27,17 @@ export class GameManager {
private currentGameScene: GameScene;
private playerName: string;
SimplePeer : SimplePeerInterface;
private frameUserSelected: string;
private characterUserSelected: string;
constructor() {
this.status = StatusGameManagerEnum.IN_PROGRESS;
}
connect(name: string, frameUserSelected : string) {
connect(name: string, characterUserSelected : string) {
this.playerName = name;
this.frameUserSelected = frameUserSelected;
this.characterUserSelected = characterUserSelected;
this.ConnexionInstance = new Connexion(name, this);
return this.ConnexionInstance.createConnexion(frameUserSelected).then(() => {
return this.ConnexionInstance.createConnexion(characterUserSelected).then(() => {
this.SimplePeer = new SimplePeer(this.ConnexionInstance);
});
}
@ -100,12 +100,12 @@ export class GameManager {
return this.playerName;
}
getFrameSelected(): string {
return this.frameUserSelected;
getCharacterSelected(): string {
return this.characterUserSelected;
}
pushPlayerPosition(event: HasMovedEvent) {
this.ConnexionInstance.sharePosition(event.x, event.y, event.frame, event.direction);
this.ConnexionInstance.sharePosition(event.x, event.y, event.character, event.direction);
}
}

10
front/src/Phaser/Game/GameScene.ts
View file

@ -192,7 +192,7 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
this.startX,
this.startY,
this.GameManager.getPlayerName(),
this.GameManager.getFrameSelected()
this.GameManager.getCharacterSelected()
);
this.CurrentPlayer.initAnimation();
@ -286,16 +286,16 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
MessageUserPosition.position.x,
MessageUserPosition.position.y,
MessageUserPosition.name,
MessageUserPosition.frame
MessageUserPosition.character
);
player.initAnimation();
this.MapPlayers.add(player);
player.updatePosition(MessageUserPosition);
//init colision
this.physics.add.collider(this.CurrentPlayer, player, (CurrentPlayer: CurrentGamerInterface, MapPlayer: GamerInterface) => {
//init collision
/*this.physics.add.collider(this.CurrentPlayer, player, (CurrentPlayer: CurrentGamerInterface, MapPlayer: GamerInterface) => {
CurrentPlayer.say("Hello, how are you ? ");
});
});*/
}
shareGroupPosition(groupPositionMessage: GroupCreatedUpdatedMessageInterface) {

4
front/src/Phaser/Player/Player.ts
View file

@ -83,12 +83,12 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
}
if (x !== 0 || y !== 0) {
this.move(x, y);
this.emit(hasMovedEventName, {direction, x: this.x, y: this.y, frame: this.PlayerTexture});
this.emit(hasMovedEventName, {direction, x: this.x, y: this.y, character: this.PlayerTexture});
} else {
if (this.previousMove !== PlayerAnimationNames.None) {
direction = PlayerAnimationNames.None;
this.stop();
this.emit(hasMovedEventName, {direction, x: this.x, y: this.y, frame: this.PlayerTexture});
this.emit(hasMovedEventName, {direction, x: this.x, y: this.y, character: this.PlayerTexture});
}
}