SQC-15_online #1

Merged
memartel_loc merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
181 changed files with 5303 additions and 1385 deletions

2
.gitignore vendored
View File

@ -378,3 +378,5 @@ FodyWeavers.xsd
/SQCSim2021/cmake/* /SQCSim2021/cmake/*
!/SQCSim2021/cmake/CMakeLists.txt !/SQCSim2021/cmake/CMakeLists.txt
/SQCSim2021/SQCSim-client /SQCSim2021/SQCSim-client
SQCSim2021/SQCSim2021.vcxproj.filters
SQCSim2021/SQCSim2021.vcxproj

View File

@ -48,7 +48,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>ClangCL</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
@ -76,6 +76,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -90,6 +91,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -104,6 +106,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -118,7 +121,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -131,6 +134,7 @@
<ClInclude Include="array2d.h" /> <ClInclude Include="array2d.h" />
<ClInclude Include="array3d.h" /> <ClInclude Include="array3d.h" />
<ClInclude Include="blockinfo.h" /> <ClInclude Include="blockinfo.h" />
<ClInclude Include="boostinfo.h" />
<ClInclude Include="bullet.h" /> <ClInclude Include="bullet.h" />
<ClInclude Include="chunk.h" /> <ClInclude Include="chunk.h" />
<ClInclude Include="define.h" /> <ClInclude Include="define.h" />
@ -144,6 +148,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="blockinfo.cpp" /> <ClCompile Include="blockinfo.cpp" />
<ClCompile Include="boostinfo.cpp" />
<ClCompile Include="bullet.cpp" /> <ClCompile Include="bullet.cpp" />
<ClCompile Include="chunk.cpp" /> <ClCompile Include="chunk.cpp" />
<ClCompile Include="netprotocol.cpp" /> <ClCompile Include="netprotocol.cpp" />

View File

@ -54,6 +54,9 @@
<ClInclude Include="transformation.h"> <ClInclude Include="transformation.h">
<Filter>Fichiers d%27en-tête</Filter> <Filter>Fichiers d%27en-tête</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="boostinfo.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="world.cpp"> <ClCompile Include="world.cpp">
@ -80,5 +83,8 @@
<ClCompile Include="transformation.cpp"> <ClCompile Include="transformation.cpp">
<Filter>Fichiers sources</Filter> <Filter>Fichiers sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="boostinfo.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

View 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
View 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__

View File

@ -3,24 +3,53 @@
Bullet::Bullet(Vector3f pos, Vector3f dir) : m_startpos(pos), m_currentpos(pos), m_velocity(dir) {} Bullet::Bullet(Vector3f pos, Vector3f dir) : m_startpos(pos), m_currentpos(pos), m_velocity(dir) {}
Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_tid(tid) {} Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t shooter_id): m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_shooter_id(shooter_id) {}
Bullet::~Bullet() {} Bullet::~Bullet() {}
bool Bullet::Update(World* world, float elapsedtime, int perframe) { bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> mapPlayer, netprot::ChunkMod** chunkmod) {
int max = 100 / perframe; int max = 100 / perframe;
float damage = 0.057f;
for (int x = 0; x < max; ++x) { for (int x = 0; x < max; ++x) {
m_currentpos += m_velocity * elapsedtime; m_currentpos += m_velocity * elapsedtime;
for (auto& [key, player] : mapPlayer) {
bool hit = false;
if ((m_currentpos - player->GetPosition()).Length() < .6f) {
hit = true;
}
if ((m_currentpos - player->GetPOV()).Length() < .2f) {
damage *= 2; // HEADSHOT!
hit = true;
}
if (hit && !player->AmIDead()) {
player->InflictDamage(damage);
player->m_hit = true;
if (player->AmIDead())
player->Killer = m_shooter_id;
return true;
}
}
if (!world->ChunkAt(m_currentpos)) if (!world->ChunkAt(m_currentpos))
return true; return true;
else if (world->BlockAt(m_currentpos) != BTYPE_AIR) { else if (world->BlockAt(m_currentpos) != BTYPE_AIR) {
if (chunkmod) {
using namespace netprot;
*chunkmod = new ChunkMod();
(*chunkmod)->old_b_type = world->BlockAt(m_currentpos);
(*chunkmod)->b_type = BTYPE_AIR;
(*chunkmod)->pos = m_currentpos;
}
world->ChangeBlockAtPosition(BTYPE_AIR, m_currentpos); world->ChangeBlockAtPosition(BTYPE_AIR, m_currentpos);
return true; return true;
} }
else if ((m_currentpos - m_startpos).Length() > VIEW_DISTANCE) return true; else if ((m_currentpos - m_startpos).Length() > VIEW_DISTANCE) return true;
} }
return false; return false;
} }
@ -39,6 +68,6 @@ Vector3f Bullet::getVel() const {
return m_velocity; return m_velocity;
} }
uint64_t Bullet::getTeamID(){ //uint64_t Bullet::getTeamID(){
return m_tid; // return m_tid;
} //}

View File

@ -1,10 +1,14 @@
#ifndef BULLET_H__ #ifndef BULLET_H__
#define BULLET_H__ #define BULLET_H__
#include <unordered_map>
#include "define.h" #include "define.h"
#include "vector3.h" #include "vector3.h"
#include "player.h"
#include "netprotocol.h"
class World; class World;
class Player;
class Bullet { class Bullet {
public: public:
@ -12,17 +16,19 @@ public:
Bullet(Vector3f pos, Vector3f dir, uint64_t tid); Bullet(Vector3f pos, Vector3f dir, uint64_t tid);
~Bullet(); ~Bullet();
bool Update(World* world, float elapsedtime, int perframe); bool Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> m_mapPlayer, netprot::ChunkMod** chunkmod);
void Transpose(int& x, int& z); void Transpose(int& x, int& z);
Vector3f getPos() const; Vector3f getPos() const;
Vector3f getVel() const; Vector3f getVel() const;
uint64_t getTeamID(); //uint64_t getTeamID();
private: private:
Vector3f m_startpos, Vector3f m_startpos,
m_currentpos, m_currentpos,
m_velocity; m_velocity;
uint64_t m_tid = 0; uint64_t m_shooter_id = 0;
}; };
#endif // BULLET_H__ #endif // BULLET_H__

View File

@ -1,137 +1,312 @@
#include "chunk.h" #include "chunk.h"
#include "world.h" #include "world.h"
#include <random>
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.
//pos << CHUNK_PATH << x << '_' << y << ".chunk";
//std::ifstream input(pos.str(), std::fstream::binary);
//if (input.fail()) { Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y) {
OpenSimplexNoise::Noise simplex = OpenSimplexNoise::Noise(seed); //std::ostringstream pos; // V<>rifie l'existence d'un fichier .chunk avec sa position.
m_blocks.Reset(BTYPE_AIR); //pos << CHUNK_PATH << x << '_' << y << ".chunk";
//std::ifstream input(pos.str(), std::fstream::binary);
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Montagnes //if (input.fail()) {
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) { OpenSimplexNoise::Noise simplex = OpenSimplexNoise::Noise(seed);
float xnoiz, ynoiz; int ratio = 0;
xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 4096.;
ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 4096.;
double height = 0;
for (int x = 0; x < 39; ++x) {
height += simplex.eval(xnoiz, ynoiz);
height *= .79;
xnoiz *= 1.139;
ynoiz *= 1.139;
}
height = height * 2000. * simplex.eval((double)(ix + x * CHUNK_SIZE_X) / 512., (double)(iz + y * CHUNK_SIZE_Z) / 512.);
height /= (CHUNK_SIZE_Y / 1.9);
height += 15.;
for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy)
SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
}
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Collines
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
float xnoiz, ynoiz;
xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 512.;
ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 512.;
float height = simplex.eval(xnoiz, ynoiz) * 50.f;// +1.f;
for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy) {
if (GetBlock(ix, iy, iz) == BTYPE_AIR)
SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr);
}
}
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // "Lacs"
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
for (int iy = 0; iy < 13; ++iy) {
if (GetBlock(ix, iy, iz) == BTYPE_AIR)
SetBlock(ix, iy, iz, BTYPE_ICE, nullptr);
}
}
//for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // "Arbres"
// for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
// float xnoiz, ynoiz;
// xnoiz = (double)(iz * CHUNK_SIZE_Y + x * CHUNK_SIZE_X) / 256.;
// ynoiz = (double)(ix * CHUNK_SIZE_Y + y * CHUNK_SIZE_Z) / 256.;
// bool tree = (int)(abs(simplex.eval(xnoiz, ynoiz)) * 17933.f) % CHUNK_SIZE_Y > 126 ? true : false;
// for (int iy = 0; iy < CHUNK_SIZE_Y - 10; ++iy)
// if (GetBlock(ix, iy, iz) == BTYPE_AIR)
// if (GetBlock(ix, iy - 1, iz) == BTYPE_GRASS)
// if (tree) {
// for (int i = 0; i < (int)(abs(simplex.eval(xnoiz, ynoiz) * 4)) % 42 + 1; ++i)
// SetBlock(ix, iy + i, iz, BTYPE_DIRT, nullptr);
// break;
// }
// }
/* }
else {
input.seekg(0, std::ios_base::end);
int size = input.tellg();
input.seekg(0, std::ios_base::beg);
char data[CHUNK_SIZE_X * CHUNK_SIZE_Y * CHUNK_SIZE_Z]; ratio = x * y % 7;
input.read(data, size); m_blocks.Reset(BTYPE_AIR);
input.close();
#pragma region Montagnes et Grass des montagnes
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix)
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
float xnoiz, ynoiz;
xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 4796.;
ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 4796.;
double height = 0;
for (int x = 0; x < 39; ++x) {
height += simplex.eval(xnoiz, ynoiz);
height *= .79;
xnoiz *= 1.1305;
ynoiz *= 1.1305;
}
height = height * 2000. * simplex.eval((double)(ix + x * CHUNK_SIZE_X) / 512., (double)(iz + y * CHUNK_SIZE_Z) / 512.);
height /= (CHUNK_SIZE_Y / 1.9);
height += 15.;
for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy) {
if (iy < 20)
{
//std::cout << "" << ynoiz << std::endl;
SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr);
}
else if (iy == 20 || iy == 21) {
double fractionalPart = ynoiz - static_cast<int>(ynoiz);
if (iy == 20) {
if (fractionalPart < 0.3) {
SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr);
}
else {
SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
}
}
else if (iy == 21) {
if (fractionalPart < 0.6) {
SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr);
}
else {
SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
}
}
}
else
{
SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
}
}
}
#pragma endregion
#pragma region Lacs
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix)
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
for (int iy = 0; iy < 13; ++iy) {
if (iy < 5 && GetBlock(ix, iy, iz) == BTYPE_AIR) {
SetBlock(ix, iy, iz, BTYPE_ICE, nullptr);
}
else if (iy >= 5 && GetBlock(ix, iy, iz) == BTYPE_AIR) {
SetBlock(ix, iy, iz, BTYPE_ICE, nullptr);
}
}
}
#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
double valeurRnd = 0;
int treeheight = 10;
int lastTreeX = -1;
int lastTreeZ = -1;
int minDistanceBetweenTrees = 10; // Définir la distance minimale entre les arbres
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) {
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
if (GetBlock(ix, 0, iz) != BTYPE_ICE) {
float xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 4796.;
float ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 4796.;
double height = 0;
for (int i = 0; i < 39; ++i) {
height += simplex.eval(xnoiz, ynoiz);
height *= .79;
xnoiz *= 1.1305;
ynoiz *= 1.1305;
}
height = height * 2000. * simplex.eval((double)(ix + x * CHUNK_SIZE_X) / 512., (double)(iz + y * CHUNK_SIZE_Z) / 512.);
height /= (CHUNK_SIZE_Y / 1.9);
height += 15.;
if (GetBlock(ix, (int)height, iz) == BTYPE_GRASS || (GetBlock(ix, (int)height, iz) == BTYPE_METAL)) {
valeurRnd = simplex.eval(xnoiz, ynoiz);
int distanceThreshold = 20;
// Vérifie si l'emplacement n'est pas à l'intérieur des lacs
bool isInsideLake = false;
for (int iy = 0; iy < 13; ++iy) {
if (GetBlock(ix, iy, iz) == BTYPE_ICE) {
isInsideLake = true;
break;
}
}
if (!isInsideLake && ((valeurRnd > -0.4 && valeurRnd < -0.38) || (valeurRnd > -0.35 && valeurRnd < -0.31)
|| (valeurRnd > 0.3 && valeurRnd < 0.32) || (valeurRnd > 0.37 && valeurRnd < 0.39))
) {
if (lastTreeX == -1 || abs(ix - lastTreeX) > minDistanceBetweenTrees || abs(iz - lastTreeZ) > minDistanceBetweenTrees) {
if (valeurRnd < 0.1)
treeheight = 10;
else {
treeheight = valeurRnd * 20;
if (treeheight < 5)
treeheight = 5;
}
PlaceTree(ix, height, iz, treeheight);
lastTreeX = ix;
lastTreeZ = iz;
}
}
}
}
}
}
#pragma endregion
//else {
// input.seekg(0, std::ios_base::end);
// int size = input.tellg();
// input.seekg(0, std::ios_base::beg);
// char data[CHUNK_SIZE_X * CHUNK_SIZE_Y * CHUNK_SIZE_Z];
// input.read(data, size);
// input.close();
// for (int ix = 0; ix < CHUNK_SIZE_X; ++ix)
// for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz)
// for (int iy = 0; iy < CHUNK_SIZE_Y; ++iy)
// m_blocks.Set(ix, iy, iz, data[ix + (iz * CHUNK_SIZE_X) + (iy * CHUNK_SIZE_Z * CHUNK_SIZE_X)]);
//}*/
//for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Collines
// for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
// float xnoiz, ynoiz;
// xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 512.;
// ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 512.;
// float height = simplex.eval(xnoiz, ynoiz) * 50.f;// +1.f;
// for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy) {
// if (iy < 10 && GetBlock(ix, iy, iz) == BTYPE_AIR) {
// SetBlock(ix, iy, iz, BTYPE_METAL, nullptr); // Collines
// }
// else if (iy >= 10 && GetBlock(ix, iy, iz) == BTYPE_AIR) {
// SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr); // Grass des collines
// }
// }
// }
for (int ix = 0; ix < CHUNK_SIZE_X; ++ix)
for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz)
for (int iy = 0; iy < CHUNK_SIZE_Y; ++iy)
m_blocks.Set(ix, iy, iz, data[ix + (iz * CHUNK_SIZE_X) + (iy * CHUNK_SIZE_Z * CHUNK_SIZE_X)]);
}*/
} }
void Chunk::PlaceTree(int x, int y, int z, int height) {
// Vérifie si les coordonnées x, y, z sont dans les limites du chunk
if (x < 0 || x >= CHUNK_SIZE_X || y < 0 || y >= CHUNK_SIZE_Y || z < 0 || z >= CHUNK_SIZE_Z) {
// Coordonnées hors limites du chunk, sortie anticipée pour éviter tout accès non valide
return;
}
// Place la tige de l'arbre
for (int iy = 0; iy < height + 1; ++iy) {
if (y + iy < CHUNK_SIZE_Y) { // Vérifie si la hauteur est à l'intérieur des limites du chunk
SetBlock(x, y + iy, z, BTYPE_DIRT, nullptr);
}
}
// Place les feuilles de l'arbre
int foliageHeight = height / 2;
for (int dy = 0; dy < foliageHeight; ++dy) {
for (int dx = -4; dx <= 4; ++dx) {
for (int dz = -4; dz <= 4; ++dz) {
// Vérifie que les coordonnées se trouvent à l'intérieur des limites du chunk
if (x + dx >= 0 && x + dx < CHUNK_SIZE_X && y + height + dy >= 0 && y + height + dy < CHUNK_SIZE_Y &&
z + dz >= 0 && z + dz < CHUNK_SIZE_Z) {
// Vérifie si le bloc est à une distance acceptable du centre des feuilles pour les placer
double distanceSquared = dx * dx + dy * dy + dz * dz;
if (distanceSquared < 20) {
SetBlock(x + dx, y + height + dy, z + dz, BTYPE_GREENGRASS, nullptr);
}
}
}
}
}
}
Chunk::~Chunk() { Chunk::~Chunk() {
/*if (m_isModified) { /*if (m_isModified) {
char data[CHUNK_SIZE_X * CHUNK_SIZE_Y * CHUNK_SIZE_Z]; char data[CHUNK_SIZE_X * CHUNK_SIZE_Y * CHUNK_SIZE_Z];
for (int x = 0; x < CHUNK_SIZE_X; ++x) for (int x = 0; x < CHUNK_SIZE_X; ++x)
for (int z = 0; z < CHUNK_SIZE_Z; ++z) for (int z = 0; z < CHUNK_SIZE_Z; ++z)
for (int y = 0; y < CHUNK_SIZE_Y; ++y) for (int y = 0; y < CHUNK_SIZE_Y; ++y)
data[x + (z * CHUNK_SIZE_X) + (y * CHUNK_SIZE_Z * CHUNK_SIZE_X)] = (char)GetBlock(x, y, z); data[x + (z * CHUNK_SIZE_X) + (y * CHUNK_SIZE_Z * CHUNK_SIZE_X)] = (char)GetBlock(x, y, z);
std::ostringstream pos; std::ostringstream pos;
pos << CHUNK_PATH << m_posX << '_' << m_posY << ".chunk"; pos << CHUNK_PATH << m_posX << '_' << m_posY << ".chunk";
std::ofstream output(pos.str(), std::fstream::binary); std::ofstream output(pos.str(), std::fstream::binary);
output.write(data, sizeof(data)); output.write(data, sizeof(data));
output.close(); output.close();
}*/ }*/
} }
void Chunk::RemoveBlock(int x, int y, int z, World* world) { void Chunk::RemoveBlock(int x, int y, int z, World* world) {
m_blocks.Set(x, y, z, BTYPE_AIR); m_blocks.Set(x, y, z, BTYPE_AIR);
CheckNeighbors(x, y, world); CheckNeighbors(x, y, world);
m_isDirty = true; m_isDirty = true;
} }
void Chunk::SetBlock(int x, int y, int z, BlockType type, World* world) { void Chunk::SetBlock(int x, int y, int z, BlockType type, World* world) {
m_blocks.Set(x, y, z, type); 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; m_isDirty = true;
} }
BlockType Chunk::GetBlock(int x, int y, int z) { return m_blocks.Get(x, y, z); } BlockType Chunk::GetBlock(int x, int y, int z) { return m_blocks.Get(x, y, z); }
void Chunk::CheckNeighbors(unsigned int x, unsigned int z, World* world) { void Chunk::CheckNeighbors(unsigned int x, unsigned int z, World* world) {
unsigned int cx, cy; unsigned int cx, cy;
world->GetScope(cx, cy); world->GetScope(cx, cy);
if (x == 0 && m_posX - cx >= 0 && if (x == 0 && m_posX - cx >= 0 &&
world->ChunkAt((m_posX - cx - 1) * CHUNK_SIZE_X, 1, (m_posY - cy) * CHUNK_SIZE_Z)) world->ChunkAt((m_posX - cx - 1) * CHUNK_SIZE_X, 1, (m_posY - cy) * CHUNK_SIZE_Z))
world->ChunkAt((m_posX - cx - 1) * CHUNK_SIZE_X, 1, (m_posY - cy) * CHUNK_SIZE_Z)->MakeDirty(); world->ChunkAt((m_posX - cx - 1) * CHUNK_SIZE_X, 1, (m_posY - cy) * CHUNK_SIZE_Z)->MakeDirty();
else if (x == CHUNK_SIZE_X - 1 && m_posX - cx < WORLD_SIZE_X && else if (x == CHUNK_SIZE_X - 1 && m_posX - cx < WORLD_SIZE_X &&
world->ChunkAt((m_posX - cx + 1) * CHUNK_SIZE_X, 1, (m_posY - cy) * CHUNK_SIZE_Z)) world->ChunkAt((m_posX - cx + 1) * CHUNK_SIZE_X, 1, (m_posY - cy) * CHUNK_SIZE_Z))
world->ChunkAt((m_posX - cx + 1) * CHUNK_SIZE_X, 1, (m_posY - cy) * CHUNK_SIZE_Z)->MakeDirty(); world->ChunkAt((m_posX - cx + 1) * CHUNK_SIZE_X, 1, (m_posY - cy) * CHUNK_SIZE_Z)->MakeDirty();
if (z == 0 && m_posY - cy >= 0 && if (z == 0 && m_posY - cy >= 0 &&
world->ChunkAt((m_posX - cx) * CHUNK_SIZE_X, 1, (m_posY - cy - 1) * CHUNK_SIZE_Z)) world->ChunkAt((m_posX - cx) * CHUNK_SIZE_X, 1, (m_posY - cy - 1) * CHUNK_SIZE_Z))
world->ChunkAt((m_posX - cx) * CHUNK_SIZE_X, 1, (m_posY - cy - 1) * CHUNK_SIZE_Z)->MakeDirty(); world->ChunkAt((m_posX - cx) * CHUNK_SIZE_X, 1, (m_posY - cy - 1) * CHUNK_SIZE_Z)->MakeDirty();
else if (z == CHUNK_SIZE_X - 1 && m_posY - cy < WORLD_SIZE_Y && else if (z == CHUNK_SIZE_X - 1 && m_posY - cy < WORLD_SIZE_Y &&
world->ChunkAt((m_posX - cx) * CHUNK_SIZE_X, 1, (m_posY - cy + 1) * CHUNK_SIZE_Z)) world->ChunkAt((m_posX - cx) * CHUNK_SIZE_X, 1, (m_posY - cy + 1) * CHUNK_SIZE_Z))
world->ChunkAt((m_posX - cx) * CHUNK_SIZE_X, 1, (m_posY - cy + 1) * CHUNK_SIZE_Z)->MakeDirty(); world->ChunkAt((m_posX - cx) * CHUNK_SIZE_X, 1, (m_posY - cy + 1) * CHUNK_SIZE_Z)->MakeDirty();
} }
void Chunk::GetPosition(unsigned int& x, unsigned int& y) const { x = m_posX; y = m_posY; } void Chunk::GetPosition(unsigned int& x, unsigned int& y) const { x = m_posX; y = m_posY; }
bool Chunk::IsDirty() const { return m_isDirty; } bool Chunk::IsDirty() const { return m_isDirty; }
void Chunk::MakeDirty() { m_isDirty = true; } void Chunk::MakeDirty() { m_isDirty = true; }
@ -140,3 +315,11 @@ void Chunk::MakeClean() { m_isDirty = false; }
void Chunk::MakeModified() { m_isModified = true; } 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);
}
}

View File

@ -27,7 +27,9 @@ class Chunk {
BlockType GetBlock(int x, int y, int z); BlockType GetBlock(int x, int y, int z);
void CheckNeighbors(unsigned int x, unsigned int z, World* world); void CheckNeighbors(unsigned int x, unsigned int z, World* world);
void GetPosition(unsigned int& x, unsigned int& y) const; 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; bool IsDirty() const;
void MakeDirty(); void MakeDirty();
void MakeClean(); void MakeClean();

View File

@ -4,12 +4,14 @@
#include <iostream> #include <iostream>
#include <chrono> #include <chrono>
#define SRV_PORT 1025 #define SRV_PORT 10000
#define CLI_PORT 1026 #define CLI_PORT 10001
#define CHUNK_SIZE_X 4 #define BUFFER_LENGTH 1500
#define CHUNK_SIZE_X 6
#define CHUNK_SIZE_Y 64 #define CHUNK_SIZE_Y 64
#define CHUNK_SIZE_Z 4 #define CHUNK_SIZE_Z 6
#define MAX_SELECTION_DISTANCE 5 #define MAX_SELECTION_DISTANCE 5
#define SEED 0 #define SEED 0
#define COUNTDOWN 300 #define COUNTDOWN 300
@ -25,23 +27,43 @@
#define THREADS_UPDATE_CHUNKS 6 #define THREADS_UPDATE_CHUNKS 6
#define THREADS_DELETE_CHUNKS 3 #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 TEXTURE_SIZE 512
#define MAX_BULLETS 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; 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 };
//anim
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; typedef uint64_t Timestamp;
#ifdef _WIN32 #ifdef _WIN32
#pragma comment(lib,"wsock32.lib") // Pour pouvoir faire fonctionner le linker sans le vcxproject #pragma comment(lib,"wsock32.lib") // Pour pouvoir faire fonctionner le linker sans le vcxproject
#pragma comment(lib,"ws2_32.lib") #pragma comment(lib,"ws2_32.lib")
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <Windows.h> #include <Windows.h>
#include <cstdio> #include <cstdio>
#include <ctime> #include <ctime>
#define poll WSAPoll
#define flag_t u_long
#define addrlen_t int
#define ioctl ioctlsocket
#define SOCK_NONBLOCK FIONBIO
#define strcpy strcpy_s
#define popen _popen #define popen _popen
#define pclose _pclose #define pclose _pclose
@ -51,10 +73,14 @@ typedef uint64_t Timestamp;
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/ioctl.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <cstring> #include <cstring>
#include <poll.h>
#define flag_t unsigned int
#define addrlen_t unsigned int
#define SOCKET int #define SOCKET int
#define INVALID_SOCKET -1 #define INVALID_SOCKET -1
#define closesocket close #define closesocket close

File diff suppressed because it is too large Load Diff

View File

@ -1,41 +1,65 @@
#ifndef NETPROTOCOL_H__ #ifndef NETPROTOCOL_H__
#define NETPROTOCOL_H__ #define NETPROTOCOL_H__
#include "define.h"
#include <string> #include <string>
#include "define.h"
#include "vector3.h" #include "vector3.h"
/* Protocole Particulier de Partie à Plusieurs Personnes (PPPPP) */ /* Protocole Particulier de Partie a Plusieurs Personnes (PPPPP) */
// Packet: packet[0] = PacketType, packet[1..n-1] = {packet}
namespace netprot { namespace netprot {
typedef uint8_t PacketType; enum class PACKET_TYPE: uint8_t {
enum PACKET_TYPE {
ERR, INPUT, OUTPUT, SYNC, ERR, INPUT, OUTPUT, SYNC,
TEAMINF, SELFINF, PLAYINF, LOGINF, TEAMINF, SELFINF, PLAYINF, LOGINF,
CHUNKMOD, PLAYERMOD, PICKUPMOD, CHUNKMOD, PLAYERMOD, PICKUPMOD,
GAMEINFO, ENDINFO , CHAT, ERRLOG, GAMEINFO, ENDINFO , BULLET,
LAST_PACK CHAT, ERRLOG, LAST_PACK
}; };
/* Structures */
struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean.
char *ptr = new char[BUFFER_LENGTH] { 1 }, *tmp = nullptr;
uint32_t len = BUFFER_LENGTH;
~Buffer() { delete[] ptr; }
void rstLen() { len = BUFFER_LENGTH; }
};
struct Packet { // Pour pouvoir recevoir les paquets du recv() sans avoir à les aiguiller dans la même thread.
void *ptr = nullptr; // Notez que le pointeur doit être supprimé séparément lorsqu'il n'est plus utile.
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 { struct Keys {
bool forward, bool forward = false,
backward, backward = false,
left, left = false,
right, right = false,
jump, jump = false,
shoot, shoot = false,
block; block = false;
}; };
struct States { struct States {
bool jumping, bool jumping = false,
shooting, shooting = false,
hit, hit = false,
powerup; powerup = false,
dead = false,
still = false,
jumpshot = false,
running = false;
}; };
/* Structures de paquets */
struct Input { // cli -> srv UDP ~frame struct Input { // cli -> srv UDP ~frame
Timestamp timestamp; Timestamp timestamp;
uint64_t sid = 0; uint64_t sid = 0;
@ -51,50 +75,83 @@ namespace netprot {
States states; // 0bJSH_____ bit-packing de bool. 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; Timestamp timestamp;
uint64_t sid = 0; uint64_t sid = 0;
uint32_t timer = 0; uint32_t timer = 0;
uint16_t ammo = 0; uint16_t ammo = 0;
uint8_t hp = 0; float hp = 0;
Vector3f position; Vector3f position;
Sync() {}
Sync(Sync* sync) : timestamp(sync->timestamp), sid(sync->sid), timer(sync->timer), ammo(sync->ammo), hp(sync->hp), position(sync->position) {}
}; };
struct TeamInfo { // cli <-> srv TCP once struct TeamInfo { // cli <-> srv TCP once
char name[32]; char *name = new char[32];
uint64_t id = 0; uint64_t id = 0;
TeamInfo() {}
TeamInfo(TeamInfo* tem) : id(tem->id) { strcpy(name, 32, tem->name); }
~TeamInfo() { delete[] name; }
}; };
struct LoginInfo { // cli <-> srv TCP once struct LoginInfo { // cli <-> srv TCP once
char name[32]; char *name = new char[32];
uint64_t sid = 0, uint64_t sid = 0,
tid = 0; tid = 0;
LoginInfo() {}
LoginInfo(LoginInfo* log): sid(log->sid), tid(log->tid) { strcpy(name, 32, log->name); }
~LoginInfo() { delete[] name; }
}; };
struct PlayerInfo { // cli <-> srv TCP once struct PlayerInfo { // cli <-> srv TCP once
char name[32]; char *name = new char[32];
uint64_t id = 0, uint64_t id = 0,
tid = 0; tid = 0;
PlayerInfo() {}
PlayerInfo(PlayerInfo* ply) : id(ply->id), tid(ply->tid) { strcpy(name, 32, ply->name); };
PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { strcpy(name, 32, strname.c_str()); }
~PlayerInfo() { delete[] name; }
}; };
struct GameInfo { // cli <-> srv TCP event (before game start)/ once struct GameInfo { // cli <-> srv TCP event (before game start)/ once
uint64_t seed; uint64_t seed;
uint32_t countdown; uint32_t countdown;
uint8_t gameType; // TOOD: enum. uint8_t gameType; // TODD: enum.
GameInfo() {}
GameInfo(GameInfo* gam) : seed(gam->seed), countdown(gam->countdown), gameType(gam->gameType) {}
}; };
struct Chat { // cli <-> srv TCP event struct Chat { // cli <-> srv TCP event
uint64_t src_id = 0, uint64_t src_id = 0,
dest_id = 0, dest_id = 0,
dest_team_id = 0; dest_team_id = 0;
char mess[140]; // Good 'nough for twitr, good 'nough for me. char *mess = new char[140]; // Good 'nough for twitr, good 'nough for me.
Chat() {}
Chat(Chat* cha) : src_id(cha->src_id), dest_id(cha->dest_id), dest_team_id(cha->dest_team_id) { strcpy(mess, 140, cha->mess); }
~Chat() { delete[] mess; }
};
struct ChunkMod {
Vector3f pos;
BlockType b_type, old_b_type;
};
struct BulletAdd {
Timestamp tstamp;
Vector3f pos, dir;
uint64_t id;
}; };
struct ErrorLog { // srv -> cli TCP event struct ErrorLog { // srv -> cli TCP event
char mess[140]; char *mess = new char[140];
bool is_fatal; bool is_fatal = false;
ErrorLog() {};
ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(mess, 140, err->mess); }
~ErrorLog() { delete[] mess; }
}; };
/* Fonctions */
void Serialize(Input* in, char* buf[], uint32_t* buflen); // cli void Serialize(Input* in, char* buf[], uint32_t* buflen); // cli
void Serialize(Output* out, char* buf[], uint32_t* buflen); // srv void Serialize(Output* out, char* buf[], uint32_t* buflen); // srv
void Serialize(Sync* sync, char* buf[], uint32_t* buflen); // srv void Serialize(Sync* sync, char* buf[], uint32_t* buflen); // srv
@ -103,18 +160,84 @@ namespace netprot {
void Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen); // srv void Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen); // srv
void Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen); // cli/srv void Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen); // cli/srv
void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv
void Serialize(ChunkMod* chmod, char* buf[], uint32_t* buflen); // srv
void Serialize(BulletAdd* bull, char* buf[], uint32_t* buflen); // srv
void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv
bool Deserialize(Input* in, char* buf, const uint32_t buflen); // srv bool Deserialize(Input* in, char* buf, uint32_t* buflen); // srv
bool Deserialize(Output* out, char* buf, const uint32_t buflen); // cli bool Deserialize(Output* out, char* buf, uint32_t* buflen); // cli
bool Deserialize(Sync* sync, char* buf, const uint32_t buflen); // cli bool Deserialize(Sync* sync, char* buf, uint32_t* buflen); // cli
bool Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen); // cli/srv bool Deserialize(TeamInfo* tinfo, char* buf, uint32_t* buflen); // cli/srv
bool Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen); // cli/srv bool Deserialize(LoginInfo* linfo, char* buf, uint32_t* buflen); // cli/srv
bool Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen); // cli bool Deserialize(PlayerInfo* pinfo, char* buf, uint32_t* buflen); // cli
bool Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen); // cli bool Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen); // cli
bool Deserialize(Chat* chat, char* buf, const uint32_t buflen); // srv/cli bool Deserialize(Chat* chat, char* buf, uint32_t* buflen); // srv/cli
bool Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen); // srv bool Deserialize(ChunkMod* chmod, char* buf, uint32_t* buflen); // cli
bool Deserialize(BulletAdd* bull, char* buf, uint32_t* buflen); // cli
bool Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen); // srv
PacketType getType(char* buf, uint32_t buflen); // srv/cli PACKET_TYPE getType(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);
void recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck);
void recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, std::vector<char*>* lsPck);
/* 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);
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) {
const sockaddr_in addr = *sockad;
netprot::Serialize(pack, buf, buflen);
memcpy(*buf + *buflen, Footer, sizeof(uint32_t));
*buflen += sizeof(Footer);
sendto(sock, *buf, *buflen, 0, (sockaddr*)&addr, sizeof(addr));
*buflen = BUFFER_LENGTH;
}
template <class T>
void sendPack(SOCKET sock, T* pack, Buffer* buf) {
netprot::Serialize(pack, &buf->ptr, &buf->len);
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) {
const sockaddr_in addr = *sockad;
netprot::Serialize(pack, &buf->ptr, &buf->len);
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 #endif

View File

@ -4,51 +4,63 @@
Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(position), m_rotX(rotX), m_rotY(rotY) { Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(position), m_rotX(rotX), m_rotY(rotY) {
m_velocity = Vector3f(0, 0, 0); m_velocity = Vector3f(0, 0, 0);
m_airborne = true; m_airborne = true;
m_hp = 0.75f; //TODO: Remettre à 1.0f m_hp = 1.0f; //TODO: Remettre <20> 1.0f
m_username = "Zelda Bee-Bop56"; m_username = "Zelda Bee-Bop56";
} }
Player::~Player() {}
void Player::TurnLeftRight(float value) { void Player::TurnLeftRight(float value) {
m_rotY += value; m_rotY += value;
if (m_rotY > 360) m_rotY = 0; if (m_rotY > 360) m_rotY = 0;
else if (m_rotY < -360) m_rotY = 0; else if (m_rotY < -360) m_rotY = 0;
float yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
float xrotrad = (m_rotX / 57.2957795056f);
m_direction = Vector3f(cos(xrotrad) * sin(yrotrad),
-sin(xrotrad),
cos(xrotrad) * -cos(yrotrad));
m_direction.Normalize();
} }
void Player::TurnTopBottom(float value) { void Player::TurnTopBottom(float value) {
m_rotX += value; m_rotX += value;
if (m_rotX > 80) m_rotX = 80; if (m_rotX > 80) m_rotX = 80;
else if (m_rotX < -80) m_rotX = -80; else if (m_rotX < -80) m_rotX = -80;
}
Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jump, bool shoot, float elapsedTime) {
Vector3f delta = Vector3f(0, 0, 0);
float yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295... float yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
float xrotrad = (m_rotX / 57.2957795056f); float xrotrad = (m_rotX / 57.2957795056f);
m_direction = Vector3f(cos(xrotrad) * sin(yrotrad), m_direction = Vector3f(cos(xrotrad) * sin(yrotrad),
-sin(xrotrad), -sin(xrotrad),
cos(xrotrad) * -cos(yrotrad)); cos(xrotrad) * -cos(yrotrad));
m_direction.Normalize(); m_direction.Normalize();
}
Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jump, bool shoot, float elapsedTime) {
Vector3f delta = Vector3f(0, 0, 0);
Vector3f dir = m_direction;
dir.y = 0;
if (front) { if (front) {
delta.x += float(sin(yrotrad)) * elapsedTime * 10.f; delta += dir;
delta.z += float(-cos(yrotrad)) * elapsedTime * 10.f;
} }
else if (back) { else if (back) {
delta.x += float(-sin(yrotrad)) * elapsedTime * 10.f; delta -= dir;
delta.z += float(cos(yrotrad)) * elapsedTime * 10.f;
} }
if (left) { if (left) {
delta.x += float(-cos(yrotrad)) * elapsedTime * 10.f; delta.x += dir.z;
delta.z += float(-sin(yrotrad)) * elapsedTime * 10.f; delta.z += -dir.x;
} }
else if (right) { else if (right) {
delta.x += float(cos(yrotrad)) * elapsedTime * 10.f; delta.x -= dir.z;
delta.z += float(sin(yrotrad)) * elapsedTime * 10.f; delta.z -= -dir.x;
} }
delta.Normalize(); delta.Normalize();
@ -59,6 +71,11 @@ Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jum
delta.y += jump? .32f: shoot? .1f : 0.f; delta.y += jump? .32f: shoot? .1f : 0.f;
m_airborne = true; m_airborne = true;
} }
if (boostspeed)
{
delta.x += STRENGTH_SPEED_BOOST / 100 * delta.x;
delta.z += STRENGTH_SPEED_BOOST / 100 * delta.z;
}
if (shoot) // Recoil! if (shoot) // Recoil!
TurnTopBottom(-1); TurnTopBottom(-1);
@ -165,7 +182,7 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
m_position += m_velocity; m_position += m_velocity;
static float bobbingtime = 0; // Gestion de la caméra static float bobbingtime = 0; // Gestion de la cam<EFBFBD>ra
static bool leftright = false; static bool leftright = false;
static bool isStep = false; static bool isStep = false;
if (bobbingtime <= 360.f) if (bobbingtime <= 360.f)
@ -180,18 +197,71 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
else isStep = false; else isStep = false;
m_POV = m_position.y; m_POV = m_position.y;
m_POV += m_airborne ? 0 : (sin(bobbingtime) - 0.5f) * (abs(m_velocity.x) + abs(m_velocity.z)) * .2f; m_POV += m_airborne ? 0 : (sin(bobbingtime) - 0.5f) * (abs(m_velocity.x) + abs(m_velocity.z)) * .2f;
RemoveBooster(elapsedTime);
return snd; 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_rotX, 1, 0, 0);
transformation.ApplyRotation(-m_rotY, 0, 1, 0); transformation.ApplyRotation(-m_rotY, 0, 1, 0);
if (rel) transformation.ApplyTranslation(-GetPOV()); if (rel) transformation.ApplyTranslation(-GetPOV());
} }
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; }
void Player::Move(Vector3f diff) { m_position -= diff; }
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::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::GetPositionAbs() const { return m_position; }
Vector3f Player::GetVelocity() const { return m_velocity; } Vector3f Player::GetVelocity() const { return m_velocity; }
Vector3f Player::GetPOV() const { return Vector3f(GetPosition().x, m_POV, GetPosition().z); } Vector3f Player::GetPOV() const { return Vector3f(GetPosition().x, m_POV, GetPosition().z); }
@ -206,3 +276,27 @@ void Player::Teleport(int& x, int& z) {
m_position.x -= x * CHUNK_SIZE_X; m_position.x -= x * CHUNK_SIZE_X;
m_position.z -= z * CHUNK_SIZE_Z; m_position.z -= z * CHUNK_SIZE_Z;
} }
bool Player::GetIsAirborne() const { return m_airborne; }
bool Player::AmIDead() { return m_hp <= 0; }
void Player::InflictDamage(float hitPoints) {
m_hp -= hitPoints;
if (m_hp < 0)
m_hp == 0;
//if (AmIDead())
//{ // Quand le joueur est mort.
//}
}
int Player::getScore() const { return m_score; }
void Player::addPoint() { ++m_score; }
uint64_t Player::getId() const { return id; }
Vector3f Player::InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now) {
return Vector3f();
}

View File

@ -5,20 +5,29 @@
#include "transformation.h" #include "transformation.h"
#include "vector3.h" #include "vector3.h"
class World; class World;
class Player { class Player {
public: public:
enum Sound { NOSOUND, STEP, FALL }; enum Sound { NOSOUND, STEP, FALL };
enum Booster { SPEED, HEAL, DAMAGE, INVINCIBLE };
Player(const Vector3f& position, float rotX = 0, float rotY = 0); Player(const Vector3f& position, float rotX = 0, float rotY = 0);
~Player();
void TurnLeftRight(float value); void TurnLeftRight(float value);
void TurnTopBottom(float value); void TurnTopBottom(float value);
Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime); Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime);
Sound ApplyPhysics(Vector3f input, World* world, 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);
void Move(Vector3f diff);
Vector3f GetPosition() const; Vector3f GetPosition() const;
Vector3f GetPositionAbs() const;
Vector3f GetDirection() const; Vector3f GetDirection() const;
Vector3f GetVelocity() const; Vector3f GetVelocity() const;
Vector3f GetPOV() const; Vector3f GetPOV() const;
@ -26,20 +35,43 @@ public:
float GetHP() const; float GetHP() const;
void Teleport(int& x, int& z); void Teleport(int& x, int& z);
bool GetIsAirborne() const;
bool AmIDead();
void InflictDamage(float hitPoints);
int getScore() const;
void addPoint();
uint64_t Killer = 0;
std::string m_username;
bool m_hit = false;
private: private:
uint64_t getId() const;
protected:
Vector3f m_position; Vector3f m_position;
Vector3f m_velocity; Vector3f m_velocity;
Vector3f m_direction; Vector3f m_direction;
std::string m_username; uint64_t id = 0;
int m_score = 0;
float m_rotX = 0; float m_rotX = 0;
float m_rotY = 0; float m_rotY = 0;
float m_POV; float m_POV;
float timeboostspeed;
float timeboostdamage;
float timeboostinvincible;
float m_hp; float m_hp;
bool m_airborne; 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__ #endif //_PLAYER_H__

View File

@ -6,10 +6,19 @@ World::~World() {}
Array2d<Chunk*>& World::GetChunks() { return m_chunks; } Array2d<Chunk*>& World::GetChunks() { return m_chunks; }
void World::BuildWorld() {
for (int x = 0; x < WORLD_SIZE_X; ++x)
for (int y = 0; y < WORLD_SIZE_Y; ++y)
m_chunks.Set(x, y, new Chunk(x + m_center[0], y + m_center[1], m_seed));
}
void World::SetSeed(uint64_t seed) { void World::SetSeed(uint64_t seed) {
m_seed = seed; m_seed = seed;
} }
Chunk* World::ChunkAt(float x, float y, float z) const { Chunk* World::ChunkAt(float x, float y, float z) const {
int cx = (int)x / CHUNK_SIZE_X; int cx = (int)x / CHUNK_SIZE_X;
int cz = (int)z / CHUNK_SIZE_Z; int cz = (int)z / CHUNK_SIZE_Z;
@ -25,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); } 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 { BlockType World::BlockAt(float x, float y, float z, BlockType defaultBlockType) const {
Chunk* c = ChunkAt(x, y, z); Chunk* c = ChunkAt(x, y, z);
@ -134,31 +169,26 @@ void World::Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, Blo
UpdateWorld(player_pos, blockinfo); UpdateWorld(player_pos, blockinfo);
//TransposeWorld(player_pos, bullets); //TransposeWorld(player_pos, bullets);
} }
//
//void World::UpdateChunk(int& updates, unsigned int chx, unsigned int chy, BlockInfo* blockinfo[BTYPE_LAST]) {
// if (updates == 0 && ChunkAt(chx, 1, chy) &&
// ChunkAt(chx, 1, chy)->IsDirty()) {
// ChunkAt(chx, 1, chy)->Update(blockinfo, this);
// updates = FRAMES_UPDATE_CHUNKS;
// }
//
//}
void World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block) { netprot::ChunkMod* World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block, bool net) {
Vector3f currentPos = player_pos; Vector3f currentPos = player_pos;
Vector3f currentBlock = currentPos; Vector3f currentBlock = currentPos;
Vector3f ray = player_dir; Vector3f ray = player_dir;
BlockType oldbtype;
netprot::ChunkMod* cmod = nullptr;
bool found = false; bool found = false;
if (block) return; if (block) return cmod;
while ((currentPos - currentBlock).Length() <= MAX_SELECTION_DISTANCE && !found) { while ((currentPos - currentBlock).Length() <= MAX_SELECTION_DISTANCE && !found) {
currentBlock += ray / 10.f; currentBlock += ray / 10.f;
BlockType bt = BlockAt(currentBlock); BlockType bt = BlockAt(currentBlock);
if (bt != BTYPE_AIR) if (bt != BTYPE_AIR) {
found = true; found = true;
oldbtype = bt;
}
} }
if (found) if (found)
@ -184,21 +214,30 @@ void World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos,
(By == PyA || (By == PyA ||
By == PyB || By == PyB ||
By == PyC) && By == PyC) &&
Bz == Pz)) Bz == Pz)) {
found = true; found = true;
oldbtype = bt;
}
} }
} }
} }
if (found && (int)currentBlock.y < CHUNK_SIZE_Y) { if (found && (int)currentBlock.y < CHUNK_SIZE_Y) {
if (net) {
cmod = new netprot::ChunkMod();
cmod->old_b_type = oldbtype;
cmod->b_type = blockType;
cmod->pos = currentBlock;
}
int bx = (int)currentBlock.x % CHUNK_SIZE_X; int bx = (int)currentBlock.x % CHUNK_SIZE_X;
int by = (int)currentBlock.y % CHUNK_SIZE_Y; int by = (int)currentBlock.y % CHUNK_SIZE_Y;
int bz = (int)currentBlock.z % CHUNK_SIZE_Z; int bz = (int)currentBlock.z % CHUNK_SIZE_Z;
ChunkAt(currentBlock)->SetBlock(bx, by, bz, blockType, this); ChunkAt(currentBlock)->SetBlock(bx, by, bz, blockType, this);
ChunkAt(currentBlock)->MakeModified(); ChunkAt(currentBlock)->MakeModified();
block = true; block = true;
} }
return cmod;
} }
void World::ChangeBlockAtPosition(BlockType blockType, Vector3f pos) { void World::ChangeBlockAtPosition(BlockType blockType, Vector3f pos) {
@ -220,7 +259,7 @@ void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]
int threads = 0; int threads = 0;
std::future<Chunk*> genThList[THREADS_GENERATE_CHUNKS]; std::future<Chunk*> genThList[THREADS_GENERATE_CHUNKS];
//std::future<void> delThList[THREADS_DELETE_CHUNKS]; //std::future<void> delThList[THREADS_DELETE_CHUNKS];
if (frameGenerate > 0) --frameGenerate; if (frameGenerate > 0) --frameGenerate;
if (frameUpdate > 0) --frameUpdate; if (frameUpdate > 0) --frameUpdate;
if (frameDelete > 0) --frameDelete; if (frameDelete > 0) --frameDelete;

View File

@ -11,6 +11,7 @@
#include "array2d.h" #include "array2d.h"
#include "bullet.h" #include "bullet.h"
#include "chunk.h" #include "chunk.h"
#include "netprotocol.h"
class Chunk; class Chunk;
class Bullet; class Bullet;
@ -21,12 +22,15 @@ public:
~World(); ~World();
Array2d<Chunk*>& GetChunks(); Array2d<Chunk*>& GetChunks();
void BuildWorld();
void SetSeed(uint64_t seed); void SetSeed(uint64_t seed);
Chunk* ChunkAt(float x, float y, float z) const; Chunk* ChunkAt(float x, float y, float z) const;
Chunk* ChunkAt(const Vector3f& pos) 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(float x, float y, float z, BlockType defaultBlockType = BTYPE_AIR) const;
BlockType BlockAt(const Vector3f& pos, BlockType defaultBlockType = BTYPE_AIR) const; BlockType BlockAt(const Vector3f& pos, BlockType defaultBlockType = BTYPE_AIR) const;
@ -34,7 +38,7 @@ public:
void GetScope(unsigned int& x, unsigned int& y); void GetScope(unsigned int& x, unsigned int& y);
void ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block); netprot::ChunkMod* ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block, bool net);
void ChangeBlockAtPosition(BlockType blockType, Vector3f pos); void ChangeBlockAtPosition(BlockType blockType, Vector3f pos);
void CleanUpWorld(int& deleteframes, bool clear); void CleanUpWorld(int& deleteframes, bool clear);
int GettbDeleted() const; int GettbDeleted() const;
@ -45,7 +49,7 @@ private:
unsigned int m_center[2] = { UINT16_MAX / 2 - WORLD_SIZE_X, UINT16_MAX / 2 - WORLD_SIZE_Y }; unsigned int m_center[2] = { UINT16_MAX / 2 - WORLD_SIZE_X, UINT16_MAX / 2 - WORLD_SIZE_Y };
void UpdateChunk(int& updates, unsigned int chx, unsigned int chy, BlockInfo* blockinfo[BTYPE_LAST]); //void UpdateChunk(int& updates, unsigned int chx, unsigned int chy, BlockInfo* blockinfo[BTYPE_LAST]);
void UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]); void UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]);
void TransposeWorld(Vector3f& player, Bullet* bullets[MAX_BULLETS]); void TransposeWorld(Vector3f& player, Bullet* bullets[MAX_BULLETS]);

View File

@ -48,7 +48,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>ClangCL</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
@ -76,6 +76,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -90,7 +91,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>Default</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -105,6 +106,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -119,6 +121,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>

View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.18.4)
project(SQCSim-Server VERSION 0.1) project(SQCSim-Server VERSION 0.1)
add_compile_options("-Wno-narrowing") add_compile_options("-Wno-narrowing")
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_STANDARD_REQUIRED True) set(CMAKE_STANDARD_REQUIRED True)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../out") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../out")

View File

@ -2,40 +2,38 @@
Connection::Connection(SOCKET sock, Connection::Connection(SOCKET sock,
sockaddr_in sockaddr, sockaddr_in sockaddr,
netprot::LoginInfo log, LoginInfo *log,
netprot::PlayerInfo play): PlayerInfo *play) :
m_sock(sock), m_sock(sock),
m_addr(sockaddr), m_addr(sockaddr),
m_loginfo(log), m_loginfo(*log),
m_playinfo(play) { m_playinfo(*play) {
} }
Connection::~Connection() { Connection::~Connection() {
closesocket(m_sock); delete player;
} closesocket(m_sock); }
uint64_t Connection::GetHash(bool self) const { return self? m_loginfo.sid: m_playinfo.id; } uint64_t Connection::GetHash(bool self) const { return self ? m_loginfo.sid : m_playinfo.id; }
uint64_t Connection::GetTeamHash() const { return m_loginfo.tid; } uint64_t Connection::GetTeamHash() const { return m_loginfo.tid; }
std::string Connection::GetName() const { return m_loginfo.name; } std::string Connection::GetName() const { return m_loginfo.name; }
void Connection::AddInput(netprot::Input in) { void Connection::AddInput(Input in) { m_input_manifest.insert({ in.timestamp, in }); m_input_vector.push_back(in); }
m_input_manifest.insert({ in.timestamp, in });
}
netprot::Output* Connection::getOutput(Timestamp time) { Output* Connection::getOutput(Timestamp time) {
auto out = m_output_manifest.find(time); auto out = m_output_manifest.find(time);
if (out != m_output_manifest.end()) if (out != m_output_manifest.end())
return &out->second; return &out->second;
return nullptr; return nullptr;
} }
netprot::Sync Connection::getSync(Timestamp time) { Sync Connection::getSync(Timestamp time) {
netprot::Sync sync; Sync sync;
auto out = m_output_manifest.find(time); auto out = m_output_manifest.find(time);
if (out != m_output_manifest.end()) { if (out != m_output_manifest.end()) {
sync.timestamp = out->second.timestamp; sync.timestamp = out->second.timestamp;
@ -45,10 +43,166 @@ netprot::Sync Connection::getSync(Timestamp time) {
return sync; return sync;
} }
void Connection::CleanInputManifest(Timestamp time) { SOCKET Connection::getSock() const { return m_sock; }
auto wat = m_input_manifest.find(time);
while (wat != m_input_manifest.begin()) PlayerInfo* Connection::getInfo() const { return (PlayerInfo*)&m_playinfo; }
m_input_manifest.erase(wat--);
sockaddr_in* Connection::getAddr() const { return (sockaddr_in*)&m_addr; }
void Connection::getPacks(SOCKET sock) {
std::vector<char*> lsPck;
Input in;
Sync sync;
recvPacksFrom(sock, &m_buf, m_addr, &lsPck);
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;
m_input_vector.push_back(in);
}
break;
case SYNC:
if (Deserialize(&sync, pck, &bsize))
m_nsync = true;
break;
default: break;
}
}
lsPck.clear();
} }
void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer) {
static int outs = 0;
static Timestamp last = 0;
while (!m_output_vector.empty()) {
Output out = m_output_vector.front();
for (auto& [key, conn] : conns) {
if (m_playinfo.id == conn->GetHash(false))
continue;
sendPackTo<Output>(sock, &out, &m_bufout, conn->getAddr());
}
++outs;
[[unlikely]] if (last == 0) // !
last = out.timestamp;
outs += out.timestamp + last;
if (outs >= 1000) {
outs -= 1000;
Sync sync;
sync.hp = player->GetHP();
sync.timestamp = out.timestamp;
sync.position = out.position;
sync.sid = m_loginfo.sid;
sync.timer = timer;
sync.timestamp = out.timestamp;
sync.ammo = -1;
sendPackTo<Sync>(sock, &sync, &m_bufout, &m_addr);
}
m_output_vector.pop_front();
}
}
Timestamp Connection::Run(World* world) {
Input in, last;
Output out;
Timestamp tstamp = 0;
float el;
if (m_input_manifest.size() < 2)
return tstamp;
if (player->AmIDead()) {
m_input_manifest.clear();
return tstamp;
}
while (m_last_in < m_input_vector.size() - 1) {
in = m_input_vector.at(m_last_in + 1);
last = m_input_vector.at(m_last_in);
el = (double)(in.timestamp - last.timestamp) / 1000.;
if (m_shoot_acc > 0.) {
m_shoot_acc -= el;
if (m_shoot_acc < 0.)
m_shoot_acc = 0;
}
player->SetDirection(in.direction);
player->ApplyPhysics(player->GetInput(in.keys.forward,
in.keys.backward,
in.keys.left,
in.keys.right,
in.keys.jump, false, el), world, el);
if (player->GetPosition().y < -20.) {
player->InflictDamage(9000.);
player->Killer = GetHash(true);
}
out.states.jumping = player->GetIsAirborne();
out.states.running = player->GetVelocity().Length() > .5f;
out.states.still = !out.states.running && !out.states.jumping;
out.states.hit = player->m_hit;
player->m_hit = false;
if (player->AmIDead()) {
in.keys.shoot = false;
in.keys.block = false;
out.states.dead = true;
}
static bool toggle = false;
if (in.keys.block) {
if (!toggle) {
toggle = true;
bool block = false;
ChunkMod* cmod = world->ChangeBlockAtCursor(BLOCK_TYPE::BTYPE_METAL,
player->GetPosition(),
player->GetDirection(),
block, true);
if (cmod)
ChunkDiffs.push_back(std::move(cmod));
}
}
else toggle = false;
out.states.shooting = in.keys.shoot;
if (out.states.jumping && out.states.shooting)
out.states.jumpshot = true;
else out.states.jumpshot = false;
if (in.keys.shoot && m_shoot_acc <= 0.) {
Bullets.push_back(std::move(new Bullet(player->GetPOV() + player->GetDirection(), player->GetDirection(), GetHash(true))));
m_shoot_acc = BULLET_TIME;
}
out.position = player->GetPositionAbs();
out.direction = in.direction;
out.timestamp = in.timestamp;
out.id = m_playinfo.id;
m_output_manifest[out.timestamp] = out;
m_output_vector.push_back(out);
tstamp = out.timestamp;
++m_last_in;
}
return tstamp;
}
void Connection::CleanInputManifest(Timestamp time) {
// auto wat = m_input_manifest.find(time);
// while (wat != m_input_manifest.begin())
// m_input_manifest.erase(wat--);
}
Timestamp Connection::GetTStamp() const { return m_tstamp; }

View File

@ -2,19 +2,22 @@
#define CONNECTION_H__ #define CONNECTION_H__
#include <deque> #include <deque>
#include <map> #include <unordered_map>
#include "../SQCSim-common/player.h" #include "../SQCSim-common/player.h"
#include "../SQCSim-common/vector3.h" #include "../SQCSim-common/vector3.h"
#include "../SQCSim-common/netprotocol.h" #include "../SQCSim-common/netprotocol.h"
#include "../SQCSim-common/world.h"
#include "define.h" #include "define.h"
using namespace netprot;
class Connection { class Connection {
public: public:
Connection( Connection(
SOCKET sock, SOCKET sock,
sockaddr_in sockaddr, sockaddr_in sockaddr,
netprot::LoginInfo log, LoginInfo *log,
netprot::PlayerInfo play); PlayerInfo *play);
~Connection(); ~Connection();
Player* player = nullptr; Player* player = nullptr;
@ -23,20 +26,47 @@ public:
uint64_t GetTeamHash() const; uint64_t GetTeamHash() const;
std::string GetName() const; std::string GetName() const;
void AddInput(netprot::Input in); void AddInput(Input in);
netprot::Output* getOutput(Timestamp time); Output* getOutput(Timestamp time);
netprot::Sync getSync(Timestamp time); Sync getSync(Timestamp time);
SOCKET getSock() const;
PlayerInfo* getInfo() const;
sockaddr_in* getAddr() const;
void getPacks(SOCKET sock);
void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer);
Timestamp Run(World* world);
void CleanInputManifest(Timestamp time); void CleanInputManifest(Timestamp time);
bool m_nsync = true;
std::vector<Bullet*> Bullets;
std::vector<ChunkMod*> ChunkDiffs;
Timestamp GetTStamp() const;
private: private:
std::map<Timestamp, netprot::Input> m_input_manifest; std::unordered_map<Timestamp, Input> m_input_manifest;
std::map<Timestamp, netprot::Output> m_output_manifest; std::vector<Input> m_input_vector;
std::map<Timestamp, netprot::Chat> m_chatlog; std::unordered_map<Timestamp, Output> m_output_manifest;
std::deque<Output> m_output_vector;
std::unordered_map<Timestamp, Chat> m_chatlog;
float m_shoot_acc = 0;
Timestamp m_tstamp = 0;
SOCKET m_sock; SOCKET m_sock;
sockaddr_in m_addr; sockaddr_in m_addr;
netprot::LoginInfo m_loginfo; LoginInfo m_loginfo;
netprot::PlayerInfo m_playinfo; PlayerInfo m_playinfo;
Timestamp m_startsync;
uint64_t m_last_in = 0,
m_last_out = 0;
Buffer m_buf,
m_bufout;
}; };
#endif #endif

View File

@ -9,9 +9,22 @@
#define MAX_CONNECTIONS 16 #define MAX_CONNECTIONS 16
#define ID_LIST_SIZE 127 #define ID_LIST_SIZE 127
#define BUFFER_LENGTH 150 #define SRV_MANUAL_SETUP true
typedef unsigned char LogDest; // @ = Dead guy, $ = Killer.
enum LOG_DEST { CONSOLE, LOGFILE, LOG_LAST }; const std::vector<std::string> DEATHMESSAGES = { "@ has gone to meet their maker.",
"@ has bit the dust, if you know what I mean.",
"@ has ceased to be.",
"@ is no more.",
"@ is like, super dead.",
"Requiescat In Pace, @.",
"So long, @, and thanks for all the lols!",
"@ has a bad case of being dead.",
"@ has finally seen the light!",
"Thought @ was hot; guess what? He's not. He is dead, dead, dead.",
"@ did not want to live forever.",
"$ made @ die for their country.",
"$ has become death, destroyer of @.",
"$ did not make @ feel lucky." };
#endif #endif

View File

@ -1,9 +1,13 @@
#include "server.h" #include "server.h"
int main() { int main() {
Server* server = new Server(); std::unique_ptr<Server> server = std::make_unique<Server>();
if (server->Init() == 0) if (server->Init() == 0)
if (server->Ready() == 0) while (server->Ready() == 0) {
server->Run(); server->Run();
delete server; if (!server->NewGameRequested())
break;
server->Cleanup();
}
server->DeInit();
} }

View File

@ -1,6 +1,6 @@
#include "server.h" #include "server.h"
Server::Server(LogDest log) { Server::Server(LOG_DEST log) {
m_log = log; m_log = log;
if (log == LOG_DEST::LOGFILE) { if (log == LOG_DEST::LOGFILE) {
m_logfile = std::ofstream("server.log", std::ofstream::out); m_logfile = std::ofstream("server.log", std::ofstream::out);
@ -18,6 +18,10 @@ Server::~Server() {
closesocket(m_sock_udp); closesocket(m_sock_udp);
if (m_sock_tcp) if (m_sock_tcp)
closesocket(m_sock_tcp); closesocket(m_sock_tcp);
for (const auto& [key, player] : m_conns)
closesocket(player->getSock());
m_conns.clear();
delete m_world;
#ifdef _WIN32 #ifdef _WIN32
WSACleanup(); WSACleanup();
#endif #endif
@ -65,85 +69,354 @@ int Server::Init() {
} }
int Server::Ready() { int Server::Ready() {
int nbrjoueurs = 0,
nbrconn = 0;
bool readystart = false;
do {
Log("Entrez la duree de la partie: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try {
m_game.countdown = std::stoi(m_buf.ptr);
}
catch (const std::exception& e) {
Log(e.what(), true, false);
m_game.countdown = 0;
}
} while (m_game.countdown < 1);
m_game.seed = 9370707;
/*do {
Log("Entrez le seed de la partie: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try {
std::stoi(m_buf.ptr);
}
catch (const std::exception& e) {
Log(e.what(), true, false);
m_game.seed = 0;
}
} while (m_game.seed < 1);*/
do {
Log("Entrez le nombre de joueurs: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try {
nbrjoueurs = std::stoi(m_buf.ptr);
}
catch (const std::exception& e) {
Log(e.what(), true, false);
nbrjoueurs = 0;
}
if (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS)
Log("Nombre de joueurs invalide.", true, false);
} while (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS);
m_game.gameType = 1;
if (listen(m_sock_tcp, MAX_CONNECTIONS) < 0) { if (listen(m_sock_tcp, MAX_CONNECTIONS) < 0) {
Log("Écoute sur le port TCP.", true, true); Log("Ecoute sur le port TCP.", true, true);
return 1; return 1;
} }
char* buf = new char[150];
uint32_t buflen = 150;
bool readystart = false;
srand(time(NULL));
Log("À l'écoute sur le port: " + std::to_string(SRV_PORT), false, false);
buildIdList(ID_LIST_SIZE); buildIdList(ID_LIST_SIZE);
m_game.countdown = 360; Log("A l'ecoute sur le port: " + std::to_string(SRV_PORT), false, false);
m_game.gameType = 1;
m_game.seed = 9370707;
while (!readystart) { while (!readystart) {
sockaddr_in sockad; sockaddr_in sockad;
unsigned int addrlen = sizeof(sockad); addrlen_t addrlen = sizeof(sockad);
SOCKET sock = accept(m_sock_tcp, (sockaddr*)&sockad, &addrlen); SOCKET sock = accept(m_sock_tcp, (sockaddr*)&sockad, &addrlen);
if (sock < 0) if (sock < 0)
Log("Erreur de connexion", true, false); Log("Erreur de connexion", true, false);
else if (sock > 0) { else if (sock > 0) {
std::string str = "Nouvelle connection provenant de: "; std::string str = "Nouvelle connexion provenant de: ";
char* strbuf = new char[BUFFER_LENGTH]; str.append(inet_ntop(AF_INET, &sockad.sin_addr, m_buf.ptr, m_buf.len)).append(": ").append(std::to_string(sockad.sin_port));
uint32_t strbuflen = BUFFER_LENGTH;
str.append(inet_ntop(AF_INET, &sockad.sin_addr, strbuf, strbuflen)).append(": ").append(std::to_string(sockad.sin_port)); if (recv(sock, m_buf.ptr, m_buf.len, 0) > 0) {
PlayerInfo* play = new PlayerInfo();
if (recv(sock, buf, buflen, 0) > 0) { m_buf.len = BUFFER_LENGTH;
netprot::LoginInfo log; Packet pck = getPack(&m_buf);
netprot::PlayerInfo play; if (pck.type != PACKET_TYPE::LOGINF) {
if (netprot::Deserialize(&log, buf, buflen)) { Log("Paquet invalide.", true, false);
log.sid = getUniqueId(); if (pck.type != PACKET_TYPE::ERR)
netprot::emptyPack(pck);
log.tid = 0; continue; // Passer au prochain appel si c'est pas un LoginInfo ou un LoginInfo invalide qui rentre.
str.append(" Nom: ").append(log.name);
Log(str, false, false);
str = "";
str.append(log.name).append(" SID: [").append(std::to_string(log.sid).append("]"));
Log(str, false, false);
//netprot::Serialize(&log, &buf, &buflen);
//send(sock, buf, buflen, 0);
//buflen = 150;
sendPack<netprot::LoginInfo>(sock, &log, &buf, &buflen);
play.id = getUniqueId();
memcpy(play.name, log.name, std::strlen(log.name) + 1);
play.tid = log.tid;
//netprot::Serialize(&m_game, &buf, &buflen);
//send(sock, buf, buflen, 0);
sendPack<netprot::GameInfo>(sock, &m_game, &buf, &buflen);
Connection* conn = new Connection(sock, sockad, log, play);
m_players[log.sid] = conn;
readystart = true;
} }
LoginInfo* log = (LoginInfo*)pck.ptr;
log->sid = getUniqueId();
log->tid = 1145389380; // TODO: À changer si on implemente un mode en equipe.
Log(str.append(" Nom: ").append(log->name), false, false);
str.clear();
sendPackTo<LoginInfo>(m_sock_udp, log, &m_buf, &sockad);
play->id = getUniqueId();
play->tid = log->tid;
strcpy(play->name, 32, log->name);
Log(str.append(play->name).append(" SID: [").append(std::to_string(log->sid)).append("]")
.append(" ID: [").append(std::to_string(play->id)).append("]")
.append(" TID: [").append(std::to_string(play->tid)).append("]"), false, false);
play->tid = log->tid;
sendPackTo<GameInfo>(m_sock_udp, &m_game, &m_buf, &sockad);
Connection* conn = new Connection(sock, sockad, log, play);
m_conns[log->sid] = conn;
if (++nbrconn >= nbrjoueurs)
readystart = true;
} }
} }
} }
for (auto& [keyin, playin] : m_conns) // Not pretty, but it works.
for (auto& [keyout, playout] : m_conns) {
if (keyin == keyout)
continue;
sendPackTo<PlayerInfo>(m_sock_udp, playout->getInfo(), &m_buf, playin->getAddr()); // et envoyer les infos des joueurs distants au nouveau joueur.
}
return 0; return 0;
} }
void Server::Run() { void Server::Run() {
bool endgame = false;
Input in;
sockaddr_in sockad;
addrlen_t socklen = sizeof(sockad);
Log("Partie en cours...", false, false); Log("Debut de la partie...", false, false);
int players = m_conns.size();
m_world = new World();
m_world->SetSeed(m_game.seed);
m_world->GetChunks().Reset(nullptr);
m_world->BuildWorld();
for (auto& [key, conn] : m_conns) { // Creation des instances de joueurs et premier sync.
if (!conn) {
m_conns.erase(key);
continue;
}
int x = (rand() % (CHUNK_SIZE_X * WORLD_SIZE_X - 1) - (CHUNK_SIZE_X * WORLD_SIZE_X / 2)) / 8,
y = (rand() % (CHUNK_SIZE_Y * WORLD_SIZE_Y - 1) - (CHUNK_SIZE_Y * WORLD_SIZE_Y / 2)) / 8;
conn->player = new Player(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f));
conn->player->m_username = conn->GetName();
m_players[key] = conn->player;
Sync sync;
sync.position = conn->player->GetPositionAbs();
sync.hp = conn->player->GetHP();
sync.sid = key;
sync.ammo = 0;
sync.timestamp = 0;
sync.timer = m_game.countdown;
sendPackTo<Sync>(m_sock_udp, &sync, &m_buf, conn->getAddr());
}
int timer = m_game.countdown, sync_acc = 0, deadplayers = 0;
std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now();
Timestamp last = 0;
std::vector<Chat*> chatlog;
std::vector<ChunkMod*> chunkdiffs;
std::vector<Bullet*> bullets;
std::vector<std::vector<Bullet*>::iterator> bullit;
std::vector<BulletAdd*> netbull;
std::vector<char*> lsPck;
Chat* startchat = new Chat();
startchat->src_id = 0;
char startmess[] = "How would -YOU- like to die today, motherf-words?";
strcpy(startchat->mess, 140, startmess);
chatlog.emplace_back(startchat);
while (!endgame) {
using namespace std::chrono;
Timestamp tstamp = duration_cast<milliseconds>(high_resolution_clock::now() - start).count();
if (last == 0)
last = tstamp;
sync_acc += tstamp - last;
if (sync_acc >= 1000) {
while (sync_acc >= 1000)
sync_acc -= 1000;
--timer;
std::string str = "Timer: ";
Log(str.append(std::to_string(timer)), false, false);
}
last = tstamp;
for (auto& [key, conn] : m_conns) {
/* In */
Input in; Sync sync;
recvPacks(m_sock_udp, &m_buf, &lsPck);
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)) {
if (m_conns.count(in.sid))
m_conns[in.sid]->AddInput(in);
}
break;
case SYNC:
if (Deserialize(&sync, pck, &bsize)) {}
break;
default: break;
}
}
lsPck.clear();
/* Process */
if (conn->m_nsync) {
Timestamp tstamp = conn->Run(m_world);
if (conn->player->AmIDead()) {
Chat* chat = new Chat();
chat->dest_id = chat->dest_team_id = chat->src_id = 0;
std::string killer = m_conns.at(conn->player->Killer)->player->GetUsername();
std::string mess = getDeathMessage(conn->player->GetUsername(), killer);
strcpy(chat->mess, 140, mess.c_str());
chatlog.emplace_back(chat);
++deadplayers;
conn->m_nsync = false;
}
else {
for (auto& chmo : conn->ChunkDiffs)
chunkdiffs.emplace_back(std::move(chmo));
conn->ChunkDiffs.clear();
for (auto& bull : conn->Bullets) {
bullets.emplace_back(bull);
//Log("POW!", false, false);
BulletAdd* nbul = new BulletAdd();
nbul->pos = bull->getPos();
nbul->dir = bull->getVel();
nbul->id = key;
nbul->tstamp = tstamp;
netbull.emplace_back(std::move(nbul));
}
conn->Bullets.clear();
}
/* Out */
conn->sendPacks(m_sock_udp, m_conns, timer);
}
if ((deadplayers == players - 1 && deadplayers != 0) || timer <= 0)
endgame = true;
}
for (auto& bull : netbull) {
for (auto& [key, conn] : m_conns)
if (bull->id != conn->GetHash(false)) // Pour pas repitcher au joueur sa propre balle.
sendPackTo<BulletAdd>(m_sock_udp, bull, &m_buf, conn->getAddr());
delete bull;
}
netbull.clear();
for (auto bull = bullets.begin(); bull != bullets.end(); ++bull) {
ChunkMod* cmod = nullptr;
Bullet* bullet = *bull;
if (bullet->Update(m_world, (1. / 60.), 20, m_players, &cmod)) {
if (cmod)
chunkdiffs.emplace_back(cmod);
bullit.push_back(bull);
delete bullet;
}
}
for (auto& bull: bullit)
bullets.erase(bull);
bullit.clear();
for (auto& chat : chatlog) {
Log(chat->mess, false, false);
for (auto& [key, conn] : m_conns)
sendPackTo<Chat>(m_sock_udp, chat, &m_buf, conn->getAddr());
delete chat;
}
chatlog.clear();
for (auto& chmo : chunkdiffs) {
for (auto& [key, conn] : m_conns)
sendPackTo<ChunkMod>(m_sock_udp, chmo, &m_buf, conn->getAddr());
delete chmo;
}
chunkdiffs.clear();
}
Chat end;
end.src_id = 0;
char endmess[] = "Game over, man. Game over.";
strcpy(end.mess, 140, endmess);
for (auto& [key, conn] : m_conns) {
std::string str = conn->player->GetUsername();
Log(str.append(" ").append(std::to_string(conn->player->GetHP())), false, false);
}
for (auto& [key, conn] : m_conns)
sendPackTo<Chat>(m_sock_udp, &end, &m_buf, conn->getAddr());
// TODO: Gérer les 2-3 secondes post-game avant le billboard pour pas avoir un whiplash à la fin de la game.
char* ch = new char[2];
std::cout << "Nouvelle partie? [o/N] ";
std::cin.getline(ch, 2);
std::cout << std::endl;
m_exit = true;
if (ch[0] == 'o' || ch[0] == 'O')
m_exit = false;
delete[] ch;
} }
void Server::Cleanup() {
for (auto& [key, conn] : m_conns)
delete conn;
m_conns.clear();
m_players.clear();
delete m_world;
m_world = nullptr;
}
void Server::DeInit() {
if (m_logfile.is_open())
m_logfile.close();
if (m_sock_udp)
closesocket(m_sock_udp);
if (m_sock_tcp)
closesocket(m_sock_tcp);
#ifdef _WIN32
WSACleanup();
#endif
}
bool Server::NewGameRequested() const { return !m_exit; }
inline std::string Server::LogTimestamp() { inline std::string Server::LogTimestamp() {
time_t rawtime; time_t rawtime;
struct tm timeinfo; tm timeinfo;
char buffer[80]; char buffer[50];
time(&rawtime); time(&rawtime);
@ -161,32 +434,42 @@ inline std::string Server::LogTimestamp() {
void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) { void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) {
switch (m_log) { switch (m_log) {
case LOG_DEST::LOGFILE: using enum LOG_DEST; // C++20!
case LOGFILE:
m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl; m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
break; break;
case LOG_DEST::CONSOLE: case CONSOLE: [[fallthrough]]; // Pour dire que c'est voulu que ça traverse vers le case en dessous (C++17!)
default: default:
std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl; std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
break; break;
} }
if (is_fatal) { if (is_fatal) {
if (m_logfile.is_open())
m_logfile.close();
if (m_sock_udp) if (m_sock_udp)
closesocket(m_sock_udp); closesocket(m_sock_udp);
if (m_sock_tcp) if (m_sock_tcp)
closesocket(m_sock_tcp); closesocket(m_sock_tcp);
for (const auto& [key, player] : m_conns)
closesocket(player->getSock());
delete m_world;
m_conns.clear();
#ifdef _WIN32 #ifdef _WIN32
WSACleanup(); WSACleanup();
#endif #endif
exit(-1);
} }
} }
void Server::buildIdList(size_t size) { void Server::buildIdList(size_t size) {
std::set<uint64_t> lst; std::set<uint64_t> lst;
do lst.insert(((uint64_t)rand() << 25) % 8675309); // EIGHT SIX SEVENFIVE THREE AUGHT NIIIIIIiIIiiIiINE! srand(time(NULL));
do lst.insert(((uint64_t)rand() << 32 | rand()));
while (lst.size() < size); while (lst.size() < size);
m_ids = std::vector<uint64_t>(lst.begin(), lst.end()); m_ids = std::vector<uint64_t>(lst.begin(), lst.end());
} }
@ -196,132 +479,33 @@ uint64_t Server::getUniqueId() {
return id; return id;
} }
// Test serialize/deserialize: std::string Server::getDeathMessage(std::string username, std::string killer) const {
/* std::string mess;
netprot::LoginInfo log, log2; std::string temp = DEATHMESSAGES.at(rand() % DEATHMESSAGES.size());
std::cout << "Nom? "; size_t ind = temp.find('@');
std::cin.getline(log.name, 32); // NO! STD::CIN >> VARIABLE;! EVEEEEEERRRR!!! size_t indk = temp.find('$');
log.sid = 12345; bool bypass = false;
char* buf = new char[150];
uint32_t buflen = 150;
netprot::Serialize(&log, &buf, &buflen); if (indk == std::string::npos)
bypass = true;
bool is_work = netprot::Deserialize(&log2, buf, buflen); if (ind < indk || bypass) {
mess.append(temp.substr(0, ind));
mess.append(username);
if (!bypass) {
mess.append(temp.substr(ind + 1, indk - 1));
mess.append(killer);
mess.append(temp.substr(indk + 1));
}
else mess.append(temp.substr(ind + 1));
}
else {
mess.append(temp.substr(0, indk));
mess.append(killer);
mess.append(temp.substr(indk + 1, ind - 1));
mess.append(username);
mess.append(temp.substr(ind + 1));
}
std::string str; return mess;
str.append(is_work ? "Y " : "N ").append(log2.name).append(": ").append(std::to_string(log2.sid)); }
Log(str, false, false);
*/
///* Recevoir paquet */
//while (true) {
// char buffer[2048];
// sockaddr_in client;
//
//#ifdef _WIN32 // Mais pourquoi?
// int clen = sizeof(client);
//#else
// unsigned int clen = sizeof(client);
//#endif
//
// int count = recvfrom(socket_udp, buffer, sizeof(buffer) - 1, 0, (sockaddr*)&client, &clen);
//
// if (count < 0) {
// Log("Erreur de reception de paquet.", socket_udp);
// return 4;
// }
//
// buffer[count] = '\0';
//
// /* Gérer le paquet reçu */
// std::string commande(buffer);
//
// if (commande.find("echo ") == 0) { /* ECHO */
// std::string::size_type pos = commande.find(' ');
// std::string parametres = commande.substr(pos + 1);
//
// sendto(socket_udp, parametres.c_str(), parametres.length(), 0, (const sockaddr*)&client, sizeof(client));
// }
// else if (commande.find("date ") == 0) { /* DATE */
// time_t rawtime;
// struct tm* timeinfo = new tm();
// char tbuffer[80];
//
// time(&rawtime);
//
//#ifdef _WIN32
// localtime_s(timeinfo, &rawtime);
//#else
// localtime_r(&rawtime, timeinfo);
//#endif
//
// strftime(tbuffer, 80, "%a %b %e %T %G", timeinfo);
//
// sendto(socket_udp, tbuffer, sizeof(tbuffer), 0, (const sockaddr*)&client, sizeof(client));
// delete timeinfo;
// }
// else if (commande.find("ping ") == 0) { /* PING */
// sendto(socket_udp, "pong", sizeof("pong"), 0, (const sockaddr*)&client, sizeof(client));
// }
// else if (commande.find("usager ") == 0) { /* USAGER */
// std::string user;
//
//#ifdef _WIN32
// wchar_t userbuf[30];
// DWORD usersize = 30;
//
// GetUserNameW(userbuf, &usersize);
//
// std::wstring wuser = userbuf;
// user = std::string(wuser.begin(), wuser.end());
//#else
// char ptr[30];
// getlogin_r(ptr, sizeof(ptr) - 1);
// user = std::string(ptr);
//#endif
//
// sendto(socket_udp, user.c_str(), user.length(), 0, (const sockaddr*)&client, sizeof(client));
// }
// else if (commande.find("exec ") == 0) { /* EXEC */
// std::string::size_type pos = commande.find(' ');
// std::string parametres = commande.substr(pos + 1);
//
// FILE* pipe = nullptr;
// char buffer[301]; // 300 caractères + '\0'
// std::string reponse;
//
// pipe = popen(parametres.c_str(), "r");
//
// if (!pipe)
// reponse = "Erreur de commande!";
// else while (!feof(pipe)) {
// if (fgets(buffer, sizeof(buffer) - 1, pipe))
// reponse += buffer;
// }
//
// if (pipe)
// pclose(pipe);
//
// if (reponse.length() > 300)
// reponse = reponse.substr(0, 300);
// else if (reponse.length() < 1)
// reponse = "OK!";
//
// sendto(socket_udp, reponse.c_str(), reponse.length(), 0, (const sockaddr*)&client, sizeof(client));
// }
// else if (commande.find("bye ") == 0) { /* BYE */
// Log("", 0); // Message d'erreur pas de message d'erreur!
// return 0;
// }
// else sendto(socket_udp, "huh?", sizeof("huh?"), 0, (const sockaddr*)&client, sizeof(client)); /* DEFAULT */
//}
//
///* Ce bout de code ne devrait theoriquement jamais etre atteint, mais au cas. */
//Log("", 0);
//return 0;
//return false;
//}
//

View File

@ -1,54 +1,61 @@
#ifndef SERVER_H__ #ifndef SERVER_H__
#define SERVER_H__ #define SERVER_H__
#include <cstdlib>
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include <set> #include <set>
#include <string> #include <string>
#include <unordered_map>
#include "../SQCSim-common/world.h" #include "../SQCSim-common/world.h"
#include "../SQCSim-common/netprotocol.h" #include "../SQCSim-common/netprotocol.h"
#include "define.h" #include "define.h"
#include "connection.h" #include "connection.h"
using namespace netprot;
class Server { class Server {
public: public:
Server(LogDest log = LOG_DEST::CONSOLE); enum LOG_DEST: unsigned char { CONSOLE, LOGFILE, LOG_LAST };
Server(LOG_DEST log = LOG_DEST::CONSOLE);
~Server(); ~Server();
int Init(); int Init();
int Ready(); int Ready();
void Run(); void Run();
void Cleanup();
void DeInit();
bool NewGameRequested() const;
private: private:
#ifdef _WIN32 #ifdef _WIN32
WSADATA m_wsaData; WSADATA m_wsaData;
#endif #endif
SOCKET m_sock_udp = 0, SOCKET m_sock_udp = 0,
m_sock_tcp = 0; m_sock_tcp = 0;
LogDest m_log; LOG_DEST m_log;
std::ofstream m_logfile; std::ofstream m_logfile;
std::map<uint64_t, Connection*> m_players; Buffer m_buf;
std::map <Timestamp, netprot::Chat> m_chatlog;
std::unordered_map<uint64_t, Player*> m_players;
std::unordered_map<uint64_t, Connection*> m_conns;
std::unordered_map<Timestamp, Chat> m_chatlog;
std::vector<uint64_t> m_ids; std::vector<uint64_t> m_ids;
netprot::GameInfo m_game; GameInfo m_game;
World* m_world = nullptr; World* m_world = nullptr;
bool m_exit = true;
std::string LogTimestamp(); std::string LogTimestamp();
void Log(std::string str, bool is_error, bool is_fatal); void Log(std::string str, bool is_error, bool is_fatal);
void buildIdList(size_t size); void buildIdList(size_t size);
uint64_t getUniqueId(); uint64_t getUniqueId();
template <class T> void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen); std::string getDeathMessage(std::string username, std::string killer) const;
}; };
template <class T>
void Server::sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen) {
netprot::Serialize(pack, buf, buflen);
send(sock, *buf, *buflen, 0);
*buflen = BUFFER_LENGTH;
}
#endif #endif

View File

@ -20,33 +20,39 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="audio.h" /> <ClInclude Include="audio.h" />
<ClInclude Include="booster.h" />
<ClInclude Include="connector.h" /> <ClInclude Include="connector.h" />
<ClInclude Include="define.h" /> <ClInclude Include="define.h" />
<ClInclude Include="engine.h" /> <ClInclude Include="engine.h" />
<ClInclude Include="mesh.h" /> <ClInclude Include="mesh.h" />
<ClInclude Include="openglcontext.h" /> <ClInclude Include="openglcontext.h" />
<ClInclude Include="remoteplayer.h" />
<ClInclude Include="settings.h" />
<ClInclude Include="shader.h" /> <ClInclude Include="shader.h" />
<ClInclude Include="skybox.h" /> <ClInclude Include="skybox.h" />
<ClInclude Include="texture.h" /> <ClInclude Include="texture.h" />
<ClInclude Include="textureatlas.h" /> <ClInclude Include="textureatlas.h" />
<ClInclude Include="tool.h" /> <ClInclude Include="tool.h" />
<ClInclude Include="vertexbuffer.h" /> <ClInclude Include="vertexbuffer.h" />
<ClInclude Include="worldrenderer.h" /> <ClInclude Include="renderer.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="audio.cpp" /> <ClCompile Include="audio.cpp" />
<ClCompile Include="booster.cpp" />
<ClCompile Include="connector.cpp" /> <ClCompile Include="connector.cpp" />
<ClCompile Include="engine.cpp" /> <ClCompile Include="engine.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="mesh.cpp" /> <ClCompile Include="mesh.cpp" />
<ClCompile Include="openglcontext.cpp" /> <ClCompile Include="openglcontext.cpp" />
<ClCompile Include="remoteplayer.cpp" />
<ClCompile Include="settings.cpp" />
<ClCompile Include="shader.cpp" /> <ClCompile Include="shader.cpp" />
<ClCompile Include="skybox.cpp" /> <ClCompile Include="skybox.cpp" />
<ClCompile Include="texture.cpp" /> <ClCompile Include="texture.cpp" />
<ClCompile Include="textureatlas.cpp" /> <ClCompile Include="textureatlas.cpp" />
<ClCompile Include="tool.cpp" /> <ClCompile Include="tool.cpp" />
<ClCompile Include="vertexbuffer.cpp" /> <ClCompile Include="vertexbuffer.cpp" />
<ClCompile Include="worldrenderer.cpp" /> <ClCompile Include="renderer.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\SQCSim-common\SQCSim-common.vcxproj"> <ProjectReference Include="..\SQCSim-common\SQCSim-common.vcxproj">
@ -85,7 +91,7 @@
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>ClangCL</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
@ -130,7 +136,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -145,7 +151,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -162,13 +168,13 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Fast</FloatingPointModel> <FloatingPointModel>Fast</FloatingPointModel>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
@ -184,13 +190,13 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Fast</FloatingPointModel> <FloatingPointModel>Fast</FloatingPointModel>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>

View File

@ -47,7 +47,16 @@
<ClInclude Include="mesh.h"> <ClInclude Include="mesh.h">
<Filter>Fichiers d%27en-tête</Filter> <Filter>Fichiers d%27en-tête</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="worldrenderer.h"> <ClInclude Include="renderer.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<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> <Filter>Fichiers d%27en-tête</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
@ -88,7 +97,16 @@
<ClCompile Include="mesh.cpp"> <ClCompile Include="mesh.cpp">
<Filter>Fichiers sources</Filter> <Filter>Fichiers sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="worldrenderer.cpp"> <ClCompile Include="renderer.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
<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> <Filter>Fichiers sources</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

View File

@ -14,7 +14,7 @@ Audio::Audio(const char * music) {
m_engine->setRolloffFactor(2); m_engine->setRolloffFactor(2);
m_engine->setDefault3DSoundMinDistance(.1); m_engine->setDefault3DSoundMinDistance(.1);
m_engine->setDefault3DSoundMaxDistance(1000); m_engine->setDefault3DSoundMaxDistance(1000);
m_music = m_engine->play2D(music, false, true, true, irrklang::ESM_STREAMING); m_music = m_engine->play2D(music, true, true, true, irrklang::ESM_STREAMING);
} }
Audio::~Audio() { Audio::~Audio() {
@ -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::ToggleMusicState() { m_music->setIsPaused(!m_music->getIsPaused()); }
void Audio::PauseEngine() { m_engine->setAllSoundsPaused(); } void Audio::PauseEngine() { m_engine->setAllSoundsPaused(); }
float Audio::GetMusicVolume() const {
return m_music->getVolume();
}

View File

@ -33,6 +33,8 @@ public:
void ToggleMusicState(); void ToggleMusicState();
void PauseEngine(); void PauseEngine();
float GetMusicVolume() const;
}; };
#endif // AUDIO_H__ #endif // AUDIO_H__

46
SQCSim2021/booster.cpp Normal file
View 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
View 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

View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.18.4)
project(SQCSim-Client VERSION 0.8) project(SQCSim-Client VERSION 0.8)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_STANDARD_REQUIRED True) set(CMAKE_STANDARD_REQUIRED True)
set(CMAKE_BUILD_DIRECTORY "./build") set(CMAKE_BUILD_DIRECTORY "./build")
@ -28,6 +28,7 @@ include_directories(
add_library(SQCSim-common add_library(SQCSim-common
"${SQCSIM_COMMON_DIR}boostinfo.cpp"
"${SQCSIM_COMMON_DIR}blockinfo.cpp" "${SQCSIM_COMMON_DIR}blockinfo.cpp"
"${SQCSIM_COMMON_DIR}bullet.cpp" "${SQCSIM_COMMON_DIR}bullet.cpp"
"${SQCSIM_COMMON_DIR}chunk.cpp" "${SQCSIM_COMMON_DIR}chunk.cpp"
@ -40,6 +41,7 @@ add_library(SQCSim-common
add_executable(SQCSim-client add_executable(SQCSim-client
"../audio.cpp" "../audio.cpp"
"../booster.cpp"
"../connector.cpp" "../connector.cpp"
"../engine.cpp" "../engine.cpp"
"../mesh.cpp" "../mesh.cpp"
@ -50,7 +52,8 @@ add_executable(SQCSim-client
"../textureatlas.cpp" "../textureatlas.cpp"
"../tool.cpp" "../tool.cpp"
"../vertexbuffer.cpp" "../vertexbuffer.cpp"
"../worldrenderer.cpp" "../renderer.cpp"
"../remoteplayer.cpp"
"../main.cpp" "../main.cpp"
) )

View File

@ -42,7 +42,7 @@ int Connector::Init() {
return 0; return 0;
} }
int Connector::Connect(char* srv_addr, std::string name) { int Connector::Connect(const char* srv_addr, std::string name) {
sockaddr_in add; sockaddr_in add;
m_srvsockaddr.sin_family = AF_INET; m_srvsockaddr.sin_family = AF_INET;
m_srvsockaddr.sin_port = htons(SRV_PORT); m_srvsockaddr.sin_port = htons(SRV_PORT);
@ -54,44 +54,65 @@ int Connector::Connect(char* srv_addr, std::string name) {
if (connect(m_sock_tcp, (sockaddr*)&m_srvsockaddr, sizeof(m_srvsockaddr)) < 0) { if (connect(m_sock_tcp, (sockaddr*)&m_srvsockaddr, sizeof(m_srvsockaddr)) < 0) {
std::cout << "Échec de la connexion." << std::endl; std::cout << "Échec de la connexion." << std::endl;
return 2;
} }
char* buf = new char[150]; flag_t flag = 1;
uint32_t buflen = 150; if (ioctl(m_sock_tcp, SOCK_NONBLOCK, &flag) < 0) {
std::cout << "Impossible de mettre le socket en mode non-bloquant." << std::endl;
return 3;
}
netprot::Buffer bf;
netprot::LoginInfo log; netprot::LoginInfo log;
memcpy(&log.name, name.c_str(), name.size() + 1); strcpy(log.name, 32, name.c_str());
netprot::Serialize(&log, &buf, &buflen); netprot::sendPack(m_sock_tcp, &log, &bf);
int se = send(m_sock_tcp, buf, buflen, 0); bool ready = false;
int errors = 0;
std::vector<char*> lsPck;
while (!ready) {
netprot::recvPacks(m_sock_udp, &bf, &lsPck);
delete[] buf; for (auto& pck : lsPck) {
buf = new char[150] {0}; uint32_t bsize = bf.len - (pck - bf.ptr);
buflen = 150; netprot::PlayerInfo* pl = nullptr;
int rpack = 0; switch (netprot::getType(pck, 1)) {
using enum netprot::PACKET_TYPE;
while (rpack < 2) { case LOGINF:
recv(m_sock_tcp, buf, buflen, 0); if (!netprot::Deserialize(&m_loginfo, pck, &bsize))
++errors;
switch (netprot::getType(buf, buflen)) { break;
case netprot::PACKET_TYPE::LOGINF: case GAMEINFO:
if (!netprot::Deserialize(&m_loginfo, buf, buflen)) { if (!netprot::Deserialize(&m_gameinfo, pck, &bsize))
std::cout << "Packet LoginInfo invalide." << std::endl; ++errors;
return 2; break;
case PLAYINF:
pl = new netprot::PlayerInfo();
if (!netprot::Deserialize(pl, pck, &bsize))
++errors;
else {
m_players[pl->id] = pl;
std::cout << "A challenger appears! " << pl->name << std::endl;
}
break;
case TEAMINF:
// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.
break;
case SYNC:
if (!netprot::Deserialize(&m_origin, pck, &bsize))
++errors;
ready = true;
break;
default:
errors++;
break;
} }
++rpack;
break;
case netprot::PACKET_TYPE::GAMEINFO:
if (!netprot::Deserialize(&m_gameinfo, buf, buflen)) {
std::cout << "Packet GameInfo invalide." << std::endl;
return 3;
}
++rpack;
break;
default:
std::cout << "Packet invalide." << std::endl;
break;
} }
lsPck.clear();
if (errors > 1000)
return 4;
} }
return 0; return 0;
} }
@ -99,3 +120,5 @@ int Connector::Connect(char* srv_addr, std::string name) {
uint64_t Connector::getId() const { return m_loginfo.sid; } uint64_t Connector::getId() const { return m_loginfo.sid; }
unsigned int Connector::getSeed() const { return m_gameinfo.seed; } unsigned int Connector::getSeed() const { return m_gameinfo.seed; }
netprot::Sync Connector::getOrigin() const { return m_origin; }

View File

@ -2,6 +2,7 @@
#define CONNECTOR_H__ #define CONNECTOR_H__
#include <stdlib.h> #include <stdlib.h>
#include <unordered_map>
#include "../SQCSim-common/netprotocol.h" #include "../SQCSim-common/netprotocol.h"
#include "define.h" #include "define.h"
@ -11,26 +12,32 @@ public:
~Connector(); ~Connector();
int Init(); int Init();
int Connect(char* srv_addr, std::string name); int Connect(const char* srv_addr, std::string name);
uint64_t getId() const; uint64_t getId() const;
unsigned int getSeed() const; unsigned int getSeed() const;
netprot::Sync getOrigin() const;
//void SendInput(); //void SendInput();
//int Sync(); //int Sync();
SOCKET m_sock_udp = 0,
m_sock_tcp = 0;
sockaddr_in m_srvsockaddr;
// void updateRemotePlayers(std::map<RemotePlayers> rplayers);
std::unordered_map<uint64_t, netprot::PlayerInfo> m_players;
private: private:
#ifdef _WIN32 #ifdef _WIN32
WSADATA m_wsaData; WSADATA m_wsaData;
#endif #endif
std::map<Timestamp, netprot::Input> m_inputmanifest; std::unordered_map<Timestamp, netprot::Input> m_inputmanifest;
std::map<uint64_t, netprot::PlayerInfo> m_players; std::unordered_map<uint64_t, netprot::TeamInfo> m_teams;
std::map<uint64_t, netprot::TeamInfo> m_teams;
netprot::LoginInfo m_loginfo; netprot::LoginInfo m_loginfo;
netprot::GameInfo m_gameinfo; netprot::GameInfo m_gameinfo;
netprot::Sync m_origin;
sockaddr_in m_srvsockaddr;
SOCKET m_sock_udp = 0,
m_sock_tcp = 0;
}; };
#endif #endif

View File

@ -20,7 +20,6 @@
#include <climits> #include <climits>
#endif #endif
#define NETWORK_TEST false
#define SRV_ADDR "127.0.0.1" #define SRV_ADDR "127.0.0.1"
#define COUNTDOWN 300 #define COUNTDOWN 300
@ -30,10 +29,37 @@
#define BASE_HEIGHT 480 #define BASE_HEIGHT 480
#define ANIME_PATH_JUMP "./media/textures/AssetOtherPlayer/FinalPNGJumping/"
#define ANIME_PATH_STILL "./media/textures/AssetOtherPlayer/FinalPNGStanding/"
//1 = jump shoot sans anim, 2 = jump shoot avec anim
#define ANIM_PATH_JSHOOT1 "./media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/"
#define ANIM_PATH_JSHOOT2 "./media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/"
//1 = shoot sans anim, 2 = shoot avec anim
#define ANIM_PATH_SSHOOT1 "./media/textures/AssetOtherPlayer/FinalPNGShooting/"
#define ANIM_PATH_SSHOOT2 "./media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/"
#define TEXTURE_PATH "./media/textures/" #define TEXTURE_PATH "./media/textures/"
#define SHADER_PATH "./media/shaders/" #define SHADER_PATH "./media/shaders/"
#define AUDIO_PATH "./media/audio/" #define AUDIO_PATH "./media/audio/"
#define CHUNK_PATH "./media/chunks/" #define CHUNK_PATH "./media/chunks/"
#define MENU_ITEM_PATH "./media/menu_items/" #define BOOSTER_TEXTURE_PATH "./media/textures/Booster/"
enum GameState {
MAIN_MENU,
SPLASH,
LOBBY,
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__ #endif // DEFINE_H__

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -2,9 +2,13 @@
#define ENGINE_H__ #define ENGINE_H__
#include <algorithm> #include <algorithm>
#include <chrono>
#include <cmath> #include <cmath>
#include <unordered_map>
#include <set>
#include "../SQCSim-common/array2d.h" #include "../SQCSim-common/array2d.h"
#include "../SQCSim-common/blockinfo.h" #include "../SQCSim-common/blockinfo.h"
#include "../SQCSim-common/boostinfo.h"
#include "../SQCSim-common/bullet.h" #include "../SQCSim-common/bullet.h"
#include "../SQCSim-common/chunk.h" #include "../SQCSim-common/chunk.h"
#include "../SQCSim-common/world.h" #include "../SQCSim-common/world.h"
@ -18,14 +22,15 @@
#include "audio.h" #include "audio.h"
#include "textureatlas.h" #include "textureatlas.h"
#include "connector.h" #include "connector.h"
#include "worldrenderer.h" #include "renderer.h"
#include "remoteplayer.h"
#include "booster.h"
#include "settings.h"
class Engine : public OpenglContext { class Engine : public OpenglContext {
public: public:
Engine(); Engine();
virtual ~Engine(); virtual ~Engine();
virtual void DrawMenu();
virtual void DrawSplachScreen();
virtual void Init(); virtual void Init();
virtual void DeInit(); virtual void DeInit();
virtual void LoadResource(); virtual void LoadResource();
@ -38,71 +43,148 @@ public:
virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y); virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y);
private: private:
std::pair<float, float> GetScale() const;
int GetFps(float elapsedTime) const; int GetFps(float elapsedTime) const;
int GetCountdown(float elapsedTime); int GetCountdown(float elapsedTime);
int GetOptionsChoice();
bool StartMultiplayerGame();
bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true); bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
void InstantDamage();
void SystemNotification(std::string systemLog); void SystemNotification(std::string systemLog);
void KillNotification(Player killer, Player killed); void KillNotification(Player killer, Player killed);
void DisplayNotification(std::string message); void DisplayNotification(std::string message);
void ProcessNotificationQueue();
void DisplayCrosshair(); void DisplayCrosshair();
void DisplayPovGun(); void DisplayPovGun();
void DisplayCurrentItem(); void DisplayCurrentItem();
void DisplayHud(int timer); void DisplayHud(int timer);
void DisplayInfo(float elapsedTime, BlockType bloc);
void DisplaySingleOrMultiplayerMenu();
void DrawHud(float elapsedTime, BlockType bloc); void DrawHud(float elapsedTime, BlockType bloc);
void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f); void DisplayInfo(float elapsedTime, BlockType bloc);
Connector m_conn; void DisplaySplashScreen();
Shader m_shader01;
BlockInfo* m_blockinfo[BTYPE_LAST]; void DisplayMainMenu();
TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST); void DrawButtonBackgrounds(float centerX, float centerY, int iterations);
void DrawMainMenuButtons(float centerX, float centerY);
void DrawSingleMultiButtons(float centerX, float centerY);
void DisplayLobbyMenu(float elapsedTime);
void SetPlayerUsername(float elapsedTime);
void SetServerAddress(float elapsedTime);
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();
char SimulateKeyboard(unsigned char key);
void HandlePlayerInput(float elapsedTime);
//udio m_menuaudio = Audio(AUDIO_PATH "menumusic.wav");
Audio m_audio = Audio(AUDIO_PATH "music01.wav");
irrklang::ISound* m_powpow, * m_scream;
irrklang::ISound* m_whoosh[MAX_BULLETS];
Bullet* m_bullets[MAX_BULLETS];
//Menu
Vector3f m_otherplayerpos = Vector3f(999, 999, 999);
World m_world = World(); World m_world = World();
WorldRenderer m_wrenderer = WorldRenderer(); 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_textureCrosshair;
Texture m_textureFont; Texture m_textureFont;
Texture m_textureGun; Texture m_textureGun;
Texture m_texturePovGun; Texture m_texturePovGun;
Texture m_textureSkybox; Texture m_textureSkybox;
Texture m_textureSoloMultiMenu;
Texture m_textureTitle;
Skybox m_skybox; Texture m_textureLobbyMenu;
Audio m_audio = Audio(AUDIO_PATH "start.wav"); Texture m_textureMainMenu;
Texture m_textureOptionsMenu;
Texture m_texturePauseMenu;
Texture m_textureSplashScreen;
irrklang::ISound* m_powpow, Texture m_textureHd;
* m_scream; Texture m_textureFhd;
irrklang::ISound *m_whoosh[MAX_BULLETS]; Texture m_textureQhd;
Texture m_textureUhd;
Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f)); Texture m_textureLobbyServer;
Texture m_textureLobbyIdentify;
Bullet* m_bullets[MAX_BULLETS]; Texture m_textureCheck;
Texture m_textureChecked;
//Menu Texture m_textureOptAudio;
enum class GameState { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY }; Texture m_textureOptBack;
GameState m_gamestate = GameState::MAIN_MENU; Texture m_textureOptGameplay;
Texture MenuTitleTexture; Texture m_textureOptGraphics;
Texture MenuBGTexture; Texture m_textureOptMain;
Texture MenuStartTexture; Texture m_textureOptMusic;
Texture MenuQuitTexture; Texture m_textureOptOptions;
Texture MenuOptionsTexture; Texture m_textureOptResolution;
Texture SplachScreenTexture; Texture m_textureOptSensitivity;
Texture m_textureOptSfx;
Texture m_textureMenuBack;
Texture m_textureMenuMulti;
Texture m_textureMenuOptions;
Texture m_textureMenuPlay;
Texture m_textureMenuQuit;
Texture m_textureMenuSingle;
Texture m_textureMenuTitle;
Settings m_options = Settings(m_audio);
Resolution m_resolution = HD;
float m_splashTime = 2.0f;
float m_scale; float m_scale;
float m_time = 0; float m_time = 0;
float m_time_SplashScreen = 0; float m_titleX = 0;
float m_Width = 0; float m_titleY = 0;
float m_Height = 0;
int m_renderCount = 0; int m_renderCount = 0;
int m_countdown = COUNTDOWN; 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;
bool m_wireframe = false; bool m_wireframe = false;
bool m_isSkybox = true; bool m_isSkybox = true;
@ -110,27 +192,57 @@ private:
bool m_flash = true; bool m_flash = true;
bool m_displayCrosshair = true; bool m_displayCrosshair = true;
bool m_displayHud = true; bool m_displayHud = true;
bool m_displayInfo = false; bool m_displayInfo = true;
bool m_resetcountdown = false; bool m_resetcountdown = false;
bool m_soloMultiChoiceMade = true; bool m_soloMultiChoiceMade = false;
bool m_stopcountdown = false; bool m_stopcountdown = false;
bool m_selectedPlayOptions = false;
bool m_selectedOptions = false;
bool m_selectedQuit = false;
std::string m_currentInputString;
std::string m_username;
std::string m_serverAddr;
char m_inputChar = 0;
bool m_invalidChar = false;
bool m_charChanged = false;
bool m_settingUsername = false;
bool m_settingServer = false;
bool m_multiReady = false;
bool m_key1 = false;
bool m_key2 = false;
bool m_keyK = false; bool m_keyK = false;
bool m_keyL = false; bool m_keyL = false;
bool m_keyW = false; bool m_keyW = false;
bool m_keyA = false; bool m_keyA = false;
bool m_keyS = false; bool m_keyS = false;
bool m_keyD = false; bool m_keyD = false;
bool m_keyEnter = false;
bool m_keySpace = false; bool m_keySpace = false;
bool m_keyShift = false;
bool m_keyBackspace = false;
bool m_mouseL = false; bool m_mouseL = false;
bool m_mouseR = false; bool m_mouseR = false;
bool m_mouseC = false; bool m_mouseC = false;
bool m_mouseWU = false; bool m_mouseWU = false;
bool m_mouseWD = false; bool m_mouseWD = false;
//Pour trouver ou est la souris
float m_mousemx = 0; float m_mousemx = 0;
float m_mousemy = 0; float m_mousemy = 0;
bool m_networkgame = false;
Connector m_conn;
std::deque<netprot::ChunkMod*> m_chunkmod_manifest;
std::chrono::high_resolution_clock::time_point m_startTime;
std::unordered_map<uint64_t, Player*> m_players;
netprot::Buffer m_buf, m_bufout;
netprot::ChunkMod* m_chunkmod = nullptr;
std::unordered_map<uint64_t, netprot::Sync> m_syncs;
std::string m_messageNotification = ""; std::string m_messageNotification = "";
}; };

Binary file not shown.

View File

@ -7,7 +7,7 @@ void main()
texel = texture2D(tex,gl_TexCoord[0].st); texel = texture2D(tex,gl_TexCoord[0].st);
texel *= light; texel *= light;
texel.a = 255.;
gl_FragColor = texel; gl_FragColor = texel;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 KiB

After

Width:  |  Height:  |  Size: 270 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 KiB

After

Width:  |  Height:  |  Size: 367 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 KiB

After

Width:  |  Height:  |  Size: 255 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 KiB

After

Width:  |  Height:  |  Size: 314 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 KiB

After

Width:  |  Height:  |  Size: 255 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 KiB

After

Width:  |  Height:  |  Size: 314 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 KiB

After

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 KiB

After

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 270 KiB

After

Width:  |  Height:  |  Size: 277 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 KiB

After

Width:  |  Height:  |  Size: 276 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 KiB

After

Width:  |  Height:  |  Size: 320 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 KiB

After

Width:  |  Height:  |  Size: 320 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 359 KiB

After

Width:  |  Height:  |  Size: 363 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 360 KiB

After

Width:  |  Height:  |  Size: 363 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 367 KiB

After

Width:  |  Height:  |  Size: 365 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 368 KiB

After

Width:  |  Height:  |  Size: 365 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 327 KiB

After

Width:  |  Height:  |  Size: 337 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 348 KiB

After

Width:  |  Height:  |  Size: 360 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 KiB

After

Width:  |  Height:  |  Size: 394 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 327 KiB

After

Width:  |  Height:  |  Size: 338 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 329 KiB

After

Width:  |  Height:  |  Size: 339 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 KiB

After

Width:  |  Height:  |  Size: 374 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 641 KiB

After

Width:  |  Height:  |  Size: 643 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 654 KiB

After

Width:  |  Height:  |  Size: 656 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 651 KiB

After

Width:  |  Height:  |  Size: 653 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 640 KiB

After

Width:  |  Height:  |  Size: 642 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 654 KiB

After

Width:  |  Height:  |  Size: 656 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 650 KiB

After

Width:  |  Height:  |  Size: 652 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 474 KiB

After

Width:  |  Height:  |  Size: 485 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 501 KiB

After

Width:  |  Height:  |  Size: 512 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 563 KiB

After

Width:  |  Height:  |  Size: 575 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 473 KiB

After

Width:  |  Height:  |  Size: 484 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 500 KiB

After

Width:  |  Height:  |  Size: 512 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 563 KiB

After

Width:  |  Height:  |  Size: 575 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 698 KiB

After

Width:  |  Height:  |  Size: 694 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 719 KiB

After

Width:  |  Height:  |  Size: 716 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 735 KiB

After

Width:  |  Height:  |  Size: 732 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 698 KiB

After

Width:  |  Height:  |  Size: 694 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 719 KiB

After

Width:  |  Height:  |  Size: 715 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 735 KiB

After

Width:  |  Height:  |  Size: 731 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 760 KiB

After

Width:  |  Height:  |  Size: 598 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 783 KiB

After

Width:  |  Height:  |  Size: 629 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 804 KiB

After

Width:  |  Height:  |  Size: 649 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 760 KiB

After

Width:  |  Height:  |  Size: 584 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 783 KiB

After

Width:  |  Height:  |  Size: 644 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 804 KiB

After

Width:  |  Height:  |  Size: 646 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 KiB

After

Width:  |  Height:  |  Size: 284 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 KiB

After

Width:  |  Height:  |  Size: 283 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 KiB

After

Width:  |  Height:  |  Size: 326 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 KiB

After

Width:  |  Height:  |  Size: 326 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 KiB

After

Width:  |  Height:  |  Size: 342 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 KiB

After

Width:  |  Height:  |  Size: 392 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 KiB

After

Width:  |  Height:  |  Size: 391 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 KiB

After

Width:  |  Height:  |  Size: 342 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 268 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 268 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 655 KiB

After

Width:  |  Height:  |  Size: 657 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 658 KiB

After

Width:  |  Height:  |  Size: 660 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 679 KiB

After

Width:  |  Height:  |  Size: 680 KiB

Some files were not shown because too many files have changed in this diff Show More