Merge pull request #83 from thecodingmachine/cleanup_rename_frame
authorDavid NĂ©grier <d.negrier@thecodingmachine.com>
Fri, 8 May 2020 14:21:16 +0000 (16:21 +0200)
committerGitHub <noreply@github.com>
Fri, 8 May 2020 14:21:16 +0000 (16:21 +0200)
Cleanup: renaming "frame" to "character"

1  2 
back/src/Controller/IoSocketController.ts
back/src/Model/Websocket/ExtRoom.ts
front/src/Connexion.ts
front/src/Phaser/Game/GameManager.ts
front/src/Phaser/Game/GameScene.ts

Simple merge
Simple merge
Simple merge
index 6ebdfc5d5558534e83df56adbf730daecef70262,c506dadb421a9d281d4697a40218323939967caa..3d0e41709c821f3431d9d73e24117fcbdf89e1d4
@@@ -292,28 -267,9 +292,28 @@@ export class GameScene extends Phaser.S
          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) {
 +        let groupId = groupPositionMessage.groupId;
 +
 +        if (this.groups.has(groupId)) {
 +            this.groups.get(groupId).setPosition(Math.round(groupPositionMessage.position.x), Math.round(groupPositionMessage.position.y));
 +        } else {
 +            // TODO: circle radius should not be hard stored
 +            let sprite = new Sprite(this, Math.round(groupPositionMessage.position.x), Math.round(groupPositionMessage.position.y), 'circleSprite');
 +            sprite.setDisplayOrigin(48, 48);
 +            this.add.existing(sprite);
 +            this.groups.set(groupId, sprite);
 +        }
 +    }
 +
 +    deleteGroup(groupId: string): void {
 +        this.groups.get(groupId).destroy();
 +        this.groups.delete(groupId);
 +    }
  }