From 95854947b42e784ac598bb11e48ee97bdcdc3cdc Mon Sep 17 00:00:00 2001
From: Lost-Fly <114507453+Lost-Fly@users.noreply.github.com>
Date: Tue, 2 Apr 2024 16:47:17 +0500
Subject: [PATCH] restructed ws client-server logic

---
 .gitignore                                    | Bin 1682 -> 1760 bytes
 .../packandgo/client/AndroidLauncher.java     |   7 ++-
 .../packandgo/client/dto/InputStateImpl.java  |  43 ++++++++++++------
 assets/env.properties                         |   1 +
 .../aqwsxlostfly/packandgo/Heroes/Player.java |   9 ++++
 .../aqwsxlostfly/packandgo/InputState.java    |   4 ++
 core/src/com/aqwsxlostfly/packandgo/Main.java |   4 +-
 .../packandgo/Screens/WaitingSc.java          |  13 +++++-
 .../packandgo/TouchProcessor.java             |  11 +++--
 9 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3da452091caead65573ad49ac982d9198e9f2773..f680d892e29719bb09c8c845394b5d7b80ef721c 100644
GIT binary patch
delta 86
zcmbQl`+#@DBsRZ9hGHO0WheoX`an95p^QO~p@5-?As<Ml0_hTlOdws%z{|izP#yqZ
Cg%O(o

delta 7
OcmaFBJBfG0BsKsHy#mz$

diff --git a/android/src/com/aqwsxlostfly/packandgo/client/AndroidLauncher.java b/android/src/com/aqwsxlostfly/packandgo/client/AndroidLauncher.java
index 8151991..88ace75 100644
--- a/android/src/com/aqwsxlostfly/packandgo/client/AndroidLauncher.java
+++ b/android/src/com/aqwsxlostfly/packandgo/client/AndroidLauncher.java
@@ -62,14 +62,13 @@ protected void onCreate(Bundle savedInstanceState) {
 //                main.handleTimer();
 //            }
 //        }, 0, 1);
-        initialize(main, config);
 
         String wsUri = readWsUriFromProperties();
 
         try {
             WebSocketClient webSocketClient = new WebSocketClient(new URI(wsUri), getWebsocketListener(callback));
 
-            connectSocket(webSocketClient);
+//            connectSocket(webSocketClient);
 
 //            main.setSocketState(webSocketClient.isOpen());
 //            Gdx.app.log("WS STATUS", "Status: " + main.getSocketState());
@@ -82,6 +81,10 @@ protected void onCreate(Bundle savedInstanceState) {
                 webSocketClient.send(toJson(message));
             });
 
+            initialize(main, config);
+
+            connectSocket(webSocketClient);
+
         } catch (URISyntaxException e) {
             Gdx.app.error("CONNECTION ERROR", "INCORRECT URL: " + e.getMessage());
             throw new RuntimeException(e);
diff --git a/android/src/com/aqwsxlostfly/packandgo/client/dto/InputStateImpl.java b/android/src/com/aqwsxlostfly/packandgo/client/dto/InputStateImpl.java
index f02186d..cf13daa 100644
--- a/android/src/com/aqwsxlostfly/packandgo/client/dto/InputStateImpl.java
+++ b/android/src/com/aqwsxlostfly/packandgo/client/dto/InputStateImpl.java
@@ -6,53 +6,70 @@
 
 public class InputStateImpl implements InputState {
 
-    @Override
-    public void setPosition(Point2D pos) {
+    private Point2D position;
+    private int score;
+    private float health;
+    private boolean ghost;
+    public float speed;
+    public float radius;
 
+    @Override
+    public void setPosition(Point2D position) {
+        this.position = position;
     }
 
     @Override
     public Point2D getPosition() {
-        return null;
+        return this.position;
     }
 
     @Override
     public void setScore(int score) {
-
+        this.score = score;
     }
 
     @Override
     public int getScore() {
-        return 0;
+        return this.score;
     }
 
     @Override
     public void setHealth(float health) {
-
+        this.health = health;
     }
 
     @Override
     public float getHealth() {
-        return 0;
+        return this.health;
     }
 
     @Override
-    public void setGhost(boolean isGhost) {
+    public void setRadius(float radius) {
+        this.radius = radius;
+    }
 
+    @Override
+    public float getRadius() {
+        return this.radius;
     }
 
     @Override
-    public boolean getGhost() {
-        return false;
+    public float getSpeed() {
+        return speed;
     }
 
     @Override
-    public void setRadius(float radius) {
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
 
+    @Override
+    public boolean getGhost() {
+        return ghost;
     }
 
     @Override
-    public float getRadius() {
-        return 0;
+    public void setGhost(boolean ghost) {
+        this.ghost = ghost;
     }
 }
diff --git a/assets/env.properties b/assets/env.properties
index e69de29..a37af31 100644
--- a/assets/env.properties
+++ b/assets/env.properties
@@ -0,0 +1 @@
+WS_URI=ws://10.249.28.111:8867/ws
diff --git a/core/src/com/aqwsxlostfly/packandgo/Heroes/Player.java b/core/src/com/aqwsxlostfly/packandgo/Heroes/Player.java
index 06f1fb2..f6c7989 100644
--- a/core/src/com/aqwsxlostfly/packandgo/Heroes/Player.java
+++ b/core/src/com/aqwsxlostfly/packandgo/Heroes/Player.java
@@ -9,6 +9,7 @@
 
 public class Player extends Heroes {
 
+    private String id;
     private int score = 0;
     private float health;
     private boolean ghost;
@@ -62,6 +63,14 @@ public void hit() {
     public void setScore(){score++;}
     public int getScore(){return score;}
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public void dispose() {
         this.img.dispose();
     }
diff --git a/core/src/com/aqwsxlostfly/packandgo/InputState.java b/core/src/com/aqwsxlostfly/packandgo/InputState.java
index a87d9ba..26b883f 100644
--- a/core/src/com/aqwsxlostfly/packandgo/InputState.java
+++ b/core/src/com/aqwsxlostfly/packandgo/InputState.java
@@ -4,6 +4,7 @@
 import com.aqwsxlostfly.packandgo.Tools.Point2D;
 
 public interface InputState {
+
     void setPosition(Point2D pos);
     Point2D getPosition();
 
@@ -18,4 +19,7 @@ public interface InputState {
 
     void setRadius(float radius);
     float getRadius();
+
+    void setSpeed(float speed);
+    float getSpeed();
 }
diff --git a/core/src/com/aqwsxlostfly/packandgo/Main.java b/core/src/com/aqwsxlostfly/packandgo/Main.java
index 652060e..7759278 100644
--- a/core/src/com/aqwsxlostfly/packandgo/Main.java
+++ b/core/src/com/aqwsxlostfly/packandgo/Main.java
@@ -9,12 +9,12 @@
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 
 
-
-
 public class Main extends Game {
 
 	public static String meId = "0909";
 
+
+
 	public  InputState inputState;
 	public MessageSender messageSender;
 
diff --git a/core/src/com/aqwsxlostfly/packandgo/Screens/WaitingSc.java b/core/src/com/aqwsxlostfly/packandgo/Screens/WaitingSc.java
index 5446dc4..ded3d4d 100644
--- a/core/src/com/aqwsxlostfly/packandgo/Screens/WaitingSc.java
+++ b/core/src/com/aqwsxlostfly/packandgo/Screens/WaitingSc.java
@@ -17,6 +17,7 @@
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
 import com.badlogic.gdx.utils.ObjectMap;
+import com.badlogic.gdx.utils.Timer;
 
 import java.util.ArrayList;
 
@@ -90,11 +91,19 @@ public void dispose() {
         }
     }
 
+
     public void loadHeroes() {
         Player me = new Player(Main.capibara, new Point2D(Main.screenWidth / 2, Main.screenHeight / 2), 10F, (float) (Main.screenHeight / 5), 5);
         players.put(main.getMeId(), me);
         bullets = new ArrayList<Bullet>();
         bulletGenerator = new BulletGenerator();
+        Timer timer = new Timer();
+        timer.scheduleTask(new Timer.Task() {
+            @Override
+            public void run() {
+                handleTimer();
+            }
+        }, 0, 5);
     }
 
 
@@ -141,11 +150,13 @@ public void gameRender(SpriteBatch batch) {
     public void handleTimer() {
         if (inputProcessor != null && !players.isEmpty()) {
             Player me = players.get(main.getMeId());
-            InputState playerState = inputProcessor.updateAndGetInputState(me.position);
+            InputState playerState = inputProcessor.updateAndGetInputState(me);
             main.messageSender.sendMessage(playerState);
         }
     }
 
+
+
     public void evict(String idToEvict) {
         players.remove(idToEvict);
     }
diff --git a/core/src/com/aqwsxlostfly/packandgo/TouchProcessor.java b/core/src/com/aqwsxlostfly/packandgo/TouchProcessor.java
index c776ced..bb80e9b 100644
--- a/core/src/com/aqwsxlostfly/packandgo/TouchProcessor.java
+++ b/core/src/com/aqwsxlostfly/packandgo/TouchProcessor.java
@@ -1,5 +1,6 @@
 package com.aqwsxlostfly.packandgo;
 
+import com.aqwsxlostfly.packandgo.Heroes.Player;
 import com.aqwsxlostfly.packandgo.Tools.Joystick;
 import com.aqwsxlostfly.packandgo.Tools.Point2D;
 import com.badlogic.gdx.InputProcessor;
@@ -65,9 +66,13 @@ public void multitouch(float x, float y, boolean isDownTouch, int pointer) {
         }
     }
 
-    public InputState updateAndGetInputState(Point2D playerPos) {
-
-
+    public InputState updateAndGetInputState(Player player) {
+        inputState.setPosition(player.position);
+        inputState.setGhost(player.isGhost());
+        inputState.setHealth(player.getHealth());
+        inputState.setRadius(player.radius);
+        inputState.setScore(player.getScore());
+        inputState.setSpeed(player.speed);
         return inputState;
     }