From 0bf1acfefbf20240c8fb79dbfac8ffdcbecf4c5d Mon Sep 17 00:00:00 2001 From: Alexis Faizeau Date: Wed, 5 Jan 2022 10:27:40 +0100 Subject: [PATCH] Improve game overlay UI --- front/src/Components/App.svelte | 196 +++---------- .../AudioManager/AudioManager.svelte | 7 +- front/src/Components/CameraControls.svelte | 220 +++++++++++--- front/src/Components/Chat/Chat.svelte | 4 +- .../CustomCharacterScene.svelte | 4 +- .../src/Components/EmoteMenu/EmoteMenu.svelte | 6 +- .../EnableCamera/EnableCameraScene.svelte | 4 +- .../Components/FollowMenu/FollowButton.svelte | 33 +++ .../Components/FollowMenu/FollowMenu.svelte | 76 ++--- .../HelpCameraSettingsPopup.svelte | 7 +- .../LayoutActionManager.svelte} | 8 +- front/src/Components/MainLayout.svelte | 163 +++++++++++ .../Components/Menu/AboutRoomSubMenu.svelte | 4 +- .../Menu/GlobalMessagesSubMenu.svelte | 4 +- front/src/Components/Menu/GuestSubMenu.svelte | 4 +- front/src/Components/Menu/Menu.svelte | 18 +- front/src/Components/Menu/MenuIcon.svelte | 63 ++-- .../src/Components/Menu/ProfileSubMenu.svelte | 4 +- .../Components/Menu/SettingsSubMenu.svelte | 24 +- front/src/Components/MyCamera.svelte | 80 ++++- .../Components/ReportMenu/ReportMenu.svelte | 21 +- .../SelectCompanionScene.svelte | 4 +- .../Components/TypeMessage/BanMessage.svelte | 16 +- .../Components/TypeMessage/TextMessage.svelte | 11 +- front/src/Components/UI/ErrorDialog.svelte | 8 +- .../Video/LocalStreamMediaBox.svelte | 22 +- front/src/Components/Video/MediaBox.svelte | 59 +++- .../Video/PresentationLayout.svelte | 26 -- .../Video/ScreenSharingMediaBox.svelte | 23 +- .../src/Components/Video/VideoMediaBox.svelte | 83 ++++-- .../src/Components/Video/VideoOverlay.svelte | 12 +- .../src/Components/VisitCard/VisitCard.svelte | 1 + .../WarningContainer/WarningContainer.svelte | 16 +- front/src/Components/Woka/Woka.svelte | 13 +- .../SelectCharacterScene.svelte | 4 +- front/src/Enum/EnvironmentVariable.ts | 2 - front/src/Phaser/Components/SoundMeter.ts | 2 - front/src/Phaser/Game/GameMapProperties.ts | 1 - front/src/Phaser/Game/GameScene.ts | 67 +++-- front/src/Phaser/Login/CustomizeScene.ts | 6 +- .../src/Phaser/Login/SelectCharacterScene.ts | 6 +- .../src/Phaser/Login/SelectCompanionScene.ts | 4 +- front/src/Phaser/Services/WaScaleManager.ts | 12 +- front/src/Stores/BiggestAvailableAreaStore.ts | 4 +- .../src/Stores/GameOverlayStoreVisibility.ts | 17 -- front/src/Stores/LayoutManagerStore.ts | 2 +- front/src/Stores/MediaStore.ts | 8 +- front/src/Stores/MyCameraStoreVisibility.ts | 8 + front/src/Stores/ScreenSharingStore.ts | 8 +- front/src/Stores/StreamableCollectionStore.ts | 5 +- front/src/WebRtc/HtmlUtils.ts | 5 + front/src/WebRtc/MediaManager.ts | 51 +--- front/src/WebRtc/ScreenSharingPeer.ts | 17 +- front/src/WebRtc/SimplePeer.ts | 2 +- front/src/WebRtc/VideoPeer.ts | 4 +- front/src/index.ts | 8 +- .../style/TextGlobalMessageSvelte-Style.scss | 2 +- front/style/cowebsite-mobile.scss | 136 --------- front/style/fonts.scss | 5 - front/style/fonts/TwemojiMozilla.ttf | Bin 1324332 -> 0 bytes front/style/index.scss | 6 +- front/style/mobile-style.scss | 48 --- front/style/style.scss | 276 ++---------------- 63 files changed, 976 insertions(+), 984 deletions(-) create mode 100644 front/src/Components/FollowMenu/FollowButton.svelte rename front/src/Components/{LayoutManager/LayoutManager.svelte => LayoutActionManager/LayoutActionManager.svelte} (91%) create mode 100644 front/src/Components/MainLayout.svelte delete mode 100644 front/src/Components/Video/PresentationLayout.svelte delete mode 100644 front/src/Stores/GameOverlayStoreVisibility.ts create mode 100644 front/src/Stores/MyCameraStoreVisibility.ts delete mode 100644 front/style/cowebsite-mobile.scss delete mode 100644 front/style/fonts/TwemojiMozilla.ttf delete mode 100644 front/style/mobile-style.scss diff --git a/front/src/Components/App.svelte b/front/src/Components/App.svelte index a1277ed2..620884cf 100644 --- a/front/src/Components/App.svelte +++ b/front/src/Components/App.svelte @@ -1,166 +1,52 @@ -
- {#if $loginSceneVisibleStore} -
- -
- {/if} - {#if $selectCharacterSceneVisibleStore} -
- -
- {/if} - {#if $customCharacterSceneVisibleStore} -
- -
- {/if} - {#if $selectCompanionSceneVisibleStore} -
- -
- {/if} - {#if $enableCameraSceneVisibilityStore} -
- -
- {/if} - {#if $banMessageStore.length > 0} -
- -
- {:else if $textMessageStore.length > 0} -
- -
- {/if} - {#if $soundPlayingStore} -
- -
- {/if} - {#if $audioManagerVisibilityStore} -
- -
- {/if} - {#if $layoutManagerVisibilityStore} -
- -
- {/if} - {#if $showReportScreenStore !== userReportEmpty} -
- -
- {/if} - {#if $followStateStore !== "off" || $peerStore.size > 0} -
- -
- {/if} - {#if $menuIconVisiblilityStore} -
- -
- {/if} - {#if $menuVisiblilityStore} -
- -
- {/if} - {#if $emoteMenuStore} -
- -
- {/if} - {#if $gameOverlayVisibilityStore} -
- - - -
- {/if} - {#if $helpCameraSettingsVisibleStore} -
- -
- {/if} - {#if $showLimitRoomModalStore} -
- -
- {/if} - {#if $showShareLinkMapModalStore} -
- -
- {/if} - {#if $requestVisitCardsStore} - - {/if} - {#if $errorStore.length > 0} -
- -
- {/if} +{#if $errorStore.length > 0} +
+ +
+{:else if $loginSceneVisibleStore} +
+ +
+{:else if $selectCharacterSceneVisibleStore} +
+ +
+{:else if $customCharacterSceneVisibleStore} +
+ +
+{:else if $selectCompanionSceneVisibleStore} +
+ +
+{:else if $enableCameraSceneVisibilityStore} +
+ +
+{:else} + + {#if $chatVisibilityStore} {/if} - {#if $warningContainerStore} - - {/if} -
+{/if} diff --git a/front/src/Components/AudioManager/AudioManager.svelte b/front/src/Components/AudioManager/AudioManager.svelte index 3385d6da..87b949c7 100644 --- a/front/src/Components/AudioManager/AudioManager.svelte +++ b/front/src/Components/AudioManager/AudioManager.svelte @@ -157,13 +157,16 @@ diff --git a/front/src/Components/Chat/Chat.svelte b/front/src/Components/Chat/Chat.svelte index c4756a36..cd9b90b5 100644 --- a/front/src/Components/Chat/Chat.svelte +++ b/front/src/Components/Chat/Chat.svelte @@ -43,7 +43,7 @@