Merge pull request #14 from CatilGrass/bevy_client

Update Client

3 files changed, 13 insertions, 18 deletions

diff --git a/apps/client/src/bevy_plugins/plugin_client_app.rs b/apps/client/src/bevy_plugins/plugin_client_app.rs
index c95d0a4..22d048d 100644
--- a/apps/client/src/bevy_plugins/plugin_client_app.rs
+++ b/apps/client/src/bevy_plugins/plugin_client_app.rs
@@ -28,7 +28,7 @@ impl Plugin for ClientAppPlugins {
     fn build(&self, app: &mut App) {
         app.add_systems(PreStartup, client_init);
         app.add_systems(Startup, client_start);
-        app.add_systems(OnEnter(Exiting), client_exit);
+        app.add_systems(OnEnter(Exiting), client_close);
     }
 }
 
@@ -67,7 +67,7 @@ fn client_start(
     }
 }
 
-fn client_exit(
+fn client_close(
     client_components: Query<&mut ClientComponent>
 ) {
     for client_component in client_components.iter() {
diff --git a/core/bindings/lang/csharp/NoGamepads_CharpBindings/NoGamepads_Core/Runtime/ControllerRuntime.cs b/core/bindings/lang/csharp/NoGamepads_CharpBindings/NoGamepads_Core/Runtime/ControllerRuntime.cs
index 5a2a30a..373c6fd 100644
--- a/core/bindings/lang/csharp/NoGamepads_CharpBindings/NoGamepads_Core/Runtime/ControllerRuntime.cs
+++ b/core/bindings/lang/csharp/NoGamepads_CharpBindings/NoGamepads_Core/Runtime/ControllerRuntime.cs
@@ -11,7 +11,7 @@ public class ControllerRuntime : IRustDataBorrow<FfiControllerRuntime>, IRustDat
 
     public ControllerRuntime(ControllerData data)
     {
-        _ffi = nogamepads_data.ControllerDataBuildRuntime(data.Borrow());
+        _ffi = nogamepads_data.ControllerDataBuildRuntime(data.Use());
     }
 
     public void Close()
diff --git a/core/bindings/lang/csharp/NoGamepads_CharpBindings/NoGamepads_Example/Program.cs b/core/bindings/lang/csharp/NoGamepads_CharpBindings/NoGamepads_Example/Program.cs
index 166526d..fbd560e 100644
--- a/core/bindings/lang/csharp/NoGamepads_CharpBindings/NoGamepads_Example/Program.cs
+++ b/core/bindings/lang/csharp/NoGamepads_CharpBindings/NoGamepads_Example/Program.cs
@@ -8,26 +8,21 @@ internal class Program
 {
     public static void Main(string[] args)
     {
-        Player player = new Player("CatilGrass", "Unknown Password");
+        Player player = new Player("CatilGrass", "123456");
+
+        player.Hue = 250;
+        player.Value = 1;
+        player.Saturation = 0.5f;
         
-        player.Hue = 200;
+        Console.WriteLine($"player \"{player.Id}\" hsv: {player.Hue}, {player.Saturation}, {player.Value}");
         
         ControllerData data = new ControllerData(player);
         
         ControllerRuntime runtime = new ControllerRuntime(data);
-        
-        runtime.SendTextMessage("Hello World! ");
-        
-        Console.WriteLine(player.Hue + "!");
-        
-        Console.WriteLine(player.Hash);
 
-        var ffi = runtime.Use();
-        if (ffi != null)
-        {
-            nogamepads_data.EnableLogger(2);
-            var client = nogamepads_data.TcpClientBuild(ffi);
-            nogamepads_data.TcpClientConnect(client);
-        }
+        nogamepads_data.EnableLogger(2);
+        
+        FfiTcpClientService client = nogamepads_data.TcpClientBuild(runtime.Use());
+        nogamepads_data.TcpClientConnect(client);
     }
 }
\ No newline at end of file