ajouts dans les cmakelists pour leenuqs

Sqc 35 nouvelles structures

SQCSim-common/SQCSim-common.vcxproj

@@ -134,6 +134,7 @@
     <ClInclude Include="array2d.h" />
     <ClInclude Include="array3d.h" />
     <ClInclude Include="blockinfo.h" />
+    <ClInclude Include="boostinfo.h" />
     <ClInclude Include="bullet.h" />
     <ClInclude Include="chunk.h" />
     <ClInclude Include="define.h" />
@@ -147,6 +148,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="blockinfo.cpp" />
+    <ClCompile Include="boostinfo.cpp" />
     <ClCompile Include="bullet.cpp" />
     <ClCompile Include="chunk.cpp" />
     <ClCompile Include="netprotocol.cpp" />

SQCSim-common/SQCSim-common.vcxproj.filters

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

SQCSim-common/boostinfo.cpp

@@ -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;
+}
+
+

SQCSim-common/boostinfo.h

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

SQCSim-common/bullet.cpp

@@ -7,7 +7,7 @@ Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_cur
 
 Bullet::~Bullet() {}
 
-bool Bullet::Update(World* world, float elapsedtime, int perframe, std::map<uint64_t, Player*> mapPlayer) {
+bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> mapPlayer) {
 	int max = 100 / perframe;
 	float damage = 0.057f;
 	for (int x = 0; x < max; ++x) {

SQCSim-common/bullet.h

@@ -1,9 +1,9 @@
 #ifndef BULLET_H__
 #define BULLET_H__
 
+#include <unordered_map>
 #include "define.h"
 #include "vector3.h"
-#include <map>
 #include "player.h"
 
 
@@ -16,7 +16,7 @@ public:
 	Bullet(Vector3f pos, Vector3f dir, uint64_t tid);
 	~Bullet();
 
-	bool Update(World* world, float elapsedtime, int perframe, std::map<uint64_t, Player*> m_mapPlayer);
+	bool Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> m_mapPlayer);
 	void Transpose(int& x, int& z);
 	Vector3f getPos() const;
 	Vector3f getVel() const;

SQCSim-common/chunk.cpp

@@ -1,133 +1,164 @@
 #include "chunk.h"
 #include "world.h"
 
-Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y) { 
+Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y) {
-    //std::ostringstream pos; // V<>rifie l'existence d'un fichier .chunk avec sa position.
+	//std::ostringstream pos; // V<>rifie l'existence d'un fichier .chunk avec sa position.
-    //pos << CHUNK_PATH << x << '_' << y << ".chunk";
+	//pos << CHUNK_PATH << x << '_' << y << ".chunk";
-    //std::ifstream input(pos.str(), std::fstream::binary);
+	//std::ifstream input(pos.str(), std::fstream::binary);
 
-    //if (input.fail()) {
+	//if (input.fail()) {
-        OpenSimplexNoise::Noise simplex = OpenSimplexNoise::Noise(seed);
+	OpenSimplexNoise::Noise simplex = OpenSimplexNoise::Noise(seed);
-        m_blocks.Reset(BTYPE_AIR);
+	m_blocks.Reset(BTYPE_AIR);
 
-        for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Montagnes
+	for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Montagnes
-            for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
+		for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
-                float xnoiz, ynoiz;
+			float xnoiz, ynoiz;
-                xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 4096.;
+			xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 4096.;
-                ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 4096.;
+			ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 4096.;
-                double height = 0;
+			double height = 0;
-                for (int x = 0; x < 39; ++x) {
+			for (int x = 0; x < 39; ++x) {
-                    height += simplex.eval(xnoiz, ynoiz);
+				height += simplex.eval(xnoiz, ynoiz);
-                    height *= .79;
+				height *= .79;
-                    xnoiz *= 1.139;
+				xnoiz *= 1.139;
-                    ynoiz *= 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 = 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 /= (CHUNK_SIZE_Y / 1.9);
-                height += 15.;
+			height += 15.;
-                for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy)
+			for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy)
-                    SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
+				SetBlock(ix, iy, iz, BTYPE_METAL, nullptr);
-            }
+		}
-        for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Collines
+	for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Collines
-            for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
+		for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
-                float xnoiz, ynoiz;
+			float xnoiz, ynoiz;
-                xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 512.;
+			xnoiz = (double)(ix + x * CHUNK_SIZE_X) / 512.;
-                ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 512.;
+			ynoiz = (double)(iz + y * CHUNK_SIZE_Z) / 512.;
-                float height = simplex.eval(xnoiz, ynoiz) * 50.f;// +1.f;
+			float height = simplex.eval(xnoiz, ynoiz) * 50.f;// +1.f;
-                for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy) {
+			for (int iy = 0; iy <= (int)height % CHUNK_SIZE_Y; ++iy) {
-                    if (GetBlock(ix, iy, iz) == BTYPE_AIR)
+				if (GetBlock(ix, iy, iz) == BTYPE_AIR)
-                        SetBlock(ix, iy, iz, BTYPE_GRASS, nullptr);
+					SetBlock(ix, iy, iz, BTYPE_GREENGRASS, nullptr);
-                }
+			}
-            }
+		}
-        for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // "Lacs"
+	for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // "Lacs"
-            for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
+		for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
-                for (int iy = 0; iy < 13; ++iy) {
+			for (int iy = 0; iy < 13; ++iy) {
-                    if (GetBlock(ix, iy, iz) == BTYPE_AIR)
+				if (GetBlock(ix, iy, iz) == BTYPE_AIR)
-                        SetBlock(ix, iy, iz, BTYPE_ICE, nullptr);
+					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];
+	int rnd = rand() % 15;
-        input.read(data, size);
+	if (rnd == 4)
-        input.close();
+		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 (rnd == 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, 2);
+				}
+			}
+	if (rnd == 6)
+		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);
+				}
+			}
 
-        for (int ix = 0; ix < CHUNK_SIZE_X; ++ix)
+
-            for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz)
+	//for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // "Arbres"
-                for (int iy = 0; iy < CHUNK_SIZE_Y; ++iy)
+	//    for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
-                    m_blocks.Set(ix, iy, iz, data[ix + (iz * CHUNK_SIZE_X) + (iy * CHUNK_SIZE_Z * CHUNK_SIZE_X)]);
+	//        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];
+	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)]);
+}*/
 }
 
 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) {
-    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) {
-    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<>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); }
 
 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; }
@@ -140,3 +171,31 @@ void Chunk::MakeClean() { m_isDirty = false; }
 
 void Chunk::MakeModified() { m_isModified = true; }
 
+
+void Chunk::Structure(int x, int y, int z,int height)
+{
+
+
+
+	for (int i = 0; i < height; i++)
+	{
+		SetBlock(x, i + y, z, BTYPE_GRASS, nullptr);
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

SQCSim-common/chunk.h

@@ -28,6 +28,7 @@ class Chunk {
         void CheckNeighbors(unsigned int x, unsigned int z, World* world);
         void GetPosition(unsigned int& x, unsigned int& y) const;
 
+        void Structure(int x, int y, int z, int height);
         bool IsDirty() const;
         void MakeDirty();
         void MakeClean();

SQCSim-common/define.h

@@ -7,11 +7,11 @@
 #define SRV_PORT 10000
 #define CLI_PORT 10001
 
-#define BUFFER_LENGTH 150
+#define BUFFER_LENGTH 1500
 
-#define CHUNK_SIZE_X  4
+#define CHUNK_SIZE_X  6
 #define CHUNK_SIZE_Y  64
-#define CHUNK_SIZE_Z  4
+#define CHUNK_SIZE_Z  6
 #define MAX_SELECTION_DISTANCE 5
 #define SEED 0
 #define COUNTDOWN 300
@@ -27,14 +27,25 @@
 #define THREADS_UPDATE_CHUNKS 6
 #define THREADS_DELETE_CHUNKS 3
 
-#define VIEW_DISTANCE 512 // Si les chunks arr<72>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<72>tent de s'afficher pendant une game et qu'il y a un access violation quand tu quitte, il faut augmenter ce chiffre.
 #define TEXTURE_SIZE 512
 #define MAX_BULLETS 512
 
+#define TIME_SPEED_BOOST 10		//secondes
+#define TIME_DAMAGE_BOOST 10	//secondes
+#define TIME_INVINCIBLE_BOOST 4	//secondes
+#define STRENGTH_SPEED_BOOST 10	//Pourcentage
 #define BULLET_TIME .1
 
 typedef uint8_t BlockType;
-enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_LAST };
+enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_GREENGRASS, BTYPE_LAST };
+typedef uint8_t BoostType;
+enum BOOST_TYPE { BTYPE_SPEED, BTYPE_HEAL, BTYPE_DAMAGE, BTYPE_INVINCIBLE, BTYPE_BOOST_LAST };
+
+//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;
 
 #ifdef _WIN32
@@ -46,6 +57,7 @@ typedef uint64_t Timestamp;
 #include <cstdio>
 #include <ctime>
 
+#define poll WSAPoll
 #define flag_t u_long
 #define addrlen_t int
 #define ioctl ioctlsocket
@@ -64,6 +76,7 @@ typedef uint64_t Timestamp;
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <cstring>
+#include <poll.h>
 
 #define flag_t unsigned int
 #define addrlen_t unsigned int

SQCSim-common/netprotocol.cpp

@@ -4,38 +4,38 @@ void netprot::Serialize(Input* in, char* buf[], uint32_t* buflen) {
 	*buf[0] = (char)netprot::PACKET_TYPE::INPUT;
 
 	uint64_t time = in->timestamp;
-	uint8_t time8[sizeof(uint64_t)] = {(uint8_t)((time >> 56) & 0xFF),
+	uint8_t time8[sizeof(uint64_t)] = { (uint8_t)((time >> 56) & 0xFF),
 									   (uint8_t)((time >> 48) & 0xFF),
 									   (uint8_t)((time >> 40) & 0xFF),
 									   (uint8_t)((time >> 32) & 0xFF),
 									   (uint8_t)((time >> 24) & 0xFF),
 									   (uint8_t)((time >> 16) & 0xFF),
-									   (uint8_t)((time >> 8 ) & 0xFF),
+									   (uint8_t)((time >> 8) & 0xFF),
-									    (uint8_t)(time		  & 0xFF)};
+										(uint8_t)(time & 0xFF) };
 
 	memcpy(*buf + 1, time8, sizeof(uint64_t));
 
 	uint64_t sid = in->sid;
-	uint8_t sid8[sizeof(uint64_t)] = {(uint8_t)((sid >> 56) & 0xFF),
+	uint8_t sid8[sizeof(uint64_t)] = { (uint8_t)((sid >> 56) & 0xFF),
 									  (uint8_t)((sid >> 48) & 0xFF),
 									  (uint8_t)((sid >> 40) & 0xFF),
 									  (uint8_t)((sid >> 32) & 0xFF),
 									  (uint8_t)((sid >> 24) & 0xFF),
 									  (uint8_t)((sid >> 16) & 0xFF),
-									  (uint8_t)((sid >> 8 ) & 0xFF),
+									  (uint8_t)((sid >> 8) & 0xFF),
-									  (uint8_t)( sid		& 0xFF)};
+									  (uint8_t)(sid & 0xFF) };
 
 	memcpy(*buf + sizeof(uint64_t) + 1, sid8, sizeof(uint64_t));
 
 	Keys keys = in->keys;
 	uint8_t keys8 = // Reste un bit.
-		keys.forward  & 0b10000000 |
+		(keys.forward? 0b10000000: 0) |
-		keys.backward & 0b01000000 |
+		(keys.backward? 0b01000000: 0) |
-		keys.left     & 0b00100000 |
+		(keys.left? 0b00100000: 0) |
-		keys.right    & 0b00010000 |
+		(keys.right? 0b00010000: 0) |
-		keys.jump     & 0b00001000 |
+		(keys.jump? 0b00001000: 0) |
-		keys.shoot    & 0b00000100 |
+		(keys.shoot? 0b00000100: 0) |
-		keys.block    & 0b00000010 ;
+		(keys.block? 0b00000010: 0);
 
 	memcpy(*buf + sizeof(uint64_t) * 2 + 1, &keys8, sizeof(uint8_t));
 
@@ -54,7 +54,7 @@ void netprot::Serialize(Input* in, char* buf[], uint32_t* buflen) {
 					 (uint8_t)((vec[2] >> 24) & 0xFF),
 					 (uint8_t)((vec[2] >> 16) & 0xFF),
 					(uint8_t)((vec[2] >> 8) & 0xFF),
-					 (uint8_t)(vec[2] & 0xFF)};
+					 (uint8_t)(vec[2] & 0xFF) };
 
 	memcpy(*buf + sizeof(uint64_t) * 2 + 2, vec8, sizeof(uint32_t) * 3);
 
@@ -88,7 +88,57 @@ void netprot::Serialize(Output* out, char* buf[], uint32_t* buflen) {
 
 	memcpy(*buf + sizeof(uint64_t) + 1, sid8, sizeof(uint64_t));
 
-	// TODO: Finir ca.
+	States states = out->states;
+	uint8_t states8 =
+		(states.jumping? 0b10000000: 0) |
+		(states.shooting? 0b01000000: 0) |
+		(states.hit? 0b00100000: 0) |
+		(states.powerup? 0b00010000: 0) |
+		(states.dead? 0b00001000: 0) |
+		(states.still? 0b00000100: 0) |
+		(states.jumpshot? 0b00000010: 0) |
+		(states.running? 0b00000001: 0);
+
+	memcpy(*buf + sizeof(uint64_t) * 2 + 1, &states8, sizeof(uint8_t));
+
+	uint32_t vec[3];
+	memcpy(vec, &out->direction, sizeof(Vector3f)); // Pour d<>naturer les floats.
+
+	uint8_t vec8[3 * sizeof(uint32_t)] = {
+							(uint8_t)((vec[0] >> 24) & 0xFF),
+							(uint8_t)((vec[0] >> 16) & 0xFF),
+							(uint8_t)((vec[0] >> 8) & 0xFF),
+							 (uint8_t)(vec[0] & 0xFF),
+						(uint8_t)((vec[1] >> 24) & 0xFF),
+						(uint8_t)((vec[1] >> 16) & 0xFF),
+						(uint8_t)((vec[1] >> 8) & 0xFF),
+						 (uint8_t)(vec[1] & 0xFF),
+					 (uint8_t)((vec[2] >> 24) & 0xFF),
+					 (uint8_t)((vec[2] >> 16) & 0xFF),
+					(uint8_t)((vec[2] >> 8) & 0xFF),
+					 (uint8_t)(vec[2] & 0xFF) };
+
+	memcpy(*buf + sizeof(uint64_t) * 2 + 2, vec8, sizeof(uint32_t) * 3);
+
+	memcpy(vec, &out->position, sizeof(Vector3f)); // Pour d<>naturer les floats.
+
+	uint8_t vec82[3 * sizeof(uint32_t)] = {
+							(uint8_t)((vec[0] >> 24) & 0xFF),
+							(uint8_t)((vec[0] >> 16) & 0xFF),
+							(uint8_t)((vec[0] >> 8) & 0xFF),
+							 (uint8_t)(vec[0] & 0xFF),
+						(uint8_t)((vec[1] >> 24) & 0xFF),
+						(uint8_t)((vec[1] >> 16) & 0xFF),
+						(uint8_t)((vec[1] >> 8) & 0xFF),
+						 (uint8_t)(vec[1] & 0xFF),
+					 (uint8_t)((vec[2] >> 24) & 0xFF),
+					 (uint8_t)((vec[2] >> 16) & 0xFF),
+					(uint8_t)((vec[2] >> 8) & 0xFF),
+					 (uint8_t)(vec[2] & 0xFF) };
+
+	memcpy(*buf + sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 3, vec82, sizeof(uint32_t) * 3);
+
+	*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 6;
 }
 
 void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
@@ -104,7 +154,7 @@ void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
 										(uint8_t)(time & 0xFF) };
 
 	memcpy(*buf + 1, stamp8, sizeof(uint64_t));
-	
+
 	uint64_t sid = sync->sid;
 	uint8_t sid8[sizeof(uint64_t)] = { (uint8_t)((sid >> 56) & 0xFF),
 									  (uint8_t)((sid >> 48) & 0xFF),
@@ -118,11 +168,11 @@ void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
 	memcpy(*buf + sizeof(uint64_t) + 1, sid8, sizeof(uint64_t));
 
 	uint32_t timer = sync->timer;
-	uint8_t time8[sizeof(uint32_t)] = {(uint8_t)((timer >> 24) & 0xFF),
+	uint8_t time8[sizeof(uint32_t)] = { (uint8_t)((timer >> 24) & 0xFF),
 									   (uint8_t)((timer >> 16) & 0xFF),
 									   (uint8_t)((timer >> 8) & 0xFF),
 										(uint8_t)(timer & 0xFF) };
-	
+
 	memcpy(*buf + sizeof(uint64_t) * 2 + 1, time8, sizeof(uint32_t));
 
 	uint16_t ammo = sync->ammo;
@@ -169,8 +219,8 @@ void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) {
 									   (uint8_t)((tid >> 32) & 0xFF),
 									   (uint8_t)((tid >> 24) & 0xFF),
 									   (uint8_t)((tid >> 16) & 0xFF),
-									   (uint8_t)((tid >> 8)  & 0xFF),
+									   (uint8_t)((tid >> 8) & 0xFF),
-									    (uint8_t)(tid 		 & 0xFF)
+										(uint8_t)(tid & 0xFF)
 	};
 
 	memcpy(*buf + namesize + 2, tid8, sizeof(uint64_t));
@@ -182,18 +232,18 @@ void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) {
 	*buf[0] = (char)netprot::PACKET_TYPE::LOGINF;
 
 	size_t namesize = std::strlen(linfo->name) + 1;
-	
+
 	memcpy(*buf + 1, &linfo->name, namesize);
 	uint64_t sid = linfo->sid;
-	uint8_t sid8[sizeof(uint64_t)] = { 
+	uint8_t sid8[sizeof(uint64_t)] = {
 									   (uint8_t)((sid >> 56) & 0xFF),
 									   (uint8_t)((sid >> 48) & 0xFF),
 									   (uint8_t)((sid >> 40) & 0xFF),
 									   (uint8_t)((sid >> 32) & 0xFF),
 									   (uint8_t)((sid >> 24) & 0xFF),
 									   (uint8_t)((sid >> 16) & 0xFF),
-									   (uint8_t)((sid >> 8)  & 0xFF),
+									   (uint8_t)((sid >> 8) & 0xFF),
-									    (uint8_t)(sid 		 & 0xFF)
+										(uint8_t)(sid & 0xFF)
 	};
 
 	memcpy(*buf + namesize + 2, sid8, sizeof(uint64_t));
@@ -206,8 +256,8 @@ void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) {
 									   (uint8_t)((tid >> 32) & 0xFF),
 									   (uint8_t)((tid >> 24) & 0xFF),
 									   (uint8_t)((tid >> 16) & 0xFF),
-									   (uint8_t)((tid >> 8)  & 0xFF),
+									   (uint8_t)((tid >> 8) & 0xFF),
-									   (uint8_t)(tid 		 & 0xFF)
+									   (uint8_t)(tid & 0xFF)
 	};
 
 	memcpy(*buf + namesize + 2 + sizeof(uint64_t), tid8, sizeof(uint64_t));
@@ -229,8 +279,8 @@ void netprot::Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen) {
 									   (uint8_t)((id >> 32) & 0xFF),
 									   (uint8_t)((id >> 24) & 0xFF),
 									   (uint8_t)((id >> 16) & 0xFF),
-									   (uint8_t)((id >> 8)  & 0xFF),
+									   (uint8_t)((id >> 8) & 0xFF),
-									    (uint8_t)(id 		& 0xFF)
+										(uint8_t)(id & 0xFF)
 	};
 
 	memcpy(*buf + namesize + 2, id8, sizeof(uint64_t));
@@ -243,8 +293,8 @@ void netprot::Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen) {
 									   (uint8_t)((tid >> 32) & 0xFF),
 									   (uint8_t)((tid >> 24) & 0xFF),
 									   (uint8_t)((tid >> 16) & 0xFF),
-									   (uint8_t)((tid >> 8)  & 0xFF),
+									   (uint8_t)((tid >> 8) & 0xFF),
-									    (uint8_t)(tid 		 & 0xFF) 
+										(uint8_t)(tid & 0xFF)
 	};
 
 	memcpy(*buf + namesize + 2 + sizeof(uint64_t), tid8, sizeof(uint64_t));
@@ -263,8 +313,8 @@ void netprot::Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen) {
 									   (uint8_t)((game >> 32) & 0xFF),
 									   (uint8_t)((game >> 24) & 0xFF),
 									   (uint8_t)((game >> 16) & 0xFF),
-									   (uint8_t)((game >> 8)  & 0xFF),
+									   (uint8_t)((game >> 8) & 0xFF),
-									    (uint8_t)(game 		  & 0xFF)
+										(uint8_t)(game & 0xFF)
 	};
 
 	memcpy(*buf + 1, seed8, sizeof(uint64_t));
@@ -272,27 +322,27 @@ void netprot::Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen) {
 	game = ginfo->countdown;
 	uint8_t count8[sizeof(uint64_t)] = {
 										(uint8_t)((game >> 56) & 0xFF),
-									    (uint8_t)((game >> 48) & 0xFF),
+										(uint8_t)((game >> 48) & 0xFF),
-									    (uint8_t)((game >> 40) & 0xFF),
+										(uint8_t)((game >> 40) & 0xFF),
-									    (uint8_t)((game >> 32) & 0xFF),
+										(uint8_t)((game >> 32) & 0xFF),
-									    (uint8_t)((game >> 24) & 0xFF),
+										(uint8_t)((game >> 24) & 0xFF),
-									    (uint8_t)((game >> 16) & 0xFF),
+										(uint8_t)((game >> 16) & 0xFF),
-										(uint8_t)((game >> 8)  & 0xFF),
+										(uint8_t)((game >> 8) & 0xFF),
-									     (uint8_t)(game 	   & 0xFF)
+										 (uint8_t)(game & 0xFF)
 	};
 
 	memcpy(*buf + sizeof(uint64_t) + 1, count8, sizeof(uint64_t));
 
 	game = ginfo->countdown;
 	uint8_t gtype8[sizeof(uint64_t)] = {
-									     (uint8_t)((game >> 56) & 0xFF),
+										 (uint8_t)((game >> 56) & 0xFF),
 									   (uint8_t)((game >> 48) & 0xFF),
 									   (uint8_t)((game >> 40) & 0xFF),
 									   (uint8_t)((game >> 32) & 0xFF),
 									   (uint8_t)((game >> 24) & 0xFF),
 									   (uint8_t)((game >> 16) & 0xFF),
-									   (uint8_t)((game >> 8)  & 0xFF),
+									   (uint8_t)((game >> 8) & 0xFF),
-									    (uint8_t)(game 		  & 0xFF)
+										(uint8_t)(game & 0xFF)
 	};
 
 	memcpy(*buf + sizeof(uint64_t) + 1, gtype8, sizeof(uint64_t));
@@ -311,8 +361,8 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
 									   (uint8_t)((src >> 32) & 0xFF),
 									   (uint8_t)((src >> 24) & 0xFF),
 									   (uint8_t)((src >> 16) & 0xFF),
-									   (uint8_t)((src >> 8)  & 0xFF),
+									   (uint8_t)((src >> 8) & 0xFF),
-									    (uint8_t)(src 		 & 0xFF)
+										(uint8_t)(src & 0xFF)
 	};
 
 	memcpy(*buf + 1, src8, sizeof(uint64_t));
@@ -325,8 +375,8 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
 									   (uint8_t)((dst >> 32) & 0xFF),
 									   (uint8_t)((dst >> 24) & 0xFF),
 									   (uint8_t)((dst >> 16) & 0xFF),
-									   (uint8_t)((dst >> 8)  & 0xFF),
+									   (uint8_t)((dst >> 8) & 0xFF),
-									    (uint8_t)(dst 		 & 0xFF)
+										(uint8_t)(dst & 0xFF)
 	};
 
 	memcpy(*buf + 1 + sizeof(uint64_t), dst8, sizeof(uint64_t));
@@ -339,10 +389,10 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
 									   (uint8_t)((dstteam >> 32) & 0xFF),
 									   (uint8_t)((dstteam >> 24) & 0xFF),
 									   (uint8_t)((dstteam >> 16) & 0xFF),
-									   (uint8_t)((dstteam >> 8)  & 0xFF),
+									   (uint8_t)((dstteam >> 8) & 0xFF),
-									    (uint8_t)(dstteam 		 & 0xFF)
+										(uint8_t)(dstteam & 0xFF)
 	};
-	
+
 	memcpy(*buf + 1 + sizeof(uint64_t) * 2, dstt8, sizeof(uint64_t));
 
 	size_t messize = std::strlen(chat->mess) + 1;
@@ -366,8 +416,8 @@ void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
 
 
 
-bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
+bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
-	if (buflen <= sizeof(Input))
+	if (*buflen <= sizeof(Input))
 		return false;
 
 	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@@ -381,7 +431,7 @@ bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
 		(uint64_t)diff[5] << 16 |
 		(uint64_t)diff[6] << 8 |
 		(uint64_t)diff[7];
-
+	
 	memcpy(diff, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
 	in->sid =
 		(uint64_t)diff[0] << 56 |
@@ -395,13 +445,13 @@ bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
 
 	uint8_t keys = 0;
 	memcpy(&keys, &buf[1 + sizeof(uint64_t) * 2], sizeof(uint8_t));
-	in->keys.forward	= keys & 0b10000000;
+	in->keys.forward = keys & 0b10000000;
-	in->keys.backward	= keys & 0b01000000;
+	in->keys.backward = keys & 0b01000000;
-	in->keys.left		= keys & 0b00100000;
+	in->keys.left = keys & 0b00100000;
-	in->keys.right		= keys & 0b00010000;
+	in->keys.right = keys & 0b00010000;
-	in->keys.jump		= keys & 0b00001000;
+	in->keys.jump = keys & 0b00001000;
-	in->keys.shoot		= keys & 0b00000100;
+	in->keys.shoot = keys & 0b00000100;
-	in->keys.block		= keys & 0b00000010;
+	in->keys.block = keys & 0b00000010;
 
 	uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
 	memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2], sizeof(uint8_t) * 12);
@@ -417,19 +467,94 @@ bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
 				(uint32_t)subvec[8] << 24 |
 				(uint32_t)subvec[9] << 16 |
 				(uint32_t)subvec[10] << 8 |
-				(uint32_t)subvec[11]};
+				(uint32_t)subvec[11] };
 
 	memcpy(&in->direction, vec, sizeof(uint32_t) * 3);
 
+	*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 3;
+
 	return true;
 }
 
-bool netprot::Deserialize(Output* out, char* buf, const uint32_t buflen) {
+bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
-	return false;
+	if (*buflen <= sizeof(Output))
+		return false;
+
+	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(diff, &buf[1], sizeof(uint64_t));
+	out->timestamp =
+		(uint64_t)diff[0] << 56 |
+		(uint64_t)diff[1] << 48 |
+		(uint64_t)diff[2] << 40 |
+		(uint64_t)diff[3] << 32 |
+		(uint64_t)diff[4] << 24 |
+		(uint64_t)diff[5] << 16 |
+		(uint64_t)diff[6] << 8 |
+		(uint64_t)diff[7];
+
+	memcpy(diff, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
+	out->id =
+		(uint64_t)diff[0] << 56 |
+		(uint64_t)diff[1] << 48 |
+		(uint64_t)diff[2] << 40 |
+		(uint64_t)diff[3] << 32 |
+		(uint64_t)diff[4] << 24 |
+		(uint64_t)diff[5] << 16 |
+		(uint64_t)diff[6] << 8 |
+		(uint64_t)diff[7];
+
+	uint8_t states = 0;
+	memcpy(&states, &buf[1 + sizeof(uint64_t) * 2], sizeof(uint8_t));
+	out->states.jumping = states & 0b10000000;
+	out->states.shooting = states & 0b01000000;
+	out->states.hit = states & 0b00100000;
+	out->states.dead = states & 0b00010000;
+	out->states.still = states & 0b00001000;
+	out->states.jumpshot = states & 0b00000100;
+	out->states.running = states & 0b00000010;
+
+	uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
+	memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2], sizeof(uint8_t) * 12);
+	uint32_t vec[3] = {
+		(uint32_t)subvec[0] << 24 |
+		(uint32_t)subvec[1] << 16 |
+		(uint32_t)subvec[2] << 8 |
+		(uint32_t)subvec[3],
+			(uint32_t)subvec[4] << 24 |
+			(uint32_t)subvec[5] << 16 |
+			(uint32_t)subvec[6] << 8 |
+			(uint32_t)subvec[7],
+				(uint32_t)subvec[8] << 24 |
+				(uint32_t)subvec[9] << 16 |
+				(uint32_t)subvec[10] << 8 |
+				(uint32_t)subvec[11] };
+
+	memcpy(&out->direction, vec, sizeof(uint32_t) * 3);
+
+	memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 3], sizeof(uint8_t) * 12);
+	uint32_t vec2[3] = {
+		(uint32_t)subvec[0] << 24 |
+		(uint32_t)subvec[1] << 16 |
+		(uint32_t)subvec[2] << 8 |
+		(uint32_t)subvec[3],
+			(uint32_t)subvec[4] << 24 |
+			(uint32_t)subvec[5] << 16 |
+			(uint32_t)subvec[6] << 8 |
+			(uint32_t)subvec[7],
+				(uint32_t)subvec[8] << 24 |
+				(uint32_t)subvec[9] << 16 |
+				(uint32_t)subvec[10] << 8 |
+				(uint32_t)subvec[11] };
+
+	memcpy(&out->position, vec2, sizeof(uint32_t) * 3);
+
+	*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 6;
+
+	return true;
 }
 
-bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) {
+bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
-	if (buflen <= sizeof(Sync))
+	if (*buflen <= sizeof(Sync))
 		return false;
 
 	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@@ -487,11 +612,13 @@ bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) {
 
 	memcpy(&sync->position, vec, sizeof(uint32_t) * 3);
 
+	*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 2;
+
 	return true;
 }
 
-bool netprot::Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen) {
+bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
-	if (buflen <= sizeof(LoginInfo))
+	if (*buflen <= sizeof(LoginInfo))
 		return false;
 
 	size_t namesize = std::strlen(buf) + 1;
@@ -513,11 +640,13 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen) {
 		(uint64_t)diff[6] << 8 |
 		(uint64_t)diff[7];
 
+	*buflen = namesize + sizeof(uint64_t) + 2;
+
 	return true;
 }
 
-bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) {
+bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
-	if (buflen <= sizeof(LoginInfo))
+	if (*buflen <= sizeof(LoginInfo))
 		return false;
 
 	size_t namesize = std::strlen(buf) + 1;
@@ -550,11 +679,13 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) {
 		(uint64_t)diff[6] << 8 |
 		(uint64_t)diff[7];
 
+	*buflen = namesize + sizeof(uint64_t) * 2 + 2;
+
 	return true;
 }
 
-bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen) {
+bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
-	if (buflen <= sizeof(PlayerInfo))
+	if (*buflen <= sizeof(PlayerInfo))
 		return false;
 
 	size_t namesize = std::strlen(buf) + 1;
@@ -587,11 +718,13 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen) {
 		(uint64_t)diff[6] << 8 |
 		(uint64_t)diff[7];
 
+	*buflen = namesize + sizeof(uint64_t) * 2 + 2;
+
 	return true;
 }
 
-bool netprot::Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen) {
+bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
-	if (buflen <= sizeof(GameInfo))
+	if (*buflen <= sizeof(GameInfo))
 		return false;
 
 	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@@ -628,11 +761,13 @@ bool netprot::Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen) {
 		(uint64_t)diff[6] << 8 |
 		(uint64_t)diff[7];
 
+	*buflen = sizeof(uint64_t) * 3 + 1;
+
 	return true;
 }
 
-bool netprot::Deserialize(Chat* chat, char* buf, const uint32_t buflen) {
+bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
-	if (buflen <= sizeof(Chat))
+	if (*buflen <= sizeof(Chat))
 		return false;
 
 	uint8_t src[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@@ -677,11 +812,14 @@ bool netprot::Deserialize(Chat* chat, char* buf, const uint32_t buflen) {
 		return false;
 
 	memcpy(&chat->mess, &buf[1 + sizeof(uint64_t) * 3], messsize);
+
+	*buflen = messsize + sizeof(uint64_t) * 3 + 2;
+	
 	return true;
 }
 
-bool netprot::Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen) {
+bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
-	if (buflen <= sizeof(ErrorLog))
+	if (*buflen <= sizeof(ErrorLog))
 		return false;
 
 	size_t messsize = std::strlen(buf) + 1;
@@ -692,18 +830,22 @@ bool netprot::Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen) {
 	memcpy(&errlog->mess, &buf[1], messsize);
 	memcpy(&errlog->is_fatal, &buf[1 + messsize], sizeof(bool));
 
+	*buflen = messsize + sizeof(uint64_t) * 3 + 2;
+
 	return true;
 }
 
+
+
 netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
-	if (buflen < 1 || 
+	if (buflen < 1 ||
-		buf[0] >= (char)netprot::PACKET_TYPE::LAST_PACK || 
+		buf[0] >= (char)netprot::PACKET_TYPE::LAST_PACK ||
 		buf[0] <= (char)netprot::PACKET_TYPE::ERR)
 		return netprot::PACKET_TYPE::ERR;
 	return (netprot::PACKET_TYPE)buf[0];
 }
 
-netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
+netprot::Packet netprot::getPack(char* buf, uint32_t *buflen) {
 	Packet pck = { nullptr, PACKET_TYPE::ERR };
 	Input* in = nullptr;
 	Output* out = nullptr;
@@ -713,7 +855,7 @@ netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
 	ErrorLog* errlog = nullptr;
 	LoginInfo* loginf = nullptr;
 
-	switch (getType(buf, buflen)) {
+	switch (getType(buf, *buflen)) {
 	case PACKET_TYPE::INPUT:
 		in = new Input();
 		if (netprot::Deserialize(in, buf, buflen)) {
@@ -769,8 +911,8 @@ netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
 	return pck;
 }
 
-netprot::Packet netprot::getPack(netprot::Buffer* buf) { 
+netprot::Packet netprot::getPack(netprot::Buffer* buf) {
-	return netprot::getPack(buf->ptr, buf->len); 
+	return netprot::getPack(buf->ptr, &buf->len);
 }
 
 bool netprot::emptyPack(netprot::Packet pck) {
@@ -808,133 +950,250 @@ netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
 	return pck;
 }
 
-std::vector<netprot::Packet> netprot::recvPacks(SOCKET sock, Buffer* buf) {
+std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf) {
-	std::vector<Packet> lsPck;
+	std::vector<char*> lsPck;
-	int len = 0, end = 0;
+	int len = buf->tmp? buf->tmp - buf->ptr: 0, 
-	bool pck_received = false;
+		end = 0;
-	char* cursor = nullptr;
+	char * cursor = buf->tmp ? buf->tmp: nullptr ,
+		 * next = buf->tmp ? buf->tmp + 1: buf->ptr, 
+		 * last = buf->tmp ? buf->tmp: buf->ptr;
+	bool ended = true;
+	struct pollfd fds[1];
+
+	fds[0].fd = sock;
+	fds[0].events = POLLIN;
 
 	while (true) {
-		while (!pck_received) {
+		if (!poll(fds, 1, 0)) {
-			int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
+			if (ended)
-			if (bytes < 0) // si recv() retourne -1; ça veut dire qu'il y a plus rien a lire.
+				buf->tmp = nullptr;
-				return lsPck;
+			return lsPck;
-			len += bytes;
+		}
-			// TODO: Voir si on trouve un footer (5 '\0' d'affilee).
+		
-			//		 Si oui, mettre l'index du debut du footer dans 
+		int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
-			//		 la variable "end" et mettre pck_received a true.
+		if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
+			if (ended)
+				buf->tmp = nullptr;
+			return lsPck;
+		} 
+		len += bytes;
+		end = len;
+
+		ended = false;
+
+		while (true) {
+			int cmp = 0;
+
+			if (cursor)
+				end -= (cursor - buf->ptr);
+
+			if (end < 0)
+				break;
+
+			cursor = (char*)memchr(next, '\r', end);
+
+			if (cursor) {
+				next = cursor;
+				cursor--;
+
+				cmp = memcmp(cursor, Footer, sizeof(uint32_t));
+				if (cmp == 0) {
+					if (!outbuf) {
+						lsPck.push_back(last);
+						cursor += sizeof(uint32_t);
+						last = cursor;
+						next = cursor + 1;
+					}
+					else {
+						memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
+						lsPck.push_back(&outbuf->ptr[cursor - last]);
+						cursor += sizeof(uint32_t);
+						last = cursor;
+						next = cursor + 1;
+					}
+				}
+			}
+			else {
+				if (!outbuf)
+					buf->tmp = last;
+				cursor = &buf->ptr[len];
+				next = cursor + 1;
+				break;
+			};
+		}
+	}
+}
+
+std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* outbuf) {
+	std::vector<char*> lsPck;
+	int len = buf->tmp ? buf->tmp - buf->ptr : 0,
+		end = 0;
+	char* cursor = buf->tmp ? buf->tmp : nullptr,
+		* next = buf->tmp ? buf->tmp + 1 : buf->ptr,
+		* last = buf->tmp ? buf->tmp : buf->ptr;
+	bool ended = true;
+	struct pollfd fds[1];
+	sockaddr_in sockad = from;
+	addrlen_t socklen = sizeof(sockad);
+
+	fds[0].fd = sock;
+	fds[0].events = POLLIN;
+
+	while (true) {
+		if (!poll(fds, 1, 0)) {
+			if (ended)
+				buf->tmp = nullptr;
+			return lsPck;
 		}
 
-		cursor = &buf->ptr[end];
+		int bytes = recvfrom(sock, &buf->ptr[len], buf->len - len, 0, (sockaddr*)&sockad, &socklen);
-
+		if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
-		lsPck.push_back(getPack(buf));
+			if (ended)
-
+				buf->tmp = nullptr;
-		while (*cursor == '\0') {
+			return lsPck;
-			cursor++;
-			end++;
 		}
+		len += bytes;
+		end = len;
 
-		if (cursor) { // mettre le début du prochain paquet au début du buffer.
+		ended = false;
-			memcpy(buf->ptr, cursor, buf->len - end); // et voir s'il y a en un autre
+
-			len = 0;
+		while (true) {
-			pck_received = true;
+			int cmp = 0;
+
+			if (cursor)
+				end -= (cursor - buf->ptr);
+
+			if (end < 0)
+				break;
+
+			cursor = (char*)memchr(next, '\r', end);
+
+			if (cursor) {
+				next = cursor;
+				cursor--;
+
+				cmp = memcmp(cursor, Footer, sizeof(uint32_t));
+				if (cmp == 0) {
+					if (!outbuf) {
+						lsPck.push_back(last);
+						cursor += sizeof(uint32_t);
+						last = cursor;
+						next = cursor + 1;
+					}
+					else {
+						memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
+						lsPck.push_back(&outbuf->ptr[cursor - last]);
+						cursor += sizeof(uint32_t);
+						last = cursor;
+						next = cursor + 1;
+					}
+				}
+			}
+			else {
+				if (!outbuf)
+					buf->tmp = last;
+				cursor = &buf->ptr[len];
+				next = cursor + 1;
+				break;
+			};
 		}
 	}
 }
 
 template <>
-void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, char** buf, uint32_t* buflen) {
+void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, Buffer* buf) {
 	switch (pack->type) {
-        case PACKET_TYPE::INPUT:
+	case PACKET_TYPE::INPUT:
-			sendPack<Input>(sock, (Input*)pack->ptr, buf, buflen);
+		sendPack<Input>(sock, (Input*)pack->ptr, buf);
-			return;
+		return;
-        case PACKET_TYPE::OUTPUT:
+	case PACKET_TYPE::OUTPUT:
-			sendPack<Output>(sock, (Output*)pack->ptr, buf, buflen);
+		sendPack<Output>(sock, (Output*)pack->ptr, buf);
-			return;
+		return;
-		case PACKET_TYPE::SYNC:
+	case PACKET_TYPE::SYNC:
-			sendPack<Sync>(sock, (Sync*)pack->ptr, buf, buflen);
+		sendPack<Sync>(sock, (Sync*)pack->ptr, buf);
-			return;
+		return;
-		case PACKET_TYPE::TEAMINF:
+	case PACKET_TYPE::TEAMINF:
-			sendPack<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, buflen);
+		sendPack<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf);
-			return;
+		return;
-		case PACKET_TYPE::PLAYINF:
+	case PACKET_TYPE::PLAYINF:
-			sendPack<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, buflen);
+		sendPack<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf);
-			return;
+		return;
-		case PACKET_TYPE::LOGINF:
+	case PACKET_TYPE::LOGINF:
-			sendPack<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, buflen);
+		sendPack<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf);
-			return;
+		return;
-		case PACKET_TYPE::CHUNKMOD:
+	case PACKET_TYPE::CHUNKMOD:
-			//sendPack<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, buflen);
+		//sendPack<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf);
-		case PACKET_TYPE::PLAYERMOD:
+		return;
-			//sendPack<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, buflen);
+	case PACKET_TYPE::PLAYERMOD:
-			return;
+		//sendPack<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf);
-		case PACKET_TYPE::PICKUPMOD:
+		return;
-			//sendPack<PickupMod>(sock, (PickupMod*)pack->ptr, buf, buflen);
+	case PACKET_TYPE::PICKUPMOD:
-			return;
+		//sendPack<PickupMod>(sock, (PickupMod*)pack->ptr, buf);
-		case PACKET_TYPE::GAMEINFO:
+		return;
-			sendPack<GameInfo>(sock, (GameInfo*)pack->ptr, buf, buflen);
+	case PACKET_TYPE::GAMEINFO:
-			return;
+		sendPack<GameInfo>(sock, (GameInfo*)pack->ptr, buf);
-		case PACKET_TYPE::ENDINFO:
+		return;
-			//sendPack<EndInfo>(sock, (EndInfo*)pack->ptr, buf, buflen);
+	case PACKET_TYPE::ENDINFO:
-			return;
+		//sendPack<EndInfo>(sock, (EndInfo*)pack->ptr, buf);
-		case PACKET_TYPE::CHAT:
+		return;
-			sendPack<Chat>(sock, (Chat*)pack->ptr, buf, buflen);
+	case PACKET_TYPE::CHAT:
-			return;
+		sendPack<Chat>(sock, (Chat*)pack->ptr, buf);
-		case PACKET_TYPE::ERRLOG:
+		return;
-			sendPack<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, buflen);
+	case PACKET_TYPE::ERRLOG:
-			return;
+		sendPack<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf);
-		case PACKET_TYPE::LAST_PACK: [[fallthrough]];
+		return;
-        case PACKET_TYPE::ERR: [[fallthrough]];
+	case PACKET_TYPE::LAST_PACK: [[fallthrough]];
-		default:
+	case PACKET_TYPE::ERR: [[fallthrough]];
-			return;
+	default:
-        }
+		return;
+	}
 }
 
 template <>
-void netprot::sendPackTo<netprot::Packet>(SOCKET sock, Packet* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad) {
+void netprot::sendPackTo<netprot::Packet>(SOCKET sock, Packet* pack, Buffer* buf, sockaddr_in* sockad) {
 	switch (pack->type) {
-        case PACKET_TYPE::INPUT:
+	case PACKET_TYPE::INPUT:
-			sendPackTo<Input>(sock, (Input*)pack->ptr, buf, buflen, sockad);
+		sendPackTo<Input>(sock, (Input*)pack->ptr, buf, sockad);
-			return;
+		return;
-        case PACKET_TYPE::OUTPUT:
+	case PACKET_TYPE::OUTPUT:
-			sendPackTo<Output>(sock, (Output*)pack->ptr, buf, buflen, sockad);
+		sendPackTo<Output>(sock, (Output*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::SYNC:
+	case PACKET_TYPE::SYNC:
-			sendPackTo<Sync>(sock, (Sync*)pack->ptr, buf, buflen, sockad);
+		sendPackTo<Sync>(sock, (Sync*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::TEAMINF:
+	case PACKET_TYPE::TEAMINF:
-			sendPackTo<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, buflen, sockad);
+		sendPackTo<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::PLAYINF:
+	case PACKET_TYPE::PLAYINF:
-			sendPackTo<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, buflen, sockad);
+		sendPackTo<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::LOGINF:
+	case PACKET_TYPE::LOGINF:
-			sendPackTo<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, buflen, sockad);
+		sendPackTo<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::CHUNKMOD:
+	case PACKET_TYPE::CHUNKMOD:
-			//sendPackTo<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, buflen, sockad);
+		//sendPackTo<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::PLAYERMOD:
+	case PACKET_TYPE::PLAYERMOD:
-			//sendPackTo<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, buflen, sockad);
+		//sendPackTo<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::PICKUPMOD:
+	case PACKET_TYPE::PICKUPMOD:
-			//sendPackTo<PickupMod>(sock, (PickupMod*)pack->ptr, buf, buflen, sockad);
+		//sendPackTo<PickupMod>(sock, (PickupMod*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::GAMEINFO:
+	case PACKET_TYPE::GAMEINFO:
-			sendPackTo<GameInfo>(sock, (GameInfo*)pack->ptr, buf, buflen, sockad);
+		sendPackTo<GameInfo>(sock, (GameInfo*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::ENDINFO:
+	case PACKET_TYPE::ENDINFO:
-			//sendPackTo<EndInfo>(sock, (EndInfo*)pack->ptr, buf, buflen, sockad);
+		//sendPackTo<EndInfo>(sock, (EndInfo*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::CHAT:
+	case PACKET_TYPE::CHAT:
-			sendPackTo<Chat>(sock, (Chat*)pack->ptr, buf, buflen, sockad);
+		sendPackTo<Chat>(sock, (Chat*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::ERRLOG:
+	case PACKET_TYPE::ERRLOG:
-			sendPackTo<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, buflen, sockad);
+		sendPackTo<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, sockad);
-			return;
+		return;
-		case PACKET_TYPE::LAST_PACK: [[fallthrough]];
+	case PACKET_TYPE::LAST_PACK: [[fallthrough]];
-        case PACKET_TYPE::ERR: [[fallthrough]];
+	case PACKET_TYPE::ERR: [[fallthrough]];
-		default:
+	default:
-			return;
+		return;
-        }
+	}
 }

SQCSim-common/netprotocol.h

@@ -7,8 +7,6 @@
 
 /* Protocole Particulier de Partie a Plusieurs Personnes (PPPPP) */
 
-// Packet: packet[0] = PacketType, packet[1..n-1] = {packet}
-
 namespace netprot {
 	enum class PACKET_TYPE: uint8_t {
 				ERR, INPUT, OUTPUT, SYNC,
@@ -17,9 +15,11 @@ namespace netprot {
 				GAMEINFO, ENDINFO , CHAT, ERRLOG,
 				LAST_PACK
 			};
+
+	/* Structures */
 	
 	struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean.
-		char* ptr = new char[BUFFER_LENGTH];
+		char* ptr = new char[BUFFER_LENGTH] { 1 }, * tmp = nullptr;
 		uint32_t len = BUFFER_LENGTH;
 
 		~Buffer() { delete[] ptr; }
@@ -31,6 +31,12 @@ namespace netprot {
 		PACKET_TYPE type = PACKET_TYPE::ERR;
 	};
 
+	/* Constantes */
+
+	inline const char Footer[sizeof(uint32_t)] = { '\0', '\r', '\0', '\n' }; // constante de footer qui est ajoutée à chaque paquet envoyé.
+
+	/* Sous-structures */
+
 	struct Keys {
 		bool forward, 
 			 backward, 
@@ -52,6 +58,8 @@ namespace netprot {
 			 running;
 	};
 
+	/* Structures de paquets */
+
 	struct Input {										// cli -> srv			UDP			~frame
 		Timestamp timestamp;
 		uint64_t sid = 0;
@@ -67,7 +75,7 @@ namespace netprot {
 		States states; // 0bJSH_____ bit-packing de bool.
 	};
 
-	struct Sync {										// srv -> cli			TCP			~second
+	struct Sync {										// srv -> cli			TCP			~second				- un premier sync démarre la partie.
 		Timestamp timestamp;
 		uint64_t sid = 0;
 		uint32_t timer = 0;
@@ -98,7 +106,11 @@ namespace netprot {
 		uint64_t id = 0,
 				 tid = 0;
 		PlayerInfo() {}
-		PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) { strcpy(log->name, name); }
+		PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) {
+			strcpy(log->name, name);
+		};
+		PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { memcpy((void*)strname.c_str(), name, strname.length());
+		}
 	};
 
 	struct GameInfo {									// cli <-> srv			TCP			event (before game start)/ once
@@ -125,6 +137,8 @@ namespace netprot {
 		ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(err->mess, mess); }
 	};
 
+	/* Fonctions */
+
 	void Serialize(Input* in, char* buf[], uint32_t* buflen); // cli
 	void Serialize(Output* out, char* buf[], uint32_t* buflen); // srv
 	void Serialize(Sync* sync, char* buf[], uint32_t* buflen); // srv
@@ -135,24 +149,26 @@ namespace netprot {
 	void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv
 	void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv
 
-	bool Deserialize(Input* in, char* buf, const uint32_t buflen); // srv
+	bool Deserialize(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(ErrorLog* errlog, char* buf, uint32_t* buflen); // srv
 
 	PACKET_TYPE getType(char* buf, uint32_t buflen);
 
-	Packet getPack(char* buf, uint32_t buflen);
+	Packet getPack(char* buf, uint32_t *buflen);
 	Packet getPack(Buffer* buf);
 
 	bool emptyPack(Packet pck);
 
 	Packet makePack(void* ptr, PACKET_TYPE type); // Pour pouvoir faire une liste de stock a supprimer sans avoir a en faire une pour chaque type.
+	
+	template <class T> T copyPack(Packet* pck);
 
 	template <class T> void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen);
 	template <class T> void sendPackTo(SOCKET sock, T* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad);
@@ -160,23 +176,29 @@ namespace netprot {
 	template <class T> void sendPack(SOCKET sock, T* pack, Buffer* buf);
 	template <class T> void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad);
 	
-	std::vector<Packet> recvPacks(SOCKET sock, Buffer* buf);
+	std::vector<char*> recvPacks(SOCKET sock, Buffer* buf, Buffer* oufbuf = nullptr);
+	std::vector<char*> recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* oufbuf = nullptr);
+
+	/* Templates */
+
+	template <class T>
+	T copyPack(Packet* pck) { return T((T*)pck->ptr); }
 
 	template <class T>
 	void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen) {
 		netprot::Serialize(pack, buf, buflen);
-		memset(&buf[*buflen], '\0', sizeof(uint64_t) + sizeof(uint8_t));
+		memcpy(*buf + *buflen, Footer, sizeof(uint32_t));
-		buflen += (sizeof(uint64_t) + sizeof(uint8_t));
+		*buflen += sizeof(Footer);
 		send(sock, *buf, *buflen, 0);
 		*buflen = BUFFER_LENGTH;
 	}
 
 	template <class T>
 	void sendPackTo(SOCKET sock, T* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad) {
-		sockaddr_in addr = *sockad;
+		const sockaddr_in addr = *sockad;
 		netprot::Serialize(pack, buf, buflen);
-		memset(&buf[*buflen], '\0', sizeof(uint64_t) + sizeof(uint8_t));
+		memcpy(*buf + *buflen, Footer, sizeof(uint32_t));
-		buflen += (sizeof(uint64_t) + sizeof(uint8_t));
+		*buflen += sizeof(Footer);
 		sendto(sock, *buf, *buflen, 0, (sockaddr*)&addr, sizeof(addr));
 		*buflen = BUFFER_LENGTH;
 	}
@@ -184,22 +206,21 @@ namespace netprot {
 	template <class T>
 	void sendPack(SOCKET sock, T* pack, Buffer* buf) {
 		netprot::Serialize(pack, &buf->ptr, &buf->len);
-		memset(&buf->ptr[buf->len], '\0', sizeof(uint64_t) + sizeof(uint8_t));
+		memcpy(&buf->ptr[buf->len], Footer, sizeof(uint32_t));
-		buf->len += sizeof(uint64_t) + sizeof(uint8_t);
+		buf->len += sizeof(Footer);
 		send(sock, buf->ptr, buf->len, 0);
 		buf->rstLen();
 	}
 
 	template <class T>
 	void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad) {
-		sockaddr_in addr = *sockad;
+		const sockaddr_in addr = *sockad;
 		netprot::Serialize(pack, &buf->ptr, &buf->len);
-		memset(&buf->ptr[buf->len], '\0', sizeof(uint64_t) + sizeof(uint8_t));
+		memcpy(&buf->ptr[buf->len], Footer, sizeof(uint32_t));
-		buf->len += sizeof(uint64_t) + sizeof(uint8_t);
+		buf->len += sizeof(Footer);
 		sendto(sock, buf->ptr, buf->len, 0, (sockaddr*)&addr, sizeof(addr));
 		buf->rstLen();
 	}
 
-
 };
 #endif

SQCSim-common/player.cpp

@@ -14,43 +14,53 @@ void Player::TurnLeftRight(float value) {
 	m_rotY += value;
 	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) {
 	m_rotX += value;
 	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 xrotrad = (m_rotX / 57.2957795056f);
 
 	m_direction = Vector3f(cos(xrotrad) * sin(yrotrad),
-						   -sin(xrotrad),
+		-sin(xrotrad),
-						   cos(xrotrad) * -cos(yrotrad));
+		cos(xrotrad) * -cos(yrotrad));
 
 	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) {
-		delta.x += float(sin(yrotrad)) * elapsedTime * 10.f;
+		delta += dir;
-		delta.z += float(-cos(yrotrad)) * elapsedTime * 10.f;
 	}
 	else if (back) {
-		delta.x += float(-sin(yrotrad)) * elapsedTime * 10.f;
+		delta -= dir;
-		delta.z += float(cos(yrotrad)) * elapsedTime * 10.f;
 	}
 
 	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) {
-		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();
@@ -61,6 +71,11 @@ Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jum
 		delta.y += jump? .32f: shoot? .1f : 0.f;
 		m_airborne = true;
 	}
+	if (boostspeed)
+	{
+		delta.x += STRENGTH_SPEED_BOOST / 100 * delta.x;
+		delta.z += STRENGTH_SPEED_BOOST / 100 * delta.z;
+	}
 
 	if (shoot) // Recoil!
 		TurnTopBottom(-1);
@@ -182,18 +197,71 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
 	else isStep = false;
 	m_POV = m_position.y;
 	m_POV += m_airborne ? 0 : (sin(bobbingtime) - 0.5f) * (abs(m_velocity.x) + abs(m_velocity.z)) * .2f;
-
+	RemoveBooster(elapsedTime);
 	return snd;
 }
 
-void Player::ApplyTransformation(Transformation& transformation, bool rel) const {
+void Player::ApplyTransformation(Transformation& transformation, bool rel, bool rot) const {
 	transformation.ApplyRotation(-m_rotX, 1, 0, 0);
 	transformation.ApplyRotation(-m_rotY, 0, 1, 0);
 	if (rel) transformation.ApplyTranslation(-GetPOV());
+	if (!rot) {
+		transformation.ApplyRotation(-m_rotX, 1, 0, 0);
+		transformation.ApplyRotation(-m_rotY, 0, 1, 0);
+	}
 }
 
+void Player::GetBooster(Booster boosttype)
+{
+	if (boosttype == SPEED)
+	{
+		boostspeed = true;
+		timeboostspeed = 0;
+	}
+	if (boosttype == HEAL)
+	{
+		m_hp = 100;
+	}
+	if (boosttype == DAMAGE)
+	{
+		boostdamage = true;
+		timeboostdamage = 0;
+	}
+	if (boosttype == INVINCIBLE)
+	{
+		boostinvincible = true;
+		boostinvincible = 0;
+	}
+}
+void Player::RemoveBooster(float elapsedtime)
+{
+	if (boostspeed)
+	{
+		timeboostspeed += elapsedtime;
+		if (timeboostspeed >= TIME_SPEED_BOOST)
+			boostspeed = false;
+	}
+	if (boostdamage)
+	{
+		timeboostdamage += elapsedtime;
+		if (timeboostdamage >= TIME_DAMAGE_BOOST)
+			boostdamage = false;
+	}
+	if (boostinvincible)
+	{
+		timeboostinvincible += elapsedtime;
+		if (timeboostinvincible >= TIME_INVINCIBLE_BOOST)
+			boostinvincible = false;
+	}
+}
+void Player::SetDirection(Vector3f dir) { m_direction = dir; }
+
+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::GetPositionAbs() const { return m_position; }
+
 Vector3f Player::GetVelocity() const { return m_velocity; }
 
 Vector3f Player::GetPOV() const { return Vector3f(GetPosition().x, m_POV, GetPosition().z); }

SQCSim-common/player.h

@@ -5,11 +5,13 @@
 #include "transformation.h"
 #include "vector3.h"
 
+
 class World; 
 
 class Player {
 public:
 	enum Sound { NOSOUND, STEP, FALL };
+	enum Booster { SPEED, HEAL, DAMAGE, INVINCIBLE };
 
 	Player(const Vector3f& position, float rotX = 0, float rotY = 0);
 	~Player();
@@ -18,9 +20,14 @@ public:
 	void TurnTopBottom(float value);
 	Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime);
 	Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime);
-	void ApplyTransformation(Transformation& transformation, bool rel = true) const;
+	void GetBooster(Booster boosttype);
+	void RemoveBooster(float elapsedtime);
+	void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;
 
+	void SetDirection(Vector3f dir);
+	void Move(Vector3f diff);
 	Vector3f GetPosition() const;
+	Vector3f GetPositionAbs() const;
 	Vector3f GetDirection() const;
 	Vector3f GetVelocity() const;
 	Vector3f GetPOV() const;
@@ -45,13 +52,20 @@ protected:
 	float m_rotX = 0; 
 	float m_rotY = 0;
 	float m_POV;
+	float timeboostspeed;
+	float timeboostdamage;
+	float timeboostinvincible;
 
 	float m_hp;
 
 	bool m_airborne;
+	bool boostspeed;
+	bool boostdamage;
+	bool boostinvincible;
+
+
 
 	Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
-
 };
 #endif //_PLAYER_H__
 

SQCSim-common/world.cpp

@@ -16,6 +16,9 @@ void World::SetSeed(uint64_t seed) {
 	m_seed = seed;
 }
 
+
+
+
 Chunk* World::ChunkAt(float x, float y, float z) const {
 	int cx = (int)x / CHUNK_SIZE_X;
 	int cz = (int)z / CHUNK_SIZE_Z;
@@ -31,6 +34,32 @@ Chunk* World::ChunkAt(float x, float y, float z) const {
 
 Chunk* World::ChunkAt(const Vector3f& pos) const { return ChunkAt(pos.x, pos.y, pos.z); }
 
+void World::RemoveChunk(int nbReduit)
+{
+	for (int x = 0; x < WORLD_SIZE_X; ++x)
+		for (int y = 0; y < WORLD_SIZE_Y; ++y)
+		{
+			Chunk* chk = nullptr;
+			if (x < nbReduit)
+				chk = m_chunks.Remove(x, y);
+			if (y < nbReduit)
+				chk = m_chunks.Remove(x, y);
+			if (y > WORLD_SIZE_Y - nbReduit)
+				chk = m_chunks.Remove(x, y);
+			if (x > WORLD_SIZE_X - nbReduit)
+				chk = m_chunks.Remove(x, y);
+
+			// TODO: MakeDirty() les voisins pour qu'ils se redessinent.
+
+			if (!chk)
+				continue;
+
+			m_tbDeleted.emplace_back(chk);
+		}
+
+
+}
+
 BlockType World::BlockAt(float x, float y, float z, BlockType defaultBlockType) const {
 	Chunk* c = ChunkAt(x, y, z);
 
@@ -226,7 +255,7 @@ void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]
 	int threads = 0;
 	std::future<Chunk*> genThList[THREADS_GENERATE_CHUNKS];
 	//std::future<void> delThList[THREADS_DELETE_CHUNKS];
-
+	
 	if (frameGenerate > 0) --frameGenerate;
 	if (frameUpdate > 0) --frameUpdate;
 	if (frameDelete > 0) --frameDelete;

SQCSim-common/world.h

@@ -28,6 +28,8 @@ public:
 	Chunk* ChunkAt(float x, float y, float z) const;
 	Chunk* ChunkAt(const Vector3f& pos) const;
 
+	void RemoveChunk(int nbReduit);
+
 	BlockType BlockAt(float x, float y, float z, BlockType defaultBlockType = BTYPE_AIR) const;
 	BlockType BlockAt(const Vector3f& pos, BlockType defaultBlockType = BTYPE_AIR) const;
 

SQCSim-srv/connection.cpp

@@ -21,7 +21,7 @@ uint64_t Connection::GetTeamHash() const { return m_loginfo.tid; }
 
 std::string Connection::GetName() const { return m_loginfo.name; }
 
-void Connection::AddInput(Input in) { m_input_manifest.insert({ in.timestamp, in }); }
+void Connection::AddInput(Input in) { m_input_manifest.insert({ in.timestamp, in }); m_input_vector.push_back(in); }
 
 Output* Connection::getOutput(Timestamp time) {
 	auto out = m_output_manifest.find(time);
@@ -47,9 +47,106 @@ PlayerInfo* Connection::getInfo() const { return (PlayerInfo*)&m_playinfo; }
 
 sockaddr_in* Connection::getAddr() const { return (sockaddr_in*)&m_addr; }
 
-void Connection::CleanInputManifest(Timestamp time) {
+void Connection::getPacks(SOCKET sock) {
-	auto wat = m_input_manifest.find(time);
+	std::vector<char*> lsPck;
-
+	Input in;
-	while (wat != m_input_manifest.begin())
+	Sync sync;
-		m_input_manifest.erase(wat--);
+		lsPck = recvPacksFrom(sock, &m_buf, m_addr);
+		for (auto& pck : lsPck) {
+			uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
+			switch (netprot::getType(pck, 1)) {
+				using enum netprot::PACKET_TYPE;
+			case INPUT:
+				if (Deserialize(&in, pck, &bsize)) {
+					m_input_manifest[in.timestamp] = in;
+					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;
+			//std::cout << m_playinfo.id << ": " << m_playinfo.name << ": " << conn->GetName() << std::endl;
+			//std::cout << out.id << ": " << out.position << std::endl;
+
+			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.get()->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();
+	}
+}
+
+void Connection::Run(World* world) {
+	Input in, last;
+	Output out;
+	float el;
+
+	if (m_input_manifest.size() < 2)
+		return;
+
+	while (m_last_in < m_input_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.;
+		std::cout << 1. / el << std::endl;
+		player.get()->SetDirection(in.direction);
+		std::cout << in.direction << std::endl;
+		player.get()->ApplyPhysics(player.get()->GetInput(in.keys.forward, 
+														  in.keys.backward, 
+														  in.keys.left, 
+														  in.keys.right, 
+														  in.keys.jump, false, el), world, el);
+
+		out.position = player.get()->GetPositionAbs();
+		player.get()->GetPositionAbs().Afficher();
+		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);
+		
+		++m_last_in;
+	}
+}
+
+void Connection::CleanInputManifest(Timestamp time) {
+//	auto wat = m_input_manifest.find(time);
+
+//	while (wat != m_input_manifest.begin())
+//		m_input_manifest.erase(wat--);
 }

SQCSim-srv/connection.h

@@ -2,10 +2,11 @@
 #define CONNECTION_H__
 
 #include <deque>
-#include <map>
+#include <unordered_map>
 #include "../SQCSim-common/player.h"
 #include "../SQCSim-common/vector3.h"
 #include "../SQCSim-common/netprotocol.h"
+#include "../SQCSim-common/world.h"
 #include "define.h"
 
 using namespace netprot;
@@ -32,16 +33,31 @@ public:
 	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);
+
+	void Run(World* world);
+
 	void CleanInputManifest(Timestamp time);
+	
+	bool m_nsync = true;
 private:
-	std::map<Timestamp, Input> m_input_manifest;
+	std::unordered_map<Timestamp, Input> m_input_manifest;
-	std::map<Timestamp, Output> m_output_manifest;
+	std::vector<Input> m_input_vector;
-	std::map<Timestamp, Chat> m_chatlog;
+	std::unordered_map<Timestamp, Output> m_output_manifest;
+	std::deque<Output> m_output_vector;
+	std::unordered_map<Timestamp, Chat> m_chatlog;
 
 	SOCKET m_sock;
 	sockaddr_in m_addr;
 	LoginInfo m_loginfo;
 	PlayerInfo m_playinfo;
 
+	Timestamp m_startsync;
+
+	uint64_t m_last_in = 0, 
+			 m_last_out = 0;
+	Buffer m_buf,
+		   m_bufout;
 };
 #endif

SQCSim-srv/server.cpp

@@ -20,7 +20,8 @@ Server::~Server() {
 		closesocket(m_sock_tcp);	
 	for (const auto& [key, player] : m_players)
 			closesocket(player->getSock());
-		m_players.clear();
+	m_players.clear();
+	delete m_world;
 #ifdef _WIN32
 	WSACleanup();
 #endif
@@ -85,7 +86,7 @@ int Server::Ready() {
 		Log("Entrez le seed de la partie: ", false, false);
 		std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
 		try {	
-			m_game.seed = std::stoi(m_buf.ptr);
+			m_game.seed = 9370707;//std::stoi(m_buf.ptr);
 		} catch(const std::exception& e) {
 			Log(e.what(), true, false);
 			m_game.seed = 0;
@@ -129,6 +130,7 @@ int Server::Ready() {
 			if (recv(sock, m_buf.ptr, m_buf.len, 0) > 0) {
 				PlayerInfo play;
 
+				m_buf.len = BUFFER_LENGTH;
 				Packet pck = getPack(&m_buf);
 				if (pck.type != PACKET_TYPE::LOGINF) {
 					Log("Paquet invalide.", true, false);
@@ -139,29 +141,28 @@ int Server::Ready() {
 				LoginInfo* log = (LoginInfo*)pck.ptr;
 
 				log->sid = getUniqueId();
-				log->tid = 0; // TODO: À changer si on implemente un mode en equipe.
+				log->tid = 1145389380; // TODO: À changer si on implemente un mode en equipe.
 
 				Log(str.append(" Nom: ").append(log->name), false, false);
 				str.clear();
 					
-				Log(str.append(log->name).append(" SID: [").append(std::to_string(log->sid).append("]")), false, false);
 
-				sendPack<LoginInfo>(sock, log, &m_buf.ptr, &m_buf.len);
+				sendPackTo<LoginInfo>(m_sock_udp, log, &m_buf, &sockad);
 				
 				play.id = getUniqueId();
+				play.tid = log->tid;
 				strcpy(play.name, 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;
 
-				sendPack<GameInfo>(sock, &m_game, &m_buf.ptr, &m_buf.len);
+				sendPackTo<GameInfo>(m_sock_udp, &m_game, &m_buf, &sockad);
-				std::unique_ptr<Connection> conn = std::make_unique<Connection>(sock, sockad, *log, play);
+				std::cout << m_game.seed << std::endl;
+				Connection* conn = new Connection(sock, sockad, *log, play);
 
-				for (auto& [key, player] : m_players) {
+				m_players[log->sid] = conn;
-					sendPack<PlayerInfo>(player->getSock(), &play, &m_buf); // Envoyer les infos de joueur distant aux joueurs d<>j<EFBFBD> connect<63>s		
-					sendPack<PlayerInfo>(sock, player->getInfo(), &m_buf); // et envoyer les infos des joueurs distants au nouveau joueur.
-				}
-
-				m_players[log->sid] = std::move(conn);
 
 				delete log;
 
@@ -170,58 +171,101 @@ int Server::Ready() {
 			}
 		}
 	}
+	for (auto& [keyin, playin] : m_players) // Not pretty, but it works.
+		for (auto& [keyout, playout] : m_players) {
+			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;
 }
 
 void Server::Run() {
+	bool endgame = false;
 	Input in;
 	sockaddr_in sockad;
 	addrlen_t socklen = sizeof(sockad);
-	
+
 	Log("Debut de la partie...", false, false);
 
-	m_world = std::make_unique<World>();
+	int players = m_players.size();
+
+	m_world = new World();
 	m_world->SetSeed(m_game.seed);
 	m_world->GetChunks().Reset(nullptr);
 	m_world->BuildWorld();
 
 	for (auto& [key, conn] : m_players) { // Creation des instances de joueurs et premier sync.
-		conn->player = std::make_unique<Player>(Vector3f(8.5f, CHUNK_SIZE_Y + 1.8f, 8.5f));
+		int x = rand() % (CHUNK_SIZE_X + WORLD_SIZE_X - 1), y = rand() % (CHUNK_SIZE_Y + WORLD_SIZE_Y - 1);
+		conn->player = std::make_unique<Player>(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f));
 		Sync sync;
-		sync.position = conn->player->GetPosition();
+		sync.position = conn->player->GetPositionAbs();
 		sync.hp = conn->player->GetHP();
 		sync.sid = key;
 		sync.ammo = 0;
 		sync.timestamp = 0;
 		sync.timer = m_game.countdown;
-		sendPack<Sync>(conn->getSock(), &sync, &m_buf);
+		sendPackTo<Sync>(m_sock_udp, &sync, &m_buf, conn->getAddr());
-	}
+
+		int timer = m_game.countdown, sync_acc = 0;
+		std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now();
+		Timestamp last = 0;
+
+		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) {
+				sync_acc -= 1000;
+				--timer;
+			}
+
+			for (auto& [key, conn] : m_players) {
+				int deadplayers = 0;
+				std::vector<char*> lsPck;
+				Input in;
+				Sync sync;
+				lsPck = recvPacks(m_sock_udp, &m_buf);
+				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_players[in.sid]->AddInput(in);
+						}
+						break;
+					case SYNC:
+						if (Deserialize(&sync, pck, &bsize)) {}
+						break;
+					case CHAT:
+						// TODO: Pitcher les chats à tous le monde.
+						break;
+					default: break;
+					}
+				}
+				lsPck.clear();
+
+				if (conn->m_nsync) {
+					if (conn->player->AmIDead()) {
+						++deadplayers;
+						continue;
+					}
+					conn->Run(m_world);
+					conn->sendPacks(m_sock_udp, m_players, timer);
+				}
+
+				if (deadplayers == players - 1 || timer <= 0)
+					endgame = true;
+			}
+		}
+
+		// TODO: Gérer les 2-3 secondes post-game avant le billboard pour pas avoir un whiplash à la fin de la game.
 
-	while (true) {
-		if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
-			Packet pck = getPack(&m_buf);
-			switch (pck.type) {
-				using enum netprot::PACKET_TYPE;
-            	case ERR:			std::puts("ERROR!");		break;
-                case INPUT:			std::puts("INPUT!");		break;
-                case OUTPUT:		std::puts("OUTPUT!");		break;
-				case SYNC:			std::puts("SYNC!");			break;
-                case TEAMINF:		std::puts("TEAMINF!");		break;
-                case SELFINF:		std::puts("SELFINF!");		break;
-                case PLAYINF:		std::puts("PLAYINF!");		break;
-                case LOGINF:		std::puts("LOGINF!");		break;
-                case CHUNKMOD:		std::puts("CHUNKMOD!");		break;
-                case PLAYERMOD:		std::puts("PLAYERMOD!");	break;
-                case PICKUPMOD:		std::puts("PICKUPMOD!");	break;
-                case GAMEINFO:		std::puts("GAMEINFO!");		break;
-                case ENDINFO:		std::puts("ENDINFO!");		break;
-                case CHAT:			std::puts("CHAT!");			break;
-                case ERRLOG:		std::puts("ERRLOG!");		break;
-				case LAST_PACK:									[[falltrough]];
-				default:			std::puts("wtf?!");			break;
-            }
-			netprot::emptyPack(pck);
-        }
 	}
 }
 
@@ -266,6 +310,7 @@ void Server::Log(std::string str, bool is_error = false, bool is_fatal = false)
 		for (const auto& [key, player] : m_players) {
 			closesocket(player->getSock());
 		}
+		delete m_world;
 		m_players.clear();
 #ifdef _WIN32
 		WSACleanup();

SQCSim-srv/server.h

@@ -5,6 +5,7 @@
 #include <vector>
 #include <set>
 #include <string>
+#include <unordered_map>
 #include "../SQCSim-common/world.h"
 #include "../SQCSim-common/netprotocol.h"
 #include "define.h"
@@ -35,12 +36,12 @@ private:
 
 	Buffer m_buf;
 
-	std::map<uint64_t, std::unique_ptr<Connection>> m_players;
+	std::unordered_map<uint64_t, Connection*> m_players;
-	std::map <Timestamp, Chat> m_chatlog;
+	std::unordered_map<Timestamp, Chat> m_chatlog;
 	std::vector<uint64_t> m_ids;
 	GameInfo m_game;
 
-	std::unique_ptr<World> m_world = nullptr;
+	World* m_world = nullptr;
 	const bool m_manual_setup = SRV_MANUAL_SETUP;
 
 	std::string LogTimestamp();

SQCSim2021/SQCSim2021.vcxproj

@@ -20,6 +20,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="audio.h" />
+    <ClInclude Include="booster.h" />
     <ClInclude Include="connector.h" />
     <ClInclude Include="define.h" />
     <ClInclude Include="engine.h" />
@@ -36,6 +37,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="audio.cpp" />
+    <ClCompile Include="booster.cpp" />
     <ClCompile Include="connector.cpp" />
     <ClCompile Include="engine.cpp" />
     <ClCompile Include="main.cpp" />
@@ -170,7 +172,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
@@ -192,7 +194,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>

SQCSim2021/SQCSim2021.vcxproj.filters

@@ -53,6 +53,9 @@
     <ClInclude Include="remoteplayer.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
+    <ClInclude Include="booster.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="engine.cpp">
@@ -97,5 +100,8 @@
     <ClCompile Include="remoteplayer.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="booster.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

SQCSim2021/booster.cpp

@@ -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);
+}

SQCSim2021/booster.h

@@ -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

SQCSim2021/cmake/CMakeLists.txt

@@ -28,6 +28,7 @@ include_directories(
 
 
 add_library(SQCSim-common
+			"${SQCSIM_COMMON_DIR}boostinfo.cpp"
 			"${SQCSIM_COMMON_DIR}blockinfo.cpp"
 			"${SQCSIM_COMMON_DIR}bullet.cpp"
 			"${SQCSIM_COMMON_DIR}chunk.cpp"
@@ -40,6 +41,7 @@ add_library(SQCSim-common
 
 add_executable(SQCSim-client
 			"../audio.cpp"
+			"../booster.cpp"
 			"../connector.cpp"
 			"../engine.cpp"
 			"../mesh.cpp"

SQCSim2021/connector.cpp

@@ -69,44 +69,53 @@ int Connector::Connect(const char* srv_addr, std::string name) {
 
 	netprot::sendPack(m_sock_tcp, &log, &bf);
 
+	//using namespace std::chrono_literals;
+	//std::this_thread::sleep_for(100ms);
+
+	memset(bf.ptr, '\0', BUFFER_LENGTH);
+
 	bool ready = false;
 	int errors = 0;
-	std::vector<netprot::Packet> lsPck;
+	std::vector<char*> lsPck;
 	while (!ready) {
-		lsPck = netprot::recvPacks(m_sock_tcp, &bf);
+		lsPck = netprot::recvPacks(m_sock_udp, &bf);
 
 		for (auto& pck : lsPck) {
-			bool bypass_delete = false;
+			uint32_t bsize = bf.len - (pck - bf.ptr);
 			netprot::PlayerInfo* pl = nullptr;
-			switch (pck.type) {
+			switch (netprot::getType(pck, 1)) {
 				using enum netprot::PACKET_TYPE;
 			case LOGINF:
-				m_loginfo = netprot::LoginInfo((netprot::LoginInfo*)pck.ptr);
+				if (!netprot::Deserialize(&m_loginfo, pck, &bsize))
+					++errors;
 				break;
 			case GAMEINFO:
-				m_gameinfo = netprot::GameInfo((netprot::GameInfo*)pck.ptr);
+				if (!netprot::Deserialize(&m_gameinfo, pck, &bsize))
+					++errors;
 				break;
 			case PLAYINF:
-				pl = (netprot::PlayerInfo*)pck.ptr;
+				pl = new netprot::PlayerInfo();
-				m_players[pl->id] = pl;
+				if (!netprot::Deserialize(pl, pck, &bsize))
-				bypass_delete = true;
+					++errors;
+				else {
+					m_players[pl->id] = pl;
+				}
 				break;
 			case TEAMINF:
 				// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.
 				break;
 			case SYNC:
-				m_origin = netprot::Sync((netprot::Sync*)pck.ptr);
+				if (!netprot::Deserialize(&m_origin, pck, &bsize))
+					++errors;
 				ready = true;
 				break;
 			default:
 				errors++;
 				break;
 			}
-			if (!bypass_delete)
-				netprot::emptyPack(pck);
 		}
 		lsPck.clear();
-		if (errors > 100)
+		if (errors > 1000)
 			return 4;
 	}
 	return 0;

SQCSim2021/connector.h

@@ -2,6 +2,7 @@
 #define CONNECTOR_H__
 
 #include <stdlib.h>
+#include <unordered_map>
 #include "../SQCSim-common/netprotocol.h"
 #include "define.h"
 
@@ -26,13 +27,13 @@ public:
 
 	// void updateRemotePlayers(std::map<RemotePlayers> rplayers);
 
-	std::map<uint64_t, netprot::PlayerInfo> m_players;
+	std::unordered_map<uint64_t, netprot::PlayerInfo> m_players;
 private:
 #ifdef _WIN32
 	WSADATA m_wsaData;
 #endif
-	std::map<Timestamp, netprot::Input> m_inputmanifest;
+	std::unordered_map<Timestamp, netprot::Input> m_inputmanifest;
-	std::map<uint64_t, netprot::TeamInfo> m_teams;
+	std::unordered_map<uint64_t, netprot::TeamInfo> m_teams;
 
 	netprot::LoginInfo m_loginfo;
 	netprot::GameInfo m_gameinfo;

SQCSim2021/define.h

@@ -29,10 +29,21 @@
 #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 SHADER_PATH		    "./media/shaders/"
 #define AUDIO_PATH			"./media/audio/"
 #define CHUNK_PATH			"./media/chunks/"
 #define MENU_ITEM_PATH		"./media/menu_items/"
+#define BOOSTER_TEXTURE_PATH "./media/textures/Booster/"
 
 #endif // DEFINE_H__

SQCSim2021/engine.cpp

@@ -1,5 +1,7 @@
 #include "engine.h"
-
+#include <algorithm>
+#include <filesystem>
+#include <fstream>
 #include <iostream>
 #include <chrono>
 #include <thread>
@@ -11,12 +13,13 @@ struct Notification {
 	float displayStartTime = 0.0f;
 };
 
+
 // Use a queue to manage notifications
 //std::queue<Notification> notificationQueue;
 // Use a vector to manage notifications
 std::vector<Notification> notifications;
 
-Engine::Engine() {}
+Engine::Engine() : m_remotePlayer(&m_pinfo), m_pinfo(){}
 
 Engine::~Engine() {
 	m_world.CleanUpWorld(m_renderCount, true);
@@ -316,18 +319,98 @@ void Engine::DrawPause()
 
 void Engine::Init() {
 
+	uint64_t seed = SEED;
 
+	if (m_istarted)
+		return;
+	else m_istarted = true;
+
+	// 
+	// Objet de skybox avec sa propre texture et son propre shader!
+	m_skybox.Init(0.2f);
+	//m_skybox2.Init(1.f);
+	// Objet de musique!
+	//m_audio.ToggleMusicState();
+
+	// Array pour les balles.
+	for (int x = 0; x < MAX_BULLETS; ++x) {
+		m_bullets[x] = nullptr;
+		m_whoosh[x] = nullptr;
+	}
+
+	// Init Chunks
+	m_world.GetChunks().Reset(nullptr);
+
+	char* ch = new char[2];
+
+	std::cout << "Jouer en ligne? [o/N] ";
+	std::cin.getline(ch, 2);
+	std::cout << std::endl;
+
+	if (*ch == 'o' || *ch == 'O') {
+		char* input = new char[32];
+		std::string playname, srvname;
+
+		while (playname.size() < 1) {
+			std::cout << "Veuillez entrer un nom de joueur: ";
+			std::cin.getline(input, 32);
+			std::cout << std::endl;
+			playname = input;
+			if (playname.size() < 1 || playname.size() > 32)
+				std::puts("Nom invalide.");
+		}
+		while (srvname.size() < 1) {
+			std::cout << "Veuillez entrer une adresse de serveur: ";
+			std::cin.getline(input, 32);
+			std::cout << std::endl;
+			srvname = input;
+			if (srvname.size() < 1 || srvname.size() > 32)
+				std::puts("Adresse serveur invalide.");
+		}
+		delete[] input;
+
+		if (!m_conn.Init()) {
+			if (!m_conn.Connect(srvname.c_str(), playname)) {
+				// setup jeu en reseau.
+				std::cout << "ID recu du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
+				//std::cout << "Seed recu du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
+				m_player = Player(m_conn.getOrigin().position);
+
+				for (auto& [key, player] : m_conn.m_players) {
+					m_players[key] = new RemotePlayer(player);
+					RemotePlayer* rt = (RemotePlayer*)m_players[key];
+					rt->SetPosition(Vector3f(555, 555, 555));
+				}
+
+				seed = 9370707;//m_conn.getSeed();
+				m_networkgame = true;
+			}
+			else std::cout << "Erreur de connexion." << std::endl;
+		}
+		else std::cout << "Erreur de creation de socket." << std::endl;
+	}
+	delete[] ch;
+
+	m_world.SetSeed(seed);
+
+	m_startTime = std::chrono::high_resolution_clock::now();
+
+	// Gestion de souris.
+	CenterMouse();
+	HideCursor();
+}
+
+void Engine::DeInit() {}
+
+void Engine::LoadResource() {
 	GLenum glewErr = glewInit();
 	if (glewErr != GLEW_OK) {
 		std::cerr << " ERREUR GLEW : " << glewGetErrorString(glewErr) << std::endl;
 		abort();
 	}
 
-	uint64_t seed = SEED;
-	char ch;
-
 	glDisable(GL_FRAMEBUFFER_SRGB);
-	glEnable(GL_DEPTH_TEST); 
+	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_STENCIL_TEST);
 	glEnable(GL_POINT_SMOOTH);
 	glEnable(GL_BLEND);
@@ -344,79 +427,9 @@ void Engine::Init() {
 	glDisable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glBlendEquation(GL_FUNC_SUBTRACT);
-	
-	// 
-	// Objet de skybox avec sa propre texture et son propre shader!
-	m_skybox.Init(0.2f);
 
-	// Objet de musique!
-	//m_audio.ToggleMusicState();
-
-	// Array pour les balles.
-	for (int x = 0; x < MAX_BULLETS; ++x) {
-		m_bullets[x] = nullptr;
-		m_whoosh[x] = nullptr;
-	}
-
-		std::cout << "Jouer en ligne? [o/N] ";
-		std::cin >> ch;
-		std::cout << std::endl;
-
-		if (ch == 'o' || ch == 'O') {
-			char* input = new char[32];
-			std::string playname, srvname;
-
-			while (playname.size() < 1) {
-				std::cout << "Veuillez entrer un nom de joueur: ";
-				std::cin.ignore();
-				std::cin.getline(input, 32);
-				std::cout << std::endl;
-				playname = input;
-				if (playname.size() < 1 || playname.size() > 32)
-					std::puts("Nom invalide.");
-			}
-			while (srvname.size() < 1) {
-				std::cout << "Veuillez entrer une adresse de serveur: ";
-				std::cin.getline(input, 32);
-				std::cout << std::endl;
-				srvname = input;
-				if (srvname.size() < 1 || srvname.size() > 32)
-					std::puts("Adresse serveur invalide.");
-			}
-			delete[] input;
-
-			if (!m_conn.Init()) {
-				if (!m_conn.Connect(srvname.c_str(), playname)) {
-					// setup jeu en reseau.
-					std::cout << "ID recu du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
-					std::cout << "Seed recu du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
-					m_player = Player(m_conn.getOrigin().position);
-
-					for (auto& [key, player] : m_conn.m_players)
-						m_players[key] = new RemotePlayer(player);
-
-					seed = m_conn.getSeed();
-					m_networkgame = true;
-				}
-				else std::cout << "Erreur de connexion." << std::endl;
-			}
-			else std::cout << "Erreur de creation de socket." << std::endl;
-		}
-
-	m_world.SetSeed(seed);
-
-	// Init Chunks
-	m_world.GetChunks().Reset(nullptr);
-
-	// Gestion de souris.
-	CenterMouse();
-	HideCursor();
-}
-
-void Engine::DeInit() {}
-
-void Engine::LoadResource() {
 	LoadTexture(m_skybox.GetTexture(), TEXTURE_PATH "skybox.png", true);
+	//LoadTexture(m_skybox2.GetTexture(), TEXTURE_PATH "skybox.png", true);
 	LoadTexture(m_textureCrosshair, TEXTURE_PATH "cross.bmp", true);
 	LoadTexture(m_textureFont, TEXTURE_PATH "font.bmp", true);
 	LoadTexture(m_textureGun, TEXTURE_PATH "gun01.png", false);
@@ -439,6 +452,84 @@ void Engine::LoadResource() {
 	TextureAtlas::TextureIndex texIceIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "metal2.png");
 	TextureAtlas::TextureIndex texGrassIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "grass.png");
 	TextureAtlas::TextureIndex texMetalIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "dirt.png");
+	TextureAtlas::TextureIndex texGreenGrassIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "greengrass.png");
+	TextureAtlas::TextureIndex texBoostHeal = m_textureAtlas.AddTexture(BOOSTER_TEXTURE_PATH "BoosterVert.png");
+	TextureAtlas::TextureIndex texBoostDmg = m_textureAtlas.AddTexture(BOOSTER_TEXTURE_PATH "BoosterRouge.png");
+	TextureAtlas::TextureIndex texBoostSpd = m_textureAtlas.AddTexture(BOOSTER_TEXTURE_PATH "BoosterBleu.png");
+	TextureAtlas::TextureIndex texBoostInv = m_textureAtlas.AddTexture(BOOSTER_TEXTURE_PATH "BoosterJaune.png");
+
+
+	//AJOUTER LES TEXTURES DANS L'ORDRE DE L'ÉNUM 
+
+	//STILL//STANDING
+	TextureAtlas::TextureIndex StillFront = m_animeAtlas.AddTexture(ANIME_PATH_STILL "BlueFrontRight.png");
+	//TextureAtlas::TextureIndex StillQuarterFrontLeft = m_animeAtlas.AddTexture(ANIME_PATH_STILL "BlueLeft.png");
+	//TextureAtlas::TextureIndex StillQuarterFrontRight = m_animeAtlas.AddTexture(ANIME_PATH_STILL "BlueRight.png");
+	//TextureAtlas::TextureIndex StillProfiltLeft = m_animeAtlas.AddTexture(ANIME_PATH_STILL "BlueProfilLeft.png");
+	//TextureAtlas::TextureIndex StillProfiltRight = m_animeAtlas.AddTexture(ANIME_PATH_STILL "BlueProfilRight.png");
+	//TextureAtlas::TextureIndex StillQuarterBackLeft = m_animeAtlas.AddTexture(ANIME_PATH_STILL "BlueLeftBack.png");
+	//TextureAtlas::TextureIndex StillQuarterBackRight = m_animeAtlas.AddTexture(ANIME_PATH_STILL "BlueRightBack.png");
+	//TextureAtlas::TextureIndex StillBack = m_animeAtlas.AddTexture(ANIME_PATH_STILL "BlueBackRight.png");
+
+	//SHOOTINGSTILL SANS TIRER
+	//TextureAtlas::TextureIndex StillFrontShoot = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT1 "BlueFrontRightShootingRight.png");
+	//TextureAtlas::TextureIndex StillQuarterFrontLeftShoot = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT1 "BlueFrontRightShootingRight.png");
+	//TextureAtlas::TextureIndex StillQuarterFrontRightShoot = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT1 "BlueRightShootingRight.png");
+	//TextureAtlas::TextureIndex StillProfiltLeftShoot = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT1 "BlueProfilShootingLeft.png");
+	//TextureAtlas::TextureIndex StillProfiltRightShoot = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT1 "BlueProfilShootingRight.png");
+	//TextureAtlas::TextureIndex StillQuarterBackLeftShoot = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT1 "BlueBackLeftShootingLeft.png");
+	//TextureAtlas::TextureIndex StillQuarterBackRightShoot = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT1 "BlueBackRightShootingRight.png");
+	//TextureAtlas::TextureIndex StillBackShoot = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT1 "BlueShootingBackRight.png");
+
+	//SHOOTINGSTILL TIRER
+	//TextureAtlas::TextureIndex StillFrontShootFire = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT2  "BlueFrontRightShootingRightShoot1.png");
+	//TextureAtlas::TextureIndex StillQuarterFrontLeftFire = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT2  "BlueLeftShootingLeftShoot1.png");
+	//TextureAtlas::TextureIndex StillQuarterFrontRightShootFire = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT2  "BlueRightShootingRightShoot1.png");
+	//TextureAtlas::TextureIndex StillProfiltLeftShootFire = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT2  "BlueProfilShootingLeftShoot1.png");
+	//TextureAtlas::TextureIndex StillProfiltRightShootFire = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT2  "BlueProfilShootingRightShoot1.png");
+	//TextureAtlas::TextureIndex StillQuarterBackLeftShootFire = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT2  "BlueBackLeftShootingLeftShoot1.png");
+	//TextureAtlas::TextureIndex StillQuarterBackRightShootFire = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT2  "BlueBackRightShootingRightShoot1.png");
+	//TextureAtlas::TextureIndex StillBackShootFire = m_animeAtlas.AddTexture(ANIM_PATH_SSHOOT2  "BlueShootingBackRightShoot1.png");
+
+
+	//JUMP
+	//TextureAtlas::TextureIndex JumpFront = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueFrontJumpRight.png");
+	//TextureAtlas::TextureIndex JumpQuarterFrontLeft = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueLeftFrontJumpLeft.png");
+	//TextureAtlas::TextureIndex JumpQuarterFrontRight = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueRightFrontJumpRight.png");
+	//TextureAtlas::TextureIndex JumpProfiltLeft = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueProfilJumpLeft.png");
+	//TextureAtlas::TextureIndex JumpProfiltRight = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueProfilJumpRight.png");
+	//TextureAtlas::TextureIndex JumpQuarterBackLeft = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueLeftBackJumpLeft.png");
+	//TextureAtlas::TextureIndex JumpQuarterBackRight = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueRightBackJumpRight.png");
+	//TextureAtlas::TextureIndex JumpBack = m_animeAtlas.AddTexture(ANIME_PATH_JUMP "BlueBackJumpRight.png");
+
+
+	//SHOOTINGJUMP SANS TIRER 
+	//TextureAtlas::TextureIndex JumpFrontShoot = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT1  "BlueFrontJumpRightShootingRight.png");
+	//TextureAtlas::TextureIndex JumpQuarterFrontLeftShoot = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT1  "BlueFrontLeftJumpLeftShootingLeft.png");
+	//TextureAtlas::TextureIndex JumpQuarterFrontRightShoot = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT1  "BlueFrontRightJumpRightShootingRight.png");
+	//TextureAtlas::TextureIndex JumpProfiltLeftShoot = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT1  "BlueProfilLeftJumpLeftShootingLeft.png");
+	//TextureAtlas::TextureIndex JumpProfiltRightShoot = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT1  "BluerProfilRightJumprightShootingRight.png");
+	//TextureAtlas::TextureIndex JumpQuarterBackLeftShoot = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT1  "BlueBackLeftJumpLeftShootingLeft.png");
+	//TextureAtlas::TextureIndex JumpQuarterBackRightShoot = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT1  "BlueBackRightJumpRightShootingRight.png");
+	//TextureAtlas::TextureIndex JumpBackShoot = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT1  "BlueBackJumpRightShootingRight.png");
+
+
+	//SHOOTINGJUMP TIRER
+	//TextureAtlas::TextureIndex JumpFrontShootFire = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT2  "BlueFrontJumpRightShootingRightShoot1.png");
+	//TextureAtlas::TextureIndex JumpQuarterFrontLeftShootFire = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT2  "BlueFrontLeftJumpLeftShootingLeftShoot1.png");
+	//TextureAtlas::TextureIndex JumpQuarterFrontRightShootFire = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT2  "BlueFrontRightJumpRightShootingRightShoot1.png");
+	//TextureAtlas::TextureIndex JumpProfiltLeftShootFire = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT2  "BlueProfilLeftJumpLeftShootingLeftShoot1.png");
+	//TextureAtlas::TextureIndex JumpProfiltRightShootFire = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT2  "BluerProfilRightJumprightShootingRightShoot1.png");
+	//TextureAtlas::TextureIndex JumpQuarterBackLeftShootFire = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT2  "BlueBackLeftJumpLeftShootingLeftShoot1.png");
+	//TextureAtlas::TextureIndex JumpQuarterBackRightShootFire = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT2  "BlueBackRightJumpRightShootingRightShoot1.png");
+	//TextureAtlas::TextureIndex JumpBackShootFire = m_animeAtlas.AddTexture(ANIM_PATH_JSHOOT2  "BlueBackJumpRightShootingRightShoot1.png");
+	
+	
+	
+	if (!m_animeAtlas.Generate(TEXTURE_SIZE, false)) {
+		std::cout << " Unable to generate texture atlas ..." << std::endl;
+		abort();
+	}
 
 	if (!m_textureAtlas.Generate(TEXTURE_SIZE, false)) {
 		std::cout << " Unable to generate texture atlas ..." << std::endl;
@@ -454,6 +545,20 @@ void Engine::LoadResource() {
 	m_blockinfo[BTYPE_METAL] = new BlockInfo(BTYPE_METAL, "Metal", u, v, s, 1);
 	m_textureAtlas.TextureIndexToCoord(texIceIndex, u, v, s, s);
 	m_blockinfo[BTYPE_ICE] = new BlockInfo(BTYPE_ICE, "Ice", u, v, s, 1);
+	m_textureAtlas.TextureIndexToCoord(texGreenGrassIndex, u, v, s, s);
+	m_blockinfo[BTYPE_GREENGRASS] = new BlockInfo(BTYPE_GREENGRASS, "GreenGrass", u, v, s, 1);
+	m_textureAtlas.TextureIndexToCoord(texBoostHeal, u, v, s, s);
+	m_boostinfo[BTYPE_HEAL] = new BoostInfo(BTYPE_HEAL, "Heal", u, v, s, 1);
+	m_textureAtlas.TextureIndexToCoord(texBoostDmg, u, v, s, s);
+	m_boostinfo[BTYPE_DAMAGE] = new BoostInfo(BTYPE_DAMAGE, "Dmg", u, v, s, 1);
+	m_textureAtlas.TextureIndexToCoord(texBoostSpd, u, v, s, s);
+	m_boostinfo[BTYPE_SPEED] = new BoostInfo(BTYPE_SPEED, "Spd", u, v, s, 1);
+	m_textureAtlas.TextureIndexToCoord(texIceIndex, u, v, s, s);
+	m_boostinfo[BTYPE_INVINCIBLE] = new BoostInfo(BTYPE_INVINCIBLE, "Inv", u, v, s, 1);
+
+
+	
+	m_animeAtlas.TextureIndexToCoord(0, u, v, s, s);
 
 	std::cout << " Loading and compiling shaders ..." << std::endl;
 	if (!m_shader01.Load(SHADER_PATH "shader01.vert", SHADER_PATH "shader01.frag", true)) {
@@ -482,6 +587,7 @@ void Engine::SystemNotification(std::string systemLog) {
 
 	DisplayNotification(message);
 }
+
 void Engine::KillNotification(Player killer, Player killed) {
 	std::string message = "";
 
@@ -632,6 +738,7 @@ void Engine::DisplayHud(int timer) {
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glLoadIdentity();
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glClear(GL_STENCIL_BUFFER_BIT);
 
 	float itemBackgroundWidthProportion = 0.25f;
 	float itemBackgroundHeightProportion = 0.175f;
@@ -769,12 +876,12 @@ void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
 	ss.str("");
 	fPosY -= charSize;
 
-	ss << " Direction : " << m_player.GetDirection();
+	ss << " Player Position : " << m_player.GetPosition();
 	PrintText(fPosX, fPosY, ss.str());
 	ss.str("");
 	fPosY -= charSize;
 
-	ss << " Position  : " << m_player.GetPosition();
+	ss << " Remote Position  : " << m_otherplayerpos;
 	PrintText(fPosX, fPosY, ss.str());
 	ss.str("");
 	fPosY -= charSize;
@@ -837,6 +944,7 @@ void Engine::DisplaySingleOrMultiplayerMenu() {
 
 	glBindTexture(GL_TEXTURE_2D, 0);
 
+
 	// Single Player and Multiplayer button background quads
 	float buttonWidthProportion = 0.4f;
 	float buttonHeightProportion = 0.075f;
@@ -924,7 +1032,13 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
 	glPushMatrix();
 
 	int timer = GetCountdown(elapsedTime);
-
+	for (int i = 1; i < WORLD_SIZE_X; i++)
+	{
+		if (timer <= COUNTDOWN - m_timerReductionChunk * i) {
+			m_world.RemoveChunk(m_nbReductionChunk * i);
+			m_renderer.RemoveChunk(m_nbReductionChunk * i);
+		}
+	}
 	if (m_keyK) {
 		SystemNotification(m_messageNotification);
 		m_keyK = false;
@@ -994,6 +1108,8 @@ int Engine::GetFps(float elapsedTime) const { return 1 / elapsedTime; }
 int Engine::GetCountdown(float elapsedTime) {
 	if (m_resetcountdown)
 	{
+		m_nbReductionChunk = 4;
+		m_timerReductionChunk = 30;
 		m_countdown = m_time + COUNTDOWN;
 		m_resetcountdown = false;
 	}
@@ -1007,11 +1123,11 @@ int Engine::GetCountdown(float elapsedTime) {
 void Engine::Render(float elapsedTime) {
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
-	m_time_SplashScreen += elapsedTime;
+	/*m_time_SplashScreen += elapsedTime;
 	if (m_time_SplashScreen < 2) {
 		DrawSplachScreen();
 	}
-	else if (m_gamestate == GameState::PLAY)
+	else */if (m_gamestate == GameState::PLAY)
 	{
 		HideCursor();
 		CenterMouse(); //D<>placement de centermouse dans l'action de jouer
@@ -1020,6 +1136,7 @@ void Engine::Render(float elapsedTime) {
 		static irrklang::ISound* step; // Pour les sons de pas.
 		static float pollTime = 0;
 		static float bulletTime = 0;
+		static float gameTime = 0;
 		static BlockType bloc = 1;
 
 		if (elapsedTime > 0.1f) return;
@@ -1029,6 +1146,8 @@ void Engine::Render(float elapsedTime) {
 
 		Transformation all;
 		Transformation skybox;
+		Transformation remotePlayer;
+
 		Vector3f vstep;
 
 		// Transformations initiales
@@ -1046,11 +1165,11 @@ void Engine::Render(float elapsedTime) {
 				if (leftright)
 					vstep = Vector3f(m_player.GetPosition().x + m_player.GetDirection().z, m_player.GetPosition().y - 1.7f, m_player.GetPosition().z + m_player.GetDirection().x);
 				else vstep = Vector3f(m_player.GetPosition().x - m_player.GetDirection().z, m_player.GetPosition().y - 1.7f, m_player.GetPosition().z - m_player.GetDirection().x);
-				m_audio.Create3DAudioObj(step, AUDIO_PATH "step.wav", vstep, m_player.GetVelocity(), false,.8f);
+				m_audio.Create3DAudioObj(step, AUDIO_PATH "step.wav", vstep, m_player.GetVelocity(), false, .8f);
 				leftright = !leftright;
 				break;
 			case Player::Sound::FALL:
-				m_audio.Create3DAudioObj(step, AUDIO_PATH "hit.wav", m_player.GetPosition(), m_player.GetVelocity(), false,1.f);
+				m_audio.Create3DAudioObj(step, AUDIO_PATH "hit.wav", m_player.GetPosition(), m_player.GetVelocity(), false, 1.f);
 				break;
 			default: break;
 			}
@@ -1063,12 +1182,17 @@ void Engine::Render(float elapsedTime) {
 
 		m_player.ApplyTransformation(skybox, false); // Version d'ApplyTransformation qui ne tient compte que de la rotation 
 		// (donc l'objet ne bouge pas relativement au joueur, ce qui est pratique pour une skybox!).
+		
+		m_player.ApplyTransformation(remotePlayer, true, false);
+
+		if (m_key1) bloc++;
+		else if (m_key2) bloc--;
 
 		if (m_mouseWU) bloc++;
 		else if (m_mouseWD) bloc--;
 		if (bloc == BTYPE_LAST + 1) bloc = BTYPE_AIR + 1;
 		else if (bloc == BTYPE_AIR) bloc = BTYPE_LAST; // La selection de BTYPE_LAST <20>quipe l'arme.
-		m_mouseWU = m_mouseWD = false;
+		m_mouseWU = m_mouseWD = m_key1 = m_key2 = false;
 
 		if (m_mouseL) {
 			if (bloc != BTYPE_LAST)
@@ -1091,37 +1215,42 @@ void Engine::Render(float elapsedTime) {
 					glClearColor(0.f, 0.f, 0.f, 1.f);
 					return;
 				}
+			}
 		}
-	}
+		else if (m_mouseR)
-	else if (m_mouseR)
+			m_world.ChangeBlockAtCursor(BTYPE_AIR, m_player.GetPosition(), m_player.GetDirection(), m_block);
-		m_world.ChangeBlockAtCursor(BTYPE_AIR, m_player.GetPosition(), m_player.GetDirection(), m_block);
+
-	
+		for (int x = 0; x < MAX_BULLETS; ++x) { // Array de bullets en jeu.
-	for (int x = 0; x < MAX_BULLETS; ++x) { // Array de bullets en jeu.
+			if (m_bullets[x]) {
-		if (m_bullets[x]) {
+				for (int b = 0; b < BULLET_UPDATES_PER_FRAME; ++b) {
-			for (int b = 0; b < BULLET_UPDATES_PER_FRAME; ++b) {
+					if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME, m_players)) {
-				if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME, m_players)) {
+						m_bullets[x]->~Bullet();
-					m_bullets[x]->~Bullet();
+						if (m_whoosh[x])
-					if (m_whoosh[x])
+							m_whoosh[x]->drop();
-						m_whoosh[x]->drop();
+						m_bullets[x] = nullptr;
-					m_bullets[x] = nullptr;
+						m_whoosh[x] = nullptr;
-					m_whoosh[x] = nullptr;
+						break;
-					break;
+					}
-				}
+					else if (!m_whoosh[x]) {
-				else if (!m_whoosh[x]) {
+						m_whoosh[x] = m_audio.Create3DAudioObj(m_whoosh[x], AUDIO_PATH "noise.wav", m_bullets[x]->getPos(), m_bullets[x]->getVel(), true, (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
-					m_whoosh[x] = m_audio.Create3DAudioObj(m_whoosh[x], AUDIO_PATH "noise.wav", m_bullets[x]->getPos(), m_bullets[x]->getVel(), true, (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
+					}
-				}
+					else {
-				else {
+						Vector3f pos = m_bullets[x]->getPos(), vel = m_bullets[x]->getVel();
-					Vector3f pos = m_bullets[x]->getPos(), vel = m_bullets[x]->getVel();
+						m_audio.Render3DAudioObj(m_whoosh[x], pos, vel, 5 - (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
-					m_audio.Render3DAudioObj(m_whoosh[x], pos, vel, 5 - (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
+					}
 				}
 			}
 		}
-	}
 
-		m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
+		gameTime += elapsedTime * 10;
+
 		m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
 		m_renderer.UpdateMesh(&m_world, m_player.GetPosition(), m_blockinfo);
 
+		//m_booster.RenderBillboard({ 195,16,195 }, m_textureAtlas, m_shader01, all);
+
+		m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
+
 		if (m_isSkybox) m_skybox.Render(skybox);
 
 		DrawHud(elapsedTime, bloc);
@@ -1133,7 +1262,7 @@ void Engine::Render(float elapsedTime) {
 		}
 		static bool fell = false;
 		if (m_player.GetPosition().y < 1.7f && !fell) {
-			m_audio.Create3DAudioObj(m_scream, AUDIO_PATH "scream.wav", m_player.GetPOV(), m_player.GetVelocity(), false,1.f);
+			m_audio.Create3DAudioObj(m_scream, AUDIO_PATH "scream.wav", m_player.GetPOV(), m_player.GetVelocity(), false, 1.f);
 			fell = true;
 		}
 		else if (m_player.GetPosition().y < -20.f) {
@@ -1141,15 +1270,39 @@ void Engine::Render(float elapsedTime) {
 			fell = false;
 		}
 
-		if (m_networkgame) {
+		if (m_networkgame) { // Pour se gerer le paquet.
-			static char* buf = new char[BUFFER_LENGTH];
+			static bool has_synced = false;
-			uint32_t buflen = BUFFER_LENGTH;
+			using namespace std::chrono;
-			netprot::Input input;
+			using namespace netprot;
-			//sockaddr_in addr = m_conn.m_srvsockaddr;
+			Timestamp tstamp = duration_cast<milliseconds>(high_resolution_clock::now() - m_startTime).count();
+			static Timestamp last = 0;
+			Input input;
+			Sync sync;
+			uint64_t id = m_conn.getId();
+			static std::vector<char*> lsPck;
+			static int sync_acc = 0;
 
+			if (last == 0)
+				last = tstamp;
+
+			sync_acc += tstamp - last;
+
+			if (sync_acc >= 1000) {
+				sync_acc -= 1000;
+				sync.sid = id;
+				sync.timestamp = tstamp;
+				sync.position = m_player.GetPositionAbs();
+				sync.hp = m_player.GetHP();
+				if (!has_synced) {
+					has_synced = true;
+					sendPackTo<Sync>(m_conn.m_sock_udp, &sync, &m_bufout, &m_conn.m_srvsockaddr);
+				}
+				m_syncs[sync.timestamp] = sync;
+			}
+
+			input.sid = id;
 			input.direction = m_player.GetDirection();
-			input.sid = m_conn.getId();
+			input.timestamp = tstamp;
-			input.timestamp = 12345;
 			input.keys.forward = m_keyW;
 			input.keys.backward = m_keyS;
 			input.keys.left = m_keyA;
@@ -1158,11 +1311,76 @@ void Engine::Render(float elapsedTime) {
 			input.keys.block = m_mouseR;
 			input.keys.shoot = m_mouseL;
 
-			//netprot::Serialize(&input, &buf, &buflen);
+			sendPackTo<Input>(m_conn.m_sock_udp, &input, &m_bufout, &m_conn.m_srvsockaddr);
-			//sendto(m_conn.m_sock_udp, buf, buflen, 0, (sockaddr*)&addr, sizeof(addr));
 
-			netprot::sendPackTo<netprot::Input>(m_conn.m_sock_udp, &input, &buf, &buflen, &m_conn.m_srvsockaddr);
+			lsPck = recvPacks(m_conn.m_sock_udp, &m_buf);
+			char* prevptr = nullptr;
+			for (auto& pck : lsPck) { // We could make a few threads out of this.
+				Sync sync;
+				Output out;
+				if (!prevptr)
+					prevptr = m_buf.ptr;
+				uint32_t bsize = m_buf.len - (pck - prevptr);
+				prevptr = pck;
+				switch (getType(pck, 1)) {
+					using enum PACKET_TYPE;
+				case SYNC:
+					if (Deserialize(&sync, pck, &bsize)) {
+						if (sync.sid != m_conn.getId()) {
+							std::cout << "syncsid be no good.";
+							break;
+						}
+						if (m_syncs.count(sync.timestamp)) {
+							Sync comp = m_syncs[sync.timestamp];
+							m_player.InflictDamage(sync.hp - comp.hp);
+
+							Vector3f diff = sync.position - comp.position;
+							
+							if (diff.y < 1.)
+								diff.y = 0;
+
+							//std::cout << sync.timestamp << " ms: " << comp.position << " - " << sync.position << " Diff: " << diff.Length() << std::endl;
+
+							if (diff.Length() > 1.5) {
+								diff.Normalize();
+								m_player.Move(-diff);
+							}
+
+							// TODO: Syncer sync.timer avec le timer
+
+							m_syncs.erase(sync.timestamp);
+						}
+						else std::cout << "sync be no good.";
+					}
+					break;
+				case OUTPUT:
+					if (Deserialize(&out, pck, &bsize)) {
+						if (!m_players.contains(out.id)) {
+							
+							std::cout << out.id << " is id no good." << std::endl;
+							break;
+						}
+						RemotePlayer* rt = static_cast<RemotePlayer*>(m_players[out.id]);
+						rt->Feed(out);
+					}
+					break;
+				default:
+					std::cout << "packet be no good.";
+					break;
+				}
+			}
+			lsPck.clear();
+
+			glDisable(GL_CULL_FACE);
+			for (auto& [key, player] : m_players) {
+				RemotePlayer* rt = static_cast<RemotePlayer*>(player);
+				glClear(GL_STENCIL_BUFFER_BIT);
+				rt->Render(m_animeAtlas, m_shader01, all, elapsedTime);
+				m_otherplayerpos = player->GetPosition(); // Aller chercher GetPosition des deux façon, voir si ça chie.
+			}
+			glEnable(GL_CULL_FACE);
 		}
+
 	}
 	else if (m_gamestate == GameState::MAIN_MENU || m_gamestate == GameState::OPTIONS)
 	{
@@ -1252,6 +1470,10 @@ void Engine::KeyPressEvent(unsigned char key) {
 		break;
 	case 24: // Y - Ignorer
 		break;
+	case 27: // 1
+		break;
+	case 28: // 2
+		break;
 	case 255: // Fn - Ignorer
 		break;
 	default:
@@ -1298,7 +1520,7 @@ void Engine::KeyReleaseEvent(unsigned char key) {
 	case 15:
 		for (int x = 0; x < MAX_BULLETS; ++x)  // Ajouter une balle dans l'array (aussi connu sous le nom de "faire pow pow").
 			if (!m_bullets[x]) {
-				m_bullets[x] = new Bullet(m_player.GetPOV() - Vector3f(1.f, 0.f, 1.f), Vector3f(1.f,0.f,1.f));
+				m_bullets[x] = new Bullet(m_player.GetPOV() - Vector3f(1.f, 0.f, 1.f), Vector3f(1.f, 0.f, 1.f));
 				break;
 			}
 			else if (x == MAX_BULLETS - 1) { // S'il y a pas d'espace dans l'array, prendre la place de la premi<6D>re balle de l'array.
@@ -1326,6 +1548,12 @@ void Engine::KeyReleaseEvent(unsigned char key) {
 		else
 			glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 		break;
+	case 27: // 1
+		m_key1 = true;
+		break;
+	case 28: // 2
+		m_key2 = true;
+		break;
 	case 57: // Espace - Stop sauter
 		m_keySpace = false;
 		break;
@@ -1446,3 +1674,5 @@ bool Engine::LoadTexture(Texture& texture, const std::string& filename, bool use
 
 	return true;
 }
+
+

SQCSim2021/engine.h

@@ -2,9 +2,12 @@
 #define ENGINE_H__
 
 #include <algorithm>
+#include <chrono>
 #include <cmath>
+#include <unordered_map>
 #include "../SQCSim-common/array2d.h"
 #include "../SQCSim-common/blockinfo.h"
+#include "../SQCSim-common/boostinfo.h"
 #include "../SQCSim-common/bullet.h"
 #include "../SQCSim-common/chunk.h"
 #include "../SQCSim-common/world.h"
@@ -20,6 +23,8 @@
 #include "connector.h"
 #include "renderer.h"
 #include "remoteplayer.h"
+#include "booster.h"
+
 
 class Engine : public OpenglContext {
 public:
@@ -59,13 +64,20 @@ private:
     void DrawHud(float elapsedTime, BlockType bloc);
     void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
 
+
+    
+
+
     Connector m_conn;
     Shader m_shader01;
     BlockInfo* m_blockinfo[BTYPE_LAST];
+    BoostInfo* m_boostinfo[BTYPE_BOOST_LAST];
     TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
+    TextureAtlas m_animeAtlas = TextureAtlas(TYPE_LAST + POS_LAST);
 
     World m_world = World();
     Renderer m_renderer = Renderer();
+    Booster m_booster = Booster();
 
     Texture m_textureCrosshair;
     Texture m_textureFont;
@@ -77,6 +89,8 @@ private:
     Texture m_textureMultiText;
     Texture m_textureTitle;
 
+    TextureAtlas::TextureIndex texBoostHeal;
+
     Skybox m_skybox;
     Audio m_audio = Audio(AUDIO_PATH "start.wav");
 
@@ -88,11 +102,13 @@ private:
     
     Bullet* m_bullets[MAX_BULLETS];
 
-    std::map<uint64_t, Player*> m_players;
+    std::unordered_map<uint64_t, Player*> m_players;
+    netprot::Buffer m_buf, m_bufout;
+    std::chrono::high_resolution_clock::time_point m_startTime;
 
     //Menu
     enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE };
-    GameState m_gamestate = GameState::MAIN_MENU;
+    GameState m_gamestate = GameState::PLAY;
     Texture MenuTitleTexture;
     Texture MenuBGTexture;
     Texture MenuStartTexture;
@@ -101,6 +117,8 @@ private:
     Texture PauseBGTexture;
     Texture SplachScreenTexture;
 
+    Vector3f m_otherplayerpos = Vector3f(999, 999, 999);
+
     float m_scale;
     float m_time = 0;
     float m_time_SplashScreen = 0;
@@ -111,6 +129,8 @@ private:
 
     int m_renderCount = 0;
     int m_countdown = COUNTDOWN;
+    int m_nbReductionChunk = 4;
+    int m_timerReductionChunk = 30;
 
     bool m_damage = false;
 
@@ -120,11 +140,14 @@ private:
     bool m_flash = true;
     bool m_displayCrosshair = true;
     bool m_displayHud = true;
-    bool m_displayInfo = false;
+    bool m_displayInfo = true;
     bool m_resetcountdown = false;
     bool m_soloMultiChoiceMade = false;
     bool m_stopcountdown = false;
     
+    bool m_key1 = false;
+    bool m_key2 = false;
+
     bool m_keyK = false;
     bool m_keyL = false;
     bool m_keyW = false;
@@ -142,7 +165,9 @@ private:
     float m_mousemy = 0;
 
     bool m_networkgame = false;
-
+    netprot::PlayerInfo m_pinfo;
+    std::unordered_map<uint64_t, netprot::Sync> m_syncs;
+    RemotePlayer m_remotePlayer = RemotePlayer(netprot::PlayerInfo(),Vector3f(5.5f, CHUNK_SIZE_Y + 1.8f, 5.5f));
     std::string m_messageNotification = "";
 };
 

SQCSim2021/main.cpp

@@ -5,5 +5,5 @@
 int main() {
     Engine engine;
     engine.SetMaxFps(60);
-    engine.Start("Syndicat Quebecois de la Construction Simulator 2023", BASE_WIDTH, BASE_HEIGHT, false);
+    engine.Start("Syndicat Quebecois de la Construction Simulator 2023", 800, 600, false);
 }

SQCSim2021/media/shaders/shader01.frag

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