diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index db3afd14..20eded64 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -317,7 +317,7 @@ export class GameScene extends ResizableScene implements CenterListener {
// Let's alter browser history
let path = this.room.id;
if (this.room.hash) {
- path += '#'+this.room.hash;
+ path += '#' + this.room.hash;
}
window.history.pushState({}, 'WorkAdventure', path);
@@ -906,6 +906,7 @@ export class GameScene extends ResizableScene implements CenterListener {
* @param delta The delta time in ms since the last frame. This is a smoothed and capped value based on the FPS rate.
*/
update(time: number, delta: number) : void {
+ mediaManager.setLastUpdateScene();
this.currentTick = time;
this.CurrentPlayer.moveUser(delta);
diff --git a/front/src/WebRtc/MediaManager.ts b/front/src/WebRtc/MediaManager.ts
index d3d7abce..943e13c2 100644
--- a/front/src/WebRtc/MediaManager.ts
+++ b/front/src/WebRtc/MediaManager.ts
@@ -40,6 +40,12 @@ export class MediaManager {
private cinemaBtn: HTMLDivElement;
private monitorBtn: HTMLDivElement;
+ private previousConstraint : MediaStreamConstraints;
+ private focused : boolean = true;
+
+ private lastUpdateScene : Date = new Date();
+ private setTimeOutlastUpdateScene? : NodeJS.Timeout;
+
private discussionManager: DiscussionManager;
private userInputManager?: UserInputManager;
@@ -100,9 +106,35 @@ export class MediaManager {
//update tracking
});
+ this.previousConstraint = JSON.parse(JSON.stringify(this.constraintsMedia));
+ this.pingCameraStatus();
+
+ this.checkActiveUser();
+
this.discussionManager = new DiscussionManager(this,'');
}
+ public setLastUpdateScene(){
+ this.lastUpdateScene = new Date();
+ }
+
+ public blurCamera() {
+ if(!this.focused){
+ return;
+ }
+ this.focused = false;
+ this.previousConstraint = JSON.parse(JSON.stringify(this.constraintsMedia));
+ this.disableCamera();
+ }
+
+ public focusCamera() {
+ if(this.focused){
+ return;
+ }
+ this.focused = true;
+ this.applyPreviousConfig();
+ }
+
public onUpdateLocalStream(callback: UpdatedLocalStreamCallback): void {
this.updatedLocalStreamCallBacks.add(callback);
}
@@ -160,12 +192,7 @@ export class MediaManager {
}
public enableCamera() {
- if(!this.hasCamera){
- return;
- }
- this.cinemaClose.style.display = "none";
- this.cinemaBtn.classList.remove("disabled");
- this.cinema.style.display = "block";
+ this.enableCameraStyle();
this.constraintsMedia.video = videoConstraint;
this.getCamera().then((stream: MediaStream) => {
this.triggerUpdatedLocalStreamCallbacks(stream);
@@ -173,7 +200,8 @@ export class MediaManager {
}
public async disableCamera() {
- this.disabledCameraView();
+ this.disableCameraStyle();
+
if (this.constraintsMedia.audio !== false) {
const stream = await this.getCamera();
this.triggerUpdatedLocalStreamCallbacks(stream);
@@ -182,19 +210,8 @@ export class MediaManager {
}
}
- private disabledCameraView(){
- this.cinemaClose.style.display = "block";
- this.cinema.style.display = "none";
- this.cinemaBtn.classList.add("disabled");
- this.constraintsMedia.video = false;
- this.myCamVideo.srcObject = null;
- this.stopCamera();
- }
-
public enableMicrophone() {
- this.microphoneClose.style.display = "none";
- this.microphone.style.display = "block";
- this.microphoneBtn.classList.remove("disabled");
+ this.enableMicrophoneStyle();
this.constraintsMedia.audio = true;
this.getCamera().then((stream) => {
@@ -203,10 +220,7 @@ export class MediaManager {
}
public async disableMicrophone() {
- this.microphoneClose.style.display = "block";
- this.microphone.style.display = "none";
- this.microphoneBtn.classList.add("disabled");
- this.constraintsMedia.audio = false;
+ this.disableMicrophoneStyle();
this.stopMicrophone();
if (this.constraintsMedia.video !== false) {
@@ -217,6 +231,52 @@ export class MediaManager {
}
}
+ private applyPreviousConfig() {
+ this.constraintsMedia = this.previousConstraint;
+ if(!this.constraintsMedia.video){
+ this.disableCameraStyle();
+ }else{
+ this.enableCameraStyle();
+ }
+ if(!this.constraintsMedia.audio){
+ this.disableMicrophoneStyle()
+ }else{
+ this.enableMicrophoneStyle()
+ }
+
+ this.getCamera().then((stream: MediaStream) => {
+ this.triggerUpdatedLocalStreamCallbacks(stream);
+ });
+ }
+
+ private enableCameraStyle(){
+ this.cinemaClose.style.display = "none";
+ this.cinemaBtn.classList.remove("disabled");
+ this.cinema.style.display = "block";
+ }
+
+ private disableCameraStyle(){
+ this.cinemaClose.style.display = "block";
+ this.cinema.style.display = "none";
+ this.cinemaBtn.classList.add("disabled");
+ this.constraintsMedia.video = false;
+ this.myCamVideo.srcObject = null;
+ this.stopCamera();
+ }
+
+ private enableMicrophoneStyle(){
+ this.microphoneClose.style.display = "none";
+ this.microphone.style.display = "block";
+ this.microphoneBtn.classList.remove("disabled");
+ }
+
+ private disableMicrophoneStyle(){
+ this.microphoneClose.style.display = "block";
+ this.microphone.style.display = "none";
+ this.microphoneBtn.classList.add("disabled");
+ this.constraintsMedia.audio = false;
+ }
+
private enableScreenSharing() {
this.monitorClose.style.display = "none";
this.monitor.style.display = "block";
@@ -299,7 +359,7 @@ export class MediaManager {
return this.getLocalStream().catch(() => {
console.info('Error get camera, trying with video option at null');
- this.disabledCameraView();
+ this.disableCameraStyle();
return this.getLocalStream().then((stream : MediaStream) => {
this.hasCamera = false;
return stream;
@@ -621,6 +681,17 @@ export class MediaManager {
callback();
}
}
+ /**
+ * For some reasons, the microphone muted icon or the stream is not always up to date.
+ * Here, every 30 seconds, we are "reseting" the streams and sending again the constraints to the other peers via the data channel again (see SimplePeer::pushVideoToRemoteUser)
+ **/
+ private pingCameraStatus(){
+ setTimeout(() => {
+ console.log('ping camera status');
+ this.triggerUpdatedLocalStreamCallbacks(this.localStream);
+ this.pingCameraStatus();
+ }, 30000);
+ }
public addNewMessage(name: string, message: string, isMe: boolean = false){
this.discussionManager.addMessage(name, message, isMe);
@@ -642,6 +713,22 @@ export class MediaManager {
public setUserInputManager(userInputManager : UserInputManager){
this.discussionManager.setUserInputManager(userInputManager);
}
+ //check if user is active
+ private checkActiveUser(){
+ if(this.setTimeOutlastUpdateScene){
+ clearTimeout(this.setTimeOutlastUpdateScene);
+ }
+ this.setTimeOutlastUpdateScene = setTimeout(() => {
+ const now = new Date();
+ //if last update is more of 10 sec
+ if( (now.getTime() - this.lastUpdateScene.getTime()) > 10000) {
+ this.blurCamera();
+ }else{
+ this.focusCamera();
+ }
+ this.checkActiveUser();
+ }, this.focused ? 10000 : 1000);
+ }
}
export const mediaManager = new MediaManager();
diff --git a/maps/characters/tenue_sg_1.png b/maps/characters/tenue_sg_1.png
new file mode 100644
index 00000000..e334340e
Binary files /dev/null and b/maps/characters/tenue_sg_1.png differ
diff --git a/maps/characters/tenue_sg_2.png b/maps/characters/tenue_sg_2.png
new file mode 100644
index 00000000..fe717a46
Binary files /dev/null and b/maps/characters/tenue_sg_2.png differ
diff --git a/website/dist/index.html b/website/dist/index.html
index 1e06204a..df76814d 100644
--- a/website/dist/index.html
+++ b/website/dist/index.html
@@ -10,6 +10,9 @@
gtag('js', new Date());
gtag('config', 'UA-10196481-11');
+ if (window.location.host.endsWith("localhost")){
+ window['ga-disable-UA-10196481-11'] = true;
+ }
-
Your workplace
- You are impatient to discover this new world? Click on "Work online" and meet new people or share this adventure with your colleagues and friends by clicking on "Work in private"
+ Meet your teammates
+
+ WorkAdventure preserves your social interaction while COVID is still out there.
+
+
+ Stay connected with your teamworkers, by creating your own online workspace to work remotely.
+
+
+ Stay connected with your clients by providing a dedicated digital place to organize meetings, workshops.
+
+
+ Stay connected with your future collaborators by organizing online event.
+
@@ -158,7 +171,7 @@
Click the button below to come and say hi!
@@ -166,10 +179,11 @@
- START IN PUBLIC MODE
+ TRY IT NOW !
+ 
+ 
+ 
