BIG Serialization Update #102
Conversation
Added serialization/deserialization for type_options Serialization/Deserialization for WorldBase Server serializes world and sends string to client Client deserializes world with new MazeWorld constructor
-Added constructors in each world type for serialized string -Added property serialization for type options -Edited client and server main to support all worlds
-ControlledAgents, agents that only appear on the client side and mimic actions of agents on the server side -ServerManager and ClientManager to facilitate this -Synchronization bug to be fixed
-PropertyType enum class in Data -Pure virtual Entity serialization -Item Serialize and Deserialize
Run (for local games) is now separate from running a server, which requires ServerManager involvement
Server can select between four world types with different agents and items. Client automatically chooses corresponding world.
There was a problem hiding this comment.
Overall this looks really solid!
I've flagged a few style things, but functionally this looks really good!
I think there's an issue with how this interacts with CMake, but I'll change that after this is merged in.
Misc. Notes:
- Running things locally, I get an issue where I
optionalisn't defined in a few files. It looks like a#include <optional>inNetworkInterface.hppfixes this. I'll also fix this after the merge.
| @@ -0,0 +1,99 @@ | |||
| /** | |||
| * This file is part of the Fall 2023, CSE 491 course project. | |||
| * @brief A networking interface that allows information to be sent across a network | |||
There was a problem hiding this comment.
Probably want to update this, looks like it's the same as ClientInterface
There was a problem hiding this comment.
Ah, this and client interface both match NetworkingInterface. It's worth taking a pass to clean these up. I know keeping up with them is a pain, but it really does help orient folks who are new to the code.
| * @param id Agent ID | ||
| * @return true if ID is present | ||
| */ | ||
| bool IdPresent(size_t id) { |
There was a problem hiding this comment.
I'm being nitpicky here, but it would be nice if ID was consistent between this and GetActionID.
I prefer ID over Id, but consistency is the important part.
| public: | ||
| const static constexpr unsigned short m_initConnectionPort = 55000; ///Port for initial client connection | ||
|
|
||
| unsigned short m_maxClientPort = 55000; ///Port that is incremented for client thread handoff |
There was a problem hiding this comment.
Looks like these aren't used elsewhere. I'm assuming they come into play in multiplayer? If so that's totally fine.
| /** | ||
| * Deserialize agents and add to world | ||
| * @param is istream | ||
| * @param world world that is being added to |
There was a problem hiding this comment.
Looks like world is no longer a parameter and can be cut from the doxygen comment
| * @param world world that is being added to | ||
| * @param manager pointer to ClientManager for agents | ||
| */ | ||
| void DeserializeAgentSet(std::istream &is, netWorth::ClientManager *manager) {\ |
There was a problem hiding this comment.
There is a dangling \ here.
It doesn't seem to break anything, but it makes me uncomfortable...
| std::cerr << "Could not find end of agent_set serialization" << std::endl; | ||
| return; | ||
| } | ||
| } |
There was a problem hiding this comment.
Indentation got a little wonky in this function.
| os << ":::END item_set\n"; | ||
| } | ||
|
|
||
| void DeserializeItemSet(std::istream &is) { |
|
|
||
| // grab action ID from MainInterface | ||
| std::uint32_t action_id = i_2D::MainInterface::SelectAction(grid, type_options, | ||
| item_set, agent_set); | ||
| std::cout << action_id << std::endl; | ||
| //std::cout << action_id << std::endl; |
There was a problem hiding this comment.
This is super minor, but as we move to the final deadline, feel free to cut lines like this instead of commenting. Old versions are always available on GitHub anyway!
(I don't think we'd take points off for something like this, unless it's particularly egregious.)
-Added serialization schemes for agents and items, and world types
-Added manager classes to manage agent movement on client and server
-ControlledAgents, client-side agents that mimic agents/interfaces on the server
-Demo modes: Server chooses world type by program arguments, then client gets world data from server
This has been done for a bit but I want to break up our feature PR a bit. Actual multiplayer coming later.