diff --git a/clean.py b/clean.py new file mode 100644 index 00000000..93084e62 --- /dev/null +++ b/clean.py @@ -0,0 +1,6 @@ +import shutil + +shutil.rmtree('build', ignore_errors=True) +shutil.rmtree('dist', ignore_errors=True) +shutil.rmtree('src-tauri\\bin', ignore_errors=True) +shutil.rmtree('src-tauri\\target', ignore_errors=True) \ No newline at end of file diff --git a/locales/en.yml b/locales/en.yml index 73ba1ed0..2879e404 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -239,6 +239,7 @@ config_page: label: Show Only Translated Messages others: + section_label_sounds: Sounds auto_clear_the_message_box: label: Auto Clear The Message Box send_only_translated_messages: @@ -254,6 +255,8 @@ config_page: send_message_to_vrc: label: Send Message To VRChat desc: There is a way to use it without sending messages to VRChat, but it is not supported. Enable this feature when you intend to send a message to VRChat. + notification_vrc_sfx: + label: Enable Notification Sound When Sending Chat send_received_message_to_vrc: label: Send Received Message To VRChat desc: Send the message you received from the speaker's sound to VRChat's chatbox. diff --git a/locales/ja.yml b/locales/ja.yml index 1218ef08..4603d81e 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -237,6 +237,7 @@ config_page: label: 翻訳後のメッセージのみ表示する others: + section_label_sounds: サウンド auto_clear_the_message_box: label: 送信後はチャットボックスを空にする send_only_translated_messages: @@ -252,6 +253,8 @@ config_page: send_message_to_vrc: label: VRChatにメッセージを送信する desc: サポート対象外ですが、VRChatにメッセージを送信せずに使う方法があります。送信したい場合、この機能を有効にする事を忘れないでください。 + notification_vrc_sfx: + label: チャット送信時に音を鳴らさない send_received_message_to_vrc: label: 受信したメッセージをVRChatに送信する desc: スピーカーから聞き取り、文字起こしされたメッセージをVRChatに送信します。 diff --git a/package.json b/package.json index 5cbeaae6..48ee7f7e 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,12 @@ "vite-preview": "vite preview", "tauri": "tauri", "tauri-dev": "tauri dev", + "clean": "python clean.py", "dev": "npm run build-python && npm run dev-ui", "dev-cuda": "npm run build-python-cuda && npm run dev-ui", "dev-ui": "npm-run-all --parallel vite tauri-dev", - "build": "npm run build-python && npm run vite-build && npm run tauri build", - "build-cuda": "npm run build-python-cuda && npm run vite-build && npm run tauri build", + "build": "npm run clean && npm run build-python && npm run vite-build && npm run tauri build", + "build-cuda": "npm run clean && npm run build-python-cuda && npm run vite-build && npm run tauri build", "release": "npm run build && python zip.py --zip_name VRCT.zip", "release-cuda": "npm run build-cuda && python zip.py --zip_name VRCT_cuda.zip", "release-all": "npm run release && npm run release-cuda" diff --git a/src-python/config.py b/src-python/config.py index 6b8433d1..05575a8e 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -931,9 +931,20 @@ class Config: self._VRC_MIC_MUTE_SYNC = value self.saveConfig(inspect.currentframe().f_code.co_name, value) + @property + @json_serializable('NOTIFICATION_VRC_SFX') + def NOTIFICATION_VRC_SFX(self): + return self._NOTIFICATION_VRC_SFX + + @NOTIFICATION_VRC_SFX.setter + def NOTIFICATION_VRC_SFX(self, value): + if isinstance(value, bool): + self._NOTIFICATION_VRC_SFX = value + self.saveConfig(inspect.currentframe().f_code.co_name, value) + def init_config(self): # Read Only - self._VERSION = "3.0.2" + self._VERSION = "3.0.3" if getattr(sys, 'frozen', False): self._PATH_LOCAL = os_path.dirname(sys.executable) else: @@ -1114,6 +1125,7 @@ class Config: self._SEND_RECEIVED_MESSAGE_TO_VRC = False self._LOGGER_FEATURE = False self._VRC_MIC_MUTE_SYNC = False + self._NOTIFICATION_VRC_SFX = True def load_config(self): if os_path.isfile(self.PATH_CONFIG) is not False: diff --git a/src-python/controller.py b/src-python/controller.py index bd193ff0..bb94bf26 100644 --- a/src-python/controller.py +++ b/src-python/controller.py @@ -1099,6 +1099,20 @@ class Controller: model.setOscPort(config.OSC_PORT) return {"status":200, "result":config.OSC_PORT} + @staticmethod + def getNotificationVrcSfx(*args, **kwargs) -> dict: + return {"status":200, "result":config.NOTIFICATION_VRC_SFX} + + @staticmethod + def setEnableNotificationVrcSfx(*args, **kwargs) -> dict: + config.NOTIFICATION_VRC_SFX = True + return {"status":200, "result":config.NOTIFICATION_VRC_SFX} + + @staticmethod + def setDisableNotificationVrcSfx(*args, **kwargs) -> dict: + config.NOTIFICATION_VRC_SFX = False + return {"status":200, "result":config.NOTIFICATION_VRC_SFX} + @staticmethod def getDeepLAuthKey(*args, **kwargs) -> dict: return {"status":200, "result":config.AUTH_KEYS["DeepL_API"]} diff --git a/src-python/mainloop.py b/src-python/mainloop.py index e2dabbfc..cd50a503 100644 --- a/src-python/mainloop.py +++ b/src-python/mainloop.py @@ -295,6 +295,10 @@ mapping = { "/get/data/osc_port": {"status": True, "variable":controller.getOscPort}, "/set/data/osc_port": {"status": True, "variable":controller.setOscPort}, + "/get/data/notification_vrc_sfx": {"status": True, "variable":controller.getNotificationVrcSfx}, + "/set/enable/notification_vrc_sfx": {"status": True, "variable":controller.setEnableNotificationVrcSfx}, + "/set/disable/notification_vrc_sfx": {"status": True, "variable":controller.setDisableNotificationVrcSfx}, + "/run/open_filepath_config_file": {"status": True, "variable":controller.openFilepathConfigFile}, # "/run/start_watchdog": {"status": True, "variable":controller.startWatchdog}, diff --git a/src-python/model.py b/src-python/model.py index b6a416b4..f393314d 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -289,8 +289,8 @@ class Model: def oscStopSendTyping(self): self.osc_handler.sendTyping(flag=False) - def oscSendMessage(self, message, notification=True): - self.osc_handler.sendMessage(message=message, notification=notification) + def oscSendMessage(self, message:str): + self.osc_handler.sendMessage(message=message, notification=config.NOTIFICATION_VRC_SFX) def getMuteSelfStatus(self): return self.osc_handler.getOSCParameterMuteSelf() diff --git a/src-python/models/overlay/overlay.py b/src-python/models/overlay/overlay.py index 71df4c98..92c24ab9 100644 --- a/src-python/models/overlay/overlay.py +++ b/src-python/models/overlay/overlay.py @@ -128,11 +128,14 @@ class Overlay: try: self.overlay.setOverlayRaw(self.handle[size], img, width, height, 4) except Exception: - errorLogging() self.reStartOverlay() while self.initialized is False: time.sleep(0.1) - self.overlay.setOverlayRaw(self.handle[size], img, width, height, 4) + try: + self.overlay.setOverlayRaw(self.handle[size], img, width, height, 4) + except Exception: + errorLogging() + self.updateOpacity(self.settings[size]["opacity"], size) self.lastUpdate[size] = time.monotonic() @@ -198,11 +201,12 @@ class Overlay: transform = utils.transform_matrix(base_matrix, translation, rotation) transform = mat34Id(transform) - self.overlay.setOverlayTransformTrackedDeviceRelative( - self.handle[size], - trackerIndex, - transform - ) + if bool(self.overlay_system.isTrackedDeviceConnected(trackerIndex)) is True: + self.overlay.setOverlayTransformTrackedDeviceRelative( + self.handle[size], + trackerIndex, + transform + ) def updateDisplayDuration(self, display_duration, size): self.settings[size]["display_duration"] = display_duration diff --git a/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx b/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx index f1e9a251..25fa5495 100644 --- a/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx @@ -9,6 +9,7 @@ import { useEnableVrcMicMuteSync, useEnableSendMessageToVrc, useEnableSendReceivedMessageToVrc, + useEnableNotificationVrcSfx, } from "@logics_configs"; import { @@ -25,6 +26,8 @@ import { Checkbox } from "@common_components"; import OpenFolderSvg from "@images/open_folder.svg?react"; export const Others = () => { + const { t } = useTranslation(); + return (
@@ -34,6 +37,10 @@ export const Others = () => {
+
+ + +
@@ -118,6 +125,19 @@ const SendMessageToVrcContainer = () => { }; +const EnableNotificationVrcSfxContainer = () => { + const { t } = useTranslation(); + const { currentEnableNotificationVrcSfx, toggleEnableNotificationVrcSfx } = useEnableNotificationVrcSfx(); + + return ( + + ); +}; + const SendReceivedMessageToVrcContainer = () => { const { t } = useTranslation(); const { currentEnableSendReceivedMessageToVrc, toggleEnableSendReceivedMessageToVrc } = useEnableSendReceivedMessageToVrc(); diff --git a/src-ui/logics/configs/index.js b/src-ui/logics/configs/index.js index e47621c2..22439030 100644 --- a/src-ui/logics/configs/index.js +++ b/src-ui/logics/configs/index.js @@ -22,6 +22,7 @@ export { useEnableSendMessageToVrc } from "./others/useEnableSendMessageToVrc"; export { useEnableSendReceivedMessageToVrc } from "./others/useEnableSendReceivedMessageToVrc"; export { useEnableSendOnlyTranslatedMessages } from "./others/useEnableSendOnlyTranslatedMessages"; export { useEnableVrcMicMuteSync } from "./others/useEnableVrcMicMuteSync"; +export { useEnableNotificationVrcSfx } from "./others/useEnableNotificationVrcSfx"; export { useMicRecordTimeout } from "./transcription/useMicRecordTimeout"; export { useMicPhraseTimeout } from "./transcription/useMicPhraseTimeout"; diff --git a/src-ui/logics/configs/others/useEnableNotificationVrcSfx.js b/src-ui/logics/configs/others/useEnableNotificationVrcSfx.js new file mode 100644 index 00000000..24e1096a --- /dev/null +++ b/src-ui/logics/configs/others/useEnableNotificationVrcSfx.js @@ -0,0 +1,28 @@ +import { useStore_EnableNotificationVrcSfx } from "@store"; +import { useStdoutToPython } from "@logics/useStdoutToPython"; + +export const useEnableNotificationVrcSfx = () => { + const { asyncStdoutToPython } = useStdoutToPython(); + const { currentEnableNotificationVrcSfx, updateEnableNotificationVrcSfx, pendingEnableNotificationVrcSfx } = useStore_EnableNotificationVrcSfx(); + + const getEnableNotificationVrcSfx = () => { + pendingEnableNotificationVrcSfx(); + asyncStdoutToPython("/get/data/notification_vrc_sfx"); + }; + + const toggleEnableNotificationVrcSfx = () => { + pendingEnableNotificationVrcSfx(); + if (currentEnableNotificationVrcSfx.data) { + asyncStdoutToPython("/set/disable/notification_vrc_sfx"); + } else { + asyncStdoutToPython("/set/enable/notification_vrc_sfx"); + } + }; + + return { + currentEnableNotificationVrcSfx, + getEnableNotificationVrcSfx, + toggleEnableNotificationVrcSfx, + updateEnableNotificationVrcSfx, + }; +}; \ No newline at end of file diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index d23f07e5..b3a5c4cd 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -69,6 +69,7 @@ import { useIsEnabledOverlayLargeLog, useOverlayLargeLogSettings, useOverlayShowOnlyTranslatedMessages, + useEnableNotificationVrcSfx, useHotkeys, useOscIpAddress, useOscPort, @@ -170,6 +171,7 @@ export const useReceiveRoutes = () => { const { updateOverlayLargeLogSettings } = useOverlayLargeLogSettings(); const { updateIsEnabledOverlayLargeLog } = useIsEnabledOverlayLargeLog(); const { updateOverlayShowOnlyTranslatedMessages } = useOverlayShowOnlyTranslatedMessages(); + const { updateEnableNotificationVrcSfx } = useEnableNotificationVrcSfx(); const { updateHotkeys } = useHotkeys(); @@ -472,6 +474,10 @@ export const useReceiveRoutes = () => { "/set/enable/send_received_message_to_vrc": updateEnableSendReceivedMessageToVrc, "/set/disable/send_received_message_to_vrc": updateEnableSendReceivedMessageToVrc, + "/get/data/notification_vrc_sfx": updateEnableNotificationVrcSfx, + "/set/enable/notification_vrc_sfx": updateEnableNotificationVrcSfx, + "/set/disable/notification_vrc_sfx": updateEnableNotificationVrcSfx, + // Hotkeys "/get/data/hotkeys": updateHotkeys, "/set/data/hotkeys": updateHotkeys, diff --git a/src-ui/store.js b/src-ui/store.js index 17c74d20..5eb0746f 100644 --- a/src-ui/store.js +++ b/src-ui/store.js @@ -264,6 +264,7 @@ export const { atomInstance: Atom_EnableAutoExportMessageLogs, useHook: useStore export const { atomInstance: Atom_EnableVrcMicMuteSync, useHook: useStore_EnableVrcMicMuteSync } = createAtomWithHook(false, "EnableVrcMicMuteSync"); export const { atomInstance: Atom_EnableSendMessageToVrc, useHook: useStore_EnableSendMessageToVrc } = createAtomWithHook(true, "EnableSendMessageToVrc"); export const { atomInstance: Atom_EnableSendReceivedMessageToVrc, useHook: useStore_EnableSendReceivedMessageToVrc } = createAtomWithHook(false, "EnableSendReceivedMessageToVrc"); +export const { atomInstance: Atom_EnableNotificationVrcSfx, useHook: useStore_EnableNotificationVrcSfx } = createAtomWithHook(true, "EnableNotificationVrcSfx"); // Hotkeys export const { atomInstance: Atom_Hotkeys, useHook: useStore_Hotkeys } = createAtomWithHook({