From 5e9433b4a489523310ee1c9e8f4fd713bdc9c765 Mon Sep 17 00:00:00 2001 From: Salad Dais Date: Mon, 18 Dec 2023 21:34:39 +0000 Subject: [PATCH] 3d_position -> 3d_pos --- hippolyzer/lib/voice/client.py | 6 +++--- tests/voice/test_voice.py | 2 +- voice_examples/hello_voice.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hippolyzer/lib/voice/client.py b/hippolyzer/lib/voice/client.py index 7b8a51c..098ec16 100644 --- a/hippolyzer/lib/voice/client.py +++ b/hippolyzer/lib/voice/client.py @@ -251,7 +251,7 @@ class VoiceClient: self._region_global_y = 0 self._uri = None - def set_3d_position(self, pos: Vector3, vel: Vector3 = Vector3(0, 0, 0)) -> asyncio.Future: + def set_3d_pos(self, pos: Vector3, vel: Vector3 = Vector3(0, 0, 0)) -> asyncio.Future: """Set global 3D position, in Vivox coordinates""" self._pos = pos future = self.send_message("Session.Set3DPosition.1", { @@ -262,10 +262,10 @@ class VoiceClient: self._channel_info_updated() return future - def set_region_3d_position(self, pos: Vector3, vel: Vector3 = Vector3(0, 0, 0)) -> asyncio.Future: + def set_region_3d_pos(self, pos: Vector3, vel: Vector3 = Vector3(0, 0, 0)) -> asyncio.Future: """Set 3D position, in region-local coordinates""" vel = Vector3(vel[0], vel[2], -vel[1]) - return self.set_3d_position(self._region_to_global(pos), vel=vel) + return self.set_3d_pos(self._region_to_global(pos), vel=vel) def set_speakers_muted(self, val: bool): return self.send_message("Connector.MuteLocalSpeaker.1", { diff --git a/tests/voice/test_voice.py b/tests/voice/test_voice.py index e059ce4..eb23abc 100644 --- a/tests/voice/test_voice.py +++ b/tests/voice/test_voice.py @@ -269,7 +269,7 @@ class TestVoiceClient(unittest.IsolatedAsyncioTestCase): await self._do_login() await self._join_session() handle_3d_pos_task = asyncio.create_task(self._handle_message("Session.Set3DPosition.1")) - await self.client.set_region_3d_position(Vector3(1, 2, 3)) + await self.client.set_region_3d_pos(Vector3(1, 2, 3)) msg = await handle_3d_pos_task self.assertDictEqual( {'X': '1.0', 'Y': '3.0', 'Z': '-258.0'}, diff --git a/voice_examples/hello_voice.py b/voice_examples/hello_voice.py index 8d60af2..075b6b3 100644 --- a/voice_examples/hello_voice.py +++ b/voice_examples/hello_voice.py @@ -22,7 +22,7 @@ async def amain(): await client.join_session(os.environ["SLVOICE_URI"], int(os.environ["SLVOICE_HANDLE"])) - await client.set_region_3d_position(Vector3(0, 0, 0)) + await client.set_region_3d_pos(Vector3(0, 0, 0)) print(client.region_pos) # leave running for 20 seconds, then exit