Compare commits
81 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f1c5c99417 | |||
| e52e940fda | |||
| e78e8048ff | |||
| 5136f08dab | |||
| f7719e1bca | |||
| 211b24fe2b | |||
| bdf7d4f94a | |||
| 3bec19c2b2 | |||
| 0f2d316523 | |||
| 7cf1353869 | |||
| 6199af3d1e | |||
| e9dc45265a | |||
| b84538b238 | |||
| 7a2196ff50 | |||
| 5634a182e6 | |||
| 0ede864f40 | |||
| 646744c9a1 | |||
| a9e6a3e853 | |||
| c74ce0f00f | |||
| d3ae5a4465 | |||
| 5bf1881f81 | |||
| 6886808132 | |||
| b4cba20d82 | |||
| b39bd8bd0a | |||
| 12b80c546c | |||
| accd442388 | |||
| d115c98b79 | |||
| 5c20fbafc1 | |||
| bd0c6df5ea | |||
| c4811ef052 | |||
| d82964526c | |||
| acedaef270 | |||
| 0c4bdb83c9 | |||
| 5a79502848 | |||
| b8fe2bb13f | |||
| 89d130a193 | |||
| 0cd912a1aa | |||
| c64cc61c78 | |||
| 2dcb047014 | |||
| 33f8bba2ed | |||
| 5aa159ed2f | |||
| 892558ab16 | |||
| f55634877a | |||
| 8b3a29a750 | |||
| 6a50bffe1e | |||
| 9144ad58ef | |||
| ee9f3fbe3a | |||
| 893c73512a | |||
| e7dd693147 | |||
| fef1007c8c | |||
| e33c442a18 | |||
| 09b185a3ad | |||
| 7d154ea4d4 | |||
| d2577e5d1f | |||
| e25f42f9ff | |||
| 28cc41c3ad | |||
| fc483c0854 | |||
| bcc45f7db8 | |||
| 689a240e5b | |||
| 85b75766a9 | |||
| b90ed974e5 | |||
| 3da57e086e | |||
| 745d196a8b | |||
| 860051777e | |||
| 6422db783a | |||
| 5d812d7acc | |||
| c214b6ca7f | |||
| 64842886d7 | |||
| c892c2b67a | |||
| e1a3ea45e2 | |||
| 8788cb0fcf | |||
| 27db256902 | |||
| 8705e93929 | |||
| 08e931d1bd | |||
| fb58dedfaf | |||
| 92062cd708 | |||
| 5fc55eaddc | |||
| 4a8aae11e3 | |||
| cd9304e63a | |||
| 5199b5271b | |||
| c01b748031 |
@@ -0,0 +1,25 @@
|
||||
**/.dockerignore
|
||||
**/.env
|
||||
**/.git
|
||||
**/.gitignore
|
||||
**/.project
|
||||
**/.settings
|
||||
**/.toolstarget
|
||||
**/.vs
|
||||
**/.vscode
|
||||
**/.idea
|
||||
**/*.*proj.user
|
||||
**/*.dbmdl
|
||||
**/*.jfm
|
||||
**/azds.yaml
|
||||
**/bin
|
||||
**/charts
|
||||
**/docker-compose*
|
||||
**/Dockerfile*
|
||||
**/node_modules
|
||||
**/npm-debug.log
|
||||
**/obj
|
||||
**/secrets.dev.yaml
|
||||
**/values.dev.yaml
|
||||
LICENSE
|
||||
README.md
|
||||
@@ -49,7 +49,7 @@ jobs:
|
||||
- name: Setup dotnet
|
||||
uses: actions/setup-dotnet@v1
|
||||
with:
|
||||
dotnet-version: 7.0.x
|
||||
dotnet-version: 8.0.x
|
||||
- name: Build
|
||||
shell: bash
|
||||
run: |
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
.DS_Store
|
||||
.idea
|
||||
.vs
|
||||
.vscode
|
||||
obj
|
||||
bin
|
||||
*.user
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
@@ -1,5 +1,5 @@
|
||||
<p align="center">
|
||||
<img src="Images/ragon-logo.png" width="200" >
|
||||
<img src="Images/logo.png">
|
||||
</p>
|
||||
|
||||
## Ragon Server
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client.Simulation
|
||||
namespace Ragon.Client.Property
|
||||
{
|
||||
[Serializable]
|
||||
public class RagonBool : RagonProperty
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client.Simulation
|
||||
namespace Ragon.Client.Property
|
||||
{
|
||||
[Serializable]
|
||||
public class RagonInt : RagonProperty
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
/*
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using System.Numerics;
|
||||
using Ragon.Client.Compressor;
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client.Property;
|
||||
|
||||
public class RagonQuaternion : RagonProperty
|
||||
{
|
||||
private Quaternion _value;
|
||||
|
||||
public Quaternion Value
|
||||
{
|
||||
get => _value;
|
||||
set
|
||||
{
|
||||
_value = value;
|
||||
|
||||
MarkAsChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private readonly FloatCompressor _compressor;
|
||||
|
||||
public RagonQuaternion(bool invokeLocal = false, int priority = 0) : base(priority, invokeLocal)
|
||||
{
|
||||
_compressor = new FloatCompressor(-1.0f, 1f, 0.01f);
|
||||
|
||||
SetFixedSize(_compressor.RequiredBits * 4);
|
||||
}
|
||||
|
||||
public override void Serialize(RagonBuffer buffer)
|
||||
{
|
||||
var compressedX = _compressor.Compress(_value.X);
|
||||
var compressedY = _compressor.Compress(_value.Y);
|
||||
var compressedZ = _compressor.Compress(_value.Z);
|
||||
var compressedW = _compressor.Compress(_value.W);
|
||||
|
||||
buffer.Write(compressedX, _compressor.RequiredBits);
|
||||
buffer.Write(compressedY, _compressor.RequiredBits);
|
||||
buffer.Write(compressedZ, _compressor.RequiredBits);
|
||||
buffer.Write(compressedW, _compressor.RequiredBits);
|
||||
}
|
||||
|
||||
public override void Deserialize(RagonBuffer buffer)
|
||||
{
|
||||
var compressedX = buffer.Read(_compressor.RequiredBits);
|
||||
var compressedY = buffer.Read(_compressor.RequiredBits);
|
||||
var compressedZ = buffer.Read(_compressor.RequiredBits);
|
||||
var compressedW = buffer.Read(_compressor.RequiredBits);
|
||||
|
||||
var x = _compressor.Decompress(compressedX);
|
||||
var y = _compressor.Decompress(compressedY);
|
||||
var z = _compressor.Decompress(compressedZ);
|
||||
var w = _compressor.Decompress(compressedW);
|
||||
|
||||
_value = new Quaternion(x, y, z, w);
|
||||
|
||||
InvokeChanged();
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -18,7 +18,7 @@
|
||||
using System.Text;
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client.Simulation
|
||||
namespace Ragon.Client.Property
|
||||
{
|
||||
[Serializable]
|
||||
public class RagonString : RagonProperty
|
||||
|
||||
@@ -0,0 +1,330 @@
|
||||
/*
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Numerics;
|
||||
using Ragon.Client.Compressor;
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client.Property
|
||||
{
|
||||
[Serializable]
|
||||
public enum RagonAxis
|
||||
{
|
||||
XYZ,
|
||||
XY,
|
||||
YZ,
|
||||
XZ,
|
||||
X,
|
||||
Y,
|
||||
Z
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class RagonVector3 : RagonProperty
|
||||
{
|
||||
private Vector3 _value;
|
||||
|
||||
public Vector3 Value
|
||||
{
|
||||
get => _value;
|
||||
set
|
||||
{
|
||||
_value = value;
|
||||
|
||||
MarkAsChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private RagonAxis _axis;
|
||||
private FloatCompressor _compressorX;
|
||||
private FloatCompressor _compressorY;
|
||||
private FloatCompressor _compressorZ;
|
||||
|
||||
|
||||
public RagonVector3(
|
||||
RagonAxis axis = RagonAxis.XYZ,
|
||||
bool invokeLocal = true,
|
||||
int priority = 0
|
||||
) : base(priority, invokeLocal)
|
||||
{
|
||||
_axis = axis;
|
||||
|
||||
var defaultCompressor = new FloatCompressor(-1024.0f, 1024f, 0.01f);
|
||||
|
||||
_compressorX = defaultCompressor;
|
||||
_compressorY = defaultCompressor;
|
||||
_compressorZ = defaultCompressor;
|
||||
|
||||
switch (_axis)
|
||||
{
|
||||
case RagonAxis.XYZ:
|
||||
SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits + _compressorZ.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.XY:
|
||||
SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.XZ:
|
||||
SetFixedSize(_compressorX.RequiredBits + _compressorZ.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.YZ:
|
||||
SetFixedSize(_compressorY.RequiredBits + _compressorZ.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.X:
|
||||
SetFixedSize(_compressorX.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.Y:
|
||||
SetFixedSize(_compressorY.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.Z:
|
||||
SetFixedSize(_compressorZ.RequiredBits);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public RagonVector3(
|
||||
Vector3 initialValue,
|
||||
RagonAxis axis = RagonAxis.XYZ,
|
||||
float min = -1024.0f,
|
||||
float max = 1024.0f,
|
||||
float precision = 0.1f,
|
||||
bool invokeLocal = true,
|
||||
int priority = 0
|
||||
) : base(priority, invokeLocal)
|
||||
{
|
||||
_value = initialValue;
|
||||
_axis = axis;
|
||||
|
||||
var defaultCompressor = new FloatCompressor(min, max, precision);
|
||||
|
||||
_compressorX = defaultCompressor;
|
||||
_compressorY = defaultCompressor;
|
||||
_compressorZ = defaultCompressor;
|
||||
|
||||
switch (_axis)
|
||||
{
|
||||
case RagonAxis.XYZ:
|
||||
SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits + _compressorZ.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.XY:
|
||||
SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.XZ:
|
||||
SetFixedSize(_compressorX.RequiredBits + _compressorZ.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.YZ:
|
||||
SetFixedSize(_compressorY.RequiredBits + _compressorZ.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.X:
|
||||
SetFixedSize(_compressorX.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.Y:
|
||||
SetFixedSize(_compressorY.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.Z:
|
||||
SetFixedSize(_compressorZ.RequiredBits);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public RagonVector3(
|
||||
RagonAxis axis = RagonAxis.XYZ,
|
||||
FloatCompressor compressorX = null,
|
||||
FloatCompressor compressorY = null,
|
||||
FloatCompressor compressorZ = null,
|
||||
bool invokeLocal = true,
|
||||
int priority = 0
|
||||
) : base(priority, invokeLocal)
|
||||
{
|
||||
_axis = axis;
|
||||
|
||||
var defaultCompressor = new FloatCompressor(-1024.0f, 1024f, 0.01f);
|
||||
|
||||
_compressorX = defaultCompressor;
|
||||
_compressorY = defaultCompressor;
|
||||
_compressorZ = defaultCompressor;
|
||||
|
||||
if (compressorX != null)
|
||||
_compressorX = compressorX;
|
||||
|
||||
if (compressorY != null)
|
||||
_compressorY = compressorY;
|
||||
|
||||
if (compressorZ != null)
|
||||
_compressorZ = compressorZ;
|
||||
|
||||
switch (_axis)
|
||||
{
|
||||
case RagonAxis.XYZ:
|
||||
SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits + _compressorZ.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.XY:
|
||||
SetFixedSize(_compressorX.RequiredBits + _compressorY.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.XZ:
|
||||
SetFixedSize(_compressorX.RequiredBits + _compressorZ.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.YZ:
|
||||
SetFixedSize(_compressorY.RequiredBits + _compressorZ.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.X:
|
||||
SetFixedSize(_compressorX.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.Y:
|
||||
SetFixedSize(_compressorY.RequiredBits);
|
||||
break;
|
||||
case RagonAxis.Z:
|
||||
SetFixedSize(_compressorZ.RequiredBits);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Serialize(RagonBuffer buffer)
|
||||
{
|
||||
switch (_axis)
|
||||
{
|
||||
case RagonAxis.XYZ:
|
||||
{
|
||||
var compressedX = _compressorX.Compress(_value.X);
|
||||
var compressedY = _compressorY.Compress(_value.Y);
|
||||
var compressedZ = _compressorZ.Compress(_value.Z);
|
||||
|
||||
buffer.Write(compressedX, _compressorX.RequiredBits);
|
||||
buffer.Write(compressedY, _compressorY.RequiredBits);
|
||||
buffer.Write(compressedZ, _compressorZ.RequiredBits);
|
||||
}
|
||||
break;
|
||||
case RagonAxis.XY:
|
||||
{
|
||||
var compressedX = _compressorX.Compress(_value.X);
|
||||
var compressedY = _compressorY.Compress(_value.Y);
|
||||
|
||||
buffer.Write(compressedX, _compressorX.RequiredBits);
|
||||
buffer.Write(compressedY, _compressorY.RequiredBits);
|
||||
}
|
||||
break;
|
||||
case RagonAxis.XZ:
|
||||
{
|
||||
var compressedX = _compressorX.Compress(_value.X);
|
||||
var compressedZ = _compressorZ.Compress(_value.Z);
|
||||
|
||||
buffer.Write(compressedX, _compressorX.RequiredBits);
|
||||
buffer.Write(compressedZ, _compressorZ.RequiredBits);
|
||||
break;
|
||||
}
|
||||
|
||||
case RagonAxis.YZ:
|
||||
{
|
||||
var compressedY = _compressorY.Compress(_value.Y);
|
||||
var compressedZ = _compressorZ.Compress(_value.Z);
|
||||
|
||||
buffer.Write(compressedY, _compressorY.RequiredBits);
|
||||
buffer.Write(compressedZ, _compressorZ.RequiredBits);
|
||||
break;
|
||||
}
|
||||
case RagonAxis.X:
|
||||
{
|
||||
var compressedX = _compressorX.Compress(_value.X);
|
||||
|
||||
buffer.Write(compressedX, _compressorX.RequiredBits);
|
||||
break;
|
||||
}
|
||||
case RagonAxis.Y:
|
||||
{
|
||||
var compressedY = _compressorY.Compress(_value.Y);
|
||||
|
||||
buffer.Write(compressedY, _compressorY.RequiredBits);
|
||||
break;
|
||||
}
|
||||
case RagonAxis.Z:
|
||||
{
|
||||
var compressedZ = _compressorZ.Compress(_value.Z);
|
||||
|
||||
buffer.Write(compressedZ, _compressorZ.RequiredBits);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override void Deserialize(RagonBuffer buffer)
|
||||
{
|
||||
switch (_axis)
|
||||
{
|
||||
case RagonAxis.XYZ:
|
||||
{
|
||||
var compressedX = buffer.Read(_compressorX.RequiredBits);
|
||||
var compressedY = buffer.Read(_compressorY.RequiredBits);
|
||||
var compressedZ = buffer.Read(_compressorZ.RequiredBits);
|
||||
|
||||
_value.X = _compressorX.Decompress(compressedX);
|
||||
_value.Y = _compressorY.Decompress(compressedY);
|
||||
_value.Z = _compressorZ.Decompress(compressedZ);
|
||||
break;
|
||||
}
|
||||
case RagonAxis.XY:
|
||||
{
|
||||
var compressedX = buffer.Read(_compressorX.RequiredBits);
|
||||
var compressedY = buffer.Read(_compressorY.RequiredBits);
|
||||
|
||||
_value.X = _compressorX.Decompress(compressedX);
|
||||
_value.Z = _compressorY.Decompress(compressedY);
|
||||
break;
|
||||
}
|
||||
case RagonAxis.XZ:
|
||||
{
|
||||
var compressedX = buffer.Read(_compressorX.RequiredBits);
|
||||
var compressedZ = buffer.Read(_compressorZ.RequiredBits);
|
||||
|
||||
_value.X = _compressorX.Decompress(compressedX);
|
||||
_value.Z = _compressorZ.Decompress(compressedZ);
|
||||
break;
|
||||
}
|
||||
case RagonAxis.YZ:
|
||||
{
|
||||
var compressedY = buffer.Read(_compressorY.RequiredBits);
|
||||
var compressedZ = buffer.Read(_compressorZ.RequiredBits);
|
||||
|
||||
_value.Y = _compressorY.Decompress(compressedY);
|
||||
_value.Z = _compressorZ.Decompress(compressedZ);
|
||||
break;
|
||||
}
|
||||
case RagonAxis.X:
|
||||
{
|
||||
var compressedX = buffer.Read(_compressorX.RequiredBits);
|
||||
|
||||
_value.X = _compressorX.Decompress(compressedX);
|
||||
break;
|
||||
}
|
||||
case RagonAxis.Y:
|
||||
{
|
||||
var compressedY = buffer.Read(_compressorY.RequiredBits);
|
||||
|
||||
_value.Y = _compressorY.Decompress(compressedY);
|
||||
break;
|
||||
}
|
||||
case RagonAxis.Z:
|
||||
{
|
||||
var compressedZ = buffer.Read(_compressorZ.RequiredBits);
|
||||
|
||||
_value.Z = _compressorZ.Decompress(compressedZ);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
InvokeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Ragon.Client.Property\Ragon.Client.Property.csproj" />
|
||||
<ProjectReference Include="..\Ragon.Client\Ragon.Client.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ENet-CSharp" Version="2.4.8" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="libenet.dylib">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,112 +0,0 @@
|
||||
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client.Simulation;
|
||||
|
||||
public class Game : IRagonListener
|
||||
{
|
||||
private RagonFloat _health;
|
||||
private RagonInt _points;
|
||||
private RagonString _name;
|
||||
private RagonEntity _entity;
|
||||
private RagonClient _client;
|
||||
|
||||
public Game(RagonClient client)
|
||||
{
|
||||
_client = client;
|
||||
}
|
||||
|
||||
public void OnConnected(RagonClient client)
|
||||
{
|
||||
RagonLog.Trace("Connected");
|
||||
_client.Session.AuthorizeWithKey("defaultkey", "Player Eduard");
|
||||
}
|
||||
|
||||
public void OnAuthorizationSuccess(RagonClient client, string playerId, string playerName)
|
||||
{
|
||||
RagonLog.Trace("Authorized");
|
||||
client.Session.CreateOrJoin("Example", 1, 20);
|
||||
}
|
||||
|
||||
public void OnAuthorizationFailed(RagonClient client, string message)
|
||||
{
|
||||
Console.WriteLine($"Authorization failed: {message}");
|
||||
}
|
||||
|
||||
public void OnJoined(RagonClient client)
|
||||
{
|
||||
RagonLog.Trace("Joined");
|
||||
|
||||
_health = new RagonFloat(100.0f, false, 0);
|
||||
_health.Changed += () => Console.WriteLine($"[Ragon Property] Health: {_health.Value}");
|
||||
|
||||
_points = new RagonInt(0, -1000, 1000, false, 0);
|
||||
_points.Changed += () => Console.WriteLine($"[Ragon Property] Points: {_points.Value}");
|
||||
|
||||
_name = new RagonString("Edmand 000", false);
|
||||
_name.Changed += () => Console.WriteLine($"[Ragon Property] Name: {_name.Value}");
|
||||
|
||||
_entity = new RagonEntity(12, 0);
|
||||
_entity.State.AddProperty(_health);
|
||||
_entity.State.AddProperty(_points);
|
||||
_entity.State.AddProperty(_name);
|
||||
|
||||
client.Room.CreateEntity(_entity);
|
||||
}
|
||||
|
||||
public void OnFailed(RagonClient client, string message)
|
||||
{
|
||||
RagonLog.Trace("Failed to join");
|
||||
}
|
||||
|
||||
public void OnLeft(RagonClient client)
|
||||
{
|
||||
RagonLog.Trace("Left");
|
||||
}
|
||||
|
||||
public void OnDisconnected(RagonClient client, RagonDisconnect ragonDisconnect)
|
||||
{
|
||||
RagonLog.Trace("Disconnected");
|
||||
}
|
||||
|
||||
public void OnPlayerJoined(RagonClient client, RagonPlayer player)
|
||||
{
|
||||
RagonLog.Trace("Player joined");
|
||||
}
|
||||
|
||||
public void OnPlayerLeft(RagonClient client, RagonPlayer player)
|
||||
{
|
||||
RagonLog.Trace("Player left");
|
||||
}
|
||||
|
||||
public void OnOwnershipChanged(RagonClient client, RagonPlayer player)
|
||||
{
|
||||
RagonLog.Trace("Owner ship changed");
|
||||
}
|
||||
|
||||
public void OnLevel(RagonClient client, string sceneName)
|
||||
{
|
||||
RagonLog.Trace($"New level: {sceneName}");
|
||||
|
||||
client.Room.SceneLoaded();
|
||||
}
|
||||
|
||||
private float _timer = 0;
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if (_client.Status != RagonStatus.ROOM)
|
||||
return;
|
||||
|
||||
_timer += 1 / 60.0f;
|
||||
if (_timer > 1)
|
||||
{
|
||||
_health.Value += 20.0f;
|
||||
_points.Value += 10;
|
||||
_name.Value = $"Edmand 00{_client.Room.Local.PeerId}";
|
||||
Console.WriteLine($"{_health.Value} {_points.Value} {_name.Value}");
|
||||
_timer = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,131 +0,0 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
using ENet;
|
||||
using Ragon.Protocol;
|
||||
using Event = ENet.Event;
|
||||
using EventType = ENet.EventType;
|
||||
|
||||
namespace Ragon.Client
|
||||
{
|
||||
public class RagonENetConnection : INetworkConnection
|
||||
{
|
||||
public ushort Id { get; }
|
||||
|
||||
public NetworkStatistics Statistics { get; private set; }
|
||||
public INetworkChannel Reliable { get; private set; }
|
||||
public INetworkChannel Unreliable { get; private set; }
|
||||
|
||||
public Action<byte[]> OnData { get; set; }
|
||||
public Action OnConnected { get; set; }
|
||||
public Action<RagonDisconnect> OnDisconnected { get; set; }
|
||||
public ulong BytesSent { get; }
|
||||
public ulong BytesReceived { get; }
|
||||
public int Ping { get; }
|
||||
|
||||
private static bool _libraryLoaded = false;
|
||||
private Host _host;
|
||||
private Peer _peer;
|
||||
private Event _netEvent;
|
||||
|
||||
public RagonENetConnection()
|
||||
{
|
||||
_host = new Host();
|
||||
_host.Create();
|
||||
}
|
||||
|
||||
|
||||
public void Prepare()
|
||||
{
|
||||
if (!_libraryLoaded)
|
||||
{
|
||||
Library.Initialize();
|
||||
_libraryLoaded = true;
|
||||
}
|
||||
}
|
||||
|
||||
public void Disconnect()
|
||||
{
|
||||
if (_peer.IsSet)
|
||||
_peer.DisconnectNow(0);
|
||||
}
|
||||
|
||||
public void Connect(string server, ushort port, uint protocol)
|
||||
{
|
||||
Address address = new Address();
|
||||
address.SetHost(server);
|
||||
address.Port = port;
|
||||
|
||||
_peer = _host.Connect(address, 2, protocol);
|
||||
_peer.Timeout(32, 5000, 5000);
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
bool polled = false;
|
||||
while (!polled)
|
||||
{
|
||||
if (_host.CheckEvents(out _netEvent) <= 0)
|
||||
{
|
||||
if (_host.Service(0, out _netEvent) <= 0)
|
||||
break;
|
||||
|
||||
polled = true;
|
||||
}
|
||||
|
||||
switch (_netEvent.Type)
|
||||
{
|
||||
case EventType.None:
|
||||
break;
|
||||
case EventType.Connect:
|
||||
Statistics = new NetworkStatistics();
|
||||
Reliable = new ENetReliableChannel(_netEvent.Peer, 0);
|
||||
Unreliable = new ENetUnreliableChannel(_netEvent.Peer, 1);
|
||||
|
||||
OnConnected?.Invoke();
|
||||
break;
|
||||
case EventType.Disconnect:
|
||||
OnDisconnected?.Invoke(RagonDisconnect.SERVER);
|
||||
break;
|
||||
case EventType.Timeout:
|
||||
OnDisconnected?.Invoke(RagonDisconnect.TIMEOUT);
|
||||
break;
|
||||
case EventType.Receive:
|
||||
var data = new byte[_netEvent.Packet.Length];
|
||||
|
||||
_netEvent.Packet.CopyTo(data);
|
||||
_netEvent.Packet.Dispose();
|
||||
|
||||
OnData?.Invoke(data);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (_host.IsSet)
|
||||
{
|
||||
_host?.Flush();
|
||||
_host?.Dispose();
|
||||
}
|
||||
|
||||
if (_libraryLoaded)
|
||||
Library.Deinitialize();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using ENet;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public sealed class ENetUnreliableChannel : INetworkChannel
|
||||
{
|
||||
private Peer _peer;
|
||||
private byte _channelId;
|
||||
|
||||
public ENetUnreliableChannel(Peer peer, int channelId)
|
||||
{
|
||||
_peer = peer;
|
||||
_channelId = (byte) channelId;
|
||||
}
|
||||
|
||||
public void Send(byte[] data)
|
||||
{
|
||||
var newPacket = new Packet();
|
||||
newPacket.Create(data, data.Length, PacketFlags.None);
|
||||
|
||||
_peer.Send(_channelId, ref newPacket);
|
||||
}
|
||||
}
|
||||
@@ -1,132 +0,0 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
using ENet;
|
||||
using Ragon.Protocol;
|
||||
using Event = ENet.Event;
|
||||
using EventType = ENet.EventType;
|
||||
|
||||
namespace Ragon.Client
|
||||
{
|
||||
public class RagonNullConnection : INetworkConnection
|
||||
{
|
||||
public ushort Id { get; }
|
||||
|
||||
public NetworkStatistics Statistics { get; private set; }
|
||||
public INetworkChannel Reliable { get; private set; }
|
||||
public INetworkChannel Unreliable { get; private set; }
|
||||
|
||||
public Action<byte[]> OnData { get; set; }
|
||||
public Action OnConnected { get; set; }
|
||||
public Action<RagonDisconnect> OnDisconnected { get; set; }
|
||||
public ulong BytesSent { get; }
|
||||
public ulong BytesReceived { get; }
|
||||
public int Ping { get; }
|
||||
|
||||
private static bool _libraryLoaded = false;
|
||||
private Host _host;
|
||||
private Peer _peer;
|
||||
private Event _netEvent;
|
||||
|
||||
public RagonNullConnection()
|
||||
{
|
||||
_host = new Host();
|
||||
_host.Create();
|
||||
}
|
||||
|
||||
|
||||
public void Prepare()
|
||||
{
|
||||
if (!_libraryLoaded)
|
||||
{
|
||||
Library.Initialize();
|
||||
_libraryLoaded = true;
|
||||
}
|
||||
}
|
||||
|
||||
public void Disconnect()
|
||||
{
|
||||
if (_peer.IsSet)
|
||||
_peer.DisconnectNow(0);
|
||||
}
|
||||
|
||||
public void Connect(string server, ushort port, uint protocol)
|
||||
{
|
||||
Address address = new Address();
|
||||
address.SetHost(server);
|
||||
address.Port = port;
|
||||
|
||||
_peer = _host.Connect(address, 2, protocol);
|
||||
_peer.Timeout(32, 5000, 5000);
|
||||
|
||||
Statistics = new NetworkStatistics();
|
||||
Reliable = new NullReliableChannel(_netEvent.Peer, 0);
|
||||
Unreliable = new NullUnreliableChannel(_netEvent.Peer, 1);
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
bool polled = false;
|
||||
while (!polled)
|
||||
{
|
||||
if (_host.CheckEvents(out _netEvent) <= 0)
|
||||
{
|
||||
if (_host.Service(0, out _netEvent) <= 0)
|
||||
break;
|
||||
|
||||
polled = true;
|
||||
}
|
||||
|
||||
switch (_netEvent.Type)
|
||||
{
|
||||
case EventType.None:
|
||||
break;
|
||||
case EventType.Connect:
|
||||
|
||||
OnConnected?.Invoke();
|
||||
break;
|
||||
case EventType.Disconnect:
|
||||
OnDisconnected?.Invoke(RagonDisconnect.SERVER);
|
||||
break;
|
||||
case EventType.Timeout:
|
||||
OnDisconnected?.Invoke(RagonDisconnect.TIMEOUT);
|
||||
break;
|
||||
case EventType.Receive:
|
||||
var data = new byte[_netEvent.Packet.Length];
|
||||
|
||||
_netEvent.Packet.CopyTo(data);
|
||||
_netEvent.Packet.Dispose();
|
||||
|
||||
OnData?.Invoke(data);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (_host.IsSet)
|
||||
{
|
||||
_host?.Flush();
|
||||
_host?.Dispose();
|
||||
}
|
||||
|
||||
if (_libraryLoaded)
|
||||
Library.Deinitialize();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
namespace Ragon.Client.Simulation;
|
||||
|
||||
public class EntityListener : IRagonEntityListener
|
||||
{
|
||||
public void OnEntityCreated(RagonEntity entity)
|
||||
{
|
||||
var health = new RagonFloat(100.0f, false, 0);
|
||||
health.Value = 50;
|
||||
health.Changed += () => Console.WriteLine($"[Ragon Property] Another Health: {health.Value}");
|
||||
|
||||
var points = new RagonInt(0, -1000, 1000, false, 0);
|
||||
points.Changed += () => Console.WriteLine($"[Ragon Property] Anther Points: {points.Value}");
|
||||
|
||||
var name = new RagonString("Eduard", false);
|
||||
name.Changed += () => Console.WriteLine($"[Ragon Property] Another Name: {name.Value}");
|
||||
|
||||
entity.State.AddProperty(health);
|
||||
entity.State.AddProperty(points);
|
||||
entity.State.AddProperty(name);
|
||||
}
|
||||
}
|
||||
|
||||
public class Simulation
|
||||
{
|
||||
public void Start()
|
||||
{
|
||||
// INetworkConnection protocol = debug ? new RagonNullConnection() : new RagonENetConnection();
|
||||
// var network = new RagonClient(protocol, new EntityListener(), 30);
|
||||
// var game = new Game(network);
|
||||
// network.AddListener(game);
|
||||
// network.Connect("127.0.0.1", 5001, "1.0.0");
|
||||
// var dt = 1000 / 60.0f;
|
||||
// while (true)
|
||||
// {
|
||||
// game.Update();
|
||||
// network.Update(dt);
|
||||
// Thread.Sleep((int) dt);
|
||||
// }
|
||||
//
|
||||
// network.Disconnect();
|
||||
}
|
||||
}
|
||||
@@ -1,22 +1,22 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.1</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<LangVersion>10</LangVersion>
|
||||
<RootNamespace>Ragon.Client.Simulation</RootNamespace>
|
||||
<Authors>Eduard Kargin (Edmand46)</Authors>
|
||||
<Authors>Eduard Kargin</Authors>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<DebugType>none</DebugType>
|
||||
<OutputPath>/Users/edmand46/RagonProjects/ragon-oss-sdk/Assets/Ragon/Plugins/</OutputPath>
|
||||
<OutputPath></OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
<OutputPath>/Users/edmand46/RagonProjects/ragon-unity-sdk/Assets/Ragon/Runtime/Plugins</OutputPath>
|
||||
<OutputPath></OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,20 +19,48 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client
|
||||
{
|
||||
public sealed class RagonEntity
|
||||
public sealed class RagonEntity : IDisposable
|
||||
{
|
||||
private class EventSubscription : IDisposable
|
||||
{
|
||||
private List<Action<RagonPlayer, IRagonEvent>> _callbacks;
|
||||
private List<Action<RagonPlayer, IRagonEvent>> _localCallbacks;
|
||||
private Action<RagonPlayer, IRagonEvent> _callback;
|
||||
|
||||
public EventSubscription(
|
||||
List<Action<RagonPlayer, IRagonEvent>> callbacks,
|
||||
List<Action<RagonPlayer, IRagonEvent>> localCallbacks,
|
||||
Action<RagonPlayer, IRagonEvent> callback)
|
||||
{
|
||||
_callbacks = callbacks;
|
||||
_localCallbacks = localCallbacks;
|
||||
_callback = callback;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_callbacks?.Remove(_callback);
|
||||
_localCallbacks?.Remove(_callback);
|
||||
|
||||
_callbacks = null!;
|
||||
_localCallbacks = null!;
|
||||
_callback = null!;
|
||||
}
|
||||
}
|
||||
|
||||
private delegate void OnEventDelegate(RagonPlayer player, RagonBuffer serializer);
|
||||
|
||||
private RagonClient _client;
|
||||
|
||||
public ushort Id { get; private set; }
|
||||
public ushort Type { get; private set; }
|
||||
public bool Replication { get; private set; }
|
||||
|
||||
public RagonAuthority Authority { get; private set; }
|
||||
public RagonPlayer Owner { get; private set; }
|
||||
public RagonEntityState State { get; private set; }
|
||||
|
||||
public bool IsStatic => SceneId > 0;
|
||||
public bool IsReplicated { get; private set; }
|
||||
public bool IsAttached { get; private set; }
|
||||
public bool HasAuthority { get; private set; }
|
||||
|
||||
@@ -43,38 +71,39 @@ namespace Ragon.Client
|
||||
internal bool PropertiesChanged => _propertiesChanged;
|
||||
internal ushort SceneId => _sceneId;
|
||||
|
||||
private ushort _sceneId;
|
||||
private readonly ushort _sceneId;
|
||||
private bool _propertiesChanged;
|
||||
|
||||
private RagonPayload _spawnPayload;
|
||||
private RagonPayload _destroyPayload;
|
||||
|
||||
private Dictionary<int, OnEventDelegate> _events = new();
|
||||
private Dictionary<int, Action<RagonPlayer, IRagonEvent>> _localEvents = new();
|
||||
private readonly Dictionary<int, OnEventDelegate> _events = new();
|
||||
private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _localListeners = new();
|
||||
private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _listeners = new();
|
||||
|
||||
public RagonEntity(ushort type = 0, ushort sceneId = 0)
|
||||
public RagonEntity(ushort type = 0, ushort sceneId = 0, bool replicated = true)
|
||||
{
|
||||
State = new RagonEntityState(this);
|
||||
Type = type;
|
||||
IsReplicated = replicated;
|
||||
|
||||
_spawnPayload = new RagonPayload(0);
|
||||
_destroyPayload = new RagonPayload(0);
|
||||
_sceneId = sceneId;
|
||||
}
|
||||
|
||||
internal void Attach(RagonClient client, ushort entityId, ushort entityType, bool hasAuthority, RagonPlayer owner, RagonPayload payload)
|
||||
internal void Attach()
|
||||
{
|
||||
Type = entityType;
|
||||
Id = entityId;
|
||||
Owner = owner;
|
||||
IsAttached = true;
|
||||
Replication = true;
|
||||
HasAuthority = hasAuthority;
|
||||
|
||||
_client = client;
|
||||
_spawnPayload = payload;
|
||||
|
||||
Attached?.Invoke(this);
|
||||
}
|
||||
|
||||
public void SetReplication(bool enabled)
|
||||
{
|
||||
IsReplicated = enabled;
|
||||
}
|
||||
|
||||
internal void Detach(RagonPayload payload)
|
||||
{
|
||||
_destroyPayload = payload;
|
||||
@@ -86,26 +115,34 @@ namespace Ragon.Client
|
||||
{
|
||||
var payload = new T();
|
||||
if (data.Size <= 0) return payload;
|
||||
|
||||
|
||||
var buffer = new RagonBuffer();
|
||||
|
||||
|
||||
data.Write(buffer);
|
||||
|
||||
|
||||
payload.Deserialize(buffer);
|
||||
|
||||
|
||||
return payload;
|
||||
}
|
||||
|
||||
public void AttachPayload(IRagonPayload? payload)
|
||||
{
|
||||
if (payload == null) return;
|
||||
|
||||
var buffer = new RagonBuffer();
|
||||
payload.Serialize(buffer);
|
||||
|
||||
_spawnPayload = new RagonPayload();
|
||||
_spawnPayload.Read(buffer);
|
||||
}
|
||||
public void Prepare(
|
||||
RagonClient client,
|
||||
ushort entityId,
|
||||
ushort entityType,
|
||||
bool hasAuthority,
|
||||
RagonPlayer player,
|
||||
RagonPayload payload
|
||||
)
|
||||
{
|
||||
Type = entityType;
|
||||
Id = entityId;
|
||||
HasAuthority = hasAuthority;
|
||||
|
||||
_client = client;
|
||||
_spawnPayload = payload;
|
||||
|
||||
Owner = player;
|
||||
}
|
||||
|
||||
public T GetAttachPayload<T>() where T : IRagonPayload, new()
|
||||
{
|
||||
@@ -155,29 +192,31 @@ namespace Ragon.Client
|
||||
return;
|
||||
}
|
||||
|
||||
var eventCode = _client.Event.GetEventCode(evnt);
|
||||
if (target != RagonTarget.ExceptOwner)
|
||||
{
|
||||
if (replicationMode == RagonReplicationMode.Local)
|
||||
{
|
||||
var eventCode = _client.Event.GetEventCode(evnt);
|
||||
_localEvents[eventCode].Invoke(_client.Room.Local, evnt);
|
||||
var localListeners = _localListeners[eventCode];
|
||||
foreach (var listener in localListeners)
|
||||
listener.Invoke(_client.Room.Local, evnt);
|
||||
return;
|
||||
}
|
||||
|
||||
if (replicationMode == RagonReplicationMode.LocalAndServer)
|
||||
{
|
||||
var eventCode = _client.Event.GetEventCode(evnt);
|
||||
_localEvents[eventCode].Invoke(_client.Room.Local, evnt);
|
||||
var localListeners = _localListeners[eventCode];
|
||||
foreach (var listener in localListeners)
|
||||
listener.Invoke(_client.Room.Local, evnt);
|
||||
}
|
||||
}
|
||||
|
||||
var evntId = _client.Event.GetEventCode(evnt);
|
||||
var buffer = _client.Buffer;
|
||||
|
||||
buffer.Clear();
|
||||
buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
|
||||
buffer.WriteUShort(Id);
|
||||
buffer.WriteUShort(evntId);
|
||||
buffer.WriteUShort(eventCode);
|
||||
buffer.WriteByte((byte)replicationMode);
|
||||
buffer.WriteByte((byte)target);
|
||||
|
||||
@@ -187,25 +226,39 @@ namespace Ragon.Client
|
||||
_client.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
public void OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
|
||||
public IDisposable OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
|
||||
{
|
||||
var t = new TEvent();
|
||||
var eventCode = _client.Event.GetEventCode(t);
|
||||
var action = (RagonPlayer player, IRagonEvent eventData) => callback.Invoke(player, (TEvent)eventData);
|
||||
|
||||
if (_events.ContainsKey(eventCode))
|
||||
if (!_listeners.TryGetValue(eventCode, out var callbacks))
|
||||
{
|
||||
_events.Remove(eventCode);
|
||||
_localEvents.Remove(eventCode);
|
||||
|
||||
RagonLog.Warn($"Event already {eventCode} subscribed, removed old one!");
|
||||
callbacks = new List<Action<RagonPlayer, IRagonEvent>>();
|
||||
_listeners.Add(eventCode, callbacks);
|
||||
}
|
||||
|
||||
_localEvents.Add(eventCode, (player, eventData) => { callback.Invoke(player, (TEvent)eventData); });
|
||||
_events.Add(eventCode, (player, serializer) =>
|
||||
if (!_localListeners.TryGetValue(eventCode, out var localCallbacks))
|
||||
{
|
||||
t.Deserialize(serializer);
|
||||
callback.Invoke(player, t);
|
||||
});
|
||||
localCallbacks = new List<Action<RagonPlayer, IRagonEvent>>();
|
||||
_localListeners.Add(eventCode, localCallbacks);
|
||||
}
|
||||
|
||||
callbacks.Add(action);
|
||||
localCallbacks.Add(action);
|
||||
|
||||
if (!_events.ContainsKey(eventCode))
|
||||
{
|
||||
_events.Add(eventCode, (player, serializer) =>
|
||||
{
|
||||
t.Deserialize(serializer);
|
||||
|
||||
foreach (var callbackListener in callbacks)
|
||||
callbackListener.Invoke(player, t);
|
||||
});
|
||||
}
|
||||
|
||||
return new EventSubscription(callbacks, localCallbacks, action);
|
||||
}
|
||||
|
||||
internal void Write(RagonBuffer buffer)
|
||||
@@ -217,7 +270,6 @@ namespace Ragon.Client
|
||||
_propertiesChanged = false;
|
||||
}
|
||||
|
||||
|
||||
internal void Read(RagonBuffer buffer)
|
||||
{
|
||||
State.ReadState(buffer);
|
||||
@@ -225,6 +277,8 @@ namespace Ragon.Client
|
||||
|
||||
internal void Event(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
|
||||
{
|
||||
if (!IsReplicated) return;
|
||||
|
||||
if (_events.TryGetValue(eventCode, out var evnt))
|
||||
evnt?.Invoke(caller, buffer);
|
||||
else
|
||||
@@ -245,5 +299,12 @@ namespace Ragon.Client
|
||||
|
||||
OwnershipChanged?.Invoke(prevOwner, player);
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_events.Clear();
|
||||
_listeners.Clear();
|
||||
_localListeners.Clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,8 +19,10 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public struct RagonPayload
|
||||
public class RagonPayload
|
||||
{
|
||||
public static RagonPayload Empty = new RagonPayload(0);
|
||||
|
||||
private readonly uint[] _data = new uint[128];
|
||||
private readonly int _size = 0;
|
||||
|
||||
@@ -32,16 +34,12 @@ public struct RagonPayload
|
||||
|
||||
public void Read(RagonBuffer buffer)
|
||||
{
|
||||
var readOnlySpan = _data.AsSpan();
|
||||
|
||||
buffer.ReadSpan(ref readOnlySpan, _size);
|
||||
buffer.ReadArray(_data, _size);
|
||||
}
|
||||
|
||||
public void Write(RagonBuffer buffer)
|
||||
{
|
||||
ReadOnlySpan<uint> readOnlySpan = _data.AsSpan();
|
||||
|
||||
buffer.WriteSpan(ref readOnlySpan, _size);
|
||||
buffer.WriteArray(_data, _size);
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -30,7 +30,7 @@ namespace Ragon.Client
|
||||
public int Size => _size;
|
||||
|
||||
private RagonBuffer _propertyBuffer;
|
||||
private RagonEntity _entity;
|
||||
private RagonEntity _entity;
|
||||
private bool _dirty;
|
||||
private int _size;
|
||||
private int _ticks;
|
||||
@@ -46,7 +46,7 @@ namespace Ragon.Client
|
||||
_priority = priority;
|
||||
_fixed = false;
|
||||
_propertyBuffer = new RagonBuffer();
|
||||
|
||||
|
||||
InvokeLocal = invokeLocal;
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace Ragon.Client
|
||||
|
||||
protected void InvokeChanged()
|
||||
{
|
||||
if (!InvokeLocal)
|
||||
if (_entity.HasAuthority)
|
||||
return;
|
||||
|
||||
Changed?.Invoke();
|
||||
@@ -71,8 +71,9 @@ namespace Ragon.Client
|
||||
|
||||
protected void MarkAsChanged()
|
||||
{
|
||||
InvokeChanged();
|
||||
|
||||
if (InvokeLocal)
|
||||
Changed?.Invoke();
|
||||
|
||||
if (_dirty || _entity == null)
|
||||
return;
|
||||
|
||||
@@ -101,34 +102,34 @@ namespace Ragon.Client
|
||||
internal void Write(RagonBuffer buffer)
|
||||
{
|
||||
_propertyBuffer.Clear();
|
||||
|
||||
|
||||
if (_fixed)
|
||||
{
|
||||
Serialize(_propertyBuffer);
|
||||
|
||||
buffer.FromBuffer(_propertyBuffer, _size);
|
||||
|
||||
buffer.CopyFrom(_propertyBuffer, _size);
|
||||
return;
|
||||
}
|
||||
|
||||
Serialize(_propertyBuffer);
|
||||
|
||||
var propertySize = (ushort) _propertyBuffer.WriteOffset;
|
||||
buffer.WriteUShort(propertySize);;
|
||||
buffer.FromBuffer(_propertyBuffer, propertySize);
|
||||
var propertySize = (ushort)_propertyBuffer.WriteOffset;
|
||||
buffer.WriteUShort(propertySize);
|
||||
buffer.CopyFrom(_propertyBuffer, propertySize);
|
||||
}
|
||||
|
||||
internal void Read(RagonBuffer buffer)
|
||||
{
|
||||
_propertyBuffer.Clear();
|
||||
|
||||
|
||||
if (_fixed)
|
||||
{
|
||||
buffer.ToBuffer(_propertyBuffer, _size);
|
||||
|
||||
|
||||
Deserialize(_propertyBuffer);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
var propSize = buffer.ReadUShort();
|
||||
buffer.ToBuffer(_propertyBuffer, propSize);
|
||||
Deserialize(_propertyBuffer);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class AuthorizeFailedHandler: Handler
|
||||
internal class AuthorizeFailedHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
public AuthorizeFailedHandler(RagonListenerList list)
|
||||
@@ -27,9 +27,9 @@ internal class AuthorizeFailedHandler: Handler
|
||||
_listenerList = list;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var message = buffer.ReadString();
|
||||
var message = reader.ReadString();
|
||||
_listenerList.OnAuthorizationFailed(message);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,21 +19,26 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class AuthorizeSuccessHandler: Handler
|
||||
internal class AuthorizeSuccessHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
private readonly RagonClient _client;
|
||||
|
||||
public AuthorizeSuccessHandler(RagonListenerList listenerList)
|
||||
public AuthorizeSuccessHandler(
|
||||
RagonClient client,
|
||||
RagonListenerList listenerList)
|
||||
{
|
||||
_client = client;
|
||||
_listenerList = listenerList;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var playerId = buffer.ReadString();
|
||||
var playerName = buffer.ReadString();
|
||||
var playerPayload = buffer.ReadString();
|
||||
var playerId = reader.ReadString();
|
||||
var playerName = reader.ReadString();
|
||||
var playerPayload = reader.ReadString();
|
||||
|
||||
_client.SetStatus(RagonStatus.LOBBY);
|
||||
_listenerList.OnAuthorizationSuccess(playerId, playerName, playerPayload);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -18,41 +18,52 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class EntityCreateHandler : Handler
|
||||
internal class EntityCreateHandler : IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
private readonly IRagonEntityListener _entityListener;
|
||||
|
||||
public EntityCreateHandler(
|
||||
RagonClient client,
|
||||
RagonPlayerCache playerCache,
|
||||
RagonEntityCache entityCache
|
||||
RagonEntityCache entityCache,
|
||||
IRagonEntityListener entityListener
|
||||
)
|
||||
{
|
||||
_client = client;
|
||||
_entityCache = entityCache;
|
||||
_playerCache = playerCache;
|
||||
_entityListener = entityListener;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var attachId = buffer.ReadUShort();
|
||||
var entityType = buffer.ReadUShort();
|
||||
var entityId = buffer.ReadUShort();
|
||||
var ownerId = buffer.ReadUShort();
|
||||
var attachId = reader.ReadUShort();
|
||||
var entityType = reader.ReadUShort();
|
||||
var entityId = reader.ReadUShort();
|
||||
var ownerId = reader.ReadUShort();
|
||||
var player = _playerCache.GetPlayerByPeer(ownerId);
|
||||
var payload = new RagonPayload(buffer.Capacity);
|
||||
payload.Read(buffer);
|
||||
var payload = new RagonPayload(reader.Capacity);
|
||||
payload.Read(reader);
|
||||
|
||||
if (player == null)
|
||||
{
|
||||
RagonLog.Warn($"Owner {ownerId}|{player.Name} not found in players");
|
||||
|
||||
_playerCache.Dump();
|
||||
return;
|
||||
}
|
||||
|
||||
var hasAuthority = _playerCache.Local.Id == player.Id;
|
||||
var entity = _entityCache.OnCreate(attachId, entityType, 0, entityId, hasAuthority);
|
||||
entity.Attach(_client, entityId, entityType, hasAuthority, player, payload);
|
||||
var entity = _entityCache.TryGetEntity(attachId, entityType, 0, entityId, hasAuthority, out var hasCreated);
|
||||
|
||||
entity.Prepare(_client, entityId, entityType, hasAuthority, player, payload);
|
||||
|
||||
if (hasCreated)
|
||||
_entityListener.OnEntityCreated(entity);
|
||||
|
||||
entity.Attach();
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -18,40 +18,39 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class EntityEventHandler : Handler
|
||||
internal class EntityEventHandler : IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
|
||||
public EntityEventHandler(
|
||||
RagonClient client,
|
||||
RagonPlayerCache playerCache,
|
||||
RagonEntityCache entityCache
|
||||
)
|
||||
public EntityEventHandler(
|
||||
RagonPlayerCache playerCache,
|
||||
RagonEntityCache entityCache
|
||||
)
|
||||
{
|
||||
_playerCache = playerCache;
|
||||
_entityCache = entityCache;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var eventCode = reader.ReadUShort();
|
||||
var peerId = reader.ReadUShort();
|
||||
var executionMode = (RagonReplicationMode)reader.ReadByte();
|
||||
var entityId = reader.ReadUShort();
|
||||
|
||||
var player = _playerCache.GetPlayerByPeer(peerId);
|
||||
if (player == null)
|
||||
{
|
||||
_client = client;
|
||||
_playerCache = playerCache;
|
||||
_entityCache = entityCache;
|
||||
RagonLog.Error($"Player with peerId:{peerId} not found as owner of event with code:{eventCode}");
|
||||
|
||||
_playerCache.Dump();
|
||||
return;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
{
|
||||
var eventCode = buffer.ReadUShort();
|
||||
var peerId = buffer.ReadUShort();
|
||||
var executionMode = (RagonReplicationMode)buffer.ReadByte();
|
||||
var entityId = buffer.ReadUShort();
|
||||
if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
|
||||
return;
|
||||
|
||||
var player = _playerCache.GetPlayerByPeer(peerId);
|
||||
if (player == null)
|
||||
{
|
||||
RagonLog.Warn($"Player not found for event {eventCode}");
|
||||
return;
|
||||
}
|
||||
|
||||
if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
|
||||
return;
|
||||
|
||||
_entityCache.OnEvent(player, entityId, eventCode, buffer);
|
||||
}
|
||||
_entityCache.OnEvent(player, entityId, eventCode, reader);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class EntityOwnershipHandler: Handler
|
||||
internal class EntityOwnershipHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
@@ -35,18 +35,26 @@ internal class EntityOwnershipHandler: Handler
|
||||
_entityCache = entityCache;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var newOwnerId = buffer.ReadUShort();
|
||||
var entities = buffer.ReadUShort();
|
||||
var newOwnerId = reader.ReadUShort();
|
||||
var entities = reader.ReadUShort();
|
||||
|
||||
var player = _playerCache.GetPlayerByPeer(newOwnerId);
|
||||
if (player == null)
|
||||
{
|
||||
RagonLog.Error($"Player with Id:{newOwnerId} not found in cache");
|
||||
|
||||
_playerCache.Dump();
|
||||
return;
|
||||
}
|
||||
|
||||
for (var i = 0; i < entities; i++)
|
||||
{
|
||||
var entityId = buffer.ReadUShort();
|
||||
var entityId = reader.ReadUShort();
|
||||
_entityCache.OnOwnershipChanged(player, entityId);
|
||||
|
||||
RagonLog.Trace("Entity changed owner: " + entityId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class EntityRemoveHandler: Handler
|
||||
internal class EntityRemoveHandler: IHandler
|
||||
{
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
|
||||
@@ -28,11 +28,11 @@ internal class EntityRemoveHandler: Handler
|
||||
_entityCache = entityCache;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var entityId = buffer.ReadUShort();
|
||||
var payload = new RagonPayload(buffer.Capacity);
|
||||
payload.Read(buffer);
|
||||
var entityId = reader.ReadUShort();
|
||||
var payload = new RagonPayload(reader.Capacity);
|
||||
payload.Read(reader);
|
||||
|
||||
_entityCache.OnDestroy(entityId, payload);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -18,7 +18,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class StateEntityHandler: Handler
|
||||
internal class StateEntityHandler: IHandler
|
||||
{
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
|
||||
@@ -27,13 +27,13 @@ internal class StateEntityHandler: Handler
|
||||
_entityCache = entityCache;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var entitiesCount = buffer.ReadUShort();
|
||||
var entitiesCount = reader.ReadUShort();
|
||||
for (var i = 0; i < entitiesCount; i++)
|
||||
{
|
||||
var entityId = buffer.ReadUShort();
|
||||
_entityCache.OnState(entityId, buffer);
|
||||
var entityId = reader.ReadUShort();
|
||||
_entityCache.OnState(entityId, reader);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public interface Handler
|
||||
public interface IHandler
|
||||
{
|
||||
public void Handle(RagonBuffer buffer);
|
||||
public void Handle(RagonBuffer reader);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class JoinFailedHandler: Handler
|
||||
internal class JoinFailedHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
|
||||
@@ -28,9 +28,9 @@ internal class JoinFailedHandler: Handler
|
||||
_listenerList = listenerList;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var message = buffer.ReadString();
|
||||
var message = reader.ReadString();
|
||||
_listenerList.OnFailed(message);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,9 +19,9 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public struct RagonRoomInformation
|
||||
public struct RoomParameters
|
||||
{
|
||||
public RagonRoomInformation(string roomId, string playerId, string ownerId, ushort min, ushort max)
|
||||
public RoomParameters(string roomId, string playerId, string ownerId, ushort min, ushort max)
|
||||
{
|
||||
RoomId = roomId;
|
||||
PlayerId = playerId;
|
||||
@@ -37,44 +37,62 @@ public struct RagonRoomInformation
|
||||
public ushort Max { get; private set; }
|
||||
}
|
||||
|
||||
internal class JoinSuccessHandler : Handler
|
||||
internal class JoinSuccessHandler : IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonBuffer _buffer;
|
||||
|
||||
public JoinSuccessHandler(
|
||||
RagonClient client,
|
||||
RagonBuffer buffer,
|
||||
RagonListenerList listenerList,
|
||||
RagonPlayerCache playerCache,
|
||||
RagonEntityCache entityCache
|
||||
)
|
||||
{
|
||||
_buffer = buffer;
|
||||
_client = client;
|
||||
_listenerList = listenerList;
|
||||
_entityCache = entityCache;
|
||||
_playerCache = playerCache;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var roomId = buffer.ReadString();
|
||||
var localId = buffer.ReadString();
|
||||
var ownerId = buffer.ReadString();
|
||||
var min = buffer.ReadUShort();
|
||||
var max = buffer.ReadUShort();
|
||||
var map = buffer.ReadString();
|
||||
|
||||
var scene = new RagonScene(_client, _playerCache, _entityCache);
|
||||
var roomInfo = new RagonRoomInformation(roomId, localId, ownerId, min, max);
|
||||
var roomId = reader.ReadString();
|
||||
var min = reader.ReadUShort();
|
||||
var max = reader.ReadUShort();
|
||||
var sceneName = reader.ReadString();
|
||||
var localId = reader.ReadString();
|
||||
var ownerId = reader.ReadString();
|
||||
|
||||
_playerCache.SetOwnerAndLocal(ownerId, localId);
|
||||
|
||||
var scene = new RagonScene(_client, _playerCache, _entityCache, sceneName);
|
||||
var roomInfo = new RoomParameters(roomId, localId, ownerId, min, max);
|
||||
var room = new RagonRoom(_client, _entityCache, _playerCache, roomInfo, scene);
|
||||
|
||||
_playerCache.SetOwnerAndLocal(ownerId, localId);
|
||||
room.UserData.Read(reader);
|
||||
|
||||
var playersCount = reader.ReadUShort();
|
||||
RagonLog.Trace("Players: " + playersCount);
|
||||
for (var i = 0; i < playersCount; i++)
|
||||
{
|
||||
var playerPeerId = reader.ReadUShort();
|
||||
var playerId = reader.ReadString();
|
||||
var playerName = reader.ReadString();
|
||||
|
||||
var player = _playerCache.AddPlayer(playerPeerId, playerId, playerName);
|
||||
|
||||
player.UserData.Read(reader);
|
||||
|
||||
RagonLog.Trace($"Player {playerPeerId} - {playerId} - {playerName}");
|
||||
}
|
||||
|
||||
_client.AssignRoom(room);
|
||||
_listenerList.OnLevel(map);
|
||||
_client.SetStatus(RagonStatus.ROOM);
|
||||
|
||||
_listenerList.OnJoined();
|
||||
_listenerList.OnSceneRequest(sceneName);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class LeaveRoomHandler : Handler
|
||||
internal class LeaveRoomHandler : IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonListenerList _listenerList;
|
||||
@@ -35,7 +35,7 @@ internal class LeaveRoomHandler : Handler
|
||||
_entityCache = entityCache;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
_listenerList.OnLeft();
|
||||
_entityCache.Cleanup();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -18,7 +18,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class SceneLoadHandler: Handler
|
||||
internal class SceneLoadHandler: IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonListenerList _listenerList;
|
||||
@@ -32,13 +32,14 @@ internal class SceneLoadHandler: Handler
|
||||
_listenerList = listenerList;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var sceneName = buffer.ReadString();
|
||||
var sceneName = reader.ReadString();
|
||||
var room = _client.Room;
|
||||
|
||||
room.Cleanup();
|
||||
room.Update(sceneName);
|
||||
|
||||
_listenerList.OnLevel(sceneName);
|
||||
_listenerList.OnSceneRequest(sceneName);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,12 +19,12 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class OwnershipRoomHandler: Handler
|
||||
internal class OwnershipRoomHandler : IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
|
||||
|
||||
public OwnershipRoomHandler(
|
||||
RagonListenerList listenerList,
|
||||
RagonPlayerCache playerCache,
|
||||
@@ -34,11 +34,18 @@ internal class OwnershipRoomHandler: Handler
|
||||
_playerCache = playerCache;
|
||||
_entityCache = entityCache;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var newOwnerId = buffer.ReadUShort();
|
||||
var newOwnerId = reader.ReadUShort();
|
||||
var player = _playerCache.GetPlayerByPeer(newOwnerId);
|
||||
if (player == null)
|
||||
{
|
||||
RagonLog.Warn($"Player with peerId:{newOwnerId} not found in cache");
|
||||
|
||||
_playerCache.Dump();
|
||||
return;
|
||||
}
|
||||
|
||||
_playerCache.OnOwnershipChanged(newOwnerId);
|
||||
_listenerList.OnOwnershipChanged(player);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class PlayerJoinHandler : Handler
|
||||
internal class PlayerJoinHandler : IHandler
|
||||
{
|
||||
private RagonPlayerCache _playerCache;
|
||||
private RagonListenerList _listenerList;
|
||||
@@ -33,11 +33,11 @@ internal class PlayerJoinHandler : Handler
|
||||
_listenerList = listenerList;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var playerPeerId = buffer.ReadUShort();
|
||||
var playerId = buffer.ReadString();
|
||||
var playerName = buffer.ReadString();
|
||||
var playerPeerId = reader.ReadUShort();
|
||||
var playerId = reader.ReadString();
|
||||
var playerName = reader.ReadString();
|
||||
|
||||
_playerCache.AddPlayer(playerPeerId, playerId, playerName);
|
||||
|
||||
@@ -45,6 +45,6 @@ internal class PlayerJoinHandler : Handler
|
||||
if (player != null)
|
||||
_listenerList.OnPlayerJoined(player);
|
||||
else
|
||||
RagonLog.Trace($"[Joined] {playerId}");
|
||||
RagonLog.Warn($"Player with Id:{playerId} not found in cache");
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class PlayerLeftHandler : Handler
|
||||
internal class PlayerLeftHandler : IHandler
|
||||
{
|
||||
private RagonPlayerCache _playerCache;
|
||||
private RagonEntityCache _entityCache;
|
||||
@@ -36,25 +36,30 @@ internal class PlayerLeftHandler : Handler
|
||||
_listenerList = listenerList;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var playerId = buffer.ReadString();
|
||||
var playerId = reader.ReadString();
|
||||
var player = _playerCache.GetPlayerById(playerId);
|
||||
if (player != null)
|
||||
{
|
||||
_playerCache.RemovePlayer(playerId);
|
||||
_listenerList.OnPlayerLeft(player);
|
||||
|
||||
var entities = buffer.ReadUShort();
|
||||
var entities = reader.ReadUShort();
|
||||
var toDeleteIds = new ushort[entities];
|
||||
for (var i = 0; i < entities; i++)
|
||||
{
|
||||
var entityId = buffer.ReadUShort();
|
||||
var entityId = reader.ReadUShort();
|
||||
toDeleteIds[i] = entityId;
|
||||
}
|
||||
|
||||
var emptyPayload = new RagonPayload(0);
|
||||
foreach (var id in toDeleteIds)
|
||||
_entityCache.OnDestroy(id, new RagonPayload());
|
||||
_entityCache.OnDestroy(id, emptyPayload);
|
||||
}
|
||||
else
|
||||
{
|
||||
RagonLog.Warn($"Player with Id:{playerId} not found in cache");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
/*
|
||||
* Copyright 2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client
|
||||
{
|
||||
|
||||
internal class PlayerUserDataHandler: IHandler
|
||||
{
|
||||
private RagonPlayerCache _playerCache;
|
||||
private RagonListenerList _listenerList;
|
||||
|
||||
public PlayerUserDataHandler(
|
||||
RagonPlayerCache playerCache,
|
||||
RagonListenerList listenerList
|
||||
)
|
||||
{
|
||||
_playerCache = playerCache;
|
||||
_listenerList = listenerList;
|
||||
}
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var playerPeerId = reader.ReadUShort();
|
||||
var player = _playerCache.GetPlayerByPeer(playerPeerId);
|
||||
|
||||
if (player != null)
|
||||
{
|
||||
var changes = player.UserData.Read(reader);
|
||||
|
||||
_listenerList.OnPlayerUserData(player, changes);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
RagonLog.Warn("Received user data for unknown player.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class RoomDataHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listeners;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
|
||||
public RoomDataHandler(
|
||||
RagonPlayerCache playerCache,
|
||||
RagonListenerList listeners)
|
||||
{
|
||||
_playerCache = playerCache;
|
||||
_listeners = listeners;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var rawData = reader.RawData;
|
||||
var peerId = (ushort)(rawData[1] + (rawData[2] << 8));
|
||||
|
||||
RagonPlayer player = null;
|
||||
if (peerId != 10000)
|
||||
{
|
||||
player = _playerCache.GetPlayerByPeer(peerId);
|
||||
if (player == null)
|
||||
{
|
||||
RagonLog.Error($"Player with peerId:{peerId} not found");
|
||||
|
||||
_playerCache.Dump();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
var headerSize = 3;
|
||||
var payload = new byte[rawData.Length - headerSize];
|
||||
|
||||
Array.Copy(rawData, headerSize, payload, 0, payload.Length);
|
||||
|
||||
_listeners.OnData(player, payload);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public class RoomEventHandler : IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
|
||||
public RoomEventHandler(
|
||||
RagonClient client,
|
||||
RagonPlayerCache playerCache
|
||||
)
|
||||
{
|
||||
_client = client;
|
||||
_playerCache = playerCache;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
{
|
||||
var eventCode = buffer.ReadUShort();
|
||||
var peerId = buffer.ReadUShort();
|
||||
var executionMode = (RagonReplicationMode)buffer.ReadByte();
|
||||
|
||||
var player = _playerCache.GetPlayerByPeer(peerId);
|
||||
if (player == null)
|
||||
{
|
||||
RagonLog.Error($"Player with peerId:{peerId} not found as owner of event with code:{eventCode}");
|
||||
|
||||
_playerCache.Dump();
|
||||
return;
|
||||
}
|
||||
|
||||
if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
|
||||
return;
|
||||
|
||||
_client.Room.HandleEvent(eventCode, player, buffer);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class RoomListHandler: IHandler
|
||||
{
|
||||
private RagonListenerList _listenerList;
|
||||
private RagonSession _session;
|
||||
|
||||
public RoomListHandler(RagonSession session, RagonListenerList list)
|
||||
{
|
||||
_session = session;
|
||||
_listenerList = list;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var roomCount = reader.ReadUShort();
|
||||
var roomList = new RagonRoomInformation[roomCount];
|
||||
for (int i = 0; i < roomCount; i++)
|
||||
{
|
||||
var id = reader.ReadString();
|
||||
var scene = reader.ReadString();
|
||||
var maxPlayers = reader.ReadUShort();
|
||||
var minPlayers = reader.ReadUShort();
|
||||
var players = reader.ReadUShort();
|
||||
|
||||
var roomInfo = new RagonRoomInformation()
|
||||
{
|
||||
Id = id,
|
||||
Scene = scene,
|
||||
PlayerCount = players,
|
||||
PlayerMax = maxPlayers,
|
||||
PlayerMin = minPlayers,
|
||||
Properties = new Dictionary<string, byte[]>()
|
||||
};
|
||||
|
||||
roomList[i] = roomInfo;
|
||||
}
|
||||
|
||||
_listenerList.OnRoomList(roomList);
|
||||
}
|
||||
}
|
||||
+16
-16
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,25 +14,25 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
using ENet;
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public sealed class NullUnreliableChannel : INetworkChannel
|
||||
namespace Ragon.Client
|
||||
{
|
||||
private Peer _peer;
|
||||
private byte _channelId;
|
||||
|
||||
public NullUnreliableChannel(Peer peer, int channelId)
|
||||
internal class RoomUserDataHandler : IHandler
|
||||
{
|
||||
_peer = peer;
|
||||
_channelId = (byte) channelId;
|
||||
}
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonListenerList _listenerList;
|
||||
|
||||
public void Send(byte[] data)
|
||||
{
|
||||
|
||||
public RoomUserDataHandler(RagonClient client, RagonListenerList listenerList)
|
||||
{
|
||||
_client = client;
|
||||
_listenerList = listenerList;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer reader)
|
||||
{
|
||||
var changes = _client.Room?.UserData.Read(reader);
|
||||
_listenerList.OnRoomUserData(changes);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -20,21 +20,24 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class SnapshotHandler : Handler
|
||||
internal class SnapshotHandler : IHandler
|
||||
{
|
||||
private RagonClient _client;
|
||||
private RagonListenerList _listenerList;
|
||||
private RagonEntityCache _entityCache;
|
||||
private RagonPlayerCache _playerCache;
|
||||
private readonly IRagonEntityListener _entityListener;
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonListenerList _listenerList;
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
|
||||
public SnapshotHandler(
|
||||
RagonClient ragonClient,
|
||||
RagonListenerList listenerList,
|
||||
RagonEntityCache entityCache,
|
||||
RagonPlayerCache playerCache
|
||||
RagonPlayerCache playerCache,
|
||||
IRagonEntityListener entityListener
|
||||
)
|
||||
{
|
||||
_client = ragonClient;
|
||||
_entityListener = entityListener;
|
||||
_listenerList = listenerList;
|
||||
_entityCache = entityCache;
|
||||
_playerCache = playerCache;
|
||||
@@ -42,16 +45,7 @@ internal class SnapshotHandler : Handler
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
{
|
||||
var playersCount = buffer.ReadUShort();
|
||||
RagonLog.Trace("Players: " + playersCount);
|
||||
for (var i = 0; i < playersCount; i++)
|
||||
{
|
||||
var playerPeerId = buffer.ReadUShort();
|
||||
var playerId = buffer.ReadString();
|
||||
var playerName = buffer.ReadString();
|
||||
|
||||
_playerCache.AddPlayer(playerPeerId, playerId, playerName);
|
||||
}
|
||||
var entities = new List<RagonEntity>();
|
||||
var dynamicEntities = buffer.ReadUShort();
|
||||
RagonLog.Trace("Dynamic Entities: " + dynamicEntities);
|
||||
for (var i = 0; i < dynamicEntities; i++)
|
||||
@@ -60,16 +54,32 @@ internal class SnapshotHandler : Handler
|
||||
var entityId = buffer.ReadUShort();
|
||||
var ownerPeerId = buffer.ReadUShort();
|
||||
var payloadSize = buffer.ReadUShort();
|
||||
|
||||
var player = _playerCache.GetPlayerByPeer(ownerPeerId);
|
||||
|
||||
var payload = new RagonPayload(payloadSize);
|
||||
payload.Read(buffer);
|
||||
if (player == null)
|
||||
{
|
||||
RagonLog.Error($"Player not found with peerId: {ownerPeerId}");
|
||||
|
||||
_playerCache.Dump();
|
||||
return;
|
||||
}
|
||||
|
||||
var hasAuthority = _playerCache.Local.Id == player.Id;
|
||||
var entity = _entityCache.OnCreate(0, entityType, 0, entityId, hasAuthority);
|
||||
|
||||
var entity = _entityCache.TryGetEntity(0, entityType, 0, entityId, hasAuthority, out _);
|
||||
var payload = RagonPayload.Empty;
|
||||
if (payloadSize > 0)
|
||||
{
|
||||
payload = new RagonPayload(payloadSize);
|
||||
payload.Read(buffer);
|
||||
}
|
||||
|
||||
entity.Prepare(_client, entityId, entityType, hasAuthority, player, payload);
|
||||
|
||||
_entityListener.OnEntityCreated(entity);
|
||||
|
||||
entity.Read(buffer);
|
||||
entity.Attach(_client, entityId, entityType, hasAuthority, player, payload);
|
||||
|
||||
entities.Add(entity);
|
||||
}
|
||||
|
||||
var staticEntities = buffer.ReadUShort();
|
||||
@@ -81,18 +91,28 @@ internal class SnapshotHandler : Handler
|
||||
var staticId = buffer.ReadUShort();
|
||||
var ownerPeerId = buffer.ReadUShort();
|
||||
var payloadSize = buffer.ReadUShort();
|
||||
|
||||
var player = _playerCache.GetPlayerByPeer(ownerPeerId);
|
||||
|
||||
var payload = new RagonPayload(payloadSize);
|
||||
payload.Read(buffer);
|
||||
if (player == null)
|
||||
{
|
||||
RagonLog.Error($"Player not found with peerId: {ownerPeerId}");
|
||||
|
||||
_playerCache.Dump();
|
||||
return;
|
||||
}
|
||||
|
||||
var hasAuthority = _playerCache.Local.Id == player.Id;
|
||||
var entity = _entityCache.OnCreate(0, entityType, staticId, entityId, hasAuthority);
|
||||
|
||||
var entity = _entityCache.TryGetEntity(0, entityType, staticId, entityId, hasAuthority, out _);
|
||||
|
||||
entity.Prepare(_client, entityId, entityType, hasAuthority, player, RagonPayload.Empty);
|
||||
entity.Read(buffer);
|
||||
entity.Attach(_client, entityId, entityType, hasAuthority, player, payload);
|
||||
|
||||
entities.Add(entity);
|
||||
}
|
||||
|
||||
_listenerList.OnJoined();
|
||||
foreach (var entity in entities)
|
||||
entity.Attach();
|
||||
|
||||
_listenerList.OnSceneLoaded();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public class TimestampHandler: IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
public TimestampHandler(RagonClient client)
|
||||
{
|
||||
_client = client;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
{
|
||||
var timestamp0 = buffer.Read(32);
|
||||
var timestamp1 = buffer.Read(32);
|
||||
var value = new DoubleToUInt { Int0 = timestamp0, Int1 = timestamp1 };
|
||||
|
||||
_client.SetTimestamp(value.Double);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -18,5 +18,5 @@ namespace Ragon.Client;
|
||||
|
||||
public interface IRagonConnection
|
||||
{
|
||||
|
||||
public void Close();
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -16,9 +16,12 @@
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Server.Handler;
|
||||
namespace Ragon.Client;
|
||||
|
||||
public interface IRagonOperation
|
||||
public interface IUserData
|
||||
{
|
||||
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer);
|
||||
public byte[] this[string key] { get; set; }
|
||||
bool Dirty { get; }
|
||||
IReadOnlyList<string> Read(RagonBuffer buffer);
|
||||
void Write(RagonBuffer buffer);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
+4
-6
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,11 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
namespace Ragon.Server.Plugin.Web;
|
||||
|
||||
[Serializable]
|
||||
public class RoomRemovedRequest
|
||||
public interface IRagonDataListener
|
||||
{
|
||||
public RoomDto Room { get; set; }
|
||||
public void OnData(RagonClient client, RagonPlayer player, byte[] data);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -22,10 +22,14 @@ namespace Ragon.Client
|
||||
IRagonFailedListener,
|
||||
IRagonJoinListener,
|
||||
IRagonLeftListener,
|
||||
IRagonLevelListener,
|
||||
IRagonSceneListener,
|
||||
IRagonOwnershipChangedListener,
|
||||
IRagonPlayerJoinListener,
|
||||
IRagonPlayerLeftListener
|
||||
IRagonPlayerLeftListener,
|
||||
IRagonRoomListListener,
|
||||
IRagonRoomUserDataListener,
|
||||
IRagonPlayerUserDataListener
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
+4
-6
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,11 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
namespace Ragon.Server.Plugin.Web;
|
||||
namespace Ragon.Client;
|
||||
|
||||
[Serializable]
|
||||
public class AuthorizationRequest
|
||||
public interface IRagonPlayerUserDataListener
|
||||
{
|
||||
public string Name;
|
||||
public string Token;
|
||||
void OnPlayerUserDataUpdated(RagonClient client, RagonPlayer player, IReadOnlyList<string> changes);
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
namespace Ragon.Client;
|
||||
|
||||
public interface IRagonRoomListListener
|
||||
{
|
||||
public void OnRoomListUpdate(RagonClient client, IReadOnlyList<RagonRoomInformation> roomsInfos);
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
namespace Ragon.Client;
|
||||
|
||||
public interface IRagonRoomUserDataListener
|
||||
{
|
||||
public void OnUserDataUpdated(RagonClient client, IReadOnlyList<string> changes);
|
||||
}
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public interface IRagonLevelListener
|
||||
public interface IRagonSceneListener
|
||||
{
|
||||
void OnLevel(RagonClient client, string sceneName);
|
||||
void OnSceneLoaded(RagonClient client);
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
namespace Ragon.Client;
|
||||
|
||||
public interface IRagonSceneRequestListener
|
||||
{
|
||||
void OnRequestScene(RagonClient client, string sceneName);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -21,23 +21,25 @@ namespace Ragon.Client
|
||||
public sealed class RagonClient
|
||||
{
|
||||
private readonly INetworkConnection _connection;
|
||||
private readonly NetworkStatistics _stats;
|
||||
private IRagonEntityListener _entityListener;
|
||||
private IRagonSceneCollector _sceneCollector;
|
||||
private Handler[] _handlers;
|
||||
private IHandler[] _handlers;
|
||||
private RagonBuffer _readBuffer;
|
||||
private RagonBuffer _writeBuffer;
|
||||
private RagonRoom _room;
|
||||
private RagonSession _session;
|
||||
private RagonListenerList _listenerList;
|
||||
private RagonListenerList _listeners;
|
||||
private RagonPlayerCache _playerCache;
|
||||
private RagonEntityCache _entityCache;
|
||||
private RagonEventCache _eventCache;
|
||||
private RagonStatus _status;
|
||||
private NetworkStatistics _stats;
|
||||
|
||||
private double _serverTimestamp;
|
||||
private float _replicationRate = 0;
|
||||
private float _replicationTime = 0;
|
||||
|
||||
public double ServerTimestamp => _serverTimestamp;
|
||||
public IRagonConnection Connection => _connection;
|
||||
public RagonStatus Status => _status;
|
||||
public RagonSession Session => _session;
|
||||
@@ -54,13 +56,13 @@ namespace Ragon.Client
|
||||
|
||||
public RagonClient(INetworkConnection connection, int rate)
|
||||
{
|
||||
_listeners = new RagonListenerList(this);
|
||||
|
||||
_connection = connection;
|
||||
_connection.OnData += OnData;
|
||||
_connection.OnConnected += OnConnected;
|
||||
_connection.OnDisconnected += OnDisconnected;
|
||||
|
||||
_listenerList = new RagonListenerList(this);
|
||||
|
||||
|
||||
_replicationRate = (1000.0f / rate) / 1000.0f;
|
||||
_replicationTime = 0;
|
||||
|
||||
@@ -79,7 +81,7 @@ namespace Ragon.Client
|
||||
{
|
||||
_entityListener = listener;
|
||||
}
|
||||
|
||||
|
||||
public void Connect(string address, ushort port, string protocol)
|
||||
{
|
||||
if (_sceneCollector == null)
|
||||
@@ -93,30 +95,40 @@ namespace Ragon.Client
|
||||
RagonLog.Error("Entity Listener is not defined!");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
_writeBuffer = new RagonBuffer();
|
||||
_readBuffer = new RagonBuffer();
|
||||
_session = new RagonSession(this, _readBuffer);
|
||||
|
||||
_playerCache = new RagonPlayerCache();
|
||||
_entityCache = new RagonEntityCache(this, _playerCache, _entityListener, _sceneCollector);
|
||||
_session = new RagonSession(this, _writeBuffer);
|
||||
_entityCache = new RagonEntityCache(this, _playerCache, _sceneCollector);
|
||||
|
||||
_handlers = new Handler[byte.MaxValue];
|
||||
_handlers[(byte)RagonOperation.AUTHORIZED_SUCCESS] = new AuthorizeSuccessHandler(_listenerList);
|
||||
_handlers[(byte)RagonOperation.AUTHORIZED_FAILED] = new AuthorizeFailedHandler(_listenerList);
|
||||
_handlers[(byte)RagonOperation.JOIN_SUCCESS] = new JoinSuccessHandler(this, _readBuffer, _listenerList, _playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.JOIN_FAILED] = new JoinFailedHandler(_listenerList);
|
||||
_handlers[(byte)RagonOperation.LEAVE_ROOM] = new LeaveRoomHandler(this, _listenerList, _entityCache);
|
||||
_handlers[(byte)RagonOperation.OWNERSHIP_ROOM_CHANGED] = new OwnershipRoomHandler(_listenerList, _playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.OWNERSHIP_ENTITY_CHANGED] = new EntityOwnershipHandler(_listenerList, _playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.PLAYER_JOINED] = new PlayerJoinHandler(_playerCache, _listenerList);
|
||||
_handlers[(byte)RagonOperation.PLAYER_LEAVED] = new PlayerLeftHandler(_entityCache, _playerCache, _listenerList);
|
||||
_handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadHandler(this, _listenerList);
|
||||
_handlers[(byte)RagonOperation.CREATE_ENTITY] = new EntityCreateHandler(this, _playerCache, _entityCache);
|
||||
_handlers = new IHandler[byte.MaxValue];
|
||||
_handlers[(byte)RagonOperation.AUTHORIZED_SUCCESS] = new AuthorizeSuccessHandler(this, _listeners);
|
||||
_handlers[(byte)RagonOperation.AUTHORIZED_FAILED] = new AuthorizeFailedHandler(_listeners);
|
||||
_handlers[(byte)RagonOperation.JOIN_SUCCESS] =
|
||||
new JoinSuccessHandler(this, _listeners, _playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.JOIN_FAILED] = new JoinFailedHandler(_listeners);
|
||||
_handlers[(byte)RagonOperation.LEAVE_ROOM] = new LeaveRoomHandler(this, _listeners, _entityCache);
|
||||
_handlers[(byte)RagonOperation.OWNERSHIP_ROOM_CHANGED] =
|
||||
new OwnershipRoomHandler(_listeners, _playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.OWNERSHIP_ENTITY_CHANGED] =
|
||||
new EntityOwnershipHandler(_listeners, _playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.PLAYER_JOINED] = new PlayerJoinHandler(_playerCache, _listeners);
|
||||
_handlers[(byte)RagonOperation.PLAYER_LEAVED] = new PlayerLeftHandler(_entityCache, _playerCache, _listeners);
|
||||
_handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadHandler(this, _listeners);
|
||||
_handlers[(byte)RagonOperation.CREATE_ENTITY] =
|
||||
new EntityCreateHandler(this, _playerCache, _entityCache, _entityListener);
|
||||
_handlers[(byte)RagonOperation.REMOVE_ENTITY] = new EntityRemoveHandler(_entityCache);
|
||||
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_STATE] = new StateEntityHandler(_entityCache);
|
||||
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventHandler(this, _playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.SNAPSHOT] = new SnapshotHandler(this, _listenerList, _entityCache, _playerCache);
|
||||
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventHandler(_playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.REPLICATE_ROOM_EVENT] = new RoomEventHandler(this, _playerCache);
|
||||
_handlers[(byte)RagonOperation.SNAPSHOT] =
|
||||
new SnapshotHandler(this, _listeners, _entityCache, _playerCache, _entityListener);
|
||||
_handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampHandler(this);
|
||||
_handlers[(byte)RagonOperation.REPLICATE_RAW_DATA] = new RoomDataHandler(_playerCache, _listeners);
|
||||
_handlers[(byte)RagonOperation.ROOM_LIST_UPDATED] = new RoomListHandler(_session, _listeners);
|
||||
_handlers[(byte)RagonOperation.ROOM_DATA_UPDATED] = new RoomUserDataHandler(this, _listeners);
|
||||
_handlers[(byte)RagonOperation.PLAYER_DATA_UPDATED] = new PlayerUserDataHandler(_playerCache, _listeners);
|
||||
|
||||
var protocolRaw = RagonVersion.Parse(protocol);
|
||||
_connection.Connect(address, port, protocolRaw);
|
||||
@@ -127,7 +139,7 @@ namespace Ragon.Client
|
||||
_status = RagonStatus.DISCONNECTED;
|
||||
_room.Cleanup();
|
||||
_connection.Disconnect();
|
||||
|
||||
|
||||
OnDisconnected(RagonDisconnect.MANUAL);
|
||||
}
|
||||
|
||||
@@ -138,64 +150,138 @@ namespace Ragon.Client
|
||||
_replicationTime += dt;
|
||||
if (_replicationTime >= _replicationRate)
|
||||
{
|
||||
_entityCache.WriteState(_readBuffer);
|
||||
_replicationTime = 0;
|
||||
_entityCache.WriteState(_writeBuffer);
|
||||
|
||||
SendTimestamp();
|
||||
SendRoomUserData();
|
||||
SendPlayerUserData();
|
||||
}
|
||||
|
||||
_stats.Update(_connection.BytesSent, _connection.BytesReceived, _connection.Ping, dt);
|
||||
}
|
||||
|
||||
_listeners.Update();
|
||||
_connection.Update();
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_status = RagonStatus.DISCONNECTED;
|
||||
_connection.Disconnect();
|
||||
if (_status != RagonStatus.DISCONNECTED)
|
||||
{
|
||||
_status = RagonStatus.DISCONNECTED;
|
||||
_connection.Disconnect();
|
||||
}
|
||||
|
||||
_connection.Dispose();
|
||||
}
|
||||
|
||||
public void AddListener(IRagonListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonAuthorizationListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonConnectionListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonFailedListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonJoinListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonLeftListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonLevelListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonOwnershipChangedListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonPlayerJoinListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonPlayerLeftListener listener) => _listenerList.Add(listener);
|
||||
public void AddListener(IRagonListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonAuthorizationListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonConnectionListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonFailedListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonJoinListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonLeftListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonOwnershipChangedListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonPlayerJoinListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonPlayerLeftListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonSceneListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonSceneRequestListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonDataListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonRoomListListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonPlayerUserDataListener listener) => _listeners.Add(listener);
|
||||
public void AddListener(IRagonRoomUserDataListener listener) => _listeners.Add(listener);
|
||||
public void RemoveListener(IRagonListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonAuthorizationListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonConnectionListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonFailedListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonJoinListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonLeftListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonOwnershipChangedListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonPlayerJoinListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonPlayerLeftListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonSceneListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonSceneRequestListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonDataListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonRoomListListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonRoomUserDataListener listener) => _listeners.Remove(listener);
|
||||
public void RemoveListener(IRagonPlayerUserDataListener listener) => _listeners.Remove(listener);
|
||||
|
||||
public void RemoveListener(IRagonListener listener) => _listenerList.Remove(listener);
|
||||
public void RemoveListener(IRagonAuthorizationListener listener) => _listenerList.Remove(listener);
|
||||
public void RemoveListener(IRagonConnectionListener listener) => _listenerList.Remove(listener);
|
||||
public void RemoveListener(IRagonFailedListener listener) => _listenerList.Remove(listener);
|
||||
public void RemoveListener(IRagonJoinListener listener) => _listenerList.Remove(listener);
|
||||
public void RemoveListener(IRagonLeftListener listener) => _listenerList.Remove(listener);
|
||||
public void RemoveListener(IRagonLevelListener listener) => _listenerList.Remove(listener);
|
||||
public void RemoveListener(IRagonOwnershipChangedListener listener) => _listenerList.Remove(listener);
|
||||
public void RemoveListener(IRagonPlayerJoinListener listener) => _listenerList.Remove(listener);
|
||||
public void RemoveListener(IRagonPlayerLeftListener listener) => _listenerList.Remove(listener);
|
||||
|
||||
#endregion
|
||||
|
||||
#region INTERNAL
|
||||
|
||||
internal void AssignRoom(RagonRoom room)
|
||||
{
|
||||
_room?.Dispose();
|
||||
_room = room;
|
||||
_status = RagonStatus.ROOM;
|
||||
}
|
||||
|
||||
internal void SetStatus(RagonStatus status)
|
||||
{
|
||||
_status = status;
|
||||
}
|
||||
|
||||
internal void SetTimestamp(double time)
|
||||
{
|
||||
_serverTimestamp = time;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region PRIVATE
|
||||
|
||||
private void SendTimestamp()
|
||||
{
|
||||
var timestamp = RagonTime.CurrentTimestamp();
|
||||
var value = new DoubleToUInt()
|
||||
{
|
||||
Double = timestamp,
|
||||
};
|
||||
|
||||
_writeBuffer.Clear();
|
||||
_writeBuffer.WriteOperation(RagonOperation.TIMESTAMP_SYNCHRONIZATION);
|
||||
_writeBuffer.Write(value.Int0, 32);
|
||||
_writeBuffer.Write(value.Int1, 32);
|
||||
}
|
||||
|
||||
private void SendRoomUserData()
|
||||
{
|
||||
if (_room == null) return;
|
||||
|
||||
var props = _room.UserData;
|
||||
if (!props.Dirty) return;
|
||||
|
||||
_writeBuffer.Clear();
|
||||
_writeBuffer.WriteOperation(RagonOperation.ROOM_DATA_UPDATED);
|
||||
|
||||
props.Write(_writeBuffer);
|
||||
|
||||
var sendData = _writeBuffer.ToArray();
|
||||
_connection.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
private void SendPlayerUserData()
|
||||
{
|
||||
if (_playerCache.Local == null) return;
|
||||
|
||||
var props = _playerCache.Local.UserData;
|
||||
if (!props.Dirty) return;
|
||||
|
||||
_writeBuffer.Clear();
|
||||
_writeBuffer.WriteOperation(RagonOperation.PLAYER_DATA_UPDATED);
|
||||
|
||||
props.Write(_writeBuffer);
|
||||
|
||||
var sendData = _writeBuffer.ToArray();
|
||||
_connection.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
private void OnConnected()
|
||||
{
|
||||
RagonLog.Trace("Connected");
|
||||
|
||||
_listenerList.OnConnected();
|
||||
_listeners.OnConnected();
|
||||
_status = RagonStatus.CONNECTED;
|
||||
}
|
||||
|
||||
@@ -203,11 +289,11 @@ namespace Ragon.Client
|
||||
{
|
||||
RagonLog.Trace($"Disconnected: {reason}");
|
||||
|
||||
_listenerList.OnDisconnected(reason);
|
||||
_listeners.OnDisconnected(reason);
|
||||
_status = RagonStatus.DISCONNECTED;
|
||||
}
|
||||
|
||||
public void OnData(byte[] data)
|
||||
private void OnData(byte[] data)
|
||||
{
|
||||
_readBuffer.Clear();
|
||||
_readBuffer.FromArray(data);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -26,7 +26,6 @@ public sealed class RagonEntityCache
|
||||
private readonly Dictionary<uint, RagonEntity> _sceneEntities = new();
|
||||
|
||||
private readonly RagonClient _client;
|
||||
private readonly IRagonEntityListener _entityListener;
|
||||
private readonly IRagonSceneCollector _sceneCollector;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
|
||||
@@ -35,12 +34,10 @@ public sealed class RagonEntityCache
|
||||
public RagonEntityCache(
|
||||
RagonClient client,
|
||||
RagonPlayerCache playerCache,
|
||||
IRagonEntityListener listener,
|
||||
IRagonSceneCollector sceneCollector
|
||||
)
|
||||
{
|
||||
_client = client;
|
||||
_entityListener = listener;
|
||||
_sceneCollector = sceneCollector;
|
||||
_playerCache = playerCache;
|
||||
}
|
||||
@@ -50,7 +47,7 @@ public sealed class RagonEntityCache
|
||||
return _entityMap.TryGetValue(id, out entity);
|
||||
}
|
||||
|
||||
public void Create(RagonEntity entity, IRagonPayload? spawnPayload)
|
||||
public void Create(RagonEntity entity, RagonPayload spawnPayload)
|
||||
{
|
||||
var attachId = (ushort)(_playerCache.Local.PeerId + _localEntitiesCounter++);
|
||||
var buffer = _client.Buffer;
|
||||
@@ -63,7 +60,7 @@ public sealed class RagonEntityCache
|
||||
|
||||
entity.State.WriteInfo(buffer);
|
||||
|
||||
spawnPayload?.Serialize(buffer);
|
||||
spawnPayload?.Write(buffer);
|
||||
|
||||
_pendingEntities.Add(attachId, entity);
|
||||
|
||||
@@ -84,21 +81,23 @@ public sealed class RagonEntityCache
|
||||
_client.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
public void Destroy(RagonEntity entity, IRagonPayload? destroyPayload)
|
||||
public void Destroy(RagonEntity entity, RagonPayload destroyPayload)
|
||||
{
|
||||
if (!entity.IsAttached)
|
||||
if (!entity.IsAttached && !entity.HasAuthority)
|
||||
{
|
||||
RagonLog.Warn("Can't destroy object, he is not created");
|
||||
RagonLog.Warn("Can't destroy object");
|
||||
return;
|
||||
}
|
||||
|
||||
entity.SetReplication(false);
|
||||
|
||||
var buffer = _client.Buffer;
|
||||
|
||||
buffer.Clear();
|
||||
buffer.WriteOperation(RagonOperation.REMOVE_ENTITY);
|
||||
buffer.WriteUShort(entity.Id);
|
||||
|
||||
destroyPayload?.Serialize(buffer);
|
||||
destroyPayload?.Write(buffer);
|
||||
|
||||
var sendData = buffer.ToArray();
|
||||
_client.Reliable.Send(sendData);
|
||||
@@ -117,7 +116,7 @@ public sealed class RagonEntityCache
|
||||
foreach (var ent in _entityList)
|
||||
{
|
||||
if (!ent.IsAttached ||
|
||||
!ent.Replication ||
|
||||
!ent.IsReplicated ||
|
||||
!ent.PropertiesChanged) continue;
|
||||
|
||||
ent.Write(buffer);
|
||||
@@ -162,7 +161,7 @@ public sealed class RagonEntityCache
|
||||
|
||||
internal void Cleanup()
|
||||
{
|
||||
var payload = new RagonPayload();
|
||||
var payload = new RagonPayload(0);
|
||||
foreach (var ent in _entityList)
|
||||
ent.Detach(payload);
|
||||
|
||||
@@ -170,53 +169,56 @@ public sealed class RagonEntityCache
|
||||
_entityList.Clear();
|
||||
}
|
||||
|
||||
internal RagonEntity OnCreate(ushort attachId, ushort entityType, ushort sceneId, ushort entityId, bool hasAuthority)
|
||||
internal RagonEntity TryGetEntity(ushort attachId, ushort entityType, ushort sceneId, ushort entityId, bool hasAuthority, out bool hasCreated)
|
||||
{
|
||||
if (sceneId > 0)
|
||||
{
|
||||
if (_sceneEntities.TryGetValue(sceneId, out var entity))
|
||||
if (_sceneEntities.TryGetValue(sceneId, out var sceneEntity))
|
||||
{
|
||||
_entityMap.Add(entityId, entity);
|
||||
_entityMap.Add(entityId, sceneEntity);
|
||||
|
||||
if (hasAuthority)
|
||||
_entityList.Add(entity);
|
||||
_entityList.Add(sceneEntity);
|
||||
|
||||
return entity;
|
||||
hasCreated = false;
|
||||
|
||||
return sceneEntity;
|
||||
}
|
||||
}
|
||||
|
||||
if (_pendingEntities.Remove(attachId, out var existsEntity))
|
||||
if (_pendingEntities.TryGetValue(attachId, out var pendingEntity) && hasAuthority)
|
||||
{
|
||||
_entityMap.Add(entityId, existsEntity);
|
||||
_pendingEntities.Remove(attachId);
|
||||
_entityMap.Add(entityId, pendingEntity);
|
||||
_entityList.Add(pendingEntity);
|
||||
|
||||
if (hasAuthority)
|
||||
_entityList.Add(existsEntity);
|
||||
hasCreated = false;
|
||||
|
||||
return existsEntity;
|
||||
return pendingEntity;
|
||||
}
|
||||
else
|
||||
{
|
||||
var entity = new RagonEntity(entityType, sceneId);
|
||||
|
||||
_entityMap.Add(entityId, entity);
|
||||
var entity = new RagonEntity(entityType, sceneId);
|
||||
|
||||
if (hasAuthority)
|
||||
_entityList.Add(entity);
|
||||
_entityMap.Add(entityId, entity);
|
||||
|
||||
_entityListener.OnEntityCreated(entity);
|
||||
if (hasAuthority)
|
||||
_entityList.Add(entity);
|
||||
|
||||
return entity;
|
||||
}
|
||||
hasCreated = true;
|
||||
|
||||
return entity;
|
||||
}
|
||||
|
||||
|
||||
internal void OnDestroy(ushort entityId, RagonPayload payload)
|
||||
{
|
||||
if (_entityMap.Remove(entityId, out var ragonEntity))
|
||||
if (_entityMap.TryGetValue(entityId, out var entity))
|
||||
{
|
||||
_entityList.Remove(ragonEntity);
|
||||
_entityMap.Remove(entityId);
|
||||
_entityList.Remove(entity);
|
||||
|
||||
ragonEntity.Detach(payload);
|
||||
entity.Detach(payload);
|
||||
entity.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -244,7 +246,7 @@ public sealed class RagonEntityCache
|
||||
_entityList.Add(entity);
|
||||
else
|
||||
_entityList.Remove(entity);
|
||||
|
||||
|
||||
entity.OnOwnershipChanged(player);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -26,16 +26,22 @@ namespace Ragon.Client
|
||||
private readonly List<IRagonFailedListener> _failedListeners = new();
|
||||
private readonly List<IRagonJoinListener> _joinListeners = new();
|
||||
private readonly List<IRagonLeftListener> _leftListeners = new();
|
||||
private readonly List<IRagonLevelListener> _levelListeners = new();
|
||||
private readonly List<IRagonSceneListener> _sceneListeners = new();
|
||||
private readonly List<IRagonSceneRequestListener> _sceneRequestListeners = new();
|
||||
private readonly List<IRagonOwnershipChangedListener> _ownershipChangedListeners = new();
|
||||
private readonly List<IRagonPlayerJoinListener> _playerJoinListeners = new();
|
||||
private readonly List<IRagonPlayerLeftListener> _playerLeftListeners = new();
|
||||
|
||||
private readonly List<IRagonDataListener> _dataListeners = new();
|
||||
private readonly List<IRagonRoomListListener> _roomListListeners = new();
|
||||
private readonly List<IRagonRoomUserDataListener> _roomUserDataListeners = new();
|
||||
private readonly List<IRagonPlayerUserDataListener> _playerUserDataListeners = new();
|
||||
private readonly List<Action> _delayedActions = new();
|
||||
|
||||
public RagonListenerList(RagonClient client)
|
||||
{
|
||||
_client = client;
|
||||
}
|
||||
|
||||
|
||||
public void Add(IRagonListener listener)
|
||||
{
|
||||
_authorizationListeners.Add(listener);
|
||||
@@ -43,113 +49,178 @@ namespace Ragon.Client
|
||||
_failedListeners.Add(listener);
|
||||
_joinListeners.Add(listener);
|
||||
_leftListeners.Add(listener);
|
||||
_levelListeners.Add(listener);
|
||||
_sceneListeners.Add(listener);
|
||||
_ownershipChangedListeners.Add(listener);
|
||||
_playerJoinListeners.Add(listener);
|
||||
_playerLeftListeners.Add(listener);
|
||||
_roomUserDataListeners.Add(listener);
|
||||
_playerUserDataListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonListener listener)
|
||||
{
|
||||
_authorizationListeners.Remove(listener);
|
||||
_connectionListeners.Remove(listener);
|
||||
_failedListeners.Remove(listener);
|
||||
_joinListeners.Remove(listener);
|
||||
_leftListeners.Remove(listener);
|
||||
_levelListeners.Remove(listener);
|
||||
_ownershipChangedListeners.Remove(listener);
|
||||
_playerJoinListeners.Remove(listener);
|
||||
_playerLeftListeners.Remove(listener);
|
||||
_delayedActions.Add(() =>
|
||||
{
|
||||
_authorizationListeners.Remove(listener);
|
||||
_connectionListeners.Remove(listener);
|
||||
_failedListeners.Remove(listener);
|
||||
_joinListeners.Remove(listener);
|
||||
_leftListeners.Remove(listener);
|
||||
_sceneListeners.Remove(listener);
|
||||
_ownershipChangedListeners.Remove(listener);
|
||||
_playerJoinListeners.Remove(listener);
|
||||
_playerLeftListeners.Remove(listener);
|
||||
_roomUserDataListeners.Remove(listener);
|
||||
_playerUserDataListeners.Remove(listener);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public void Update()
|
||||
{
|
||||
foreach (var action in _delayedActions)
|
||||
action.Invoke();
|
||||
|
||||
_delayedActions.Clear();
|
||||
}
|
||||
|
||||
public void Add(IRagonDataListener dataListener)
|
||||
{
|
||||
_dataListeners.Add(dataListener);
|
||||
}
|
||||
|
||||
public void Add(IRagonAuthorizationListener listener)
|
||||
{
|
||||
_authorizationListeners.Add(listener);
|
||||
}
|
||||
|
||||
|
||||
public void Add(IRagonSceneRequestListener listener)
|
||||
{
|
||||
_sceneRequestListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Add(IRagonConnectionListener listener)
|
||||
{
|
||||
_connectionListeners.Add(listener);
|
||||
}
|
||||
|
||||
|
||||
public void Add(IRagonFailedListener listener)
|
||||
{
|
||||
_failedListeners.Add(listener);
|
||||
}
|
||||
|
||||
|
||||
public void Add(IRagonJoinListener listener)
|
||||
{
|
||||
_joinListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Add(IRagonLeftListener listener)
|
||||
|
||||
public void Add(IRagonLeftListener listener)
|
||||
{
|
||||
_leftListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Add(IRagonLevelListener listener)
|
||||
|
||||
public void Add(IRagonSceneListener listener)
|
||||
{
|
||||
_levelListeners.Add(listener);
|
||||
_sceneListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Add(IRagonOwnershipChangedListener listener)
|
||||
|
||||
public void Add(IRagonOwnershipChangedListener listener)
|
||||
{
|
||||
_ownershipChangedListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Add(IRagonPlayerJoinListener listener)
|
||||
public void Add(IRagonPlayerJoinListener listener)
|
||||
{
|
||||
_playerJoinListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Add(IRagonPlayerLeftListener listener)
|
||||
|
||||
public void Add(IRagonPlayerLeftListener listener)
|
||||
{
|
||||
_playerLeftListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonAuthorizationListener listener)
|
||||
public void Add(IRagonRoomListListener listener)
|
||||
{
|
||||
_authorizationListeners.Remove(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonConnectionListener listener)
|
||||
{
|
||||
_connectionListeners.Remove(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonFailedListener listener)
|
||||
{
|
||||
_failedListeners.Remove(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonJoinListener listener)
|
||||
{
|
||||
_joinListeners.Remove(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonLeftListener listener)
|
||||
{
|
||||
_leftListeners.Remove(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonLevelListener listener)
|
||||
{
|
||||
_levelListeners.Remove(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonOwnershipChangedListener listener)
|
||||
{
|
||||
_ownershipChangedListeners.Remove(listener);
|
||||
_roomListListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonPlayerJoinListener listener)
|
||||
public void Add(IRagonRoomUserDataListener listener)
|
||||
{
|
||||
_playerJoinListeners.Remove(listener);
|
||||
_roomUserDataListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonPlayerLeftListener listener)
|
||||
public void Add(IRagonPlayerUserDataListener listener)
|
||||
{
|
||||
_playerLeftListeners.Remove(listener);
|
||||
_playerUserDataListeners.Add(listener);
|
||||
}
|
||||
|
||||
public void Remove(IRagonDataListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _dataListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonSceneRequestListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _sceneRequestListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonAuthorizationListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _authorizationListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonConnectionListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _connectionListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonFailedListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _failedListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonJoinListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _joinListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonLeftListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _leftListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonSceneListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _sceneListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonOwnershipChangedListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _ownershipChangedListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonPlayerJoinListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _playerJoinListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonPlayerLeftListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _playerLeftListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonRoomListListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _roomListListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonRoomUserDataListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _roomUserDataListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void Remove(IRagonPlayerUserDataListener listener)
|
||||
{
|
||||
_delayedActions.Add(() => _playerUserDataListeners.Remove(listener));
|
||||
}
|
||||
|
||||
public void OnAuthorizationSuccess(string playerId, string playerName, string payload)
|
||||
@@ -157,13 +228,13 @@ namespace Ragon.Client
|
||||
foreach (var listener in _authorizationListeners)
|
||||
listener.OnAuthorizationSuccess(_client, playerId, playerName);
|
||||
}
|
||||
|
||||
|
||||
public void OnAuthorizationFailed(string message)
|
||||
{
|
||||
foreach (var listener in _authorizationListeners)
|
||||
listener.OnAuthorizationFailed(_client, message);
|
||||
}
|
||||
|
||||
|
||||
public void OnLeft()
|
||||
{
|
||||
foreach (var listener in _leftListeners)
|
||||
@@ -194,10 +265,16 @@ namespace Ragon.Client
|
||||
listener.OnPlayerJoined(_client, player);
|
||||
}
|
||||
|
||||
public void OnLevel(string sceneName)
|
||||
public void OnSceneLoaded()
|
||||
{
|
||||
foreach (var listener in _levelListeners)
|
||||
listener.OnLevel(_client, sceneName);
|
||||
foreach (var listener in _sceneListeners)
|
||||
listener.OnSceneLoaded(_client);
|
||||
}
|
||||
|
||||
public void OnSceneRequest(string sceneName)
|
||||
{
|
||||
foreach (var listener in _sceneRequestListeners)
|
||||
listener.OnRequestScene(_client, sceneName);
|
||||
}
|
||||
|
||||
public void OnJoined()
|
||||
@@ -217,5 +294,29 @@ namespace Ragon.Client
|
||||
foreach (var listener in _connectionListeners)
|
||||
listener.OnDisconnected(_client, disconnect);
|
||||
}
|
||||
|
||||
public void OnData(RagonPlayer player, byte[] data)
|
||||
{
|
||||
foreach (var listener in _dataListeners)
|
||||
listener.OnData(_client, player, data);
|
||||
}
|
||||
|
||||
public void OnRoomList(RagonRoomInformation[] roomInfos)
|
||||
{
|
||||
foreach (var listListener in _roomListListeners)
|
||||
listListener.OnRoomListUpdate(_client, roomInfos);
|
||||
}
|
||||
|
||||
public void OnRoomUserData(IReadOnlyList<string> changes)
|
||||
{
|
||||
foreach (var userDataListener in _roomUserDataListeners)
|
||||
userDataListener.OnUserDataUpdated(_client, changes);
|
||||
}
|
||||
|
||||
public void OnPlayerUserData(RagonPlayer player, IReadOnlyList<string> changes)
|
||||
{
|
||||
foreach(var playerUserDataListener in _playerUserDataListeners)
|
||||
playerUserDataListener.OnPlayerUserDataUpdated(_client, player, changes);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -24,6 +24,7 @@ namespace Ragon.Client
|
||||
public ushort PeerId { get; set; }
|
||||
public bool IsRoomOwner { get; set; }
|
||||
public bool IsLocal { get; set; }
|
||||
public IUserData UserData { get; private set; }
|
||||
|
||||
public RagonPlayer(ushort peerId, string playerId, string name, bool isRoomOwner, bool isLocal)
|
||||
{
|
||||
@@ -32,6 +33,7 @@ namespace Ragon.Client
|
||||
IsLocal = isLocal;
|
||||
Name = name;
|
||||
Id = playerId;
|
||||
}
|
||||
UserData = isLocal ? new RagonUserData() : new RagonUserDataReadOnly();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -26,9 +26,22 @@ public sealed class RagonPlayerCache
|
||||
public RagonPlayer Owner { get; private set; }
|
||||
public RagonPlayer Local { get; private set; }
|
||||
public bool IsRoomOwner => _ownerId == _localId;
|
||||
|
||||
public RagonPlayer? GetPlayerById(string playerId) => _playersById[playerId];
|
||||
public RagonPlayer? GetPlayerByPeer(ushort peerId) => _playersByConnection[peerId];
|
||||
|
||||
public RagonPlayer? GetPlayerById(string playerId)
|
||||
{
|
||||
if (_playersById.TryGetValue(playerId, out var player))
|
||||
return player;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public RagonPlayer? GetPlayerByPeer(ushort peerId)
|
||||
{
|
||||
if (_playersByConnection.TryGetValue(peerId, out var player))
|
||||
return player;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private string _ownerId;
|
||||
private string _localId;
|
||||
@@ -39,10 +52,10 @@ public sealed class RagonPlayerCache
|
||||
_localId = localId;
|
||||
}
|
||||
|
||||
public void AddPlayer(ushort peerId, string playerId, string playerName)
|
||||
public RagonPlayer AddPlayer(ushort peerId, string playerId, string playerName)
|
||||
{
|
||||
if (_playersById.ContainsKey(playerId))
|
||||
return;
|
||||
return null;
|
||||
|
||||
var isOwner = playerId == _ownerId;
|
||||
var isLocal = playerId == _localId;
|
||||
@@ -60,13 +73,16 @@ public sealed class RagonPlayerCache
|
||||
_players.Add(player);
|
||||
_playersById.Add(player.Id, player);
|
||||
_playersByConnection.Add(player.PeerId, player);
|
||||
|
||||
return player;
|
||||
}
|
||||
|
||||
public void RemovePlayer(string playerId)
|
||||
{
|
||||
if (_playersById.Remove(playerId, out var player))
|
||||
if (_playersById.TryGetValue(playerId, out var player))
|
||||
{
|
||||
_players.Remove(player);
|
||||
_playersById.Remove(playerId);
|
||||
_playersByConnection.Remove(player.PeerId);
|
||||
}
|
||||
}
|
||||
@@ -90,4 +106,14 @@ public sealed class RagonPlayerCache
|
||||
_playersByConnection.Clear();
|
||||
_playersById.Clear();
|
||||
}
|
||||
|
||||
public void Dump()
|
||||
{
|
||||
RagonLog.Trace("Players: ");
|
||||
RagonLog.Trace("[Connection] [ID] [Name]");
|
||||
foreach (var player in _players)
|
||||
{
|
||||
RagonLog.Trace($"[{player.PeerId}] {player.Id} {player.Name}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -14,35 +14,78 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client
|
||||
{
|
||||
public class RagonRoom
|
||||
public class RagonRoom : IDisposable
|
||||
{
|
||||
private RagonClient _client;
|
||||
private RagonScene _scene;
|
||||
private RagonEntityCache _entityCache;
|
||||
private RagonPlayerCache _playerCache;
|
||||
private RagonRoomInformation _information;
|
||||
private class EventSubscription : IDisposable
|
||||
{
|
||||
private List<Action<RagonPlayer, IRagonEvent>> _callbacks;
|
||||
private List<Action<RagonPlayer, IRagonEvent>> _localCallbacks;
|
||||
private Action<RagonPlayer, IRagonEvent> _callback;
|
||||
|
||||
public string Id => _information.RoomId;
|
||||
public int MinPlayers => _information.Min;
|
||||
public int MaxPlayers => _information.Max;
|
||||
public EventSubscription(
|
||||
List<Action<RagonPlayer, IRagonEvent>> callbacks,
|
||||
List<Action<RagonPlayer, IRagonEvent>> localCallbacks,
|
||||
Action<RagonPlayer, IRagonEvent> callback)
|
||||
{
|
||||
_callbacks = callbacks;
|
||||
_localCallbacks = localCallbacks;
|
||||
_callback = callback;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_callbacks?.Remove(_callback);
|
||||
_localCallbacks?.Remove(_callback);
|
||||
|
||||
_callbacks = null!;
|
||||
_localCallbacks = null!;
|
||||
_callback = null!;
|
||||
}
|
||||
}
|
||||
|
||||
private delegate void OnEventDelegate(RagonPlayer player, RagonBuffer serializer);
|
||||
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonScene _scene;
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
private readonly RoomParameters _parameters;
|
||||
private readonly RagonUserData _userData;
|
||||
|
||||
public string Id => _parameters.RoomId;
|
||||
public int MinPlayers => _parameters.Min;
|
||||
public int MaxPlayers => _parameters.Max;
|
||||
public string Scene => _scene.Name;
|
||||
|
||||
public IReadOnlyList<RagonPlayer> Players => _playerCache.Players;
|
||||
public RagonPlayer Local => _playerCache.Local;
|
||||
public RagonPlayer Owner => _playerCache.Owner;
|
||||
|
||||
public RagonUserData UserData => _userData;
|
||||
|
||||
private readonly Dictionary<int, OnEventDelegate> _events = new Dictionary<int, OnEventDelegate>();
|
||||
|
||||
private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _localListeners =
|
||||
new Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>>();
|
||||
|
||||
private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _listeners =
|
||||
new Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>>();
|
||||
|
||||
public RagonRoom(RagonClient client,
|
||||
RagonEntityCache entityCache,
|
||||
RagonPlayerCache playerCache,
|
||||
RagonRoomInformation information,
|
||||
RoomParameters parameters,
|
||||
RagonScene scene)
|
||||
{
|
||||
_client = client;
|
||||
_information = information;
|
||||
_parameters = parameters;
|
||||
_entityCache = entityCache;
|
||||
_playerCache = playerCache;
|
||||
_scene = scene;
|
||||
_userData = new RagonUserData();
|
||||
}
|
||||
|
||||
internal void Cleanup()
|
||||
@@ -51,14 +94,84 @@ namespace Ragon.Client
|
||||
_playerCache.Cleanup();
|
||||
}
|
||||
|
||||
public void LoadScene(string map) => _scene.Load(map);
|
||||
internal void Update(string sceneName)
|
||||
{
|
||||
_scene.Update(sceneName);
|
||||
}
|
||||
|
||||
internal void HandleEvent(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
|
||||
{
|
||||
if (_events.TryGetValue(eventCode, out var evnt))
|
||||
evnt?.Invoke(caller, buffer);
|
||||
else
|
||||
RagonLog.Warn($"Handler event {Id} with eventCode {eventCode} not defined");
|
||||
}
|
||||
|
||||
internal void HandleUserData(RagonBuffer buffer)
|
||||
{
|
||||
_userData.Read(buffer);
|
||||
}
|
||||
|
||||
public IDisposable OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
|
||||
{
|
||||
var t = new TEvent();
|
||||
var eventCode = _client.Event.GetEventCode(t);
|
||||
var action = (RagonPlayer player, IRagonEvent eventData) => callback.Invoke(player, (TEvent)eventData);
|
||||
|
||||
if (!_listeners.TryGetValue(eventCode, out var callbacks))
|
||||
{
|
||||
callbacks = new List<Action<RagonPlayer, IRagonEvent>>();
|
||||
_listeners.Add(eventCode, callbacks);
|
||||
}
|
||||
|
||||
if (!_localListeners.TryGetValue(eventCode, out var localCallbacks))
|
||||
{
|
||||
localCallbacks = new List<Action<RagonPlayer, IRagonEvent>>();
|
||||
_localListeners.Add(eventCode, localCallbacks);
|
||||
}
|
||||
|
||||
callbacks.Add(action);
|
||||
localCallbacks.Add(action);
|
||||
|
||||
if (!_events.ContainsKey(eventCode))
|
||||
{
|
||||
_events.Add(eventCode, (player, serializer) =>
|
||||
{
|
||||
t.Deserialize(serializer);
|
||||
|
||||
foreach (var callbackListener in callbacks)
|
||||
callbackListener.Invoke(player, t);
|
||||
});
|
||||
}
|
||||
|
||||
return new EventSubscription(callbacks, localCallbacks, action);
|
||||
}
|
||||
|
||||
public void LoadScene(string sceneName) => _scene.Load(sceneName);
|
||||
public void SceneLoaded() => _scene.SceneLoaded();
|
||||
|
||||
public void ReplicateEvent<TEvent>(TEvent evnt, RagonTarget target, RagonReplicationMode mode)
|
||||
where TEvent : IRagonEvent, new() => _scene.ReplicateEvent(evnt, target, mode);
|
||||
|
||||
public void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode mode)
|
||||
where TEvent : IRagonEvent, new() => _scene.ReplicateEvent(evnt, target, mode);
|
||||
|
||||
public void ReplicateData(byte[] data, bool reliable = false) => _scene.ReplicateData(data, reliable);
|
||||
|
||||
public void CreateEntity(RagonEntity entity) => CreateEntity(entity, null);
|
||||
public void CreateEntity(RagonEntity entity, IRagonPayload? payload) => _entityCache.Create(entity, payload);
|
||||
public void CreateEntity(RagonEntity entity, RagonPayload payload) => _entityCache.Create(entity, payload);
|
||||
public void TransferEntity(RagonEntity entity, RagonPlayer player) => _entityCache.Transfer(entity, player);
|
||||
|
||||
public void DestroyEntity(RagonEntity entityId) => DestroyEntity(entityId, null);
|
||||
public void DestroyEntity(RagonEntity entityId, IRagonPayload? payload) => _entityCache.Destroy(entityId, payload);
|
||||
public void DestroyEntity(RagonEntity entityId, RagonPayload payload) => _entityCache.Destroy(entityId, payload);
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
Cleanup();
|
||||
|
||||
_events.Clear();
|
||||
_listeners.Clear();
|
||||
_localListeners.Clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
namespace Ragon.Client
|
||||
{
|
||||
public struct RagonRoomInformation
|
||||
{
|
||||
public string Id;
|
||||
public string Scene;
|
||||
public int PlayerMax;
|
||||
public int PlayerMin;
|
||||
public int PlayerCount;
|
||||
public Dictionary<string, byte[]> Properties;
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -20,24 +20,33 @@ namespace Ragon.Client;
|
||||
|
||||
public class RagonScene
|
||||
{
|
||||
public string Name { get; private set; }
|
||||
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
|
||||
public RagonScene(RagonClient client, RagonPlayerCache playerCache, RagonEntityCache entityCache)
|
||||
public RagonScene(RagonClient client, RagonPlayerCache playerCache, RagonEntityCache entityCache, string sceneName)
|
||||
{
|
||||
Name = sceneName;
|
||||
|
||||
_client = client;
|
||||
_playerCache = playerCache;
|
||||
_entityCache = entityCache;
|
||||
}
|
||||
|
||||
internal void Load(string map)
|
||||
internal void Update(string scene)
|
||||
{
|
||||
Name = scene;
|
||||
}
|
||||
|
||||
internal void Load(string sceneName)
|
||||
{
|
||||
var buffer = _client.Buffer;
|
||||
|
||||
buffer.Clear();
|
||||
buffer.WriteOperation(RagonOperation.LOAD_SCENE);
|
||||
buffer.WriteString(map);
|
||||
buffer.WriteString(sceneName);
|
||||
|
||||
var sendData = buffer.ToArray();
|
||||
_client.Reliable.Send(sendData);
|
||||
@@ -58,4 +67,53 @@ public class RagonScene
|
||||
var sendData = buffer.ToArray();
|
||||
_client.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
internal void ReplicateEvent<TEvent>(TEvent evnt, RagonTarget target, RagonReplicationMode replicationMode)
|
||||
where TEvent : IRagonEvent, new()
|
||||
{
|
||||
var evntId = _client.Event.GetEventCode(evnt);
|
||||
var buffer = _client.Buffer;
|
||||
|
||||
buffer.Clear();
|
||||
buffer.WriteOperation(RagonOperation.REPLICATE_ROOM_EVENT);
|
||||
buffer.WriteUShort(evntId);
|
||||
buffer.WriteByte((byte)replicationMode);
|
||||
buffer.WriteByte((byte)target);
|
||||
|
||||
evnt.Serialize(buffer);
|
||||
|
||||
var sendData = buffer.ToArray();
|
||||
_client.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
internal void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode replicationMode)
|
||||
where TEvent : IRagonEvent, new()
|
||||
{
|
||||
var evntId = _client.Event.GetEventCode(evnt);
|
||||
var buffer = _client.Buffer;
|
||||
|
||||
buffer.Clear();
|
||||
buffer.WriteOperation(RagonOperation.REPLICATE_ROOM_EVENT);
|
||||
buffer.WriteUShort(evntId);
|
||||
buffer.WriteByte((byte)replicationMode);
|
||||
buffer.WriteByte((byte)RagonTarget.Player);
|
||||
buffer.WriteUShort(target.PeerId);
|
||||
|
||||
evnt.Serialize(buffer);
|
||||
|
||||
var sendData = buffer.ToArray();
|
||||
_client.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
public void ReplicateData(byte[] data, bool reliable)
|
||||
{
|
||||
var sendData = new byte[data.Length + 1];
|
||||
sendData[0] = (byte) RagonOperation.REPLICATE_RAW_DATA;
|
||||
Array.Copy(data, 0, sendData, 1, data.Length);
|
||||
|
||||
if (reliable)
|
||||
_client.Reliable.Send(sendData);
|
||||
else
|
||||
_client.Unreliable.Send(sendData);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -29,9 +29,9 @@ namespace Ragon.Client
|
||||
_buffer = buffer;
|
||||
}
|
||||
|
||||
public void CreateOrJoin(string map, int minPlayers, int maxPlayers)
|
||||
public void CreateOrJoin(string sceneName, int minPlayers, int maxPlayers)
|
||||
{
|
||||
var parameters = new RagonRoomParameters() {Map = map, Min = minPlayers, Max = maxPlayers};
|
||||
var parameters = new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers};
|
||||
CreateOrJoin(parameters);
|
||||
}
|
||||
|
||||
@@ -46,17 +46,17 @@ namespace Ragon.Client
|
||||
_client.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
public void Create(string map, int minPlayers, int maxPlayers)
|
||||
public void Create(string sceneName, int minPlayers, int maxPlayers)
|
||||
{
|
||||
Create(null, new RagonRoomParameters() {Map = map, Min = minPlayers, Max = maxPlayers});
|
||||
Create(null, new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers});
|
||||
}
|
||||
|
||||
public void Create(string roomId, string map, int minPlayers, int maxPlayers)
|
||||
public void Create(string roomId, string sceneName, int minPlayers, int maxPlayers)
|
||||
{
|
||||
Create(roomId, new RagonRoomParameters() {Map = map, Min = minPlayers, Max = maxPlayers});
|
||||
Create(roomId, new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers});
|
||||
}
|
||||
|
||||
public void Create(string roomId, RagonRoomParameters parameters)
|
||||
public void Create(string roomId, RagonRoomParameters parameters)
|
||||
{
|
||||
_buffer.Clear();
|
||||
_buffer.WriteOperation(RagonOperation.CREATE_ROOM);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
/*
|
||||
* Copyright 2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client
|
||||
{
|
||||
public class RagonUserData : IUserData
|
||||
{
|
||||
public byte[] this[string key]
|
||||
{
|
||||
get => _properties[key];
|
||||
set
|
||||
{
|
||||
_properties[key] = value;
|
||||
|
||||
if (!_changesCache.ContainsKey(key))
|
||||
{
|
||||
_localChanges.Add(key);
|
||||
_changesCache.Add(key, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Remove(string key)
|
||||
{
|
||||
if (_properties.Remove(key))
|
||||
{
|
||||
if (!_changesCache.ContainsKey(key))
|
||||
{
|
||||
_localChanges.Add(key);
|
||||
_changesCache.Add(key, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public bool Dirty => _localChanges.Count > 0;
|
||||
|
||||
private readonly List<string> _localChanges = new();
|
||||
private readonly Dictionary<string, bool> _changesCache = new();
|
||||
private readonly Dictionary<string, byte[]> _properties = new();
|
||||
|
||||
public RagonUserData()
|
||||
{
|
||||
}
|
||||
|
||||
public IReadOnlyList<string> Read(RagonBuffer buffer)
|
||||
{
|
||||
var len = buffer.ReadUShort();
|
||||
var changes = new List<string>(len);
|
||||
for (int i = 0; i < len; i++)
|
||||
{
|
||||
var key = buffer.ReadString();
|
||||
var valueSize = buffer.ReadUShort();
|
||||
if (valueSize > 0)
|
||||
{
|
||||
var value = buffer.ReadBytes(valueSize);
|
||||
_properties[key] = value;
|
||||
}
|
||||
else
|
||||
{
|
||||
_properties.Remove(key);
|
||||
}
|
||||
|
||||
changes.Add(key);
|
||||
}
|
||||
|
||||
return changes;
|
||||
}
|
||||
|
||||
public void Write(RagonBuffer buffer)
|
||||
{
|
||||
buffer.WriteUShort((ushort)_localChanges.Count);
|
||||
foreach (var propertyChanged in _localChanges)
|
||||
{
|
||||
buffer.WriteString(propertyChanged);
|
||||
if (_properties.TryGetValue(propertyChanged, out var property))
|
||||
{
|
||||
buffer.WriteUShort((ushort)property.Length);
|
||||
buffer.WriteBytes(property);
|
||||
}
|
||||
else
|
||||
{
|
||||
buffer.WriteUShort(0);
|
||||
}
|
||||
}
|
||||
|
||||
_localChanges.Clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
/*
|
||||
* Copyright 2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public class RagonUserDataReadOnly : IUserData
|
||||
{
|
||||
public byte[] this[string key]
|
||||
{
|
||||
get => _properties[key];
|
||||
set { }
|
||||
}
|
||||
|
||||
public bool Dirty => _dirty;
|
||||
|
||||
private bool _dirty = false;
|
||||
private readonly Dictionary<string, byte[]> _properties = new();
|
||||
|
||||
public RagonUserDataReadOnly()
|
||||
{
|
||||
}
|
||||
|
||||
public void Write(RagonBuffer buffer)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public IReadOnlyList<string> Read(RagonBuffer buffer)
|
||||
{
|
||||
var len = buffer.ReadUShort();
|
||||
var changes = new List<string>(len);
|
||||
for (int i = 0; i < len; i++)
|
||||
{
|
||||
var key = buffer.ReadString();
|
||||
var valueSize = buffer.ReadUShort();
|
||||
if (valueSize > 0)
|
||||
{
|
||||
var value = buffer.ReadBytes(valueSize);
|
||||
_properties[key] = value;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
_properties.Remove(key);
|
||||
}
|
||||
|
||||
changes.Add(key);
|
||||
}
|
||||
|
||||
return changes;
|
||||
}
|
||||
}
|
||||
@@ -6,14 +6,15 @@
|
||||
<LangVersion>8</LangVersion>
|
||||
<RootNamespace>Ragon.Common</RootNamespace>
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
<Version>1.2.4-rc</Version>
|
||||
<Title>Ragon.Protocol</Title>
|
||||
<Copyright>Eduard Kargin</Copyright>
|
||||
<PackageProjectUrl>https://ragon-server.com</PackageProjectUrl>
|
||||
<Version>1.4.0</Version>
|
||||
<Authors>Eduard Kargin</Authors>
|
||||
<PackageProjectUrl>https://ragon.io</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
|
||||
<RepositoryType>Source</RepositoryType>
|
||||
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
|
||||
<TargetFramework>netstandard2.1</TargetFramework>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -58,7 +58,6 @@
|
||||
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
|
||||
@@ -66,19 +65,24 @@ namespace Ragon.Protocol
|
||||
{
|
||||
public class RagonBuffer
|
||||
{
|
||||
private const int MaxBufferSize = 1024 * 1024; // 1MB max buffer size
|
||||
|
||||
private int _read;
|
||||
private int _write;
|
||||
private uint[] _buckets;
|
||||
private byte[] _rawData;
|
||||
private readonly UTF8Encoding _utf8Encoding = new UTF8Encoding(false, true);
|
||||
|
||||
public byte[] RawData => _rawData;
|
||||
public int ReadOffset => _read;
|
||||
public int WriteOffset => _write;
|
||||
public int Length => ((_write - 1) >> 3) + 1;
|
||||
public int Capacity => _write - _read;
|
||||
public int Capacity => _write - _read - 1;
|
||||
|
||||
public RagonBuffer(int capacity = 128)
|
||||
{
|
||||
_buckets = new uint[capacity];
|
||||
_rawData = Array.Empty<byte>();
|
||||
_read = 0;
|
||||
_write = 0;
|
||||
}
|
||||
@@ -119,6 +123,21 @@ namespace Ragon.Protocol
|
||||
return (RagonOperation)Read(8);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteFloat(float value)
|
||||
{
|
||||
var bytes = BitConverter.GetBytes(value);
|
||||
WriteBytes(bytes);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public float ReadFloat()
|
||||
{
|
||||
var bytes = ReadBytes(4);
|
||||
var value = BitConverter.ToSingle(bytes, 0);
|
||||
return value;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteFloat(float value, float min, float max, float precision)
|
||||
{
|
||||
@@ -145,6 +164,23 @@ namespace Ragon.Protocol
|
||||
return adjusted;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteInt(int value)
|
||||
{
|
||||
var bytes = BitConverter.GetBytes(value);
|
||||
|
||||
WriteBytes(bytes);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public int ReadInt()
|
||||
{
|
||||
var bytes = ReadBytes(4);
|
||||
var value = BitConverter.ToInt32(bytes, 0);
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteInt(int value, int min, int max)
|
||||
{
|
||||
@@ -234,9 +270,6 @@ namespace Ragon.Protocol
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void Write(uint value, int numBits = 16)
|
||||
{
|
||||
Debug.Assert(!(numBits < 0));
|
||||
Debug.Assert(!(numBits > 32));
|
||||
|
||||
var currentBucketIndex = _write >> 5;
|
||||
var used = _write & 0x0000001F;
|
||||
var mask = (1UL << used) - 1;
|
||||
@@ -245,12 +278,13 @@ namespace Ragon.Protocol
|
||||
|
||||
if (currentBucketIndex + 1 >= _buckets.Length)
|
||||
Resize(1);
|
||||
|
||||
|
||||
_buckets[currentBucketIndex] = (uint)result;
|
||||
_buckets[currentBucketIndex + 1] = (uint)(result >> 32);
|
||||
|
||||
_write += numBits;
|
||||
}
|
||||
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public uint Read(int numBits = 16)
|
||||
@@ -282,22 +316,25 @@ namespace Ragon.Protocol
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
[Obsolete("Do not use this method, will be removed")]
|
||||
public byte[] ReadBytes(int lenght)
|
||||
public byte[] ReadBytes(int len)
|
||||
{
|
||||
var data = new byte[lenght];
|
||||
for (int i = 0; i < lenght; i++)
|
||||
var data = new byte[len];
|
||||
for (int i = 0; i < len; i++)
|
||||
data[i] = (byte)Read(8);
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void ReadSpan(ref Span<uint> data, int size)
|
||||
public void ReadArray(uint[] data, int size)
|
||||
{
|
||||
var used = _read & 0x0000001F;
|
||||
var index = _read >> 5;
|
||||
var limit = (size + 32 - 1) / 32;
|
||||
var capacity = size;
|
||||
|
||||
if (index + limit >= _buckets.Length)
|
||||
Resize(size);
|
||||
|
||||
for (int i = 0; i < limit; i++)
|
||||
{
|
||||
@@ -306,23 +343,24 @@ namespace Ragon.Protocol
|
||||
var bucketRaw = (ulong)_buckets[index];
|
||||
if (index + 1 < _buckets.Length)
|
||||
bucketRaw |= (ulong)_buckets[index + 1] << 32;
|
||||
|
||||
|
||||
var bucket = bucketRaw >> used;
|
||||
var result = bucket & mask;
|
||||
|
||||
|
||||
data[i] = (uint)result;
|
||||
if (i + 1 < data.Length)
|
||||
data[i + 1] = (uint)(result >> 32);
|
||||
|
||||
|
||||
index += 1;
|
||||
capacity -= dataSize;
|
||||
}
|
||||
|
||||
|
||||
_read += size;
|
||||
}
|
||||
|
||||
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteSpan(ref ReadOnlySpan<uint> data, int size)
|
||||
public void WriteArray(uint[] data, int size)
|
||||
{
|
||||
var used = _write & 0x0000001F;
|
||||
var index = _write >> 5;
|
||||
@@ -330,20 +368,20 @@ namespace Ragon.Protocol
|
||||
|
||||
if (index + limit >= _buckets.Length)
|
||||
Resize(size);
|
||||
|
||||
|
||||
for (var i = 0; i < limit; i += 1)
|
||||
{
|
||||
var prepared = (ulong) data[i] << used;
|
||||
var prepared = (ulong)data[i] << used;
|
||||
var mask = (1UL << used) - 1;
|
||||
var scratch = _buckets[index] & mask;
|
||||
var result = scratch | prepared;
|
||||
|
||||
|
||||
_buckets[index] = (uint)result;
|
||||
_buckets[index + 1] = (uint)(result >> 32);
|
||||
|
||||
|
||||
index += 1;
|
||||
}
|
||||
|
||||
|
||||
_write += size;
|
||||
}
|
||||
|
||||
@@ -354,22 +392,26 @@ namespace Ragon.Protocol
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void FromBuffer(RagonBuffer buffer, int size)
|
||||
public void CopyFrom(RagonBuffer buffer, int size)
|
||||
{
|
||||
ReadOnlySpan<uint> data = buffer._buckets.AsSpan();
|
||||
WriteSpan(ref data, size);
|
||||
WriteArray(buffer._buckets, size);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void ToBuffer(RagonBuffer buffer, int size)
|
||||
{
|
||||
var data = buffer._buckets.AsSpan();
|
||||
ReadSpan(ref data, size);
|
||||
ReadArray(buffer._buckets, size);
|
||||
}
|
||||
|
||||
|
||||
public void FromArray(byte[] data)
|
||||
{
|
||||
var length = data.Length;
|
||||
|
||||
if (length > MaxBufferSize)
|
||||
{
|
||||
throw new InvalidOperationException($"Input data exceeds maximum buffer size: {length} bytes > {MaxBufferSize} bytes");
|
||||
}
|
||||
|
||||
var bucketsCount = length / 4 + 1;
|
||||
|
||||
if (_buckets.Length < bucketsCount)
|
||||
@@ -399,10 +441,13 @@ namespace Ragon.Protocol
|
||||
|
||||
_write = ((length - 1) * 8) + positionInByte;
|
||||
_read = 0;
|
||||
_rawData = data;
|
||||
}
|
||||
|
||||
public byte[] ToArray()
|
||||
{
|
||||
Write(1, 1);
|
||||
|
||||
var data = new byte[Length];
|
||||
int bucketsCount = (_write >> 5) + 1;
|
||||
int length = data.Length;
|
||||
@@ -428,9 +473,42 @@ namespace Ragon.Protocol
|
||||
return data;
|
||||
}
|
||||
|
||||
public void ToArray(byte[] outData)
|
||||
{
|
||||
Write(1, 1);
|
||||
|
||||
var bucketsCount = (_write >> 5) + 1;
|
||||
var length = Length;
|
||||
|
||||
for (int i = 0; i < bucketsCount; i++)
|
||||
{
|
||||
var dataIdx = i * 4;
|
||||
var bucket = _buckets[i];
|
||||
|
||||
if (dataIdx < length)
|
||||
outData[dataIdx] = (byte)bucket;
|
||||
|
||||
if (dataIdx + 1 < length)
|
||||
outData[dataIdx + 1] = (byte)(bucket >> 8);
|
||||
|
||||
if (dataIdx + 2 < length)
|
||||
outData[dataIdx + 2] = (byte)(bucket >> 16);
|
||||
|
||||
if (dataIdx + 3 < length)
|
||||
outData[dataIdx + 3] = (byte)(bucket >> 24);
|
||||
}
|
||||
}
|
||||
|
||||
private void Resize(int capacity)
|
||||
{
|
||||
var buckets = new uint[_buckets.Length * 2 + capacity];
|
||||
var newSize = _buckets.Length * 2 + capacity;
|
||||
|
||||
if (newSize * 4 > MaxBufferSize)
|
||||
{
|
||||
throw new InvalidOperationException($"Buffer size limit exceeded: {newSize * 4} bytes > {MaxBufferSize} bytes");
|
||||
}
|
||||
|
||||
var buckets = new uint[newSize];
|
||||
Array.Copy(_buckets, buckets, _buckets.Length);
|
||||
_buckets = buckets;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,27 +19,33 @@ namespace Ragon.Protocol
|
||||
{
|
||||
public enum RagonOperation: byte
|
||||
{
|
||||
AUTHORIZE,
|
||||
AUTHORIZED_SUCCESS,
|
||||
AUTHORIZED_FAILED,
|
||||
JOIN_OR_CREATE_ROOM,
|
||||
CREATE_ROOM,
|
||||
JOIN_ROOM,
|
||||
LEAVE_ROOM,
|
||||
OWNERSHIP_ENTITY_CHANGED,
|
||||
OWNERSHIP_ROOM_CHANGED,
|
||||
JOIN_SUCCESS,
|
||||
JOIN_FAILED,
|
||||
LOAD_SCENE,
|
||||
SCENE_LOADED,
|
||||
PLAYER_JOINED,
|
||||
PLAYER_LEAVED,
|
||||
CREATE_ENTITY,
|
||||
REMOVE_ENTITY,
|
||||
SNAPSHOT,
|
||||
REPLICATE_ENTITY_STATE,
|
||||
REPLICATE_ENTITY_EVENT,
|
||||
TRANSFER_ROOM_OWNERSHIP,
|
||||
TRANSFER_ENTITY_OWNERSHIP,
|
||||
AUTHORIZE = 1,
|
||||
AUTHORIZED_SUCCESS = 2,
|
||||
AUTHORIZED_FAILED = 3,
|
||||
JOIN_OR_CREATE_ROOM = 4,
|
||||
CREATE_ROOM = 5,
|
||||
JOIN_ROOM = 6,
|
||||
LEAVE_ROOM = 7,
|
||||
OWNERSHIP_ENTITY_CHANGED = 8,
|
||||
OWNERSHIP_ROOM_CHANGED= 9,
|
||||
JOIN_SUCCESS = 10,
|
||||
JOIN_FAILED = 11,
|
||||
LOAD_SCENE = 12,
|
||||
SCENE_LOADED = 13,
|
||||
PLAYER_JOINED = 14,
|
||||
PLAYER_LEAVED = 15,
|
||||
CREATE_ENTITY = 16,
|
||||
REMOVE_ENTITY = 17,
|
||||
SNAPSHOT = 18,
|
||||
REPLICATE_ENTITY_STATE = 19,
|
||||
REPLICATE_ENTITY_EVENT = 20,
|
||||
REPLICATE_RAW_DATA = 21,
|
||||
REPLICATE_ROOM_EVENT = 22,
|
||||
TRANSFER_ROOM_OWNERSHIP = 23,
|
||||
TRANSFER_ENTITY_OWNERSHIP = 24,
|
||||
TIMESTAMP_SYNCHRONIZATION = 25,
|
||||
ROOM_LIST_UPDATED = 26,
|
||||
PLAYER_DATA_UPDATED = 27,
|
||||
ROOM_DATA_UPDATED = 28,
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -19,20 +19,20 @@ namespace Ragon.Protocol
|
||||
{
|
||||
public class RagonRoomParameters: IRagonSerializable
|
||||
{
|
||||
public string Map { get; set; }
|
||||
public string Scene { get; set; }
|
||||
public int Min { get; set; }
|
||||
public int Max { get; set; }
|
||||
|
||||
public void Serialize(RagonBuffer buffer)
|
||||
{
|
||||
buffer.WriteString(Map);
|
||||
buffer.WriteString(Scene);
|
||||
buffer.WriteInt(Min, 1, 32);
|
||||
buffer.WriteInt(Max, 1, 32);
|
||||
}
|
||||
|
||||
public void Deserialize(RagonBuffer buffer)
|
||||
{
|
||||
Map = buffer.ReadString();
|
||||
Scene = buffer.ReadString();
|
||||
Min = buffer.ReadInt(1, 32);
|
||||
Max = buffer.ReadInt(1, 32);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -0,0 +1,309 @@
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
|
||||
namespace Ragon.Protocol
|
||||
{
|
||||
[StructLayout(LayoutKind.Explicit)]
|
||||
internal struct ValueConverter
|
||||
{
|
||||
[FieldOffset(0)] public int Int;
|
||||
[FieldOffset(0)] public float Float;
|
||||
[FieldOffset(0)] public long Long;
|
||||
[FieldOffset(0)] public byte Byte0;
|
||||
[FieldOffset(1)] public byte Byte1;
|
||||
[FieldOffset(2)] public byte Byte2;
|
||||
[FieldOffset(3)] public byte Byte3;
|
||||
[FieldOffset(4)] public byte Byte4;
|
||||
[FieldOffset(5)] public byte Byte5;
|
||||
[FieldOffset(6)] public byte Byte6;
|
||||
[FieldOffset(7)] public byte Byte7;
|
||||
}
|
||||
|
||||
public class RagonStream
|
||||
{
|
||||
private byte[] _data;
|
||||
private int _offset;
|
||||
private int _size;
|
||||
|
||||
public int Lenght => _offset;
|
||||
public int Size => _size - _offset;
|
||||
|
||||
public RagonStream(int capacity = 256)
|
||||
{
|
||||
_data = new byte[capacity];
|
||||
_offset = 0;
|
||||
_size = 0;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void Reset()
|
||||
{
|
||||
_size = _offset;
|
||||
_offset = 0;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void AddOffset(int offset)
|
||||
{
|
||||
_offset += offset;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public int WriteByte(byte value)
|
||||
{
|
||||
ResizeIfNeed(1);
|
||||
_data[_offset] = value;
|
||||
_offset += 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public byte ReadByte()
|
||||
{
|
||||
var value = _data[_offset];
|
||||
_offset += 1;
|
||||
return value;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public int WriteBool(bool value)
|
||||
{
|
||||
ResizeIfNeed(1);
|
||||
_data[_offset] = value ? (byte)1 : (byte)0;
|
||||
_offset += 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public bool ReadBool()
|
||||
{
|
||||
var value = _data[_offset];
|
||||
_offset += 1;
|
||||
return value == 1;
|
||||
}
|
||||
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public int WriteInt(int value)
|
||||
{
|
||||
ResizeIfNeed(4);
|
||||
var converter = new ValueConverter() { Int = value };
|
||||
_data[_offset] = converter.Byte0;
|
||||
_data[_offset + 1] = converter.Byte1;
|
||||
_data[_offset + 2] = converter.Byte2;
|
||||
_data[_offset + 3] = converter.Byte3;
|
||||
_offset += 4;
|
||||
return 4;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public int WriteInt(int value, int offset)
|
||||
{
|
||||
ResizeIfNeed(4);
|
||||
var converter = new ValueConverter() { Int = value };
|
||||
_data[offset] = converter.Byte0;
|
||||
_data[offset + 1] = converter.Byte1;
|
||||
_data[offset + 2] = converter.Byte2;
|
||||
_data[offset + 3] = converter.Byte3;
|
||||
return 4;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public int ReadInt()
|
||||
{
|
||||
var converter = new ValueConverter
|
||||
{ Byte0 = _data[_offset], Byte1 = _data[_offset + 1], Byte2 = _data[_offset + 2], Byte3 = _data[_offset + 3] };
|
||||
_offset += 4;
|
||||
return converter.Int;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteLong(long value)
|
||||
{
|
||||
ResizeIfNeed(8);
|
||||
WriteLong(value, _offset);
|
||||
_offset += 8;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public int WriteLong(long value, int offset)
|
||||
{
|
||||
var converter = new ValueConverter() { Long = value };
|
||||
_data[offset] = converter.Byte0;
|
||||
_data[offset + 1] = converter.Byte1;
|
||||
_data[offset + 2] = converter.Byte2;
|
||||
_data[offset + 3] = converter.Byte3;
|
||||
_data[offset + 4] = converter.Byte4;
|
||||
_data[offset + 5] = converter.Byte5;
|
||||
_data[offset + 6] = converter.Byte6;
|
||||
_data[offset + 7] = converter.Byte7;
|
||||
return 8;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public long ReadLong()
|
||||
{
|
||||
var converter = new ValueConverter
|
||||
{
|
||||
Byte0 = _data[_offset],
|
||||
Byte1 = _data[_offset + 1],
|
||||
Byte2 = _data[_offset + 2],
|
||||
Byte3 = _data[_offset + 3],
|
||||
Byte4 = _data[_offset + 4],
|
||||
Byte5 = _data[_offset + 5],
|
||||
Byte6 = _data[_offset + 6],
|
||||
Byte7 = _data[_offset + 7],
|
||||
};
|
||||
_offset += 8;
|
||||
return converter.Long;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public int WriteFloat(float value)
|
||||
{
|
||||
var converter = new ValueConverter() { Float = value };
|
||||
WriteInt(converter.Int);
|
||||
return 4;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public float ReadFloat()
|
||||
{
|
||||
var rawValue = ReadInt();
|
||||
var converter = new ValueConverter() { Int = rawValue };
|
||||
var value = converter.Float;
|
||||
return value;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public int WriteString(string value)
|
||||
{
|
||||
var rawData = Encoding.UTF8.GetBytes(value);
|
||||
var len = rawData.Length;
|
||||
ResizeIfNeed(2 + len);
|
||||
WriteUShort((ushort)len);
|
||||
|
||||
Buffer.BlockCopy(rawData, 0, _data, _offset, len);
|
||||
|
||||
_offset += len;
|
||||
|
||||
return len + 2;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public string ReadString()
|
||||
{
|
||||
var len = ReadUShort();
|
||||
var rawData = new byte[len];
|
||||
|
||||
Buffer.BlockCopy(_data, _offset, rawData, 0, len);
|
||||
|
||||
var str = Encoding.UTF8.GetString(rawData);
|
||||
_offset += len;
|
||||
return str;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public byte[] ReadBinary(int len)
|
||||
{
|
||||
if (len >= _data.Length)
|
||||
return Array.Empty<byte>();
|
||||
|
||||
var payload = new byte[len];
|
||||
Buffer.BlockCopy(_data, _offset, payload, 0, len);
|
||||
|
||||
_offset += len;
|
||||
|
||||
return payload;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteBinary(byte[] payload)
|
||||
{
|
||||
ResizeIfNeed(payload.Length);
|
||||
|
||||
Array.Copy(payload, 0, _data, _offset, payload.Length);
|
||||
|
||||
_offset += payload.Length;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteOperation(RagonOperation operation)
|
||||
{
|
||||
ResizeIfNeed(1);
|
||||
|
||||
_data[_offset] = (byte)operation;
|
||||
_offset += 1;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public RagonOperation ReadOperation()
|
||||
{
|
||||
var op = (RagonOperation)_data[_offset];
|
||||
_offset += 1;
|
||||
return op;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteUShort(ushort value)
|
||||
{
|
||||
ResizeIfNeed(2);
|
||||
|
||||
_data[_offset] = (byte)(value & 0x00FF);
|
||||
_data[_offset + 1] = (byte)((value & 0xFF00) >> 8);
|
||||
_offset += 2;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void WriteUShort(ushort value, int offset)
|
||||
{
|
||||
ResizeIfNeed(2);
|
||||
_data[offset] = (byte)(value & 0x00FF);
|
||||
_data[offset + 1] = (byte)((value & 0xFF00) >> 8);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public ushort ReadUShort()
|
||||
{
|
||||
var value = (ushort)(_data[_offset] + (_data[_offset + 1] << 8));
|
||||
_offset += 2;
|
||||
return value;
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
{
|
||||
_offset = 0;
|
||||
_size = 0;
|
||||
}
|
||||
|
||||
|
||||
public void FromArray(byte[] data)
|
||||
{
|
||||
Clear();
|
||||
ResizeIfNeed(data.Length);
|
||||
Buffer.BlockCopy(data, 0, _data, 0, data.Length);
|
||||
_size = data.Length;
|
||||
}
|
||||
|
||||
|
||||
public byte[] ToArray()
|
||||
{
|
||||
var bytes = new byte[_offset];
|
||||
Buffer.BlockCopy(_data, 0, bytes, 0, _offset);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
private void ResizeIfNeed(int lenght)
|
||||
{
|
||||
if (_offset + lenght < _data.Length)
|
||||
return;
|
||||
|
||||
var newData = new byte[_data.Length * 4 + lenght];
|
||||
Buffer.BlockCopy(_data, 0, newData, 0, _data.Length);
|
||||
_data = newData;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -16,9 +16,34 @@
|
||||
|
||||
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Ragon.Protocol
|
||||
{
|
||||
[StructLayout(LayoutKind.Explicit)]
|
||||
public struct DoubleToUInt
|
||||
{
|
||||
[FieldOffset(0)]
|
||||
public double Double;
|
||||
|
||||
[FieldOffset(0)]
|
||||
public uint Int0;
|
||||
|
||||
[FieldOffset(4)]
|
||||
public uint Int1;
|
||||
}
|
||||
|
||||
public static class RagonTime {
|
||||
public static double CurrentTimestamp()
|
||||
{
|
||||
var currentTime = System.DateTime.UtcNow.ToUniversalTime().Subtract(
|
||||
new System.DateTime(1970, 1, 1, 0, 0, 0, System.DateTimeKind.Utc)
|
||||
).TotalMilliseconds;
|
||||
|
||||
return currentTime;
|
||||
}
|
||||
}
|
||||
|
||||
public static class DeBruijn
|
||||
{
|
||||
private static readonly int[] _lookup = new int[32]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2023 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
* Copyright 2023-2024 Eduard Kargin <kargin.eduard@gmail.com>
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -16,12 +16,12 @@
|
||||
|
||||
namespace Ragon.Relay
|
||||
{
|
||||
class Program
|
||||
class Program
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
var relay = new Relay();
|
||||
relay.Start();
|
||||
}
|
||||
var relay = new Relay();
|
||||
relay.Start();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>Ragon.Relay</RootNamespace>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
@@ -23,9 +23,14 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Ragon.Server.ENet\Ragon.Server.ENet.csproj" />
|
||||
<ProjectReference Include="..\Ragon.Server.ENetServer\Ragon.Server.ENetServer.csproj" />
|
||||
<ProjectReference Include="..\Ragon.Server.WebSocketServer\Ragon.Server.WebSocketServer.csproj" />
|
||||
<ProjectReference Include="..\Ragon.Server\Ragon.Server.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="NLog" Version="5.3.2" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user