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

🐛[bugfix] Model : overlayのバグを修正

Browse Source 
fontのバスを修正
翻訳の変数の型がstr -> listに変更になったため、修正
This commit is contained in:
misyaguziya
2024-11-16 02:41:23 +09:00
parent ea12cbc083
commit 59f544396c
3 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src-python/models/overlay/overlay.py
View File

@@ -92,7 +92,6 @@ class Overlay:
for i, size in enumerate(self.settings.keys()):
self.handle[size] = self.overlay.createOverlay(f"VRCT{i}", f"VRCT{i}")
self.overlay.showOverlay(self.handle[size])
self.initialized = True
for size in self.settings.keys():
self.updateImage(Image.new("RGBA", (1, 1), (0, 0, 0, 0)), size)
@@ -109,6 +108,7 @@ class Overlay:
self.settings[size]["tracker"],
size
)
self.initialized = True
except Exception as e:
printLog("error:Could not initialise OpenVR", e)
@@ -248,9 +248,10 @@ class Overlay:
self.mainloop()
def startOverlay(self):
self.thread_overlay = Thread(target=self.main)
self.thread_overlay.daemon = True
self.thread_overlay.start()
if self.checkSteamvrRunning() and self.initialized is False:
self.thread_overlay = Thread(target=self.main)
self.thread_overlay.daemon = True
self.thread_overlay.start()
def shutdownOverlay(self):
if isinstance(self.thread_overlay, Thread):
@@ -315,7 +316,9 @@ if __name__ == "__main__":
overlay_image = OverlayImage()
overlay = Overlay(settings_dict)
overlay.startOverlay()
time.sleep(1)
while overlay.initialized is False:
time.sleep(1)
# Example usage
img = overlay_image.createOverlayImageLargeLog("send", "こんにちは、世界！さようなら", "Japanese", "Hello,World!Goodbye", "Japanese")

12
src-python/models/overlay/overlay_image.py
View File

@@ -51,10 +51,12 @@ class OverlayImage:
font_family = self.LANGUAGES.get(language, "NotoSansJP-Regular")
img = Image.new("RGBA", (base_width, base_height), (0, 0, 0, 0))
draw = ImageDraw.Draw(img)
font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", f"{font_family}.ttf")
try:
font_path = os_path.join(os_path.dirname(os_path.dirname(os_path.dirname(__file__))), "fonts", f"{font_family}.ttf")
font = ImageFont.truetype(font_path, font_size)
except Exception:
font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", f"{font_family}.ttf")
font = ImageFont.truetype(font_path, font_size)
text_width = draw.textlength(text, font)
@@ -126,10 +128,12 @@ class OverlayImage:
img = Image.new("RGBA", (0, 0), (0, 0, 0, 0))
draw = ImageDraw.Draw(img)
font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", f"{font_family}.ttf")
try:
font_path = os_path.join(os_path.dirname(os_path.dirname(os_path.dirname(__file__))), "fonts", f"{font_family}.ttf")
font = ImageFont.truetype(font_path, font_size)
except Exception:
font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", f"{font_family}.ttf")
font = ImageFont.truetype(font_path, font_size)
text_width = draw.textlength(text, font)
@@ -158,10 +162,12 @@ class OverlayImage:
img = Image.new("RGBA", (0, 0), (0, 0, 0, 0))
draw = ImageDraw.Draw(img)
font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", "NotoSansJP-Regular.ttf")
try:
font_path = os_path.join(os_path.dirname(os_path.dirname(os_path.dirname(__file__))), "fonts", "NotoSansJP-Regular.ttf")
font = ImageFont.truetype(font_path, font_size)
except Exception:
font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", "NotoSansJP-Regular.ttf")
font = ImageFont.truetype(font_path, font_size)
text_height = font_size + ui_padding