From 21be71da805966098a3b46e0afe3628d14df6e1d Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:01:13 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model=20:=20Ove?= =?UTF-8?q?rlay=E3=81=AEUI=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/model.py | 3 +-- src-python/models/overlay/overlay.py | 17 ++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src-python/model.py b/src-python/model.py index f865c2d8..ab7ca815 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -86,7 +86,6 @@ class Model: "small": config.OVERLAY_SMALL_LOG_SETTINGS, "large": config.OVERLAY_LARGE_LOG_SETTINGS, } - overlay_settings["large"]["ui_scaling"] = copy.copy(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"]*0.25) self.overlay = Overlay(overlay_settings) self.overlay_image = OverlayImage() self.mic_audio_queue = None @@ -747,7 +746,7 @@ class Model: self.overlay.updateDisplayDuration(config.OVERLAY_LARGE_LOG_SETTINGS["display_duration"], size) self.overlay.updateFadeoutDuration(config.OVERLAY_LARGE_LOG_SETTINGS["fadeout_duration"], size) self.overlay.updateOpacity(config.OVERLAY_LARGE_LOG_SETTINGS["opacity"], size, True) - self.overlay.updateUiScaling(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"]*0.25, size) + self.overlay.updateUiScaling(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"], size) def startOverlay(self): self.overlay.startOverlay() diff --git a/src-python/models/overlay/overlay.py b/src-python/models/overlay/overlay.py index b486c77a..655420ca 100644 --- a/src-python/models/overlay/overlay.py +++ b/src-python/models/overlay/overlay.py @@ -47,12 +47,12 @@ def getHMDBaseMatrix(): return arr def getLeftHandBaseMatrix(): - x_pos = 0.0 - y_pos = -0.06 - z_pos = -0.14 - x_rotation = -62.0 - y_rotation = 154.0 - z_rotation = 71.0 + x_pos = 0.1 + y_pos = 0.1 + z_pos = -0.2 + x_rotation = -65.0 + y_rotation = 165.0 + z_rotation = 115.0 arr = getBaseMatrix(x_pos, y_pos, z_pos, x_rotation, y_rotation, z_rotation) return arr @@ -160,7 +160,10 @@ class Overlay: def updateUiScaling(self, ui_scaling, size): self.settings[size]["ui_scaling"] = ui_scaling if self.initialized is True: - self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"]) + if "large" == size: + self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"]*0.25) + else: + self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"]) def updatePosition(self, x_pos, y_pos, z_pos, x_rotation, y_rotation, z_rotation, tracker, size): """