stand vom letzten wochenende (ebbbc5b0) · Commits · Jochen Bauer / spn-relayserver

.gitmodules

+3 −0

Original line number	Diff line number	Diff line
		@@ -8,3 +8,6 @@
		path = lib/uWebSockets
		url = git@git.bingo-ev.de:GPN18Programmierspiel/uWebSockets.git
		branch = cmake
		[submodule "lib/nlohmann"]
		path = lib/nlohmann
		url = https://github.com/nlohmann/json.git

nlohmann @ 46ec2fdd

Original line number	Diff line number	Diff line
		Subproject commit 46ec2fddf8774af2f9368bf563dd6e32fa91d77e

relayserver/CMakeLists.txt

+5 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,8 @@ include_directories(${EIGEN3_INCLUDE_DIR})
		include_directories(
		${PROJECT_NAME}
		../lib/uWebSockets/src
		../lib/msgpack-c/include/
		../lib/msgpack-c/include
		../lib/nlohmann/single_include
		)

		add_executable(
		@@ -15,7 +16,9 @@ add_executable(
		main.cpp
		RelayServer.h RelayServer.cpp
		TcpProtocol.h TcpProtocol.cpp
		SpatialMap.h MsgPackProtocol.h
		SpatialMap.h
		MsgPackProtocol.h MsgPackProtocol.cpp
		JsonProtocol.h JsonProtocol.cpp
		WebsocketConnection.h WebsocketConnection.cpp
		)

relayserver/JsonProtocol.cpp

0 → 100644

+182 −0

Original line number	Diff line number	Diff line
		#include "JsonProtocol.h"

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::Message &msg)
		{
		switch (msg.messageType)
		{
		case MESSAGE_TYPE_GAME_INFO:
		to_json(j, static_cast<const GameInfoMessage>(&msg));
		break;
		case MESSAGE_TYPE_WORLD_UPDATE:
		to_json(j, static_cast<const WorldUpdateMessage>(&msg));
		break;
		case MESSAGE_TYPE_TICK:
		to_json(j, static_cast<const TickMessage>(&msg));
		break;
		case MESSAGE_TYPE_BOT_SPAWN:
		to_json(j, static_cast<const BotSpawnMessage>(&msg));
		break;
		case MESSAGE_TYPE_BOT_KILL:
		to_json(j, static_cast<const BotKillMessage>(&msg));
		break;
		case MESSAGE_TYPE_BOT_MOVE:
		to_json(j, static_cast<const BotMoveMessage>(&msg));
		break;
		case MESSAGE_TYPE_FOOD_SPAWN:
		to_json(j, static_cast<const FoodSpawnMessage>(&msg));
		break;
		case MESSAGE_TYPE_FOOD_CONSUME:
		to_json(j, static_cast<const FoodConsumeMessage>(&msg));
		break;
		case MESSAGE_TYPE_FOOD_DECAY:
		to_json(j, static_cast<const FoodDecayMessage>(&msg));
		break;
		case MESSAGE_TYPE_PLAYER_INFO:
		to_json(j, static_cast<const PlayerInfoMessage>(&msg));
		break;
		}
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::GameInfoMessage &msg)
		{
		j = json {
		{"t", "GameInfo"},
		{"world_size_x", msg.world_size_x},
		{"world_size_y", msg.world_size_y},
		{"food_decay_per_frame", msg.food_decay_per_frame}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::WorldUpdateMessage &msg)
		{
		json bots = json::object();
		for (auto& bot: msg.bots)
		{
		bots[std::to_string(bot.guid)] = bot;
		}

		json food = json::object();
		for (auto& item: msg.food)
		{
		food[std::to_string(item.guid)] = item;
		}

		j = json {
		{"t", "WorldUpdate"},
		{"bots", bots},
		{"food", food}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::BotItem &item)
		{
		j = json {
		{"id", item.guid},
		{"name", item.name},
		{"segment_radius", item.segment_radius},
		{"color", item.color},
		{"snake_segments", item.segments},
		{"heading", 0}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::SnakeSegmentItem &item)
		{
		j = json{
		{"pos_x", item.pos().x()},
		{"pos_y", item.pos().y()}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::FoodItem &item)
		{
		j = json {
		{"id", item.guid},
		{"pos_x", item.pos().x()},
		{"pos_y", item.pos().y()},
		{"value", item.value}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::TickMessage &msg)
		{
		j = json {
		{"t", "Tick"},
		{"frame_id", msg.frame_id}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::BotSpawnMessage &msg)
		{
		j = json {
		{"t", "BotSpawn"},
		{"bot", msg.bot}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::BotKillMessage &msg)
		{
		j = json {
		{"t", "BotKill"},
		{"killer_id", msg.killer_id},
		{"victim_id", msg.victim_id}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::BotMoveMessage &msg)
		{
		j = json {
		{"t", "BotMove"},
		{"items", msg.items}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::BotMoveItem &item)
		{
		j = json {
		{"bot_id", item.bot_id},
		{"segment_data", item.new_segments},
		{"length", item.current_length},
		{"segment_radius", item.current_segment_radius}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::FoodSpawnMessage &msg)
		{
		j = json {
		{"t", "FoodSpawn"},
		{"items", msg.new_food}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::FoodConsumeMessage &msg)
		{
		j = json {
		{"t", "FoodConsume"},
		{"items", msg.items}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::FoodConsumeItem &item)
		{
		j = json {
		{"food_id", item.food_id},
		{"bot_id", item.bot_id}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::FoodDecayMessage &msg)
		{
		j = json {
		{"t", "FoodDecay"},
		{"items", msg.food_ids}
		};
		}

		void MsgPackProtocol::to_json(nlohmann::json &j, const MsgPackProtocol::PlayerInfoMessage &msg)
		{
		j = json {
		{"t", "PlayerInfo"},
		{"player_id", msg.player_id}
		};
		}

relayserver/JsonProtocol.h

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		#pragma once

		#include "MsgPackProtocol.h"
		#include <nlohmann/json.hpp>
		using nlohmann::json;

		namespace MsgPackProtocol
		{
		void to_json(json& j, const Message& msg);

		void to_json(json& j, const GameInfoMessage& msg);
		void to_json(json& j, const WorldUpdateMessage& msg);
		void to_json(json& j, const BotItem& item);
		void to_json(json& j, const SnakeSegmentItem& item);
		void to_json(json& j, const FoodItem& item);
		void to_json(json& j, const TickMessage& msg);
		void to_json(json& j, const BotSpawnMessage& msg);
		void to_json(json& j, const BotKillMessage& msg);
		void to_json(json& j, const BotMoveMessage& msg);
		void to_json(json& j, const BotMoveItem& item);
		void to_json(json& j, const FoodSpawnMessage& msg);
		void to_json(json& j, const FoodConsumeMessage& msg);
		void to_json(json& j, const FoodConsumeItem& item);
		void to_json(json& j, const FoodDecayMessage& msg);
		void to_json(json& j, const PlayerInfoMessage& msg);
		}