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

Merge branch 'develop' of https://git.nr18.space/lbehm/workadventure into develop

Browse source
This commit is contained in:
Ludwig Behm 2021-01-16 19:23:29 +01:00
parent d5e0cd37b9 b020120366
commit 8175106763
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import {CurrentGamerInterface, hasMovedEventName, Player} from "../Player/Player
import { import {
DEBUG_MODE, DEBUG_MODE,
JITSI_PRIVATE_MODE, JITSI_PRIVATE_MODE,
JITSI_URL,
POSITION_DELAY, POSITION_DELAY,
RESOLUTION, RESOLUTION,
ZOOM_LEVEL ZOOM_LEVEL
@ -1206,7 +1207,8 @@ export class GameScene extends ResizableScene implements CenterListener {
} }
public startJitsi(roomName: string, jwt?: string): void { public startJitsi(roomName: string, jwt?: string): void {
jitsiFactory.start(roomName, this.playerName, jwt); const jitsiUrl = getMapProperty(this.mapFile, 'jitsiUrl', 'string', JITSI_URL);
jitsiFactory.start(jitsiUrl, roomName, this.playerName, jwt);
this.connection.setSilent(true); this.connection.setSilent(true);
mediaManager.hideGameOverlay(); mediaManager.hideGameOverlay();

7
front/src/WebRtc/JitsiFactory.ts
View file

@ -1,4 +1,3 @@
import {JITSI_URL} from "../Enum/EnvironmentVariable";
import {mediaManager} from "./MediaManager"; import {mediaManager} from "./MediaManager";
import {coWebsiteManager} from "./CoWebsiteManager"; import {coWebsiteManager} from "./CoWebsiteManager";
declare const window:any; // eslint-disable-line @typescript-eslint/no-explicit-any declare const window:any; // eslint-disable-line @typescript-eslint/no-explicit-any
@ -30,9 +29,9 @@ class JitsiFactory {
private audioCallback = this.onAudioChange.bind(this); private audioCallback = this.onAudioChange.bind(this);
private videoCallback = this.onVideoChange.bind(this); private videoCallback = this.onVideoChange.bind(this);
public start(roomName: string, playerName:string, jwt?: string): void { public start(jitsiUrl: string, roomName: string, playerName:string, jwt?: string): void {
coWebsiteManager.insertCoWebsite((cowebsiteDiv => { coWebsiteManager.insertCoWebsite((cowebsiteDiv => {
const domain = JITSI_URL; const domain = jitsiUrl;
const options: any = { // eslint-disable-line @typescript-eslint/no-explicit-any const options: any = { // eslint-disable-line @typescript-eslint/no-explicit-any
roomName: roomName, roomName: roomName,
jwt: jwt, jwt: jwt,
@ -90,4 +89,4 @@ class JitsiFactory {
} }
export const jitsiFactory = new JitsiFactory(); export const jitsiFactory = new JitsiFactory();