Merge branch 'bugfix_overlay' into develop

This commit is contained in:
misyaguziya
2025-02-18 15:34:05 +09:00

View File

@@ -128,11 +128,14 @@ class Overlay:
try: try:
self.overlay.setOverlayRaw(self.handle[size], img, width, height, 4) self.overlay.setOverlayRaw(self.handle[size], img, width, height, 4)
except Exception: except Exception:
errorLogging()
self.reStartOverlay() self.reStartOverlay()
while self.initialized is False: while self.initialized is False:
time.sleep(0.1) 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.updateOpacity(self.settings[size]["opacity"], size)
self.lastUpdate[size] = time.monotonic() self.lastUpdate[size] = time.monotonic()
@@ -198,11 +201,12 @@ class Overlay:
transform = utils.transform_matrix(base_matrix, translation, rotation) transform = utils.transform_matrix(base_matrix, translation, rotation)
transform = mat34Id(transform) transform = mat34Id(transform)
self.overlay.setOverlayTransformTrackedDeviceRelative( if bool(self.overlay_system.isTrackedDeviceConnected(trackerIndex)) is True:
self.handle[size], self.overlay.setOverlayTransformTrackedDeviceRelative(
trackerIndex, self.handle[size],
transform trackerIndex,
) transform
)
def updateDisplayDuration(self, display_duration, size): def updateDisplayDuration(self, display_duration, size):
self.settings[size]["display_duration"] = display_duration self.settings[size]["display_duration"] = display_duration