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

work

Browse Source
This commit is contained in:
milek7
2019-01-14 22:45:22 +01:00
parent b2a9388fab
commit f55a5465ef
30 changed files with 172 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
network/network.cpp
View File

@@ -5,11 +5,15 @@
#include "Timer.h"
#include "application.h"
network::connection::connection(bool client) {
is_client = client;
}
void network::connection::connected()
{
WriteLog("net: socket connected", logtype::net);
if (!Global.network_conf.is_server) {
if (is_client) {
std::shared_ptr<message> hello = std::make_shared<message>(message::CONNECT_REQUEST);
send_message(hello);
}
@@ -52,16 +56,6 @@ void network::connection::message_received(std::shared_ptr<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, double, command_queue::commands_map> network::connection::get_next_delta()
@@ -125,6 +119,9 @@ network::server::server()
void network::server::push_delta(double dt, double sync, command_queue::commands_map commands)
{
if (dt == 0.0 && commands.empty())
return;
std::shared_ptr<delta_message> msg = std::make_shared<delta_message>();
msg->dt = dt;
msg->sync = sync;
@@ -140,15 +137,6 @@ void network::server::push_delta(double dt, double sync, command_queue::commands
c->send_message(msg);
}
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;
@@ -178,11 +166,3 @@ void network::client::send_commands(command_queue::commands_map 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);
}