Skip to content

Commit

Permalink
fix: improve client connection checks and packet handling, update eve…
Browse files Browse the repository at this point in the history 
…nt system for better axis control
  • Loading branch information
@MasterLaplace
MasterLaplace committed Nov 25, 2024
1 parent aecd893 commit 98aac25
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 60 deletions.
2 changes: 1 addition & 1 deletion Flakkari/Engine/EntityComponentSystem/Factory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void RegistryEntityByTemplate(Registry &registry, Entity entity, const nl_templa
Engine::Math::Vector3f(componentContent["position"]["x"], componentContent["position"]["y"],
componentContent["position"]["z"]);
transform._rotation =
Engine::Math::Vector3f(componentContent["rotation"]["x"], componentContent["rotation"]["y"],
Engine::Math::Vector3d(componentContent["rotation"]["x"], componentContent["rotation"]["y"],
componentContent["rotation"]["z"]);
transform._scale = Engine::Math::Vector3f(componentContent["scale"]["x"], componentContent["scale"]["y"],
componentContent["scale"]["z"]);
Expand Down
47 changes: 29 additions & 18 deletions Flakkari/Engine/Math/Vector.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ template <typename Type> struct Vector {
return Vector<Type>(v[0] * other.v[0], v[1] * other.v[1], v[2] * other.v[2], v[3] * other.v[3]);
}

Vector<float> multiplyWithFloatVector(const Vector<float> &other) const
{
return Vector<float>((float)v[0] * other.v[0], (float)v[1] * other.v[1], (float)v[2] * other.v[2], (float)v[3] * other.v[3]);
}

Vector<Type> operator/(const Vector<Type> &other) const
{
return Vector<Type>(v[0] / other.v[0], v[1] / other.v[1], v[2] / other.v[2], v[3] / other.v[3]);
Expand Down Expand Up @@ -193,9 +198,7 @@ template <typename Type> struct Vector {

Type operator[](const int &index) const { return v[index]; }

Type length() const { return sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2] + v[3] * v[3]); }

Type lengthSquared() const { return v[0] * v[0] + v[1] * v[1] + v[2] * v[2] + v[3] * v[3]; }
Type length() const { return sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]); }

Vector<Type> &normalize()
{
Expand All @@ -205,7 +208,6 @@ template <typename Type> struct Vector {
v[0] /= len;
v[1] /= len;
v[2] /= len;
v[3] /= len;
return *this;
}

Expand All @@ -214,7 +216,7 @@ template <typename Type> struct Vector {
Type len = length();
if (len == 0)
return *this;
return Vector<Type>(v[0] / len, v[1] / len, v[2] / len, v[3] / len);
return Vector<Type>(v[0] / len, v[1] / len, v[2] / len);
}

Type dot(const Vector<Type> &other) const
Expand Down Expand Up @@ -307,19 +309,28 @@ template <typename Type> struct Vector {
v[1] = y;
}

void rotate(const Vector<Type> &axis, double angleRadians)
void quaternionRotate(Type x, Type y, Type z, Type w)
{
Type c = cos(angleRadians);
Type s = sin(angleRadians);
Type x = v[0] * (c + axis.x * axis.x * (1 - c)) + v[1] * (axis.x * axis.y * (1 - c) - axis.z * s) +
v[2] * (axis.x * axis.z * (1 - c) + axis.y * s);
Type y = v[0] * (axis.y * axis.x * (1 - c) + axis.z * s) + v[1] * (c + axis.y * axis.y * (1 - c)) +
v[2] * (axis.y * axis.z * (1 - c) - axis.x * s);
Type z = v[0] * (axis.z * axis.x * (1 - c) - axis.y * s) + v[1] * (axis.z * axis.y * (1 - c) + axis.x * s) +
v[2] * (c + axis.z * axis.z * (1 - c));
v[0] = x;
v[1] = y;
v[2] = z;
v[0] = v[3] * x + v[0] * w + v[1] * z - v[2] * y;
v[1] = v[3] * y - v[0] * z + v[1] * w + v[2] * x;
v[2] = v[3] * z + v[0] * y - v[1] * x + v[2] * w;
v[3] = v[3] * w - v[0] * x - v[1] * y - v[2] * z;
}

/**
* @brief Rotate the vector around an axis by an angle in radians.
*
* @param axis The axis to rotate around.
* @param angleRadians The angle in radians.
*/
void rotate(const Vector<Type> &axis, float angleDegrees)
{
double _pi = 3.14159265358979323846;
double angleRadians = (angleDegrees * _pi / 180) / 2.0;
double sinHalfAngle = sin(angleRadians);
auto normalizedAxis = axis.normalized();
quaternionRotate(normalizedAxis.v[0] * sinHalfAngle, normalizedAxis.v[1] * sinHalfAngle,
normalizedAxis.v[2] * sinHalfAngle, cos(angleRadians));
}
};

Expand All @@ -335,7 +346,7 @@ using Vector4f = Vector<float>;
using Vector4d = Vector<double>;
using Vector4i = Vector<int>;
using Vector4u = Vector<unsigned int>;
using Quaternion = Vector4f;
using Quaternion = Vector4d;
using Color = Vector4f;

template <typename Type> std::ostream &operator<<(std::ostream &os, const Vector<Type> &vector);
Expand Down
23 changes: 13 additions & 10 deletions Flakkari/Protocol/Events.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,14 @@ enum class EventId : uint8_t {
MOVE_DOWN = 3,
MOVE_FRONT = 4,
MOVE_BACK = 5,
LOOK_LEFT = 6,
LOOK_RIGHT = 7,
LOOK_UP = 8,
LOOK_DOWN = 9,
SHOOT = 10,
MAX_EVENT
};

enum class EventAxisId : uint8_t {
LOOK_LEFT = 1,
LOOK_RIGHT = 2,
LOOK_UP = 3,
LOOK_DOWN = 4,
SHOOT = 5,
MAX_EVENT
};

enum class EventState : uint8_t {
PRESSED = 0,
RELEASED = 1,
Expand All @@ -91,11 +86,19 @@ LPL_PACKED_START
struct Event {
V_1::EventId id;
V_1::EventState state;

void print () const {
std::cout << "Event: " << int(id) << " " << int(state) << std::endl;
}
};

struct EventAxis {
V_1::EventAxisId id;
V_1::EventId id;
float value;

void print () const {
std::cout << "EventAxis: " << int(id) << " " << value << std::endl;
}
};

LPL_PACKED_END
Expand Down
8 changes: 4 additions & 4 deletions Flakkari/Protocol/PacketFactory.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,10 @@ class PacketFactory {
packet << transform->_position.vec.x;
packet << transform->_position.vec.y;
packet << transform->_position.vec.z;
packet << transform->_rotation.vec.x;
packet << transform->_rotation.vec.y;
packet << transform->_rotation.vec.z;
packet << transform->_rotation.vec.w;
packet << (float)transform->_rotation.vec.x;
packet << (float)transform->_rotation.vec.y;
packet << (float)transform->_rotation.vec.z;
packet << (float)transform->_rotation.vec.w;
packet << transform->_scale.vec.x;
packet << transform->_scale.vec.y;
packet << transform->_scale.vec.z;
Expand Down
2 changes: 1 addition & 1 deletion Flakkari/Server/Client/Client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Client::~Client() { _isConnected = false; }

bool Client::isConnected(float timeout)
{
if (!_isConnected)
if (!this || !_isConnected)
return false;
return std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - _lastActivity).count() <
timeout;
Expand Down
10 changes: 8 additions & 2 deletions Flakkari/Server/Client/ClientManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void ClientManager::sendPacketToAllClientsExcept(const std::shared_ptr<Network::
}
}

std::optional<std::pair<const std::string &, std::shared_ptr<Client>>>
std::optional<std::pair<std::string, std::shared_ptr<Client>>>
ClientManager::receivePacketFromClient(const std::shared_ptr<Network::Address> &client, const Network::Buffer &buffer)
{
auto clientName = client->toString().value_or("");
Expand All @@ -130,6 +130,13 @@ ClientManager::receivePacketFromClient(const std::shared_ptr<Network::Address> &
if (packet.deserialize(buffer))
{
FLAKKARI_LOG_LOG("Client " + clientName + " sent a valid packet: " + packet.to_string());

if (packet.header._commandId == Protocol::CommandId::REQ_DISCONNECT)
{
FLAKKARI_LOG_LOG("Client " + clientName + " disconnected");
return std::make_pair(tmp_client->getGameName(), tmp_client);
}

tmp_client->addPacketToReceiveQueue(packet);
return std::nullopt;
}
Expand All @@ -143,7 +150,6 @@ ClientManager::receivePacketFromClient(const std::shared_ptr<Network::Address> &

_bannedClients.push_back(ip);
FLAKKARI_LOG_LOG("Client " + clientName + " banned");
_clients.erase(clientName);
return std::make_pair(tmp_client->getGameName(), tmp_client);
}

Expand Down
4 changes: 2 additions & 2 deletions Flakkari/Server/Client/ClientManager.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ class ClientManager : public Singleton<ClientManager> {
* @param client The client's address
* @param packet The packet received
* @return std::optional<std::pair<const std::string &, std::shared_ptr<Client>>
* The client's name and the client object
* A pair of the client's game name and the client object
*/
std::optional<std::pair<const std::string &, std::shared_ptr<Client>>>
std::optional<std::pair<std::string, std::shared_ptr<Client>>>
receivePacketFromClient(const std::shared_ptr<Network::Address> &client, const Network::Buffer &packet);

/**
Expand Down
34 changes: 13 additions & 21 deletions Flakkari/Server/Game/Game.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void Game::loadSystems(Engine::ECS::Registry &registry, const std::string &scene
registry.add_system(
[this](Engine::ECS::Registry &r) { Engine::ECS::Systems::_3D::apply_movable(r, _deltaTime); });

else if (sysName == "spawn_enemy")
if (sysName == "spawn_enemy")
registry.add_system([this, sceneName](Engine::ECS::Registry &r) {
std::string templateName;
Engine::ECS::Entity entity;
Expand Down Expand Up @@ -230,10 +230,10 @@ void Game::sendUpdatePosition(std::shared_ptr<Client> player, Engine::ECS::Compo
packet << pos._position.vec.x;
packet << pos._position.vec.y;
packet << pos._position.vec.z;
packet << pos._rotation.vec.x;
packet << pos._rotation.vec.y;
packet << pos._rotation.vec.z;
packet << pos._rotation.vec.w;
packet << (float)pos._rotation.vec.x;
packet << (float)pos._rotation.vec.y;
packet << (float)pos._rotation.vec.z;
packet << (float)pos._rotation.vec.w;
packet << pos._scale.vec.x;
packet << pos._scale.vec.y;
packet << pos._scale.vec.z;
Expand All @@ -260,7 +260,7 @@ static bool handleMoveEvent(Protocol::Event &event, Engine::ECS::Components::_3D
Engine::ECS::Components::_3D::Movable &vel, Engine::ECS::Components::_3D::Transform &pos)
{
auto setAcceleration = [&](const Engine::Math::Vector3f &acceleration) {
vel._acceleration = pos._rotation * acceleration;
vel._acceleration = pos._rotation.multiplyWithFloatVector(acceleration);
};

switch (event.id)
Expand Down Expand Up @@ -356,30 +356,22 @@ void Game::handleEvents(std::shared_ptr<Client> player, Protocol::Packet<Protoco
}

// jump to the first axis event
data += count_events * sizeof(Protocol::Event);
data += count_events * sizeof(Protocol::Event) + sizeof(uint16_t);

for (uint16_t i = 0; i < count_axis; ++i)
{
Protocol::EventAxis event = *(Protocol::EventAxis *) (data + i * sizeof(Protocol::EventAxis));

if (event.id == Protocol::EventAxisId::LOOK_RIGHT && ctrl->_look_right)
if (event.id == Protocol::EventId::LOOK_RIGHT && ctrl->_look_right)
{
pos->_rotation.vec.y += event.value * 100 * _deltaTime;
continue;
}
else if (event.id == Protocol::EventAxisId::LOOK_LEFT && ctrl->_look_left)
{
pos->_rotation.vec.y -= event.value * 100 * _deltaTime;
continue;
}
else if (event.id == Protocol::EventAxisId::LOOK_UP && ctrl->_look_up)
{
pos->_rotation.vec.x += event.value * 100 * _deltaTime;
pos->_rotation.rotate(Engine::Math::Vector3d(0, 0, 1), -event.value);
sendUpdatePosition(player, pos.value(), vel.value());
continue;
}
else if (event.id == Protocol::EventAxisId::LOOK_DOWN && ctrl->_look_down)
else if (event.id == Protocol::EventId::LOOK_UP && ctrl->_look_up)
{
pos->_rotation.vec.x -= event.value * 100 * _deltaTime;
pos->_rotation.rotate(Engine::Math::Vector3d(1, 0, 0), -event.value);
sendUpdatePosition(player, pos.value(), vel.value());
continue;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Flakkari/Server/Game/GameManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void GameManager::removeClientFromGame(const std::string &gameName, const std::s
{
_gamesInstances[gameName].pop_back();
FLAKKARI_LOG_INFO("game \"" + gameName + "\" removed");
break;
return;
}
else if (instance->getPlayers().size() > minPlayers)
{
Expand Down

0 comments on commit 98aac25

Please sign in to comment.