Compare commits
34 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2f919e4fd8 | |||
| edf90b39c4 | |||
| 672bb1ff6d | |||
| 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 |
@@ -49,7 +49,7 @@ jobs:
|
|||||||
- name: Setup dotnet
|
- name: Setup dotnet
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: 7.0.x
|
dotnet-version: 8.0.x
|
||||||
- name: Build
|
- name: Build
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\Ragon.Client\Ragon.Client.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,60 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client.Property
|
|
||||||
{
|
|
||||||
[Serializable]
|
|
||||||
public class RagonBool : RagonProperty
|
|
||||||
{
|
|
||||||
public bool Value
|
|
||||||
{
|
|
||||||
get => _value;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_value = value;
|
|
||||||
|
|
||||||
MarkAsChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool _value;
|
|
||||||
|
|
||||||
public RagonBool(
|
|
||||||
bool initialValue,
|
|
||||||
bool invokeLocal = true,
|
|
||||||
int priority = 0
|
|
||||||
) : base(priority, invokeLocal)
|
|
||||||
{
|
|
||||||
_value = initialValue;
|
|
||||||
SetFixedSize(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Serialize(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
buffer.WriteBool(_value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Deserialize(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
_value = buffer.ReadBool();
|
|
||||||
|
|
||||||
InvokeChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,104 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client
|
|
||||||
{
|
|
||||||
[Serializable]
|
|
||||||
public class RagonFloat : RagonProperty
|
|
||||||
{
|
|
||||||
public float Value
|
|
||||||
{
|
|
||||||
get => _value;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_value = value;
|
|
||||||
|
|
||||||
if (_value < _min)
|
|
||||||
_value = _min;
|
|
||||||
else if (_value > _max)
|
|
||||||
_value = _max;
|
|
||||||
|
|
||||||
MarkAsChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private float _value;
|
|
||||||
private float _min;
|
|
||||||
private float _max;
|
|
||||||
private int _requiredBits;
|
|
||||||
private float _precision;
|
|
||||||
private uint _mask;
|
|
||||||
|
|
||||||
public RagonFloat(
|
|
||||||
float initialValue,
|
|
||||||
bool invokeLocal = true,
|
|
||||||
int priority = 0
|
|
||||||
) : base(priority, invokeLocal)
|
|
||||||
{
|
|
||||||
_value = initialValue;
|
|
||||||
_min = -1024.0f;
|
|
||||||
_max = 1024.0f;
|
|
||||||
_precision = 0.01f;
|
|
||||||
|
|
||||||
_requiredBits = DeBruijn.Log2((uint)((_max - _min) * (1.0f / _precision) + 0.5f)) + 1;
|
|
||||||
_mask = (uint)((1L << _requiredBits) - 1);
|
|
||||||
|
|
||||||
SetFixedSize(_requiredBits);
|
|
||||||
}
|
|
||||||
|
|
||||||
public RagonFloat(
|
|
||||||
float initialValue,
|
|
||||||
float min = -1024.0f,
|
|
||||||
float max = 1024.0f,
|
|
||||||
float precision = 0.01f,
|
|
||||||
bool invokeLocal = true,
|
|
||||||
int priority = 0
|
|
||||||
) : base(priority, invokeLocal)
|
|
||||||
{
|
|
||||||
_value = initialValue;
|
|
||||||
_min = min;
|
|
||||||
_max = max;
|
|
||||||
_precision = precision;
|
|
||||||
|
|
||||||
_requiredBits = DeBruijn.Log2((uint)((_max - _min) * (1.0f / _precision) + 0.5f)) + 1;
|
|
||||||
_mask = (uint)((1L << _requiredBits) - 1);
|
|
||||||
|
|
||||||
SetFixedSize(_requiredBits);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Serialize(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
var compressedValue = (uint)((_value - _min) * (1f / _precision) + 0.5f) & _mask;
|
|
||||||
buffer.Write(compressedValue, _requiredBits);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Deserialize(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
var compressedValue = buffer.Read(_requiredBits);
|
|
||||||
_value = compressedValue * _precision + _min;
|
|
||||||
|
|
||||||
if (_value < _min)
|
|
||||||
_value = _min;
|
|
||||||
else if (_value > _max)
|
|
||||||
_value = _max;
|
|
||||||
|
|
||||||
InvokeChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,87 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client.Property
|
|
||||||
{
|
|
||||||
[Serializable]
|
|
||||||
public class RagonInt : RagonProperty
|
|
||||||
{
|
|
||||||
public int Value
|
|
||||||
{
|
|
||||||
get => _value;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_value = value;
|
|
||||||
MarkAsChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private int _min;
|
|
||||||
private int _max;
|
|
||||||
private int _requiredBits;
|
|
||||||
private int _value;
|
|
||||||
|
|
||||||
public RagonInt(
|
|
||||||
int initialValue,
|
|
||||||
bool invokeLocal = true,
|
|
||||||
int priority = 0
|
|
||||||
) : base(priority, invokeLocal)
|
|
||||||
{
|
|
||||||
_value = initialValue;
|
|
||||||
_min = -1000;
|
|
||||||
_max = 1000;
|
|
||||||
|
|
||||||
_max = Math.Max(Math.Abs(_min), Math.Abs(_max));
|
|
||||||
_requiredBits = Bits.Compute(_max);
|
|
||||||
|
|
||||||
SetFixedSize(_requiredBits);
|
|
||||||
}
|
|
||||||
|
|
||||||
public RagonInt(
|
|
||||||
int initialValue,
|
|
||||||
int min = -1000,
|
|
||||||
int max = 1000,
|
|
||||||
bool invokeLocal = true,
|
|
||||||
int priority = 0
|
|
||||||
) : base(priority, invokeLocal)
|
|
||||||
{
|
|
||||||
_value = initialValue;
|
|
||||||
_min = min;
|
|
||||||
_max = max;
|
|
||||||
|
|
||||||
_requiredBits = Bits.Compute(_max);
|
|
||||||
|
|
||||||
SetFixedSize(_requiredBits);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Serialize(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
uint compressedValue = (uint)((_value << 1) ^ (_value >> 31));
|
|
||||||
buffer.Write(compressedValue, _requiredBits);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Deserialize(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
var compressedValue = buffer.Read(_requiredBits);
|
|
||||||
_value = (int)((compressedValue >> 1) ^ -(int)(compressedValue & 1));
|
|
||||||
|
|
||||||
InvokeChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,76 +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 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,68 +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 System.Text;
|
|
||||||
using Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client.Property
|
|
||||||
{
|
|
||||||
[Serializable]
|
|
||||||
public class RagonString : RagonProperty
|
|
||||||
{
|
|
||||||
public string Value
|
|
||||||
{
|
|
||||||
get => _value;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_value = value;
|
|
||||||
|
|
||||||
MarkAsChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private string _value;
|
|
||||||
private readonly UTF8Encoding _utf8Encoding = new UTF8Encoding(false, true);
|
|
||||||
|
|
||||||
public RagonString(
|
|
||||||
string initialValue,
|
|
||||||
bool invokeLocal = true,
|
|
||||||
int priority = 0
|
|
||||||
) : base(priority, invokeLocal)
|
|
||||||
{
|
|
||||||
_value = initialValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Serialize(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
var data = _utf8Encoding.GetBytes(_value);
|
|
||||||
var len = (uint) data.Length;
|
|
||||||
|
|
||||||
buffer.Write(len, 16);
|
|
||||||
buffer.WriteBytes(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Deserialize(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
var len = (int) buffer.Read(16);
|
|
||||||
var data = buffer.ReadBytes(len);
|
|
||||||
|
|
||||||
_value = _utf8Encoding.GetString(data);
|
|
||||||
|
|
||||||
InvokeChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,330 +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 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,3 +1,4 @@
|
|||||||
|
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
@@ -5,18 +6,18 @@
|
|||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<LangVersion>10</LangVersion>
|
<LangVersion>10</LangVersion>
|
||||||
<RootNamespace>Ragon.Client.Simulation</RootNamespace>
|
<RootNamespace>Ragon.Client.Simulation</RootNamespace>
|
||||||
<Authors>Eduard Kargin (Edmand46)</Authors>
|
<Authors>Eduard Kargin</Authors>
|
||||||
<TargetFramework>netstandard2.0</TargetFramework>
|
<TargetFramework>netstandard2.0</TargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<DebugType>none</DebugType>
|
<DebugType>none</DebugType>
|
||||||
<OutputPath>/Users/edmand46/UnityProjects/itd-client/Assets/Ragon/Runtime/Plugins/</OutputPath>
|
<OutputPath></OutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||||
<OutputPath>/Users/edmand46/RagonProjects/ragon-oss-examples/Assets/Ragon/Plugins/</OutputPath>
|
<OutputPath></OutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,57 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client.Compressor;
|
|
||||||
|
|
||||||
public class FloatCompressor
|
|
||||||
{
|
|
||||||
public float Min { get; private set; }
|
|
||||||
public float Max { get; private set; }
|
|
||||||
public float Precision { get; private set; }
|
|
||||||
public int RequiredBits { get; private set; }
|
|
||||||
|
|
||||||
private uint _mask;
|
|
||||||
|
|
||||||
public FloatCompressor(float min = -1024.0f, float max = 1024.0f, float precision = 0.01f)
|
|
||||||
{
|
|
||||||
Min = min;
|
|
||||||
Max = max;
|
|
||||||
Precision = precision;
|
|
||||||
RequiredBits = DeBruijn.Log2((uint)((Max - Min) * (1f / Precision) + 0.5f)) + 1;
|
|
||||||
|
|
||||||
_mask = (uint)((1L << RequiredBits) - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public uint Compress(float value)
|
|
||||||
{
|
|
||||||
return (uint)((value - Min) * 1f / Precision + 0.5f) & _mask;
|
|
||||||
}
|
|
||||||
|
|
||||||
public float Decompress(uint value)
|
|
||||||
{
|
|
||||||
var result = value * Precision + Min;
|
|
||||||
|
|
||||||
if (result < Min)
|
|
||||||
result = Min;
|
|
||||||
else if (result > Max)
|
|
||||||
result = Max;
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,44 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client.Compressor;
|
|
||||||
|
|
||||||
public class IntCompressor
|
|
||||||
{
|
|
||||||
public int Min { get; private set; }
|
|
||||||
public int Max { get; private set; }
|
|
||||||
public int RequiredBits { get; private set; }
|
|
||||||
|
|
||||||
public IntCompressor(int min = -1000, int max = 1000)
|
|
||||||
{
|
|
||||||
Min = min;
|
|
||||||
Max = max;
|
|
||||||
RequiredBits = Bits.Compute(Max);
|
|
||||||
}
|
|
||||||
|
|
||||||
public uint Compress(int value)
|
|
||||||
{
|
|
||||||
return (uint)((value << 1) ^ (value >> 31));;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int Decompress(uint value)
|
|
||||||
{
|
|
||||||
return (int)((value >> 1) ^ -(int)(value & 1));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,304 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client
|
|
||||||
{
|
|
||||||
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 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; }
|
|
||||||
|
|
||||||
public event Action<RagonEntity> Attached;
|
|
||||||
public event Action Detached;
|
|
||||||
public event Action<RagonPlayer, RagonPlayer> OwnershipChanged;
|
|
||||||
|
|
||||||
internal bool PropertiesChanged => _propertiesChanged;
|
|
||||||
internal ushort SceneId => _sceneId;
|
|
||||||
|
|
||||||
private ushort _sceneId;
|
|
||||||
private bool _propertiesChanged;
|
|
||||||
|
|
||||||
private RagonPayload _spawnPayload;
|
|
||||||
private RagonPayload _destroyPayload;
|
|
||||||
|
|
||||||
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 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()
|
|
||||||
{
|
|
||||||
IsAttached = true;
|
|
||||||
|
|
||||||
Attached?.Invoke(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SetReplication(bool enabled)
|
|
||||||
{
|
|
||||||
IsReplicated = enabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void Detach(RagonPayload payload)
|
|
||||||
{
|
|
||||||
_destroyPayload = payload;
|
|
||||||
|
|
||||||
Detached?.Invoke();
|
|
||||||
}
|
|
||||||
|
|
||||||
internal T GetPayload<T>(RagonPayload data) where T : IRagonPayload, new()
|
|
||||||
{
|
|
||||||
var payload = new T();
|
|
||||||
if (data.Size <= 0) return payload;
|
|
||||||
|
|
||||||
var buffer = new RagonBuffer();
|
|
||||||
|
|
||||||
data.Write(buffer);
|
|
||||||
|
|
||||||
payload.Deserialize(buffer);
|
|
||||||
|
|
||||||
return payload;
|
|
||||||
}
|
|
||||||
|
|
||||||
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()
|
|
||||||
{
|
|
||||||
return GetPayload<T>(_spawnPayload);
|
|
||||||
}
|
|
||||||
|
|
||||||
public T GetDetachPayload<T>() where T : IRagonPayload, new()
|
|
||||||
{
|
|
||||||
return GetPayload<T>(_destroyPayload);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ReplicateEvent<TEvent>(TEvent evnt, RagonPlayer target, RagonReplicationMode replicationMode)
|
|
||||||
where TEvent : IRagonEvent, new()
|
|
||||||
{
|
|
||||||
if (!IsAttached)
|
|
||||||
{
|
|
||||||
RagonLog.Error("Entity not attached");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
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.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 ReplicateEvent<TEvent>(
|
|
||||||
TEvent evnt,
|
|
||||||
RagonTarget target = RagonTarget.All,
|
|
||||||
RagonReplicationMode replicationMode = RagonReplicationMode.Server)
|
|
||||||
where TEvent : IRagonEvent, new()
|
|
||||||
{
|
|
||||||
if (!IsAttached)
|
|
||||||
{
|
|
||||||
RagonLog.Error("Entity not attached");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var eventCode = _client.Event.GetEventCode(evnt);
|
|
||||||
if (target != RagonTarget.ExceptOwner)
|
|
||||||
{
|
|
||||||
if (replicationMode == RagonReplicationMode.Local)
|
|
||||||
{
|
|
||||||
var localListeners = _localListeners[eventCode];
|
|
||||||
foreach (var listener in localListeners)
|
|
||||||
listener.Invoke(_client.Room.Local, evnt);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (replicationMode == RagonReplicationMode.LocalAndServer)
|
|
||||||
{
|
|
||||||
var localListeners = _localListeners[eventCode];
|
|
||||||
foreach (var listener in localListeners)
|
|
||||||
listener.Invoke(_client.Room.Local, evnt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var buffer = _client.Buffer;
|
|
||||||
|
|
||||||
buffer.Clear();
|
|
||||||
buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
|
|
||||||
buffer.WriteUShort(Id);
|
|
||||||
buffer.WriteUShort(eventCode);
|
|
||||||
buffer.WriteByte((byte)replicationMode);
|
|
||||||
buffer.WriteByte((byte)target);
|
|
||||||
|
|
||||||
evnt.Serialize(buffer);
|
|
||||||
|
|
||||||
var sendData = buffer.ToArray();
|
|
||||||
_client.Reliable.Send(sendData);
|
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void Write(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
buffer.WriteUShort(Id);
|
|
||||||
|
|
||||||
State.WriteState(buffer);
|
|
||||||
|
|
||||||
_propertiesChanged = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void Read(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
State.ReadState(buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void Event(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
if (!IsReplicated) return;
|
|
||||||
|
|
||||||
if (_events.TryGetValue(eventCode, out var evnt))
|
|
||||||
evnt?.Invoke(caller, buffer);
|
|
||||||
else
|
|
||||||
RagonLog.Warn($"Handler event on entity {Id} with eventCode {eventCode} not defined");
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void TrackChangedProperty(RagonProperty property)
|
|
||||||
{
|
|
||||||
_propertiesChanged = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnOwnershipChanged(RagonPlayer player)
|
|
||||||
{
|
|
||||||
var prevOwner = Owner;
|
|
||||||
|
|
||||||
Owner = player;
|
|
||||||
HasAuthority = player.IsLocal;
|
|
||||||
|
|
||||||
OwnershipChanged?.Invoke(prevOwner, player);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
_events.Clear();
|
|
||||||
_listeners.Clear();
|
|
||||||
_localListeners.Clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
public sealed class RagonEntityState
|
|
||||||
{
|
|
||||||
private List<RagonProperty> _properties;
|
|
||||||
private RagonEntity _entity;
|
|
||||||
|
|
||||||
public RagonEntityState(RagonEntity entity)
|
|
||||||
{
|
|
||||||
_entity = entity;
|
|
||||||
_properties = new List<RagonProperty>(6);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AddProperty(RagonProperty property)
|
|
||||||
{
|
|
||||||
_properties.Add(property);
|
|
||||||
|
|
||||||
property.AssignEntity(_entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void WriteInfo(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
buffer.WriteUShort((ushort)_properties.Count);
|
|
||||||
foreach (var property in _properties)
|
|
||||||
{
|
|
||||||
buffer.WriteBool(property.IsFixed);
|
|
||||||
buffer.WriteUShort((ushort)property.Size);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void ReadState(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
foreach (var property in _properties)
|
|
||||||
{
|
|
||||||
var changed = buffer.ReadBool();
|
|
||||||
if (changed)
|
|
||||||
property.Read(buffer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void WriteState(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
foreach (var prop in _properties)
|
|
||||||
{
|
|
||||||
if (prop.IsDirty)
|
|
||||||
{
|
|
||||||
buffer.WriteBool(true);
|
|
||||||
prop.Write(buffer);
|
|
||||||
prop.Flush();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
prop.AddTick();
|
|
||||||
buffer.WriteBool(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,49 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
public class RagonPayload
|
|
||||||
{
|
|
||||||
public static RagonPayload Empty = new RagonPayload(0);
|
|
||||||
|
|
||||||
private readonly uint[] _data = new uint[128];
|
|
||||||
private readonly int _size = 0;
|
|
||||||
|
|
||||||
public RagonPayload(int capacity)
|
|
||||||
{
|
|
||||||
_size = capacity;
|
|
||||||
}
|
|
||||||
public int Size => _size;
|
|
||||||
|
|
||||||
public void Read(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
buffer.ReadArray(_data, _size);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Write(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
buffer.WriteArray(_data, _size);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string ToString()
|
|
||||||
{
|
|
||||||
return $"Payload Size: {_size}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,146 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client
|
|
||||||
{
|
|
||||||
[Serializable]
|
|
||||||
public class RagonProperty
|
|
||||||
{
|
|
||||||
public string Name => _name;
|
|
||||||
public RagonEntity Entity => _entity;
|
|
||||||
|
|
||||||
public event Action Changed;
|
|
||||||
public bool IsDirty => _dirty && _ticks >= _priority;
|
|
||||||
public bool IsFixed => _fixed;
|
|
||||||
public int Size => _size;
|
|
||||||
|
|
||||||
private RagonBuffer _propertyBuffer;
|
|
||||||
private RagonEntity _entity;
|
|
||||||
private bool _dirty;
|
|
||||||
private int _size;
|
|
||||||
private int _ticks;
|
|
||||||
private int _priority;
|
|
||||||
private bool _fixed;
|
|
||||||
private string _name;
|
|
||||||
|
|
||||||
protected bool InvokeLocal;
|
|
||||||
|
|
||||||
protected RagonProperty(int priority, bool invokeLocal)
|
|
||||||
{
|
|
||||||
_size = 0;
|
|
||||||
_priority = priority;
|
|
||||||
_fixed = false;
|
|
||||||
_propertyBuffer = new RagonBuffer();
|
|
||||||
|
|
||||||
InvokeLocal = invokeLocal;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SetName(string name)
|
|
||||||
{
|
|
||||||
_name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void SetFixedSize(int size)
|
|
||||||
{
|
|
||||||
_size = size;
|
|
||||||
_fixed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void InvokeChanged()
|
|
||||||
{
|
|
||||||
if (_entity.HasAuthority)
|
|
||||||
return;
|
|
||||||
|
|
||||||
Changed?.Invoke();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void MarkAsChanged()
|
|
||||||
{
|
|
||||||
if (InvokeLocal)
|
|
||||||
Changed?.Invoke();
|
|
||||||
|
|
||||||
if (_dirty || _entity == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
_dirty = true;
|
|
||||||
_entity.TrackChangedProperty(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void Flush()
|
|
||||||
{
|
|
||||||
_dirty = false;
|
|
||||||
_ticks = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void AddTick()
|
|
||||||
{
|
|
||||||
_ticks++;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void AssignEntity(RagonEntity ent)
|
|
||||||
{
|
|
||||||
_entity = ent;
|
|
||||||
|
|
||||||
Changed?.Invoke();
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void Write(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
_propertyBuffer.Clear();
|
|
||||||
|
|
||||||
if (_fixed)
|
|
||||||
{
|
|
||||||
Serialize(_propertyBuffer);
|
|
||||||
|
|
||||||
buffer.CopyFrom(_propertyBuffer, _size);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Serialize(_propertyBuffer);
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual void Serialize(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual void Deserialize(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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -27,7 +27,7 @@ internal class AuthorizeFailedHandler: IHandler
|
|||||||
_listenerList = list;
|
_listenerList = list;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
public void Handle(RagonStream reader)
|
||||||
{
|
{
|
||||||
var message = reader.ReadString();
|
var message = reader.ReadString();
|
||||||
_listenerList.OnAuthorizationFailed(message);
|
_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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -32,13 +32,13 @@ internal class AuthorizeSuccessHandler: IHandler
|
|||||||
_listenerList = listenerList;
|
_listenerList = listenerList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
public void Handle(RagonStream reader)
|
||||||
{
|
{
|
||||||
var playerId = reader.ReadString();
|
var playerId = reader.ReadString();
|
||||||
var playerName = reader.ReadString();
|
var playerName = reader.ReadString();
|
||||||
var playerPayload = reader.ReadString();
|
var playerPayload = reader.ReadString();
|
||||||
|
|
||||||
_client.SetStatus(RagonStatus.LOBBY);
|
_client.UpdateState(RagonState.LOBBY);
|
||||||
_listenerList.OnAuthorizationSuccess(playerId, playerName, playerPayload);
|
_listenerList.OnAuthorizationSuccess(playerId, playerName, playerPayload);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,69 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
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,
|
|
||||||
IRagonEntityListener entityListener
|
|
||||||
)
|
|
||||||
{
|
|
||||||
_client = client;
|
|
||||||
_entityCache = entityCache;
|
|
||||||
_playerCache = playerCache;
|
|
||||||
_entityListener = entityListener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
|
||||||
{
|
|
||||||
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(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.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,56 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
internal class EntityEventHandler : IHandler
|
|
||||||
{
|
|
||||||
private readonly RagonPlayerCache _playerCache;
|
|
||||||
private readonly 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)
|
|
||||||
{
|
|
||||||
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;
|
|
||||||
|
|
||||||
_entityCache.OnEvent(player, entityId, eventCode, reader);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,60 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
internal class EntityOwnershipHandler: IHandler
|
|
||||||
{
|
|
||||||
private readonly RagonListenerList _listenerList;
|
|
||||||
private readonly RagonPlayerCache _playerCache;
|
|
||||||
private readonly RagonEntityCache _entityCache;
|
|
||||||
|
|
||||||
public EntityOwnershipHandler(
|
|
||||||
RagonListenerList listenerList,
|
|
||||||
RagonPlayerCache playerCache,
|
|
||||||
RagonEntityCache entityCache)
|
|
||||||
{
|
|
||||||
_listenerList = listenerList;
|
|
||||||
_playerCache = playerCache;
|
|
||||||
_entityCache = entityCache;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
|
||||||
{
|
|
||||||
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 = reader.ReadUShort();
|
|
||||||
_entityCache.OnOwnershipChanged(player, entityId);
|
|
||||||
|
|
||||||
RagonLog.Trace("Entity changed owner: " + entityId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
internal class EntityRemoveHandler: IHandler
|
|
||||||
{
|
|
||||||
private readonly RagonEntityCache _entityCache;
|
|
||||||
|
|
||||||
public EntityRemoveHandler(RagonEntityCache entityCache)
|
|
||||||
{
|
|
||||||
_entityCache = entityCache;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
|
||||||
{
|
|
||||||
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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -21,5 +21,5 @@ namespace Ragon.Client;
|
|||||||
|
|
||||||
public interface IHandler
|
public interface IHandler
|
||||||
{
|
{
|
||||||
public void Handle(RagonBuffer reader);
|
public void Handle(RagonStream 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -28,7 +28,7 @@ internal class JoinFailedHandler: IHandler
|
|||||||
_listenerList = listenerList;
|
_listenerList = listenerList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
public void Handle(RagonStream reader)
|
||||||
{
|
{
|
||||||
var message = reader.ReadString();
|
var message = reader.ReadString();
|
||||||
_listenerList.OnFailed(message);
|
_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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,9 +19,9 @@ using Ragon.Protocol;
|
|||||||
|
|
||||||
namespace Ragon.Client;
|
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;
|
RoomId = roomId;
|
||||||
PlayerId = playerId;
|
PlayerId = playerId;
|
||||||
@@ -41,38 +41,48 @@ internal class JoinSuccessHandler : IHandler
|
|||||||
{
|
{
|
||||||
private readonly RagonListenerList _listenerList;
|
private readonly RagonListenerList _listenerList;
|
||||||
private readonly RagonPlayerCache _playerCache;
|
private readonly RagonPlayerCache _playerCache;
|
||||||
private readonly RagonEntityCache _entityCache;
|
|
||||||
private readonly RagonClient _client;
|
private readonly RagonClient _client;
|
||||||
|
private readonly RagonRoom _room;
|
||||||
|
|
||||||
public JoinSuccessHandler(
|
public JoinSuccessHandler(
|
||||||
RagonClient client,
|
RagonClient client,
|
||||||
RagonListenerList listenerList,
|
RagonRoom room
|
||||||
RagonPlayerCache playerCache,
|
|
||||||
RagonEntityCache entityCache
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
_client = client;
|
_client = client;
|
||||||
_listenerList = listenerList;
|
_room = room;
|
||||||
_entityCache = entityCache;
|
|
||||||
_playerCache = playerCache;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
public void Handle(RagonStream reader)
|
||||||
{
|
{
|
||||||
var roomId = reader.ReadString();
|
var roomId = reader.ReadString();
|
||||||
var localId = reader.ReadString();
|
|
||||||
var ownerId = reader.ReadString();
|
|
||||||
var min = reader.ReadUShort();
|
var min = reader.ReadUShort();
|
||||||
var max = reader.ReadUShort();
|
var max = reader.ReadUShort();
|
||||||
var sceneName = reader.ReadString();
|
var localId = reader.ReadString();
|
||||||
|
var ownerId = reader.ReadString();
|
||||||
var scene = new RagonScene(_client, _playerCache, _entityCache, sceneName);
|
var roomInfo = new RoomParameters(roomId, localId, ownerId, min, max);
|
||||||
var roomInfo = new RagonRoomInformation(roomId, localId, ownerId, min, max);
|
|
||||||
var room = new RagonRoom(_client, _entityCache, _playerCache, roomInfo, scene);
|
|
||||||
|
|
||||||
_playerCache.SetOwnerAndLocal(ownerId, localId);
|
_playerCache.SetOwnerAndLocal(ownerId, localId);
|
||||||
_client.AssignRoom(room);
|
_room.Reset(roomInfo);
|
||||||
|
_room.UserData.Read(reader);
|
||||||
|
|
||||||
_listenerList.OnSceneRequest(sceneName);
|
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.UpdateState(RagonState.ROOM);
|
||||||
|
|
||||||
|
_listenerList.OnJoined();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -23,22 +23,19 @@ internal class LeaveRoomHandler : IHandler
|
|||||||
{
|
{
|
||||||
private readonly RagonClient _client;
|
private readonly RagonClient _client;
|
||||||
private readonly RagonListenerList _listenerList;
|
private readonly RagonListenerList _listenerList;
|
||||||
private readonly RagonEntityCache _entityCache;
|
|
||||||
|
|
||||||
public LeaveRoomHandler(
|
public LeaveRoomHandler(
|
||||||
RagonClient client,
|
RagonClient client,
|
||||||
RagonListenerList listenerList,
|
RagonListenerList listenerList)
|
||||||
RagonEntityCache entityCache)
|
|
||||||
{
|
{
|
||||||
_client = client;
|
_client = client;
|
||||||
_listenerList = listenerList;
|
_listenerList = listenerList;
|
||||||
_entityCache = entityCache;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
public void Handle(RagonStream reader)
|
||||||
{
|
{
|
||||||
_listenerList.OnLeft();
|
_listenerList.OnLeft();
|
||||||
_entityCache.Cleanup();
|
|
||||||
_client.Room.Cleanup();
|
_client.Room.Clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,45 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
internal class SceneLoadHandler: IHandler
|
|
||||||
{
|
|
||||||
private readonly RagonClient _client;
|
|
||||||
private readonly RagonListenerList _listenerList;
|
|
||||||
|
|
||||||
public SceneLoadHandler(
|
|
||||||
RagonClient ragonClient,
|
|
||||||
RagonListenerList listenerList
|
|
||||||
)
|
|
||||||
{
|
|
||||||
_client = ragonClient;
|
|
||||||
_listenerList = listenerList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
|
||||||
{
|
|
||||||
var sceneName = reader.ReadString();
|
|
||||||
var room = _client.Room;
|
|
||||||
|
|
||||||
room.Cleanup();
|
|
||||||
room.Update(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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -23,19 +23,16 @@ internal class OwnershipRoomHandler : IHandler
|
|||||||
{
|
{
|
||||||
private readonly RagonListenerList _listenerList;
|
private readonly RagonListenerList _listenerList;
|
||||||
private readonly RagonPlayerCache _playerCache;
|
private readonly RagonPlayerCache _playerCache;
|
||||||
private readonly RagonEntityCache _entityCache;
|
|
||||||
|
|
||||||
public OwnershipRoomHandler(
|
public OwnershipRoomHandler(
|
||||||
RagonListenerList listenerList,
|
RagonListenerList listenerList,
|
||||||
RagonPlayerCache playerCache,
|
RagonPlayerCache playerCache)
|
||||||
RagonEntityCache entityCache)
|
|
||||||
{
|
{
|
||||||
_listenerList = listenerList;
|
_listenerList = listenerList;
|
||||||
_playerCache = playerCache;
|
_playerCache = playerCache;
|
||||||
_entityCache = entityCache;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
public void Handle(RagonStream reader)
|
||||||
{
|
{
|
||||||
var newOwnerId = reader.ReadUShort();
|
var newOwnerId = reader.ReadUShort();
|
||||||
var player = _playerCache.GetPlayerByPeer(newOwnerId);
|
var player = _playerCache.GetPlayerByPeer(newOwnerId);
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -33,7 +33,7 @@ internal class PlayerJoinHandler : IHandler
|
|||||||
_listenerList = listenerList;
|
_listenerList = listenerList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
public void Handle(RagonStream reader)
|
||||||
{
|
{
|
||||||
var playerPeerId = reader.ReadUShort();
|
var playerPeerId = reader.ReadUShort();
|
||||||
var playerId = reader.ReadString();
|
var playerId = reader.ReadString();
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -22,21 +22,18 @@ namespace Ragon.Client;
|
|||||||
internal class PlayerLeftHandler : IHandler
|
internal class PlayerLeftHandler : IHandler
|
||||||
{
|
{
|
||||||
private RagonPlayerCache _playerCache;
|
private RagonPlayerCache _playerCache;
|
||||||
private RagonEntityCache _entityCache;
|
|
||||||
private RagonListenerList _listenerList;
|
private RagonListenerList _listenerList;
|
||||||
|
|
||||||
public PlayerLeftHandler(
|
public PlayerLeftHandler(
|
||||||
RagonEntityCache entityCache,
|
|
||||||
RagonPlayerCache playerCache,
|
RagonPlayerCache playerCache,
|
||||||
RagonListenerList listenerList
|
RagonListenerList listenerList
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
_entityCache = entityCache;
|
|
||||||
_playerCache = playerCache;
|
_playerCache = playerCache;
|
||||||
_listenerList = listenerList;
|
_listenerList = listenerList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer reader)
|
public void Handle(RagonStream reader)
|
||||||
{
|
{
|
||||||
var playerId = reader.ReadString();
|
var playerId = reader.ReadString();
|
||||||
var player = _playerCache.GetPlayerById(playerId);
|
var player = _playerCache.GetPlayerById(playerId);
|
||||||
@@ -53,9 +50,10 @@ internal class PlayerLeftHandler : IHandler
|
|||||||
toDeleteIds[i] = entityId;
|
toDeleteIds[i] = entityId;
|
||||||
}
|
}
|
||||||
|
|
||||||
var emptyPayload = new RagonPayload(0);
|
|
||||||
foreach (var id in toDeleteIds)
|
// var emptyPayload = new RagonPayload(0);
|
||||||
_entityCache.OnDestroy(id, emptyPayload);
|
// foreach (var id in toDeleteIds)
|
||||||
|
// _entityCache.OnDestroy(id, emptyPayload);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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(RagonStream 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.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,56 +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 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));
|
|
||||||
var 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -32,7 +32,7 @@ public class RoomEventHandler : IHandler
|
|||||||
_playerCache = playerCache;
|
_playerCache = playerCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer buffer)
|
public void Handle(RagonStream buffer)
|
||||||
{
|
{
|
||||||
var eventCode = buffer.ReadUShort();
|
var eventCode = buffer.ReadUShort();
|
||||||
var peerId = buffer.ReadUShort();
|
var peerId = buffer.ReadUShort();
|
||||||
@@ -50,6 +50,6 @@ public class RoomEventHandler : IHandler
|
|||||||
if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
|
if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
_client.Room.Event(eventCode, player, buffer);
|
_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(RagonStream 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
+15
-2
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -18,8 +18,21 @@ using Ragon.Protocol;
|
|||||||
|
|
||||||
namespace Ragon.Client
|
namespace Ragon.Client
|
||||||
{
|
{
|
||||||
public interface IRagonPayload: IRagonSerializable
|
internal class RoomUserDataHandler : IHandler
|
||||||
{
|
{
|
||||||
|
private readonly RagonClient _client;
|
||||||
|
private readonly RagonListenerList _listenerList;
|
||||||
|
|
||||||
|
public RoomUserDataHandler(RagonClient client, RagonListenerList listenerList)
|
||||||
|
{
|
||||||
|
_client = client;
|
||||||
|
_listenerList = listenerList;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Handle(RagonStream reader)
|
||||||
|
{
|
||||||
|
var changes = _client.Room?.UserData.Read(reader);
|
||||||
|
_listenerList.OnRoomUserData(changes);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,137 +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 System.Diagnostics;
|
|
||||||
using Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
internal class SnapshotHandler : IHandler
|
|
||||||
{
|
|
||||||
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,
|
|
||||||
IRagonEntityListener entityListener
|
|
||||||
)
|
|
||||||
{
|
|
||||||
_client = ragonClient;
|
|
||||||
_entityListener = entityListener;
|
|
||||||
_listenerList = listenerList;
|
|
||||||
_entityCache = entityCache;
|
|
||||||
_playerCache = playerCache;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Handle(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
var entities = new List<RagonEntity>();
|
|
||||||
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);
|
|
||||||
|
|
||||||
RagonLog.Trace($"Player {playerPeerId} - {playerId} - {playerName}");
|
|
||||||
}
|
|
||||||
|
|
||||||
var dynamicEntities = buffer.ReadUShort();
|
|
||||||
RagonLog.Trace("Dynamic Entities: " + dynamicEntities);
|
|
||||||
for (var i = 0; i < dynamicEntities; i++)
|
|
||||||
{
|
|
||||||
var entityType = buffer.ReadUShort();
|
|
||||||
var entityId = buffer.ReadUShort();
|
|
||||||
var ownerPeerId = buffer.ReadUShort();
|
|
||||||
var payloadSize = buffer.ReadUShort();
|
|
||||||
|
|
||||||
var player = _playerCache.GetPlayerByPeer(ownerPeerId);
|
|
||||||
if (player == null)
|
|
||||||
{
|
|
||||||
RagonLog.Error($"Player not found with peerId: {ownerPeerId}");
|
|
||||||
|
|
||||||
_playerCache.Dump();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var hasAuthority = _playerCache.Local.Id == player.Id;
|
|
||||||
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);
|
|
||||||
|
|
||||||
entities.Add(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
var staticEntities = buffer.ReadUShort();
|
|
||||||
RagonLog.Trace("Scene Entities: " + staticEntities);
|
|
||||||
for (var i = 0; i < staticEntities; i++)
|
|
||||||
{
|
|
||||||
var entityType = buffer.ReadUShort();
|
|
||||||
var entityId = buffer.ReadUShort();
|
|
||||||
var staticId = buffer.ReadUShort();
|
|
||||||
var ownerPeerId = buffer.ReadUShort();
|
|
||||||
var payloadSize = buffer.ReadUShort();
|
|
||||||
|
|
||||||
var player = _playerCache.GetPlayerByPeer(ownerPeerId);
|
|
||||||
if (player == null)
|
|
||||||
{
|
|
||||||
RagonLog.Error($"Player not found with peerId: {ownerPeerId}");
|
|
||||||
|
|
||||||
_playerCache.Dump();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var hasAuthority = _playerCache.Local.Id == player.Id;
|
|
||||||
var entity = _entityCache.TryGetEntity(0, entityType, staticId, entityId, hasAuthority, out _);
|
|
||||||
|
|
||||||
entity.Prepare(_client, entityId, entityType, hasAuthority, player, RagonPayload.Empty);
|
|
||||||
entity.Read(buffer);
|
|
||||||
|
|
||||||
entities.Add(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_client.Status == RagonStatus.LOBBY)
|
|
||||||
{
|
|
||||||
_client.SetStatus(RagonStatus.ROOM);
|
|
||||||
_listenerList.OnJoined();
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var entity in entities)
|
|
||||||
entity.Attach();
|
|
||||||
|
|
||||||
_listenerList.OnSceneLoaded();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,12 +10,12 @@ public class TimestampHandler: IHandler
|
|||||||
_client = client;
|
_client = client;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(RagonBuffer buffer)
|
public void Handle(RagonStream buffer)
|
||||||
{
|
{
|
||||||
var timestamp0 = buffer.Read(32);
|
var timestamp0 = (uint)buffer.ReadInt();
|
||||||
var timestamp1 = buffer.Read(32);
|
var timestamp1 = (uint)buffer.ReadInt();
|
||||||
var value = new DoubleToUInt { Int0 = timestamp0, Int1 = timestamp1 };
|
var value = new DoubleToUInt { Int0 = timestamp0, Int1 = timestamp1 };
|
||||||
|
|
||||||
_client.SetTimestamp(value.Double);
|
_client.UpdateTimestamp(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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|||||||
@@ -1,22 +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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
public interface IRagonEntityListener
|
|
||||||
{
|
|
||||||
public void OnEntityCreated(RagonEntity entity);
|
|
||||||
}
|
|
||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -20,6 +20,5 @@ namespace Ragon.Client
|
|||||||
{
|
{
|
||||||
public interface IRagonEvent: IRagonSerializable
|
public interface IRagonEvent: IRagonSerializable
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -14,9 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
using Ragon.Protocol;
|
||||||
|
|
||||||
namespace Ragon.Client;
|
namespace Ragon.Client;
|
||||||
|
|
||||||
public interface IRagonSceneCollector
|
public interface IUserData
|
||||||
{
|
{
|
||||||
public RagonEntity[] Collect();
|
public byte[] this[string key] { get; set; }
|
||||||
|
bool Dirty { get; }
|
||||||
|
IReadOnlyList<string> Read(RagonStream buffer);
|
||||||
|
void Write(RagonStream 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -18,5 +18,5 @@ namespace Ragon.Client;
|
|||||||
|
|
||||||
public interface IRagonDataListener
|
public interface IRagonDataListener
|
||||||
{
|
{
|
||||||
public void OnData(RagonPlayer player, byte[] data);
|
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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -22,10 +22,12 @@ namespace Ragon.Client
|
|||||||
IRagonFailedListener,
|
IRagonFailedListener,
|
||||||
IRagonJoinListener,
|
IRagonJoinListener,
|
||||||
IRagonLeftListener,
|
IRagonLeftListener,
|
||||||
IRagonSceneListener,
|
|
||||||
IRagonOwnershipChangedListener,
|
IRagonOwnershipChangedListener,
|
||||||
IRagonPlayerJoinListener,
|
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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|||||||
+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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
namespace Ragon.Client;
|
namespace Ragon.Client;
|
||||||
|
|
||||||
public interface IRagonSceneListener
|
public interface IRagonPlayerUserDataListener
|
||||||
{
|
{
|
||||||
void OnSceneLoaded(RagonClient client);
|
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);
|
||||||
|
}
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|||||||
+104
-109
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -22,18 +22,16 @@ namespace Ragon.Client
|
|||||||
{
|
{
|
||||||
private readonly INetworkConnection _connection;
|
private readonly INetworkConnection _connection;
|
||||||
private readonly NetworkStatistics _stats;
|
private readonly NetworkStatistics _stats;
|
||||||
private IRagonEntityListener _entityListener;
|
|
||||||
private IRagonSceneCollector _sceneCollector;
|
|
||||||
private IHandler[] _handlers;
|
private IHandler[] _handlers;
|
||||||
private RagonBuffer _readBuffer;
|
private RagonStream _readBuffer;
|
||||||
private RagonBuffer _writeBuffer;
|
private RagonStream _writeBuffer;
|
||||||
private RagonRoom _room;
|
private RagonRoom _room;
|
||||||
private RagonSession _session;
|
private RagonSession _session;
|
||||||
private RagonListenerList listeners;
|
private RagonListenerList _listeners;
|
||||||
private RagonPlayerCache _playerCache;
|
private RagonPlayerCache _playerCache;
|
||||||
private RagonEntityCache _entityCache;
|
|
||||||
private RagonEventCache _eventCache;
|
private RagonEventCache _eventCache;
|
||||||
private RagonStatus _status;
|
private RagonState _state;
|
||||||
|
|
||||||
private double _serverTimestamp;
|
private double _serverTimestamp;
|
||||||
private float _replicationRate = 0;
|
private float _replicationRate = 0;
|
||||||
@@ -41,14 +39,13 @@ namespace Ragon.Client
|
|||||||
|
|
||||||
public double ServerTimestamp => _serverTimestamp;
|
public double ServerTimestamp => _serverTimestamp;
|
||||||
public IRagonConnection Connection => _connection;
|
public IRagonConnection Connection => _connection;
|
||||||
public RagonStatus Status => _status;
|
public RagonState State => _state;
|
||||||
public RagonSession Session => _session;
|
public RagonSession Session => _session;
|
||||||
public RagonEventCache Event => _eventCache;
|
public RagonEventCache Event => _eventCache;
|
||||||
public RagonEntityCache Entity => _entityCache;
|
|
||||||
public NetworkStatistics Statistics => _stats;
|
public NetworkStatistics Statistics => _stats;
|
||||||
public RagonRoom Room => _room;
|
public RagonRoom Room => _room;
|
||||||
|
|
||||||
internal RagonBuffer Buffer => _writeBuffer;
|
internal RagonStream Buffer => _writeBuffer;
|
||||||
internal INetworkChannel Reliable => _connection.Reliable;
|
internal INetworkChannel Reliable => _connection.Reliable;
|
||||||
internal INetworkChannel Unreliable => _connection.Unreliable;
|
internal INetworkChannel Unreliable => _connection.Unreliable;
|
||||||
|
|
||||||
@@ -56,7 +53,7 @@ namespace Ragon.Client
|
|||||||
|
|
||||||
public RagonClient(INetworkConnection connection, int rate)
|
public RagonClient(INetworkConnection connection, int rate)
|
||||||
{
|
{
|
||||||
listeners = new RagonListenerList(this);
|
_listeners = new RagonListenerList(this);
|
||||||
|
|
||||||
_connection = connection;
|
_connection = connection;
|
||||||
_connection.OnData += OnData;
|
_connection.OnData += OnData;
|
||||||
@@ -67,70 +64,41 @@ namespace Ragon.Client
|
|||||||
_replicationTime = 0;
|
_replicationTime = 0;
|
||||||
|
|
||||||
_eventCache = new RagonEventCache();
|
_eventCache = new RagonEventCache();
|
||||||
|
_writeBuffer = new RagonStream();
|
||||||
|
_readBuffer = new RagonStream();
|
||||||
|
_playerCache = new RagonPlayerCache();
|
||||||
|
_session = new RagonSession(this, _writeBuffer);
|
||||||
|
_room = new RagonRoom(this, _playerCache);
|
||||||
_stats = new NetworkStatistics();
|
_stats = new NetworkStatistics();
|
||||||
_status = RagonStatus.DISCONNECTED;
|
_state = RagonState.DISCONNECTED;
|
||||||
}
|
|
||||||
|
|
||||||
|
_handlers = new IHandler[byte.MaxValue];
|
||||||
public void Configure(IRagonSceneCollector sceneCollector)
|
_handlers[(byte)RagonOperation.AUTHORIZED_SUCCESS] = new AuthorizeSuccessHandler(this, _listeners);
|
||||||
{
|
_handlers[(byte)RagonOperation.AUTHORIZED_FAILED] = new AuthorizeFailedHandler(_listeners);
|
||||||
_sceneCollector = sceneCollector;
|
_handlers[(byte)RagonOperation.JOIN_SUCCESS] = new JoinSuccessHandler(this, _room);
|
||||||
}
|
_handlers[(byte)RagonOperation.JOIN_FAILED] = new JoinFailedHandler(_listeners);
|
||||||
|
_handlers[(byte)RagonOperation.LEAVE_ROOM] = new LeaveRoomHandler(this, _listeners);
|
||||||
public void Configure(IRagonEntityListener listener)
|
_handlers[(byte)RagonOperation.OWNERSHIP_ROOM_CHANGED] = new OwnershipRoomHandler(_listeners, _playerCache);
|
||||||
{
|
_handlers[(byte)RagonOperation.PLAYER_JOINED] = new PlayerJoinHandler(_playerCache, _listeners);
|
||||||
_entityListener = listener;
|
_handlers[(byte)RagonOperation.PLAYER_LEAVED] = new PlayerLeftHandler(_playerCache, _listeners);
|
||||||
|
_handlers[(byte)RagonOperation.REPLICATE_ROOM_EVENT] = new RoomEventHandler(this, _playerCache);
|
||||||
|
_handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampHandler(this);
|
||||||
|
_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);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Connect(string address, ushort port, string protocol)
|
public void Connect(string address, ushort port, string protocol)
|
||||||
{
|
{
|
||||||
if (_sceneCollector == null)
|
|
||||||
{
|
|
||||||
RagonLog.Error("Scene collector is not defined!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_entityListener == null)
|
|
||||||
{
|
|
||||||
RagonLog.Error("Entity Listener is not defined!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_writeBuffer = new RagonBuffer();
|
|
||||||
_readBuffer = new RagonBuffer();
|
|
||||||
_session = new RagonSession(this, _writeBuffer);
|
|
||||||
|
|
||||||
_playerCache = new RagonPlayerCache();
|
|
||||||
_entityCache = new RagonEntityCache(this, _playerCache, _sceneCollector);
|
|
||||||
|
|
||||||
_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(_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);
|
|
||||||
|
|
||||||
var protocolRaw = RagonVersion.Parse(protocol);
|
var protocolRaw = RagonVersion.Parse(protocol);
|
||||||
_connection.Connect(address, port, protocolRaw);
|
_connection.Connect(address, port, protocolRaw);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Disconnect()
|
public void Disconnect()
|
||||||
{
|
{
|
||||||
_status = RagonStatus.DISCONNECTED;
|
_state = RagonState.DISCONNECTED;
|
||||||
_room.Cleanup();
|
_room.Clear();
|
||||||
|
|
||||||
_connection.Disconnect();
|
_connection.Disconnect();
|
||||||
|
|
||||||
OnDisconnected(RagonDisconnect.MANUAL);
|
OnDisconnected(RagonDisconnect.MANUAL);
|
||||||
@@ -138,76 +106,71 @@ namespace Ragon.Client
|
|||||||
|
|
||||||
public void Update(float dt)
|
public void Update(float dt)
|
||||||
{
|
{
|
||||||
if (_status != RagonStatus.DISCONNECTED)
|
if (_state != RagonState.DISCONNECTED)
|
||||||
{
|
{
|
||||||
_replicationTime += dt;
|
_replicationTime += dt;
|
||||||
if (_replicationTime >= _replicationRate)
|
if (_replicationTime >= _replicationRate)
|
||||||
{
|
{
|
||||||
_replicationTime = 0;
|
_replicationTime = 0;
|
||||||
_entityCache.WriteState(_writeBuffer);
|
|
||||||
|
|
||||||
SendTimestamp();
|
SendTimestamp();
|
||||||
|
SendRoomUserData();
|
||||||
|
SendPlayerUserData();
|
||||||
}
|
}
|
||||||
|
|
||||||
_stats.Update(_connection.BytesSent, _connection.BytesReceived, _connection.Ping, dt);
|
_stats.Update(_connection.BytesSent, _connection.BytesReceived, _connection.Ping, dt);
|
||||||
}
|
}
|
||||||
|
|
||||||
listeners.Update();
|
_listeners.Update();
|
||||||
_connection.Update();
|
_connection.Update();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
if (_status != RagonStatus.DISCONNECTED)
|
if (_state != RagonState.DISCONNECTED)
|
||||||
{
|
{
|
||||||
_status = RagonStatus.DISCONNECTED;
|
_state = RagonState.DISCONNECTED;
|
||||||
_connection.Disconnect();
|
_connection.Disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
_connection.Dispose();
|
_connection.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddListener(IRagonListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonAuthorizationListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonAuthorizationListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonConnectionListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonConnectionListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonFailedListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonFailedListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonJoinListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonJoinListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonLeftListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonLeftListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonOwnershipChangedListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonOwnershipChangedListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonPlayerJoinListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonPlayerJoinListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonPlayerLeftListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonPlayerLeftListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonSceneListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonRoomListListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonSceneRequestListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonPlayerUserDataListener listener) => _listeners.Add(listener);
|
||||||
public void AddListener(IRagonDataListener listener) => listeners.Add(listener);
|
public void AddListener(IRagonRoomUserDataListener listener) => _listeners.Add(listener);
|
||||||
|
public void RemoveListener(IRagonListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonAuthorizationListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonAuthorizationListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonConnectionListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonConnectionListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonFailedListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonFailedListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonJoinListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonJoinListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonLeftListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonLeftListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonOwnershipChangedListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonOwnershipChangedListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonPlayerJoinListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonPlayerJoinListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonPlayerLeftListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonPlayerLeftListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonRoomListListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonSceneListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonRoomUserDataListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonSceneRequestListener listener) => listeners.Remove(listener);
|
public void RemoveListener(IRagonPlayerUserDataListener listener) => _listeners.Remove(listener);
|
||||||
public void RemoveListener(IRagonDataListener listener) => listeners.Remove(listener);
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region INTERNAL
|
#region INTERNAL
|
||||||
|
|
||||||
internal void AssignRoom(RagonRoom room)
|
internal void UpdateState(RagonState state)
|
||||||
{
|
{
|
||||||
_room?.Dispose();
|
_state = state;
|
||||||
_room = room;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void SetStatus(RagonStatus status)
|
internal void UpdateTimestamp(double time)
|
||||||
{
|
|
||||||
_status = status;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void SetTimestamp(double time)
|
|
||||||
{
|
{
|
||||||
_serverTimestamp = time;
|
_serverTimestamp = time;
|
||||||
}
|
}
|
||||||
@@ -226,24 +189,56 @@ namespace Ragon.Client
|
|||||||
|
|
||||||
_writeBuffer.Clear();
|
_writeBuffer.Clear();
|
||||||
_writeBuffer.WriteOperation(RagonOperation.TIMESTAMP_SYNCHRONIZATION);
|
_writeBuffer.WriteOperation(RagonOperation.TIMESTAMP_SYNCHRONIZATION);
|
||||||
_writeBuffer.Write(value.Int0, 32);
|
_writeBuffer.WriteInt((int)value.Int0);
|
||||||
_writeBuffer.Write(value.Int1, 32);
|
_writeBuffer.WriteInt((int)value.Int1);
|
||||||
|
}
|
||||||
|
|
||||||
|
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()
|
private void OnConnected()
|
||||||
{
|
{
|
||||||
RagonLog.Trace("Connected");
|
RagonLog.Trace("Connected");
|
||||||
|
|
||||||
listeners.OnConnected();
|
_listeners.OnConnected();
|
||||||
_status = RagonStatus.CONNECTED;
|
_state = RagonState.CONNECTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDisconnected(RagonDisconnect reason)
|
private void OnDisconnected(RagonDisconnect reason)
|
||||||
{
|
{
|
||||||
RagonLog.Trace($"Disconnected: {reason}");
|
RagonLog.Trace($"Disconnected: {reason}");
|
||||||
|
|
||||||
listeners.OnDisconnected(reason);
|
_listeners.OnDisconnected(reason);
|
||||||
_status = RagonStatus.DISCONNECTED;
|
_state = RagonState.DISCONNECTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnData(byte[] data)
|
private void OnData(byte[] data)
|
||||||
|
|||||||
@@ -1,257 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client;
|
|
||||||
|
|
||||||
public sealed class RagonEntityCache
|
|
||||||
{
|
|
||||||
private readonly List<RagonEntity> _entityList = new();
|
|
||||||
private readonly Dictionary<uint, RagonEntity> _entityMap = new();
|
|
||||||
private readonly Dictionary<uint, RagonEntity> _pendingEntities = new();
|
|
||||||
private readonly Dictionary<uint, RagonEntity> _sceneEntities = new();
|
|
||||||
|
|
||||||
private readonly RagonClient _client;
|
|
||||||
private readonly IRagonSceneCollector _sceneCollector;
|
|
||||||
private readonly RagonPlayerCache _playerCache;
|
|
||||||
|
|
||||||
private int _localEntitiesCounter = 0;
|
|
||||||
|
|
||||||
public RagonEntityCache(
|
|
||||||
RagonClient client,
|
|
||||||
RagonPlayerCache playerCache,
|
|
||||||
IRagonSceneCollector sceneCollector
|
|
||||||
)
|
|
||||||
{
|
|
||||||
_client = client;
|
|
||||||
_sceneCollector = sceneCollector;
|
|
||||||
_playerCache = playerCache;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool TryGetEntity(ushort id, out RagonEntity entity)
|
|
||||||
{
|
|
||||||
return _entityMap.TryGetValue(id, out entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Create(RagonEntity entity, RagonPayload spawnPayload)
|
|
||||||
{
|
|
||||||
var attachId = (ushort)(_playerCache.Local.PeerId + _localEntitiesCounter++);
|
|
||||||
var buffer = _client.Buffer;
|
|
||||||
|
|
||||||
buffer.Clear();
|
|
||||||
buffer.WriteOperation(RagonOperation.CREATE_ENTITY);
|
|
||||||
buffer.WriteUShort(attachId);
|
|
||||||
buffer.WriteUShort(entity.Type);
|
|
||||||
buffer.WriteByte((byte)entity.Authority);
|
|
||||||
|
|
||||||
entity.State.WriteInfo(buffer);
|
|
||||||
|
|
||||||
spawnPayload?.Write(buffer);
|
|
||||||
|
|
||||||
_pendingEntities.Add(attachId, entity);
|
|
||||||
|
|
||||||
var sendData = buffer.ToArray();
|
|
||||||
_client.Reliable.Send(sendData);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Transfer(RagonEntity entity, RagonPlayer player)
|
|
||||||
{
|
|
||||||
var buffer = _client.Buffer;
|
|
||||||
|
|
||||||
buffer.Clear();
|
|
||||||
buffer.WriteOperation(RagonOperation.TRANSFER_ENTITY_OWNERSHIP);
|
|
||||||
buffer.WriteUShort(entity.Id);
|
|
||||||
buffer.WriteUShort(player.PeerId);
|
|
||||||
|
|
||||||
var sendData = buffer.ToArray();
|
|
||||||
_client.Reliable.Send(sendData);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Destroy(RagonEntity entity, RagonPayload destroyPayload)
|
|
||||||
{
|
|
||||||
if (!entity.IsAttached && !entity.HasAuthority)
|
|
||||||
{
|
|
||||||
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?.Write(buffer);
|
|
||||||
|
|
||||||
var sendData = buffer.ToArray();
|
|
||||||
_client.Reliable.Send(sendData);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void WriteState(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
var changedEntities = 0u;
|
|
||||||
|
|
||||||
buffer.Clear();
|
|
||||||
buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_STATE);
|
|
||||||
|
|
||||||
var offset = buffer.WriteOffset;
|
|
||||||
buffer.Write(0, 16);
|
|
||||||
|
|
||||||
foreach (var ent in _entityList)
|
|
||||||
{
|
|
||||||
if (!ent.IsAttached ||
|
|
||||||
!ent.IsReplicated ||
|
|
||||||
!ent.PropertiesChanged) continue;
|
|
||||||
|
|
||||||
ent.Write(buffer);
|
|
||||||
|
|
||||||
changedEntities++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (changedEntities <= 0) return;
|
|
||||||
|
|
||||||
buffer.Write(changedEntities, 16, offset);
|
|
||||||
|
|
||||||
var data = buffer.ToArray();
|
|
||||||
_client.Unreliable.Send(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void WriteScene(RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
_sceneEntities.Clear();
|
|
||||||
|
|
||||||
var entities = _sceneCollector.Collect();
|
|
||||||
buffer.WriteUShort((ushort)entities.Length);
|
|
||||||
foreach (var entity in entities)
|
|
||||||
{
|
|
||||||
buffer.WriteUShort(entity.Type);
|
|
||||||
buffer.WriteByte((byte)entity.Authority);
|
|
||||||
buffer.WriteUShort(entity.SceneId);
|
|
||||||
|
|
||||||
entity.State.WriteInfo(buffer);
|
|
||||||
|
|
||||||
_sceneEntities.Add(entity.SceneId, entity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void CacheScene()
|
|
||||||
{
|
|
||||||
_sceneEntities.Clear();
|
|
||||||
|
|
||||||
var entities = _sceneCollector.Collect();
|
|
||||||
foreach (var entity in entities)
|
|
||||||
_sceneEntities.Add(entity.SceneId, entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void Cleanup()
|
|
||||||
{
|
|
||||||
var payload = new RagonPayload(0);
|
|
||||||
foreach (var ent in _entityList)
|
|
||||||
ent.Detach(payload);
|
|
||||||
|
|
||||||
_entityMap.Clear();
|
|
||||||
_entityList.Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
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 sceneEntity))
|
|
||||||
{
|
|
||||||
_entityMap.Add(entityId, sceneEntity);
|
|
||||||
|
|
||||||
if (hasAuthority)
|
|
||||||
_entityList.Add(sceneEntity);
|
|
||||||
|
|
||||||
hasCreated = false;
|
|
||||||
|
|
||||||
return sceneEntity;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_pendingEntities.TryGetValue(attachId, out var pendingEntity) && hasAuthority)
|
|
||||||
{
|
|
||||||
_pendingEntities.Remove(attachId);
|
|
||||||
_entityMap.Add(entityId, pendingEntity);
|
|
||||||
_entityList.Add(pendingEntity);
|
|
||||||
|
|
||||||
hasCreated = false;
|
|
||||||
|
|
||||||
return pendingEntity;
|
|
||||||
}
|
|
||||||
|
|
||||||
var entity = new RagonEntity(entityType, sceneId);
|
|
||||||
|
|
||||||
_entityMap.Add(entityId, entity);
|
|
||||||
|
|
||||||
if (hasAuthority)
|
|
||||||
_entityList.Add(entity);
|
|
||||||
|
|
||||||
hasCreated = true;
|
|
||||||
|
|
||||||
return entity;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
internal void OnDestroy(ushort entityId, RagonPayload payload)
|
|
||||||
{
|
|
||||||
if (_entityMap.TryGetValue(entityId, out var entity))
|
|
||||||
{
|
|
||||||
_entityMap.Remove(entityId);
|
|
||||||
_entityList.Remove(entity);
|
|
||||||
|
|
||||||
entity.Detach(payload);
|
|
||||||
entity.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void OnState(ushort entityId, RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
if (_entityMap.TryGetValue(entityId, out var entity))
|
|
||||||
entity.Read(buffer);
|
|
||||||
else
|
|
||||||
RagonLog.Warn($"Entity {entityId} not found!");
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void OnEvent(RagonPlayer player, ushort entityId, ushort eventCode, RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
if (_entityMap.TryGetValue(entityId, out var entity))
|
|
||||||
entity.Event(eventCode, player, buffer);
|
|
||||||
else
|
|
||||||
RagonLog.Warn($"Entity {entityId} not found!");
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void OnOwnershipChanged(RagonPlayer player, ushort entityId)
|
|
||||||
{
|
|
||||||
if (_entityMap.TryGetValue(entityId, out var entity))
|
|
||||||
{
|
|
||||||
if (player.IsLocal)
|
|
||||||
_entityList.Add(entity);
|
|
||||||
else
|
|
||||||
_entityList.Remove(entity);
|
|
||||||
|
|
||||||
entity.OnOwnershipChanged(player);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
RagonLog.Warn($"Entity {entityId} not found!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -26,11 +26,13 @@ public class RagonEventCache
|
|||||||
public ushort GetEventCode<TEvent>(TEvent _) where TEvent : IRagonEvent
|
public ushort GetEventCode<TEvent>(TEvent _) where TEvent : IRagonEvent
|
||||||
{
|
{
|
||||||
var type = typeof(TEvent);
|
var type = typeof(TEvent);
|
||||||
|
|
||||||
if (!_eventsRegistryByType.TryGetValue(type, out var eventCode))
|
if (!_eventsRegistryByType.TryGetValue(type, out var eventCode))
|
||||||
{
|
{
|
||||||
RagonLog.Error($"Event with type {type} not registered");
|
RagonLog.Error($"Event with type {type} not registered");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return eventCode;
|
return eventCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -26,12 +26,12 @@ namespace Ragon.Client
|
|||||||
private readonly List<IRagonFailedListener> _failedListeners = new();
|
private readonly List<IRagonFailedListener> _failedListeners = new();
|
||||||
private readonly List<IRagonJoinListener> _joinListeners = new();
|
private readonly List<IRagonJoinListener> _joinListeners = new();
|
||||||
private readonly List<IRagonLeftListener> _leftListeners = new();
|
private readonly List<IRagonLeftListener> _leftListeners = new();
|
||||||
private readonly List<IRagonSceneListener> _sceneListeners = new();
|
|
||||||
private readonly List<IRagonSceneRequestListener> _sceneRequestListeners = new();
|
|
||||||
private readonly List<IRagonOwnershipChangedListener> _ownershipChangedListeners = new();
|
private readonly List<IRagonOwnershipChangedListener> _ownershipChangedListeners = new();
|
||||||
private readonly List<IRagonPlayerJoinListener> _playerJoinListeners = new();
|
private readonly List<IRagonPlayerJoinListener> _playerJoinListeners = new();
|
||||||
private readonly List<IRagonPlayerLeftListener> _playerLeftListeners = 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();
|
private readonly List<Action> _delayedActions = new();
|
||||||
|
|
||||||
public RagonListenerList(RagonClient client)
|
public RagonListenerList(RagonClient client)
|
||||||
@@ -46,10 +46,11 @@ namespace Ragon.Client
|
|||||||
_failedListeners.Add(listener);
|
_failedListeners.Add(listener);
|
||||||
_joinListeners.Add(listener);
|
_joinListeners.Add(listener);
|
||||||
_leftListeners.Add(listener);
|
_leftListeners.Add(listener);
|
||||||
_sceneListeners.Add(listener);
|
|
||||||
_ownershipChangedListeners.Add(listener);
|
_ownershipChangedListeners.Add(listener);
|
||||||
_playerJoinListeners.Add(listener);
|
_playerJoinListeners.Add(listener);
|
||||||
_playerLeftListeners.Add(listener);
|
_playerLeftListeners.Add(listener);
|
||||||
|
_roomUserDataListeners.Add(listener);
|
||||||
|
_playerUserDataListeners.Add(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Remove(IRagonListener listener)
|
public void Remove(IRagonListener listener)
|
||||||
@@ -61,10 +62,11 @@ namespace Ragon.Client
|
|||||||
_failedListeners.Remove(listener);
|
_failedListeners.Remove(listener);
|
||||||
_joinListeners.Remove(listener);
|
_joinListeners.Remove(listener);
|
||||||
_leftListeners.Remove(listener);
|
_leftListeners.Remove(listener);
|
||||||
_sceneListeners.Remove(listener);
|
|
||||||
_ownershipChangedListeners.Remove(listener);
|
_ownershipChangedListeners.Remove(listener);
|
||||||
_playerJoinListeners.Remove(listener);
|
_playerJoinListeners.Remove(listener);
|
||||||
_playerLeftListeners.Remove(listener);
|
_playerLeftListeners.Remove(listener);
|
||||||
|
_roomUserDataListeners.Remove(listener);
|
||||||
|
_playerUserDataListeners.Remove(listener);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,21 +78,11 @@ namespace Ragon.Client
|
|||||||
_delayedActions.Clear();
|
_delayedActions.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Add(IRagonDataListener dataListener)
|
|
||||||
{
|
|
||||||
_dataListeners.Add(dataListener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Add(IRagonAuthorizationListener listener)
|
public void Add(IRagonAuthorizationListener listener)
|
||||||
{
|
{
|
||||||
_authorizationListeners.Add(listener);
|
_authorizationListeners.Add(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Add(IRagonSceneRequestListener listener)
|
|
||||||
{
|
|
||||||
_sceneRequestListeners.Add(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Add(IRagonConnectionListener listener)
|
public void Add(IRagonConnectionListener listener)
|
||||||
{
|
{
|
||||||
_connectionListeners.Add(listener);
|
_connectionListeners.Add(listener);
|
||||||
@@ -111,11 +103,6 @@ namespace Ragon.Client
|
|||||||
_leftListeners.Add(listener);
|
_leftListeners.Add(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Add(IRagonSceneListener listener)
|
|
||||||
{
|
|
||||||
_sceneListeners.Add(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Add(IRagonOwnershipChangedListener listener)
|
public void Add(IRagonOwnershipChangedListener listener)
|
||||||
{
|
{
|
||||||
_ownershipChangedListeners.Add(listener);
|
_ownershipChangedListeners.Add(listener);
|
||||||
@@ -131,14 +118,19 @@ namespace Ragon.Client
|
|||||||
_playerLeftListeners.Add(listener);
|
_playerLeftListeners.Add(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Remove(IRagonDataListener listener)
|
public void Add(IRagonRoomListListener listener)
|
||||||
{
|
{
|
||||||
_delayedActions.Add(() => _dataListeners.Remove(listener));
|
_roomListListeners.Add(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Remove(IRagonSceneRequestListener listener)
|
public void Add(IRagonRoomUserDataListener listener)
|
||||||
{
|
{
|
||||||
_delayedActions.Add(() => _sceneRequestListeners.Remove(listener));
|
_roomUserDataListeners.Add(listener);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Add(IRagonPlayerUserDataListener listener)
|
||||||
|
{
|
||||||
|
_playerUserDataListeners.Add(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Remove(IRagonAuthorizationListener listener)
|
public void Remove(IRagonAuthorizationListener listener)
|
||||||
@@ -166,11 +158,6 @@ namespace Ragon.Client
|
|||||||
_delayedActions.Add(() => _leftListeners.Remove(listener));
|
_delayedActions.Add(() => _leftListeners.Remove(listener));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Remove(IRagonSceneListener listener)
|
|
||||||
{
|
|
||||||
_delayedActions.Add(() => _sceneListeners.Remove(listener));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Remove(IRagonOwnershipChangedListener listener)
|
public void Remove(IRagonOwnershipChangedListener listener)
|
||||||
{
|
{
|
||||||
_delayedActions.Add(() => _ownershipChangedListeners.Remove(listener));
|
_delayedActions.Add(() => _ownershipChangedListeners.Remove(listener));
|
||||||
@@ -186,6 +173,21 @@ namespace Ragon.Client
|
|||||||
_delayedActions.Add(() => _playerLeftListeners.Remove(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)
|
public void OnAuthorizationSuccess(string playerId, string playerName, string payload)
|
||||||
{
|
{
|
||||||
foreach (var listener in _authorizationListeners)
|
foreach (var listener in _authorizationListeners)
|
||||||
@@ -228,18 +230,6 @@ namespace Ragon.Client
|
|||||||
listener.OnPlayerJoined(_client, player);
|
listener.OnPlayerJoined(_client, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnSceneLoaded()
|
|
||||||
{
|
|
||||||
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()
|
public void OnJoined()
|
||||||
{
|
{
|
||||||
foreach (var listener in _joinListeners)
|
foreach (var listener in _joinListeners)
|
||||||
@@ -258,10 +248,22 @@ namespace Ragon.Client
|
|||||||
listener.OnDisconnected(_client, disconnect);
|
listener.OnDisconnected(_client, disconnect);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnData(RagonPlayer player, byte[] data)
|
public void OnRoomList(RagonRoomInformation[] roomInfos)
|
||||||
{
|
{
|
||||||
foreach (var listener in _dataListeners)
|
foreach (var listListener in _roomListListeners)
|
||||||
listener.OnData(player, data);
|
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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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 ushort PeerId { get; set; }
|
||||||
public bool IsRoomOwner { get; set; }
|
public bool IsRoomOwner { get; set; }
|
||||||
public bool IsLocal { 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)
|
public RagonPlayer(ushort peerId, string playerId, string name, bool isRoomOwner, bool isLocal)
|
||||||
{
|
{
|
||||||
@@ -32,6 +33,7 @@ namespace Ragon.Client
|
|||||||
IsLocal = isLocal;
|
IsLocal = isLocal;
|
||||||
Name = name;
|
Name = name;
|
||||||
Id = playerId;
|
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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -52,10 +52,10 @@ public sealed class RagonPlayerCache
|
|||||||
_localId = localId;
|
_localId = localId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddPlayer(ushort peerId, string playerId, string playerName)
|
public RagonPlayer AddPlayer(ushort peerId, string playerId, string playerName)
|
||||||
{
|
{
|
||||||
if (_playersById.ContainsKey(playerId))
|
if (_playersById.ContainsKey(playerId))
|
||||||
return;
|
return null;
|
||||||
|
|
||||||
var isOwner = playerId == _ownerId;
|
var isOwner = playerId == _ownerId;
|
||||||
var isLocal = playerId == _localId;
|
var isLocal = playerId == _localId;
|
||||||
@@ -73,6 +73,8 @@ public sealed class RagonPlayerCache
|
|||||||
_players.Add(player);
|
_players.Add(player);
|
||||||
_playersById.Add(player.Id, player);
|
_playersById.Add(player.Id, player);
|
||||||
_playersByConnection.Add(player.PeerId, player);
|
_playersByConnection.Add(player.PeerId, player);
|
||||||
|
|
||||||
|
return player;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RemovePlayer(string playerId)
|
public void RemovePlayer(string playerId)
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -18,66 +18,90 @@ using Ragon.Protocol;
|
|||||||
|
|
||||||
namespace Ragon.Client
|
namespace Ragon.Client
|
||||||
{
|
{
|
||||||
public class RagonRoom: IDisposable
|
public class RagonRoom
|
||||||
{
|
{
|
||||||
private delegate void OnEventDelegate(RagonPlayer player, RagonBuffer serializer);
|
private class EventSubscription : IDisposable
|
||||||
|
{
|
||||||
|
private List<Action<RagonPlayer, IRagonEvent>> _callbacks;
|
||||||
|
private List<Action<RagonPlayer, IRagonEvent>> _localCallbacks;
|
||||||
|
private Action<RagonPlayer, IRagonEvent> _callback;
|
||||||
|
|
||||||
private RagonClient _client;
|
public EventSubscription(
|
||||||
private RagonScene _scene;
|
List<Action<RagonPlayer, IRagonEvent>> callbacks,
|
||||||
private RagonEntityCache _entityCache;
|
List<Action<RagonPlayer, IRagonEvent>> localCallbacks,
|
||||||
private RagonPlayerCache _playerCache;
|
Action<RagonPlayer, IRagonEvent> callback)
|
||||||
private RagonRoomInformation _information;
|
{
|
||||||
|
_callbacks = callbacks;
|
||||||
|
_localCallbacks = localCallbacks;
|
||||||
|
_callback = callback;
|
||||||
|
}
|
||||||
|
|
||||||
public string Id => _information.RoomId;
|
public void Dispose()
|
||||||
public int MinPlayers => _information.Min;
|
{
|
||||||
public int MaxPlayers => _information.Max;
|
_callbacks?.Remove(_callback);
|
||||||
public string Scene => _scene.Name;
|
_localCallbacks?.Remove(_callback);
|
||||||
|
|
||||||
|
_callbacks = null!;
|
||||||
|
_localCallbacks = null!;
|
||||||
|
_callback = null!;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private delegate void OnEventDelegate(RagonPlayer player, RagonStream serializer);
|
||||||
|
|
||||||
|
private readonly RagonClient _client;
|
||||||
|
private readonly RagonPlayerCache _playerCache;
|
||||||
|
private RoomParameters _parameters;
|
||||||
|
private RagonUserData _userData;
|
||||||
|
|
||||||
|
public string Id => _parameters.RoomId;
|
||||||
|
public int MinPlayers => _parameters.Min;
|
||||||
|
public int MaxPlayers => _parameters.Max;
|
||||||
|
|
||||||
public IReadOnlyList<RagonPlayer> Players => _playerCache.Players;
|
public IReadOnlyList<RagonPlayer> Players => _playerCache.Players;
|
||||||
public RagonPlayer Local => _playerCache.Local;
|
public RagonPlayer Local => _playerCache.Local;
|
||||||
public RagonPlayer Owner => _playerCache.Owner;
|
public RagonPlayer Owner => _playerCache.Owner;
|
||||||
|
public RagonUserData UserData => _userData;
|
||||||
|
|
||||||
private readonly Dictionary<int, OnEventDelegate> _events = new Dictionary<int, OnEventDelegate>();
|
private readonly Dictionary<int, OnEventDelegate> _events = new();
|
||||||
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,
|
private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _localListeners = new();
|
||||||
RagonEntityCache entityCache,
|
|
||||||
RagonPlayerCache playerCache,
|
private readonly Dictionary<int, List<Action<RagonPlayer, IRagonEvent>>> _listeners = new();
|
||||||
RagonRoomInformation information,
|
|
||||||
RagonScene scene)
|
public RagonRoom(RagonClient client, RagonPlayerCache playerCache)
|
||||||
{
|
{
|
||||||
_client = client;
|
_client = client;
|
||||||
_information = information;
|
|
||||||
_entityCache = entityCache;
|
|
||||||
_playerCache = playerCache;
|
_playerCache = playerCache;
|
||||||
_scene = scene;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void Cleanup()
|
public void Reset(RoomParameters parameters)
|
||||||
{
|
{
|
||||||
_entityCache.Cleanup();
|
Clear();
|
||||||
|
|
||||||
|
_userData = new RagonUserData();
|
||||||
|
_parameters = parameters;
|
||||||
_playerCache.Cleanup();
|
_playerCache.Cleanup();
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void Update(string sceneName)
|
internal void HandleEvent(ushort eventCode, RagonPlayer caller, RagonStream buffer)
|
||||||
{
|
|
||||||
_scene.Update(sceneName);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void Event(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
|
|
||||||
{
|
{
|
||||||
if (_events.TryGetValue(eventCode, out var evnt))
|
if (_events.TryGetValue(eventCode, out var evnt))
|
||||||
evnt?.Invoke(caller, buffer);
|
evnt?.Invoke(caller, buffer);
|
||||||
else
|
else
|
||||||
RagonLog.Warn($"Handler event on entity {Id} with eventCode {eventCode} not defined");
|
RagonLog.Warn($"Handler event {Id} with eventCode {eventCode} not defined");
|
||||||
}
|
}
|
||||||
|
|
||||||
public Action<RagonPlayer, IRagonEvent> OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
|
internal void HandleUserData(RagonStream buffer)
|
||||||
|
{
|
||||||
|
_userData.Read(buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IDisposable OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
|
||||||
{
|
{
|
||||||
var t = new TEvent();
|
var t = new TEvent();
|
||||||
var eventCode = _client.Event.GetEventCode(t);
|
var eventCode = _client.Event.GetEventCode(t);
|
||||||
|
|
||||||
var action = (RagonPlayer player, IRagonEvent eventData) => callback.Invoke(player, (TEvent)eventData);
|
var action = (RagonPlayer player, IRagonEvent eventData) => callback.Invoke(player, (TEvent)eventData);
|
||||||
|
|
||||||
if (!_listeners.TryGetValue(eventCode, out var callbacks))
|
if (!_listeners.TryGetValue(eventCode, out var callbacks))
|
||||||
@@ -106,39 +130,67 @@ namespace Ragon.Client
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return action;
|
return new EventSubscription(callbacks, localCallbacks, action);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OffEvent<TEvent>(Action<RagonPlayer, IRagonEvent> callback) where TEvent : IRagonEvent, new()
|
public void ReplicateEvent<TEvent>(TEvent evnt, RagonTarget target, RagonReplicationMode replicationMode)
|
||||||
|
where TEvent : IRagonEvent, new()
|
||||||
{
|
{
|
||||||
var t = new TEvent();
|
var evntId = _client.Event.GetEventCode(evnt);
|
||||||
var eventCode = _client.Event.GetEventCode(t);
|
var buffer = _client.Buffer;
|
||||||
|
|
||||||
if (_listeners.TryGetValue(eventCode, out var callbacks))
|
{
|
||||||
callbacks.Remove(callback);
|
if (replicationMode == RagonReplicationMode.Local &&
|
||||||
|
_localListeners.TryGetValue(evntId, out var localListeners))
|
||||||
if (_localListeners.TryGetValue(eventCode, out var localCallbacks))
|
{
|
||||||
localCallbacks.Remove(callback);
|
foreach (var listener in localListeners)
|
||||||
|
listener.Invoke(_client.Room.Local, evnt);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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, 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, RagonPayload payload) => _entityCache.Destroy(entityId, payload);
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
{
|
||||||
Cleanup();
|
if (replicationMode == RagonReplicationMode.LocalAndServer &&
|
||||||
|
_localListeners.TryGetValue(evntId, out var localListeners))
|
||||||
|
{
|
||||||
|
foreach (var listener in localListeners)
|
||||||
|
listener.Invoke(_client.Room.Local, evnt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
public 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 Clear()
|
||||||
|
{
|
||||||
_events.Clear();
|
_events.Clear();
|
||||||
_listeners.Clear();
|
_listeners.Clear();
|
||||||
_localListeners.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,117 +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 Ragon.Protocol;
|
|
||||||
|
|
||||||
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, string sceneName)
|
|
||||||
{
|
|
||||||
Name = sceneName;
|
|
||||||
|
|
||||||
_client = client;
|
|
||||||
_playerCache = playerCache;
|
|
||||||
_entityCache = entityCache;
|
|
||||||
}
|
|
||||||
|
|
||||||
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(sceneName);
|
|
||||||
|
|
||||||
var sendData = buffer.ToArray();
|
|
||||||
_client.Reliable.Send(sendData);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void SceneLoaded()
|
|
||||||
{
|
|
||||||
var buffer = _client.Buffer;
|
|
||||||
|
|
||||||
buffer.Clear();
|
|
||||||
buffer.WriteOperation(RagonOperation.SCENE_LOADED);
|
|
||||||
|
|
||||||
if (_playerCache.IsRoomOwner)
|
|
||||||
_entityCache.WriteScene(buffer);
|
|
||||||
else
|
|
||||||
_entityCache.CacheScene();
|
|
||||||
|
|
||||||
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);
|
|
||||||
|
|
||||||
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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -21,17 +21,18 @@ namespace Ragon.Client
|
|||||||
public class RagonSession
|
public class RagonSession
|
||||||
{
|
{
|
||||||
private readonly RagonClient _client;
|
private readonly RagonClient _client;
|
||||||
private readonly RagonBuffer _buffer;
|
|
||||||
|
|
||||||
public RagonSession(RagonClient client, RagonBuffer buffer)
|
private readonly RagonStream _buffer;
|
||||||
|
|
||||||
|
public RagonSession(RagonClient client, RagonStream buffer)
|
||||||
{
|
{
|
||||||
_client = client;
|
_client = client;
|
||||||
_buffer = buffer;
|
_buffer = buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CreateOrJoin(string sceneName, int minPlayers, int maxPlayers)
|
public void CreateOrJoin(string sessionName, int minPlayers, int maxPlayers)
|
||||||
{
|
{
|
||||||
var parameters = new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers};
|
var parameters = new RagonRoomParameters() { Min = minPlayers, Max = maxPlayers };
|
||||||
CreateOrJoin(parameters);
|
CreateOrJoin(parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -46,14 +47,14 @@ namespace Ragon.Client
|
|||||||
_client.Reliable.Send(sendData);
|
_client.Reliable.Send(sendData);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Create(string sceneName, int minPlayers, int maxPlayers)
|
public void Create(string sessionName, int minPlayers, int maxPlayers)
|
||||||
{
|
{
|
||||||
Create(null, new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers});
|
Create(null, new RagonRoomParameters() { Min = minPlayers, Max = maxPlayers });
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Create(string roomId, string sceneName, int minPlayers, int maxPlayers)
|
public void Create(string roomId, string sessionName, int minPlayers, int maxPlayers)
|
||||||
{
|
{
|
||||||
Create(roomId, new RagonRoomParameters() {Scene = sceneName, Min = minPlayers, Max = maxPlayers});
|
Create(roomId, new RagonRoomParameters() { Min = minPlayers, Max = maxPlayers });
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Create(string roomId, RagonRoomParameters parameters)
|
public void Create(string roomId, RagonRoomParameters parameters)
|
||||||
@@ -104,6 +105,5 @@ namespace Ragon.Client
|
|||||||
var sendData = _buffer.ToArray();
|
var sendData = _buffer.ToArray();
|
||||||
_client.Reliable.Send(sendData);
|
_client.Reliable.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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
namespace Ragon.Client
|
namespace Ragon.Client
|
||||||
{
|
{
|
||||||
public enum RagonStatus
|
public enum RagonState
|
||||||
{
|
{
|
||||||
DISCONNECTED,
|
DISCONNECTED,
|
||||||
CONNECTED,
|
CONNECTED,
|
||||||
@@ -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(RagonStream 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.ReadBinary(valueSize);
|
||||||
|
_properties[key] = value;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_properties.Remove(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
changes.Add(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
return changes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Write(RagonStream 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.WriteBinary(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(RagonStream buffer)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public IReadOnlyList<string> Read(RagonStream 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.ReadBinary(valueSize);
|
||||||
|
_properties[key] = value;
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_properties.Remove(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
changes.Add(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
return changes;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
using Ragon.Client.Compressor;
|
|
||||||
using Ragon.Protocol;
|
|
||||||
|
|
||||||
namespace Ragon.Client.Utils;
|
|
||||||
|
|
||||||
public static class CompressorExtension
|
|
||||||
{
|
|
||||||
public static float Read(this FloatCompressor compressor, RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
return compressor.Decompress(buffer.Read(compressor.RequiredBits));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void Write(this FloatCompressor compressor, RagonBuffer buffer, float value)
|
|
||||||
{
|
|
||||||
buffer.Write(compressor.Compress(value), compressor.RequiredBits);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static float Read(this IntCompressor compressor, RagonBuffer buffer)
|
|
||||||
{
|
|
||||||
return compressor.Decompress(buffer.Read(compressor.RequiredBits));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void Write(this IntCompressor compressor, RagonBuffer buffer, int value)
|
|
||||||
{
|
|
||||||
buffer.Write(compressor.Compress(value), compressor.RequiredBits);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,7 +8,9 @@
|
|||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
<Title>Ragon.Protocol</Title>
|
<Title>Ragon.Protocol</Title>
|
||||||
<Copyright>Eduard Kargin</Copyright>
|
<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>
|
<RepositoryUrl>https://github.com/edmand46/Ragon</RepositoryUrl>
|
||||||
<RepositoryType>Source</RepositoryType>
|
<RepositoryType>Source</RepositoryType>
|
||||||
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
|
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -121,6 +121,21 @@ namespace Ragon.Protocol
|
|||||||
return (RagonOperation)Read(8);
|
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)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
public void WriteFloat(float value, float min, float max, float precision)
|
public void WriteFloat(float value, float min, float max, float precision)
|
||||||
{
|
{
|
||||||
@@ -147,6 +162,23 @@ namespace Ragon.Protocol
|
|||||||
return adjusted;
|
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)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
public void WriteInt(int value, int min, int max)
|
public void WriteInt(int value, int min, int max)
|
||||||
{
|
{
|
||||||
@@ -251,6 +283,7 @@ namespace Ragon.Protocol
|
|||||||
_write += numBits;
|
_write += numBits;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
public uint Read(int numBits = 16)
|
public uint Read(int numBits = 16)
|
||||||
{
|
{
|
||||||
@@ -281,10 +314,10 @@ namespace Ragon.Protocol
|
|||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
[Obsolete("Do not use this method, will be removed")]
|
[Obsolete("Do not use this method, will be removed")]
|
||||||
public byte[] ReadBytes(int lenght)
|
public byte[] ReadBytes(int len)
|
||||||
{
|
{
|
||||||
var data = new byte[lenght];
|
var data = new byte[len];
|
||||||
for (int i = 0; i < lenght; i++)
|
for (int i = 0; i < len; i++)
|
||||||
data[i] = (byte)Read(8);
|
data[i] = (byte)Read(8);
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
@@ -298,6 +331,9 @@ namespace Ragon.Protocol
|
|||||||
var limit = (size + 32 - 1) / 32;
|
var limit = (size + 32 - 1) / 32;
|
||||||
var capacity = size;
|
var capacity = size;
|
||||||
|
|
||||||
|
if (index + limit >= _buckets.Length)
|
||||||
|
Resize(size);
|
||||||
|
|
||||||
for (int i = 0; i < limit; i++)
|
for (int i = 0; i < limit; i++)
|
||||||
{
|
{
|
||||||
var dataSize = capacity > 32 ? 32 : capacity;
|
var dataSize = capacity > 32 ? 32 : capacity;
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -26,23 +26,16 @@ namespace Ragon.Protocol
|
|||||||
CREATE_ROOM = 5,
|
CREATE_ROOM = 5,
|
||||||
JOIN_ROOM = 6,
|
JOIN_ROOM = 6,
|
||||||
LEAVE_ROOM = 7,
|
LEAVE_ROOM = 7,
|
||||||
OWNERSHIP_ENTITY_CHANGED = 8,
|
|
||||||
OWNERSHIP_ROOM_CHANGED = 9,
|
OWNERSHIP_ROOM_CHANGED = 9,
|
||||||
JOIN_SUCCESS = 10,
|
JOIN_SUCCESS = 10,
|
||||||
JOIN_FAILED = 11,
|
JOIN_FAILED = 11,
|
||||||
LOAD_SCENE = 12,
|
|
||||||
SCENE_LOADED = 13,
|
|
||||||
PLAYER_JOINED = 14,
|
PLAYER_JOINED = 14,
|
||||||
PLAYER_LEAVED = 15,
|
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,
|
REPLICATE_ROOM_EVENT = 22,
|
||||||
TRANSFER_ROOM_OWNERSHIP = 23,
|
TRANSFER_ROOM_OWNERSHIP = 23,
|
||||||
TRANSFER_ENTITY_OWNERSHIP = 24,
|
|
||||||
TIMESTAMP_SYNCHRONIZATION = 25,
|
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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -17,24 +17,21 @@
|
|||||||
|
|
||||||
namespace Ragon.Protocol
|
namespace Ragon.Protocol
|
||||||
{
|
{
|
||||||
public class RagonRoomParameters: IRagonSerializable
|
public class RagonRoomParameters
|
||||||
{
|
{
|
||||||
public string Scene { get; set; }
|
|
||||||
public int Min { get; set; }
|
public int Min { get; set; }
|
||||||
public int Max { get; set; }
|
public int Max { get; set; }
|
||||||
|
|
||||||
public void Serialize(RagonBuffer buffer)
|
public void Serialize(RagonStream buffer)
|
||||||
{
|
{
|
||||||
buffer.WriteString(Scene);
|
buffer.WriteInt(Min);
|
||||||
buffer.WriteInt(Min, 1, 32);
|
buffer.WriteInt(Max);
|
||||||
buffer.WriteInt(Max, 1, 32);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Deserialize(RagonBuffer buffer)
|
public void Deserialize(RagonStream buffer)
|
||||||
{
|
{
|
||||||
Scene = buffer.ReadString();
|
Min = buffer.ReadInt();
|
||||||
Min = buffer.ReadInt(1, 32);
|
Max = buffer.ReadInt();
|
||||||
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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,7 +19,7 @@ namespace Ragon.Protocol
|
|||||||
{
|
{
|
||||||
public interface IRagonSerializable
|
public interface IRagonSerializable
|
||||||
{
|
{
|
||||||
public void Serialize(RagonBuffer buffer);
|
public void Serialize(RagonStream buffer);
|
||||||
public void Deserialize(RagonBuffer buffer);
|
public void Deserialize(RagonStream buffer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<RootNamespace>Ragon.Relay</RootNamespace>
|
<RootNamespace>Ragon.Relay</RootNamespace>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
@@ -23,9 +23,15 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<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" />
|
<ProjectReference Include="..\Ragon.Server\Ragon.Server.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="ENet-CSharp" Version="2.4.8" />
|
||||||
|
<PackageReference Include="Google.Protobuf" Version="3.29.0" />
|
||||||
|
<PackageReference Include="MsgPack.Cli" Version="1.0.1" />
|
||||||
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
|
<PackageReference Include="NLog" Version="5.3.2" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
namespace Ragon.Relay;
|
|
||||||
|
|
||||||
public class KickPlayerCommand
|
|
||||||
{
|
|
||||||
public string Id;
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
using System;
|
||||||
|
using NLog;
|
||||||
|
using Ragon.Server.Logging;
|
||||||
|
|
||||||
|
namespace Ragon.Relay;
|
||||||
|
|
||||||
|
public class RelayLogger: IRagonLogger
|
||||||
|
{
|
||||||
|
private Logger _nlogger;
|
||||||
|
|
||||||
|
public RelayLogger(string tag)
|
||||||
|
{
|
||||||
|
_nlogger = LogManager.GetLogger(tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Warning(string message)
|
||||||
|
{
|
||||||
|
_nlogger.Warn(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Info(string message)
|
||||||
|
{
|
||||||
|
_nlogger.Info(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Error(string message)
|
||||||
|
{
|
||||||
|
_nlogger.Error(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Error(Exception ex)
|
||||||
|
{
|
||||||
|
_nlogger.Error(ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Trace(string message)
|
||||||
|
{
|
||||||
|
_nlogger.Trace(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
using Ragon.Server.Logging;
|
||||||
|
|
||||||
|
namespace Ragon.Relay;
|
||||||
|
|
||||||
|
public class RelayLoggerFactory: IRagonLoggerFactory
|
||||||
|
{
|
||||||
|
public IRagonLogger GetLogger(string tag)
|
||||||
|
{
|
||||||
|
return new RelayLogger(tag);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
using System;
|
||||||
|
using Ragon.Server.Plugin;
|
||||||
|
|
||||||
|
namespace Ragon.Relay;
|
||||||
|
|
||||||
|
public class RelayRoomPlugin: BaseRoomPlugin
|
||||||
|
{
|
||||||
|
public void Tick(float dt)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
public void OnAttached()
|
||||||
|
{
|
||||||
|
Console.WriteLine("Room attached");
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnDetached()
|
||||||
|
{
|
||||||
|
Console.WriteLine("Room detached");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
using Ragon.Server;
|
||||||
|
using Ragon.Server.Lobby;
|
||||||
|
using Ragon.Server.Plugin;
|
||||||
|
using Ragon.Server.Time;
|
||||||
|
|
||||||
|
namespace Ragon.Relay
|
||||||
|
{
|
||||||
|
public class RelayServerPlugin : BaseServerPlugin
|
||||||
|
{
|
||||||
|
private RelayConfiguration _relayConfiguration;
|
||||||
|
private RagonScheduler _scheduler;
|
||||||
|
private RagonConnectionRegistry _connectionRegistry;
|
||||||
|
private IRagonLobby _lobby;
|
||||||
|
private Reporter _reporter;
|
||||||
|
|
||||||
|
public RelayServerPlugin(RelayConfiguration config)
|
||||||
|
{
|
||||||
|
_relayConfiguration = config;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnAttached(IRagonServer server)
|
||||||
|
{
|
||||||
|
base.OnAttached(server);
|
||||||
|
|
||||||
|
_lobby = server.Lobby;
|
||||||
|
_connectionRegistry = server.ConnectionRegistry;
|
||||||
|
_scheduler = server.Scheduler;
|
||||||
|
_reporter = new Reporter(_relayConfiguration, server, "127.0.0.1", 5000);
|
||||||
|
|
||||||
|
server.Scheduler.Run(new RagonActionTimer(() => _reporter.Done(), 1, -1));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool OnCommand(string command, string payload)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override IRoomPlugin CreateRoomPlugin(RoomInformation information)
|
||||||
|
{
|
||||||
|
return new RelayRoomPlugin();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -14,27 +14,34 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using NLog;
|
using System.IO;
|
||||||
|
using System.Threading;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using Ragon.Server;
|
using Ragon.Server;
|
||||||
using Ragon.Server.ENetServer;
|
|
||||||
using Ragon.Server.WebSocketServer;
|
|
||||||
using Ragon.Server.IO;
|
using Ragon.Server.IO;
|
||||||
|
using Ragon.Server.Logging;
|
||||||
using Ragon.Server.Plugin;
|
using Ragon.Server.Plugin;
|
||||||
|
using Ragon.Server.WebSocketServer;
|
||||||
|
using Ragon.Transport;
|
||||||
|
|
||||||
namespace Ragon.Relay;
|
namespace Ragon.Relay
|
||||||
|
{
|
||||||
public class Relay
|
public class Relay
|
||||||
{
|
{
|
||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
var logger = LogManager.GetLogger("Ragon.Relay");
|
LoggerManager.SetLoggerFactory(new RelayLoggerFactory());
|
||||||
|
|
||||||
|
var logger = LoggerManager.GetLogger("Relay");
|
||||||
logger.Info("Relay Application");
|
logger.Info("Relay Application");
|
||||||
|
|
||||||
var configuration = RagonServerConfiguration.Load("relay.config.json");
|
var data = File.ReadAllText("relay.config.json");
|
||||||
|
var configuration = JsonConvert.DeserializeObject<RelayConfiguration>(data);
|
||||||
var serverType = RagonServerConfiguration.GetServerType(configuration.ServerType);
|
var serverType = RagonServerConfiguration.GetServerType(configuration.ServerType);
|
||||||
|
|
||||||
INetworkServer networkServer = new ENetServer();
|
INetworkServer networkServer = new ENetServer();
|
||||||
IServerPlugin plugin = new RelayServerPlugin();
|
IServerPlugin plugin = new RelayServerPlugin();
|
||||||
|
|
||||||
switch (serverType)
|
switch (serverType)
|
||||||
{
|
{
|
||||||
case ServerType.ENET:
|
case ServerType.ENET:
|
||||||
@@ -45,8 +52,30 @@ public class Relay
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
var relay = new RagonServer(networkServer, plugin, configuration);
|
var serverConfiguration = new RagonServerConfiguration()
|
||||||
logger.Info("Started");
|
{
|
||||||
relay.Start();
|
LimitConnections = configuration.LimitConnections,
|
||||||
|
LimitRooms = configuration.LimitRooms,
|
||||||
|
LimitBufferedEvents = configuration.LimitBufferedEvents,
|
||||||
|
LimitPlayersPerRoom = configuration.LimitPlayersPerRoom,
|
||||||
|
LimitUserDataSize = configuration.LimitUserDataSize,
|
||||||
|
LimitPropertySize = configuration.LimitPropertySize,
|
||||||
|
Port = configuration.Port,
|
||||||
|
Protocol = configuration.Protocol,
|
||||||
|
ServerKey = configuration.ServerKey,
|
||||||
|
ServerTickRate = configuration.ServerTickRate,
|
||||||
|
ServerAddress = configuration.ServerAddress,
|
||||||
|
};
|
||||||
|
|
||||||
|
var relay = new RagonServer(networkServer, plugin, serverConfiguration);
|
||||||
|
relay.Listen();
|
||||||
|
while (relay.IsRunning)
|
||||||
|
{
|
||||||
|
relay.Tick();
|
||||||
|
Thread.Sleep(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
relay.Dispose();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Ragon.Relay
|
||||||
|
{
|
||||||
|
[Serializable]
|
||||||
|
public struct RelayConfiguration
|
||||||
|
{
|
||||||
|
public string ServerKey;
|
||||||
|
public string ServerType;
|
||||||
|
public string ServerAddress;
|
||||||
|
public ushort ServerTickRate;
|
||||||
|
public string Protocol;
|
||||||
|
public ushort Port;
|
||||||
|
public int LimitConnections;
|
||||||
|
public int LimitPlayersPerRoom;
|
||||||
|
public int LimitRooms;
|
||||||
|
public int LimitBufferedEvents;
|
||||||
|
public int LimitUserDataSize;
|
||||||
|
public int LimitPropertySize;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Ragon.Server;
|
|
||||||
using Ragon.Server.Entity;
|
|
||||||
using Ragon.Server.Plugin;
|
|
||||||
using Ragon.Server.Room;
|
|
||||||
|
|
||||||
namespace Ragon.Relay;
|
|
||||||
|
|
||||||
public class RelayRoomPlugin: BaseRoomPlugin
|
|
||||||
{
|
|
||||||
public void Tick(float dt)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnAttached()
|
|
||||||
{
|
|
||||||
Console.WriteLine("Room attached");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnDetached()
|
|
||||||
{
|
|
||||||
Console.WriteLine("Room detached");
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool OnEntityCreate(RagonRoomPlayer creator, RagonEntity entity)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Entity created: {entity.Id}");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool OnEntityRemove(RagonRoomPlayer destroyer, RagonEntity entity)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Entity destroyed: {entity.Id}");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
using Ragon.Server;
|
|
||||||
using Ragon.Server.Plugin;
|
|
||||||
|
|
||||||
namespace Ragon.Relay;
|
|
||||||
|
|
||||||
public class RelayServerPlugin: BaseServerPlugin
|
|
||||||
{
|
|
||||||
public override bool OnCommand(string command, string payload)
|
|
||||||
{
|
|
||||||
Console.WriteLine(command);
|
|
||||||
if (command == "kick-player")
|
|
||||||
{
|
|
||||||
var commandPayload = JsonConvert.DeserializeObject<KickPlayerCommand>(payload);
|
|
||||||
var player = Server.GetPlayerById(commandPayload.Id);
|
|
||||||
if (player != null)
|
|
||||||
player.Connection.Close();
|
|
||||||
else
|
|
||||||
Console.WriteLine($"Player not found with Id {commandPayload.Id}");
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override IRoomPlugin CreateRoomPlugin(RoomInformation information)
|
|
||||||
{
|
|
||||||
return new RelayRoomPlugin();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
using System;
|
||||||
|
using System.Net;
|
||||||
|
using System.Net.Sockets;
|
||||||
|
using Ragon.Server.Logging;
|
||||||
|
|
||||||
|
namespace Ragon.Relay;
|
||||||
|
|
||||||
|
public class Client
|
||||||
|
{
|
||||||
|
private readonly UdpClient _udpClient;
|
||||||
|
private readonly IPEndPoint _endpoint;
|
||||||
|
private readonly IRagonLogger _logger;
|
||||||
|
|
||||||
|
public Client(string host, int port)
|
||||||
|
{
|
||||||
|
_logger = LoggerManager.GetLogger("Client");
|
||||||
|
_udpClient = new UdpClient();
|
||||||
|
_endpoint = new IPEndPoint(IPAddress.Parse(host), port);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Send(byte[] data)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_udpClient.BeginSend(data, data.Length, _endpoint, SendCallback, null);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.Error(ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SendCallback(IAsyncResult ar)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_udpClient.EndSend(ar);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.Error(ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,56 @@
|
|||||||
|
using Google.Protobuf;
|
||||||
|
using Google.Protobuf.Collections;
|
||||||
|
using Ragon.Server;
|
||||||
|
|
||||||
|
namespace Ragon.Relay;
|
||||||
|
|
||||||
|
public class Reporter
|
||||||
|
{
|
||||||
|
private readonly Client _client;
|
||||||
|
private readonly IRagonServer _server;
|
||||||
|
private readonly RelayConfiguration _configuration;
|
||||||
|
|
||||||
|
public Reporter(
|
||||||
|
RelayConfiguration relayConfiguration,
|
||||||
|
IRagonServer server,
|
||||||
|
string host,
|
||||||
|
int port
|
||||||
|
)
|
||||||
|
{
|
||||||
|
_client = new Client(host, port);
|
||||||
|
_server = server;
|
||||||
|
_configuration = relayConfiguration;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Done()
|
||||||
|
{
|
||||||
|
for (var i = 0; i < 10; i++)
|
||||||
|
{
|
||||||
|
var message = new Data();
|
||||||
|
message.Statistics = new Statistics()
|
||||||
|
{
|
||||||
|
Connections = _server.ConnectionRegistry.Contexts.Count,
|
||||||
|
ConnectionsLimit = _configuration.LimitConnections,
|
||||||
|
Rooms = _server.Lobby.Rooms.Count,
|
||||||
|
RoomsLimit = _configuration.LimitRooms,
|
||||||
|
};
|
||||||
|
|
||||||
|
var room = new Room()
|
||||||
|
{
|
||||||
|
Id = $"Room ID {i}",
|
||||||
|
};
|
||||||
|
|
||||||
|
for (var j = 0; j < 10; j++)
|
||||||
|
{
|
||||||
|
room.Players.Add(new Player()
|
||||||
|
{
|
||||||
|
Id = $"Player ID {i}",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
message.Room = room;
|
||||||
|
|
||||||
|
_client.Send(message.ToByteArray());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user