Syntriax/Engine-Pong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: bumped engine version

Browse Source
This commit is contained in:
Syntriax
2026-01-31 00:49:30 +03:00
parent 1a1e6fe4c8
commit 1a76df1f02
9 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.vscode/launch.json vendored
View File

@@ -6,7 +6,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-client",
"program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net9.0/Pong.dll",
"program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net10.0/Pong.dll",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
@@ -22,7 +22,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-client",
"program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net9.0/Desktop.dll",
"program": "${workspaceFolder}/Platforms/Desktop/bin/Debug/net10.0/Pong.dll",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
@@ -38,7 +38,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-server",
"program": "${workspaceFolder}/Platforms/Server/bin/Debug/net9.0/Server.dll",
"program": "${workspaceFolder}/Platforms/Server/bin/Debug/net10.0/Server.dll",
"args": [],
"env": {
"PORT": "8888",

2
Engine

Submodule Engine updated: a050909375...913af2a4a4

2
Platforms/Desktop/Desktop.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RollForward>Major</RollForward>
<PublishReadyToRun>false</PublishReadyToRun>
<TieredCompilation>false</TieredCompilation>

2
Platforms/Server/Server.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Pong.Platforms.Server</RootNamespace>

2
Shared/Behaviours/DrawableColliderCircle.cs
View File

@@ -1,5 +1,5 @@
using Engine.Core;
using Engine.Integration.MonoGame;
using Engine.Systems.Graphics;
namespace Pong.Behaviours;

2
Shared/Behaviours/DrawableColliderShape.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Engine.Core;
using Engine.Integration.MonoGame;
using Engine.Systems.Graphics;
namespace Pong.Behaviours;

15
Shared/Behaviours/Paddle.cs
View File

@@ -7,19 +7,14 @@ using Engine.Systems.Network;
using Engine.Physics2D;
using Engine.Systems.Input;
using Engine.Systems.Tween;
using Engine.Core.Debug;
namespace Pong.Behaviours;
public class Paddle(Keys Up, Keys Down, float High, float Low, float Speed) : Behaviour2D,
IFirstFrameUpdate, IPhysicsIteration, IPostPhysicsUpdate,
IPacketListenerServer<Paddle.PaddleKeyStatePacket>, IPacketListenerClient<Paddle.PaddleKeyStatePacket>
IPacketListenerServerEntity<Paddle.PaddleKeyStatePacket>, IPacketListenerClientEntity<Paddle.PaddleKeyStatePacket>
{
private Keys Up { get; } = Up;
private Keys Down { get; } = Down;
public float High { get; } = High;
public float Low { get; } = Low;
public float Speed { get; set; } = Speed;
private bool isUpPressed = false;
private bool isDownPressed = false;
@@ -66,18 +61,19 @@ public class Paddle(Keys Up, Keys Down, float High, float Low, float Speed) : Be
private void OnDownPressed(IButtonInputs<Keys> sender, IButtonInputs<Keys>.ButtonCallbackArguments args) { isDownPressed = true; networkClient?.SendToServer(new PaddleKeyStatePacket(this)); }
private void OnDownReleased(IButtonInputs<Keys> sender, IButtonInputs<Keys>.ButtonCallbackArguments args) { isDownPressed = false; networkClient?.SendToServer(new PaddleKeyStatePacket(this)); }
public void OnServerPacketArrived(IConnection sender, PaddleKeyStatePacket packet)
public void OnEntityServerPacketArrived(IConnection sender, PaddleKeyStatePacket packet)
{
physicsEngine2D.StepIndividual(rigidBody, -sender.Ping.Min(.05f));
isUpPressed = packet.IsUpPressed;
isDownPressed = packet.IsDownPressed;
ILogger.Shared.Log(this, $"Packet Server {isUpPressed} | {isDownPressed}");
physicsEngine2D.StepIndividual(rigidBody, sender.Ping.Min(.05f));
networkServer?.SendToAll(new PaddleKeyStatePacket(this));
}
public void OnClientPacketArrived(IConnection sender, PaddleKeyStatePacket packet)
public void OnEntityClientPacketArrived(IConnection sender, PaddleKeyStatePacket packet)
{
if (packet.IsDownPressed || packet.IsUpPressed) // Check if the server paddle is moving
if (isDownPressed == packet.IsDownPressed && isUpPressed == packet.IsUpPressed) // Check if we are the ones giving the inputs
@@ -87,6 +83,7 @@ public class Paddle(Keys Up, Keys Down, float High, float Low, float Speed) : Be
isUpPressed = packet.IsUpPressed;
isDownPressed = packet.IsDownPressed;
ILogger.Shared.Log(this, $"Packet Client {isUpPressed} | {isDownPressed}");
physicsEngine2D.StepIndividual(rigidBody, sender.Ping);

2
Shared/PongUniverse.cs
View File

@@ -8,6 +8,7 @@ using Engine.Integration.MonoGame;
using Engine.Physics2D;
using Engine.Systems.Network;
using Engine.Systems.Tween;
using Engine.Systems.Graphics;
using Pong.Behaviours;
@@ -31,6 +32,7 @@ public static class PongUniverse
universe.InstantiateUniverseObject().SetUniverseObject("Camera")
.BehaviourController.AddBehaviour<Transform2D>()
.BehaviourController.AddBehaviour<CameraController>()
.BehaviourController.AddBehaviour<MonoGameTriangleBatch>()
.BehaviourController.AddBehaviour<MonoGameCamera2D>();
////////////////////////////////////////////////////////////////////////////////////

2
Shared/Shared.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Pong.Shared</RootNamespace>
<AssemblyName>Pong.Shared</AssemblyName>