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

🐛[bugfix] Model : overlayの不透明度が追従しない問題の対策2

Browse Source
This commit is contained in:
misygauziya
2024-04-25 11:05:53 +09:00
parent d3920e730e
commit 6d93ca0f42
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
model.py
View File

@@ -623,7 +623,6 @@ class Model:
if self.overlay.initialized is True: if self.overlay.initialized is True:
opacity = config.OVERLAY_SETTINGS["opacity"] opacity = config.OVERLAY_SETTINGS["opacity"]
self.overlay.uiManager.setTransparency(opacity) self.overlay.uiManager.setTransparency(opacity)
self.overlay.uiManager.update()
def updateOverlayImageUiScaling(self): def updateOverlayImageUiScaling(self):
if self.overlay.initialized is True: if self.overlay.initialized is True:

10
models/overlay/overlay.py
View File

@@ -98,6 +98,7 @@ class UIManager:
overlay_name, overlay_name,
self.settings, self.settings,
) )
self.fadeRatio = 1
self.lastUpdate = time.monotonic() self.lastUpdate = time.monotonic()
def update(self): def update(self):
@@ -113,11 +114,11 @@ class UIManager:
def evaluateTransparencyFade(self, lastUpdate, currentTime): def evaluateTransparencyFade(self, lastUpdate, currentTime):
if (currentTime - lastUpdate) > self.settings['Fade_time']: if (currentTime - lastUpdate) > self.settings['Fade_time']:
timeThroughInterval = currentTime - lastUpdate - self.settings['Fade_time'] timeThroughInterval = currentTime - lastUpdate - self.settings['Fade_time']
fadeRatio = 1 - timeThroughInterval / self.settings['Fade_interval'] self.fadeRatio = 1 - timeThroughInterval / self.settings['Fade_interval']
if fadeRatio < 0: if self.fadeRatio < 0:
fadeRatio = 0 self.fadeRatio = 0
self.overlayUI.setTransparency(fadeRatio * self.settings['Transparency']) self.overlayUI.setTransparency(self.fadeRatio * self.settings['Transparency'])
def posUpdate(self): def posUpdate(self):
self.overlayUI.updatePosition() self.overlayUI.updatePosition()
@@ -139,6 +140,7 @@ class UIManager:
def setTransparency(self, transparency): def setTransparency(self, transparency):
self.settings["Transparency"] = transparency self.settings["Transparency"] = transparency
self.overlayUI.setTransparency(self.fadeRatio * self.settings['Transparency'])
class Overlay: class Overlay:
def __init__(self, x, y , depth, fade_time, fade_interval, transparency, ui_scaling): def __init__(self, x, y , depth, fade_time, fade_interval, transparency, ui_scaling):