every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'overlay' into develop

Browse Source
This commit is contained in:
Sakamoto Shiina
2024-04-28 17:12:51 +09:00
parent 61b7084939 d3bc434d38
commit 55d79ae007
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controller.py
View File

@@ -163,7 +163,7 @@ def receiveSpeakerMessage(message):
if model.overlay.initialized is False: if model.overlay.initialized is False:
model.startOverlay() model.startOverlay()
else:
if config.ENABLE_OVERLAY_SMALL_LOG is True: if config.ENABLE_OVERLAY_SMALL_LOG is True:
overlay_image = model.createOverlayImageShort(message, translation) overlay_image = model.createOverlayImageShort(message, translation)
model.updateOverlay(overlay_image) model.updateOverlay(overlay_image)
@@ -874,6 +874,12 @@ def callbackSetEnableOverlaySmallLog(value):
print("callbackSetEnableOverlaySmallLog", value) print("callbackSetEnableOverlaySmallLog", value)
config.ENABLE_OVERLAY_SMALL_LOG = value config.ENABLE_OVERLAY_SMALL_LOG = value
if config.ENABLE_OVERLAY_SMALL_LOG is True:
pass
else:
if model.overlay.initialized is True:
model.clearOverlayImage()
def callbackSetOverlaySmallLogSettings(value, set_type:str): def callbackSetOverlaySmallLogSettings(value, set_type:str):
print("callbackSetOverlaySmallLogSettings", value, set_type) print("callbackSetOverlaySmallLogSettings", value, set_type)
pre_settings = config.OVERLAY_SMALL_LOG_SETTINGS pre_settings = config.OVERLAY_SMALL_LOG_SETTINGS

6
model.py
View File

@@ -602,6 +602,10 @@ class Model:
# target_language = config.SOURCE_LANGUAGE if message_type == "receive" else config.TARGET_LANGUAGE # target_language = config.SOURCE_LANGUAGE if message_type == "receive" else config.TARGET_LANGUAGE
# return self.overlay_image.create_overlay_image_long(message_type, message, your_language, translation, target_language) # return self.overlay_image.create_overlay_image_long(message_type, message, your_language, translation, target_language)
def clearOverlayImage(self):
if self.overlay.initialized is True:
self.overlay.uiManager.uiClear()
def updateOverlay(self, img): def updateOverlay(self, img):
if self.overlay.initialized is True: if self.overlay.initialized is True:
self.overlay.uiManager.uiUpdate(img) self.overlay.uiManager.uiUpdate(img)
@@ -610,7 +614,7 @@ class Model:
if self.overlay.initialized is False: if self.overlay.initialized is False:
self.overlay.init() self.overlay.init()
if self.overlay.initialized is True: if self.overlay.initialized is True and self.th_overlay is None:
self.th_overlay = Thread(target=self.overlay.startOverlay) self.th_overlay = Thread(target=self.overlay.startOverlay)
self.th_overlay.daemon = True self.th_overlay.daemon = True
self.th_overlay.start() self.th_overlay.start()

5
models/overlay/overlay.py
View File

@@ -106,6 +106,11 @@ class UIManager:
if self.settings['Fade_interval'] != 0: if self.settings['Fade_interval'] != 0:
self.evaluateTransparencyFade(self.lastUpdate, currTime) self.evaluateTransparencyFade(self.lastUpdate, currTime)
def uiClear(self):
self.overlayUI.setImage(Image.new("RGBA", (1, 1), (0, 0, 0, 0)))
self.overlayUI.setTransparency(self.settings['Transparency'])
self.lastUpdate = time.monotonic()
def uiUpdate(self, img): def uiUpdate(self, img):
self.overlayUI.setImage(img) self.overlayUI.setImage(img)
self.overlayUI.setTransparency(self.settings['Transparency']) self.overlayUI.setTransparency(self.settings['Transparency'])