Merge branch 'master' into Améloration_Gen_Monde
@ -134,6 +134,7 @@
|
||||
<ClInclude Include="array2d.h" />
|
||||
<ClInclude Include="array3d.h" />
|
||||
<ClInclude Include="blockinfo.h" />
|
||||
<ClInclude Include="boostinfo.h" />
|
||||
<ClInclude Include="bullet.h" />
|
||||
<ClInclude Include="chunk.h" />
|
||||
<ClInclude Include="define.h" />
|
||||
@ -147,6 +148,7 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="blockinfo.cpp" />
|
||||
<ClCompile Include="boostinfo.cpp" />
|
||||
<ClCompile Include="bullet.cpp" />
|
||||
<ClCompile Include="chunk.cpp" />
|
||||
<ClCompile Include="netprotocol.cpp" />
|
||||
|
@ -54,6 +54,9 @@
|
||||
<ClInclude Include="transformation.h">
|
||||
<Filter>Fichiers d%27en-tête</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="boostinfo.h">
|
||||
<Filter>Fichiers d%27en-tête</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="world.cpp">
|
||||
@ -80,5 +83,8 @@
|
||||
<ClCompile Include="transformation.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="boostinfo.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
32
SQCSim-common/boostinfo.cpp
Normal file
@ -0,0 +1,32 @@
|
||||
#include "boostinfo.h"
|
||||
#include <iostream>
|
||||
|
||||
BoostInfo::BoostInfo(BoostType type, const std::string& name, float u, float v, float s, int dur) : m_type(type), m_name(name), m_u(u), m_v(v), m_s(s), m_durability(dur)
|
||||
{
|
||||
}
|
||||
|
||||
BoostInfo::~BoostInfo()
|
||||
{
|
||||
}
|
||||
|
||||
BoostType BoostInfo::GetType() const
|
||||
{
|
||||
return m_type;
|
||||
}
|
||||
|
||||
void BoostInfo::GetTexture(float& u, float& v, float& s)
|
||||
{
|
||||
u = m_u;
|
||||
v = m_v;
|
||||
s = m_s;
|
||||
}
|
||||
|
||||
void BoostInfo::Show() const
|
||||
{
|
||||
std::cout << "Type: " << m_type << std::endl;
|
||||
std::cout << "Nom: " << m_name << std::endl;
|
||||
std::cout << "Durabilite: " << m_durability << std::endl;
|
||||
std::cout << "Coordonnees Texture: " << m_u << ", " << m_v << ", " << m_s << std::endl;
|
||||
}
|
||||
|
||||
|
29
SQCSim-common/boostinfo.h
Normal file
@ -0,0 +1,29 @@
|
||||
#ifndef BOOSTINFO_H__
|
||||
#define BOOSTINFO_H__
|
||||
|
||||
#include <string>
|
||||
#include "define.h"
|
||||
|
||||
class BoostInfo
|
||||
{
|
||||
public:
|
||||
BoostInfo(BoostType type, const std::string& name, float u, float v, float s, int dur);
|
||||
~BoostInfo();
|
||||
|
||||
BoostType GetType() const;
|
||||
|
||||
void GetTexture(float& u, float& v, float& s);
|
||||
|
||||
void Show() const;
|
||||
|
||||
private:
|
||||
BoostType m_type;
|
||||
float m_u;
|
||||
float m_v;
|
||||
float m_s;
|
||||
std::string m_name;
|
||||
int m_durability;
|
||||
|
||||
};
|
||||
|
||||
#endif // BOOSTINFO_H__
|
@ -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;
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
|
||||
Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y) {
|
||||
//std::ostringstream pos; // Vérifie l'existence d'un fichier .chunk avec sa position.
|
||||
//std::ostringstream pos; // V<EFBFBD>rifie l'existence d'un fichier .chunk avec sa position.
|
||||
//pos << CHUNK_PATH << x << '_' << y << ".chunk";
|
||||
//std::ifstream input(pos.str(), std::fstream::binary);
|
||||
|
||||
@ -77,6 +77,38 @@ Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y
|
||||
}
|
||||
#pragma endregion
|
||||
|
||||
//int rnd = rand() % 15;
|
||||
if (ratio == 1)
|
||||
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // structure
|
||||
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
|
||||
for (int iy = 0; iy < 14; ++iy) {
|
||||
if (ix == 3)
|
||||
if (GetBlock(ix, iy, iz) == BTYPE_AIR)
|
||||
Structure(ix, iy, iz, 2);
|
||||
}
|
||||
}
|
||||
if (ratio == 3)
|
||||
for (int ix = 0; ix < CHUNK_SIZE_Z; ++ix) // structure
|
||||
for (int iz = 0; iz < CHUNK_SIZE_X; ++iz) {
|
||||
for (int iy = 0; iy < 14; ++iy) {
|
||||
if (iz == 4)
|
||||
if (GetBlock(ix, iy, iz) == BTYPE_AIR)
|
||||
Structure(ix, iy, iz, 1);
|
||||
}
|
||||
}
|
||||
if (ratio == 5)
|
||||
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // structure
|
||||
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
|
||||
for (int iy = 0; iy < 14; ++iy) {
|
||||
if (ix == 3)
|
||||
if (GetBlock(ix, iy, iz) == BTYPE_AIR)
|
||||
Structure(ix, iy, iz, 2);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#pragma region Arbre
|
||||
|
||||
@ -109,7 +141,7 @@ Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y
|
||||
|
||||
int distanceThreshold = 20;
|
||||
|
||||
// Vérifie si l'emplacement n'est pas à l'intérieur des lacs
|
||||
// V<EFBFBD>rifie si l'emplacement n'est pas <20> l'int<6E>rieur des lacs
|
||||
bool isInsideLake = false;
|
||||
for (int iy = 0; iy < 13; ++iy) {
|
||||
if (GetBlock(ix, iy, iz) == BTYPE_ICE) {
|
||||
@ -146,6 +178,9 @@ Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//else {
|
||||
// input.seekg(0, std::ios_base::end);
|
||||
// int size = input.tellg();
|
||||
@ -231,7 +266,7 @@ void Chunk::RemoveBlock(int x, int y, int z, World* world) {
|
||||
|
||||
void Chunk::SetBlock(int x, int y, int z, BlockType type, World* world) {
|
||||
m_blocks.Set(x, y, z, type);
|
||||
if (world) CheckNeighbors(x, z, world); // Si nullptr, ne pas vérifier les chunks voisines.
|
||||
if (world) CheckNeighbors(x, z, world); // Si nullptr, ne pas v<EFBFBD>rifier les chunks voisines.
|
||||
m_isDirty = true;
|
||||
}
|
||||
|
||||
@ -271,3 +306,31 @@ void Chunk::MakeClean() { m_isDirty = false; }
|
||||
|
||||
void Chunk::MakeModified() { m_isModified = true; }
|
||||
|
||||
|
||||
void Chunk::Structure(int x, int y, int z,int height)
|
||||
{
|
||||
|
||||
|
||||
|
||||
for (int i = 0; i < height; i++)
|
||||
{
|
||||
SetBlock(x, i + y, z, BTYPE_GRASS, nullptr);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -28,6 +28,8 @@ class Chunk {
|
||||
void CheckNeighbors(unsigned int x, unsigned int z, World* world);
|
||||
void GetPosition(unsigned int& x, unsigned int& y) const;
|
||||
void PlaceTree(int x, int y, int z, int height);
|
||||
|
||||
void Structure(int x, int y, int z, int height);
|
||||
bool IsDirty() const;
|
||||
void MakeDirty();
|
||||
void MakeClean();
|
||||
|
@ -7,11 +7,11 @@
|
||||
#define SRV_PORT 10000
|
||||
#define CLI_PORT 10001
|
||||
|
||||
#define BUFFER_LENGTH 150
|
||||
#define BUFFER_LENGTH 1500
|
||||
|
||||
#define CHUNK_SIZE_X 4
|
||||
#define CHUNK_SIZE_X 6
|
||||
#define CHUNK_SIZE_Y 64
|
||||
#define CHUNK_SIZE_Z 4
|
||||
#define CHUNK_SIZE_Z 6
|
||||
#define MAX_SELECTION_DISTANCE 5
|
||||
#define SEED 0
|
||||
#define COUNTDOWN 300
|
||||
@ -27,25 +27,35 @@
|
||||
#define THREADS_UPDATE_CHUNKS 6
|
||||
#define THREADS_DELETE_CHUNKS 3
|
||||
|
||||
#define VIEW_DISTANCE 512 // Si les chunks arrêtent de s'afficher pendant une game et qu'il y a un access violation quand tu quitte, il faut augmenter ce chiffre.
|
||||
#define VIEW_DISTANCE 512 // Si les chunks arr<EFBFBD>tent de s'afficher pendant une game et qu'il y a un access violation quand tu quitte, il faut augmenter ce chiffre.
|
||||
#define TEXTURE_SIZE 512
|
||||
#define MAX_BULLETS 512
|
||||
|
||||
#define TIME_SPEED_BOOST 10 //secondes
|
||||
#define TIME_DAMAGE_BOOST 10 //secondes
|
||||
#define TIME_INVINCIBLE_BOOST 4 //secondes
|
||||
#define STRENGTH_SPEED_BOOST 10 //Pourcentage
|
||||
#define BULLET_TIME .1
|
||||
|
||||
typedef uint8_t BlockType;
|
||||
enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_LAST };
|
||||
enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_GREENGRASS, BTYPE_LAST };
|
||||
typedef uint8_t BoostType;
|
||||
enum BOOST_TYPE { BTYPE_SPEED, BTYPE_HEAL, BTYPE_DAMAGE, BTYPE_INVINCIBLE, BTYPE_BOOST_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
|
||||
|
||||
#pragma comment(lib,"wsock32.lib") // Pour pouvoir faire fonctionner le linker sans le vcxproject
|
||||
#pragma comment(lib,"ws2_32.lib")
|
||||
|
||||
#include <ws2tcpip.h>
|
||||
#include <Windows.h>
|
||||
#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) {
|
||||
@ -104,7 +154,7 @@ void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
|
||||
(uint8_t)(time & 0xFF) };
|
||||
|
||||
memcpy(*buf + 1, stamp8, sizeof(uint64_t));
|
||||
|
||||
|
||||
uint64_t sid = sync->sid;
|
||||
uint8_t sid8[sizeof(uint64_t)] = { (uint8_t)((sid >> 56) & 0xFF),
|
||||
(uint8_t)((sid >> 48) & 0xFF),
|
||||
@ -118,11 +168,11 @@ 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) };
|
||||
|
||||
|
||||
memcpy(*buf + sizeof(uint64_t) * 2 + 1, time8, sizeof(uint32_t));
|
||||
|
||||
uint16_t ammo = sync->ammo;
|
||||
@ -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));
|
||||
@ -182,18 +232,18 @@ void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) {
|
||||
*buf[0] = (char)netprot::PACKET_TYPE::LOGINF;
|
||||
|
||||
size_t namesize = std::strlen(linfo->name) + 1;
|
||||
|
||||
|
||||
memcpy(*buf + 1, &linfo->name, namesize);
|
||||
uint64_t sid = linfo->sid;
|
||||
uint8_t sid8[sizeof(uint64_t)] = {
|
||||
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 + 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,10 +389,10 @@ 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));
|
||||
|
||||
size_t messize = std::strlen(chat->mess) + 1;
|
||||
@ -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,18 +830,22 @@ 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 ||
|
||||
if (buflen < 1 ||
|
||||
buf[0] >= (char)netprot::PACKET_TYPE::LAST_PACK ||
|
||||
buf[0] <= (char)netprot::PACKET_TYPE::ERR)
|
||||
return netprot::PACKET_TYPE::ERR;
|
||||
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)) {
|
||||
@ -769,8 +911,8 @@ netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
|
||||
return pck;
|
||||
}
|
||||
|
||||
netprot::Packet netprot::getPack(netprot::Buffer* buf) {
|
||||
return netprot::getPack(buf->ptr, buf->len);
|
||||
netprot::Packet netprot::getPack(netprot::Buffer* buf) {
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
cursor = &buf->ptr[end];
|
||||
|
||||
lsPck.push_back(getPack(buf));
|
||||
|
||||
while (*cursor == '\0') {
|
||||
cursor++;
|
||||
end++;
|
||||
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;
|
||||
|
||||
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;
|
||||
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,
|
||||
@ -17,9 +15,11 @@ namespace netprot {
|
||||
GAMEINFO, ENDINFO , CHAT, ERRLOG,
|
||||
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,24 +149,26 @@ 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);
|
||||
@ -160,23 +176,29 @@ namespace netprot {
|
||||
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
|
||||
|
@ -61,6 +61,11 @@ Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jum
|
||||
delta.y += jump? .32f: shoot? .1f : 0.f;
|
||||
m_airborne = true;
|
||||
}
|
||||
if (boostspeed)
|
||||
{
|
||||
delta.x += STRENGTH_SPEED_BOOST / 100 * delta.x;
|
||||
delta.z += STRENGTH_SPEED_BOOST / 100 * delta.z;
|
||||
}
|
||||
|
||||
if (shoot) // Recoil!
|
||||
TurnTopBottom(-1);
|
||||
@ -182,16 +187,65 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
|
||||
else isStep = false;
|
||||
m_POV = m_position.y;
|
||||
m_POV += m_airborne ? 0 : (sin(bobbingtime) - 0.5f) * (abs(m_velocity.x) + abs(m_velocity.z)) * .2f;
|
||||
|
||||
RemoveBooster(elapsedTime);
|
||||
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::GetBooster(Booster boosttype)
|
||||
{
|
||||
if (boosttype == SPEED)
|
||||
{
|
||||
boostspeed = true;
|
||||
timeboostspeed = 0;
|
||||
}
|
||||
if (boosttype == HEAL)
|
||||
{
|
||||
m_hp = 100;
|
||||
}
|
||||
if (boosttype == DAMAGE)
|
||||
{
|
||||
boostdamage = true;
|
||||
timeboostdamage = 0;
|
||||
}
|
||||
if (boosttype == INVINCIBLE)
|
||||
{
|
||||
boostinvincible = true;
|
||||
boostinvincible = 0;
|
||||
}
|
||||
}
|
||||
void Player::RemoveBooster(float elapsedtime)
|
||||
{
|
||||
if (boostspeed)
|
||||
{
|
||||
timeboostspeed += elapsedtime;
|
||||
if (timeboostspeed >= TIME_SPEED_BOOST)
|
||||
boostspeed = false;
|
||||
}
|
||||
if (boostdamage)
|
||||
{
|
||||
timeboostdamage += elapsedtime;
|
||||
if (timeboostdamage >= TIME_DAMAGE_BOOST)
|
||||
boostdamage = false;
|
||||
}
|
||||
if (boostinvincible)
|
||||
{
|
||||
timeboostinvincible += elapsedtime;
|
||||
if (timeboostinvincible >= TIME_INVINCIBLE_BOOST)
|
||||
boostinvincible = false;
|
||||
}
|
||||
}
|
||||
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,11 +5,13 @@
|
||||
#include "transformation.h"
|
||||
#include "vector3.h"
|
||||
|
||||
|
||||
class World;
|
||||
|
||||
class Player {
|
||||
public:
|
||||
enum Sound { NOSOUND, STEP, FALL };
|
||||
enum Booster { SPEED, HEAL, DAMAGE, INVINCIBLE };
|
||||
|
||||
Player(const Vector3f& position, float rotX = 0, float rotY = 0);
|
||||
~Player();
|
||||
@ -18,8 +20,11 @@ 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 GetBooster(Booster boosttype);
|
||||
void RemoveBooster(float elapsedtime);
|
||||
void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;
|
||||
|
||||
void SetDirection(Vector3f dir);
|
||||
Vector3f GetPosition() const;
|
||||
Vector3f GetDirection() const;
|
||||
Vector3f GetVelocity() const;
|
||||
@ -45,13 +50,20 @@ protected:
|
||||
float m_rotX = 0;
|
||||
float m_rotY = 0;
|
||||
float m_POV;
|
||||
float timeboostspeed;
|
||||
float timeboostdamage;
|
||||
float timeboostinvincible;
|
||||
|
||||
float m_hp;
|
||||
|
||||
bool m_airborne;
|
||||
bool boostspeed;
|
||||
bool boostdamage;
|
||||
bool boostinvincible;
|
||||
|
||||
|
||||
|
||||
Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
|
||||
|
||||
};
|
||||
#endif //_PLAYER_H__
|
||||
|
||||
|
@ -16,6 +16,9 @@ void World::SetSeed(uint64_t seed) {
|
||||
m_seed = seed;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Chunk* World::ChunkAt(float x, float y, float z) const {
|
||||
int cx = (int)x / CHUNK_SIZE_X;
|
||||
int cz = (int)z / CHUNK_SIZE_Z;
|
||||
@ -31,6 +34,32 @@ Chunk* World::ChunkAt(float x, float y, float z) const {
|
||||
|
||||
Chunk* World::ChunkAt(const Vector3f& pos) const { return ChunkAt(pos.x, pos.y, pos.z); }
|
||||
|
||||
void World::RemoveChunk(int nbReduit)
|
||||
{
|
||||
for (int x = 0; x < WORLD_SIZE_X; ++x)
|
||||
for (int y = 0; y < WORLD_SIZE_Y; ++y)
|
||||
{
|
||||
Chunk* chk = nullptr;
|
||||
if (x < nbReduit)
|
||||
chk = m_chunks.Remove(x, y);
|
||||
if (y < nbReduit)
|
||||
chk = m_chunks.Remove(x, y);
|
||||
if (y > WORLD_SIZE_Y - nbReduit)
|
||||
chk = m_chunks.Remove(x, y);
|
||||
if (x > WORLD_SIZE_X - nbReduit)
|
||||
chk = m_chunks.Remove(x, y);
|
||||
|
||||
// TODO: MakeDirty() les voisins pour qu'ils se redessinent.
|
||||
|
||||
if (!chk)
|
||||
continue;
|
||||
|
||||
m_tbDeleted.emplace_back(chk);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
BlockType World::BlockAt(float x, float y, float z, BlockType defaultBlockType) const {
|
||||
Chunk* c = ChunkAt(x, y, z);
|
||||
|
||||
@ -226,7 +255,7 @@ void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]
|
||||
int threads = 0;
|
||||
std::future<Chunk*> genThList[THREADS_GENERATE_CHUNKS];
|
||||
//std::future<void> delThList[THREADS_DELETE_CHUNKS];
|
||||
|
||||
|
||||
if (frameGenerate > 0) --frameGenerate;
|
||||
if (frameUpdate > 0) --frameUpdate;
|
||||
if (frameDelete > 0) --frameDelete;
|
||||
|
@ -28,6 +28,8 @@ public:
|
||||
Chunk* ChunkAt(float x, float y, float z) const;
|
||||
Chunk* ChunkAt(const Vector3f& pos) const;
|
||||
|
||||
void RemoveChunk(int nbReduit);
|
||||
|
||||
BlockType BlockAt(float x, float y, float z, BlockType defaultBlockType = BTYPE_AIR) const;
|
||||
BlockType BlockAt(const Vector3f& pos, BlockType defaultBlockType = BTYPE_AIR) const;
|
||||
|
||||
|
@ -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,17 +175,20 @@ 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();
|
||||
|
||||
|
||||
for (auto& [key, conn] : m_players) { // Creation des instances de joueurs et premier sync.
|
||||
conn->player = std::make_unique<Player>(Vector3f(8.5f, CHUNK_SIZE_Y + 1.8f, 8.5f));
|
||||
Sync sync;
|
||||
@ -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();
|
||||
|
@ -20,12 +20,14 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="audio.h" />
|
||||
<ClInclude Include="booster.h" />
|
||||
<ClInclude Include="connector.h" />
|
||||
<ClInclude Include="define.h" />
|
||||
<ClInclude Include="engine.h" />
|
||||
<ClInclude Include="mesh.h" />
|
||||
<ClInclude Include="openglcontext.h" />
|
||||
<ClInclude Include="remoteplayer.h" />
|
||||
<ClInclude Include="settings.h" />
|
||||
<ClInclude Include="shader.h" />
|
||||
<ClInclude Include="skybox.h" />
|
||||
<ClInclude Include="texture.h" />
|
||||
@ -36,12 +38,14 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="audio.cpp" />
|
||||
<ClCompile Include="booster.cpp" />
|
||||
<ClCompile Include="connector.cpp" />
|
||||
<ClCompile Include="engine.cpp" />
|
||||
<ClCompile Include="main.cpp" />
|
||||
<ClCompile Include="mesh.cpp" />
|
||||
<ClCompile Include="openglcontext.cpp" />
|
||||
<ClCompile Include="remoteplayer.cpp" />
|
||||
<ClCompile Include="settings.cpp" />
|
||||
<ClCompile Include="shader.cpp" />
|
||||
<ClCompile Include="skybox.cpp" />
|
||||
<ClCompile Include="texture.cpp" />
|
||||
@ -170,7 +174,7 @@
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
@ -192,7 +196,7 @@
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
|
@ -53,6 +53,12 @@
|
||||
<ClInclude Include="remoteplayer.h">
|
||||
<Filter>Fichiers d%27en-tête</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="booster.h">
|
||||
<Filter>Fichiers d%27en-tête</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="settings.h">
|
||||
<Filter>Fichiers d%27en-tête</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="engine.cpp">
|
||||
@ -97,5 +103,11 @@
|
||||
<ClCompile Include="remoteplayer.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="booster.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="settings.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
@ -48,3 +48,7 @@ void Audio::Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& v
|
||||
void Audio::ToggleMusicState() { m_music->setIsPaused(!m_music->getIsPaused()); }
|
||||
|
||||
void Audio::PauseEngine() { m_engine->setAllSoundsPaused(); }
|
||||
|
||||
float Audio::GetMusicVolume() const {
|
||||
return m_music->getVolume();
|
||||
}
|
||||
|
@ -33,6 +33,8 @@ public:
|
||||
void ToggleMusicState();
|
||||
|
||||
void PauseEngine();
|
||||
|
||||
float GetMusicVolume() const;
|
||||
};
|
||||
|
||||
#endif // AUDIO_H__
|
||||
|
46
SQCSim2021/booster.cpp
Normal file
@ -0,0 +1,46 @@
|
||||
#include "booster.h";
|
||||
|
||||
void Booster::RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas, Shader& shader, Transformation tran)
|
||||
{
|
||||
//
|
||||
//Vector3f playerToQuad = m_player.GetPosition() - m_position;
|
||||
//playerToQuad.Normalize();
|
||||
//Vector3f targetPosition = m_player.GetPosition() + playerToQuad * 10.0f;
|
||||
//Matrix4f rotationMatrix;
|
||||
//rotationMatrix.SetLookAt(m_position, targetPosition, Vector3f(0, 1, 0));
|
||||
//glMultMatrixf(rotationMatrix.GetInternalValues());
|
||||
float x = pos.x;
|
||||
float y = pos.y;
|
||||
float z = pos.z;
|
||||
float width = 1.0f;
|
||||
float height = 1.0f;
|
||||
//Pt override les collisions.. a ce point la je sais pas quoi faire
|
||||
|
||||
//Matrix4 mat4 = tran.GetMatrix();
|
||||
//mat4 VP = pMatrix * vMatrix;
|
||||
//Vector3f CameraRight = Vector3f(mat4.Get11(), mat4.Get21(), mat4.Get31());
|
||||
//Vector3f CameraUp = Vector3f(mat4.Get12(), mat4.Get22(), mat4.Get32());
|
||||
|
||||
//Vector3f v1 = (m_position + CameraRight * 0.5 * width + CameraUp * -0.5 * width);
|
||||
//Vector3f v2 = (m_position + CameraRight * 0.5 * width + CameraUp * 0.5 * width);
|
||||
//Vector3f v4 = (m_position + CameraRight * -0.5 * width + CameraUp * -0.5 * width);
|
||||
//Vector3f v3 = (m_position + CameraRight * -0.5 * width + CameraUp * 0.5 * width);
|
||||
|
||||
//tran.ApplyTranslation(m_position);
|
||||
float u, v, w, h;
|
||||
//glDisable(GL_DEPTH_TEST);
|
||||
shader.Use();
|
||||
textureAtlas.Bind();
|
||||
textureAtlas.TextureIndexToCoord(8, u, v, w, h);
|
||||
//glLoadIdentity();
|
||||
glLoadMatrixf(tran.GetMatrix().GetInternalValues());
|
||||
glBegin(GL_QUADS);
|
||||
glTexCoord2f(u, v); glVertex3f(x - width / 2., y - height, z); //glVertex3f(v4.x, v4.y, v4.z);//glVertex3f(0, 50, 0);
|
||||
glTexCoord2f(u + w, v); glVertex3f(x + width / 2., y - height, z); //glVertex3f(v3.x, v3.y, v3.z); //glVertex3f(50,50, 0);
|
||||
glTexCoord2f(u + w, v + h); glVertex3f(x + width / 2., y, z); //glVertex3f(v2.x, v2.y, v2.z); //glVertex3f(50, 0, 0);
|
||||
glTexCoord2f(u, v + h); glVertex3f(x - width / 2., y, z); //glVertex3f(v1.x, v1.y, v1.z);// glVertex3f(0, 0, 0);
|
||||
glEnd();
|
||||
shader.Disable();
|
||||
//tran.ApplyTranslation(-m_position);
|
||||
//glEnable(GL_DEPTH_TEST);
|
||||
}
|
14
SQCSim2021/booster.h
Normal file
@ -0,0 +1,14 @@
|
||||
#ifndef BOOSTER_H__
|
||||
#define BOOSTER_H__
|
||||
#include "define.h"
|
||||
#include "textureatlas.h"
|
||||
#include "shader.h"
|
||||
#include "../SQCSim-common/vector3.h"
|
||||
#include "../SQCSim-common/transformation.h"
|
||||
|
||||
|
||||
class Booster {
|
||||
public:
|
||||
void RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas, Shader& shader, Transformation tran);
|
||||
};
|
||||
#endif
|
@ -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,11 +28,28 @@
|
||||
#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/"
|
||||
#define CHUNK_PATH "./media/chunks/"
|
||||
#define MENU_ITEM_PATH "./media/menu_items/"
|
||||
#define BOOSTER_TEXTURE_PATH "./media/textures/Booster/"
|
||||
|
||||
enum GameState {
|
||||
MAIN_MENU,
|
||||
SPLASH,
|
||||
OPTIONS,
|
||||
QUIT,
|
||||
PLAY,
|
||||
PAUSE
|
||||
};
|
||||
|
||||
enum Resolution {
|
||||
HD = 0, // 1280x720 (High Definition)
|
||||
FHD, // 1920x1080 (Full HD)
|
||||
QHD, // 2560x1440 (Quad HD)
|
||||
UHD // 3840x2160 (Ultra HD)
|
||||
};
|
||||
|
||||
#endif // DEFINE_H__
|
||||
|
@ -2,9 +2,12 @@
|
||||
#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/boostinfo.h"
|
||||
#include "../SQCSim-common/bullet.h"
|
||||
#include "../SQCSim-common/chunk.h"
|
||||
#include "../SQCSim-common/world.h"
|
||||
@ -20,13 +23,13 @@
|
||||
#include "connector.h"
|
||||
#include "renderer.h"
|
||||
#include "remoteplayer.h"
|
||||
#include "booster.h"
|
||||
#include "settings.h"
|
||||
|
||||
class Engine : public OpenglContext {
|
||||
public:
|
||||
Engine();
|
||||
virtual ~Engine();
|
||||
virtual void DrawMenu();
|
||||
virtual void DrawSplachScreen();
|
||||
virtual void Init();
|
||||
virtual void DeInit();
|
||||
virtual void LoadResource();
|
||||
@ -41,74 +44,141 @@ public:
|
||||
private:
|
||||
int GetFps(float elapsedTime) const;
|
||||
int GetCountdown(float elapsedTime);
|
||||
int GetOptionsChoice();
|
||||
|
||||
bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
|
||||
|
||||
void InstantDamage();
|
||||
void SystemNotification(std::string systemLog);
|
||||
void KillNotification(Player killer, Player killed);
|
||||
|
||||
void DisplayNotification(std::string message);
|
||||
void ProcessNotificationQueue();
|
||||
void DisplayCrosshair();
|
||||
void DisplayPovGun();
|
||||
void DisplayCurrentItem();
|
||||
void DisplayHud(int timer);
|
||||
void DisplayInfo(float elapsedTime, BlockType bloc);
|
||||
void DisplaySingleOrMultiplayerMenu();
|
||||
void DrawHud(float elapsedTime, BlockType bloc);
|
||||
void DisplayInfo(float elapsedTime, BlockType bloc);
|
||||
|
||||
void DisplaySplashScreen();
|
||||
void DisplayPauseMenu();
|
||||
|
||||
void DisplayMainMenu();
|
||||
void DrawButtonBackgrounds(float centerX, float centerY, int iterations);
|
||||
void DrawMainMenuButtons(float centerX, float centerY);
|
||||
void DrawSingleMultiButtons(float centerX, float centerY);
|
||||
|
||||
void DisplayOptionsMenu();
|
||||
void DisplayAudioMenu(float centerX, float centerY);
|
||||
void DisplayGraphicsMenu(float centerX, float centerY);
|
||||
void DisplayGameplayMenu(float centerX, float centerY);
|
||||
void DrawSliderBackground(float centerX, float centerY, float minVal, float maxVal, float bottomSideValue, float topSideValue);
|
||||
void DisplayBarPercentValue(float centerX, float centerY, float posX, float posY, float minVal, float maxVal, float value);
|
||||
void DrawSlider(float centerX, float centerY, float value, float minVal, float maxVal, float bottomSideValue, float topSideValue);
|
||||
|
||||
|
||||
void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
|
||||
void ProcessNotificationQueue();
|
||||
|
||||
Connector m_conn;
|
||||
Shader m_shader01;
|
||||
BlockInfo* m_blockinfo[BTYPE_LAST];
|
||||
TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
|
||||
|
||||
Audio m_audio = Audio(AUDIO_PATH "start.wav");
|
||||
irrklang::ISound* m_powpow, * m_scream;
|
||||
irrklang::ISound* m_whoosh[MAX_BULLETS];
|
||||
|
||||
Bullet* m_bullets[MAX_BULLETS];
|
||||
|
||||
std::chrono::high_resolution_clock::time_point m_startTime;
|
||||
std::unordered_map<uint64_t, Player*> m_players;
|
||||
netprot::Buffer m_buf, m_bufout;
|
||||
|
||||
netprot::PlayerInfo m_pinfo;
|
||||
RemotePlayer m_remotePlayer = RemotePlayer(netprot::PlayerInfo(), Vector3f(5.5f, CHUNK_SIZE_Y + 1.8f, 5.5f));
|
||||
std::string m_messageNotification = "";
|
||||
|
||||
World m_world = World();
|
||||
Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
|
||||
|
||||
Renderer m_renderer = Renderer();
|
||||
|
||||
Booster m_booster = Booster();
|
||||
BlockInfo* m_blockinfo[BTYPE_LAST];
|
||||
BoostInfo* m_boostinfo[BTYPE_BOOST_LAST];
|
||||
|
||||
GameState m_gamestate = GameState::SPLASH;
|
||||
|
||||
Shader m_shader01;
|
||||
|
||||
Skybox m_skybox;
|
||||
|
||||
TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
|
||||
TextureAtlas m_animeAtlas = TextureAtlas(TYPE_LAST + POS_LAST);
|
||||
|
||||
TextureAtlas::TextureIndex texBoostHeal;
|
||||
|
||||
Texture m_textureCrosshair;
|
||||
Texture m_textureFont;
|
||||
Texture m_textureGun;
|
||||
Texture m_texturePovGun;
|
||||
Texture m_textureSkybox;
|
||||
Texture m_textureSoloMultiMenu;
|
||||
Texture m_textureSoloText;
|
||||
Texture m_textureMultiText;
|
||||
Texture m_textureTitle;
|
||||
|
||||
Skybox m_skybox;
|
||||
Audio m_audio = Audio(AUDIO_PATH "start.wav");
|
||||
Texture m_textureMainMenu;
|
||||
Texture m_textureOptionsMenu;
|
||||
Texture m_texturePauseMenu;
|
||||
Texture m_textureSplashScreen;
|
||||
|
||||
irrklang::ISound* m_powpow,
|
||||
* m_scream;
|
||||
irrklang::ISound *m_whoosh[MAX_BULLETS];
|
||||
Texture m_textureHd;
|
||||
Texture m_textureFhd;
|
||||
Texture m_textureQhd;
|
||||
Texture m_textureUhd;
|
||||
Texture m_textureCheck;
|
||||
Texture m_textureChecked;
|
||||
|
||||
Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
|
||||
|
||||
Bullet* m_bullets[MAX_BULLETS];
|
||||
Texture m_textureOptAudio;
|
||||
Texture m_textureOptBack;
|
||||
Texture m_textureOptGameplay;
|
||||
Texture m_textureOptGraphics;
|
||||
Texture m_textureOptMain;
|
||||
Texture m_textureOptMusic;
|
||||
Texture m_textureOptOptions;
|
||||
Texture m_textureOptResolution;
|
||||
Texture m_textureOptSensitivity;
|
||||
Texture m_textureOptSfx;
|
||||
|
||||
std::map<uint64_t, Player*> m_players;
|
||||
Texture m_textureMenuBack;
|
||||
Texture m_textureMenuMulti;
|
||||
Texture m_textureMenuOptions;
|
||||
Texture m_textureMenuPlay;
|
||||
Texture m_textureMenuQuit;
|
||||
Texture m_textureMenuSingle;
|
||||
Texture m_textureMenuTitle;
|
||||
|
||||
//Menu
|
||||
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
|
||||
GameState m_gamestate = GameState::MAIN_MENU;
|
||||
Texture MenuTitleTexture;
|
||||
Texture MenuBGTexture;
|
||||
Texture MenuStartTexture;
|
||||
Texture MenuQuitTexture;
|
||||
Texture MenuOptionsTexture;
|
||||
Texture SplachScreenTexture;
|
||||
Settings m_options = Settings(m_audio);
|
||||
|
||||
Resolution m_resolution = HD;
|
||||
|
||||
float m_splashTime = 2.0f;
|
||||
float m_scale;
|
||||
float m_time = 0;
|
||||
float m_time_SplashScreen = 0;
|
||||
float m_titleX = 0;
|
||||
float m_titleY = 0;
|
||||
float m_Width = 0;
|
||||
float m_Height = 0;
|
||||
|
||||
int m_renderCount = 0;
|
||||
int m_countdown = COUNTDOWN;
|
||||
int m_nbReductionChunk = 4;
|
||||
int m_timerReductionChunk = 30;
|
||||
|
||||
float m_volPrincipal = 0.0f;
|
||||
float m_volMusique = 0.0f;
|
||||
float m_volEffets = 0.0f;
|
||||
float m_volSensible = 0.0f;
|
||||
|
||||
int m_selectedOption = 0;
|
||||
|
||||
bool m_selectedOptAudioMainBar = false;
|
||||
bool m_selectedOptAudioMusicBar = false;
|
||||
bool m_selectedOptAudioSfxBar = false;
|
||||
bool m_selectedGameplaySensitivityBar = false;
|
||||
|
||||
bool m_damage = false;
|
||||
|
||||
@ -118,11 +188,17 @@ 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;
|
||||
|
||||
bool m_selectedPlayOptions = false;
|
||||
bool m_selectedOptions = false;
|
||||
bool m_selectedQuit = false;
|
||||
|
||||
bool m_key1 = false;
|
||||
bool m_key2 = false;
|
||||
bool m_keyK = false;
|
||||
bool m_keyL = false;
|
||||
bool m_keyW = false;
|
||||
@ -130,18 +206,17 @@ private:
|
||||
bool m_keyS = false;
|
||||
bool m_keyD = false;
|
||||
bool m_keySpace = false;
|
||||
|
||||
bool m_mouseL = false;
|
||||
bool m_mouseR = false;
|
||||
bool m_mouseC = false;
|
||||
bool m_mouseWU = false;
|
||||
bool m_mouseWD = false;
|
||||
//Pour trouver ou est la souris
|
||||
|
||||
float m_mousemx = 0;
|
||||
float m_mousemy = 0;
|
||||
|
||||
bool m_networkgame = false;
|
||||
|
||||
std::string m_messageNotification = "";
|
||||
};
|
||||
|
||||
#endif // ENGINE_H__
|
||||
|
@ -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 |