Skip to content

Fix follow offset during conference #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xsyann wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix follow offset during conference #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion core/client/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,33 @@ const getSimulationSize = () => {
};
};

const getResizableMeetWidth = () => {
const { WorldScene } = game.scene.keys;
if (WorldScene.viewportMode !== viewportModes.fullscreen && Session.get('screenMode') !== 'unlocked') {
return document.querySelector('.resizableMeet').clientWidth;
}
return 0;
};

const updateFollowOffset = () => {
if (!levelManager.map) return;
const { WorldScene, UIScene } = game.scene.keys;
const parentWidth = getSimulationSize().width;
const elementWidth = getResizableMeetWidth();
const width = parentWidth - elementWidth;
document.querySelector('.simulation').style.setProperty('--game-modules-adaptative-size', `${width}px`);

const offset = (Session.get('screenSide') === 'right') ? -elementWidth / 2 : elementWidth / 2;
const zoomFactor = 1 / WorldScene.cameras.main.zoom;

WorldScene.cameras.main.followOffset.x = offset * zoomFactor;
UIScene.cameras.main.followOffset.x = offset * zoomFactor;

const boundX = (Session.get('screenSide') === 'right') ? 0 : -elementWidth * zoomFactor;
UIScene.cameras.main.setBounds(boundX, 0, levelManager.map.widthInPixels + elementWidth * zoomFactor, levelManager.map.heightInPixels);
WorldScene.cameras.main.setBounds(boundX, 0, levelManager.map.widthInPixels + elementWidth * zoomFactor, levelManager.map.heightInPixels);
};

updateViewport = (scene, mode) => {
if (typeof mode !== 'string') mode = scene.viewportMode;

Expand All @@ -112,7 +139,7 @@ updateViewport = (scene, mode) => {
scene.cameras.main.setViewport(0, 0, width, height);

scene.viewportMode = mode;

updateFollowOffset();
const event = new CustomEvent(eventTypes.onViewportUpdated);
window.dispatchEvent(event);
};
Expand Down Expand Up @@ -351,6 +378,7 @@ export {
setReaction,
textDirectionToVector,
toggleUIInputs,
updateFollowOffset,
vectorToTextDirection,

moduleType,
Expand Down
16 changes: 2 additions & 14 deletions core/client/lemverse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import hotkeys from 'hotkeys-js';
import Phaser from 'phaser';
import audioManager from './audio-manager';
import meetingRoom from './meeting-room';
import { setReaction } from './helpers';
import { setReaction, updateFollowOffset } from './helpers';
import URLOpener from './url-opener';
import { guestAllowed, permissionTypes } from '../lib/misc';
import initSentryClient from './sentry';
Expand Down Expand Up @@ -87,19 +87,7 @@ Template.lemverse.onCreated(function () {
});

window.addEventListener(eventTypes.onElementResized, event => {
const { WorldScene, UIScene } = game.scene.keys;
if (WorldScene.viewportMode !== viewportModes.fullscreen && Session.get('screenMode') !== 'unlocked') {
const parentElement = this.firstNode.querySelector('.simulation');
const parentWidth = parentElement.getBoundingClientRect().width;
const elementWidth = event.detail.borderBoxSize[0].inlineSize;
const width = parentWidth - elementWidth;
this.firstNode.style.setProperty('--game-modules-adaptative-size', `${width}px`);

const offset = (Session.get('screenSide') === 'right') ? -elementWidth / 2 : elementWidth / 2;

WorldScene.cameras.main.followOffset.x = offset;
UIScene.cameras.main.followOffset.x = offset;
}
updateFollowOffset();
});

window.addEventListener(eventTypes.onZoneLeft, event => {
Expand Down
5 changes: 4 additions & 1 deletion core/client/scenes/scene-world.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Phaser from 'phaser';
import networkManager from '../network-manager';
import URLOpener from '../url-opener';

import { clamp, isMobile } from '../helpers';
import { clamp, isMobile, updateFollowOffset } from '../helpers';

const fixedUpdateInterval = 200;
const zoomConfig = Meteor.settings.public.zoom;
Expand Down Expand Up @@ -70,9 +70,12 @@ WorldScene = new Phaser.Class({
document.activeElement.blur();
});

const throttledUpdateFollowOffset = throttle(() => updateFollowOffset(), 100);

// Notes: tilesets with extrusion are required to avoid potential black lines between tiles (see https://github.com/sporadic-labs/tile-extruder)
this.input.on('wheel', (_pointer, _gameObjects, _deltaX, deltaY) => {
this.zoomDelta(deltaY);
throttledUpdateFollowOffset();
});

if (isMobile()) {
Expand Down