deleted cameraManager, use camera follow code instead
This commit is contained in:
parent
33c58874e0
commit
1774594e76
@ -2,10 +2,12 @@ const DEBUG_MODE: boolean = !!process.env.DEBUG_MODE || false;
|
|||||||
const API_URL = process.env.API_URL || "http://api.workadventure.localhost";
|
const API_URL = process.env.API_URL || "http://api.workadventure.localhost";
|
||||||
const ROOM = [process.env.ROOM || "THECODINGMACHINE"];
|
const ROOM = [process.env.ROOM || "THECODINGMACHINE"];
|
||||||
const RESOLUTION = 2;
|
const RESOLUTION = 2;
|
||||||
|
const ZOOM_LEVEL = 3/4;
|
||||||
|
|
||||||
export {
|
export {
|
||||||
DEBUG_MODE,
|
DEBUG_MODE,
|
||||||
API_URL,
|
API_URL,
|
||||||
RESOLUTION,
|
RESOLUTION,
|
||||||
|
ZOOM_LEVEL,
|
||||||
ROOM
|
ROOM
|
||||||
}
|
}
|
@ -1,49 +0,0 @@
|
|||||||
import {RESOLUTION} from "../../Enum/EnvironmentVariable";
|
|
||||||
import {Player} from "../Player/Player";
|
|
||||||
import {GameSceneInterface} from "./GameScene";
|
|
||||||
|
|
||||||
export interface CameraManagerInterface {
|
|
||||||
moveCamera(CurrentPlayer : Player) : void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class CameraManager implements CameraManagerInterface{
|
|
||||||
Scene : GameSceneInterface;
|
|
||||||
Camera : Phaser.Cameras.Scene2D.Camera;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
Scene: GameSceneInterface,
|
|
||||||
Camera : Phaser.Cameras.Scene2D.Camera,
|
|
||||||
) {
|
|
||||||
this.Scene = Scene;
|
|
||||||
this.Camera = Camera;
|
|
||||||
}
|
|
||||||
|
|
||||||
moveCamera(CurrentPlayer : Player): void {
|
|
||||||
//center of camera
|
|
||||||
let startX = ((window.innerWidth / 2) / RESOLUTION);
|
|
||||||
let startY = ((window.innerHeight / 2) / RESOLUTION);
|
|
||||||
|
|
||||||
let limit = {
|
|
||||||
top: startY,
|
|
||||||
left: startX,
|
|
||||||
bottom : this.Scene.Map.heightInPixels - startY,
|
|
||||||
right: this.Scene.Map.widthInPixels - startX,
|
|
||||||
};
|
|
||||||
|
|
||||||
if(CurrentPlayer.x < limit.left){
|
|
||||||
this.Camera.scrollX = 0;
|
|
||||||
}else if(CurrentPlayer.x > limit.right){
|
|
||||||
this.Camera.scrollX = (limit.right - startX);
|
|
||||||
}else {
|
|
||||||
this.Camera.scrollX = (CurrentPlayer.x - startX);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(CurrentPlayer.y < limit.top){
|
|
||||||
this.Camera.scrollY = 0;
|
|
||||||
}else if(CurrentPlayer.y > limit.bottom){
|
|
||||||
this.Camera.scrollY = (limit.bottom - startY);
|
|
||||||
}else {
|
|
||||||
this.Camera.scrollY = (CurrentPlayer.y - startY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,8 +1,7 @@
|
|||||||
import {GameManagerInterface, StatusGameManagerEnum} from "./GameManager";
|
import {GameManagerInterface, StatusGameManagerEnum} from "./GameManager";
|
||||||
import {MessageUserPositionInterface} from "../../Connexion";
|
import {MessageUserPositionInterface} from "../../Connexion";
|
||||||
import {CameraManager, CameraManagerInterface} from "./CameraManager";
|
|
||||||
import {CurrentGamerInterface, GamerInterface, Player} from "../Player/Player";
|
import {CurrentGamerInterface, GamerInterface, Player} from "../Player/Player";
|
||||||
import {DEBUG_MODE, RESOLUTION} from "../../Enum/EnvironmentVariable";
|
import {DEBUG_MODE, RESOLUTION, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable";
|
||||||
import Tile = Phaser.Tilemaps.Tile;
|
import Tile = Phaser.Tilemaps.Tile;
|
||||||
|
|
||||||
export enum Textures {
|
export enum Textures {
|
||||||
@ -22,7 +21,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
|
|||||||
GameManager : GameManagerInterface;
|
GameManager : GameManagerInterface;
|
||||||
RoomId : string;
|
RoomId : string;
|
||||||
Terrain : Phaser.Tilemaps.Tileset;
|
Terrain : Phaser.Tilemaps.Tileset;
|
||||||
Camera: CameraManagerInterface;
|
|
||||||
CurrentPlayer: CurrentGamerInterface;
|
CurrentPlayer: CurrentGamerInterface;
|
||||||
MapPlayers : Phaser.Physics.Arcade.Group;
|
MapPlayers : Phaser.Physics.Arcade.Group;
|
||||||
Map: Phaser.Tilemaps.Tilemap;
|
Map: Phaser.Tilemaps.Tilemap;
|
||||||
@ -76,14 +74,22 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
|
|||||||
//init event click
|
//init event click
|
||||||
this.EventToClickOnTile();
|
this.EventToClickOnTile();
|
||||||
|
|
||||||
//initialise camera
|
|
||||||
this.Camera = new CameraManager(this, this.cameras.main);
|
|
||||||
|
|
||||||
//initialise list of other player
|
//initialise list of other player
|
||||||
this.MapPlayers = this.physics.add.group({ immovable: true });
|
this.MapPlayers = this.physics.add.group({ immovable: true });
|
||||||
|
|
||||||
//notify game manager can to create currentUser in map
|
//notify game manager can to create currentUser in map
|
||||||
this.GameManager.createCurrentPlayer();
|
this.GameManager.createCurrentPlayer();
|
||||||
|
|
||||||
|
|
||||||
|
//initialise camera
|
||||||
|
this.initCamera();
|
||||||
|
}
|
||||||
|
|
||||||
|
//todo: in a dedicated class/function?
|
||||||
|
initCamera() {
|
||||||
|
this.cameras.main.setBounds(0,0, this.Map.widthInPixels, this.Map.heightInPixels);
|
||||||
|
this.cameras.main.startFollow(this.CurrentPlayer);
|
||||||
|
this.cameras.main.setZoom(ZOOM_LEVEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
addLayer(Layer : Phaser.Tilemaps.StaticTilemapLayer){
|
addLayer(Layer : Phaser.Tilemaps.StaticTilemapLayer){
|
||||||
@ -128,7 +134,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
|
|||||||
this,
|
this,
|
||||||
this.startX,
|
this.startX,
|
||||||
this.startY,
|
this.startY,
|
||||||
this.Camera,
|
|
||||||
);
|
);
|
||||||
this.CurrentPlayer.initAnimation();
|
this.CurrentPlayer.initAnimation();
|
||||||
|
|
||||||
@ -212,7 +217,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
|
|||||||
this,
|
this,
|
||||||
MessageUserPosition.position.x,
|
MessageUserPosition.position.x,
|
||||||
MessageUserPosition.position.y,
|
MessageUserPosition.position.y,
|
||||||
this.Camera,
|
|
||||||
);
|
);
|
||||||
player.initAnimation();
|
player.initAnimation();
|
||||||
this.MapPlayers.add(player);
|
this.MapPlayers.add(player);
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
import {getPlayerAnimations, playAnimation, PlayerAnimationNames} from "./Animation";
|
import {getPlayerAnimations, playAnimation, PlayerAnimationNames} from "./Animation";
|
||||||
import {GameSceneInterface, Textures} from "../Game/GameScene";
|
import {GameSceneInterface, Textures} from "../Game/GameScene";
|
||||||
import {ConnexionInstance} from "../Game/GameManager";
|
import {ConnexionInstance} from "../Game/GameManager";
|
||||||
import {CameraManagerInterface} from "../Game/CameraManager";
|
|
||||||
import {MessageUserPositionInterface} from "../../Connexion";
|
import {MessageUserPositionInterface} from "../../Connexion";
|
||||||
import {ActiveEventList, UserInputEvent, UserInputManager} from "../UserInput/UserInputManager";
|
import {ActiveEventList, UserInputEvent, UserInputManager} from "../UserInput/UserInputManager";
|
||||||
import {PlayableCaracter} from "../Entity/PlayableCaracter";
|
import {PlayableCaracter} from "../Entity/PlayableCaracter";
|
||||||
@ -9,7 +8,6 @@ import {PlayableCaracter} from "../Entity/PlayableCaracter";
|
|||||||
export interface CurrentGamerInterface extends PlayableCaracter{
|
export interface CurrentGamerInterface extends PlayableCaracter{
|
||||||
userId : string;
|
userId : string;
|
||||||
PlayerValue : string;
|
PlayerValue : string;
|
||||||
CameraManager: CameraManagerInterface;
|
|
||||||
initAnimation() : void;
|
initAnimation() : void;
|
||||||
moveUser() : void;
|
moveUser() : void;
|
||||||
say(text : string) : void;
|
say(text : string) : void;
|
||||||
@ -18,7 +16,6 @@ export interface CurrentGamerInterface extends PlayableCaracter{
|
|||||||
export interface GamerInterface extends PlayableCaracter{
|
export interface GamerInterface extends PlayableCaracter{
|
||||||
userId : string;
|
userId : string;
|
||||||
PlayerValue : string;
|
PlayerValue : string;
|
||||||
CameraManager: CameraManagerInterface;
|
|
||||||
initAnimation() : void;
|
initAnimation() : void;
|
||||||
updatePosition(MessageUserPosition : MessageUserPositionInterface) : void;
|
updatePosition(MessageUserPosition : MessageUserPositionInterface) : void;
|
||||||
say(text : string) : void;
|
say(text : string) : void;
|
||||||
@ -27,7 +24,6 @@ export interface GamerInterface extends PlayableCaracter{
|
|||||||
export class Player extends PlayableCaracter implements CurrentGamerInterface, GamerInterface {
|
export class Player extends PlayableCaracter implements CurrentGamerInterface, GamerInterface {
|
||||||
userId: string;
|
userId: string;
|
||||||
PlayerValue: string;
|
PlayerValue: string;
|
||||||
CameraManager: CameraManagerInterface;
|
|
||||||
userInputManager: UserInputManager;
|
userInputManager: UserInputManager;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@ -35,7 +31,6 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
|
|||||||
Scene: GameSceneInterface,
|
Scene: GameSceneInterface,
|
||||||
x: number,
|
x: number,
|
||||||
y: number,
|
y: number,
|
||||||
CameraManager: CameraManagerInterface,
|
|
||||||
PlayerValue: string = Textures.Player
|
PlayerValue: string = Textures.Player
|
||||||
) {
|
) {
|
||||||
super(Scene, x, y, PlayerValue, 1);
|
super(Scene, x, y, PlayerValue, 1);
|
||||||
@ -46,7 +41,6 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
|
|||||||
//set data
|
//set data
|
||||||
this.userId = userId;
|
this.userId = userId;
|
||||||
this.PlayerValue = PlayerValue;
|
this.PlayerValue = PlayerValue;
|
||||||
this.CameraManager = CameraManager;
|
|
||||||
|
|
||||||
//the current player model should be push away by other players to prevent conflict
|
//the current player model should be push away by other players to prevent conflict
|
||||||
this.setImmovable(false);
|
this.setImmovable(false);
|
||||||
@ -96,7 +90,6 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
|
|||||||
this.stop();
|
this.stop();
|
||||||
}
|
}
|
||||||
this.sharePosition(direction);
|
this.sharePosition(direction);
|
||||||
this.CameraManager.moveCamera(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private sharePosition(direction: string) {
|
private sharePosition(direction: string) {
|
||||||
|
Loading…
Reference in New Issue
Block a user