temp fix to pass UUID as player name and fix AMPQ issue, will update …

…later to pass user provided callsign. Also, moved canvas to layer 0 so login UI can get mouse clicks
redhat-gamedev · Jun 12, 2022 · 87dc3c0 · 87dc3c0
1 parent 8007e56
commit 87dc3c0
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 26 deletions.
diff --git a/.vs/srt-godot-client/xs/UserPrefs.xml b/.vs/srt-godot-client/xs/UserPrefs.xml
@@ -1,29 +1,20 @@
 <Properties>
-  <MonoDevelop.Ide.Workbench ActiveDocument="README.md">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Networking/ServerConnection.cs">
     <Files>
-      <File FileName="Scenes/SupportScenes/PlayerShip.cs" Line="129" Column="1" />
+      <File FileName="Scenes/SupportScenes/PlayerShip.cs" Line="56" Column="1" />
       <File FileName="Autoload/CSLogger.cs" />
-      <File FileName="Networking/Server.cs" />
       <File FileName="Scenes/SupportScenes/SpaceMissile.cs" />
-      <File FileName="README.md" Line="27" Column="1" />
+      <File FileName="README.md" />
+      <File FileName="Networking/proto/box2d.proto" />
+      <File FileName="Networking/proto/SecurityCommandBuffer.cs" />
+      <File FileName="Scenes/MainScenes/Game.cs" />
+      <File FileName="Networking/ServerConnection.cs" Line="132" Column="42" />
+      <File FileName="Networking/proto/RawInputCommandBuffer.cs" />
+      <File FileName="Networking/proto/EntityGameEventBuffer.cs" />
+      <File FileName="Networking/proto/GameEventBuffer.cs" />
+      <File FileName="Networking/proto/box2d.cs" />
+      <File FileName="Resources/client.cfg" />
     </Files>
-    <Pads>
-      <Pad Id="ProjectPad">
-        <State name="__root__">
-          <Option id="ShowAllFiles" value="True" />
-          <Node name="srt-godot-client" expanded="True">
-            <Node name=".DS_Store" selected="True" />
-            <Node name="srt-godot-client" expanded="True">
-              <Node name="Autoload" expanded="True" />
-              <Node name="Networking" expanded="True" />
-              <Node name="Scenes" expanded="True">
-                <Node name="SupportScenes" expanded="True" />
-              </Node>
-            </Node>
-          </Node>
-        </State>
-      </Pad>
-    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />

diff --git a/.vs/srt-godot-client/xs/project-cache/srt-godot-client-Debug.json b/.vs/srt-godot-client/xs/project-cache/srt-godot-client-Debug.json
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ run `./artemis create gamebroker --user XXXXX --password XXXXX --role admin --na
 It will provide the command to run your newly configured broker
 
 * Option 3. Running in a Kubernetes cluster
-TBD - helm or an operator to launch
+TBD - helm to launch
 
 #### Server
 Find/follow instructions for the [game server here](https://github.com/redhat-gamedev/srt-godot-server).

diff --git a/Resources/client.cfg b/Resources/client.cfg
@@ -1,3 +1,3 @@
 [amqp]
-server_string="amqp://127.0.0.1:5672"
+server_string="amqp://localhost:5672"
 disable_cert_validation=true
diff --git a/Scenes/LoginScreen.tscn b/Scenes/LoginScreen.tscn
@@ -13,6 +13,7 @@ margin_left = -512.0
 margin_top = -300.0
 margin_right = 512.0
 margin_bottom = 300.0
+mouse_filter = 1
 script = ExtResource( 2 )
 
 [node name="TextureRect" type="TextureRect" parent="."]

diff --git a/Scenes/MainScenes/Game.cs b/Scenes/MainScenes/Game.cs
@@ -61,7 +61,7 @@ public bool JoinGameAsPlayer(string playerName)
 
         // construct a join message
         SecurityCommandBuffer scb = new SecurityCommandBuffer();
-        scb.Uuid = playerName; //ServerConnection.UUID;
+        scb.Uuid = ServerConnection.UUID;
         scb.Type = SecurityCommandBuffer.SecurityCommandBufferType.Join;
         CommandBuffer cb = new CommandBuffer();
         cb.Type = CommandBuffer.CommandBufferType.Security;
@@ -71,6 +71,8 @@ public bool JoinGameAsPlayer(string playerName)
         Label nameLabel = mapOverlay.GetNode<Label>("PlayerNameLabel");
         nameLabel.Text = playerName;
         return true; // TODO: this can't always be true
+
+        // TODO: send my name and player preferences over to the severside
     }
 
     /// <summary>
@@ -142,7 +144,7 @@ void ProcessInputEvent(Vector2 velocity, Vector2 shoot)
         cb.rawInputCommandBuffer = ricb;
         serverConnection.SendCommand(cb);
     }
-   
+
     //  // Called every frame. 'delta' is the elapsed time since the previous frame.
     //  public override void _Process(float delta)
     //  {

diff --git a/Scenes/MainScenes/Game.tscn b/Scenes/MainScenes/Game.tscn
@@ -7,6 +7,7 @@
 script = ExtResource( 2 )
 
 [node name="MapCanvasLayer" type="CanvasLayer" parent="."]
+layer = 0
 
 [node name="MapOverlay" parent="MapCanvasLayer" instance=ExtResource( 1 )]
 margin_right = 0.0

diff --git a/Scenes/MainScenes/MapOverlay.tscn b/Scenes/MainScenes/MapOverlay.tscn
@@ -7,6 +7,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 margin_right = 896.0
 margin_bottom = 480.0
+mouse_filter = 1
 
 [node name="SectorLabelTextureRect" type="TextureRect" parent="."]
 anchor_left = 1.0

diff --git a/Scenes/SupportScenes/PlayerShip.cs b/Scenes/SupportScenes/PlayerShip.cs
@@ -58,6 +58,11 @@ public override void _Ready()
         playerIDLabel.Text = uuid;
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="BufferType"></param>
+    /// <returns></returns>
     public EntityGameEventBuffer CreatePlayerGameEventBuffer(EntityGameEventBuffer.EntityGameEventBufferType BufferType)
     {
         EntityGameEventBuffer egeb = new EntityGameEventBuffer();
@@ -83,15 +88,25 @@ public EntityGameEventBuffer CreatePlayerGameEventBuffer(EntityGameEventBuffer.E
         return egeb;
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="egeb"></param>
     public void UpdateFromGameEventBuffer(EntityGameEventBuffer egeb)
     {
         this.GlobalPosition = new Vector2(egeb.Body.Position.X, egeb.Body.Position.Y);
         this.RotationDegrees = egeb.Body.Angle;
         this.CurrentVelocity = egeb.Body.AbsoluteVelocity;
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
     public void ExpireMissile() { MyMissile = null; }
 
+    /// <summary>
+    /// 
+    /// </summary>
     public void FireMissile()
     {
         // only one missile allowed for now
@@ -132,6 +147,10 @@ public void FireMissile()
         cslogger.Debug("Added missile instance!");
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="Damage"></param>
     public void TakeDamage(int Damage)
     {
         cslogger.Debug($"Player.cs: {uuid}: Taking damage: {Damage}");
@@ -146,6 +165,10 @@ public void TakeDamage(int Damage)
     //  theServer.RemovePlayer(uuid);
     //s}
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="delta"></param>
     public override void _Process(float delta)
     {
         if (HitPoints <= 0)
@@ -156,6 +179,10 @@ public override void _Process(float delta)
         }
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="delta"></param>
     public override void _PhysicsProcess(float delta)
     {
         // somewhat based on: https://kidscancode.org/godot_recipes/2d/topdown_movement/