wip
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client.Simulation
|
||||
namespace Ragon.Client.Property
|
||||
{
|
||||
[Serializable]
|
||||
public class RagonBool : RagonProperty
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client.Simulation
|
||||
namespace Ragon.Client.Property
|
||||
{
|
||||
[Serializable]
|
||||
public class RagonInt : RagonProperty
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
/*
|
||||
* Copyright 2023 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();
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@
|
||||
using System.Text;
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client.Simulation
|
||||
namespace Ragon.Client.Property
|
||||
{
|
||||
[Serializable]
|
||||
public class RagonString : RagonProperty
|
||||
|
||||
@@ -0,0 +1,330 @@
|
||||
/*
|
||||
* Copyright 2023 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();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<DebugType>none</DebugType>
|
||||
<OutputPath>/Users/edmand46/RagonProjects/ragon-oss-examples/Assets/Ragon/Plugins/</OutputPath>
|
||||
<OutputPath>/Users/edmand46/RagonProjects/ragon-oss-examples/Assets/Ragon/Plugins/netstandard2.0/</OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class AuthorizeFailedHandler: Handler
|
||||
internal class AuthorizeFailedHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
public AuthorizeFailedHandler(RagonListenerList list)
|
||||
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class AuthorizeSuccessHandler: Handler
|
||||
internal class AuthorizeSuccessHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
private readonly RagonClient _client;
|
||||
|
||||
@@ -18,7 +18,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class EntityCreateHandler : Handler
|
||||
internal class EntityCreateHandler : IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
|
||||
@@ -18,19 +18,16 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class EntityEventHandler : Handler
|
||||
internal class EntityEventHandler : IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
|
||||
public EntityEventHandler(
|
||||
RagonClient client,
|
||||
RagonPlayerCache playerCache,
|
||||
RagonEntityCache entityCache
|
||||
)
|
||||
{
|
||||
_client = client;
|
||||
_playerCache = playerCache;
|
||||
_entityCache = entityCache;
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class EntityOwnershipHandler: Handler
|
||||
internal class EntityOwnershipHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class EntityRemoveHandler: Handler
|
||||
internal class EntityRemoveHandler: IHandler
|
||||
{
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class StateEntityHandler: Handler
|
||||
internal class StateEntityHandler: IHandler
|
||||
{
|
||||
private readonly RagonEntityCache _entityCache;
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
/*
|
||||
* 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 EventRoomHandler: IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
|
||||
public EventRoomHandler(
|
||||
RagonClient client,
|
||||
RagonPlayerCache playerCache
|
||||
)
|
||||
{
|
||||
_client = client;
|
||||
_playerCache = playerCache;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
{
|
||||
var eventCode = buffer.ReadUShort();
|
||||
var peerId = buffer.ReadUShort();
|
||||
var executionMode = (RagonReplicationMode)buffer.ReadByte();
|
||||
|
||||
var player = _playerCache.GetPlayerByPeer(peerId);
|
||||
if (player == null)
|
||||
{
|
||||
RagonLog.Warn($"Player not found for event {eventCode}");
|
||||
return;
|
||||
}
|
||||
|
||||
if (player.IsLocal && executionMode == RagonReplicationMode.LocalAndServer)
|
||||
return;
|
||||
|
||||
_client.Room.Event(eventCode, player, buffer);
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public interface Handler
|
||||
public interface IHandler
|
||||
{
|
||||
public void Handle(RagonBuffer buffer);
|
||||
}
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class JoinFailedHandler: Handler
|
||||
internal class JoinFailedHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ public struct RagonRoomInformation
|
||||
public ushort Max { get; private set; }
|
||||
}
|
||||
|
||||
internal class JoinSuccessHandler : Handler
|
||||
internal class JoinSuccessHandler : IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
@@ -46,7 +46,6 @@ internal class JoinSuccessHandler : Handler
|
||||
|
||||
public JoinSuccessHandler(
|
||||
RagonClient client,
|
||||
RagonBuffer buffer,
|
||||
RagonListenerList listenerList,
|
||||
RagonPlayerCache playerCache,
|
||||
RagonEntityCache entityCache
|
||||
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class LeaveRoomHandler : Handler
|
||||
internal class LeaveRoomHandler : IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonListenerList _listenerList;
|
||||
|
||||
@@ -18,7 +18,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class SceneLoadHandler: Handler
|
||||
internal class SceneLoadHandler: IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
private readonly RagonListenerList _listenerList;
|
||||
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class OwnershipRoomHandler: Handler
|
||||
internal class OwnershipRoomHandler: IHandler
|
||||
{
|
||||
private readonly RagonListenerList _listenerList;
|
||||
private readonly RagonPlayerCache _playerCache;
|
||||
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class PlayerJoinHandler : Handler
|
||||
internal class PlayerJoinHandler : IHandler
|
||||
{
|
||||
private RagonPlayerCache _playerCache;
|
||||
private RagonListenerList _listenerList;
|
||||
|
||||
@@ -19,7 +19,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class PlayerLeftHandler : Handler
|
||||
internal class PlayerLeftHandler : IHandler
|
||||
{
|
||||
private RagonPlayerCache _playerCache;
|
||||
private RagonEntityCache _entityCache;
|
||||
|
||||
@@ -20,7 +20,7 @@ using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
internal class SnapshotHandler : Handler
|
||||
internal class SnapshotHandler : IHandler
|
||||
{
|
||||
private readonly IRagonEntityListener _entityListener;
|
||||
private readonly RagonClient _client;
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client;
|
||||
|
||||
public class TimestampHandler: IHandler
|
||||
{
|
||||
private readonly RagonClient _client;
|
||||
public TimestampHandler(RagonClient client)
|
||||
{
|
||||
_client = client;
|
||||
}
|
||||
|
||||
public void Handle(RagonBuffer buffer)
|
||||
{
|
||||
var timestamp0 = buffer.Read(32);
|
||||
var timestamp1 = buffer.Read(32);
|
||||
var value = new DoubleToUInt { Int0 = timestamp0, Int1 = timestamp1 };
|
||||
|
||||
_client.SetTimestamp(value.Double);
|
||||
}
|
||||
}
|
||||
@@ -18,5 +18,5 @@ namespace Ragon.Client;
|
||||
|
||||
public interface IRagonConnection
|
||||
{
|
||||
|
||||
public void Close();
|
||||
}
|
||||
@@ -24,7 +24,7 @@ namespace Ragon.Client
|
||||
private readonly NetworkStatistics _stats;
|
||||
private IRagonEntityListener _entityListener;
|
||||
private IRagonSceneCollector _sceneCollector;
|
||||
private Handler[] _handlers;
|
||||
private IHandler[] _handlers;
|
||||
private RagonBuffer _readBuffer;
|
||||
private RagonBuffer _writeBuffer;
|
||||
private RagonRoom _room;
|
||||
@@ -35,9 +35,11 @@ namespace Ragon.Client
|
||||
private RagonEventCache _eventCache;
|
||||
private RagonStatus _status;
|
||||
|
||||
private double _serverTimestamp;
|
||||
private float _replicationRate = 0;
|
||||
private float _replicationTime = 0;
|
||||
|
||||
public double ServerTimestamp => _serverTimestamp;
|
||||
public IRagonConnection Connection => _connection;
|
||||
public RagonStatus Status => _status;
|
||||
public RagonSession Session => _session;
|
||||
@@ -46,6 +48,7 @@ namespace Ragon.Client
|
||||
public NetworkStatistics Statistics => _stats;
|
||||
public RagonRoom Room => _room;
|
||||
|
||||
|
||||
internal RagonBuffer Buffer => _writeBuffer;
|
||||
internal INetworkChannel Reliable => _connection.Reliable;
|
||||
internal INetworkChannel Unreliable => _connection.Unreliable;
|
||||
@@ -96,15 +99,15 @@ namespace Ragon.Client
|
||||
|
||||
_writeBuffer = new RagonBuffer();
|
||||
_readBuffer = new RagonBuffer();
|
||||
_session = new RagonSession(this, _readBuffer);
|
||||
_session = new RagonSession(this, _writeBuffer);
|
||||
|
||||
_playerCache = new RagonPlayerCache();
|
||||
_entityCache = new RagonEntityCache(this, _playerCache, _sceneCollector);
|
||||
|
||||
_handlers = new Handler[byte.MaxValue];
|
||||
_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, _readBuffer, listeners, _playerCache, _entityCache);
|
||||
_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);
|
||||
@@ -115,8 +118,10 @@ namespace Ragon.Client
|
||||
_handlers[(byte)RagonOperation.CREATE_ENTITY] = new EntityCreateHandler(this, _playerCache, _entityCache, _entityListener);
|
||||
_handlers[(byte)RagonOperation.REMOVE_ENTITY] = new EntityRemoveHandler(_entityCache);
|
||||
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_STATE] = new StateEntityHandler(_entityCache);
|
||||
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventHandler(this, _playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.REPLICATE_ENTITY_EVENT] = new EntityEventHandler(_playerCache, _entityCache);
|
||||
_handlers[(byte)RagonOperation.SNAPSHOT] = new SnapshotHandler(this, listeners, _entityCache, _playerCache, _entityListener);
|
||||
_handlers[(byte)RagonOperation.REPLICATE_RAW_DATA] = new EventRoomHandler(this, _playerCache);
|
||||
_handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampHandler(this);
|
||||
|
||||
var protocolRaw = RagonVersion.Parse(protocol);
|
||||
_connection.Connect(address, port, protocolRaw);
|
||||
@@ -138,8 +143,10 @@ namespace Ragon.Client
|
||||
_replicationTime += dt;
|
||||
if (_replicationTime >= _replicationRate)
|
||||
{
|
||||
_entityCache.WriteState(_readBuffer);
|
||||
_replicationTime = 0;
|
||||
_entityCache.WriteState(_writeBuffer);
|
||||
|
||||
SendTimestamp();
|
||||
}
|
||||
|
||||
_stats.Update(_connection.BytesSent, _connection.BytesReceived, _connection.Ping, dt);
|
||||
@@ -194,10 +201,29 @@ namespace Ragon.Client
|
||||
_status = status;
|
||||
}
|
||||
|
||||
internal void SetTimestamp(double time)
|
||||
{
|
||||
_serverTimestamp = time;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region PRIVATE
|
||||
|
||||
private void SendTimestamp()
|
||||
{
|
||||
var timestamp = RagonTime.CurrentTimestamp();
|
||||
var value = new DoubleToUInt()
|
||||
{
|
||||
Double = timestamp,
|
||||
};
|
||||
|
||||
_writeBuffer.Clear();
|
||||
_writeBuffer.WriteOperation(RagonOperation.TIMESTAMP_SYNCHRONIZATION);
|
||||
_writeBuffer.Write(value.Int0, 32);
|
||||
_writeBuffer.Write(value.Int1, 32);
|
||||
}
|
||||
|
||||
private void OnConnected()
|
||||
{
|
||||
RagonLog.Trace("Connected");
|
||||
@@ -214,7 +240,7 @@ namespace Ragon.Client
|
||||
_status = RagonStatus.DISCONNECTED;
|
||||
}
|
||||
|
||||
public void OnData(byte[] data)
|
||||
private void OnData(byte[] data)
|
||||
{
|
||||
_readBuffer.Clear();
|
||||
_readBuffer.FromArray(data);
|
||||
|
||||
@@ -14,10 +14,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Client
|
||||
{
|
||||
public class RagonRoom
|
||||
{
|
||||
private delegate void OnEventDelegate(RagonPlayer player, RagonBuffer serializer);
|
||||
|
||||
private RagonClient _client;
|
||||
private RagonScene _scene;
|
||||
private RagonEntityCache _entityCache;
|
||||
@@ -33,6 +37,9 @@ namespace Ragon.Client
|
||||
public RagonPlayer Local => _playerCache.Local;
|
||||
public RagonPlayer Owner => _playerCache.Owner;
|
||||
|
||||
private readonly Dictionary<int, OnEventDelegate> _events = new Dictionary<int, OnEventDelegate>();
|
||||
private readonly Dictionary<int, Action<RagonPlayer, IRagonEvent>> _localEvents = new Dictionary<int, Action<RagonPlayer, IRagonEvent>>();
|
||||
|
||||
public RagonRoom(RagonClient client,
|
||||
RagonEntityCache entityCache,
|
||||
RagonPlayerCache playerCache,
|
||||
@@ -57,9 +64,41 @@ namespace Ragon.Client
|
||||
_scene.Update(sceneName);
|
||||
}
|
||||
|
||||
internal void Event(ushort eventCode, RagonPlayer caller, RagonBuffer buffer)
|
||||
{
|
||||
if (_events.TryGetValue(eventCode, out var evnt))
|
||||
evnt?.Invoke(caller, buffer);
|
||||
else
|
||||
RagonLog.Warn($"Handler event on entity {Id} with eventCode {eventCode} not defined");
|
||||
}
|
||||
|
||||
public void OnEvent<TEvent>(Action<RagonPlayer, TEvent> callback) where TEvent : IRagonEvent, new()
|
||||
{
|
||||
var t = new TEvent();
|
||||
var eventCode = _client.Event.GetEventCode(t);
|
||||
|
||||
if (_events.ContainsKey(eventCode))
|
||||
{
|
||||
_events.Remove(eventCode);
|
||||
_localEvents.Remove(eventCode);
|
||||
|
||||
RagonLog.Warn($"Event already {eventCode} subscribed, removed old one!");
|
||||
}
|
||||
|
||||
_localEvents.Add(eventCode, (player, eventData) => { callback.Invoke(player, (TEvent)eventData); });
|
||||
_events.Add(eventCode, (player, serializer) =>
|
||||
{
|
||||
t.Deserialize(serializer);
|
||||
callback.Invoke(player, t);
|
||||
});
|
||||
}
|
||||
|
||||
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 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);
|
||||
|
||||
@@ -67,4 +67,39 @@ public class RagonScene
|
||||
var sendData = buffer.ToArray();
|
||||
_client.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
internal void ReplicateEvent<TEvent>(TEvent evnt, RagonTarget target, RagonReplicationMode replicationMode)
|
||||
where TEvent : IRagonEvent, new()
|
||||
{
|
||||
var evntId = _client.Event.GetEventCode(evnt);
|
||||
var buffer = _client.Buffer;
|
||||
|
||||
buffer.Clear();
|
||||
buffer.WriteOperation(RagonOperation.REPLICATE_RAW_DATA);
|
||||
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_RAW_DATA);
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -41,5 +41,7 @@ namespace Ragon.Protocol
|
||||
REPLICATE_ENTITY_EVENT,
|
||||
TRANSFER_ROOM_OWNERSHIP,
|
||||
TRANSFER_ENTITY_OWNERSHIP,
|
||||
REPLICATE_RAW_DATA,
|
||||
TIMESTAMP_SYNCHRONIZATION,
|
||||
}
|
||||
}
|
||||
@@ -16,9 +16,34 @@
|
||||
|
||||
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Ragon.Protocol
|
||||
{
|
||||
[StructLayout(LayoutKind.Explicit)]
|
||||
public struct DoubleToUInt
|
||||
{
|
||||
[FieldOffset(0)]
|
||||
public double Double;
|
||||
|
||||
[FieldOffset(0)]
|
||||
public uint Int0;
|
||||
|
||||
[FieldOffset(4)]
|
||||
public uint Int1;
|
||||
}
|
||||
|
||||
public static class RagonTime {
|
||||
public static double CurrentTimestamp()
|
||||
{
|
||||
var currentTime = System.DateTime.UtcNow.ToUniversalTime().Subtract(
|
||||
new System.DateTime(1970, 1, 1, 0, 0, 0, System.DateTimeKind.Utc)
|
||||
).TotalMilliseconds;
|
||||
|
||||
return currentTime;
|
||||
}
|
||||
}
|
||||
|
||||
public static class DeBruijn
|
||||
{
|
||||
private static readonly int[] _lookup = new int[32]
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace Ragon.Server.ENet
|
||||
private ENetConnection[] _connections;
|
||||
private INetworkListener _listener;
|
||||
private uint _protocol;
|
||||
private Event _event;
|
||||
private global::ENet.Event _event;
|
||||
private Executor _executor;
|
||||
|
||||
public ENetServer()
|
||||
@@ -90,6 +90,7 @@ namespace Ragon.Server.ENet
|
||||
_event.Peer.DisconnectNow(0);
|
||||
break;
|
||||
}
|
||||
|
||||
var connection = new ENetConnection(_event.Peer);
|
||||
|
||||
_connections[_event.Peer.ID] = connection;
|
||||
@@ -124,6 +125,22 @@ namespace Ragon.Server.ENet
|
||||
}
|
||||
}
|
||||
|
||||
public void BroadcastReliable(byte[] data)
|
||||
{
|
||||
var packet = new Packet();
|
||||
packet.Create(data, PacketFlags.Reliable);
|
||||
|
||||
_host.Broadcast(0, ref packet);
|
||||
}
|
||||
|
||||
public void BroadcastUnreliable(byte[] data)
|
||||
{
|
||||
var packet = new Packet();
|
||||
packet.Create(data, PacketFlags.None);
|
||||
|
||||
_host.Broadcast(1, ref packet);
|
||||
}
|
||||
|
||||
public void Stop()
|
||||
{
|
||||
_host?.Dispose();
|
||||
|
||||
@@ -102,6 +102,18 @@ public class WebSocketServer : INetworkServer
|
||||
Flush();
|
||||
}
|
||||
|
||||
public void BroadcastUnreliable(byte[] data)
|
||||
{
|
||||
foreach (var activeConnection in _activeConnections)
|
||||
activeConnection.Unreliable.Send(data);
|
||||
}
|
||||
|
||||
public void BroadcastReliable(byte[] data)
|
||||
{
|
||||
foreach (var activeConnection in _activeConnections)
|
||||
activeConnection.Reliable.Send(data);
|
||||
}
|
||||
|
||||
public async void Flush()
|
||||
{
|
||||
foreach (var conn in _activeConnections)
|
||||
|
||||
@@ -25,4 +25,5 @@
|
||||
<ProjectReference Include="..\Ragon.Protocol\Ragon.Protocol.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
|
||||
using Ragon.Protocol;
|
||||
using Ragon.Server.Event;
|
||||
using Ragon.Server.Room;
|
||||
|
||||
namespace Ragon.Server.Entity;
|
||||
@@ -130,19 +131,24 @@ public class RagonEntity : IRagonEntity
|
||||
}
|
||||
|
||||
public void ReplicateEvent(
|
||||
RagonRoomPlayer caller,
|
||||
RagonRoomPlayer invoker,
|
||||
RagonEvent evnt,
|
||||
RagonReplicationMode eventMode,
|
||||
RagonRoomPlayer targetPlayer
|
||||
)
|
||||
{
|
||||
if (Authority == RagonAuthority.OwnerOnly && invoker.Connection.Id != Owner.Connection.Id)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var room = Owner.Room;
|
||||
var buffer = room.Writer;
|
||||
|
||||
buffer.Clear();
|
||||
buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
|
||||
buffer.WriteUShort(evnt.EventCode);
|
||||
buffer.WriteUShort(caller.Connection.Id);
|
||||
buffer.WriteUShort(invoker.Connection.Id);
|
||||
buffer.WriteByte((byte)eventMode);
|
||||
buffer.WriteUShort(Id);
|
||||
|
||||
@@ -153,21 +159,18 @@ public class RagonEntity : IRagonEntity
|
||||
}
|
||||
|
||||
public void ReplicateEvent(
|
||||
RagonRoomPlayer caller,
|
||||
RagonRoomPlayer invoker,
|
||||
RagonEvent evnt,
|
||||
RagonReplicationMode eventMode,
|
||||
RagonTarget targetMode
|
||||
)
|
||||
{
|
||||
if (Authority == RagonAuthority.OwnerOnly &&
|
||||
Owner.Connection.Id != caller.Connection.Id)
|
||||
if (Authority == RagonAuthority.OwnerOnly && invoker.Connection.Id != Owner.Connection.Id)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (eventMode == RagonReplicationMode.Buffered &&
|
||||
targetMode != RagonTarget.Owner &&
|
||||
_bufferedEvents.Count < _limitBufferedEvents)
|
||||
if (eventMode == RagonReplicationMode.Buffered && targetMode != RagonTarget.Owner && _bufferedEvents.Count < _limitBufferedEvents)
|
||||
{
|
||||
_bufferedEvents.Add(evnt);
|
||||
}
|
||||
@@ -178,7 +181,7 @@ public class RagonEntity : IRagonEntity
|
||||
buffer.Clear();
|
||||
buffer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
|
||||
buffer.WriteUShort(evnt.EventCode);
|
||||
buffer.WriteUShort(caller.Connection.Id);
|
||||
buffer.WriteUShort(invoker.Connection.Id);
|
||||
buffer.WriteByte((byte)eventMode);
|
||||
buffer.WriteUShort(Id);
|
||||
|
||||
@@ -206,7 +209,7 @@ public class RagonEntity : IRagonEntity
|
||||
{
|
||||
foreach (var roomPlayer in room.ReadyPlayersList)
|
||||
{
|
||||
if (roomPlayer.Connection.Id != caller.Connection.Id)
|
||||
if (roomPlayer.Connection.Id != invoker.Connection.Id)
|
||||
roomPlayer.Connection.Reliable.Send(sendData);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
using Ragon.Protocol;
|
||||
using Ragon.Server.Room;
|
||||
|
||||
namespace Ragon.Server.Entity;
|
||||
namespace Ragon.Server.Event;
|
||||
|
||||
public class RagonEvent
|
||||
{
|
||||
@@ -17,7 +17,6 @@
|
||||
using NLog;
|
||||
using Ragon.Protocol;
|
||||
using Ragon.Server.Lobby;
|
||||
using Ragon.Server.Plugin;
|
||||
using Ragon.Server.Plugin.Web;
|
||||
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
using NLog;
|
||||
using Ragon.Protocol;
|
||||
using Ragon.Server.Entity;
|
||||
using Ragon.Server.Event;
|
||||
|
||||
namespace Ragon.Server.Handler;
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ public sealed class EntityOwnershipOperation : IRagonOperation
|
||||
|
||||
if (!room.Players.TryGetValue(playerPeerId, out var nextOwner))
|
||||
{
|
||||
_logger.Error($"Player not found with id {entityId}");
|
||||
_logger.Error($"Player not found with id {playerPeerId}");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Server.Handler;
|
||||
|
||||
public class TimestampSyncOperation: IRagonOperation
|
||||
{
|
||||
public void Handle(RagonContext context, RagonBuffer reader, RagonBuffer writer)
|
||||
{
|
||||
var timestamp0 = reader.Read(32);
|
||||
var timestamp1 = reader.Read(32);
|
||||
var value = new DoubleToUInt() { Int0 = timestamp0, Int1 = timestamp1 };
|
||||
|
||||
context.RoomPlayer?.SetTimestamp(value.Double);
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Server.IO;
|
||||
|
||||
public interface INetworkChannel
|
||||
|
||||
@@ -21,5 +21,7 @@ public interface INetworkServer
|
||||
public Executor Executor { get; }
|
||||
public void Stop();
|
||||
public void Update();
|
||||
public void BroadcastUnreliable(byte[] data);
|
||||
public void BroadcastReliable(byte[] data);
|
||||
public void Start(INetworkListener listener, NetworkConfiguration configuration);
|
||||
}
|
||||
@@ -87,6 +87,8 @@ public class RagonServer : IRagonServer, INetworkListener
|
||||
_handlers[(byte) RagonOperation.REPLICATE_ENTITY_STATE] = new EntityStateOperation();
|
||||
_handlers[(byte) RagonOperation.TRANSFER_ROOM_OWNERSHIP] = new EntityOwnershipOperation();
|
||||
_handlers[(byte) RagonOperation.TRANSFER_ENTITY_OWNERSHIP] = new EntityOwnershipOperation();
|
||||
_handlers[(byte)RagonOperation.REPLICATE_RAW_DATA] = new RoomDataOperation();
|
||||
_handlers[(byte)RagonOperation.TIMESTAMP_SYNCHRONIZATION] = new TimestampSyncOperation();
|
||||
|
||||
_logger.Trace($"Server Tick Rate: {_configuration.ServerTickRate}");
|
||||
}
|
||||
@@ -98,8 +100,10 @@ public class RagonServer : IRagonServer, INetworkListener
|
||||
{
|
||||
if (_timer.ElapsedMilliseconds > _tickRate)
|
||||
{
|
||||
_scheduler.Update(_timer.ElapsedMilliseconds / 1000.0f);
|
||||
_timer.Restart();
|
||||
_scheduler.Update(_timer.ElapsedMilliseconds / 1000.0f);
|
||||
|
||||
SendTimestamp();
|
||||
}
|
||||
|
||||
_executor.Update();
|
||||
@@ -158,7 +162,7 @@ public class RagonServer : IRagonServer, INetworkListener
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Trace($"Disconnected: {connection.Id}");
|
||||
_logger.Trace($"Disconnected without context: {connection.Id}");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,6 +205,23 @@ public class RagonServer : IRagonServer, INetworkListener
|
||||
}
|
||||
}
|
||||
|
||||
public void SendTimestamp()
|
||||
{
|
||||
var timestamp = RagonTime.CurrentTimestamp();
|
||||
var value = new DoubleToUInt
|
||||
{
|
||||
Double = timestamp,
|
||||
};
|
||||
|
||||
_writer.Clear();
|
||||
_writer.WriteOperation(RagonOperation.TIMESTAMP_SYNCHRONIZATION);
|
||||
_writer.Write(value.Int0, 32);
|
||||
_writer.Write(value.Int1, 32);
|
||||
|
||||
var sendData = _writer.ToArray();
|
||||
_server.BroadcastUnreliable(sendData);
|
||||
}
|
||||
|
||||
public IRagonOperation ResolveOperation(RagonOperation operation)
|
||||
{
|
||||
return _handlers[(byte)operation];
|
||||
|
||||
@@ -25,6 +25,7 @@ public class RagonRoomPlayer
|
||||
public string Id { get; }
|
||||
public string Name { get; }
|
||||
public bool IsLoaded { get; private set; }
|
||||
public double Timestamp { get; private set; }
|
||||
public RagonRoom Room { get; private set; }
|
||||
public RagonEntityCache Entities { get; private set; }
|
||||
|
||||
@@ -65,4 +66,9 @@ public class RagonRoomPlayer
|
||||
{
|
||||
IsLoaded = false;
|
||||
}
|
||||
|
||||
internal void SetTimestamp(double time)
|
||||
{
|
||||
Timestamp = time;
|
||||
}
|
||||
}
|
||||
+6
@@ -6,6 +6,7 @@
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||
<RootNamespace>Ragon.Client.Simulation</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -15,6 +16,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ENet-CSharp" Version="2.4.8" />
|
||||
<PackageReference Include="Raylib-cs" Version="4.5.0.4" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -23,4 +25,8 @@
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Sources\Server\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -0,0 +1,143 @@
|
||||
using System.Numerics;
|
||||
using Raylib_cs;
|
||||
using static Raylib_cs.Raylib;
|
||||
|
||||
namespace Ragon.Simulation;
|
||||
|
||||
public class Client
|
||||
{
|
||||
public void Start()
|
||||
{
|
||||
// Initialization
|
||||
//--------------------------------------------------------------------------------------
|
||||
const int screenWidth = 800;
|
||||
const int screenHeight = 450;
|
||||
|
||||
InitWindow(screenWidth, screenHeight, "raylib [models] example - first person maze");
|
||||
|
||||
// Define the camera to look into our 3d world
|
||||
Camera3D camera = new();
|
||||
camera.Position = new Vector3(0.2f, 0.4f, 0.2f);
|
||||
camera.Target = new Vector3(0.0f, 0.0f, 0.0f);
|
||||
camera.Up = new Vector3(0.0f, 1.0f, 0.0f);
|
||||
camera.FovY = 45.0f;
|
||||
camera.Projection = CameraProjection.CAMERA_PERSPECTIVE;
|
||||
|
||||
Image imMap = LoadImage("resources/cubicmap.png");
|
||||
Texture2D cubicmap = LoadTextureFromImage(imMap);
|
||||
Mesh mesh = GenMeshCubicmap(imMap, new Vector3(1.0f, 1.0f, 1.0f));
|
||||
Model model = LoadModelFromMesh(mesh);
|
||||
|
||||
// NOTE: By default each cube is mapped to one part of texture atlas
|
||||
Texture2D texture = LoadTexture("resources/cubicmap_atlas.png");
|
||||
|
||||
// Set map diffuse texture
|
||||
Raylib.SetMaterialTexture(ref model, 0, MaterialMapIndex.MATERIAL_MAP_ALBEDO, ref texture);
|
||||
|
||||
// Get map image data to be used for collision detection
|
||||
Color* mapPixels = LoadImageColors(imMap);
|
||||
UnloadImage(imMap);
|
||||
|
||||
Vector3 mapPosition = new(-16.0f, 0.0f, -8.0f);
|
||||
Vector3 playerPosition = camera.Position;
|
||||
|
||||
SetTargetFPS(60);
|
||||
//--------------------------------------------------------------------------------------
|
||||
|
||||
// Main game loop
|
||||
while (!WindowShouldClose())
|
||||
{
|
||||
// Update
|
||||
//----------------------------------------------------------------------------------
|
||||
Vector3 oldCamPos = camera.Position;
|
||||
|
||||
UpdateCamera(ref camera, CameraMode.CAMERA_FIRST_PERSON);
|
||||
|
||||
// Check player collision (we simplify to 2D collision detection)
|
||||
Vector2 playerPos = new(camera.Position.X, camera.Position.Z);
|
||||
|
||||
// Collision radius (player is modelled as a cilinder for collision)
|
||||
float playerRadius = 0.1f;
|
||||
|
||||
int playerCellX = (int)(playerPos.X - mapPosition.X + 0.5f);
|
||||
int playerCellY = (int)(playerPos.Y - mapPosition.Z + 0.5f);
|
||||
|
||||
// Out-of-limits security check
|
||||
if (playerCellX < 0)
|
||||
{
|
||||
playerCellX = 0;
|
||||
}
|
||||
else if (playerCellX >= cubicmap.Width)
|
||||
{
|
||||
playerCellX = cubicmap.Width - 1;
|
||||
}
|
||||
|
||||
if (playerCellY < 0)
|
||||
{
|
||||
playerCellY = 0;
|
||||
}
|
||||
else if (playerCellY >= cubicmap.Height)
|
||||
{
|
||||
playerCellY = cubicmap.Height - 1;
|
||||
}
|
||||
|
||||
// Check map collisions using image data and player position
|
||||
// TODO: Improvement: Just check player surrounding cells for collision
|
||||
for (int y = 0; y < cubicmap.Height; y++)
|
||||
{
|
||||
for (int x = 0; x < cubicmap.Width; x++)
|
||||
{
|
||||
Color* mapPixelsData = mapPixels;
|
||||
|
||||
// Collision: Color.white pixel, only check R channel
|
||||
Rectangle rec = new(
|
||||
mapPosition.X - 0.5f + x * 1.0f,
|
||||
mapPosition.Z - 0.5f + y * 1.0f,
|
||||
1.0f,
|
||||
1.0f
|
||||
);
|
||||
|
||||
bool collision = CheckCollisionCircleRec(playerPos, playerRadius, rec);
|
||||
if ((mapPixelsData[y * cubicmap.Width + x].R == 255) && collision)
|
||||
{
|
||||
// Collision detected, reset camera position
|
||||
camera.Position = oldCamPos;
|
||||
}
|
||||
}
|
||||
}
|
||||
//----------------------------------------------------------------------------------
|
||||
|
||||
// Draw
|
||||
//----------------------------------------------------------------------------------
|
||||
BeginDrawing();
|
||||
ClearBackground(Color.RAYWHITE);
|
||||
|
||||
// Draw maze map
|
||||
BeginMode3D(camera);
|
||||
DrawModel(model, mapPosition, 1.0f, Color.WHITE);
|
||||
EndMode3D();
|
||||
|
||||
DrawTextureEx(cubicmap, new Vector2(GetScreenWidth() - cubicmap.Width * 4 - 20, 20), 0.0f, 4.0f, Color.WHITE);
|
||||
DrawRectangleLines(GetScreenWidth() - cubicmap.Width * 4 - 20, 20, cubicmap.Width * 4, cubicmap.Height * 4, Color.GREEN);
|
||||
|
||||
// Draw player position radar
|
||||
DrawRectangle(GetScreenWidth() - cubicmap.Width * 4 - 20 + playerCellX * 4, 20 + playerCellY * 4, 4, 4, Color.RED);
|
||||
|
||||
DrawFPS(10, 10);
|
||||
|
||||
EndDrawing();
|
||||
//----------------------------------------------------------------------------------
|
||||
}
|
||||
|
||||
// De-Initialization
|
||||
//--------------------------------------------------------------------------------------
|
||||
UnloadImageColors(mapPixels);
|
||||
|
||||
UnloadTexture(cubicmap);
|
||||
UnloadTexture(texture);
|
||||
UnloadModel(model);
|
||||
|
||||
CloseWindow();
|
||||
//--------------------------------------------------------------------------------------
|
||||
}
|
||||
}
|
||||
+7
-1
@@ -1,4 +1,7 @@
|
||||
namespace Ragon.Client.Simulation;
|
||||
using Ragon.Client;
|
||||
using Ragon.Client.Simulation;
|
||||
|
||||
namespace Ragon.Simulation;
|
||||
|
||||
public class EntityListener : IRagonEntityListener
|
||||
{
|
||||
@@ -24,6 +27,9 @@ public class Simulation
|
||||
{
|
||||
public void Start()
|
||||
{
|
||||
var client = new Ragon.Simulation.Client();
|
||||
client.Start();
|
||||
|
||||
// INetworkConnection protocol = debug ? new RagonNullConnection() : new RagonENetConnection();
|
||||
// var network = new RagonClient(protocol, new EntityListener(), 30);
|
||||
// var game = new Game(network);
|
||||
@@ -12,7 +12,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ragon.Server.ENet", "Ragon.
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ragon.Client", "Ragon.Client\Ragon.Client.csproj", "{C82D65BF-6D80-4263-ADFE-CB9ED990B6C3}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ragon.Client.Simulation", "Ragon.Client.Simulation\Ragon.Client.Simulation.csproj", "{0384848D-3B63-4B3A-B15F-A836EBB3E95D}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ragon.Simulation", "Ragon.Simulation\Ragon.Simulation.csproj", "{0384848D-3B63-4B3A-B15F-A836EBB3E95D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ragon.Client.Property", "Ragon.Client.Property\Ragon.Client.Property.csproj", "{46A60DAB-F854-4BB6-A119-BD4C5B2B0D29}"
|
||||
EndProject
|
||||
|
||||
Reference in New Issue
Block a user