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

[bugfix] ttfファイルのバスを修正

Browse Source
This commit is contained in:
misyaguziya
2025-06-15 15:54:41 +09:00
parent d454c9b13a
commit acae7644eb
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src-python/model.py
View File

@@ -96,7 +96,7 @@ class Model:
"large": 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(config.PATH_LOCAL)
self.mic_audio_queue = None self.mic_audio_queue = None
self.mic_mute_status = None self.mic_mute_status = None
self.kks = kakasi() self.kks = kakasi()
@@ -725,13 +725,13 @@ class Model:
def createOverlayImageSmallMessage(self, message): def createOverlayImageSmallMessage(self, message):
ui_language = config.UI_LANGUAGE ui_language = config.UI_LANGUAGE
convert_languages = { convert_languages = {
"en": "Japanese", "en": "Default",
"jp": "Japanese", "jp": "Japanese",
"ko":"Korean", "ko":"Korean",
"zh-Hans":"Chinese Simplified", "zh-Hans":"Chinese Simplified",
"zh-Hant":"Chinese Traditional", "zh-Hant":"Chinese Traditional",
} }
language = convert_languages.get(ui_language, "Japanese") language = convert_languages.get(ui_language, "Default")
return self.overlay_image.createOverlayImageSmallLog(message, language) return self.overlay_image.createOverlayImageSmallLog(message, language)
def clearOverlayImageSmallLog(self): def clearOverlayImageSmallLog(self):
@@ -777,14 +777,14 @@ class Model:
def createOverlayImageLargeMessage(self, message): def createOverlayImageLargeMessage(self, message):
ui_language = config.UI_LANGUAGE ui_language = config.UI_LANGUAGE
convert_languages = { convert_languages = {
"en": "Japanese", "en": "Default",
"jp": "Japanese", "jp": "Japanese",
"ko":"Korean", "ko":"Korean",
"zh-Hans":"Chinese Simplified", "zh-Hans":"Chinese Simplified",
"zh-Hant":"Chinese Traditional", "zh-Hant":"Chinese Traditional",
} }
language = convert_languages.get(ui_language, "Japanese") language = convert_languages.get(ui_language, "Default")
overlay_image = OverlayImage() overlay_image = OverlayImage(config.PATH_LOCAL)
for _ in range(2): for _ in range(2):
overlay_image.createOverlayImageLargeLog("send", message, language) overlay_image.createOverlayImageLargeLog("send", message, language)

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

@@ -11,14 +11,20 @@ except ImportError:
class OverlayImage: class OverlayImage:
LANGUAGES = { LANGUAGES = {
"Japanese": "NotoSansJP-Regular", "Default": "NotoSansJP-Regular.ttf",
"Korean": "NotoSansKR-Regular", "Japanese": "NotoSansJP-Regular.ttf",
"Chinese Simplified": "NotoSansSC-Regular", "Korean": "NotoSansKR-Regular.ttf",
"Chinese Traditional": "NotoSansTC-Regular", "Chinese Simplified": "NotoSansSC-Regular.ttf",
"Chinese Traditional": "NotoSansTC-Regular.ttf",
} }
def __init__(self): def __init__(self, root_path: str=None):
self.message_log = [] self.message_log = []
if root_path is None:
self.root_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts")
else:
self.root_path = os_path.join(root_path, "_internal", "fonts")
print(self.root_path)
@staticmethod @staticmethod
def concatenateImagesVertically(img1: Image, img2: Image, margin: int = 0) -> Image: def concatenateImagesVertically(img1: Image, img2: Image, margin: int = 0) -> Image:
@@ -54,16 +60,16 @@ class OverlayImage:
return colors return colors
def createTextboxSmallLog(self, text:str, language:str, text_color:tuple, base_width:int, base_height:int, font_size:int) -> Image: def createTextboxSmallLog(self, text:str, language:str, text_color:tuple, base_width:int, base_height:int, font_size:int) -> Image:
font_family = self.LANGUAGES.get(language, "NotoSansJP-Regular") font_family = self.LANGUAGES.get(language, self.LANGUAGES["Default"])
img = Image.new("RGBA", (base_width, base_height), (0, 0, 0, 0)) img = Image.new("RGBA", (base_width, base_height), (0, 0, 0, 0))
draw = ImageDraw.Draw(img) draw = ImageDraw.Draw(img)
try: try:
font_path = os_path.join(os_path.dirname(os_path.dirname(os_path.dirname(__file__))), "fonts", f"{font_family}.ttf") font_path = os_path.join(self.root_path, font_family)
font = ImageFont.truetype(font_path, font_size) font = ImageFont.truetype(font_path, font_size)
except Exception: except Exception:
errorLogging() errorLogging()
font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", f"{font_family}.ttf") font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", font_family)
font = ImageFont.truetype(font_path, font_size) font = ImageFont.truetype(font_path, font_size)
text_width = draw.textlength(text, font) text_width = draw.textlength(text, font)
@@ -98,7 +104,9 @@ class OverlayImage:
draw = ImageDraw.Draw(background) draw = ImageDraw.Draw(background)
draw.rounded_rectangle([(0, 0), img.size], radius=50, fill=background_color, outline=background_outline_color, width=5) draw.rounded_rectangle([(0, 0), img.size], radius=50, fill=background_color, outline=background_outline_color, width=5)
return Image.alpha_composite(background, img) img = Image.alpha_composite(background, img)
img.save("overlay_small.png")
return img
@staticmethod @staticmethod
def getUiSizeLargeLog() -> dict: def getUiSizeLargeLog() -> dict:
@@ -131,17 +139,17 @@ class OverlayImage:
anchor = "lm" if message_type == "receive" else "rm" anchor = "lm" if message_type == "receive" else "rm"
text_x = 0 if message_type == "receive" else ui_size["width"] text_x = 0 if message_type == "receive" else ui_size["width"]
align = "left" if message_type == "receive" else "right" align = "left" if message_type == "receive" else "right"
font_family = self.LANGUAGES.get(language, "NotoSansJP-Regular") font_family = self.LANGUAGES.get(language, self.LANGUAGES["Default"])
img = Image.new("RGBA", (0, 0), (0, 0, 0, 0)) img = Image.new("RGBA", (0, 0), (0, 0, 0, 0))
draw = ImageDraw.Draw(img) draw = ImageDraw.Draw(img)
try: try:
font_path = os_path.join(os_path.dirname(os_path.dirname(os_path.dirname(__file__))), "fonts", f"{font_family}.ttf") font_path = os_path.join(self.root_path, font_family)
font = ImageFont.truetype(font_path, font_size) font = ImageFont.truetype(font_path, font_size)
except Exception: except Exception:
errorLogging() errorLogging()
font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", f"{font_family}.ttf") font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", font_family)
font = ImageFont.truetype(font_path, font_size) font = ImageFont.truetype(font_path, font_size)
text_width = draw.textlength(text, font) text_width = draw.textlength(text, font)
@@ -172,11 +180,11 @@ class OverlayImage:
draw = ImageDraw.Draw(img) draw = ImageDraw.Draw(img)
try: try:
font_path = os_path.join(os_path.dirname(os_path.dirname(os_path.dirname(__file__))), "fonts", "NotoSansJP-Regular.ttf") font_path = os_path.join(self.root_path, self.LANGUAGES["Default"])
font = ImageFont.truetype(font_path, font_size) font = ImageFont.truetype(font_path, font_size)
except Exception: except Exception:
errorLogging() errorLogging()
font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", "NotoSansJP-Regular.ttf") font_path = os_path.join(os_path.dirname(__file__), "..", "..", "..", "fonts", self.LANGUAGES["Default"])
font = ImageFont.truetype(font_path, font_size) font = ImageFont.truetype(font_path, font_size)
text_height = font_size + ui_padding text_height = font_size + ui_padding
@@ -242,7 +250,9 @@ class OverlayImage:
background = Image.new("RGBA", (width, height), (0, 0, 0, 0)) background = Image.new("RGBA", (width, height), (0, 0, 0, 0))
draw = ImageDraw.Draw(background) draw = ImageDraw.Draw(background)
draw.rounded_rectangle([(0, 0), (width, height)], radius=ui_radius, fill=background_color, outline=background_outline_color, width=5) draw.rounded_rectangle([(0, 0), (width, height)], radius=ui_radius, fill=background_color, outline=background_outline_color, width=5)
return Image.alpha_composite(background, img) img = Image.alpha_composite(background, img)
img.save("overlay_large.png")
return img
if __name__ == "__main__": if __name__ == "__main__":
overlay = OverlayImage() overlay = OverlayImage()