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

👍️[Update] Model : OverlayのUIを調整

Browse Source
This commit is contained in:
misyaguziya
2024-11-26 15:01:13 +09:00
parent 83ff143064
commit 21be71da80
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src-python/model.py
View File

@@ -86,7 +86,6 @@ class Model:
"small": config.OVERLAY_SMALL_LOG_SETTINGS, "small": config.OVERLAY_SMALL_LOG_SETTINGS,
"large": config.OVERLAY_LARGE_LOG_SETTINGS, "large": config.OVERLAY_LARGE_LOG_SETTINGS,
} }
overlay_settings["large"]["ui_scaling"] = copy.copy(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"]*0.25)
self.overlay = Overlay(overlay_settings) self.overlay = Overlay(overlay_settings)
self.overlay_image = OverlayImage() self.overlay_image = OverlayImage()
self.mic_audio_queue = None self.mic_audio_queue = None
@@ -747,7 +746,7 @@ class Model:
self.overlay.updateDisplayDuration(config.OVERLAY_LARGE_LOG_SETTINGS["display_duration"], size) self.overlay.updateDisplayDuration(config.OVERLAY_LARGE_LOG_SETTINGS["display_duration"], size)
self.overlay.updateFadeoutDuration(config.OVERLAY_LARGE_LOG_SETTINGS["fadeout_duration"], size) self.overlay.updateFadeoutDuration(config.OVERLAY_LARGE_LOG_SETTINGS["fadeout_duration"], size)
self.overlay.updateOpacity(config.OVERLAY_LARGE_LOG_SETTINGS["opacity"], size, True) self.overlay.updateOpacity(config.OVERLAY_LARGE_LOG_SETTINGS["opacity"], size, True)
self.overlay.updateUiScaling(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"]*0.25, size) self.overlay.updateUiScaling(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"], size)
def startOverlay(self): def startOverlay(self):
self.overlay.startOverlay() self.overlay.startOverlay()

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

@@ -47,12 +47,12 @@ def getHMDBaseMatrix():
return arr return arr
def getLeftHandBaseMatrix(): def getLeftHandBaseMatrix():
x_pos = 0.0 x_pos = 0.1
y_pos = -0.06 y_pos = 0.1
z_pos = -0.14 z_pos = -0.2
x_rotation = -62.0 x_rotation = -65.0
y_rotation = 154.0 y_rotation = 165.0
z_rotation = 71.0 z_rotation = 115.0
arr = getBaseMatrix(x_pos, y_pos, z_pos, x_rotation, y_rotation, z_rotation) arr = getBaseMatrix(x_pos, y_pos, z_pos, x_rotation, y_rotation, z_rotation)
return arr return arr
@@ -160,7 +160,10 @@ class Overlay:
def updateUiScaling(self, ui_scaling, size): def updateUiScaling(self, ui_scaling, size):
self.settings[size]["ui_scaling"] = ui_scaling self.settings[size]["ui_scaling"] = ui_scaling
if self.initialized is True: if self.initialized is True:
self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"]) if "large" == size:
self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"]*0.25)
else:
self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"])
def updatePosition(self, x_pos, y_pos, z_pos, x_rotation, y_rotation, z_rotation, tracker, size): def updatePosition(self, x_pos, y_pos, z_pos, x_rotation, y_rotation, z_rotation, tracker, size):
""" """