👍️[Update] Model : Overlayのスケールがループする問題を修正
This commit is contained in:
@@ -82,9 +82,12 @@ class Model:
|
|||||||
self.previous_receive_message = ""
|
self.previous_receive_message = ""
|
||||||
self.translator = Translator()
|
self.translator = Translator()
|
||||||
self.keyword_processor = KeywordProcessor()
|
self.keyword_processor = KeywordProcessor()
|
||||||
|
overlay_small_log_settings = copy.deepcopy(config.OVERLAY_SMALL_LOG_SETTINGS)
|
||||||
|
overlay_large_log_settings = copy.deepcopy(config.OVERLAY_LARGE_LOG_SETTINGS)
|
||||||
|
overlay_large_log_settings["ui_scaling"] = overlay_large_log_settings["ui_scaling"] * 0.25
|
||||||
overlay_settings = {
|
overlay_settings = {
|
||||||
"small": config.OVERLAY_SMALL_LOG_SETTINGS,
|
"small": overlay_small_log_settings,
|
||||||
"large": config.OVERLAY_LARGE_LOG_SETTINGS,
|
"large": overlay_large_log_settings,
|
||||||
}
|
}
|
||||||
self.overlay = Overlay(overlay_settings)
|
self.overlay = Overlay(overlay_settings)
|
||||||
self.overlay_image = OverlayImage()
|
self.overlay_image = OverlayImage()
|
||||||
@@ -746,7 +749,7 @@ class Model:
|
|||||||
self.overlay.updateDisplayDuration(config.OVERLAY_LARGE_LOG_SETTINGS["display_duration"], size)
|
self.overlay.updateDisplayDuration(config.OVERLAY_LARGE_LOG_SETTINGS["display_duration"], size)
|
||||||
self.overlay.updateFadeoutDuration(config.OVERLAY_LARGE_LOG_SETTINGS["fadeout_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.updateOpacity(config.OVERLAY_LARGE_LOG_SETTINGS["opacity"], size, True)
|
||||||
self.overlay.updateUiScaling(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"], size)
|
self.overlay.updateUiScaling(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"] * 0.25, size)
|
||||||
|
|
||||||
def startOverlay(self):
|
def startOverlay(self):
|
||||||
self.overlay.startOverlay()
|
self.overlay.startOverlay()
|
||||||
|
|||||||
@@ -160,10 +160,7 @@ class Overlay:
|
|||||||
def updateUiScaling(self, ui_scaling, size):
|
def updateUiScaling(self, ui_scaling, size):
|
||||||
self.settings[size]["ui_scaling"] = ui_scaling
|
self.settings[size]["ui_scaling"] = ui_scaling
|
||||||
if self.initialized is True:
|
if self.initialized is True:
|
||||||
if size == "large":
|
self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"])
|
||||||
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):
|
def updatePosition(self, x_pos, y_pos, z_pos, x_rotation, y_rotation, z_rotation, tracker, size):
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user