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

Merge branch 'overlay' into for_webui

Browse Source
This commit is contained in:
Sakamoto Shiina
2024-12-14 13:59:01 +09:00
parent 62131b1f3c 43b481c185
commit b3a4a25504
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,6 +177,7 @@ class Overlay:
self.settings[size]["z_rotation"] = z_rotation self.settings[size]["z_rotation"] = z_rotation
self.settings[size]["tracker"] = tracker self.settings[size]["tracker"] = tracker
if self.initialized is True:
match tracker: match tracker:
case "HMD": case "HMD":
base_matrix = getHMDBaseMatrix() base_matrix = getHMDBaseMatrix()
@@ -196,7 +197,6 @@ class Overlay:
transform = utils.transform_matrix(base_matrix, translation, rotation) transform = utils.transform_matrix(base_matrix, translation, rotation)
transform = mat34Id(transform) transform = mat34Id(transform)
if self.initialized is True:
self.overlay.setOverlayTransformTrackedDeviceRelative( self.overlay.setOverlayTransformTrackedDeviceRelative(
self.handle[size], self.handle[size],
trackerIndex, trackerIndex,
@@ -261,6 +261,7 @@ class Overlay:
self.thread_overlay.start() self.thread_overlay.start()
def shutdownOverlay(self): def shutdownOverlay(self):
if self.initialized is True and self.init_process is False:
if isinstance(self.thread_overlay, Thread): if isinstance(self.thread_overlay, Thread):
self.loop = False self.loop = False
self.thread_overlay.join() self.thread_overlay.join()