diff --git a/config.py b/config.py index ec4c1dc3..30964d58 100644 --- a/config.py +++ b/config.py @@ -960,7 +960,7 @@ class Config: def init_config(self): # Read Only - self._VERSION = "2.2.5" + self._VERSION = "2.2.6" self._ENABLE_SPEAKER2CHATBOX = False # Speaker2Chatbox self._ENABLE_SPEAKER2CHATBOX_PASS_CONFIRMATION = "VRCT=0YEN" self._PATH_LOCAL = os_path.dirname(sys.argv[0]) diff --git a/img/about_vrct/showcased_worlds/cam.png b/img/about_vrct/showcased_worlds/cam.png new file mode 100644 index 00000000..41339042 Binary files /dev/null and b/img/about_vrct/showcased_worlds/cam.png differ diff --git a/img/about_vrct/showcased_worlds/celestial_blooms.png b/img/about_vrct/showcased_worlds/celestial_blooms.png new file mode 100644 index 00000000..19f23031 Binary files /dev/null and b/img/about_vrct/showcased_worlds/celestial_blooms.png differ diff --git a/img/about_vrct/showcased_worlds/chakachaka_multipurpose_room.png b/img/about_vrct/showcased_worlds/chakachaka_multipurpose_room.png index 4829e2b3..0360e4e4 100644 Binary files a/img/about_vrct/showcased_worlds/chakachaka_multipurpose_room.png and b/img/about_vrct/showcased_worlds/chakachaka_multipurpose_room.png differ diff --git a/img/about_vrct/showcased_worlds/ehon_no_heikousekai.png b/img/about_vrct/showcased_worlds/ehon_no_heikousekai.png new file mode 100644 index 00000000..3cb91ec4 Binary files /dev/null and b/img/about_vrct/showcased_worlds/ehon_no_heikousekai.png differ diff --git a/img/about_vrct/showcased_worlds/japan_street.png b/img/about_vrct/showcased_worlds/japan_street.png new file mode 100644 index 00000000..941a4f05 Binary files /dev/null and b/img/about_vrct/showcased_worlds/japan_street.png differ diff --git a/img/about_vrct/showcased_worlds/kr_jp_exchange.png b/img/about_vrct/showcased_worlds/kr_jp_exchange.png index c92eb13e..44b25835 100644 Binary files a/img/about_vrct/showcased_worlds/kr_jp_exchange.png and b/img/about_vrct/showcased_worlds/kr_jp_exchange.png differ diff --git a/img/about_vrct/showcased_worlds/omoshiro_kotoba_asobi_game.png b/img/about_vrct/showcased_worlds/omoshiro_kotoba_asobi_game.png new file mode 100644 index 00000000..9a6cfbba Binary files /dev/null and b/img/about_vrct/showcased_worlds/omoshiro_kotoba_asobi_game.png differ diff --git a/img/about_vrct/showcased_worlds/parallel_collar.png b/img/about_vrct/showcased_worlds/parallel_collar.png index fae8c770..b2ab89d6 100644 Binary files a/img/about_vrct/showcased_worlds/parallel_collar.png and b/img/about_vrct/showcased_worlds/parallel_collar.png differ diff --git a/img/about_vrct/showcased_worlds/poker_room_elysion.png b/img/about_vrct/showcased_worlds/poker_room_elysion.png new file mode 100644 index 00000000..ae1fd928 Binary files /dev/null and b/img/about_vrct/showcased_worlds/poker_room_elysion.png differ diff --git a/img/about_vrct/showcased_worlds/tyuuniti_kouryuukai.png b/img/about_vrct/showcased_worlds/tyuuniti_kouryuukai.png index ad6c10a7..0d4656d2 100644 Binary files a/img/about_vrct/showcased_worlds/tyuuniti_kouryuukai.png and b/img/about_vrct/showcased_worlds/tyuuniti_kouryuukai.png differ diff --git a/img/about_vrct/showcased_worlds/una_yosh.png b/img/about_vrct/showcased_worlds/una_yosh.png new file mode 100644 index 00000000..da1a6789 Binary files /dev/null and b/img/about_vrct/showcased_worlds/una_yosh.png differ diff --git a/img/about_vrct/special_thanks_members.png b/img/about_vrct/special_thanks_members.png index e3847657..80be4a66 100644 Binary files a/img/about_vrct/special_thanks_members.png and b/img/about_vrct/special_thanks_members.png differ diff --git a/models/overlay/overlay.py b/models/overlay/overlay.py index 35ecc82b..7ebb05bc 100644 --- a/models/overlay/overlay.py +++ b/models/overlay/overlay.py @@ -91,7 +91,7 @@ class Overlay: self.system = openvr.init(openvr.VRApplication_Background) self.overlay = openvr.IVROverlay() self.overlay_system = openvr.IVRSystem() - self.handle = self.overlay.createOverlay("Overlay_Speaker2log", "SOverlay_Speaker2log_UI") + self.handle = self.overlay.createOverlay("Overlay_Speaker2log", "Overlay_Speaker2log_UI") self.overlay.showOverlay(self.handle) self.initialized = True @@ -116,7 +116,16 @@ class Overlay: width, height = img.size img = img.tobytes() img = (ctypes.c_char * len(img)).from_buffer_copy(img) - self.overlay.setOverlayRaw(self.handle, img, width, height, 4) + + try: + self.overlay.setOverlayRaw(self.handle, img, width, height, 4) + except Exception as e: + print("Could not update image", e) + self.initialized = False + self.reStartOverlay() + while self.initialized is False: + time.sleep(0.1) + self.overlay.setOverlayRaw(self.handle, img, width, height, 4) self.updateOpacity(self.settings["opacity"]) self.lastUpdate = time.monotonic() @@ -254,6 +263,10 @@ class Overlay: self.system = None self.initialized = False + def reStartOverlay(self): + self.shutdownOverlay() + self.startOverlay() + @staticmethod def checkSteamvrRunning() -> bool: _proc_name = "vrmonitor.exe" if os.name == "nt" else "vrmonitor" diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py index 751211fc..724ccfa5 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py @@ -1126,7 +1126,7 @@ class _SettingBoxGenerator(): button_fg_color=self.settings.ctm.SB__BUTTON_COLOR, button_enter_color=self.settings.ctm.SB__BUTTON_HOVERED_COLOR, button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR, - button_image_file=self.settings.image_file.ARROW_LEFT.rotate(270), + button_image_file=self.settings.image_file.ARROW_LEFT.rotate(90), button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE, corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS, button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY, @@ -1141,7 +1141,7 @@ class _SettingBoxGenerator(): button_fg_color=self.settings.ctm.SB__BUTTON_COLOR, button_enter_color=self.settings.ctm.SB__BUTTON_HOVERED_COLOR, button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR, - button_image_file=self.settings.image_file.ARROW_LEFT.rotate(90), + button_image_file=self.settings.image_file.ARROW_LEFT.rotate(270), button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE, corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS, button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY, diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/about_vrct_store.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/about_vrct_store.py index bc015b17..f327449c 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/about_vrct_store.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/about_vrct_store.py @@ -19,6 +19,8 @@ poster_showcase_worlds_settings = [ { "image_file_name": "uj_club.png", "x_post_num": "1780791654196388201" }, { "image_file_name": "sushi_stand_guruguru.png", "x_post_num": "1788523302404952218" }, { "image_file_name": "sushi_guru_annex.png", "x_post_num": None }, + { "image_file_name": "una_yosh.png", "x_post_num": "1820329216598311065" }, + { "image_file_name": "cam.png", "x_post_num": None }, ] }, @@ -42,10 +44,11 @@ poster_showcase_worlds_settings = [ { "author_name": "ichiya", "data": [ + { "image_file_name": "ehon_no_heikousekai.png", "x_post_num": None }, { "image_file_name": "ehon_no_heikousekai_jimusho.png", "x_post_num": "1780792306976850285" }, { "image_file_name": "ikoiba.png", "x_post_num": "1782723006923780580" }, { "image_file_name": "kimodameshi.png", "x_post_num": "1781224391692714133" }, - { "image_file_name": "parallel_collar.png", "x_post_num": None }, + { "image_file_name": "parallel_collar.png", "x_post_num": "1820693442105934068" }, ] }, @@ -77,7 +80,7 @@ poster_showcase_worlds_settings = [ { "author_name": "chakamoto", "data": [ - { "image_file_name": "chakachaka_multipurpose_room.png", "x_post_num": None }, + { "image_file_name": "chakachaka_multipurpose_room.png", "x_post_num": "1818107831289295065" }, ] }, @@ -101,7 +104,7 @@ poster_showcase_worlds_settings = [ { "author_name": "eenkoo", "data": [ - { "image_file_name": "tyuuniti_kouryuukai.png", "x_post_num": None }, + { "image_file_name": "tyuuniti_kouryuukai.png", "x_post_num": "1818109101731422617" }, ] }, @@ -132,9 +135,9 @@ poster_showcase_worlds_settings = [ # MiMi_Sorahana # VRC日韓交流会 (KRJPEX.1355) { - "author_name": "tommie_500", + "author_name": "mimi_sorahana", "data": [ - { "image_file_name": "kr_jp_exchange.png", "x_post_num": None }, + { "image_file_name": "kr_jp_exchange.png", "x_post_num": "1820328755950473668" }, ] }, @@ -145,4 +148,36 @@ poster_showcase_worlds_settings = [ { "image_file_name": "smokerz_guild_v2.png", "x_post_num": None }, ] }, + + # KokiM1018 + { + "author_name": "kokim1018", + "data": [ + { "image_file_name": "poker_room_elysion.png", "x_post_num": "1818880695344980208" }, + ] + }, + + # NEET ENGINEER + { + "author_name": "neet_engineer", + "data": [ + { "image_file_name": "japan_street.png", "x_post_num": "1818881593114861924" }, + ] + }, + + # RIKU_VR + { + "author_name": "riku_vr", + "data": [ + { "image_file_name": "celestial_blooms.png", "x_post_num": "1820694531568001061" }, + ] + }, + + # ღKAEDEಇ + { + "author_name": "kaede", + "data": [ + { "image_file_name": "omoshiro_kotoba_asobi_game.png", "x_post_num": None }, + ] + }, ] \ No newline at end of file diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py index 615f9107..59708e14 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py @@ -279,15 +279,15 @@ def createSettingBox_AboutVrct(setting_box_wrapper, config_window, settings, vie special_thanks_message = settings.about_vrct.embedImageCTkLabel(special_thanks_contents_wrapper, settings.about_vrct.image_file.SPECIAL_THANKS_MESSAGE) special_thanks_message.grid(column=0, row=1, padx=0, pady=(0,about_vrct_uism.SPECIAL_THANKS_MESSAGE_BOTTOM_PADY), sticky="nsew") - special_thanks_message_and_you = settings.about_vrct.embedImageCTkLabel(special_thanks_contents_wrapper, "special_thanks_message_and_you.png") - special_thanks_message_and_you.grid(column=0, row=2, padx=0, pady=(0,about_vrct_uism.SPECIAL_THANKS_MESSAGE_AND_YOU_BOTTOM_PADY), sticky="nsw") + # special_thanks_message_and_you = settings.about_vrct.embedImageCTkLabel(special_thanks_contents_wrapper, "special_thanks_message_and_you.png") + # special_thanks_message_and_you.grid(column=0, row=2, padx=0, pady=(0,about_vrct_uism.SPECIAL_THANKS_MESSAGE_AND_YOU_BOTTOM_PADY), sticky="nsw") - special_thanks_tell_us_message = createTellUsButton( - parent_frame=special_thanks_contents_wrapper, - image_file_name=settings.about_vrct.image_file.SPECIAL_THANKS_TELL_US_MESSAGE, - callback=lambda _e: callFunctionIfCallable(view_variable.CALLBACK_OPEN_WEBPAGE_ABOUT_VRCT, "SUPPORTER_REGISTRATION"), - ) - special_thanks_tell_us_message.grid(column=0, row=3) + # special_thanks_tell_us_message = createTellUsButton( + # parent_frame=special_thanks_contents_wrapper, + # image_file_name=settings.about_vrct.image_file.SPECIAL_THANKS_TELL_US_MESSAGE, + # callback=lambda _e: callFunctionIfCallable(view_variable.CALLBACK_OPEN_WEBPAGE_ABOUT_VRCT, "SUPPORTER_REGISTRATION"), + # ) + # special_thanks_tell_us_message.grid(column=0, row=3)