[MRG] Syncables

* Add Syncable networking primitive, which can automatically synchronize it's fields between few instances.
* Inherite Object from Syncable and make name autosynchronizable.
* Serialize archives to archive.
* Minor Serializable changes.

PR #63

GameLogic/Engine/Server.py

@@ -28,7 +28,7 @@ def __init__(self, impl):
 	def world() -> Engine.World.World:
 		return Engine.World.World(eGGame.world)
 
-class Player(ePlayer, Engine.World.VerbsHolder):
+class Player(ePlayer):
 	"""
 	Player class is persistent until restart. When player re-logins, existed Player instance is used.
 
@@ -47,10 +47,18 @@ class Player(ePlayer, Engine.World.VerbsHolder):
 	IsConnected() -> bool
 		returns True when player is online
 
+	AddVerb(name: str, action: Callable[[Player], None])
+		add new verb
+
+		Parametres
+		----------
+		name: str
+			verb's key. Use name to call verb from console
+
 	"""
 
 	def __init__(self, impl):
-		Engine.World.VerbsHolder.__init__(self, impl)
+		self._impl = impl
 
 	@property
 	def ckey(self) -> str:
@@ -66,6 +74,10 @@ def control(self, value: Engine.World.Control):
 	def IsConnected(self) -> bool:
 		return self._impl.IsConnected()
 
+	def AddVerb(self, name: str, action: Callable[[Engine.Server.Player], None]):
+		wrapper = lambda player: action(Engine.Server.Player(player))
+		self._impl.AddVerb(name, wrapper)
+
 
 class ResourceManager(eResourceManager):
 	"""

GameLogic/Engine/World.py

@@ -125,37 +125,7 @@ def GetDenseObject(self, directions: DirectionSet) -> Object:
 		return self._impl.GetDenseObject(directions._impl)
 
 
-class VerbsHolder(eVerbsHolder):
-	"""
-	Inheritance from this class allow to define special actions without
-	arguments which can be called with command from console
-
-	VerbsHolder is registrated with unique name, so player can call it's verbs.
-
-	For example, class Player registrated with name "Player".
-	So player's verb "Drop" can be called with next command: "Player.Drop"
-
-	Methods
-	-------
-	AddVerb(name: str, action: Callable[[Player], None])
-		add new verb
-
-		Parametres
-		----------
-		name: str
-			verb's key. Use name to call verb from console
-
-	"""
-
-	def __init__(self, impl):
-		self._impl = impl
-
-	def AddVerb(self, name: str, action: Callable[[Engine.Server.Player], None]):
-		wrapper = lambda player: action(Engine.Server.Player(player))
-		eVerbsHolder.AddVerb(self._impl, name, wrapper)
-
-
-class Object(eObject, VerbsHolder):
+class Object(eObject):
 	"""
 	Any game object
 
@@ -313,6 +283,14 @@ class Object(eObject, VerbsHolder):
 
 		Note: "animation" is animated sprite. Thus "id" is sprite id.
 
+	AddVerb(name: str, action: Callable[[Player], None])
+		add new verb
+
+		Parametres
+		----------
+		name: str
+			verb's key. Use name to call verb from console
+
 	Delete(self):
 		delete object
 
@@ -343,7 +321,6 @@ class Object(eObject, VerbsHolder):
 
 	def __init__(self):
 		eObject.__init__(self)
-		VerbsHolder.__init__(self, self)
 		self.name = str(self.defName)
 		self.sprite = str(self.defSprite)
 		self.description = str(self.defDescription)
@@ -490,6 +467,10 @@ def SetSpriteState(self, state: ItemSpriteState):
 	def PlayAnimation(self, id: str, callback: Callable[[], None] = None) -> bool:
 		return super().PlayAnimation(id, callback)
 
+	def AddVerb(self, name: str, action: Callable[[Engine.Server.Player], None]):
+		wrapper = lambda player: action(Engine.Server.Player(player))
+		super().AddVerb(name, wrapper)
+
 	def Delete(self):
 		super().Delete()
 

OSS13 Client/OSS13 Client.vcxproj

@@ -77,7 +77,7 @@
     <ClCompile />
     <Link>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
       <SubSystem>Windows</SubSystem>
     </Link>
@@ -88,7 +88,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
       <SubSystem>Windows</SubSystem>
     </Link>
@@ -102,7 +102,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
       <SubSystem>Windows</SubSystem>
     </Link>
@@ -116,7 +116,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
       <SubSystem>Windows</SubSystem>
     </Link>

OSS13 Client/Sources/Graphics/TileGrid/Object.cpp

@@ -10,13 +10,14 @@
 #include <Graphics/Sprite.hpp>
 #include <Graphics/TileGrid/TileGrid.hpp>
 
-Object::Object(const network::protocol::ObjectInfo &objectInfo) {
+Object::Object(network::protocol::ObjectInfo &&objectInfo) {
 	for (auto &sprite : objectInfo.spriteIds) {
 		AddSprite(uint(sprite));
 	}
 
+	static_cast<network::sync::ObjectSyncFields &>(*this) = std::move(objectInfo.fields);
+
 	id = objectInfo.id;
-	name = objectInfo.name;
 	layer = objectInfo.layer;
 	direction = objectInfo.direction;
 	density = objectInfo.density;

OSS13 Client/Sources/Graphics/TileGrid/Object.hpp

@@ -10,6 +10,7 @@
 #include <Shared/Geometry/DirectionSet.h>
 #include <Shared/Global.hpp>
 #include <Shared/Network/Protocol/ServerToClient/WorldInfo.h>
+#include <Shared/Network/Syncable/ObjectSyncFields.h>
 
 class Sprite;
 class Tile;
@@ -22,9 +23,9 @@ namespace sf {
 
 #include "iostream"
 
-class Object {
+class Object : public network::sync::ObjectSyncFields {
 public:
-	explicit Object(const network::protocol::ObjectInfo &objectInfo);
+	explicit Object(network::protocol::ObjectInfo &&objectInfo);
 
     Object &operator=(Object &) = default;
     ~Object();
@@ -62,7 +63,6 @@ class Object {
 
 private:
 	uint id{};
-    std::string name;
 	std::vector<::Sprite> sprites;
     ::Sprite animation;
 	bool animationProcess{};

OSS13 Client/Sources/Graphics/TileGrid/Tile.cpp

@@ -15,20 +15,22 @@ Tile::Tile(TileGrid *tileGrid) :
 	overlay.setCharacterSize(10);
 }
 
-Tile::Tile(TileGrid *tileGrid, const network::protocol::TileInfo &tileInfo) :
+Tile::Tile(TileGrid *tileGrid, network::protocol::TileInfo &&tileInfo) :
 	Tile(tileGrid)
 {
 	sprite = CC::Get()->RM.CreateSprite(uint(tileInfo.sprite));
 
 	for (auto &objInfo : tileInfo.content) {
 		auto &objects = GetTileGrid()->GetObjects();
 
-		auto iter = objects.find(objInfo.id);
+		auto id = objInfo.id;
+
+		auto iter = objects.find(id);
 		if (iter == objects.end()) {
-			objects[objInfo.id] = std::make_unique<Object>(objInfo);
+			objects[id] = std::make_unique<Object>(std::forward<network::protocol::ObjectInfo>(objInfo));
 		}
 
-		AddObject(objects[objInfo.id].get());
+		AddObject(objects[id].get());
 	}
 	Resize(GetTileGrid()->GetTileSize());
 }

OSS13 Client/Sources/Graphics/TileGrid/Tile.hpp

@@ -20,7 +20,7 @@ namespace sf {
 class Tile : public INonCopyable {
 public:
 	explicit Tile(TileGrid *tileGrid);
-	Tile(TileGrid *tileGrid, const network::protocol::TileInfo &tileInfo);
+	Tile(TileGrid *tileGrid, network::protocol::TileInfo &&tileInfo);
 	Tile(Tile &&) = default;
 	Tile &operator=(Tile &&) = default;
 	~Tile();

OSS13 Client/Sources/Graphics/TileGrid/TileGrid.cpp

@@ -356,6 +356,13 @@ void TileGrid::RemoveObject(uint id) {
     LOGE << "Error: object with id " << id << " doesn't exist (TileGrid::RemoveObject)";
 }
 
+void TileGrid::AmendObjectChanges(network::protocol::FieldsDiff &&diff) {
+	auto iter = objects.find(diff.objId);
+	EXPECT(iter != objects.end());
+	auto &obj = iter->second;
+	obj->AmendChanges(std::forward<uf::SyncableChanges>(diff.fieldsChanges));
+}
+
 void TileGrid::RelocateObject(uint id, apos toVec, int toObjectNum) {
     Tile *tile = GetTileAbs(toVec);
     if (!tile) {

OSS13 Client/Sources/Graphics/TileGrid/TileGrid.hpp

@@ -10,6 +10,7 @@
 
 #include <Shared/Types.hpp>
 #include <Shared/Network/Protocol/ServerToClient/OverlayInfo.h>
+#include <Shared/Network/Protocol/ServerToClient/Diff.h>
 
 #include <Shared/Grid.hpp>
 
@@ -40,6 +41,7 @@ class TileGrid : public Container {
 		// Differences commiting
 		void AddObject(Object *object);
 		void RemoveObject(uint id);
+		void AmendObjectChanges(network::protocol::FieldsDiff &&diff);
 		void RelocateObject(uint id, apos toVec, int toObjectNum);
 		void SetMoveIntentObject(uint id, uf::Direction direction);
 		void MoveObject(uint id, uf::Direction direction, float speed);

OSS13 Client/Sources/Network/Connection.cpp

@@ -90,10 +90,10 @@ void Connection::session() {
 			sendCommands();
 			working = true;
 		}
-		sf::Packet packet;
-		if (socket.receive(packet) == sf::Socket::Done) {
+		auto packet = std::make_unique<sf::Packet>();
+		if (socket.receive(*packet) == sf::Socket::Done) {
 			try {
-				parsePacket(packet);
+				parsePacket(std::move(packet));
 			} catch (const std::exception &e) {
 				MANAGE_EXCEPTION(e);
 			}
@@ -107,22 +107,21 @@ void Connection::session() {
 
 void Connection::sendCommands() {
 	while (!commandQueue.Empty()) {
-		sf::Packet packet;
-		uf::InputArchive ar(packet);
+		uf::Archive ar;
 		Command *temp = commandQueue.Pop();
 		ar << *temp;
 		if (temp) delete temp;
-		while (socket.send(packet) == sf::Socket::Partial);
+		while (socket.send(ar.GetPacket()) == sf::Socket::Partial);
 	}
 }
 
-bool Connection::parsePacket(sf::Packet &packet) {
-	uf::OutputArchive ar(packet);
+bool Connection::parsePacket(std::unique_ptr<sf::Packet> packet) {
+	uf::Archive ar(std::move(packet));
 	auto serializable = ar.UnpackSerializable();
 	auto generalCommand = uptr<network::protocol::Command>(dynamic_cast<network::protocol::Command *>(serializable.release()));
 
 	if (!generalCommand) {
-		LOGE << "Unknown serializable (id is 0x" << std::hex << serializable->Id() << ") is received!";
+		LOGE << "Unknown serializable (id is 0x" << std::hex << serializable->SerID() << ") is received!";
 		return false;
 	}
 

OSS13 Client/Sources/Network/Connection.h

@@ -30,7 +30,7 @@ class Connection {
 private:
 	static void session();
 	static void sendCommands();
-	static bool parsePacket(sf::Packet &);
+	static bool parsePacket(std::unique_ptr<sf::Packet> packet);
 
 private:
 	static Status status;

OSS13 Client/Sources/Network/SyncCommandsProcessor.cpp

@@ -28,7 +28,7 @@ void SyncCommandsProcessor::ProcessCommand(network::protocol::Command &generalCo
 	_REGISTRATE_COMMAND_PROCESSOR(UpdateWindowCommand);
 	_REGISTRATE_COMMAND_PROCESSOR(AddChatMessageCommand);
 
-	LOGE << __FUNCTION__ << ": unknown command (ser id is 0x" << std::hex << generalCommand.Id() << ") was not processed!";
+	LOGE << __FUNCTION__ << ": unknown command (ser id is 0x" << std::hex << generalCommand.SerID() << ") was not processed!";
 }
 
 void SyncCommandsProcessor::commandProcessor_AuthorizationSuccessCommand(network::protocol::server::AuthorizationSuccessCommand &) {
@@ -65,7 +65,7 @@ void SyncCommandsProcessor::commandProcessor_GraphicsUpdateCommand(network::prot
 		tileGrid->ShiftBlocks(command.firstTile);
 
 		for (auto &tileInfo : command.tilesInfo) {
-			tileGrid->SetBlock(tileInfo.coords, std::make_shared<Tile>(tileGrid, tileInfo));
+			tileGrid->SetBlock(tileInfo.coords, std::make_shared<Tile>(tileGrid, std::move(tileInfo)));
 		}
 	}
 	if (command.options & server::GraphicsUpdateCommand::Option::CAMERA_MOVE) {
@@ -74,11 +74,13 @@ void SyncCommandsProcessor::commandProcessor_GraphicsUpdateCommand(network::prot
 	if (command.options & server::GraphicsUpdateCommand::Option::DIFFERENCES) {
 		for (auto &generalDiff : command.diffs) {
 			if (auto *diff = dynamic_cast<network::protocol::AddDiff *>(generalDiff.get())) {
-				auto obj = std::make_unique<Object>(diff->objectInfo);
+				auto obj = std::make_unique<Object>(std::move(diff->objectInfo));
 				tileGrid->AddObject(obj.release());
 				tileGrid->RelocateObject(diff->objId, diff->coords, diff->layer);
 			} else if (auto *diff = dynamic_cast<network::protocol::RemoveDiff *>(generalDiff.get())) {
 				tileGrid->RemoveObject(diff->objId);
+			} else if (auto *diff = dynamic_cast<network::protocol::FieldsDiff *>(generalDiff.get())) {
+				tileGrid->AmendObjectChanges(std::forward<network::protocol::FieldsDiff>(*diff));
 			} else if (auto *diff = dynamic_cast<network::protocol::RelocateDiff *>(generalDiff.get())) {
 				tileGrid->RelocateObject(diff->objId, diff->newCoords, diff->layer);
 			} else if (auto *diff = dynamic_cast<network::protocol::MoveIntentDiff *>(generalDiff.get())) {

OSS13 Server/OSS13 Server.vcxproj

@@ -80,7 +80,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <ClCompile>
@@ -93,7 +92,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <ClCompile>
@@ -107,7 +105,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <ClCompile>
@@ -121,7 +118,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <ClCompile>