bump version

Ragon.Common/Sources/RagonOperation.cs

@@ -16,6 +16,7 @@ namespace Ragon.Common
     
     LOAD_SCENE,
     SCENE_IS_LOADED,
+    SCENE_IS_PROCESSED,
 
     PLAYER_JOINED,
     PLAYER_LEAVED,

Ragon.SimpleServer/Source/Plugins/EmptyPlugin.cs

@@ -1,4 +1,5 @@
-using Ragon.Core;
+using NLog.Fluent;
+using Ragon.Core;
 
 namespace Game.Source
 {
@@ -16,13 +17,23 @@ namespace Game.Source
     }
    
     public override void OnPlayerJoined(Player player)
-    { 
-      // _logger.Info($"Player({player.PlayerName}) joined to Room({GameRoom.Id})");
+    {
+      // Logger.Info($"Player({player.PlayerName}) joined to Room({Room.Id})");
     }
 
     public override void OnPlayerLeaved(Player player)
     {
-      // _logger.Info($"Player({player.PlayerName}) left from Room({GameRoom.Id})");
+      // Logger.Info($"Player({player.PlayerName}) left from Room({Room.Id})");
+    }
+
+    public override void OnEntityCreated(Player player, Entity entity)
+    {
+      // Logger.Info($"Player({player.PlayerName}) create entity {entity.EntityId}:{entity.EntityType}"); 
+    }
+
+    public override void OnEntityDestroyed(Player player, Entity entity)
+    {
+      // Logger.Info($"Player({player.PlayerName}) destroy entity {entity.EntityId}:{entity.EntityType}");
     }
   }
 }

Ragon/Sources/Authorization/AuthorizationManager.cs

@@ -48,7 +48,7 @@ public class AuthorizationManager : IAuthorizationManager
       PeerId = peerId,
       IsLoaded = false,
       Entities = new List<Entity>(),
-      EntitiesIds = new List<int>(),
+      EntitiesIds = new List<ushort>(),
     };
 
     _playersByIds.Add(playerId, player);

Ragon/Sources/Configuration/ConfigurationLoader.cs

@@ -9,7 +9,7 @@ namespace Ragon.Core
   public static class ConfigurationLoader
   {
     private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
-    private static readonly string _serverVersion = "1.0.13-rc";
+    private static readonly string _serverVersion = "1.0.17-rc";
 
     private static void CopyrightInfo()
     {

Ragon/Sources/Entity/EntityProperty.cs

@@ -6,17 +6,19 @@ namespace Ragon.Core;
 public class EntityProperty
 {
     public int Size { get; set; }
+    public int Capacity { get; set; }
     public bool IsDirty { get; private set; }
     public bool IsFixed { get; private set; }
     private byte[] _data;
 
     public EntityProperty(int size, bool isFixed)
     {
-        _data = new byte[512];
-
+        Capacity = 512;
         Size = size;
         IsFixed = isFixed;
         IsDirty = true;
+        
+        _data = new byte[Capacity];
     }
     
     public ReadOnlySpan<byte> Read()

Ragon/Sources/Game/GameRoom.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using NLog;
 using Ragon.Common;
@@ -33,6 +32,7 @@ namespace Ragon.Core
     private HashSet<Entity> _entitiesDirtySet = new HashSet<Entity>();
     private List<Entity> _entitiesDirty = new List<Entity>();
     private List<uint> _peersCache = new List<uint>();
+    private List<uint> _loadedPeers = new List<uint>();
 
     public GameRoom(IGameThread gameThread, PluginBase pluginBase, string roomId, string map, int min, int max)
     {
@@ -55,17 +55,6 @@ namespace Ragon.Core
         _owner = player.PeerId;
       }
 
-      {
-        _serializer.Clear();
-        _serializer.WriteOperation(RagonOperation.PLAYER_JOINED);
-        _serializer.WriteUShort((ushort) player.PeerId);
-        _serializer.WriteString(player.Id);
-        _serializer.WriteString(player.PlayerName);
-
-        var sendData = _serializer.ToArray();
-        Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
-      }
-
       _players.Add(player.PeerId, player);
       _allPlayers = _players.Select(p => p.Key).ToArray();
 
@@ -109,7 +98,7 @@ namespace Ragon.Core
           _serializer.WriteUShort((ushort) player.EntitiesIds.Count);
           foreach (var entityId in player.EntitiesIds)
           {
-            _serializer.WriteInt(entityId);
+            _serializer.WriteUShort(entityId);
             _entities.Remove(entityId);
           }
 
@@ -161,11 +150,19 @@ namespace Ragon.Core
                 if (_serializer.ReadBool())
                 {
                   var property = ent.Properties[i];
+                  var size = property.Size;
                   if (!property.IsFixed)
-                    property.Size = _serializer.ReadUShort();
+                    size = _serializer.ReadUShort();
 
-                  var propertyPayload = _serializer.ReadData(property.Size);
+                  if (size > property.Capacity)
+                  {
+                    _logger.Warn($"Property {i} payload too large, size: {size}");
+                    continue;
+                  }
+
+                  var propertyPayload = _serializer.ReadData(size);
                   property.Write(ref propertyPayload);
+                  property.Size = size;
                 }
               }
 
@@ -205,7 +202,7 @@ namespace Ragon.Core
           _serializer.Clear();
           _serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
           _serializer.WriteUShort(evntId);
-          _serializer.WriteUShort((ushort) peerId);
+          _serializer.WriteUShort(peerId);
           _serializer.WriteByte(evntMode);
           _serializer.WriteUShort(entityId);
           _serializer.WriteData(ref payload);
@@ -324,7 +321,7 @@ namespace Ragon.Core
           player.Entities.Add(entity);
           player.EntitiesIds.Add(entity.EntityId);
 
-          var ownerId = (ushort) peerId;
+          var ownerId = peerId;
 
           _entities.Add(entity.EntityId, entity);
           _entitiesAll = _entities.Values.ToArray();
@@ -345,7 +342,7 @@ namespace Ragon.Core
           }
 
           var sendData = _serializer.ToArray();
-          Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
+          Send(peerId, sendData, DeliveryType.Reliable);
           break;
         }
         case RagonOperation.CREATE_ENTITY:
@@ -369,7 +366,7 @@ namespace Ragon.Core
           player.Entities.Add(entity);
           player.EntitiesIds.Add(entity.EntityId);
 
-          var ownerId = (ushort) peerId;
+          var ownerId = peerId;
 
           _entities.Add(entity.EntityId, entity);
           _entitiesAll = _entities.Values.ToArray();
@@ -423,55 +420,41 @@ namespace Ragon.Core
 
           break;
         }
-        case RagonOperation.SCENE_IS_LOADED:
+        case RagonOperation.SCENE_IS_PROCESSED:
         {
+          var player = _players[peerId];
+
           _serializer.Clear();
-          _serializer.WriteOperation(RagonOperation.SNAPSHOT);
-
-          _serializer.WriteUShort((ushort) _allPlayers.Length);
-          foreach (var playerPeerId in _allPlayers)
-          {
-            _serializer.WriteString(_players[playerPeerId].Id);
-            _serializer.WriteUShort((ushort) playerPeerId);
-            _serializer.WriteString(_players[playerPeerId].PlayerName);
-          }
-
-          var dynamicEntities = _entitiesAll.Where(e => e.StaticId == 0).ToArray();
-          _serializer.WriteUShort((ushort) dynamicEntities.Length);
-          foreach (var entity in dynamicEntities)
-          {
-            ReadOnlySpan<byte> payload = entity.Payload.AsSpan();
-
-            _serializer.WriteUShort(entity.EntityType);
-            _serializer.WriteUShort(entity.EntityId);
-            _serializer.WriteUShort((ushort) entity.OwnerId);
-            _serializer.WriteUShort((ushort) payload.Length);
-            _serializer.WriteData(ref payload);
-          }
-
-          var staticCount = _entitiesAll.Where(e => e.StaticId != 0).ToArray();
-          _serializer.WriteUShort((ushort) staticCount.Length);
-          foreach (var entity in staticCount)
-          {
-            ReadOnlySpan<byte> payload = entity.Payload.AsSpan();
-
-            _serializer.WriteUShort(entity.EntityType);
-            _serializer.WriteUShort(entity.EntityId);
-            _serializer.WriteUShort(entity.StaticId);
-            _serializer.WriteUShort(entity.OwnerId);
-            _serializer.WriteUShort((ushort) payload.Length);
-            _serializer.WriteData(ref payload);
-          }
+          _serializer.WriteOperation(RagonOperation.PLAYER_JOINED);
+          _serializer.WriteUShort((ushort) player.PeerId);
+          _serializer.WriteString(player.Id);
+          _serializer.WriteString(player.PlayerName);
 
           var sendData = _serializer.ToArray();
-          Send(peerId, sendData, DeliveryType.Reliable);
-
-          RestoreProperties(peerId);
-
-          _players[peerId].IsLoaded = true;
+          Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
+          
+          player.IsLoaded = true;
+          
           _readyPlayers = _players.Where(p => p.Value.IsLoaded).Select(p => p.Key).ToArray();
-          _plugin.OnPlayerJoined(_players[peerId]);
-
+          _plugin.OnPlayerJoined(player);
+          
+          var isOwner = _owner == peerId;
+          if (isOwner)
+          {
+            foreach (var peer in _loadedPeers)
+              ReplicateSnapshot(peer);
+            
+            _loadedPeers.Clear();
+          }
+          break;
+        }
+        case RagonOperation.SCENE_IS_LOADED:
+        {
+          var player = GetOwner();
+          if (player.IsLoaded || _owner == peerId)
+            ReplicateSnapshot(peerId);
+          else
+            _loadedPeers.Add(peerId);
           break;
         }
       }
@@ -481,6 +464,57 @@ namespace Ragon.Core
     {
       _scheduler.Tick(deltaTime);
 
+      ReplicateProperties();
+    }
+
+    public void ReplicateSnapshot(uint peerId)
+    {
+      _serializer.Clear();
+      _serializer.WriteOperation(RagonOperation.SNAPSHOT);
+
+      _serializer.WriteUShort((ushort) _allPlayers.Length);
+      foreach (var playerPeerId in _allPlayers)
+      {
+        _serializer.WriteString(_players[playerPeerId].Id);
+        _serializer.WriteUShort((ushort) playerPeerId);
+        _serializer.WriteString(_players[playerPeerId].PlayerName);
+      }
+
+      var dynamicEntities = _entitiesAll.Where(e => e.StaticId == 0).ToArray();
+      _serializer.WriteUShort((ushort) dynamicEntities.Length);
+      foreach (var entity in dynamicEntities)
+      {
+        ReadOnlySpan<byte> payload = entity.Payload.AsSpan();
+
+        _serializer.WriteUShort(entity.EntityType);
+        _serializer.WriteUShort(entity.EntityId);
+        _serializer.WriteUShort((ushort) entity.OwnerId);
+        _serializer.WriteUShort((ushort) payload.Length);
+        _serializer.WriteData(ref payload);
+      }
+
+      var staticCount = _entitiesAll.Where(e => e.StaticId != 0).ToArray();
+      _serializer.WriteUShort((ushort) staticCount.Length);
+      foreach (var entity in staticCount)
+      {
+        ReadOnlySpan<byte> payload = entity.Payload.AsSpan();
+
+        _serializer.WriteUShort(entity.EntityType);
+        _serializer.WriteUShort(entity.EntityId);
+        _serializer.WriteUShort(entity.StaticId);
+        _serializer.WriteUShort(entity.OwnerId);
+        _serializer.WriteUShort((ushort) payload.Length);
+        _serializer.WriteData(ref payload);
+      }
+
+      var sendData = _serializer.ToArray();
+      Send(peerId, sendData, DeliveryType.Reliable);
+
+      RestoreProperties(peerId);
+    }
+
+    private void ReplicateProperties()
+    {
       if (_entitiesDirty.Count > 0)
       {
         _serializer.Clear();
@@ -532,11 +566,18 @@ namespace Ragon.Core
         for (int propertyIndex = 0; propertyIndex < entity.Properties.Length; propertyIndex++)
         {
           var property = entity.Properties[propertyIndex];
-          _serializer.WriteBool(true);
-
-          var span = _serializer.GetWritableData(property.Size);
-          var data = property.Read();
-          data.CopyTo(span);
+          var hasPayload = property.IsFixed || property.Size > 0 && !property.IsFixed;
+          if (hasPayload)
+          {
+            _serializer.WriteBool(true);
+            var span = _serializer.GetWritableData(property.Size);
+            var data = property.Read();
+            data.CopyTo(span);
+          }
+          else
+          {
+            _serializer.WriteBool(false);
+          }
         }
       }
 
@@ -568,19 +609,13 @@ namespace Ragon.Core
 
     public IScheduler GetScheduler() => _scheduler;
 
-    public void Send(uint peerId, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable)
-    {
+    public void Send(uint peerId, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable) =>
       _gameThread.Server.Send(peerId, rawData, deliveryType);
-    }
 
-    public void Broadcast(uint[] peersIds, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable)
-    {
+    public void Broadcast(uint[] peersIds, byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable) =>
       _gameThread.Server.Broadcast(peersIds, rawData, deliveryType);
-    }
 
-    public void Broadcast(byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable)
-    {
+    public void Broadcast(byte[] rawData, DeliveryType deliveryType = DeliveryType.Unreliable) =>
       _gameThread.Server.Broadcast(_allPlayers, rawData, deliveryType);
-    }
   }
 }

Ragon/Sources/Player/Player.cs

@@ -11,6 +11,6 @@ namespace Ragon.Core
     public bool IsLoaded { get; set; }
     
     public List<Entity> Entities;
-    public List<int> EntitiesIds;
+    public List<ushort> EntitiesIds;
   }
 }

Ragon/Sources/Plugin/PluginBase.cs

@@ -8,21 +8,20 @@ namespace Ragon.Core
   public class PluginBase 
   {
     private delegate void SubscribeDelegate(Player player, ref ReadOnlySpan<byte> data);
-
     private delegate void SubscribeEntityDelegate(Player player, Entity entity, ref ReadOnlySpan<byte> data);
 
     private Dictionary<ushort, SubscribeDelegate> _globalEvents = new();
     private Dictionary<int, Dictionary<ushort, SubscribeEntityDelegate>> _entityEvents = new();
     private readonly RagonSerializer _serializer = new();
 
-    protected IGameRoom GameRoom { get; private set; } = null!;
+    protected IGameRoom Room { get; private set; } = null!;
     protected ILogger Logger = null!;
 
     public void Attach(GameRoom gameRoom)
     {
       Logger = LogManager.GetLogger($"Plugin<{GetType().Name}>");
 
-      GameRoom = gameRoom;
+      Room = gameRoom;
 
       _globalEvents.Clear();
       _entityEvents.Clear();
@@ -34,7 +33,7 @@ namespace Ragon.Core
       _entityEvents.Clear();
     }
 
-    public void Subscribe<T>(ushort evntCode, Action<Player, T> action) where T : IRagonSerializable, new()
+    public void OnEvent<T>(ushort evntCode, Action<Player, T> action) where T : IRagonSerializable, new()
     {
       if (_globalEvents.ContainsKey(evntCode))
       {
@@ -58,7 +57,7 @@ namespace Ragon.Core
       });
     }
 
-    public void Subscribe(ushort evntCode, Action<Player> action)
+    public void OnEvent(ushort evntCode, Action<Player> action)
     {
       if (_globalEvents.ContainsKey(evntCode))
       {
@@ -69,7 +68,7 @@ namespace Ragon.Core
       _globalEvents.Add(evntCode, (Player player, ref ReadOnlySpan<byte> raw) => { action.Invoke(player); });
     }
 
-    public void Subscribe<T>(Entity entity, ushort evntCode, Action<Player, Entity, T> action) where T : IRagonSerializable, new()
+    public void OnEvent<T>(Entity entity, ushort evntCode, Action<Player, Entity, T> action) where T : IRagonSerializable, new()
     {
       if (_entityEvents.ContainsKey(entity.EntityId))
       {
@@ -116,7 +115,7 @@ namespace Ragon.Core
       }
     }
 
-    public void Subscribe(Entity entity, ushort evntCode, Action<Player, Entity> action)
+    public void OnEvent(Entity entity, ushort evntCode, Action<Player, Entity> action)
     {
       if (_entityEvents.ContainsKey(entity.EntityId))
       {
@@ -150,8 +149,9 @@ namespace Ragon.Core
       if (!_entityEvents[entityId].ContainsKey(evntCode))
         return false;
 
-      var player = GameRoom.GetPlayerById(peerId);
-      var entity = GameRoom.GetEntityById(entityId);
+      var player = Room.GetPlayerById(peerId);
+      var entity = Room.GetEntityById(entityId);
+      
       _entityEvents[entityId][evntCode].Invoke(player, entity, ref payload);
 
       return true;
@@ -161,7 +161,7 @@ namespace Ragon.Core
     {
       if (_globalEvents.ContainsKey(evntCode))
       {
-        var player = GameRoom.GetPlayerById(peerId);
+        var player = Room.GetPlayerById(peerId);
         _globalEvents[evntCode].Invoke(player, ref payload);
         return true;
       }
@@ -169,7 +169,7 @@ namespace Ragon.Core
       return false;
     }
 
-    public void SendEvent(Player player, uint eventCode, IRagonSerializable payload)
+    public void ReplicateEvent(Player player, uint eventCode, IRagonSerializable payload)
     {
       _serializer.Clear();
       _serializer.WriteOperation(RagonOperation.REPLICATE_EVENT);
@@ -177,10 +177,10 @@ namespace Ragon.Core
       payload.Serialize(_serializer);
       
       var sendData = _serializer.ToArray();
-      GameRoom.Send(player.PeerId, sendData);
+      Room.Send(player.PeerId, sendData);
     }
 
-    public void BroadcastEvent(ushort eventCode, IRagonSerializable payload)
+    public void ReplicateEvent(ushort eventCode, IRagonSerializable payload)
     {
       _serializer.Clear();
       _serializer.WriteOperation(RagonOperation.REPLICATE_EVENT);
@@ -188,10 +188,10 @@ namespace Ragon.Core
       payload.Serialize(_serializer);
 
       var sendData = _serializer.ToArray();
-      GameRoom.Broadcast(sendData, DeliveryType.Reliable);
+      Room.Broadcast(sendData, DeliveryType.Reliable);
     }
 
-    public void SendEntityEvent(Player player, Entity entity, IRagonSerializable payload)
+    public void ReplicateEntityEvent(Player player, Entity entity, IRagonSerializable payload)
     {
       _serializer.Clear();
       _serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
@@ -200,10 +200,10 @@ namespace Ragon.Core
       payload.Serialize(_serializer);
 
       var sendData = _serializer.ToArray();
-      GameRoom.Send(player.PeerId, sendData, DeliveryType.Reliable);
+      Room.Send(player.PeerId, sendData, DeliveryType.Reliable);
     }
 
-    public void BroadcastEntityEvent(Entity entity, IRagonSerializable payload)
+    public void ReplicateEntityEvent(Entity entity, IRagonSerializable payload)
     {
       _serializer.Clear();
       _serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
@@ -212,7 +212,7 @@ namespace Ragon.Core
       payload.Serialize(_serializer);
 
       var sendData = _serializer.ToArray();
-      GameRoom.Broadcast(sendData);
+      Room.Broadcast(sendData);
     }