@ -7,7 +7,7 @@ Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_cur
|
||||
|
||||
Bullet::~Bullet() {}
|
||||
|
||||
bool Bullet::Update(World* world, float elapsedtime, int perframe, std::map<uint64_t, Player*> mapPlayer) {
|
||||
bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> mapPlayer) {
|
||||
int max = 100 / perframe;
|
||||
float damage = 0.057f;
|
||||
for (int x = 0; x < max; ++x) {
|
||||
|
@ -1,9 +1,9 @@
|
||||
#ifndef BULLET_H__
|
||||
#define BULLET_H__
|
||||
|
||||
#include <unordered_map>
|
||||
#include "define.h"
|
||||
#include "vector3.h"
|
||||
#include <map>
|
||||
#include "player.h"
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ public:
|
||||
Bullet(Vector3f pos, Vector3f dir, uint64_t tid);
|
||||
~Bullet();
|
||||
|
||||
bool Update(World* world, float elapsedtime, int perframe, std::map<uint64_t, Player*> m_mapPlayer);
|
||||
bool Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> m_mapPlayer);
|
||||
void Transpose(int& x, int& z);
|
||||
Vector3f getPos() const;
|
||||
Vector3f getVel() const;
|
||||
|
@ -7,7 +7,7 @@
|
||||
#define SRV_PORT 10000
|
||||
#define CLI_PORT 10001
|
||||
|
||||
#define BUFFER_LENGTH 150
|
||||
#define BUFFER_LENGTH 1500
|
||||
|
||||
#define CHUNK_SIZE_X 4
|
||||
#define CHUNK_SIZE_Y 64
|
||||
@ -35,6 +35,8 @@
|
||||
|
||||
typedef uint8_t BlockType;
|
||||
enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_LAST };
|
||||
enum ANIM_TYPE { STILL = 0, SHOOTING = 8, JUMPING = 16, JUMPINGSHOOTING = 24, DEAD = 32, TYPE_LAST = 40};
|
||||
enum ANIM_POS {FRONT, QUARTER_FRONT_LEFT, QUATER_FRONT_RIGHT, PROFIL_LEFT, PROFIL_RIGHT, QUARTER_BACK_LEFT, QUARTER_BACK_RIGHT, BACK , POS_LAST};
|
||||
typedef uint64_t Timestamp;
|
||||
|
||||
#ifdef _WIN32
|
||||
@ -46,6 +48,7 @@ typedef uint64_t Timestamp;
|
||||
#include <cstdio>
|
||||
#include <ctime>
|
||||
|
||||
#define poll WSAPoll
|
||||
#define flag_t u_long
|
||||
#define addrlen_t int
|
||||
#define ioctl ioctlsocket
|
||||
|
@ -4,38 +4,38 @@ void netprot::Serialize(Input* in, char* buf[], uint32_t* buflen) {
|
||||
*buf[0] = (char)netprot::PACKET_TYPE::INPUT;
|
||||
|
||||
uint64_t time = in->timestamp;
|
||||
uint8_t time8[sizeof(uint64_t)] = {(uint8_t)((time >> 56) & 0xFF),
|
||||
uint8_t time8[sizeof(uint64_t)] = { (uint8_t)((time >> 56) & 0xFF),
|
||||
(uint8_t)((time >> 48) & 0xFF),
|
||||
(uint8_t)((time >> 40) & 0xFF),
|
||||
(uint8_t)((time >> 32) & 0xFF),
|
||||
(uint8_t)((time >> 24) & 0xFF),
|
||||
(uint8_t)((time >> 16) & 0xFF),
|
||||
(uint8_t)((time >> 8 ) & 0xFF),
|
||||
(uint8_t)(time & 0xFF)};
|
||||
(uint8_t)((time >> 8) & 0xFF),
|
||||
(uint8_t)(time & 0xFF) };
|
||||
|
||||
memcpy(*buf + 1, time8, sizeof(uint64_t));
|
||||
|
||||
uint64_t sid = in->sid;
|
||||
uint8_t sid8[sizeof(uint64_t)] = {(uint8_t)((sid >> 56) & 0xFF),
|
||||
uint8_t sid8[sizeof(uint64_t)] = { (uint8_t)((sid >> 56) & 0xFF),
|
||||
(uint8_t)((sid >> 48) & 0xFF),
|
||||
(uint8_t)((sid >> 40) & 0xFF),
|
||||
(uint8_t)((sid >> 32) & 0xFF),
|
||||
(uint8_t)((sid >> 24) & 0xFF),
|
||||
(uint8_t)((sid >> 16) & 0xFF),
|
||||
(uint8_t)((sid >> 8 ) & 0xFF),
|
||||
(uint8_t)( sid & 0xFF)};
|
||||
(uint8_t)((sid >> 8) & 0xFF),
|
||||
(uint8_t)(sid & 0xFF) };
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) + 1, sid8, sizeof(uint64_t));
|
||||
|
||||
Keys keys = in->keys;
|
||||
uint8_t keys8 = // Reste un bit.
|
||||
keys.forward & 0b10000000 |
|
||||
keys.forward & 0b10000000 |
|
||||
keys.backward & 0b01000000 |
|
||||
keys.left & 0b00100000 |
|
||||
keys.right & 0b00010000 |
|
||||
keys.jump & 0b00001000 |
|
||||
keys.shoot & 0b00000100 |
|
||||
keys.block & 0b00000010 ;
|
||||
keys.left & 0b00100000 |
|
||||
keys.right & 0b00010000 |
|
||||
keys.jump & 0b00001000 |
|
||||
keys.shoot & 0b00000100 |
|
||||
keys.block & 0b00000010;
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) * 2 + 1, &keys8, sizeof(uint8_t));
|
||||
|
||||
@ -54,7 +54,7 @@ void netprot::Serialize(Input* in, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((vec[2] >> 24) & 0xFF),
|
||||
(uint8_t)((vec[2] >> 16) & 0xFF),
|
||||
(uint8_t)((vec[2] >> 8) & 0xFF),
|
||||
(uint8_t)(vec[2] & 0xFF)};
|
||||
(uint8_t)(vec[2] & 0xFF) };
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) * 2 + 2, vec8, sizeof(uint32_t) * 3);
|
||||
|
||||
@ -88,7 +88,57 @@ void netprot::Serialize(Output* out, char* buf[], uint32_t* buflen) {
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) + 1, sid8, sizeof(uint64_t));
|
||||
|
||||
// TODO: Finir ca.
|
||||
States states = out->states;
|
||||
uint8_t states8 =
|
||||
states.jumping & 0b10000000 |
|
||||
states.shooting & 0b01000000 |
|
||||
states.hit & 0b00100000 |
|
||||
states.powerup & 0b00010000 |
|
||||
states.dead & 0b00001000 |
|
||||
states.still & 0b00000100 |
|
||||
states.jumpshot & 0b00000010 |
|
||||
states.running & 0b00000001;
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) * 2 + 1, &states8, sizeof(uint8_t));
|
||||
|
||||
uint32_t vec[3];
|
||||
memcpy(vec, &out->direction, sizeof(Vector3f)); // Pour d<>naturer les floats.
|
||||
|
||||
uint8_t vec8[3 * sizeof(uint32_t)] = {
|
||||
(uint8_t)((vec[0] >> 24) & 0xFF),
|
||||
(uint8_t)((vec[0] >> 16) & 0xFF),
|
||||
(uint8_t)((vec[0] >> 8) & 0xFF),
|
||||
(uint8_t)(vec[0] & 0xFF),
|
||||
(uint8_t)((vec[1] >> 24) & 0xFF),
|
||||
(uint8_t)((vec[1] >> 16) & 0xFF),
|
||||
(uint8_t)((vec[1] >> 8) & 0xFF),
|
||||
(uint8_t)(vec[1] & 0xFF),
|
||||
(uint8_t)((vec[2] >> 24) & 0xFF),
|
||||
(uint8_t)((vec[2] >> 16) & 0xFF),
|
||||
(uint8_t)((vec[2] >> 8) & 0xFF),
|
||||
(uint8_t)(vec[2] & 0xFF) };
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) * 2 + 2, vec8, sizeof(uint32_t) * 3);
|
||||
|
||||
memcpy(vec, &out->position, sizeof(Vector3f)); // Pour d<>naturer les floats.
|
||||
|
||||
uint8_t vec82[3 * sizeof(uint32_t)] = {
|
||||
(uint8_t)((vec[0] >> 24) & 0xFF),
|
||||
(uint8_t)((vec[0] >> 16) & 0xFF),
|
||||
(uint8_t)((vec[0] >> 8) & 0xFF),
|
||||
(uint8_t)(vec[0] & 0xFF),
|
||||
(uint8_t)((vec[1] >> 24) & 0xFF),
|
||||
(uint8_t)((vec[1] >> 16) & 0xFF),
|
||||
(uint8_t)((vec[1] >> 8) & 0xFF),
|
||||
(uint8_t)(vec[1] & 0xFF),
|
||||
(uint8_t)((vec[2] >> 24) & 0xFF),
|
||||
(uint8_t)((vec[2] >> 16) & 0xFF),
|
||||
(uint8_t)((vec[2] >> 8) & 0xFF),
|
||||
(uint8_t)(vec[2] & 0xFF) };
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 3, vec82, sizeof(uint32_t) * 3);
|
||||
|
||||
*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 6;
|
||||
}
|
||||
|
||||
void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
|
||||
@ -118,7 +168,7 @@ void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
|
||||
memcpy(*buf + sizeof(uint64_t) + 1, sid8, sizeof(uint64_t));
|
||||
|
||||
uint32_t timer = sync->timer;
|
||||
uint8_t time8[sizeof(uint32_t)] = {(uint8_t)((timer >> 24) & 0xFF),
|
||||
uint8_t time8[sizeof(uint32_t)] = { (uint8_t)((timer >> 24) & 0xFF),
|
||||
(uint8_t)((timer >> 16) & 0xFF),
|
||||
(uint8_t)((timer >> 8) & 0xFF),
|
||||
(uint8_t)(timer & 0xFF) };
|
||||
@ -169,8 +219,8 @@ void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((tid >> 32) & 0xFF),
|
||||
(uint8_t)((tid >> 24) & 0xFF),
|
||||
(uint8_t)((tid >> 16) & 0xFF),
|
||||
(uint8_t)((tid >> 8) & 0xFF),
|
||||
(uint8_t)(tid & 0xFF)
|
||||
(uint8_t)((tid >> 8) & 0xFF),
|
||||
(uint8_t)(tid & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + namesize + 2, tid8, sizeof(uint64_t));
|
||||
@ -192,8 +242,8 @@ void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((sid >> 32) & 0xFF),
|
||||
(uint8_t)((sid >> 24) & 0xFF),
|
||||
(uint8_t)((sid >> 16) & 0xFF),
|
||||
(uint8_t)((sid >> 8) & 0xFF),
|
||||
(uint8_t)(sid & 0xFF)
|
||||
(uint8_t)((sid >> 8) & 0xFF),
|
||||
(uint8_t)(sid & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + namesize + 2, sid8, sizeof(uint64_t));
|
||||
@ -206,8 +256,8 @@ void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((tid >> 32) & 0xFF),
|
||||
(uint8_t)((tid >> 24) & 0xFF),
|
||||
(uint8_t)((tid >> 16) & 0xFF),
|
||||
(uint8_t)((tid >> 8) & 0xFF),
|
||||
(uint8_t)(tid & 0xFF)
|
||||
(uint8_t)((tid >> 8) & 0xFF),
|
||||
(uint8_t)(tid & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + namesize + 2 + sizeof(uint64_t), tid8, sizeof(uint64_t));
|
||||
@ -229,8 +279,8 @@ void netprot::Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((id >> 32) & 0xFF),
|
||||
(uint8_t)((id >> 24) & 0xFF),
|
||||
(uint8_t)((id >> 16) & 0xFF),
|
||||
(uint8_t)((id >> 8) & 0xFF),
|
||||
(uint8_t)(id & 0xFF)
|
||||
(uint8_t)((id >> 8) & 0xFF),
|
||||
(uint8_t)(id & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + namesize + 2, id8, sizeof(uint64_t));
|
||||
@ -243,8 +293,8 @@ void netprot::Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((tid >> 32) & 0xFF),
|
||||
(uint8_t)((tid >> 24) & 0xFF),
|
||||
(uint8_t)((tid >> 16) & 0xFF),
|
||||
(uint8_t)((tid >> 8) & 0xFF),
|
||||
(uint8_t)(tid & 0xFF)
|
||||
(uint8_t)((tid >> 8) & 0xFF),
|
||||
(uint8_t)(tid & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + namesize + 2 + sizeof(uint64_t), tid8, sizeof(uint64_t));
|
||||
@ -263,8 +313,8 @@ void netprot::Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((game >> 32) & 0xFF),
|
||||
(uint8_t)((game >> 24) & 0xFF),
|
||||
(uint8_t)((game >> 16) & 0xFF),
|
||||
(uint8_t)((game >> 8) & 0xFF),
|
||||
(uint8_t)(game & 0xFF)
|
||||
(uint8_t)((game >> 8) & 0xFF),
|
||||
(uint8_t)(game & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + 1, seed8, sizeof(uint64_t));
|
||||
@ -272,27 +322,27 @@ void netprot::Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen) {
|
||||
game = ginfo->countdown;
|
||||
uint8_t count8[sizeof(uint64_t)] = {
|
||||
(uint8_t)((game >> 56) & 0xFF),
|
||||
(uint8_t)((game >> 48) & 0xFF),
|
||||
(uint8_t)((game >> 40) & 0xFF),
|
||||
(uint8_t)((game >> 32) & 0xFF),
|
||||
(uint8_t)((game >> 24) & 0xFF),
|
||||
(uint8_t)((game >> 16) & 0xFF),
|
||||
(uint8_t)((game >> 8) & 0xFF),
|
||||
(uint8_t)(game & 0xFF)
|
||||
(uint8_t)((game >> 48) & 0xFF),
|
||||
(uint8_t)((game >> 40) & 0xFF),
|
||||
(uint8_t)((game >> 32) & 0xFF),
|
||||
(uint8_t)((game >> 24) & 0xFF),
|
||||
(uint8_t)((game >> 16) & 0xFF),
|
||||
(uint8_t)((game >> 8) & 0xFF),
|
||||
(uint8_t)(game & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) + 1, count8, sizeof(uint64_t));
|
||||
|
||||
game = ginfo->countdown;
|
||||
uint8_t gtype8[sizeof(uint64_t)] = {
|
||||
(uint8_t)((game >> 56) & 0xFF),
|
||||
(uint8_t)((game >> 56) & 0xFF),
|
||||
(uint8_t)((game >> 48) & 0xFF),
|
||||
(uint8_t)((game >> 40) & 0xFF),
|
||||
(uint8_t)((game >> 32) & 0xFF),
|
||||
(uint8_t)((game >> 24) & 0xFF),
|
||||
(uint8_t)((game >> 16) & 0xFF),
|
||||
(uint8_t)((game >> 8) & 0xFF),
|
||||
(uint8_t)(game & 0xFF)
|
||||
(uint8_t)((game >> 8) & 0xFF),
|
||||
(uint8_t)(game & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) + 1, gtype8, sizeof(uint64_t));
|
||||
@ -311,8 +361,8 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((src >> 32) & 0xFF),
|
||||
(uint8_t)((src >> 24) & 0xFF),
|
||||
(uint8_t)((src >> 16) & 0xFF),
|
||||
(uint8_t)((src >> 8) & 0xFF),
|
||||
(uint8_t)(src & 0xFF)
|
||||
(uint8_t)((src >> 8) & 0xFF),
|
||||
(uint8_t)(src & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + 1, src8, sizeof(uint64_t));
|
||||
@ -325,8 +375,8 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((dst >> 32) & 0xFF),
|
||||
(uint8_t)((dst >> 24) & 0xFF),
|
||||
(uint8_t)((dst >> 16) & 0xFF),
|
||||
(uint8_t)((dst >> 8) & 0xFF),
|
||||
(uint8_t)(dst & 0xFF)
|
||||
(uint8_t)((dst >> 8) & 0xFF),
|
||||
(uint8_t)(dst & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + 1 + sizeof(uint64_t), dst8, sizeof(uint64_t));
|
||||
@ -339,8 +389,8 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)((dstteam >> 32) & 0xFF),
|
||||
(uint8_t)((dstteam >> 24) & 0xFF),
|
||||
(uint8_t)((dstteam >> 16) & 0xFF),
|
||||
(uint8_t)((dstteam >> 8) & 0xFF),
|
||||
(uint8_t)(dstteam & 0xFF)
|
||||
(uint8_t)((dstteam >> 8) & 0xFF),
|
||||
(uint8_t)(dstteam & 0xFF)
|
||||
};
|
||||
|
||||
memcpy(*buf + 1 + sizeof(uint64_t) * 2, dstt8, sizeof(uint64_t));
|
||||
@ -366,8 +416,8 @@ void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
|
||||
|
||||
|
||||
|
||||
bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
|
||||
if (buflen <= sizeof(Input))
|
||||
bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
|
||||
if (*buflen <= sizeof(Input))
|
||||
return false;
|
||||
|
||||
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
|
||||
@ -395,13 +445,13 @@ bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
|
||||
|
||||
uint8_t keys = 0;
|
||||
memcpy(&keys, &buf[1 + sizeof(uint64_t) * 2], sizeof(uint8_t));
|
||||
in->keys.forward = keys & 0b10000000;
|
||||
in->keys.backward = keys & 0b01000000;
|
||||
in->keys.left = keys & 0b00100000;
|
||||
in->keys.right = keys & 0b00010000;
|
||||
in->keys.jump = keys & 0b00001000;
|
||||
in->keys.shoot = keys & 0b00000100;
|
||||
in->keys.block = keys & 0b00000010;
|
||||
in->keys.forward = keys & 0b10000000;
|
||||
in->keys.backward = keys & 0b01000000;
|
||||
in->keys.left = keys & 0b00100000;
|
||||
in->keys.right = keys & 0b00010000;
|
||||
in->keys.jump = keys & 0b00001000;
|
||||
in->keys.shoot = keys & 0b00000100;
|
||||
in->keys.block = keys & 0b00000010;
|
||||
|
||||
uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
|
||||
memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2], sizeof(uint8_t) * 12);
|
||||
@ -417,19 +467,94 @@ bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
|
||||
(uint32_t)subvec[8] << 24 |
|
||||
(uint32_t)subvec[9] << 16 |
|
||||
(uint32_t)subvec[10] << 8 |
|
||||
(uint32_t)subvec[11]};
|
||||
(uint32_t)subvec[11] };
|
||||
|
||||
memcpy(&in->direction, vec, sizeof(uint32_t) * 3);
|
||||
|
||||
*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 3;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool netprot::Deserialize(Output* out, char* buf, const uint32_t buflen) {
|
||||
return false;
|
||||
bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
|
||||
if (*buflen <= sizeof(Output))
|
||||
return false;
|
||||
|
||||
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
|
||||
memcpy(diff, &buf[1], sizeof(uint64_t));
|
||||
out->timestamp =
|
||||
(uint64_t)diff[0] << 56 |
|
||||
(uint64_t)diff[1] << 48 |
|
||||
(uint64_t)diff[2] << 40 |
|
||||
(uint64_t)diff[3] << 32 |
|
||||
(uint64_t)diff[4] << 24 |
|
||||
(uint64_t)diff[5] << 16 |
|
||||
(uint64_t)diff[6] << 8 |
|
||||
(uint64_t)diff[7];
|
||||
|
||||
memcpy(diff, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
|
||||
out->id =
|
||||
(uint64_t)diff[0] << 56 |
|
||||
(uint64_t)diff[1] << 48 |
|
||||
(uint64_t)diff[2] << 40 |
|
||||
(uint64_t)diff[3] << 32 |
|
||||
(uint64_t)diff[4] << 24 |
|
||||
(uint64_t)diff[5] << 16 |
|
||||
(uint64_t)diff[6] << 8 |
|
||||
(uint64_t)diff[7];
|
||||
|
||||
uint8_t states = 0;
|
||||
memcpy(&states, &buf[1 + sizeof(uint64_t) * 2], sizeof(uint8_t));
|
||||
out->states.jumping = states & 0b10000000;
|
||||
out->states.shooting = states & 0b01000000;
|
||||
out->states.hit = states & 0b00100000;
|
||||
out->states.dead = states & 0b00010000;
|
||||
out->states.still = states & 0b00001000;
|
||||
out->states.jumpshot = states & 0b00000100;
|
||||
out->states.running = states & 0b00000010;
|
||||
|
||||
uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
|
||||
memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2], sizeof(uint8_t) * 12);
|
||||
uint32_t vec[3] = {
|
||||
(uint32_t)subvec[0] << 24 |
|
||||
(uint32_t)subvec[1] << 16 |
|
||||
(uint32_t)subvec[2] << 8 |
|
||||
(uint32_t)subvec[3],
|
||||
(uint32_t)subvec[4] << 24 |
|
||||
(uint32_t)subvec[5] << 16 |
|
||||
(uint32_t)subvec[6] << 8 |
|
||||
(uint32_t)subvec[7],
|
||||
(uint32_t)subvec[8] << 24 |
|
||||
(uint32_t)subvec[9] << 16 |
|
||||
(uint32_t)subvec[10] << 8 |
|
||||
(uint32_t)subvec[11] };
|
||||
|
||||
memcpy(&out->direction, vec, sizeof(uint32_t) * 3);
|
||||
|
||||
memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 3], sizeof(uint8_t) * 12);
|
||||
uint32_t vec2[3] = {
|
||||
(uint32_t)subvec[0] << 24 |
|
||||
(uint32_t)subvec[1] << 16 |
|
||||
(uint32_t)subvec[2] << 8 |
|
||||
(uint32_t)subvec[3],
|
||||
(uint32_t)subvec[4] << 24 |
|
||||
(uint32_t)subvec[5] << 16 |
|
||||
(uint32_t)subvec[6] << 8 |
|
||||
(uint32_t)subvec[7],
|
||||
(uint32_t)subvec[8] << 24 |
|
||||
(uint32_t)subvec[9] << 16 |
|
||||
(uint32_t)subvec[10] << 8 |
|
||||
(uint32_t)subvec[11] };
|
||||
|
||||
memcpy(&out->position, vec2, sizeof(uint32_t) * 3);
|
||||
|
||||
*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 6;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) {
|
||||
if (buflen <= sizeof(Sync))
|
||||
bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
|
||||
if (*buflen <= sizeof(Sync))
|
||||
return false;
|
||||
|
||||
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
|
||||
@ -487,11 +612,13 @@ bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) {
|
||||
|
||||
memcpy(&sync->position, vec, sizeof(uint32_t) * 3);
|
||||
|
||||
*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 2;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool netprot::Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen) {
|
||||
if (buflen <= sizeof(LoginInfo))
|
||||
bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
|
||||
if (*buflen <= sizeof(LoginInfo))
|
||||
return false;
|
||||
|
||||
size_t namesize = std::strlen(buf) + 1;
|
||||
@ -513,11 +640,13 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen) {
|
||||
(uint64_t)diff[6] << 8 |
|
||||
(uint64_t)diff[7];
|
||||
|
||||
*buflen = namesize + sizeof(uint64_t) + 2;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) {
|
||||
if (buflen <= sizeof(LoginInfo))
|
||||
bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
|
||||
if (*buflen <= sizeof(LoginInfo))
|
||||
return false;
|
||||
|
||||
size_t namesize = std::strlen(buf) + 1;
|
||||
@ -550,11 +679,13 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) {
|
||||
(uint64_t)diff[6] << 8 |
|
||||
(uint64_t)diff[7];
|
||||
|
||||
*buflen = namesize + sizeof(uint64_t) * 2 + 2;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen) {
|
||||
if (buflen <= sizeof(PlayerInfo))
|
||||
bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
|
||||
if (*buflen <= sizeof(PlayerInfo))
|
||||
return false;
|
||||
|
||||
size_t namesize = std::strlen(buf) + 1;
|
||||
@ -587,11 +718,13 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen) {
|
||||
(uint64_t)diff[6] << 8 |
|
||||
(uint64_t)diff[7];
|
||||
|
||||
*buflen = namesize + sizeof(uint64_t) * 2 + 2;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool netprot::Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen) {
|
||||
if (buflen <= sizeof(GameInfo))
|
||||
bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
|
||||
if (*buflen <= sizeof(GameInfo))
|
||||
return false;
|
||||
|
||||
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
|
||||
@ -628,11 +761,13 @@ bool netprot::Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen) {
|
||||
(uint64_t)diff[6] << 8 |
|
||||
(uint64_t)diff[7];
|
||||
|
||||
*buflen = sizeof(uint64_t) * 3 + 1;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool netprot::Deserialize(Chat* chat, char* buf, const uint32_t buflen) {
|
||||
if (buflen <= sizeof(Chat))
|
||||
bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
|
||||
if (*buflen <= sizeof(Chat))
|
||||
return false;
|
||||
|
||||
uint8_t src[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
|
||||
@ -677,11 +812,14 @@ bool netprot::Deserialize(Chat* chat, char* buf, const uint32_t buflen) {
|
||||
return false;
|
||||
|
||||
memcpy(&chat->mess, &buf[1 + sizeof(uint64_t) * 3], messsize);
|
||||
|
||||
*buflen = messsize + sizeof(uint64_t) * 3 + 2;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool netprot::Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen) {
|
||||
if (buflen <= sizeof(ErrorLog))
|
||||
bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
|
||||
if (*buflen <= sizeof(ErrorLog))
|
||||
return false;
|
||||
|
||||
size_t messsize = std::strlen(buf) + 1;
|
||||
@ -692,9 +830,13 @@ bool netprot::Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen) {
|
||||
memcpy(&errlog->mess, &buf[1], messsize);
|
||||
memcpy(&errlog->is_fatal, &buf[1 + messsize], sizeof(bool));
|
||||
|
||||
*buflen = messsize + sizeof(uint64_t) * 3 + 2;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
|
||||
if (buflen < 1 ||
|
||||
buf[0] >= (char)netprot::PACKET_TYPE::LAST_PACK ||
|
||||
@ -703,7 +845,7 @@ netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
|
||||
return (netprot::PACKET_TYPE)buf[0];
|
||||
}
|
||||
|
||||
netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
|
||||
netprot::Packet netprot::getPack(char* buf, uint32_t *buflen) {
|
||||
Packet pck = { nullptr, PACKET_TYPE::ERR };
|
||||
Input* in = nullptr;
|
||||
Output* out = nullptr;
|
||||
@ -713,7 +855,7 @@ netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
|
||||
ErrorLog* errlog = nullptr;
|
||||
LoginInfo* loginf = nullptr;
|
||||
|
||||
switch (getType(buf, buflen)) {
|
||||
switch (getType(buf, *buflen)) {
|
||||
case PACKET_TYPE::INPUT:
|
||||
in = new Input();
|
||||
if (netprot::Deserialize(in, buf, buflen)) {
|
||||
@ -770,7 +912,7 @@ netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
|
||||
}
|
||||
|
||||
netprot::Packet netprot::getPack(netprot::Buffer* buf) {
|
||||
return netprot::getPack(buf->ptr, buf->len);
|
||||
return netprot::getPack(buf->ptr, &buf->len);
|
||||
}
|
||||
|
||||
bool netprot::emptyPack(netprot::Packet pck) {
|
||||
@ -808,133 +950,250 @@ netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
|
||||
return pck;
|
||||
}
|
||||
|
||||
std::vector<netprot::Packet> netprot::recvPacks(SOCKET sock, Buffer* buf) {
|
||||
std::vector<Packet> lsPck;
|
||||
int len = 0, end = 0;
|
||||
bool pck_received = false;
|
||||
char* cursor = nullptr;
|
||||
std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf) {
|
||||
std::vector<char*> lsPck;
|
||||
int len = buf->tmp? buf->tmp - buf->ptr: 0,
|
||||
end = 0;
|
||||
char * cursor = buf->tmp ? buf->tmp: nullptr ,
|
||||
* next = buf->tmp ? buf->tmp + 1: buf->ptr,
|
||||
* last = buf->tmp ? buf->tmp: buf->ptr;
|
||||
bool ended = true;
|
||||
struct pollfd fds[1];
|
||||
|
||||
fds[0].fd = sock;
|
||||
fds[0].events = POLLIN;
|
||||
|
||||
while (true) {
|
||||
while (!pck_received) {
|
||||
int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
|
||||
if (bytes < 0) // si recv() retourne -1; ça veut dire qu'il y a plus rien a lire.
|
||||
return lsPck;
|
||||
len += bytes;
|
||||
// TODO: Voir si on trouve un footer (5 '\0' d'affilee).
|
||||
// Si oui, mettre l'index du debut du footer dans
|
||||
// la variable "end" et mettre pck_received a true.
|
||||
if (!poll(fds, 1, 0)) {
|
||||
if (ended)
|
||||
buf->tmp = nullptr;
|
||||
return lsPck;
|
||||
}
|
||||
|
||||
cursor = &buf->ptr[end];
|
||||
int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
|
||||
if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
|
||||
if (ended)
|
||||
buf->tmp = nullptr;
|
||||
return lsPck;
|
||||
}
|
||||
len += bytes;
|
||||
end = len;
|
||||
|
||||
lsPck.push_back(getPack(buf));
|
||||
ended = false;
|
||||
|
||||
while (*cursor == '\0') {
|
||||
cursor++;
|
||||
end++;
|
||||
while (true) {
|
||||
int cmp = 0;
|
||||
|
||||
if (cursor)
|
||||
end -= (cursor - buf->ptr);
|
||||
|
||||
if (end < 0)
|
||||
break;
|
||||
|
||||
cursor = (char*)memchr(next, '\r', end);
|
||||
|
||||
if (cursor) {
|
||||
next = cursor;
|
||||
cursor--;
|
||||
|
||||
cmp = memcmp(cursor, Footer, sizeof(uint32_t));
|
||||
if (cmp == 0) {
|
||||
if (!outbuf) {
|
||||
lsPck.push_back(last);
|
||||
cursor += sizeof(uint32_t);
|
||||
last = cursor;
|
||||
next = cursor + 1;
|
||||
}
|
||||
else {
|
||||
memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
|
||||
lsPck.push_back(&outbuf->ptr[cursor - last]);
|
||||
cursor += sizeof(uint32_t);
|
||||
last = cursor;
|
||||
next = cursor + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (!outbuf)
|
||||
buf->tmp = last;
|
||||
cursor = &buf->ptr[len];
|
||||
next = cursor + 1;
|
||||
break;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* outbuf) {
|
||||
std::vector<char*> lsPck;
|
||||
int len = buf->tmp ? buf->tmp - buf->ptr : 0,
|
||||
end = 0;
|
||||
char* cursor = buf->tmp ? buf->tmp : nullptr,
|
||||
* next = buf->tmp ? buf->tmp + 1 : buf->ptr,
|
||||
* last = buf->tmp ? buf->tmp : buf->ptr;
|
||||
bool ended = true;
|
||||
struct pollfd fds[1];
|
||||
sockaddr_in sockad = from;
|
||||
addrlen_t socklen = sizeof(sockad);
|
||||
|
||||
fds[0].fd = sock;
|
||||
fds[0].events = POLLIN;
|
||||
|
||||
while (true) {
|
||||
if (!poll(fds, 1, 0)) {
|
||||
if (ended)
|
||||
buf->tmp = nullptr;
|
||||
return lsPck;
|
||||
}
|
||||
|
||||
if (cursor) { // mettre le début du prochain paquet au début du buffer.
|
||||
memcpy(buf->ptr, cursor, buf->len - end); // et voir s'il y a en un autre
|
||||
len = 0;
|
||||
pck_received = true;
|
||||
int bytes = recvfrom(sock, &buf->ptr[len], buf->len - len, 0, (sockaddr*)&sockad, &socklen);
|
||||
if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
|
||||
if (ended)
|
||||
buf->tmp = nullptr;
|
||||
return lsPck;
|
||||
}
|
||||
len += bytes;
|
||||
end = len;
|
||||
|
||||
ended = false;
|
||||
|
||||
while (true) {
|
||||
int cmp = 0;
|
||||
|
||||
if (cursor)
|
||||
end -= (cursor - buf->ptr);
|
||||
|
||||
if (end < 0)
|
||||
break;
|
||||
|
||||
cursor = (char*)memchr(next, '\r', end);
|
||||
|
||||
if (cursor) {
|
||||
next = cursor;
|
||||
cursor--;
|
||||
|
||||
cmp = memcmp(cursor, Footer, sizeof(uint32_t));
|
||||
if (cmp == 0) {
|
||||
if (!outbuf) {
|
||||
lsPck.push_back(last);
|
||||
cursor += sizeof(uint32_t);
|
||||
last = cursor;
|
||||
next = cursor + 1;
|
||||
}
|
||||
else {
|
||||
memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
|
||||
lsPck.push_back(&outbuf->ptr[cursor - last]);
|
||||
cursor += sizeof(uint32_t);
|
||||
last = cursor;
|
||||
next = cursor + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (!outbuf)
|
||||
buf->tmp = last;
|
||||
cursor = &buf->ptr[len];
|
||||
next = cursor + 1;
|
||||
break;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <>
|
||||
void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, char** buf, uint32_t* buflen) {
|
||||
void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, Buffer* buf) {
|
||||
switch (pack->type) {
|
||||
case PACKET_TYPE::INPUT:
|
||||
sendPack<Input>(sock, (Input*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::OUTPUT:
|
||||
sendPack<Output>(sock, (Output*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::SYNC:
|
||||
sendPack<Sync>(sock, (Sync*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::TEAMINF:
|
||||
sendPack<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::PLAYINF:
|
||||
sendPack<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::LOGINF:
|
||||
sendPack<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::CHUNKMOD:
|
||||
//sendPack<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, buflen);
|
||||
case PACKET_TYPE::PLAYERMOD:
|
||||
//sendPack<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::PICKUPMOD:
|
||||
//sendPack<PickupMod>(sock, (PickupMod*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::GAMEINFO:
|
||||
sendPack<GameInfo>(sock, (GameInfo*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::ENDINFO:
|
||||
//sendPack<EndInfo>(sock, (EndInfo*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::CHAT:
|
||||
sendPack<Chat>(sock, (Chat*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::ERRLOG:
|
||||
sendPack<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, buflen);
|
||||
return;
|
||||
case PACKET_TYPE::LAST_PACK: [[fallthrough]];
|
||||
case PACKET_TYPE::ERR: [[fallthrough]];
|
||||
default:
|
||||
return;
|
||||
}
|
||||
case PACKET_TYPE::INPUT:
|
||||
sendPack<Input>(sock, (Input*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::OUTPUT:
|
||||
sendPack<Output>(sock, (Output*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::SYNC:
|
||||
sendPack<Sync>(sock, (Sync*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::TEAMINF:
|
||||
sendPack<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::PLAYINF:
|
||||
sendPack<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::LOGINF:
|
||||
sendPack<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::CHUNKMOD:
|
||||
//sendPack<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::PLAYERMOD:
|
||||
//sendPack<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::PICKUPMOD:
|
||||
//sendPack<PickupMod>(sock, (PickupMod*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::GAMEINFO:
|
||||
sendPack<GameInfo>(sock, (GameInfo*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::ENDINFO:
|
||||
//sendPack<EndInfo>(sock, (EndInfo*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::CHAT:
|
||||
sendPack<Chat>(sock, (Chat*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::ERRLOG:
|
||||
sendPack<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf);
|
||||
return;
|
||||
case PACKET_TYPE::LAST_PACK: [[fallthrough]];
|
||||
case PACKET_TYPE::ERR: [[fallthrough]];
|
||||
default:
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
template <>
|
||||
void netprot::sendPackTo<netprot::Packet>(SOCKET sock, Packet* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad) {
|
||||
void netprot::sendPackTo<netprot::Packet>(SOCKET sock, Packet* pack, Buffer* buf, sockaddr_in* sockad) {
|
||||
switch (pack->type) {
|
||||
case PACKET_TYPE::INPUT:
|
||||
sendPackTo<Input>(sock, (Input*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::OUTPUT:
|
||||
sendPackTo<Output>(sock, (Output*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::SYNC:
|
||||
sendPackTo<Sync>(sock, (Sync*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::TEAMINF:
|
||||
sendPackTo<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::PLAYINF:
|
||||
sendPackTo<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::LOGINF:
|
||||
sendPackTo<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::CHUNKMOD:
|
||||
//sendPackTo<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::PLAYERMOD:
|
||||
//sendPackTo<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::PICKUPMOD:
|
||||
//sendPackTo<PickupMod>(sock, (PickupMod*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::GAMEINFO:
|
||||
sendPackTo<GameInfo>(sock, (GameInfo*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::ENDINFO:
|
||||
//sendPackTo<EndInfo>(sock, (EndInfo*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::CHAT:
|
||||
sendPackTo<Chat>(sock, (Chat*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::ERRLOG:
|
||||
sendPackTo<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, buflen, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::LAST_PACK: [[fallthrough]];
|
||||
case PACKET_TYPE::ERR: [[fallthrough]];
|
||||
default:
|
||||
return;
|
||||
}
|
||||
case PACKET_TYPE::INPUT:
|
||||
sendPackTo<Input>(sock, (Input*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::OUTPUT:
|
||||
sendPackTo<Output>(sock, (Output*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::SYNC:
|
||||
sendPackTo<Sync>(sock, (Sync*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::TEAMINF:
|
||||
sendPackTo<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::PLAYINF:
|
||||
sendPackTo<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::LOGINF:
|
||||
sendPackTo<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::CHUNKMOD:
|
||||
//sendPackTo<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::PLAYERMOD:
|
||||
//sendPackTo<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::PICKUPMOD:
|
||||
//sendPackTo<PickupMod>(sock, (PickupMod*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::GAMEINFO:
|
||||
sendPackTo<GameInfo>(sock, (GameInfo*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::ENDINFO:
|
||||
//sendPackTo<EndInfo>(sock, (EndInfo*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::CHAT:
|
||||
sendPackTo<Chat>(sock, (Chat*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::ERRLOG:
|
||||
sendPackTo<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, sockad);
|
||||
return;
|
||||
case PACKET_TYPE::LAST_PACK: [[fallthrough]];
|
||||
case PACKET_TYPE::ERR: [[fallthrough]];
|
||||
default:
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -7,8 +7,6 @@
|
||||
|
||||
/* Protocole Particulier de Partie a Plusieurs Personnes (PPPPP) */
|
||||
|
||||
// Packet: packet[0] = PacketType, packet[1..n-1] = {packet}
|
||||
|
||||
namespace netprot {
|
||||
enum class PACKET_TYPE: uint8_t {
|
||||
ERR, INPUT, OUTPUT, SYNC,
|
||||
@ -18,8 +16,10 @@ namespace netprot {
|
||||
LAST_PACK
|
||||
};
|
||||
|
||||
/* Structures */
|
||||
|
||||
struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean.
|
||||
char* ptr = new char[BUFFER_LENGTH];
|
||||
char* ptr = new char[BUFFER_LENGTH] { 1 }, * tmp = nullptr;
|
||||
uint32_t len = BUFFER_LENGTH;
|
||||
|
||||
~Buffer() { delete[] ptr; }
|
||||
@ -31,6 +31,12 @@ namespace netprot {
|
||||
PACKET_TYPE type = PACKET_TYPE::ERR;
|
||||
};
|
||||
|
||||
/* Constantes */
|
||||
|
||||
inline const char Footer[sizeof(uint32_t)] = { '\0', '\r', '\0', '\n' }; // constante de footer qui est ajoutée à chaque paquet envoyé.
|
||||
|
||||
/* Sous-structures */
|
||||
|
||||
struct Keys {
|
||||
bool forward,
|
||||
backward,
|
||||
@ -52,6 +58,8 @@ namespace netprot {
|
||||
running;
|
||||
};
|
||||
|
||||
/* Structures de paquets */
|
||||
|
||||
struct Input { // cli -> srv UDP ~frame
|
||||
Timestamp timestamp;
|
||||
uint64_t sid = 0;
|
||||
@ -67,7 +75,7 @@ namespace netprot {
|
||||
States states; // 0bJSH_____ bit-packing de bool.
|
||||
};
|
||||
|
||||
struct Sync { // srv -> cli TCP ~second
|
||||
struct Sync { // srv -> cli TCP ~second - un premier sync démarre la partie.
|
||||
Timestamp timestamp;
|
||||
uint64_t sid = 0;
|
||||
uint32_t timer = 0;
|
||||
@ -98,7 +106,11 @@ namespace netprot {
|
||||
uint64_t id = 0,
|
||||
tid = 0;
|
||||
PlayerInfo() {}
|
||||
PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) { strcpy(log->name, name); }
|
||||
PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) {
|
||||
strcpy(log->name, name);
|
||||
};
|
||||
PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { memcpy((void*)strname.c_str(), name, strname.length());
|
||||
}
|
||||
};
|
||||
|
||||
struct GameInfo { // cli <-> srv TCP event (before game start)/ once
|
||||
@ -125,6 +137,8 @@ namespace netprot {
|
||||
ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(err->mess, mess); }
|
||||
};
|
||||
|
||||
/* Fonctions */
|
||||
|
||||
void Serialize(Input* in, char* buf[], uint32_t* buflen); // cli
|
||||
void Serialize(Output* out, char* buf[], uint32_t* buflen); // srv
|
||||
void Serialize(Sync* sync, char* buf[], uint32_t* buflen); // srv
|
||||
@ -135,48 +149,56 @@ namespace netprot {
|
||||
void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv
|
||||
void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv
|
||||
|
||||
bool Deserialize(Input* in, char* buf, const uint32_t buflen); // srv
|
||||
bool Deserialize(Output* out, char* buf, const uint32_t buflen); // cli
|
||||
bool Deserialize(Sync* sync, char* buf, const uint32_t buflen); // cli
|
||||
bool Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen); // cli/srv
|
||||
bool Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen); // cli/srv
|
||||
bool Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen); // cli
|
||||
bool Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen); // cli
|
||||
bool Deserialize(Chat* chat, char* buf, const uint32_t buflen); // srv/cli
|
||||
bool Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen); // srv
|
||||
bool Deserialize(Input* in, char* buf, uint32_t* buflen); // srv
|
||||
bool Deserialize(Output* out, char* buf, uint32_t* buflen); // cli
|
||||
bool Deserialize(Sync* sync, char* buf, uint32_t* buflen); // cli
|
||||
bool Deserialize(TeamInfo* tinfo, char* buf, uint32_t* buflen); // cli/srv
|
||||
bool Deserialize(LoginInfo* linfo, char* buf, uint32_t* buflen); // cli/srv
|
||||
bool Deserialize(PlayerInfo* pinfo, char* buf, uint32_t* buflen); // cli
|
||||
bool Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen); // cli
|
||||
bool Deserialize(Chat* chat, char* buf, uint32_t* buflen); // srv/cli
|
||||
bool Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen); // srv
|
||||
|
||||
PACKET_TYPE getType(char* buf, uint32_t buflen);
|
||||
|
||||
Packet getPack(char* buf, uint32_t buflen);
|
||||
Packet getPack(char* buf, uint32_t *buflen);
|
||||
Packet getPack(Buffer* buf);
|
||||
|
||||
bool emptyPack(Packet pck);
|
||||
|
||||
Packet makePack(void* ptr, PACKET_TYPE type); // Pour pouvoir faire une liste de stock a supprimer sans avoir a en faire une pour chaque type.
|
||||
|
||||
template <class T> T copyPack(Packet* pck);
|
||||
|
||||
template <class T> void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen);
|
||||
template <class T> void sendPackTo(SOCKET sock, T* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad);
|
||||
|
||||
template <class T> void sendPack(SOCKET sock, T* pack, Buffer* buf);
|
||||
template <class T> void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad);
|
||||
|
||||
std::vector<Packet> recvPacks(SOCKET sock, Buffer* buf);
|
||||
std::vector<char*> recvPacks(SOCKET sock, Buffer* buf, Buffer* oufbuf = nullptr);
|
||||
std::vector<char*> recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* oufbuf = nullptr);
|
||||
|
||||
/* Templates */
|
||||
|
||||
template <class T>
|
||||
T copyPack(Packet* pck) { return T((T*)pck->ptr); }
|
||||
|
||||
template <class T>
|
||||
void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen) {
|
||||
netprot::Serialize(pack, buf, buflen);
|
||||
memset(&buf[*buflen], '\0', sizeof(uint64_t) + sizeof(uint8_t));
|
||||
buflen += (sizeof(uint64_t) + sizeof(uint8_t));
|
||||
memcpy(*buf + *buflen, Footer, sizeof(uint32_t));
|
||||
*buflen += sizeof(Footer);
|
||||
send(sock, *buf, *buflen, 0);
|
||||
*buflen = BUFFER_LENGTH;
|
||||
}
|
||||
|
||||
template <class T>
|
||||
void sendPackTo(SOCKET sock, T* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad) {
|
||||
sockaddr_in addr = *sockad;
|
||||
const sockaddr_in addr = *sockad;
|
||||
netprot::Serialize(pack, buf, buflen);
|
||||
memset(&buf[*buflen], '\0', sizeof(uint64_t) + sizeof(uint8_t));
|
||||
buflen += (sizeof(uint64_t) + sizeof(uint8_t));
|
||||
memcpy(*buf + *buflen, Footer, sizeof(uint32_t));
|
||||
*buflen += sizeof(Footer);
|
||||
sendto(sock, *buf, *buflen, 0, (sockaddr*)&addr, sizeof(addr));
|
||||
*buflen = BUFFER_LENGTH;
|
||||
}
|
||||
@ -184,22 +206,21 @@ namespace netprot {
|
||||
template <class T>
|
||||
void sendPack(SOCKET sock, T* pack, Buffer* buf) {
|
||||
netprot::Serialize(pack, &buf->ptr, &buf->len);
|
||||
memset(&buf->ptr[buf->len], '\0', sizeof(uint64_t) + sizeof(uint8_t));
|
||||
buf->len += sizeof(uint64_t) + sizeof(uint8_t);
|
||||
memcpy(&buf->ptr[buf->len], Footer, sizeof(uint32_t));
|
||||
buf->len += sizeof(Footer);
|
||||
send(sock, buf->ptr, buf->len, 0);
|
||||
buf->rstLen();
|
||||
}
|
||||
|
||||
template <class T>
|
||||
void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad) {
|
||||
sockaddr_in addr = *sockad;
|
||||
const sockaddr_in addr = *sockad;
|
||||
netprot::Serialize(pack, &buf->ptr, &buf->len);
|
||||
memset(&buf->ptr[buf->len], '\0', sizeof(uint64_t) + sizeof(uint8_t));
|
||||
buf->len += sizeof(uint64_t) + sizeof(uint8_t);
|
||||
memcpy(&buf->ptr[buf->len], Footer, sizeof(uint32_t));
|
||||
buf->len += sizeof(Footer);
|
||||
sendto(sock, buf->ptr, buf->len, 0, (sockaddr*)&addr, sizeof(addr));
|
||||
buf->rstLen();
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
#endif
|
||||
|
@ -186,12 +186,18 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
|
||||
return snd;
|
||||
}
|
||||
|
||||
void Player::ApplyTransformation(Transformation& transformation, bool rel) const {
|
||||
void Player::ApplyTransformation(Transformation& transformation, bool rel, bool rot) const {
|
||||
transformation.ApplyRotation(-m_rotX, 1, 0, 0);
|
||||
transformation.ApplyRotation(-m_rotY, 0, 1, 0);
|
||||
if (rel) transformation.ApplyTranslation(-GetPOV());
|
||||
if (!rot) {
|
||||
transformation.ApplyRotation(-m_rotX, 1, 0, 0);
|
||||
transformation.ApplyRotation(-m_rotY, 0, 1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void Player::SetDirection(Vector3f dir) { m_direction = dir; }
|
||||
|
||||
Vector3f Player::GetPosition() const { return Vector3f(m_position.x + CHUNK_SIZE_X * WORLD_SIZE_X / 2, m_position.y, m_position.z + CHUNK_SIZE_Z * WORLD_SIZE_Y / 2); }
|
||||
|
||||
Vector3f Player::GetVelocity() const { return m_velocity; }
|
||||
|
@ -5,6 +5,7 @@
|
||||
#include "transformation.h"
|
||||
#include "vector3.h"
|
||||
|
||||
|
||||
class World;
|
||||
|
||||
class Player {
|
||||
@ -18,8 +19,9 @@ public:
|
||||
void TurnTopBottom(float value);
|
||||
Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime);
|
||||
Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime);
|
||||
void ApplyTransformation(Transformation& transformation, bool rel = true) const;
|
||||
void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;
|
||||
|
||||
void SetDirection(Vector3f dir);
|
||||
Vector3f GetPosition() const;
|
||||
Vector3f GetDirection() const;
|
||||
Vector3f GetVelocity() const;
|
||||
@ -50,6 +52,8 @@ protected:
|
||||
|
||||
bool m_airborne;
|
||||
|
||||
|
||||
|
||||
Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
|
||||
|
||||
};
|
||||
|
@ -47,6 +47,70 @@ PlayerInfo* Connection::getInfo() const { return (PlayerInfo*)&m_playinfo; }
|
||||
|
||||
sockaddr_in* Connection::getAddr() const { return (sockaddr_in*)&m_addr; }
|
||||
|
||||
void Connection::getPacks(SOCKET sock) {
|
||||
std::vector<char*> lsPck;
|
||||
Input in;
|
||||
while (true) {
|
||||
lsPck = recvPacksFrom(sock, &m_buf, m_addr);
|
||||
|
||||
for (auto& pck : lsPck) {
|
||||
uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
|
||||
switch (netprot::getType(pck, 1)) {
|
||||
using enum netprot::PACKET_TYPE;
|
||||
case INPUT:
|
||||
if (Deserialize(&in, pck, &bsize))
|
||||
m_input_manifest[in.timestamp] = in;
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
lsPck.clear();
|
||||
}
|
||||
}
|
||||
|
||||
void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns) {
|
||||
while (m_last_out < m_output_manifest.size()) {
|
||||
Output out = m_output_manifest.at(m_last_out++);
|
||||
|
||||
for (auto& [key, conn] : conns) {
|
||||
if (m_playinfo.id == conn->GetHash(true))
|
||||
continue;
|
||||
sendPackTo<Output>(sock, &out, &m_bufout, conn->getAddr());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Connection::Run(World* world) {
|
||||
Input in, last;
|
||||
Output out;
|
||||
float el;
|
||||
|
||||
if (m_input_manifest.size() < 2)
|
||||
return;
|
||||
|
||||
while (m_last_in < m_input_manifest.size()) {
|
||||
in = m_input_manifest.at(m_last_in + 1);
|
||||
last = m_input_manifest.at(m_last_in);
|
||||
|
||||
el = (float)(in.timestamp - last.timestamp) / 1000.;
|
||||
player.get()->SetDirection(in.direction);
|
||||
player.get()->ApplyPhysics(player.get()->GetInput(in.keys.forward,
|
||||
in.keys.backward,
|
||||
in.keys.left,
|
||||
in.keys.right,
|
||||
in.keys.jump, false, el), world, el);
|
||||
|
||||
out.position = player.get()->GetPosition();
|
||||
out.direction = in.direction;
|
||||
out.timestamp = in.timestamp;
|
||||
out.id = m_playinfo.id;
|
||||
|
||||
m_output_manifest[out.timestamp] = out;
|
||||
|
||||
++m_last_in;
|
||||
}
|
||||
}
|
||||
|
||||
void Connection::CleanInputManifest(Timestamp time) {
|
||||
auto wat = m_input_manifest.find(time);
|
||||
|
||||
|
@ -2,10 +2,11 @@
|
||||
#define CONNECTION_H__
|
||||
|
||||
#include <deque>
|
||||
#include <map>
|
||||
#include <unordered_map>
|
||||
#include "../SQCSim-common/player.h"
|
||||
#include "../SQCSim-common/vector3.h"
|
||||
#include "../SQCSim-common/netprotocol.h"
|
||||
#include "../SQCSim-common/world.h"
|
||||
#include "define.h"
|
||||
|
||||
using namespace netprot;
|
||||
@ -32,16 +33,27 @@ public:
|
||||
PlayerInfo* getInfo() const;
|
||||
sockaddr_in* getAddr() const;
|
||||
|
||||
void getPacks(SOCKET sock);
|
||||
void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns);
|
||||
|
||||
void Run(World* world);
|
||||
|
||||
void CleanInputManifest(Timestamp time);
|
||||
private:
|
||||
std::map<Timestamp, Input> m_input_manifest;
|
||||
std::map<Timestamp, Output> m_output_manifest;
|
||||
std::map<Timestamp, Chat> m_chatlog;
|
||||
std::unordered_map<Timestamp, Input> m_input_manifest;
|
||||
std::unordered_map<Timestamp, Output> m_output_manifest;
|
||||
std::unordered_map<Timestamp, Chat> m_chatlog;
|
||||
|
||||
SOCKET m_sock;
|
||||
sockaddr_in m_addr;
|
||||
LoginInfo m_loginfo;
|
||||
PlayerInfo m_playinfo;
|
||||
|
||||
Timestamp m_startsync;
|
||||
|
||||
uint64_t m_last_in = 0,
|
||||
m_last_out = 0;
|
||||
Buffer m_buf,
|
||||
m_bufout;
|
||||
};
|
||||
#endif
|
||||
|
@ -129,6 +129,7 @@ int Server::Ready() {
|
||||
if (recv(sock, m_buf.ptr, m_buf.len, 0) > 0) {
|
||||
PlayerInfo play;
|
||||
|
||||
m_buf.len = BUFFER_LENGTH;
|
||||
Packet pck = getPack(&m_buf);
|
||||
if (pck.type != PACKET_TYPE::LOGINF) {
|
||||
Log("Paquet invalide.", true, false);
|
||||
@ -139,22 +140,22 @@ int Server::Ready() {
|
||||
LoginInfo* log = (LoginInfo*)pck.ptr;
|
||||
|
||||
log->sid = getUniqueId();
|
||||
log->tid = 0; // TODO: À changer si on implemente un mode en equipe.
|
||||
log->tid = 1145389380; // TODO: À changer si on implemente un mode en equipe.
|
||||
|
||||
Log(str.append(" Nom: ").append(log->name), false, false);
|
||||
str.clear();
|
||||
|
||||
Log(str.append(log->name).append(" SID: [").append(std::to_string(log->sid).append("]")), false, false);
|
||||
|
||||
sendPack<LoginInfo>(sock, log, &m_buf.ptr, &m_buf.len);
|
||||
sendPack<LoginInfo>(sock, log, &m_buf);
|
||||
|
||||
play.id = getUniqueId();
|
||||
strcpy(play.name, log->name);
|
||||
|
||||
play.tid = log->tid;
|
||||
|
||||
sendPack<GameInfo>(sock, &m_game, &m_buf.ptr, &m_buf.len);
|
||||
std::unique_ptr<Connection> conn = std::make_unique<Connection>(sock, sockad, *log, play);
|
||||
sendPack<GameInfo>(sock, &m_game, &m_buf);
|
||||
Connection* conn = new Connection(sock, sockad, *log, play);
|
||||
|
||||
for (auto& [key, player] : m_players) {
|
||||
sendPack<PlayerInfo>(player->getSock(), &play, &m_buf); // Envoyer les infos de joueur distant aux joueurs d<>j<EFBFBD> connect<63>s
|
||||
@ -174,13 +175,16 @@ int Server::Ready() {
|
||||
}
|
||||
|
||||
void Server::Run() {
|
||||
bool endgame = false;
|
||||
Input in;
|
||||
sockaddr_in sockad;
|
||||
addrlen_t socklen = sizeof(sockad);
|
||||
|
||||
Log("Debut de la partie...", false, false);
|
||||
|
||||
m_world = std::make_unique<World>();
|
||||
int players = m_players.size();
|
||||
|
||||
m_world = new World();
|
||||
m_world->SetSeed(m_game.seed);
|
||||
m_world->GetChunks().Reset(nullptr);
|
||||
m_world->BuildWorld();
|
||||
@ -197,32 +201,41 @@ void Server::Run() {
|
||||
sendPack<Sync>(conn->getSock(), &sync, &m_buf);
|
||||
}
|
||||
|
||||
while (true) {
|
||||
if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
|
||||
Packet pck = getPack(&m_buf);
|
||||
switch (pck.type) {
|
||||
using enum netprot::PACKET_TYPE;
|
||||
case ERR: std::puts("ERROR!"); break;
|
||||
case INPUT: std::puts("INPUT!"); break;
|
||||
case OUTPUT: std::puts("OUTPUT!"); break;
|
||||
case SYNC: std::puts("SYNC!"); break;
|
||||
case TEAMINF: std::puts("TEAMINF!"); break;
|
||||
case SELFINF: std::puts("SELFINF!"); break;
|
||||
case PLAYINF: std::puts("PLAYINF!"); break;
|
||||
case LOGINF: std::puts("LOGINF!"); break;
|
||||
case CHUNKMOD: std::puts("CHUNKMOD!"); break;
|
||||
case PLAYERMOD: std::puts("PLAYERMOD!"); break;
|
||||
case PICKUPMOD: std::puts("PICKUPMOD!"); break;
|
||||
case GAMEINFO: std::puts("GAMEINFO!"); break;
|
||||
case ENDINFO: std::puts("ENDINFO!"); break;
|
||||
case CHAT: std::puts("CHAT!"); break;
|
||||
case ERRLOG: std::puts("ERRLOG!"); break;
|
||||
case LAST_PACK: [[falltrough]];
|
||||
default: std::puts("wtf?!"); break;
|
||||
}
|
||||
netprot::emptyPack(pck);
|
||||
}
|
||||
while (!endgame) {
|
||||
for (auto& [key, conn] : m_players) {
|
||||
conn->getPacks(m_sock_udp);
|
||||
conn->Run(m_world);
|
||||
conn->sendPacks(m_sock_udp, m_players);
|
||||
}
|
||||
}
|
||||
|
||||
//while (true) {
|
||||
// if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
|
||||
// Packet pck = getPack(&m_buf);
|
||||
// switch (pck.type) {
|
||||
// using enum netprot::PACKET_TYPE;
|
||||
// case ERR: std::puts("ERROR!"); break;
|
||||
// case INPUT: std::puts("INPUT!"); break;
|
||||
// case OUTPUT: std::puts("OUTPUT!"); break;
|
||||
// case SYNC: std::puts("SYNC!"); break;
|
||||
// case TEAMINF: std::puts("TEAMINF!"); break;
|
||||
// case SELFINF: std::puts("SELFINF!"); break;
|
||||
// case PLAYINF: std::puts("PLAYINF!"); break;
|
||||
// case LOGINF: std::puts("LOGINF!"); break;
|
||||
// case CHUNKMOD: std::puts("CHUNKMOD!"); break;
|
||||
// case PLAYERMOD: std::puts("PLAYERMOD!"); break;
|
||||
// case PICKUPMOD: std::puts("PICKUPMOD!"); break;
|
||||
// case GAMEINFO: std::puts("GAMEINFO!"); break;
|
||||
// case ENDINFO: std::puts("ENDINFO!"); break;
|
||||
// case CHAT: std::puts("CHAT!"); break;
|
||||
// case ERRLOG: std::puts("ERRLOG!"); break;
|
||||
// case LAST_PACK: [[falltrough]];
|
||||
// default: std::puts("wtf?!"); break;
|
||||
// }
|
||||
// netprot::emptyPack(pck);
|
||||
// }
|
||||
//}
|
||||
|
||||
}
|
||||
|
||||
inline std::string Server::LogTimestamp() {
|
||||
|
@ -5,6 +5,7 @@
|
||||
#include <vector>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include "../SQCSim-common/world.h"
|
||||
#include "../SQCSim-common/netprotocol.h"
|
||||
#include "define.h"
|
||||
@ -35,12 +36,12 @@ private:
|
||||
|
||||
Buffer m_buf;
|
||||
|
||||
std::map<uint64_t, std::unique_ptr<Connection>> m_players;
|
||||
std::map <Timestamp, Chat> m_chatlog;
|
||||
std::unordered_map<uint64_t, Connection*> m_players;
|
||||
std::unordered_map<Timestamp, Chat> m_chatlog;
|
||||
std::vector<uint64_t> m_ids;
|
||||
GameInfo m_game;
|
||||
|
||||
std::unique_ptr<World> m_world = nullptr;
|
||||
World* m_world = nullptr;
|
||||
const bool m_manual_setup = SRV_MANUAL_SETUP;
|
||||
|
||||
std::string LogTimestamp();
|
||||
|
@ -170,7 +170,7 @@
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
@ -192,7 +192,7 @@
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
|
@ -69,44 +69,51 @@ int Connector::Connect(const char* srv_addr, std::string name) {
|
||||
|
||||
netprot::sendPack(m_sock_tcp, &log, &bf);
|
||||
|
||||
//using namespace std::chrono_literals;
|
||||
//std::this_thread::sleep_for(100ms);
|
||||
|
||||
memset(bf.ptr, '\0', BUFFER_LENGTH);
|
||||
|
||||
bool ready = false;
|
||||
int errors = 0;
|
||||
std::vector<netprot::Packet> lsPck;
|
||||
std::vector<char*> lsPck;
|
||||
while (!ready) {
|
||||
lsPck = netprot::recvPacks(m_sock_tcp, &bf);
|
||||
|
||||
for (auto& pck : lsPck) {
|
||||
bool bypass_delete = false;
|
||||
uint32_t bsize = bf.len - (pck - bf.ptr);
|
||||
netprot::PlayerInfo* pl = nullptr;
|
||||
switch (pck.type) {
|
||||
switch (netprot::getType(pck, 1)) {
|
||||
using enum netprot::PACKET_TYPE;
|
||||
case LOGINF:
|
||||
m_loginfo = netprot::LoginInfo((netprot::LoginInfo*)pck.ptr);
|
||||
if (!netprot::Deserialize(&m_loginfo, pck, &bsize))
|
||||
++errors;
|
||||
break;
|
||||
case GAMEINFO:
|
||||
m_gameinfo = netprot::GameInfo((netprot::GameInfo*)pck.ptr);
|
||||
if (!netprot::Deserialize(&m_gameinfo, pck, &bsize))
|
||||
++errors;
|
||||
break;
|
||||
case PLAYINF:
|
||||
pl = (netprot::PlayerInfo*)pck.ptr;
|
||||
m_players[pl->id] = pl;
|
||||
bypass_delete = true;
|
||||
pl = new netprot::PlayerInfo();
|
||||
if (!netprot::Deserialize(pl, pck, &bsize))
|
||||
++errors;
|
||||
else m_players[pl->id] = pl;
|
||||
break;
|
||||
case TEAMINF:
|
||||
// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.
|
||||
break;
|
||||
case SYNC:
|
||||
m_origin = netprot::Sync((netprot::Sync*)pck.ptr);
|
||||
if (!netprot::Deserialize(&m_origin, pck, &bsize))
|
||||
++errors;
|
||||
ready = true;
|
||||
break;
|
||||
default:
|
||||
errors++;
|
||||
break;
|
||||
}
|
||||
if (!bypass_delete)
|
||||
netprot::emptyPack(pck);
|
||||
}
|
||||
lsPck.clear();
|
||||
if (errors > 100)
|
||||
if (errors > 1000)
|
||||
return 4;
|
||||
}
|
||||
return 0;
|
||||
|
@ -2,6 +2,7 @@
|
||||
#define CONNECTOR_H__
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <unordered_map>
|
||||
#include "../SQCSim-common/netprotocol.h"
|
||||
#include "define.h"
|
||||
|
||||
@ -26,13 +27,13 @@ public:
|
||||
|
||||
// void updateRemotePlayers(std::map<RemotePlayers> rplayers);
|
||||
|
||||
std::map<uint64_t, netprot::PlayerInfo> m_players;
|
||||
std::unordered_map<uint64_t, netprot::PlayerInfo> m_players;
|
||||
private:
|
||||
#ifdef _WIN32
|
||||
WSADATA m_wsaData;
|
||||
#endif
|
||||
std::map<Timestamp, netprot::Input> m_inputmanifest;
|
||||
std::map<uint64_t, netprot::TeamInfo> m_teams;
|
||||
std::unordered_map<Timestamp, netprot::Input> m_inputmanifest;
|
||||
std::unordered_map<uint64_t, netprot::TeamInfo> m_teams;
|
||||
|
||||
netprot::LoginInfo m_loginfo;
|
||||
netprot::GameInfo m_gameinfo;
|
||||
|
@ -28,7 +28,8 @@
|
||||
#define BASE_WIDTH 640
|
||||
#define BASE_HEIGHT 480
|
||||
|
||||
|
||||
#define ANIME_PATH_JUMP "./media/textures/AssetOtherPlayer/FinalPNGJumping/"
|
||||
#define ANIME_PATH_STILL "./media/textures/AssetOtherPlayer/FinalPNGStanding/"
|
||||
#define TEXTURE_PATH "./media/textures/"
|
||||
#define SHADER_PATH "./media/shaders/"
|
||||
#define AUDIO_PATH "./media/audio/"
|
||||
|
@ -1,5 +1,7 @@
|
||||
#include "engine.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <filesystem>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
@ -11,12 +13,13 @@ struct Notification {
|
||||
float displayStartTime = 0.0f;
|
||||
};
|
||||
|
||||
|
||||
// Use a queue to manage notifications
|
||||
//std::queue<Notification> notificationQueue;
|
||||
// Use a vector to manage notifications
|
||||
std::vector<Notification> notifications;
|
||||
|
||||
Engine::Engine() {}
|
||||
Engine::Engine() : m_remotePlayer(&m_pinfo), m_pinfo(){}
|
||||
|
||||
Engine::~Engine() {
|
||||
m_world.CleanUpWorld(m_renderCount, true);
|
||||
@ -316,7 +319,6 @@ void Engine::DrawPause()
|
||||
|
||||
void Engine::Init() {
|
||||
|
||||
|
||||
GLenum glewErr = glewInit();
|
||||
if (glewErr != GLEW_OK) {
|
||||
std::cerr << " ERREUR GLEW : " << glewGetErrorString(glewErr) << std::endl;
|
||||
@ -324,14 +326,13 @@ void Engine::Init() {
|
||||
}
|
||||
|
||||
uint64_t seed = SEED;
|
||||
char ch;
|
||||
|
||||
glDisable(GL_FRAMEBUFFER_SRGB);
|
||||
glEnable(GL_DEPTH_TEST);
|
||||
glEnable(GL_STENCIL_TEST);
|
||||
glEnable(GL_POINT_SMOOTH);
|
||||
glEnable(GL_BLEND);
|
||||
glEnable(GL_CULL_FACE);
|
||||
//glEnable(GL_CULL_FACE);
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
@ -345,10 +346,14 @@ void Engine::Init() {
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
glBlendEquation(GL_FUNC_SUBTRACT);
|
||||
|
||||
if (m_istarted)
|
||||
return;
|
||||
else m_istarted = true;
|
||||
|
||||
//
|
||||
// Objet de skybox avec sa propre texture et son propre shader!
|
||||
m_skybox.Init(0.2f);
|
||||
|
||||
//m_skybox2.Init(1.f);
|
||||
// Objet de musique!
|
||||
//m_audio.ToggleMusicState();
|
||||
|
||||
@ -358,56 +363,61 @@ void Engine::Init() {
|
||||
m_whoosh[x] = nullptr;
|
||||
}
|
||||
|
||||
std::cout << "Jouer en ligne? [o/N] ";
|
||||
std::cin >> ch;
|
||||
std::cout << std::endl;
|
||||
char* ch = new char[2];
|
||||
|
||||
if (ch == 'o' || ch == 'O') {
|
||||
char* input = new char[32];
|
||||
std::string playname, srvname;
|
||||
std::cout << "Jouer en ligne? [o/N] ";
|
||||
std::cin.getline(ch, 2);
|
||||
std::cout << std::endl;
|
||||
|
||||
while (playname.size() < 1) {
|
||||
std::cout << "Veuillez entrer un nom de joueur: ";
|
||||
std::cin.ignore();
|
||||
std::cin.getline(input, 32);
|
||||
std::cout << std::endl;
|
||||
playname = input;
|
||||
if (playname.size() < 1 || playname.size() > 32)
|
||||
std::puts("Nom invalide.");
|
||||
}
|
||||
while (srvname.size() < 1) {
|
||||
std::cout << "Veuillez entrer une adresse de serveur: ";
|
||||
std::cin.getline(input, 32);
|
||||
std::cout << std::endl;
|
||||
srvname = input;
|
||||
if (srvname.size() < 1 || srvname.size() > 32)
|
||||
std::puts("Adresse serveur invalide.");
|
||||
}
|
||||
delete[] input;
|
||||
if (*ch == 'o' || *ch == 'O') {
|
||||
char* input = new char[32];
|
||||
std::string playname, srvname;
|
||||
|
||||
if (!m_conn.Init()) {
|
||||
if (!m_conn.Connect(srvname.c_str(), playname)) {
|
||||
// setup jeu en reseau.
|
||||
std::cout << "ID recu du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
|
||||
std::cout << "Seed recu du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
|
||||
m_player = Player(m_conn.getOrigin().position);
|
||||
|
||||
for (auto& [key, player] : m_conn.m_players)
|
||||
m_players[key] = new RemotePlayer(player);
|
||||
|
||||
seed = m_conn.getSeed();
|
||||
m_networkgame = true;
|
||||
}
|
||||
else std::cout << "Erreur de connexion." << std::endl;
|
||||
}
|
||||
else std::cout << "Erreur de creation de socket." << std::endl;
|
||||
while (playname.size() < 1) {
|
||||
std::cout << "Veuillez entrer un nom de joueur: ";
|
||||
std::cin.getline(input, 32);
|
||||
std::cout << std::endl;
|
||||
playname = input;
|
||||
if (playname.size() < 1 || playname.size() > 32)
|
||||
std::puts("Nom invalide.");
|
||||
}
|
||||
while (srvname.size() < 1) {
|
||||
std::cout << "Veuillez entrer une adresse de serveur: ";
|
||||
std::cin.getline(input, 32);
|
||||
std::cout << std::endl;
|
||||
srvname = input;
|
||||
if (srvname.size() < 1 || srvname.size() > 32)
|
||||
std::puts("Adresse serveur invalide.");
|
||||
}
|
||||
delete[] input;
|
||||
|
||||
if (!m_conn.Init()) {
|
||||
if (!m_conn.Connect(srvname.c_str(), playname)) {
|
||||
// setup jeu en reseau.
|
||||
std::cout << "ID recu du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
|
||||
std::cout << "Seed recu du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
|
||||
m_player = Player(m_conn.getOrigin().position);
|
||||
|
||||
for (auto& [key, player] : m_conn.m_players)
|
||||
m_players[key] = new RemotePlayer(player);
|
||||
|
||||
seed = m_conn.getSeed();
|
||||
m_networkgame = true;
|
||||
}
|
||||
else std::cout << "Erreur de connexion." << std::endl;
|
||||
}
|
||||
else std::cout << "Erreur de creation de socket." << std::endl;
|
||||
}
|
||||
delete[] ch;
|
||||
|
||||
m_world.SetSeed(seed);
|
||||
|
||||
// Init Chunks
|
||||
m_world.GetChunks().Reset(nullptr);
|
||||
|
||||
m_startTime = std::chrono::high_resolution_clock::now();
|
||||
|
||||
m_remotePlayer.SetPosition(Vector3f(.5,CHUNK_SIZE_Y + 10., .5));
|
||||
// Gestion de souris.
|
||||
CenterMouse();
|
||||
HideCursor();
|
||||
@ -417,6 +427,7 @@ void Engine::DeInit() {}
|
||||
|
||||
void Engine::LoadResource() {
|
||||
LoadTexture(m_skybox.GetTexture(), TEXTURE_PATH "skybox.png", true);
|
||||
//LoadTexture(m_skybox2.GetTexture(), TEXTURE_PATH "skybox.png", true);
|
||||
LoadTexture(m_textureCrosshair, TEXTURE_PATH "cross.bmp", true);
|
||||
LoadTexture(m_textureFont, TEXTURE_PATH "font.bmp", true);
|
||||
LoadTexture(m_textureGun, TEXTURE_PATH "gun01.png", false);
|
||||
@ -440,6 +451,37 @@ void Engine::LoadResource() {
|
||||
TextureAtlas::TextureIndex texGrassIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "grass.png");
|
||||
TextureAtlas::TextureIndex texMetalIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "dirt.png");
|
||||
|
||||
|
||||
//AJOUTER LES TEXTURES DANS L'ORDRE DE L'ÉNUM
|
||||
|
||||
//JUMP
|
||||
//TextureAtlas::TextureIndex JumpBack = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueBackJumpRight.png");
|
||||
//TextureAtlas::TextureIndex JumpFront = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueFrontJumpRight.png");
|
||||
//TextureAtlas::TextureIndex JumpQuarterBackLeft = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueLeftBackJumpLeft.png");
|
||||
//TextureAtlas::TextureIndex JumpQuarterBackRight = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueRightBackJumpRight.png");
|
||||
//TextureAtlas::TextureIndex JumpProfiltLeft = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueProfilJumpLeft.png");
|
||||
//TextureAtlas::TextureIndex JumpProfiltRight = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueProfilJumpRight.png");
|
||||
//TextureAtlas::TextureIndex JumpQuarterFrontLeft = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueLeftFrontJumpLeft.png");
|
||||
//TextureAtlas::TextureIndex JumpQuarterFrontRight = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueRightFrontJumpRight.png");
|
||||
|
||||
//STILL
|
||||
//TextureAtlas::TextureIndex StillBack = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueBackRight.png");
|
||||
TextureAtlas::TextureIndex StillFront = m_animeAtlas.AddTexture(ANIME_PATH_STILL "BlueFrontRight.png");
|
||||
//TextureAtlas::TextureIndex StillQuarterBackLeft = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueLeftBack.png");
|
||||
//TextureAtlas::TextureIndex StillQuarterBackRight = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueRightBack.png");
|
||||
//TextureAtlas::TextureIndex StillProfiltLeft = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueProfilLeft.png");
|
||||
//TextureAtlas::TextureIndex StillProfiltRight = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueProfilRight.png");
|
||||
//TextureAtlas::TextureIndex StillQuarterFrontLeft = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueLeft.png");
|
||||
//TextureAtlas::TextureIndex StillQuarterFrontRight = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueRight.png");
|
||||
|
||||
//SHOOTINGSTILL
|
||||
//SHOOTINGJUMP
|
||||
|
||||
if (!m_animeAtlas.Generate(TEXTURE_SIZE, false)) {
|
||||
std::cout << " Unable to generate texture atlas ..." << std::endl;
|
||||
abort();
|
||||
}
|
||||
|
||||
if (!m_textureAtlas.Generate(TEXTURE_SIZE, false)) {
|
||||
std::cout << " Unable to generate texture atlas ..." << std::endl;
|
||||
abort();
|
||||
@ -455,6 +497,9 @@ void Engine::LoadResource() {
|
||||
m_textureAtlas.TextureIndexToCoord(texIceIndex, u, v, s, s);
|
||||
m_blockinfo[BTYPE_ICE] = new BlockInfo(BTYPE_ICE, "Ice", u, v, s, 1);
|
||||
|
||||
|
||||
m_animeAtlas.TextureIndexToCoord(0, u, v, s, s);
|
||||
|
||||
std::cout << " Loading and compiling shaders ..." << std::endl;
|
||||
if (!m_shader01.Load(SHADER_PATH "shader01.vert", SHADER_PATH "shader01.frag", true)) {
|
||||
std::cout << " Failed to load shader " << std::endl;
|
||||
@ -764,17 +809,17 @@ void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
|
||||
fPosY = fPosYJump;
|
||||
fPosY -= charSize;
|
||||
|
||||
ss << " Velocity : " << m_player.GetVelocity();
|
||||
ss << " Velocity : " << m_remotePlayer.GetVelocity();
|
||||
PrintText(fPosX, fPosY, ss.str());
|
||||
ss.str("");
|
||||
fPosY -= charSize;
|
||||
|
||||
ss << " Direction : " << m_player.GetDirection();
|
||||
ss << " Player Position : " << m_player.GetPosition();
|
||||
PrintText(fPosX, fPosY, ss.str());
|
||||
ss.str("");
|
||||
fPosY -= charSize;
|
||||
|
||||
ss << " Position : " << m_player.GetPosition();
|
||||
ss << " Remote Position : " << m_remotePlayer.GetPosition();//m_player.GetPosition();
|
||||
PrintText(fPosX, fPosY, ss.str());
|
||||
ss.str("");
|
||||
fPosY -= charSize;
|
||||
@ -837,6 +882,7 @@ void Engine::DisplaySingleOrMultiplayerMenu() {
|
||||
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
|
||||
|
||||
// Single Player and Multiplayer button background quads
|
||||
float buttonWidthProportion = 0.4f;
|
||||
float buttonHeightProportion = 0.075f;
|
||||
@ -926,8 +972,10 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
|
||||
int timer = GetCountdown(elapsedTime);
|
||||
for (int i = 1; i < WORLD_SIZE_X; i++)
|
||||
{
|
||||
if (timer <= COUNTDOWN - m_timerReductionChunk * i)
|
||||
if (timer <= COUNTDOWN - m_timerReductionChunk * i) {
|
||||
m_world.RemoveChunk(m_nbReductionChunk * i);
|
||||
m_renderer.RemoveChunk(m_nbReductionChunk * i);
|
||||
}
|
||||
}
|
||||
if (m_keyK) {
|
||||
SystemNotification(m_messageNotification);
|
||||
@ -1035,6 +1083,8 @@ void Engine::Render(float elapsedTime) {
|
||||
|
||||
Transformation all;
|
||||
Transformation skybox;
|
||||
Transformation remotePlayer;
|
||||
|
||||
Vector3f vstep;
|
||||
|
||||
// Transformations initiales
|
||||
@ -1052,11 +1102,11 @@ void Engine::Render(float elapsedTime) {
|
||||
if (leftright)
|
||||
vstep = Vector3f(m_player.GetPosition().x + m_player.GetDirection().z, m_player.GetPosition().y - 1.7f, m_player.GetPosition().z + m_player.GetDirection().x);
|
||||
else vstep = Vector3f(m_player.GetPosition().x - m_player.GetDirection().z, m_player.GetPosition().y - 1.7f, m_player.GetPosition().z - m_player.GetDirection().x);
|
||||
m_audio.Create3DAudioObj(step, AUDIO_PATH "step.wav", vstep, m_player.GetVelocity(), false,.8f);
|
||||
m_audio.Create3DAudioObj(step, AUDIO_PATH "step.wav", vstep, m_player.GetVelocity(), false, .8f);
|
||||
leftright = !leftright;
|
||||
break;
|
||||
case Player::Sound::FALL:
|
||||
m_audio.Create3DAudioObj(step, AUDIO_PATH "hit.wav", m_player.GetPosition(), m_player.GetVelocity(), false,1.f);
|
||||
m_audio.Create3DAudioObj(step, AUDIO_PATH "hit.wav", m_player.GetPosition(), m_player.GetVelocity(), false, 1.f);
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
@ -1070,6 +1120,8 @@ void Engine::Render(float elapsedTime) {
|
||||
m_player.ApplyTransformation(skybox, false); // Version d'ApplyTransformation qui ne tient compte que de la rotation
|
||||
// (donc l'objet ne bouge pas relativement au joueur, ce qui est pratique pour une skybox!).
|
||||
|
||||
m_player.ApplyTransformation(remotePlayer, true, false);
|
||||
|
||||
if (m_mouseWU) bloc++;
|
||||
else if (m_mouseWD) bloc--;
|
||||
if (bloc == BTYPE_LAST + 1) bloc = BTYPE_AIR + 1;
|
||||
@ -1097,40 +1149,52 @@ void Engine::Render(float elapsedTime) {
|
||||
glClearColor(0.f, 0.f, 0.f, 1.f);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (m_mouseR)
|
||||
m_world.ChangeBlockAtCursor(BTYPE_AIR, m_player.GetPosition(), m_player.GetDirection(), m_block);
|
||||
else if (m_mouseR)
|
||||
m_world.ChangeBlockAtCursor(BTYPE_AIR, m_player.GetPosition(), m_player.GetDirection(), m_block);
|
||||
|
||||
for (int x = 0; x < MAX_BULLETS; ++x) { // Array de bullets en jeu.
|
||||
if (m_bullets[x]) {
|
||||
for (int b = 0; b < BULLET_UPDATES_PER_FRAME; ++b) {
|
||||
if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME, m_players)) {
|
||||
m_bullets[x]->~Bullet();
|
||||
if (m_whoosh[x])
|
||||
m_whoosh[x]->drop();
|
||||
m_bullets[x] = nullptr;
|
||||
m_whoosh[x] = nullptr;
|
||||
break;
|
||||
}
|
||||
else if (!m_whoosh[x]) {
|
||||
m_whoosh[x] = m_audio.Create3DAudioObj(m_whoosh[x], AUDIO_PATH "noise.wav", m_bullets[x]->getPos(), m_bullets[x]->getVel(), true, (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
|
||||
}
|
||||
else {
|
||||
Vector3f pos = m_bullets[x]->getPos(), vel = m_bullets[x]->getVel();
|
||||
m_audio.Render3DAudioObj(m_whoosh[x], pos, vel, 5 - (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
|
||||
for (int x = 0; x < MAX_BULLETS; ++x) { // Array de bullets en jeu.
|
||||
if (m_bullets[x]) {
|
||||
for (int b = 0; b < BULLET_UPDATES_PER_FRAME; ++b) {
|
||||
if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME, m_players)) {
|
||||
m_bullets[x]->~Bullet();
|
||||
if (m_whoosh[x])
|
||||
m_whoosh[x]->drop();
|
||||
m_bullets[x] = nullptr;
|
||||
m_whoosh[x] = nullptr;
|
||||
break;
|
||||
}
|
||||
else if (!m_whoosh[x]) {
|
||||
m_whoosh[x] = m_audio.Create3DAudioObj(m_whoosh[x], AUDIO_PATH "noise.wav", m_bullets[x]->getPos(), m_bullets[x]->getVel(), true, (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
|
||||
}
|
||||
else {
|
||||
Vector3f pos = m_bullets[x]->getPos(), vel = m_bullets[x]->getVel();
|
||||
m_audio.Render3DAudioObj(m_whoosh[x], pos, vel, 5 - (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
|
||||
|
||||
m_remotePlayer.ApplyPhysics(Vector3f(0,0,0), &m_world, elapsedTime);
|
||||
//m_remotePlayer.ApplyTransformation(remotePlayer, false);
|
||||
m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
|
||||
m_renderer.UpdateMesh(&m_world, m_player.GetPosition(), m_blockinfo);
|
||||
|
||||
m_remotePlayer.Render(m_animeAtlas, m_shader01, all, elapsedTime);
|
||||
|
||||
|
||||
if (m_isSkybox) m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
|
||||
|
||||
//glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
|
||||
//m_remotePlayer.Render(m_textureAtlas, m_shader01, all, elapsedTime);
|
||||
|
||||
|
||||
if (m_isSkybox) m_skybox.Render(skybox);
|
||||
|
||||
|
||||
|
||||
DrawHud(elapsedTime, bloc);
|
||||
DisplayPovGun();
|
||||
ProcessNotificationQueue();
|
||||
@ -1140,7 +1204,7 @@ void Engine::Render(float elapsedTime) {
|
||||
}
|
||||
static bool fell = false;
|
||||
if (m_player.GetPosition().y < 1.7f && !fell) {
|
||||
m_audio.Create3DAudioObj(m_scream, AUDIO_PATH "scream.wav", m_player.GetPOV(), m_player.GetVelocity(), false,1.f);
|
||||
m_audio.Create3DAudioObj(m_scream, AUDIO_PATH "scream.wav", m_player.GetPOV(), m_player.GetVelocity(), false, 1.f);
|
||||
fell = true;
|
||||
}
|
||||
else if (m_player.GetPosition().y < -20.f) {
|
||||
@ -1148,15 +1212,26 @@ void Engine::Render(float elapsedTime) {
|
||||
fell = false;
|
||||
}
|
||||
|
||||
if (m_networkgame) {
|
||||
static char* buf = new char[BUFFER_LENGTH];
|
||||
uint32_t buflen = BUFFER_LENGTH;
|
||||
netprot::Input input;
|
||||
//sockaddr_in addr = m_conn.m_srvsockaddr;
|
||||
if (m_networkgame) { // Pour se gerer le paquet.
|
||||
using namespace std::chrono;
|
||||
using namespace netprot;
|
||||
Timestamp tstamp = duration_cast<milliseconds>(high_resolution_clock::now() - m_startTime).count();
|
||||
Input input;
|
||||
Sync sync;
|
||||
uint64_t id = m_conn.getId();
|
||||
static std::vector<char*> lsPck;
|
||||
|
||||
if (false) { // TODO: Faire un checkup pour chaque ~1000ms.
|
||||
sync.sid = id;
|
||||
sync.timestamp = tstamp;
|
||||
sync.position = m_player.GetPosition();
|
||||
sync.hp = m_player.GetHP();
|
||||
// TODO: Garrocher ca quelque-part.
|
||||
}
|
||||
|
||||
input.sid = id;
|
||||
input.direction = m_player.GetDirection();
|
||||
input.sid = m_conn.getId();
|
||||
input.timestamp = 12345;
|
||||
input.timestamp = tstamp;
|
||||
input.keys.forward = m_keyW;
|
||||
input.keys.backward = m_keyS;
|
||||
input.keys.left = m_keyA;
|
||||
@ -1165,10 +1240,37 @@ void Engine::Render(float elapsedTime) {
|
||||
input.keys.block = m_mouseR;
|
||||
input.keys.shoot = m_mouseL;
|
||||
|
||||
//netprot::Serialize(&input, &buf, &buflen);
|
||||
//sendto(m_conn.m_sock_udp, buf, buflen, 0, (sockaddr*)&addr, sizeof(addr));
|
||||
sendPackTo<Input>(m_conn.m_sock_udp, &input, &m_bufout, &m_conn.m_srvsockaddr);
|
||||
|
||||
netprot::sendPackTo<netprot::Input>(m_conn.m_sock_udp, &input, &buf, &buflen, &m_conn.m_srvsockaddr);
|
||||
lsPck = recvPacks(m_conn.m_sock_udp, &m_buf);
|
||||
char* prevptr = nullptr;
|
||||
for (auto& pck : lsPck) { // We could make a few threads out of this.
|
||||
Sync sync;
|
||||
Output out;
|
||||
if (!prevptr)
|
||||
prevptr = m_buf.ptr;
|
||||
uint32_t bsize = m_buf.len - (pck - prevptr);
|
||||
prevptr = pck;
|
||||
switch (getType(pck, 1)) {
|
||||
using enum PACKET_TYPE;
|
||||
case SYNC:
|
||||
if (Deserialize(&sync, pck, &bsize)) {
|
||||
if (sync.sid != m_conn.getId())
|
||||
break;
|
||||
// TODO: Vérifier si les positions concordent au sync local.
|
||||
}
|
||||
break;
|
||||
case OUTPUT:
|
||||
if (Deserialize(&out, pck, &bsize)) {
|
||||
RemotePlayer* r = (RemotePlayer*)m_players[out.id];
|
||||
r->Feed(out);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
lsPck.clear();
|
||||
}
|
||||
}
|
||||
else if (m_gamestate == GameState::MAIN_MENU || m_gamestate == GameState::OPTIONS)
|
||||
@ -1305,7 +1407,7 @@ void Engine::KeyReleaseEvent(unsigned char key) {
|
||||
case 15:
|
||||
for (int x = 0; x < MAX_BULLETS; ++x) // Ajouter une balle dans l'array (aussi connu sous le nom de "faire pow pow").
|
||||
if (!m_bullets[x]) {
|
||||
m_bullets[x] = new Bullet(m_player.GetPOV() - Vector3f(1.f, 0.f, 1.f), Vector3f(1.f,0.f,1.f));
|
||||
m_bullets[x] = new Bullet(m_player.GetPOV() - Vector3f(1.f, 0.f, 1.f), Vector3f(1.f, 0.f, 1.f));
|
||||
break;
|
||||
}
|
||||
else if (x == MAX_BULLETS - 1) { // S'il y a pas d'espace dans l'array, prendre la place de la premi<6D>re balle de l'array.
|
||||
|
@ -2,7 +2,9 @@
|
||||
#define ENGINE_H__
|
||||
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
#include <cmath>
|
||||
#include <unordered_map>
|
||||
#include "../SQCSim-common/array2d.h"
|
||||
#include "../SQCSim-common/blockinfo.h"
|
||||
#include "../SQCSim-common/bullet.h"
|
||||
@ -21,6 +23,7 @@
|
||||
#include "renderer.h"
|
||||
#include "remoteplayer.h"
|
||||
|
||||
|
||||
class Engine : public OpenglContext {
|
||||
public:
|
||||
Engine();
|
||||
@ -59,10 +62,14 @@ private:
|
||||
void DrawHud(float elapsedTime, BlockType bloc);
|
||||
void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
|
||||
|
||||
|
||||
|
||||
|
||||
Connector m_conn;
|
||||
Shader m_shader01;
|
||||
BlockInfo* m_blockinfo[BTYPE_LAST];
|
||||
TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
|
||||
TextureAtlas m_animeAtlas = TextureAtlas(TYPE_LAST + POS_LAST);
|
||||
|
||||
World m_world = World();
|
||||
Renderer m_renderer = Renderer();
|
||||
@ -88,7 +95,9 @@ private:
|
||||
|
||||
Bullet* m_bullets[MAX_BULLETS];
|
||||
|
||||
std::map<uint64_t, Player*> m_players;
|
||||
std::unordered_map<uint64_t, Player*> m_players;
|
||||
netprot::Buffer m_buf, m_bufout;
|
||||
std::chrono::high_resolution_clock::time_point m_startTime;
|
||||
|
||||
//Menu
|
||||
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE };
|
||||
@ -101,6 +110,7 @@ private:
|
||||
Texture PauseBGTexture;
|
||||
Texture SplachScreenTexture;
|
||||
|
||||
|
||||
float m_scale;
|
||||
float m_time = 0;
|
||||
float m_time_SplashScreen = 0;
|
||||
@ -122,7 +132,7 @@ private:
|
||||
bool m_flash = true;
|
||||
bool m_displayCrosshair = true;
|
||||
bool m_displayHud = true;
|
||||
bool m_displayInfo = false;
|
||||
bool m_displayInfo = true;
|
||||
bool m_resetcountdown = false;
|
||||
bool m_soloMultiChoiceMade = false;
|
||||
bool m_stopcountdown = false;
|
||||
@ -144,7 +154,8 @@ private:
|
||||
float m_mousemy = 0;
|
||||
|
||||
bool m_networkgame = false;
|
||||
|
||||
netprot::PlayerInfo m_pinfo;
|
||||
RemotePlayer m_remotePlayer = RemotePlayer(netprot::PlayerInfo(),Vector3f(5.5f, CHUNK_SIZE_Y + 1.8f, 5.5f));
|
||||
std::string m_messageNotification = "";
|
||||
};
|
||||
|
||||
|
@ -7,7 +7,7 @@ void main()
|
||||
texel = texture2D(tex,gl_TexCoord[0].st);
|
||||
|
||||
texel *= light;
|
||||
texel.a = 255.;
|
||||
|
||||
gl_FragColor = texel;
|
||||
|
||||
}
|
||||
|
Before Width: | Height: | Size: 262 KiB |
Before Width: | Height: | Size: 261 KiB After Width: | Height: | Size: 270 KiB |
Before Width: | Height: | Size: 363 KiB |
Before Width: | Height: | Size: 363 KiB After Width: | Height: | Size: 367 KiB |
Before Width: | Height: | Size: 249 KiB After Width: | Height: | Size: 255 KiB |
Before Width: | Height: | Size: 308 KiB After Width: | Height: | Size: 314 KiB |
Before Width: | Height: | Size: 249 KiB After Width: | Height: | Size: 255 KiB |
Before Width: | Height: | Size: 308 KiB After Width: | Height: | Size: 314 KiB |
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 264 KiB |
Before Width: | Height: | Size: 255 KiB After Width: | Height: | Size: 264 KiB |
Before Width: | Height: | Size: 270 KiB After Width: | Height: | Size: 277 KiB |
Before Width: | Height: | Size: 269 KiB After Width: | Height: | Size: 276 KiB |
Before Width: | Height: | Size: 310 KiB After Width: | Height: | Size: 320 KiB |
Before Width: | Height: | Size: 310 KiB After Width: | Height: | Size: 320 KiB |
Before Width: | Height: | Size: 359 KiB After Width: | Height: | Size: 363 KiB |
Before Width: | Height: | Size: 360 KiB After Width: | Height: | Size: 363 KiB |
Before Width: | Height: | Size: 367 KiB After Width: | Height: | Size: 365 KiB |
Before Width: | Height: | Size: 368 KiB After Width: | Height: | Size: 365 KiB |
Before Width: | Height: | Size: 327 KiB After Width: | Height: | Size: 337 KiB |
Before Width: | Height: | Size: 348 KiB After Width: | Height: | Size: 360 KiB |
Before Width: | Height: | Size: 382 KiB After Width: | Height: | Size: 394 KiB |
Before Width: | Height: | Size: 327 KiB After Width: | Height: | Size: 338 KiB |
Before Width: | Height: | Size: 329 KiB After Width: | Height: | Size: 339 KiB |
Before Width: | Height: | Size: 362 KiB After Width: | Height: | Size: 374 KiB |
Before Width: | Height: | Size: 641 KiB After Width: | Height: | Size: 643 KiB |
Before Width: | Height: | Size: 654 KiB After Width: | Height: | Size: 656 KiB |
Before Width: | Height: | Size: 651 KiB After Width: | Height: | Size: 653 KiB |
Before Width: | Height: | Size: 640 KiB After Width: | Height: | Size: 642 KiB |
Before Width: | Height: | Size: 654 KiB After Width: | Height: | Size: 656 KiB |
Before Width: | Height: | Size: 650 KiB After Width: | Height: | Size: 652 KiB |
Before Width: | Height: | Size: 474 KiB After Width: | Height: | Size: 485 KiB |
Before Width: | Height: | Size: 501 KiB After Width: | Height: | Size: 512 KiB |
Before Width: | Height: | Size: 563 KiB After Width: | Height: | Size: 575 KiB |
Before Width: | Height: | Size: 473 KiB After Width: | Height: | Size: 484 KiB |
Before Width: | Height: | Size: 500 KiB After Width: | Height: | Size: 512 KiB |
Before Width: | Height: | Size: 563 KiB After Width: | Height: | Size: 575 KiB |
Before Width: | Height: | Size: 698 KiB After Width: | Height: | Size: 694 KiB |
Before Width: | Height: | Size: 719 KiB After Width: | Height: | Size: 716 KiB |
Before Width: | Height: | Size: 735 KiB After Width: | Height: | Size: 732 KiB |
Before Width: | Height: | Size: 698 KiB After Width: | Height: | Size: 694 KiB |
Before Width: | Height: | Size: 719 KiB After Width: | Height: | Size: 715 KiB |
Before Width: | Height: | Size: 735 KiB After Width: | Height: | Size: 731 KiB |
Before Width: | Height: | Size: 760 KiB After Width: | Height: | Size: 598 KiB |
Before Width: | Height: | Size: 783 KiB After Width: | Height: | Size: 629 KiB |
Before Width: | Height: | Size: 804 KiB After Width: | Height: | Size: 649 KiB |
Before Width: | Height: | Size: 760 KiB After Width: | Height: | Size: 584 KiB |
Before Width: | Height: | Size: 783 KiB After Width: | Height: | Size: 644 KiB |
Before Width: | Height: | Size: 804 KiB After Width: | Height: | Size: 646 KiB |
Before Width: | Height: | Size: 276 KiB After Width: | Height: | Size: 284 KiB |
Before Width: | Height: | Size: 276 KiB After Width: | Height: | Size: 283 KiB |
Before Width: | Height: | Size: 315 KiB After Width: | Height: | Size: 326 KiB |
Before Width: | Height: | Size: 315 KiB After Width: | Height: | Size: 326 KiB |
Before Width: | Height: | Size: 338 KiB After Width: | Height: | Size: 342 KiB |
Before Width: | Height: | Size: 395 KiB After Width: | Height: | Size: 392 KiB |
Before Width: | Height: | Size: 395 KiB After Width: | Height: | Size: 391 KiB |
Before Width: | Height: | Size: 338 KiB After Width: | Height: | Size: 342 KiB |
Before Width: | Height: | Size: 258 KiB After Width: | Height: | Size: 268 KiB |
Before Width: | Height: | Size: 258 KiB After Width: | Height: | Size: 268 KiB |
Before Width: | Height: | Size: 655 KiB After Width: | Height: | Size: 657 KiB |
Before Width: | Height: | Size: 658 KiB After Width: | Height: | Size: 660 KiB |
Before Width: | Height: | Size: 679 KiB After Width: | Height: | Size: 680 KiB |
Before Width: | Height: | Size: 654 KiB After Width: | Height: | Size: 656 KiB |
Before Width: | Height: | Size: 657 KiB After Width: | Height: | Size: 659 KiB |
Before Width: | Height: | Size: 678 KiB After Width: | Height: | Size: 680 KiB |
Before Width: | Height: | Size: 473 KiB After Width: | Height: | Size: 486 KiB |
Before Width: | Height: | Size: 481 KiB After Width: | Height: | Size: 494 KiB |
Before Width: | Height: | Size: 504 KiB After Width: | Height: | Size: 517 KiB |
Before Width: | Height: | Size: 474 KiB After Width: | Height: | Size: 486 KiB |
Before Width: | Height: | Size: 481 KiB After Width: | Height: | Size: 493 KiB |
Before Width: | Height: | Size: 505 KiB After Width: | Height: | Size: 517 KiB |
Before Width: | Height: | Size: 688 KiB After Width: | Height: | Size: 680 KiB |
Before Width: | Height: | Size: 701 KiB After Width: | Height: | Size: 695 KiB |
Before Width: | Height: | Size: 715 KiB After Width: | Height: | Size: 710 KiB |
Before Width: | Height: | Size: 843 KiB After Width: | Height: | Size: 678 KiB |
Before Width: | Height: | Size: 874 KiB After Width: | Height: | Size: 701 KiB |
Before Width: | Height: | Size: 891 KiB After Width: | Height: | Size: 728 KiB |
Before Width: | Height: | Size: 842 KiB After Width: | Height: | Size: 672 KiB |
Before Width: | Height: | Size: 874 KiB After Width: | Height: | Size: 696 KiB |
Before Width: | Height: | Size: 891 KiB After Width: | Height: | Size: 732 KiB |
Before Width: | Height: | Size: 688 KiB After Width: | Height: | Size: 679 KiB |
Before Width: | Height: | Size: 701 KiB After Width: | Height: | Size: 694 KiB |
Before Width: | Height: | Size: 715 KiB After Width: | Height: | Size: 710 KiB |