From 9201215b06c96daf17e285f69a5021cd9bfda5b3 Mon Sep 17 00:00:00 2001 From: Cassandra de la Cruz-Munoz Date: Fri, 20 Oct 2023 10:05:54 -0400 Subject: [PATCH] feat!: add Node3D to constructor for Marionette and Performer --- Marionette.cs | 5 ++++- Performer.cs | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Marionette.cs b/Marionette.cs index 23c37bc..8749e5f 100644 --- a/Marionette.cs +++ b/Marionette.cs @@ -29,8 +29,10 @@ namespace godotVmcSharp private CameraReceiver cam; private DeviceReceiver devices; private DirectionalLightReceiver lights; - public Marionette(int port) + private Node3D node; + public Marionette(int port, Node3D node) { + this.node = node; receiver = new OscReceiver(port); receiver.MessageReceived += (sender, e) => { @@ -46,6 +48,7 @@ namespace godotVmcSharp }; devices = new DeviceReceiver(); lights = new DirectionalLightReceiver(); + cam = new CameraReceiver(node.GetViewport().GetCamera3D()); } private void ProcessMessage(OscMessage m) { diff --git a/Performer.cs b/Performer.cs index 98215d9..d806a83 100644 --- a/Performer.cs +++ b/Performer.cs @@ -29,8 +29,10 @@ namespace godotVmcSharp private CameraReceiver cam; private DeviceReceiver devices; private DirectionalLightReceiver lights; - public Performer(IPAddress host, int port) + private Node3D node; + public Performer(IPAddress host, int port, Node3D node) { + this.node = node; receiver = new OscReceiver(port); sender = new OscSender(host, port); receiver.MessageReceived += (sender, e) => @@ -44,6 +46,7 @@ namespace godotVmcSharp }; devices = new DeviceReceiver(); lights = new DirectionalLightReceiver(); + cam = new CameraReceiver(node.GetViewport().GetCamera3D()); } private void ProcessMessage(OscMessage m) { @@ -96,4 +99,4 @@ namespace godotVmcSharp } } } -} \ No newline at end of file +}