From b8873d127780b92425ee9b6110e0b42ed4405283 Mon Sep 17 00:00:00 2001
From: GRL <g.lesniewski@thecodingmachine.com>
Date: Mon, 31 May 2021 12:06:11 +0200
Subject: [PATCH] selectCompanionScene work with svelte

---
 .../resources/html/CustomCharacterScene.html  |   3 -
 .../resources/html/EnableCameraScene.html     |   3 -
 .../resources/html/SelectCompanionScene.html  | 134 ------------------
 front/dist/resources/html/gameMenu.html       |   3 -
 front/dist/resources/html/gameMenuIcon.html   |   3 -
 .../dist/resources/html/gameQualityMenu.html  |   3 -
 front/dist/resources/html/gameReport.html     |   3 -
 front/dist/resources/html/gameShare.html      |   3 -
 .../resources/html/helpCameraSettings.html    |   3 -
 front/dist/resources/html/loginScene.html     |   3 -
 .../resources/html/selectCharacterScene.html  |   3 -
 .../dist/resources/html/warningContainer.html |   3 -
 front/src/Components/App.svelte               |  10 +-
 front/src/Phaser/Game/GameScene.ts            |   2 +
 .../src/Phaser/Login/SelectCompanionScene.ts  |  65 +++------
 front/src/WebRtc/SimplePeer.ts                |   2 +-
 front/src/index.ts                            |   4 +-
 front/style/fonts.scss                        |   6 +-
 18 files changed, 42 insertions(+), 214 deletions(-)
 delete mode 100644 front/dist/resources/html/SelectCompanionScene.html

diff --git a/front/dist/resources/html/CustomCharacterScene.html b/front/dist/resources/html/CustomCharacterScene.html
index 0bf3f753..9a8aac4d 100644
--- a/front/dist/resources/html/CustomCharacterScene.html
+++ b/front/dist/resources/html/CustomCharacterScene.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #customizeScene {
         background: #0000;
         /*border: 1px solid #ebeeee;*/
diff --git a/front/dist/resources/html/EnableCameraScene.html b/front/dist/resources/html/EnableCameraScene.html
index 2dda6cc1..21c798b5 100644
--- a/front/dist/resources/html/EnableCameraScene.html
+++ b/front/dist/resources/html/EnableCameraScene.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #enableCameraScene {
         background: #000000;
         /*border: 1px solid #ebeeee;*/
diff --git a/front/dist/resources/html/SelectCompanionScene.html b/front/dist/resources/html/SelectCompanionScene.html
deleted file mode 100644
index 30c782cb..00000000
--- a/front/dist/resources/html/SelectCompanionScene.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
-    #selectCompanionScene {
-        background: #0000;
-        /*border: 1px solid #ebeeee;*/
-        border-radius: 6px;
-        margin: 10px auto 0;
-        color: #ebeeee;
-        max-height: 40vh;
-        max-width: 300px;
-        width: 40vw;
-        overflow: hidden;
-    }
-    #selectCompanionScene h1 {
-        background-image: linear-gradient(top, #f1f3f3, #d4dae0);
-        border-bottom: 1px solid #a6abaf;
-        border-radius: 6px 6px 0 0;
-        box-sizing: border-box;
-        color: #727678;
-        display: block;
-        height: 43px;
-        padding-top: 10px;
-        margin: 0;
-        text-align: center;
-        text-shadow: 0 -1px 0 rgba(0,0,0,0.2), 0 1px 0 #fff;
-    }
-    #selectCompanionScene input {
-        font-size: 70%;
-        background: linear-gradient(top, #d6d7d7, #dee0e0);
-        border: 1px solid #a1a3a3;
-        border-radius: 4px;
-        box-shadow: 0 1px #fff;
-        box-sizing: border-box;
-        color: #696969;
-        height: 30px;
-        transition: box-shadow 0.3s;
-        width: 100%;
-        text-align: center;
-    }
-    #selectCompanionScene section {
-        margin: 10px;
-    }
-    #selectCompanionScene section.action {
-        text-align: center;
-        margin: 0;
-        margin-top: 20vh;
-    }
-    #selectCompanionScene button {
-        margin: 10px 4px;
-        background-color: black;;
-        color: #ebeeee;
-        border-radius: 7px;
-        padding-bottom: 4px;
-        width: 100px;
-    }
-    #selectCompanionScene button#selectCompanionSceneFormCancel {
-        background-color: #aca6a600;
-        color: #292929;
-    }
-    #selectCompanionScene section h6,
-    #selectCompanionScene section h5{
-        margin: 1px;
-    }
-    #selectCompanionScene section.text-center{
-        text-align: center;
-    }
-    #selectCompanionScene section a{
-        font-size: 14px;
-        text-decoration: underline;
-        color: #ebeeee;
-    }
-    #selectCompanionScene section a:hover{
-        font-weight: 700;
-    }
-    #selectCompanionScene section p{
-        text-align: left;
-        font-size: 8px;
-        margin: 10px 10px;
-    }
-    #selectCompanionScene section p.err{
-        color: red;
-        text-align: center;
-    }
-    #selectCompanionScene section p.info{
-        display: none;
-        text-align: center;
-    }
-    #selectCompanionScene section input#selectCompanionSceneLink{
-        background-color: #a1a3a3;
-    }
-    #selectCompanionScene section img{
-        width: 160px;
-        margin: 20px 0;
-    }
-    #selectCompanionScene section button.selectCharacterButton{
-        position: absolute;
-        top: 20vh;
-        margin: 0;
-        width: 25px;
-    }
-    #selectCompanionScene section button.selectCharacterButton#selectCharacterButtonLeft{
-        left: 1vw;
-    }
-    #selectCompanionScene section button.selectCharacterButton#selectCharacterButtonRight{
-        right: 1vw;
-    }
-    #selectCompanionScene section button#selectCompanionSceneFormCustomYourOwnSubmit{
-        font-size: 14px;
-        width: auto;
-        margin-top: -2px;
-        background-color: #ffd700;
-        color: black;
-    }
-    @media only screen and (max-width: 800px),
-            only screen and (max-height: 600px) {
-        #selectCompanionScene{
-            overflow-y: scroll;
-        }
-    }
-</style>
-
-<form id="selectCompanionScene" hidden>
-    <section class="text-center">
-        <h5>Select your WOKA</h5>
-        <button class="selectCharacterButton" id="selectCharacterButtonLeft"> < </button>
-        <button class="selectCharacterButton" id="selectCharacterButtonRight"> > </button>
-    </section>
-    <section class="action">
-        <a href="#" id="selectCompanionSceneFormBack">No companion</a>
-        <button type="submit" id="selectCompanionSceneFormSubmit">Continue</button>
-    </section>
-</form>
diff --git a/front/dist/resources/html/gameMenu.html b/front/dist/resources/html/gameMenu.html
index 6abf2753..399cf349 100644
--- a/front/dist/resources/html/gameMenu.html
+++ b/front/dist/resources/html/gameMenu.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #gameMenu main{
         margin-top: 15px;
     }
diff --git a/front/dist/resources/html/gameMenuIcon.html b/front/dist/resources/html/gameMenuIcon.html
index e0a1f782..22fe9867 100644
--- a/front/dist/resources/html/gameMenuIcon.html
+++ b/front/dist/resources/html/gameMenuIcon.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #menuIcon button {
         background-color: black;
         color: white;
diff --git a/front/dist/resources/html/gameQualityMenu.html b/front/dist/resources/html/gameQualityMenu.html
index 09c74dee..babb3f0e 100644
--- a/front/dist/resources/html/gameQualityMenu.html
+++ b/front/dist/resources/html/gameQualityMenu.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #gameQuality {
         background: #eceeee;
         border: 1px solid #42464b;
diff --git a/front/dist/resources/html/gameReport.html b/front/dist/resources/html/gameReport.html
index 9ea16b74..d35ae556 100644
--- a/front/dist/resources/html/gameReport.html
+++ b/front/dist/resources/html/gameReport.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #gameReport {
         background: #eceeee;
         border: 1px solid #42464b;
diff --git a/front/dist/resources/html/gameShare.html b/front/dist/resources/html/gameShare.html
index 00222437..404c8680 100644
--- a/front/dist/resources/html/gameShare.html
+++ b/front/dist/resources/html/gameShare.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #gameShare {
         background: #eceeee;
         border: 1px solid #42464b;
diff --git a/front/dist/resources/html/helpCameraSettings.html b/front/dist/resources/html/helpCameraSettings.html
index ee8e16e2..8c4e63c4 100644
--- a/front/dist/resources/html/helpCameraSettings.html
+++ b/front/dist/resources/html/helpCameraSettings.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #helpCameraSettings {
         background: #eceeee;
         border: 1px solid #42464b;
diff --git a/front/dist/resources/html/loginScene.html b/front/dist/resources/html/loginScene.html
index 38e798e5..9c076693 100644
--- a/front/dist/resources/html/loginScene.html
+++ b/front/dist/resources/html/loginScene.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #loginScene {
         background: #000000;
         /*border: 1px solid #ebeeee;*/
diff --git a/front/dist/resources/html/selectCharacterScene.html b/front/dist/resources/html/selectCharacterScene.html
index c51731df..88c84041 100644
--- a/front/dist/resources/html/selectCharacterScene.html
+++ b/front/dist/resources/html/selectCharacterScene.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #selectCharacterScene {
         background: #0000;
         /*border: 1px solid #ebeeee;*/
diff --git a/front/dist/resources/html/warningContainer.html b/front/dist/resources/html/warningContainer.html
index 4989c49d..832ac4da 100644
--- a/front/dist/resources/html/warningContainer.html
+++ b/front/dist/resources/html/warningContainer.html
@@ -1,7 +1,4 @@
 <style>
-    *{
-        font-family: PixelFont-7,monospace!important;
-    }
     #warningMain {
         border-radius: 5px;
         height: 100px;
diff --git a/front/src/Components/App.svelte b/front/src/Components/App.svelte
index 9b072e8d..f8a2589f 100644
--- a/front/src/Components/App.svelte
+++ b/front/src/Components/App.svelte
@@ -4,14 +4,22 @@
     import {gameOverlayVisibilityStore} from "../Stores/MediaStore";
     import CameraControls from "./CameraControls.svelte";
     import MyCamera from "./MyCamera.svelte";
+    import SelectCompanionScene from "./SelectCompanion/SelectCompanionScene.svelte";
+    import {selectCompanionSceneVisibleStore} from "../Stores/SelectCompanionStore";
+    import {Game} from "../Phaser/Game/Game";
+
+    export let game: Game;
 
 </script>
 
 <div>
-    {#if $gameOverlayVisibilityStore}
+    {#if $selectCompanionSceneVisibleStore}
+        <SelectCompanionScene game={game}></SelectCompanionScene>
+    {/if}
     <!-- {#if $menuIconVisible}
     <MenuIcon  />
     {/if} -->
+    {#if $gameOverlayVisibilityStore}
         <MyCamera></MyCamera>
         <CameraControls></CameraControls>
     {/if}
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 300dc71d..10a038ba 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -966,6 +966,8 @@ ${escapedMessage}
         this.pinchManager?.destroy();
         this.emoteManager.destroy();
 
+        mediaManager.hideGameOverlay();
+
         for(const iframeEvents of this.iframeSubscriptionList){
             iframeEvents.unsubscribe();
         }
diff --git a/front/src/Phaser/Login/SelectCompanionScene.ts b/front/src/Phaser/Login/SelectCompanionScene.ts
index 0e32108a..6efbbaea 100644
--- a/front/src/Phaser/Login/SelectCompanionScene.ts
+++ b/front/src/Phaser/Login/SelectCompanionScene.ts
@@ -10,17 +10,15 @@ import { getAllCompanionResources } from "../Companion/CompanionTexturesLoadingM
 import {touchScreenManager} from "../../Touch/TouchScreenManager";
 import {PinchManager} from "../UserInput/PinchManager";
 import { MenuScene } from "../Menu/MenuScene";
+import {selectCompanionSceneVisibleStore} from "../../Stores/SelectCompanionStore";
 
 export const SelectCompanionSceneName = "SelectCompanionScene";
 
-const selectCompanionSceneKey = 'selectCompanionScene';
-
 export class SelectCompanionScene extends ResizableScene {
     private selectedCompanion!: Phaser.Physics.Arcade.Sprite;
     private companions: Array<Phaser.Physics.Arcade.Sprite> = new Array<Phaser.Physics.Arcade.Sprite>();
     private companionModels: Array<CompanionResourceDescriptionInterface> = [];
 
-    private selectCompanionSceneElement!: Phaser.GameObjects.DOMElement;
     private currentCompanion = 0;
 
     constructor() {
@@ -30,8 +28,6 @@ export class SelectCompanionScene extends ResizableScene {
     }
 
     preload() {
-        this.load.html(selectCompanionSceneKey, 'resources/html/SelectCompanionScene.html');
-
         getAllCompanionResources(this.load).forEach(model => {
             this.companionModels.push(model);
         });
@@ -42,30 +38,14 @@ export class SelectCompanionScene extends ResizableScene {
 
     create() {
 
-        this.selectCompanionSceneElement = this.add.dom(-1000, 0).createFromCache(selectCompanionSceneKey);
-        this.centerXDomElement(this.selectCompanionSceneElement, 300);
-        MenuScene.revealMenusAfterInit(this.selectCompanionSceneElement, selectCompanionSceneKey);
-
-        this.selectCompanionSceneElement.addListener('click');
-        this.selectCompanionSceneElement.on('click',  (event:MouseEvent) => {
-            event.preventDefault();
-            if((event?.target as HTMLInputElement).id === 'selectCharacterButtonLeft') {
-                this.moveToLeft();
-            }else if((event?.target as HTMLInputElement).id === 'selectCharacterButtonRight') {
-                this.moveToRight();
-            }else if((event?.target as HTMLInputElement).id === 'selectCompanionSceneFormSubmit') {
-                this.nextScene();
-            }else if((event?.target as HTMLInputElement).id === 'selectCompanionSceneFormBack') {
-                this._nextScene();
-            }
-        });
+        selectCompanionSceneVisibleStore.set(true);
 
         if (touchScreenManager.supportTouchScreen) {
             new PinchManager(this);
         }
 
         // input events
-        this.input.keyboard.on('keyup-ENTER', this.nextScene.bind(this));
+        this.input.keyboard.on('keyup-ENTER', this.selectCompanion.bind(this));
 
         this.input.keyboard.on('keydown-RIGHT', this.moveToRight.bind(this));
         this.input.keyboard.on('keydown-LEFT', this.moveToLeft.bind(this));
@@ -89,18 +69,19 @@ export class SelectCompanionScene extends ResizableScene {
 
     }
 
-    private nextScene(): void {
+    public selectCompanion(): void {
         localUserStore.setCompanion(this.companionModels[this.currentCompanion].name);
         gameManager.setCompanion(this.companionModels[this.currentCompanion].name);
 
-        this._nextScene();
+        this.closeScene();
     }
 
-    private _nextScene(){
+    public closeScene(){
         // next scene
         this.scene.stop(SelectCompanionSceneName);
         gameManager.tryResumingGame(this, EnableCameraSceneName);
         this.scene.remove(SelectCompanionSceneName);
+        selectCompanionSceneVisibleStore.set(false);
     }
 
     private createCurrentCompanion(): void {
@@ -128,8 +109,6 @@ export class SelectCompanionScene extends ResizableScene {
 
     public onResize(): void {
         this.moveCompanion();
-
-        this.centerXDomElement(this.selectCompanionSceneElement, 300);
     }
 
     private updateSelectedCompanion(): void {
@@ -147,15 +126,7 @@ export class SelectCompanionScene extends ResizableScene {
         this.updateSelectedCompanion();
     }
 
-    private moveToLeft(){
-        if(this.currentCompanion === 0){
-            return;
-        }
-        this.currentCompanion -= 1;
-        this.moveCompanion();
-    }
-
-    private moveToRight(){
+    public moveToRight(){
         if(this.currentCompanion === (this.companions.length - 1)){
             return;
         }
@@ -163,38 +134,46 @@ export class SelectCompanionScene extends ResizableScene {
         this.moveCompanion();
     }
 
-    private defineSetupCompanion(numero: number){
+    public moveToLeft(){
+        if(this.currentCompanion === 0){
+            return;
+        }
+        this.currentCompanion -= 1;
+        this.moveCompanion();
+    }
+
+    private defineSetupCompanion(num: number){
         const deltaX = 30;
         const deltaY = 2;
         let [companionX, companionY] = this.getCompanionPosition();
         let companionVisible = true;
         let companionScale = 1.5;
         let companionOpactity = 1;
-        if( this.currentCompanion !== numero ){
+        if( this.currentCompanion !== num ){
             companionVisible = false;
         }
-        if( numero === (this.currentCompanion + 1) ){
+        if( num === (this.currentCompanion + 1) ){
             companionY -= deltaY;
             companionX += deltaX;
             companionScale = 0.8;
             companionOpactity = 0.6;
             companionVisible = true;
         }
-        if( numero === (this.currentCompanion + 2) ){
+        if( num === (this.currentCompanion + 2) ){
             companionY -= deltaY;
             companionX += (deltaX * 2);
             companionScale = 0.8;
             companionOpactity = 0.6;
             companionVisible = true;
         }
-        if( numero === (this.currentCompanion - 1) ){
+        if( num === (this.currentCompanion - 1) ){
             companionY -= deltaY;
             companionX -= deltaX;
             companionScale = 0.8;
             companionOpactity = 0.6;
             companionVisible = true;
         }
-        if( numero === (this.currentCompanion - 2) ){
+        if( num === (this.currentCompanion - 2) ){
             companionY -= deltaY;
             companionX -= (deltaX * 2);
             companionScale = 0.8;
diff --git a/front/src/WebRtc/SimplePeer.ts b/front/src/WebRtc/SimplePeer.ts
index caec53c5..9193f18b 100644
--- a/front/src/WebRtc/SimplePeer.ts
+++ b/front/src/WebRtc/SimplePeer.ts
@@ -263,7 +263,7 @@ export class SimplePeer {
 
             const userIndex = this.Users.findIndex(user => user.userId === userId);
             if(userIndex < 0){
-                throw 'Couln\'t delete user';
+                throw 'Couldn\'t delete user';
             } else {
                 this.Users.splice(userIndex, 1);
             }
diff --git a/front/src/index.ts b/front/src/index.ts
index f9017c24..bc435ee1 100644
--- a/front/src/index.ts
+++ b/front/src/index.ts
@@ -152,7 +152,9 @@ iframeListener.init();
 
 const app = new App({
     target: HtmlUtils.getElementByIdOrFail('svelte-overlay'),
-    props: { },
+    props: {
+        game: game
+    },
 })
 
 export default app
diff --git a/front/style/fonts.scss b/front/style/fonts.scss
index 5ef9b9b4..748710fa 100644
--- a/front/style/fonts.scss
+++ b/front/style/fonts.scss
@@ -1 +1,5 @@
-@import "~@fontsource/press-start-2p/index.css";
\ No newline at end of file
+@import "~@fontsource/press-start-2p/index.css";
+
+*{
+  font-family: PixelFont-7,monospace;
+}
\ No newline at end of file