eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 20:19:18 +02:00
Code Issues 122 Wiki Activity

work

Browse Source
This commit is contained in:
milek7
2019-01-02 22:31:46 +01:00
parent 1cad7ad297
commit b1cb4ad1ea
24 changed files with 462 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
network/network.cpp
View File

@@ -3,6 +3,7 @@
#include "Logs.h"
#include "sn_utils.h"
#include "Timer.h"
#include "application.h"
void network::connection::connected()
{
@@ -32,19 +33,35 @@ void network::connection::message_received(std::shared_ptr<message> &msg)
{
WriteLog("accept received", logtype::net);
}
else if (msg->type == message::CLIENT_COMMAND)
{
auto cmd = std::dynamic_pointer_cast<command_message>(msg);
for (auto const &kv : cmd->commands)
client_commands_queue.emplace(kv);
}
else if (msg->type == message::STEP_INFO)
{
auto delta = std::dynamic_pointer_cast<delta_message>(msg);
auto now = std::chrono::high_resolution_clock::now();
delta_queue.push(std::make_pair(now, delta));
}
else if (msg->type == message::REQUEST_SPAWN_TRAIN)
{
auto req = std::dynamic_pointer_cast<string_message>(msg);
Application.request_train(req->name);
}
else if (msg->type == message::SPAWN_TRAIN)
{
auto req = std::dynamic_pointer_cast<string_message>(msg);
Application.spawn_train(req->name);
}
}
std::tuple<double, command_queue::commanddatasequence_map> network::connection::get_next_delta()
std::tuple<double, command_queue::commands_map> network::connection::get_next_delta()
{
if (delta_queue.empty()) {
return std::tuple<double,
command_queue::commanddatasequence_map>(0.0, command_queue::commanddatasequence_map());
command_queue::commands_map>(0.0, command_queue::commands_map());
}
///auto now = std::chrono::high_resolution_clock::now();
@@ -66,6 +83,13 @@ std::tuple<double, command_queue::commanddatasequence_map> network::connection::
//}
}
command_queue::commands_map network::connection::pop_commands()
{
command_queue::commands_map map(client_commands_queue);
client_commands_queue.clear();
return map;
}
void network::connection::data_received(std::string &buffer)
{
std::istringstream body(buffer);
@@ -87,7 +111,7 @@ void network::connection::send_message(std::shared_ptr<message> msg)
send_data(buf);
}
void network::server::push_delta(double dt, command_queue::commanddatasequence_map commands)
void network::server::push_delta(double dt, command_queue::commands_map commands)
{
std::shared_ptr<delta_message> msg = std::make_shared<delta_message>();
msg->dt = dt;
@@ -97,7 +121,46 @@ void network::server::push_delta(double dt, command_queue::commanddatasequence_m
c->send_message(msg);
}
std::tuple<double, command_queue::commanddatasequence_map> network::client::get_next_delta()
void network::server::notify_train(std::string name)
{
std::shared_ptr<string_message> msg = std::make_shared<string_message>(message::SPAWN_TRAIN);
msg->name = name;
for (auto c : clients)
c->send_message(msg);
}
command_queue::commands_map network::server::pop_commands()
{
command_queue::commands_map map;
for (auto c : clients) {
command_queue::commands_map cmap = c->pop_commands();
for (auto const &kv : cmap) {
auto lookup = map.emplace(kv.first, command_queue::commanddata_sequence());
for (command_data const &data : kv.second)
lookup.first->second.emplace_back(data);
}
}
return map;
}
std::tuple<double, command_queue::commands_map> network::client::get_next_delta()
{
return conn->get_next_delta();
}
void network::client::send_commands(command_queue::commands_map commands)
{
std::shared_ptr<command_message> msg = std::make_shared<command_message>();
msg->commands = commands;
conn->send_message(msg);
}
void network::client::request_train(std::string name)
{
std::shared_ptr<string_message> msg = std::make_shared<string_message>(message::REQUEST_SPAWN_TRAIN);
msg->name = name;
conn->send_message(msg);
}