Adding custom character textures

front/src/Connexion/ConnectionManager.ts

@@ -21,7 +21,7 @@ class ConnectionManager {
         if(connexionType === GameConnexionTypes.register) {
            const organizationMemberToken = urlManager.getOrganizationToken();
             const data = await Axios.post(`${API_URL}/register`, {organizationMemberToken}).then(res => res.data);
-            this.localUser = new LocalUser(data.userUuid, data.authToken);
+            this.localUser = new LocalUser(data.userUuid, data.authToken, data.textures);
             localUserStore.saveUser(this.localUser);
 
             const organizationSlug = data.organizationSlug;
@@ -34,7 +34,7 @@ class ConnectionManager {
         } else if (connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
             const localUser = localUserStore.getLocalUser();
 
-            if (localUser && localUser.jwtToken && localUser.uuid) {
+            if (localUser && localUser.jwtToken && localUser.uuid && localUser.textures) {
                 this.localUser = localUser;
                 try {
                     await this.verifyToken(localUser.jwtToken);
@@ -78,12 +78,12 @@ class ConnectionManager {
 
     private async anonymousLogin(): Promise<void> {
         const data = await Axios.post(`${API_URL}/anonymLogin`).then(res => res.data);
-        this.localUser = new LocalUser(data.userUuid, data.authToken);
+        this.localUser = new LocalUser(data.userUuid, data.authToken, []);
         localUserStore.saveUser(this.localUser);
     }
 
     public initBenchmark(): void {
-        this.localUser = new LocalUser('', 'test');
+        this.localUser = new LocalUser('', 'test', []);
     }
 
     public connectToRoomSocket(roomId: string, name: string, characterLayers: string[], position: PositionInterface, viewport: ViewportInterface): Promise<RoomConnection> {

front/src/Connexion/ConnexionModels.ts

@@ -1,6 +1,7 @@
 import {PlayerAnimationNames} from "../Phaser/Player/Animation";
 import {UserSimplePeerInterface} from "../WebRtc/SimplePeer";
 import {SignalData} from "simple-peer";
+import {BodyResourceDescriptionInterface} from "../Phaser/Entity/body_character";
 
 export enum EventMessage{
     WEBRTC_SIGNAL = "webrtc-signal",
@@ -49,7 +50,7 @@ export class Point implements PointInterface{
 export interface MessageUserPositionInterface {
     userId: number;
     name: string;
-    characterLayers: string[];
+    characterLayers: BodyResourceDescriptionInterface[];
     position: PointInterface;
 }
 
@@ -61,7 +62,7 @@ export interface MessageUserMovedInterface {
 export interface MessageUserJoined {
     userId: number;
     name: string;
-    characterLayers: string[];
+    characterLayers: BodyResourceDescriptionInterface[];
     position: PointInterface
 }
 

front/src/Connexion/LocalUser.ts

@@ -1,9 +1,11 @@
+export interface CharacterTexture {
+    id: number,
+    level: number,
+    url: string,
+    rights: string
+}
+
 export class LocalUser {
-    public uuid: string;
-    public jwtToken: string;
-    
-    constructor(uuid:string, jwtToken: string) {
-        this.uuid = uuid;
-        this.jwtToken = jwtToken;
+    constructor(public readonly uuid:string, public readonly jwtToken: string, public readonly textures: CharacterTexture[]) {
     }
-}
+}

front/src/Connexion/RoomConnection.ts

@@ -22,7 +22,11 @@ import {
     WebRtcSignalToServerMessage,
     WebRtcStartMessage,
     ReportPlayerMessage,
-    TeleportMessageMessage, QueryJitsiJwtMessage, SendJitsiJwtMessage, SendUserMessage
+    TeleportMessageMessage,
+    QueryJitsiJwtMessage,
+    SendJitsiJwtMessage,
+    CharacterLayerMessage,
+    SendUserMessage
 } from "../Messages/generated/messages_pb"
 
 import {UserSimplePeerInterface} from "../WebRtc/SimplePeer";
@@ -36,6 +40,7 @@ import {
     ViewportInterface, WebRtcDisconnectMessageInterface,
     WebRtcSignalReceivedMessageInterface,
 } from "./ConnexionModels";
+import {BodyResourceDescriptionInterface} from "../Phaser/Entity/body_character";
 
 export class RoomConnection implements RoomConnection {
     private readonly socket: WebSocket;
@@ -169,10 +174,10 @@ export class RoomConnection implements RoomConnection {
         }
     }
 
-    public emitPlayerDetailsMessage(userName: string, characterLayersSelected: string[]) {
+    public emitPlayerDetailsMessage(userName: string, characterLayersSelected: BodyResourceDescriptionInterface[]) {
         const message = new SetPlayerDetailsMessage();
         message.setName(userName);
-        message.setCharacterlayersList(characterLayersSelected);
+        message.setCharacterlayersList(characterLayersSelected.map((characterLayer) => characterLayer.name));
 
         const clientToServerMessage = new ClientToServerMessage();
         clientToServerMessage.setSetplayerdetailsmessage(message);
@@ -277,10 +282,18 @@ export class RoomConnection implements RoomConnection {
         if (position === undefined) {
             throw new Error('Invalid JOIN_ROOM message');
         }
+
+        const characterLayers = message.getCharacterlayersList().map((characterLayer: CharacterLayerMessage): BodyResourceDescriptionInterface => {
+            return {
+                name: characterLayer.getName(),
+                img: characterLayer.getUrl()
+            }
+        })
+
         return {
             userId: message.getUserid(),
             name: message.getName(),
-            characterLayers: message.getCharacterlayersList(),
+            characterLayers,
             position: ProtobufClientUtils.toPointInterface(position)
         }
     }