Correction pour pr20

Sqc 15 paquets

.gitignore

@@ -373,3 +373,10 @@ FodyWeavers.xsd
 /x64/Release/SQCSim2023.exe
 /x64/Debug/SQCSim2023.exe
 /x64/Debug/SQCSim2021.pdb
+/SQCSim-srv/cmake/*
+!/SQCSim-srv/cmake/CMakeLists.txt
+/SQCSim2021/cmake/*
+!/SQCSim2021/cmake/CMakeLists.txt
+/SQCSim2021/SQCSim-client
+SQCSim2021/SQCSim2021.vcxproj.filters
+SQCSim2021/SQCSim2021.vcxproj

SQCSim-common/SQCSim-common.vcxproj

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{ee91ab12-4225-4a4d-931d-69d72f6d91fb}</ProjectGuid>
+    <RootNamespace>SQCSimcommon</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="array2d.h" />
+    <ClInclude Include="array3d.h" />
+    <ClInclude Include="blockinfo.h" />
+    <ClInclude Include="bullet.h" />
+    <ClInclude Include="chunk.h" />
+    <ClInclude Include="define.h" />
+    <ClInclude Include="matrix4.h" />
+    <ClInclude Include="opensimplex.h" />
+    <ClInclude Include="player.h" />
+    <ClInclude Include="netprotocol.h" />
+    <ClInclude Include="transformation.h" />
+    <ClInclude Include="vector3.h" />
+    <ClInclude Include="world.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="blockinfo.cpp" />
+    <ClCompile Include="bullet.cpp" />
+    <ClCompile Include="chunk.cpp" />
+    <ClCompile Include="netprotocol.cpp" />
+    <ClCompile Include="opensimplex.cpp" />
+    <ClCompile Include="player.cpp" />
+    <ClCompile Include="transformation.cpp" />
+    <ClCompile Include="world.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

SQCSim-common/SQCSim-common.vcxproj.filters

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Fichiers sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Fichiers d%27en-tête">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Fichiers de ressources">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="world.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="player.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="opensimplex.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="array2d.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="array3d.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="blockinfo.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="bullet.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="chunk.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="define.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="matrix4.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="vector3.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="netprotocol.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="transformation.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="world.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="blockinfo.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="bullet.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="chunk.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="opensimplex.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="player.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="netprotocol.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="transformation.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

SQCSim-common/bullet.cpp

@@ -0,0 +1,52 @@
+#include "bullet.h"
+#include "world.h"
+
+Bullet::Bullet(Vector3f pos, Vector3f dir) : m_startpos(pos), m_currentpos(pos), m_velocity(dir) {}
+
+Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_tid(tid) {}
+
+Bullet::~Bullet() {}
+
+bool Bullet::Update(World* world, float elapsedtime, int perframe, std::map<uint64_t, Player*> mapPlayer) {
+	int max = 100 / perframe;
+	float damage = 0.057f;
+	for (int x = 0; x < max; ++x) {
+		m_currentpos += m_velocity * elapsedtime;
+
+		for (auto& [key, player] : mapPlayer) {
+			if ((m_currentpos - player->GetPosition()).Length() < .4f) {
+				player->InflictDamage(damage);
+				return true;
+			}
+		}
+
+		if (!world->ChunkAt(m_currentpos))
+			return true;
+		else if (world->BlockAt(m_currentpos) != BTYPE_AIR) {
+			world->ChangeBlockAtPosition(BTYPE_AIR, m_currentpos);
+			return true;
+		}
+		else if ((m_currentpos - m_startpos).Length() > VIEW_DISTANCE) return true;
+	}
+	
+	return false;
+}
+
+void Bullet::Transpose(int& x, int& z) {
+	m_currentpos.x -= x * CHUNK_SIZE_X;
+	m_currentpos.z -= z * CHUNK_SIZE_Z;
+	m_startpos.x -= x * CHUNK_SIZE_X;
+	m_startpos.z -= z * CHUNK_SIZE_Z;
+}
+
+Vector3f Bullet::getPos() const {
+	return m_currentpos;
+}
+
+Vector3f Bullet::getVel() const {
+	return m_velocity;
+}
+
+uint64_t Bullet::getTeamID(){
+	return m_tid;
+}

SQCSim-common/bullet.h

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

SQCSim-common/chunk.cpp

@@ -1,13 +1,13 @@
 #include "chunk.h"
 #include "world.h"
 
-Chunk::Chunk(unsigned int x, unsigned int y) : 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.
     //pos << CHUNK_PATH << x << '_' << y << ".chunk";
     //std::ifstream input(pos.str(), std::fstream::binary);
 
     //if (input.fail()) {
-        OpenSimplexNoise::Noise simplex = OpenSimplexNoise::Noise(SEED);
+        OpenSimplexNoise::Noise simplex = OpenSimplexNoise::Noise(seed);
         m_blocks.Reset(BTYPE_AIR);
 
         for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Montagnes
@@ -132,103 +132,11 @@ void Chunk::CheckNeighbors(unsigned int x, unsigned int z, World* world) {
 
 void Chunk::GetPosition(unsigned int& x, unsigned int& y) const { x = m_posX; y = m_posY; }
 
-void Chunk::FlushMeshToVBO() {
-    m_vertexBuffer.SetMeshData(m_vd, m_vcount);
-    m_vcount = 0;
-    delete[] m_vd;
-}
-
-void Chunk::FlushVBO() {
-    m_vertexBuffer.Flush();
-}
-
-void Chunk::Update(BlockInfo* blockinfo[BTYPE_LAST], World* world) {
-    float u, v, s;
-    // Update mesh
-    if (m_isDirty) {
-        int maxVertexCount = (CHUNK_SIZE_X * CHUNK_SIZE_Y * CHUNK_SIZE_Z) * (6 * 4);
-        m_vd = new VertexBuffer::VertexData[maxVertexCount];
-        m_vcount = 0;
-        for (int x = 0; x < CHUNK_SIZE_X; ++x) {
-            for (int z = 0; z < CHUNK_SIZE_Z; ++z) {
-                for (int y = 0; y < CHUNK_SIZE_Y; ++y) {
-                    if (m_vcount > USHRT_MAX)
-                        break;
-
-                    BlockType bt = GetBlock(x, y, z);
-
-                    if (bt != BTYPE_AIR) {
-                        blockinfo[bt]->GetTexture(u, v, s);
-                        AddBlockToMesh(m_vd, m_vcount, bt, x, y, z, u, v, s, world);
-                    }
-                }
-            }
-        }
-        if (m_vcount > USHRT_MAX) {
-            m_vcount = USHRT_MAX;
-            std::cout << "[ Chunk :: Update ] Chunk data truncaned , too much vertices to have a 16 bit index " << std::endl;
-        }
-    }
-    m_isDirty = false;
-}
-
-void Chunk::AddBlockToMesh(VertexBuffer::VertexData* vd, int& count, BlockType bt, 
-                           int x, int y, int z, float u, float v, float s, World* world) {
-    
-    unsigned int cex, cey;
-
-    world->GetScope(cex, cey);
-
-    int cx = x + (m_posX - cex) * CHUNK_SIZE_X, cy = z + (m_posY - cey) * CHUNK_SIZE_Z;
-
-    if (y == CHUNK_SIZE_Y - 1 || GetBlock(x, y + 1, z) == BTYPE_AIR) {                      //  y
-        vd[count++] = VertexBuffer::VertexData(x, y + 1.f, z, .8f, .8f, .8f, u, v);
-        vd[count++] = VertexBuffer::VertexData(x, y + 1.f, z + 1.f, .8f, .8f, .8f, u, v + s);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y + 1.f, z + 1.f, .8f, .8f, .8f, u + s, v + s);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y + 1.f, z, .8f, .8f, .8f, u + s, v);
-    }
-
-    if (y == 0 || GetBlock(x, y - 1, z) == BTYPE_AIR) {                                     // -y
-        vd[count++] = VertexBuffer::VertexData(x, y, z + 1.f, .2f, .2f, .2f, u, v);
-        vd[count++] = VertexBuffer::VertexData(x, y, z, .2f, .2f, .2f, u, v + s);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y, z, .2f, .2f, .2f, u + s, v + s);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y, z + 1.f, .2f, .2f, .2f, u + s, v);
-    }
-
-    if (world->BlockAt(cx + 1, y, cy) == BTYPE_AIR) {                      //  x
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y, z, .9f, .9f, .9f, u, v);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y + 1.f, z, .9f, .9f, .9f, u, v + s);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y + 1.f, z + 1.f, .9f, .9f, .9f, u + s, v + s);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y, z + 1.f, .9f, .9f, .9f, u + s, v);
-    }
-
-    if (world->BlockAt(cx - 1, y, cy) == BTYPE_AIR) {                                     // -x
-        vd[count++] = VertexBuffer::VertexData(x, y + 1.f, z + 1.f, .5f, .5f, .5f, u, v + s);
-        vd[count++] = VertexBuffer::VertexData(x, y + 1.f, z, .5f, .5f, .5f, u + s, v + s);
-        vd[count++] = VertexBuffer::VertexData(x, y, z, .5f, .5f, .5f, u + s, v);
-        vd[count++] = VertexBuffer::VertexData(x, y, z + 1.f, .5f, .5f, .5f, u, v);
-    }
-
-    if (world->BlockAt(cx, y, cy + 1) == BTYPE_AIR) {                      //  z
-        vd[count++] = VertexBuffer::VertexData(x, y, z + 1.f, .4f, .4f, .4f, u, v);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y, z + 1.f, .4f, .4f, .4f, u + s, v);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y + 1.f, z + 1.f, .4f, .4f, .4f, u + s, v + s);
-        vd[count++] = VertexBuffer::VertexData(x, y + 1.f, z + 1.f, .4f, .4f, .4f, u, v + s);
-    }
-
-    if (world->BlockAt(cx, y, cy - 1) == BTYPE_AIR) {                                     // -z
-        vd[count++] = VertexBuffer::VertexData(x, y + 1.f, z, 1.f, 1.f, 1.f, u, v + s);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y + 1.f, z, 1.f, 1.f, 1.f, u + s, v + s);
-        vd[count++] = VertexBuffer::VertexData(x + 1.f, y, z , 1.f, 1.f, 1.f, u + s, v);
-        vd[count++] = VertexBuffer::VertexData(x, y, z , 1.f, 1.f, 1.f, u, v);
-    }
-}
-
-void Chunk::Render() const { m_vertexBuffer.Render(); }
-
 bool Chunk::IsDirty() const { return m_isDirty; }
 
 void Chunk::MakeDirty() { m_isDirty = true; }
 
+void Chunk::MakeClean() { m_isDirty = false; }
+
 void Chunk::MakeModified() { m_isModified = true; }
 

SQCSim-common/chunk.h

@@ -1,9 +1,9 @@
 #ifndef CHUNK_H__
 #define CHUNK_H__
+
 #include "define.h"
-#include "array3d.h"
 #include "array2d.h"
-#include "vertexbuffer.h"
+#include "array3d.h"
 #include "blockinfo.h"
 #include "opensimplex.h"
 
@@ -12,20 +12,14 @@ class World;
 class Chunk {
     private:
         Array3d<BlockType> m_blocks = Array3d<BlockType>(CHUNK_SIZE_X, CHUNK_SIZE_Y, CHUNK_SIZE_Z);
-        VertexBuffer m_vertexBuffer;
         bool m_isDirty = true;
         bool m_isModified = false;
 
         unsigned int m_posX; // Position du chunk dans l'array constituant le monde.
         unsigned int m_posY;
 
-        VertexBuffer::VertexData* m_vd;
-        int m_vcount;
-
-        void AddBlockToMesh(VertexBuffer::VertexData* vd, int& count, BlockType bt, int x, int y, int z, float u, float v, float s, World* world);
-
     public:
-        Chunk(unsigned int x, unsigned int y);
+        Chunk(unsigned int x, unsigned int y, int64_t seed);
         ~Chunk();
 
         void RemoveBlock(int x, int y, int z, World* world);
@@ -34,15 +28,9 @@ class Chunk {
         void CheckNeighbors(unsigned int x, unsigned int z, World* world);
         void GetPosition(unsigned int& x, unsigned int& y) const;
 
-
-        void Update(BlockInfo* blockinfo[BTYPE_LAST], World* world);
-        void FlushMeshToVBO();
-
-        void FlushVBO();
-        
-        void Render() const;
         bool IsDirty() const;
         void MakeDirty();
+        void MakeClean();
         void MakeModified();
 };
 

SQCSim-common/define.h

@@ -0,0 +1,77 @@
+#ifndef DEFINE_H__
+#define DEFINE_H__
+
+#include <iostream>
+#include <chrono>
+
+#define SRV_PORT 10000
+#define CLI_PORT 10001
+
+#define BUFFER_LENGTH 150
+
+#define CHUNK_SIZE_X  4
+#define CHUNK_SIZE_Y  64
+#define CHUNK_SIZE_Z  4
+#define MAX_SELECTION_DISTANCE 5
+#define SEED 0
+#define COUNTDOWN 300
+
+#define WORLD_SIZE_X 64
+#define WORLD_SIZE_Y 64
+
+#define FRAMES_RENDER_CHUNKS 1
+#define FRAMES_UPDATE_CHUNKS 1
+#define FRAMES_DELETE_CHUNKS 1
+
+#define THREADS_GENERATE_CHUNKS 8
+#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 TEXTURE_SIZE 512
+#define MAX_BULLETS 512
+
+#define BULLET_TIME .1
+
+typedef uint8_t BlockType;
+enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_LAST };
+typedef uint64_t Timestamp;
+
+#ifdef _WIN32
+
+#pragma comment(lib,"wsock32.lib") // Pour pouvoir faire fonctionner le linker sans le vcxproject
+#pragma comment(lib,"ws2_32.lib")
+#include <ws2tcpip.h>
+#include <Windows.h>
+#include <cstdio>
+#include <ctime>
+
+#define flag_t u_long
+#define addrlen_t int
+#define ioctl ioctlsocket
+#define SOCK_NONBLOCK FIONBIO
+#define strcpy strcpy_s
+#define popen _popen
+#define pclose _pclose
+
+#else // Pas _WIN32
+
+#include <unistd.h>
+#include <time.h>
+#include <stdio.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <cstring>
+
+#define flag_t unsigned int
+#define addrlen_t unsigned int
+#define SOCKET int
+#define INVALID_SOCKET -1
+#define closesocket close
+
+#endif // _WIN32
+
+
+#endif // DEFINE_H__

SQCSim-common/netprotocol.cpp

@@ -0,0 +1,940 @@
+#include "netprotocol.h"
+
+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)((time >> 48) & 0xFF),
+									   (uint8_t)((time >> 40) & 0xFF),
+									   (uint8_t)((time >> 32) & 0xFF),
+									   (uint8_t)((time >> 24) & 0xFF),
+									   (uint8_t)((time >> 16) & 0xFF),
+									   (uint8_t)((time >> 8 ) & 0xFF),
+									    (uint8_t)(time		  & 0xFF)};
+
+	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)((sid >> 48) & 0xFF),
+									  (uint8_t)((sid >> 40) & 0xFF),
+									  (uint8_t)((sid >> 32) & 0xFF),
+									  (uint8_t)((sid >> 24) & 0xFF),
+									  (uint8_t)((sid >> 16) & 0xFF),
+									  (uint8_t)((sid >> 8 ) & 0xFF),
+									  (uint8_t)( sid		& 0xFF)};
+
+	memcpy(*buf + sizeof(uint64_t) + 1, sid8, sizeof(uint64_t));
+
+	Keys keys = in->keys;
+	uint8_t keys8 = // Reste un bit.
+		keys.forward  & 0b10000000 |
+		keys.backward & 0b01000000 |
+		keys.left     & 0b00100000 |
+		keys.right    & 0b00010000 |
+		keys.jump     & 0b00001000 |
+		keys.shoot    & 0b00000100 |
+		keys.block    & 0b00000010 ;
+
+	memcpy(*buf + sizeof(uint64_t) * 2 + 1, &keys8, sizeof(uint8_t));
+
+	uint32_t vec[3];
+	memcpy(vec, &in->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);
+
+	*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 3;
+}
+
+void netprot::Serialize(Output* out, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::OUTPUT;
+
+	uint64_t time = out->timestamp;
+	uint8_t time8[sizeof(uint64_t)] = { (uint8_t)((time >> 56) & 0xFF),
+									   (uint8_t)((time >> 48) & 0xFF),
+									   (uint8_t)((time >> 40) & 0xFF),
+									   (uint8_t)((time >> 32) & 0xFF),
+									   (uint8_t)((time >> 24) & 0xFF),
+									   (uint8_t)((time >> 16) & 0xFF),
+									   (uint8_t)((time >> 8) & 0xFF),
+										(uint8_t)(time & 0xFF) };
+
+	memcpy(*buf + 1, time8, sizeof(uint64_t));
+
+	uint64_t sid = out->id;
+	uint8_t sid8[sizeof(uint64_t)] = { (uint8_t)((sid >> 56) & 0xFF),
+									  (uint8_t)((sid >> 48) & 0xFF),
+									  (uint8_t)((sid >> 40) & 0xFF),
+									  (uint8_t)((sid >> 32) & 0xFF),
+									  (uint8_t)((sid >> 24) & 0xFF),
+									  (uint8_t)((sid >> 16) & 0xFF),
+									  (uint8_t)((sid >> 8) & 0xFF),
+									  (uint8_t)(sid & 0xFF) };
+
+	memcpy(*buf + sizeof(uint64_t) + 1, sid8, sizeof(uint64_t));
+
+	// TODO: Finir ca.
+}
+
+void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::SYNC;
+	uint64_t time = sync->timestamp;
+	uint8_t stamp8[sizeof(uint64_t)] = { (uint8_t)((time >> 56) & 0xFF),
+									   (uint8_t)((time >> 48) & 0xFF),
+									   (uint8_t)((time >> 40) & 0xFF),
+									   (uint8_t)((time >> 32) & 0xFF),
+									   (uint8_t)((time >> 24) & 0xFF),
+									   (uint8_t)((time >> 16) & 0xFF),
+									   (uint8_t)((time >> 8) & 0xFF),
+										(uint8_t)(time & 0xFF) };
+
+	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),
+									  (uint8_t)((sid >> 40) & 0xFF),
+									  (uint8_t)((sid >> 32) & 0xFF),
+									  (uint8_t)((sid >> 24) & 0xFF),
+									  (uint8_t)((sid >> 16) & 0xFF),
+									  (uint8_t)((sid >> 8) & 0xFF),
+									  (uint8_t)(sid & 0xFF) };
+
+	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)((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;
+	uint8_t ammo8[sizeof(uint16_t)] = { (uint8_t)((ammo >> 8) & 0xFF),
+										(uint8_t)(ammo & 0xFF) };
+
+	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + 1, ammo8, sizeof(uint16_t));
+
+	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t) + 1, &sync->hp, sizeof(uint8_t));
+
+	uint32_t vec[3];
+	memcpy(vec, &sync->position, 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 + sizeof(uint32_t) + sizeof(uint16_t) + 2, vec8, sizeof(uint32_t) * 3);
+
+	*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 2;
+}
+
+void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::TEAMINF;
+
+	size_t namesize = std::strlen(tinfo->name) + 1;
+
+	memcpy(*buf + 1, &tinfo->name, namesize);
+	uint64_t tid = tinfo->id;
+	uint8_t tid8[sizeof(uint64_t)] = {
+									   (uint8_t)((tid >> 56) & 0xFF),
+									   (uint8_t)((tid >> 48) & 0xFF),
+									   (uint8_t)((tid >> 40) & 0xFF),
+									   (uint8_t)((tid >> 32) & 0xFF),
+									   (uint8_t)((tid >> 24) & 0xFF),
+									   (uint8_t)((tid >> 16) & 0xFF),
+									   (uint8_t)((tid >> 8)  & 0xFF),
+									    (uint8_t)(tid 		 & 0xFF)
+	};
+
+	memcpy(*buf + namesize + 2, tid8, sizeof(uint64_t));
+
+	*buflen = namesize + sizeof(uint64_t) + 2;
+}
+
+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)((sid >> 56) & 0xFF),
+									   (uint8_t)((sid >> 48) & 0xFF),
+									   (uint8_t)((sid >> 40) & 0xFF),
+									   (uint8_t)((sid >> 32) & 0xFF),
+									   (uint8_t)((sid >> 24) & 0xFF),
+									   (uint8_t)((sid >> 16) & 0xFF),
+									   (uint8_t)((sid >> 8)  & 0xFF),
+									    (uint8_t)(sid 		 & 0xFF)
+	};
+
+	memcpy(*buf + namesize + 2, sid8, sizeof(uint64_t));
+
+	uint64_t tid = linfo->tid;
+	uint8_t tid8[sizeof(uint64_t)] = {
+									   (uint8_t)((tid >> 56) & 0xFF),
+									   (uint8_t)((tid >> 48) & 0xFF),
+									   (uint8_t)((tid >> 40) & 0xFF),
+									   (uint8_t)((tid >> 32) & 0xFF),
+									   (uint8_t)((tid >> 24) & 0xFF),
+									   (uint8_t)((tid >> 16) & 0xFF),
+									   (uint8_t)((tid >> 8)  & 0xFF),
+									   (uint8_t)(tid 		 & 0xFF)
+	};
+
+	memcpy(*buf + namesize + 2 + sizeof(uint64_t), tid8, sizeof(uint64_t));
+
+	*buflen = namesize + sizeof(uint64_t) * 2 + 2;
+}
+
+void netprot::Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::PLAYINF;
+
+	size_t namesize = std::strlen(pinfo->name) + 1;
+
+	memcpy(*buf + 1, &pinfo->name, namesize);
+	uint64_t id = pinfo->id;
+	uint8_t id8[sizeof(uint64_t)] = {
+									   (uint8_t)((id >> 56) & 0xFF),
+									   (uint8_t)((id >> 48) & 0xFF),
+									   (uint8_t)((id >> 40) & 0xFF),
+									   (uint8_t)((id >> 32) & 0xFF),
+									   (uint8_t)((id >> 24) & 0xFF),
+									   (uint8_t)((id >> 16) & 0xFF),
+									   (uint8_t)((id >> 8)  & 0xFF),
+									    (uint8_t)(id 		& 0xFF)
+	};
+
+	memcpy(*buf + namesize + 2, id8, sizeof(uint64_t));
+
+	uint64_t tid = pinfo->tid;
+	uint8_t tid8[sizeof(uint64_t)] = {
+									   (uint8_t)((tid >> 56) & 0xFF),
+									   (uint8_t)((tid >> 48) & 0xFF),
+									   (uint8_t)((tid >> 40) & 0xFF),
+									   (uint8_t)((tid >> 32) & 0xFF),
+									   (uint8_t)((tid >> 24) & 0xFF),
+									   (uint8_t)((tid >> 16) & 0xFF),
+									   (uint8_t)((tid >> 8)  & 0xFF),
+									    (uint8_t)(tid 		 & 0xFF) 
+	};
+
+	memcpy(*buf + namesize + 2 + sizeof(uint64_t), tid8, sizeof(uint64_t));
+
+	*buflen = namesize + sizeof(uint64_t) * 2 + 2;
+}
+
+void netprot::Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::GAMEINFO;
+
+	uint64_t game = ginfo->seed;
+	uint8_t seed8[sizeof(uint64_t)] = {
+									   (uint8_t)((game >> 56) & 0xFF),
+									   (uint8_t)((game >> 48) & 0xFF),
+									   (uint8_t)((game >> 40) & 0xFF),
+									   (uint8_t)((game >> 32) & 0xFF),
+									   (uint8_t)((game >> 24) & 0xFF),
+									   (uint8_t)((game >> 16) & 0xFF),
+									   (uint8_t)((game >> 8)  & 0xFF),
+									    (uint8_t)(game 		  & 0xFF)
+	};
+
+	memcpy(*buf + 1, seed8, sizeof(uint64_t));
+
+	game = ginfo->countdown;
+	uint8_t count8[sizeof(uint64_t)] = {
+										(uint8_t)((game >> 56) & 0xFF),
+									    (uint8_t)((game >> 48) & 0xFF),
+									    (uint8_t)((game >> 40) & 0xFF),
+									    (uint8_t)((game >> 32) & 0xFF),
+									    (uint8_t)((game >> 24) & 0xFF),
+									    (uint8_t)((game >> 16) & 0xFF),
+										(uint8_t)((game >> 8)  & 0xFF),
+									     (uint8_t)(game 	   & 0xFF)
+	};
+
+	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 >> 48) & 0xFF),
+									   (uint8_t)((game >> 40) & 0xFF),
+									   (uint8_t)((game >> 32) & 0xFF),
+									   (uint8_t)((game >> 24) & 0xFF),
+									   (uint8_t)((game >> 16) & 0xFF),
+									   (uint8_t)((game >> 8)  & 0xFF),
+									    (uint8_t)(game 		  & 0xFF)
+	};
+
+	memcpy(*buf + sizeof(uint64_t) + 1, gtype8, sizeof(uint64_t));
+
+	*buflen = sizeof(uint64_t) * 3 + 1;
+}
+
+void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::CHAT;
+
+	uint64_t src = chat->src_id;
+	uint8_t src8[sizeof(uint64_t)] = {
+									   (uint8_t)((src >> 56) & 0xFF),
+									   (uint8_t)((src >> 48) & 0xFF),
+									   (uint8_t)((src >> 40) & 0xFF),
+									   (uint8_t)((src >> 32) & 0xFF),
+									   (uint8_t)((src >> 24) & 0xFF),
+									   (uint8_t)((src >> 16) & 0xFF),
+									   (uint8_t)((src >> 8)  & 0xFF),
+									    (uint8_t)(src 		 & 0xFF)
+	};
+
+	memcpy(*buf + 1, src8, sizeof(uint64_t));
+
+	uint64_t dst = chat->dest_id;
+	uint8_t dst8[sizeof(uint64_t)] = {
+									   (uint8_t)((dst >> 56) & 0xFF),
+									   (uint8_t)((dst >> 48) & 0xFF),
+									   (uint8_t)((dst >> 40) & 0xFF),
+									   (uint8_t)((dst >> 32) & 0xFF),
+									   (uint8_t)((dst >> 24) & 0xFF),
+									   (uint8_t)((dst >> 16) & 0xFF),
+									   (uint8_t)((dst >> 8)  & 0xFF),
+									    (uint8_t)(dst 		 & 0xFF)
+	};
+
+	memcpy(*buf + 1 + sizeof(uint64_t), dst8, sizeof(uint64_t));
+
+	uint64_t dstteam = chat->dest_id;
+	uint8_t dstt8[sizeof(uint64_t)] = {
+									   (uint8_t)((dstteam >> 56) & 0xFF),
+									   (uint8_t)((dstteam >> 48) & 0xFF),
+									   (uint8_t)((dstteam >> 40) & 0xFF),
+									   (uint8_t)((dstteam >> 32) & 0xFF),
+									   (uint8_t)((dstteam >> 24) & 0xFF),
+									   (uint8_t)((dstteam >> 16) & 0xFF),
+									   (uint8_t)((dstteam >> 8)  & 0xFF),
+									    (uint8_t)(dstteam 		 & 0xFF)
+	};
+	
+	memcpy(*buf + 1 + sizeof(uint64_t) * 2, dstt8, sizeof(uint64_t));
+
+	size_t messize = std::strlen(chat->mess) + 1;
+
+	memcpy(*buf + 1 + sizeof(uint64_t) * 3, &chat->mess, messize);
+
+	*buflen = messize + sizeof(uint64_t) * 3 + 2;
+}
+
+void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::ERRLOG;
+
+	size_t messize = std::strlen(errlog->mess) + 1;
+
+	memcpy(*buf + 1, &errlog->mess, messize);
+
+	memcpy(*buf + 1 + messize, &errlog->is_fatal, sizeof(bool));
+
+	*buflen = messize + sizeof(bool) + 1;
+}
+
+
+
+bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
+	if (buflen <= sizeof(Input))
+		return false;
+
+	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(diff, &buf[1], sizeof(uint64_t));
+	in->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));
+	in->sid =
+		(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 keys = 0;
+	memcpy(&keys, &buf[1 + sizeof(uint64_t) * 2], sizeof(uint8_t));
+	in->keys.forward	= keys & 0b10000000;
+	in->keys.backward	= keys & 0b01000000;
+	in->keys.left		= keys & 0b00100000;
+	in->keys.right		= keys & 0b00010000;
+	in->keys.jump		= keys & 0b00001000;
+	in->keys.shoot		= keys & 0b00000100;
+	in->keys.block		= keys & 0b00000010;
+
+	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(&in->direction, vec, sizeof(uint32_t) * 3);
+
+	return true;
+}
+
+bool netprot::Deserialize(Output* out, char* buf, const uint32_t buflen) {
+	return false;
+}
+
+bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) {
+	if (buflen <= sizeof(Sync))
+		return false;
+
+	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(diff, &buf[1], sizeof(uint64_t));
+	sync->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));
+	sync->sid =
+		(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) * 2], sizeof(uint32_t));
+	sync->timer =
+		(uint32_t)diff[0] << 24 |
+		(uint32_t)diff[1] << 16 |
+		(uint32_t)diff[2] << 8 |
+		(uint32_t)diff[3];
+
+	memcpy(diff, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t)], sizeof(uint16_t));
+	sync->ammo =
+		(uint16_t)diff[0] << 8 |
+		(uint16_t)diff[1];
+
+	memcpy(&sync->hp, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t)], sizeof(uint8_t));
+
+	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(uint32_t) + sizeof(uint16_t)], 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(&sync->position, vec, sizeof(uint32_t) * 3);
+
+	return true;
+}
+
+bool netprot::Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen) {
+	if (buflen <= sizeof(LoginInfo))
+		return false;
+
+	size_t namesize = std::strlen(buf) + 1;
+
+	if (namesize > 32)
+		return false;
+
+	memcpy(&tinfo->name, &buf[1], namesize);
+
+	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
+	tinfo->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];
+
+	return true;
+}
+
+bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) {
+	if (buflen <= sizeof(LoginInfo))
+		return false;
+
+	size_t namesize = std::strlen(buf) + 1;
+
+	if (namesize > 32)
+		return false;
+
+	memcpy(&linfo->name, &buf[1], namesize);
+
+	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
+	linfo->sid =
+		(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[namesize + sizeof(uint64_t) + 1], sizeof(uint64_t));
+	linfo->tid =
+		(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];
+
+	return true;
+}
+
+bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen) {
+	if (buflen <= sizeof(PlayerInfo))
+		return false;
+
+	size_t namesize = std::strlen(buf) + 1;
+
+	if (namesize > 32)
+		return false;
+
+	memcpy(&pinfo->name, &buf[1], namesize);
+
+	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
+	pinfo->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];
+
+	memcpy(diff, &buf[namesize + sizeof(uint64_t) + 1], sizeof(uint64_t));
+	pinfo->tid =
+		(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];
+
+	return true;
+}
+
+bool netprot::Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen) {
+	if (buflen <= sizeof(GameInfo))
+		return false;
+
+	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(diff, &buf[1], sizeof(uint64_t));
+	ginfo->seed =
+		(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[sizeof(uint64_t) + 1], sizeof(uint64_t));
+	ginfo->countdown =
+		(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[sizeof(uint64_t) * 2 + 1], sizeof(uint64_t));
+	ginfo->gameType =
+		(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];
+
+	return true;
+}
+
+bool netprot::Deserialize(Chat* chat, char* buf, const uint32_t buflen) {
+	if (buflen <= sizeof(Chat))
+		return false;
+
+	uint8_t src[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(src, &buf[1], sizeof(uint64_t));
+	chat->src_id =
+		(uint64_t)src[0] << 56 |
+		(uint64_t)src[1] << 48 |
+		(uint64_t)src[2] << 40 |
+		(uint64_t)src[3] << 32 |
+		(uint64_t)src[4] << 24 |
+		(uint64_t)src[5] << 16 |
+		(uint64_t)src[6] << 8 |
+		(uint64_t)src[7];
+
+	uint8_t dst[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(dst, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
+	chat->dest_id =
+		(uint64_t)dst[0] << 56 |
+		(uint64_t)dst[1] << 48 |
+		(uint64_t)dst[2] << 40 |
+		(uint64_t)dst[3] << 32 |
+		(uint64_t)dst[4] << 24 |
+		(uint64_t)dst[5] << 16 |
+		(uint64_t)dst[6] << 8 |
+		(uint64_t)dst[7];
+
+	uint8_t dstt[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(dstt, &buf[1 + sizeof(uint64_t) * 2], sizeof(uint64_t));
+	chat->dest_team_id =
+		(uint64_t)dstt[0] << 56 |
+		(uint64_t)dstt[1] << 48 |
+		(uint64_t)dstt[2] << 40 |
+		(uint64_t)dstt[3] << 32 |
+		(uint64_t)dstt[4] << 24 |
+		(uint64_t)dstt[5] << 16 |
+		(uint64_t)dstt[6] << 8 |
+		(uint64_t)dstt[7];
+
+	size_t messsize = std::strlen(buf + sizeof(uint64_t) * 3) + 1;
+
+	if (messsize > 140)
+		return false;
+
+	memcpy(&chat->mess, &buf[1 + sizeof(uint64_t) * 3], messsize);
+	return true;
+}
+
+bool netprot::Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen) {
+	if (buflen <= sizeof(ErrorLog))
+		return false;
+
+	size_t messsize = std::strlen(buf) + 1;
+
+	if (messsize > 140)
+		return false;
+
+	memcpy(&errlog->mess, &buf[1], messsize);
+	memcpy(&errlog->is_fatal, &buf[1 + messsize], sizeof(bool));
+
+	return true;
+}
+
+netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
+	if (buflen < 1 || 
+		buf[0] >= (char)netprot::PACKET_TYPE::LAST_PACK || 
+		buf[0] <= (char)netprot::PACKET_TYPE::ERR)
+		return netprot::PACKET_TYPE::ERR;
+	return (netprot::PACKET_TYPE)buf[0];
+}
+
+netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
+	Packet pck = { nullptr, PACKET_TYPE::ERR };
+	Input* in = nullptr;
+	Output* out = nullptr;
+	Sync* sync = nullptr;
+	Chat* chat = nullptr;
+	GameInfo* ginfo = nullptr;
+	ErrorLog* errlog = nullptr;
+	LoginInfo* loginf = nullptr;
+
+	switch (getType(buf, buflen)) {
+	case PACKET_TYPE::INPUT:
+		in = new Input();
+		if (netprot::Deserialize(in, buf, buflen)) {
+			pck.type = PACKET_TYPE::INPUT;
+			pck.ptr = (void*)in;
+		}
+		break;
+	case PACKET_TYPE::OUTPUT:
+		out = new Output();
+		if (netprot::Deserialize(out, buf, buflen)) {
+			pck.type = PACKET_TYPE::OUTPUT;
+			pck.ptr = (void*)out;
+		}
+		break;
+	case PACKET_TYPE::SYNC:
+		sync = new Sync();
+		if (netprot::Deserialize(sync, buf, buflen)) {
+			pck.type = PACKET_TYPE::SYNC;
+			pck.ptr = (void*)sync;
+		}
+		break;
+	case PACKET_TYPE::CHAT:
+		chat = new Chat();
+		if (netprot::Deserialize(chat, buf, buflen)) {
+			pck.type = PACKET_TYPE::CHAT;
+			pck.ptr = (void*)chat;
+		}
+		break;
+	case PACKET_TYPE::GAMEINFO:
+		ginfo = new GameInfo();
+		if (netprot::Deserialize(ginfo, buf, buflen)) {
+			pck.type = PACKET_TYPE::GAMEINFO;
+			pck.ptr = (void*)ginfo;
+		}
+		break;
+	case PACKET_TYPE::ERRLOG:
+		errlog = new ErrorLog();
+		if (netprot::Deserialize(errlog, buf, buflen)) {
+			pck.type = PACKET_TYPE::ERRLOG;
+			pck.ptr = (void*)errlog;
+		}
+		break;
+	case PACKET_TYPE::LOGINF:
+		loginf = new LoginInfo();
+		if (netprot::Deserialize(loginf, buf, buflen)) {
+			pck.type = PACKET_TYPE::LOGINF;
+			pck.ptr = (void*)loginf;
+		}
+		break;
+	default:
+		break;
+	}
+	return pck;
+}
+
+netprot::Packet netprot::getPack(netprot::Buffer* buf) { 
+	return netprot::getPack(buf->ptr, buf->len); 
+}
+
+bool netprot::emptyPack(netprot::Packet pck) {
+	switch (pck.type) {
+	case PACKET_TYPE::INPUT:
+		delete (Input*)pck.ptr;
+		return true;
+	case PACKET_TYPE::OUTPUT:
+		delete (Output*)pck.ptr;
+		return true;
+	case PACKET_TYPE::SYNC:
+		delete (Sync*)pck.ptr;
+		return true;
+	case PACKET_TYPE::CHAT:
+		delete (Chat*)pck.ptr;
+		return true;
+	case PACKET_TYPE::GAMEINFO:
+		delete (GameInfo*)pck.ptr;
+		return true;
+	case PACKET_TYPE::ERRLOG:
+		delete (ErrorLog*)pck.ptr;
+		return true;
+	case PACKET_TYPE::LOGINF:
+		delete (LoginInfo*)pck.ptr;
+		return true;
+	default:
+		return false;
+	}
+}
+
+netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
+	Packet pck;
+	pck.ptr = ptr;
+	pck.type = type;
+	return pck;
+}
+
+std::vector<netprot::Packet> netprot::recvPacks(SOCKET sock, Buffer* buf) {
+	std::vector<Packet> lsPck;
+	int len = 0, end = 0;
+	bool pck_received = false;
+	char* cursor = nullptr;
+
+	while (true) {
+		while (!pck_received) {
+			int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
+			if (bytes < 0) // si recv() retourne -1; ça veut dire qu'il y a plus rien a lire.
+				return lsPck;
+			len += bytes;
+			// TODO: Voir si on trouve un footer (5 '\0' d'affilee).
+			//		 Si oui, mettre l'index du debut du footer dans 
+			//		 la variable "end" et mettre pck_received a true.
+		}
+
+		cursor = &buf->ptr[end];
+
+		lsPck.push_back(getPack(buf));
+
+		while (*cursor == '\0') {
+			cursor++;
+			end++;
+		}
+
+		if (cursor) { // mettre le début du prochain paquet au début du buffer.
+			memcpy(buf->ptr, cursor, buf->len - end); // et voir s'il y a en un autre
+			len = 0;
+			pck_received = true;
+		}
+	}
+}
+
+template <>
+void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, char** buf, uint32_t* buflen) {
+	switch (pack->type) {
+        case PACKET_TYPE::INPUT:
+			sendPack<Input>(sock, (Input*)pack->ptr, buf, buflen);
+			return;
+        case PACKET_TYPE::OUTPUT:
+			sendPack<Output>(sock, (Output*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::SYNC:
+			sendPack<Sync>(sock, (Sync*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::TEAMINF:
+			sendPack<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::PLAYINF:
+			sendPack<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::LOGINF:
+			sendPack<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::CHUNKMOD:
+			//sendPack<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, buflen);
+		case PACKET_TYPE::PLAYERMOD:
+			//sendPack<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::PICKUPMOD:
+			//sendPack<PickupMod>(sock, (PickupMod*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::GAMEINFO:
+			sendPack<GameInfo>(sock, (GameInfo*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::ENDINFO:
+			//sendPack<EndInfo>(sock, (EndInfo*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::CHAT:
+			sendPack<Chat>(sock, (Chat*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::ERRLOG:
+			sendPack<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, buflen);
+			return;
+		case PACKET_TYPE::LAST_PACK: [[fallthrough]];
+        case PACKET_TYPE::ERR: [[fallthrough]];
+		default:
+			return;
+        }
+}
+
+template <>
+void netprot::sendPackTo<netprot::Packet>(SOCKET sock, Packet* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad) {
+	switch (pack->type) {
+        case PACKET_TYPE::INPUT:
+			sendPackTo<Input>(sock, (Input*)pack->ptr, buf, buflen, sockad);
+			return;
+        case PACKET_TYPE::OUTPUT:
+			sendPackTo<Output>(sock, (Output*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::SYNC:
+			sendPackTo<Sync>(sock, (Sync*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::TEAMINF:
+			sendPackTo<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::PLAYINF:
+			sendPackTo<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::LOGINF:
+			sendPackTo<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::CHUNKMOD:
+			//sendPackTo<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::PLAYERMOD:
+			//sendPackTo<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::PICKUPMOD:
+			//sendPackTo<PickupMod>(sock, (PickupMod*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::GAMEINFO:
+			sendPackTo<GameInfo>(sock, (GameInfo*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::ENDINFO:
+			//sendPackTo<EndInfo>(sock, (EndInfo*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::CHAT:
+			sendPackTo<Chat>(sock, (Chat*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::ERRLOG:
+			sendPackTo<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, buflen, sockad);
+			return;
+		case PACKET_TYPE::LAST_PACK: [[fallthrough]];
+        case PACKET_TYPE::ERR: [[fallthrough]];
+		default:
+			return;
+        }
+}

SQCSim-common/netprotocol.h

@@ -0,0 +1,205 @@
+#ifndef NETPROTOCOL_H__
+#define NETPROTOCOL_H__
+
+#include <string>
+#include "define.h"
+#include "vector3.h"
+
+/* 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,
+				TEAMINF, SELFINF, PLAYINF, LOGINF,
+				CHUNKMOD, PLAYERMOD, PICKUPMOD,
+				GAMEINFO, ENDINFO , CHAT, ERRLOG,
+				LAST_PACK
+			};
+	
+	struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean.
+		char* ptr = new char[BUFFER_LENGTH];
+		uint32_t len = BUFFER_LENGTH;
+
+		~Buffer() { delete[] ptr; }
+		void rstLen() { len = BUFFER_LENGTH; }
+	};
+
+	struct Packet { // Pour pouvoir recevoir les paquets du recv() sans avoir à les aiguiller dans la même thread.
+		void* ptr = nullptr; // Notez que le pointeur doit être supprimé séparément lorsqu'il n'est plus utile.
+		PACKET_TYPE type = PACKET_TYPE::ERR;
+	};
+
+	struct Keys {
+		bool forward, 
+			 backward, 
+			 left, 
+			 right, 
+			 jump, 
+			 shoot,
+			 block;
+	};
+
+	struct States {
+		bool jumping, 
+			 shooting, 
+			 hit, 
+			 powerup,
+			 dead,
+			 still,
+		     jumpshot,
+			 running;
+	};
+
+	struct Input {										// cli -> srv			UDP			~frame
+		Timestamp timestamp;
+		uint64_t sid = 0;
+		Keys keys; // 0bFBLRJS__ bit-packing de bool.
+		Vector3f direction;
+	};
+
+	struct Output {										// srv -> cli			UDP			~frame
+		Timestamp timestamp;
+		uint64_t id = 0;
+		Vector3f position,
+			     direction;
+		States states; // 0bJSH_____ bit-packing de bool.
+	};
+
+	struct Sync {										// srv -> cli			TCP			~second
+		Timestamp timestamp;
+		uint64_t sid = 0;
+		uint32_t timer = 0;
+		uint16_t ammo = 0;
+		uint8_t hp = 0;
+		Vector3f position;
+		Sync() {}
+		Sync(Sync* sync) : timestamp(sync->timestamp), sid(sync->sid), timer(sync->timer), ammo(sync->ammo), hp(sync->hp), position(sync->position) {}
+	};
+
+	struct TeamInfo {									// cli <-> srv			TCP			once
+		char name[32];
+		uint64_t id = 0;
+		TeamInfo() {}
+		TeamInfo(TeamInfo* tem) : id(tem->id) { strcpy(tem->name, name); }
+	};
+
+	struct LoginInfo {									// cli <-> srv			TCP			once
+		char name[32];
+		uint64_t sid = 0, 
+			     tid = 0;
+		LoginInfo() {}
+		LoginInfo(LoginInfo* ply): sid(ply->sid), tid(ply->tid) { strcpy(ply->name, name); }
+	};
+
+	struct PlayerInfo {									// cli <-> srv			TCP			once
+		char name[32];
+		uint64_t id = 0,
+				 tid = 0;
+		PlayerInfo() {}
+		PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) { strcpy(log->name, name); }
+	};
+
+	struct GameInfo {									// cli <-> srv			TCP			event (before game start)/ once
+		uint64_t seed;
+		uint32_t countdown;
+		uint8_t gameType; // TODD: enum.
+		GameInfo() {}
+		GameInfo(GameInfo* gam) : seed(gam->seed), countdown(gam->countdown), gameType(gam->gameType) {}
+	};
+
+	struct Chat {										// cli <-> srv			TCP			event
+		uint64_t src_id = 0,
+			dest_id = 0,
+			dest_team_id = 0;
+		char mess[140]; // Good 'nough for twitr, good 'nough for me.
+		Chat() {}
+		Chat(Chat* cha) : src_id(cha->src_id), dest_id(cha->dest_id), dest_team_id(cha->dest_team_id) { strcpy(cha->mess, mess); }
+	};
+
+	struct ErrorLog {									// srv -> cli			TCP			event
+		char mess[140];
+		bool is_fatal;
+		ErrorLog() {};
+		ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(err->mess, mess); }
+	};
+
+	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
+	void Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen); // cli/srv
+	void Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen); // cli/srv
+	void Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen); // srv
+	void Serialize(GameInfo* ginfo, char* buf[], uint32_t* buflen); // cli/srv
+	void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv
+	void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv
+
+	bool Deserialize(Input* in, char* buf, const uint32_t buflen); // srv
+	bool Deserialize(Output* out, char* buf, const uint32_t buflen); // cli
+	bool Deserialize(Sync* sync, char* buf, const uint32_t buflen); // cli
+	bool Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen); // cli/srv
+	bool Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen); // cli/srv
+	bool Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen); // cli
+	bool Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen); // cli
+	bool Deserialize(Chat* chat, char* buf, const uint32_t buflen); // srv/cli
+	bool Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen); // srv
+
+	PACKET_TYPE getType(char* buf, uint32_t buflen);
+
+	Packet getPack(char* buf, uint32_t buflen);
+	Packet getPack(Buffer* buf);
+
+	bool emptyPack(Packet pck);
+
+	Packet makePack(void* ptr, PACKET_TYPE type); // Pour pouvoir faire une liste de stock a supprimer sans avoir a en faire une pour chaque type.
+
+	template <class T> void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen);
+	template <class T> void sendPackTo(SOCKET sock, T* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad);
+
+	template <class T> void sendPack(SOCKET sock, T* pack, Buffer* buf);
+	template <class T> void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad);
+	
+	std::vector<Packet> recvPacks(SOCKET sock, Buffer* buf);
+
+	template <class T>
+	void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen) {
+		netprot::Serialize(pack, buf, buflen);
+		memset(&buf[*buflen], '\0', sizeof(uint64_t) + sizeof(uint8_t));
+		buflen += (sizeof(uint64_t) + sizeof(uint8_t));
+		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;
+		netprot::Serialize(pack, buf, buflen);
+		memset(&buf[*buflen], '\0', sizeof(uint64_t) + sizeof(uint8_t));
+		buflen += (sizeof(uint64_t) + sizeof(uint8_t));
+		sendto(sock, *buf, *buflen, 0, (sockaddr*)&addr, sizeof(addr));
+		*buflen = BUFFER_LENGTH;
+	}
+
+	template <class T>
+	void sendPack(SOCKET sock, T* pack, Buffer* buf) {
+		netprot::Serialize(pack, &buf->ptr, &buf->len);
+		memset(&buf->ptr[buf->len], '\0', sizeof(uint64_t) + sizeof(uint8_t));
+		buf->len += sizeof(uint64_t) + sizeof(uint8_t);
+		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;
+		netprot::Serialize(pack, &buf->ptr, &buf->len);
+		memset(&buf->ptr[buf->len], '\0', sizeof(uint64_t) + sizeof(uint8_t));
+		buf->len += sizeof(uint64_t) + sizeof(uint8_t);
+		sendto(sock, buf->ptr, buf->len, 0, (sockaddr*)&addr, sizeof(addr));
+		buf->rstLen();
+	}
+
+
+};
+#endif

SQCSim-common/player.cpp

@@ -4,10 +4,12 @@
 Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(position), m_rotX(rotX), m_rotY(rotY) {
 	m_velocity = Vector3f(0, 0, 0);
 	m_airborne = true;
-	m_hp = 0.75f; //TODO: Remettre à 1.0f
-	m_username = "Zelda Bee-Bop";
+	m_hp = 1.0f; //TODO: Remettre <EFBFBD> 1.0f
+	m_username = "Zelda Bee-Bop56";
 }
 
+Player::~Player() {}
+
 void Player::TurnLeftRight(float value) {
 	m_rotY += value;
 	if (m_rotY > 360) m_rotY = 0;
@@ -66,8 +68,8 @@ Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jum
 	return delta;
 }
 
-void Player::ApplyPhysics(Vector3f input, World* world, float elapsedTime, Audio* audio) {
-	static irrklang::ISound* step; // Pour les sons de pas.
+Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTime) {
+	Player::Sound snd = Player::Sound::NOSOUND;
 	static float timing = 0.f;
 	/* Gestion de collisions */
 	BlockType bt1, bt2, bt3;
@@ -88,7 +90,7 @@ void Player::ApplyPhysics(Vector3f input, World* world, float elapsedTime, Audio
 		if (bt3 != BTYPE_AIR) {
 			m_velocity.y = 0;
 			if (timing == 0.f) {
-				if (m_airborne) audio->Create3DAudioObj(step, AUDIO_PATH "hit.wav", GetPosition(), GetVelocity(), 1.f);
+				if (m_airborne) snd = Player::Sound::FALL;
 				timing = .3f;
 			}
 			m_airborne = false;
@@ -105,7 +107,15 @@ void Player::ApplyPhysics(Vector3f input, World* world, float elapsedTime, Audio
 	bt1 = world->BlockAt(GetPosition().x + input.x, GetPosition().y, GetPosition().z);
 	bt2 = world->BlockAt(GetPosition().x + input.x, GetPosition().y - 0.9f, GetPosition().z);
 	bt3 = world->BlockAt(GetPosition().x + input.x, GetPosition().y - 1.7f, GetPosition().z);
-	if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
+	if (bt1 == BTYPE_AIR && bt2 != BTYPE_AIR && bt3 != BTYPE_AIR) {
+		if (input.x > 0)
+			input.x = m_velocity.x = 0.5f;
+		else
+			input.x = m_velocity.x = -0.5f;
+		m_velocity.y = 0.3;
+		m_velocity.z *= .5f;
+	}
+	else if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
 		input.x = m_velocity.x = 0;
 		m_velocity.z *= .5f;
 	}
@@ -113,7 +123,15 @@ void Player::ApplyPhysics(Vector3f input, World* world, float elapsedTime, Audio
 	bt1 = world->BlockAt(GetPosition().x, GetPosition().y, GetPosition().z + input.z);
 	bt2 = world->BlockAt(GetPosition().x, GetPosition().y - 0.9f, GetPosition().z + input.z);
 	bt3 = world->BlockAt(GetPosition().x, GetPosition().y - 1.7f, GetPosition().z + input.z);
-	if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
+	if (bt1 == BTYPE_AIR && bt2 != BTYPE_AIR && bt3 != BTYPE_AIR) {
+		if (input.z > 0)
+			input.z = m_velocity.z = 0.5f;
+		else
+			input.z = m_velocity.z = -0.5f;
+		m_velocity.y = 0.3;
+		m_velocity.x *= .5f;
+	}
+	else if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
 		input.z = m_velocity.z = 0;
 		m_velocity.x *= .5f;
 	}
@@ -149,26 +167,23 @@ void Player::ApplyPhysics(Vector3f input, World* world, float elapsedTime, Audio
 
 	m_position += m_velocity;
 
-	static float bobbingtime = 0; // Gestion de la caméra
+	static float bobbingtime = 0; // Gestion de la cam<EFBFBD>ra
 	static bool leftright = false;
 	static bool isStep = false;
 	if (bobbingtime <= 360.f)
 		bobbingtime += elapsedTime * 20.f; else bobbingtime = 0;
 
 	if ((sin(bobbingtime) - 0.5f) * (abs(m_velocity.x) + abs(m_velocity.z)) < -.2f && !m_airborne) {
-		Vector3f vstep;
-		if (leftright)
-			vstep = Vector3f(GetPosition().x + GetDirection().z, GetPosition().y - 1.7f, GetPosition().z + GetDirection().x);
-		else vstep = Vector3f(GetPosition().x - GetDirection().z, GetPosition().y - 1.7f, GetPosition().z - GetDirection().x);
 		if (!isStep) {
-			audio->Create3DAudioObj(step, AUDIO_PATH "step.wav", vstep, GetVelocity(), .8f);
-			leftright = !leftright;
+			snd = Player::Sound::STEP;
 		}
 		isStep = true;
 	}
 	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;
+
+	return snd;
 }
 
 void Player::ApplyTransformation(Transformation& transformation, bool rel) const {
@@ -193,3 +208,29 @@ void Player::Teleport(int& x, int& z) {
 	m_position.x -= x * CHUNK_SIZE_X;
 	m_position.z -= z * CHUNK_SIZE_Z;
 }
+bool Player::AmIDead()
+{
+	return m_hp <= 0;
+}
+
+
+void Player::InflictDamage(float hitPoints)
+{
+
+	m_hp -= hitPoints;
+
+
+	if (AmIDead())
+	{ // Quand le joueur est mort.
+
+
+
+	}
+}
+
+
+uint64_t Player::getId() const { return id; }
+
+Vector3f Player::InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now) {
+	return Vector3f();
+}

SQCSim-common/player.h

@@ -1,19 +1,23 @@
-#ifndef _PLAYER_H__
-#define _PLAYER_H__
-#include "vector3.h"
-#include "transformation.h"
-#include "audio.h"
+#ifndef PLAYER_H__
+#define PLAYER_H__
+
 #include <cmath>
+#include "transformation.h"
+#include "vector3.h"
 
 class World; 
 
 class Player {
 public:
+	enum Sound { NOSOUND, STEP, FALL };
+
 	Player(const Vector3f& position, float rotX = 0, float rotY = 0);
+	~Player();
+
 	void TurnLeftRight(float value);
 	void TurnTopBottom(float value);
 	Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime);
-	void ApplyPhysics(Vector3f input, World* world, float elapsedTime, Audio* audio);
+	Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime);
 	void ApplyTransformation(Transformation& transformation, bool rel = true) const;
 
 	Vector3f GetPosition() const;
@@ -24,12 +28,19 @@ public:
 	float GetHP() const;
 	void Teleport(int& x, int& z);
 
+	bool AmIDead();
+	void InflictDamage(float hitPoints);
+
 private:
+	uint64_t getId() const;
+
+protected:
 	Vector3f m_position;
 	Vector3f m_velocity;
 	Vector3f m_direction;
 
 	std::string m_username;
+	uint64_t id = 0;
 
 	float m_rotX = 0; 
 	float m_rotY = 0;
@@ -38,6 +49,9 @@ private:
 	float m_hp;
 
 	bool m_airborne;
+
+	Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
+
 };
 #endif //_PLAYER_H__
 

SQCSim-common/transformation.cpp

@@ -51,10 +51,10 @@ void Transformation::ApplyScale(const Vector3f& v)
     ApplyScale(v.x, v.y, v.z);
 }
 
-void Transformation::Use() const
-{
-    glLoadMatrixf(m_stack.top().GetInternalValues());
-}
+//void Transformation::Use() const
+//{
+//    glLoadMatrixf(m_stack.top().GetInternalValues());
+//}
 
 const Matrix4f& Transformation::GetMatrix() const
 {

SQCSim-common/transformation.h

@@ -1,9 +1,10 @@
 #ifndef TRANSFORMATION_H__
 #define TRANSFORMATION_H__
 
+#include <stack>
+#include "define.h"
 #include "matrix4.h"
 #include "vector3.h"
-#include <stack>
 
 class Transformation
 {
@@ -24,7 +25,7 @@ class Transformation
         void ApplyScale(float x, float y, float z);
         void ApplyScale(const Vector3f& v);
 
-        void Use() const;
+        //void Use() const;
 
         const Matrix4f& GetMatrix() const;
 

SQCSim-common/world.cpp

@@ -0,0 +1,416 @@
+#include "world.h"
+
+World::World() {}
+
+World::~World() {}
+
+Array2d<Chunk*>& World::GetChunks() { return m_chunks; }
+
+void World::BuildWorld() {
+	for (int x = 0; x < WORLD_SIZE_X; ++x)
+		for (int y = 0; y < WORLD_SIZE_Y; ++y)
+			m_chunks.Set(x, y, new Chunk(x + m_center[0], y + m_center[1], m_seed));
+}
+
+void World::SetSeed(uint64_t seed) {
+	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;
+
+	if (x < 0 || y < 0 || z < 0 ||
+		x >= WORLD_SIZE_X * CHUNK_SIZE_X ||
+		z >= CHUNK_SIZE_Z * WORLD_SIZE_Y ||
+		y > CHUNK_SIZE_Y)
+		return 0;
+
+	return m_chunks.Get(cx, cz);
+}
+
+Chunk* World::ChunkAt(const Vector3f& pos) const { return ChunkAt(pos.x, pos.y, pos.z); }
+
+BlockType World::BlockAt(float x, float y, float z, BlockType defaultBlockType) const {
+	Chunk* c = ChunkAt(x, y, z);
+
+	if (!c)
+		return defaultBlockType;
+
+	int bx = (int)x % CHUNK_SIZE_X;
+	int by = (int)y % CHUNK_SIZE_Y;
+	int bz = (int)z % CHUNK_SIZE_Z;
+
+	return c->GetBlock(bx, by, bz);
+}
+
+BlockType World::BlockAt(const Vector3f& pos, BlockType defaultBlockType) const {
+	return BlockAt(pos.x, pos.y, pos.z, defaultBlockType);
+}
+
+void World::TransposeWorld(Vector3f& player, Bullet* bullets[MAX_BULLETS]) {
+	int x = 0, y = 0;
+
+	if (player.x > (WORLD_SIZE_X * CHUNK_SIZE_X) * .6f) ++x;
+	else if (player.x < (WORLD_SIZE_X * CHUNK_SIZE_X) * .4f) --x;
+	if (player.z > (WORLD_SIZE_Y * CHUNK_SIZE_Z) * .6f) ++y;
+	else if (player.z < (WORLD_SIZE_Y * CHUNK_SIZE_Z) * .4f) --y;
+
+	if (!x && !y) return;
+
+	if (x > 0) {
+		for (int ax = 0; ax < WORLD_SIZE_X; ++ax)
+			for (int ay = 0; ay < WORLD_SIZE_Y; ++ay)
+				if (ax - x >= 0) {
+					m_chunks.Set(ax - x, ay,
+						m_chunks.Remove(ax, ay));
+					if (ax == WORLD_SIZE_X - 1 && m_chunks.Get(ax - x, ay))
+						m_chunks.Get(ax - x, ay)->MakeDirty();
+				}
+				else if (m_chunks.Get(ax, ay)) m_tbDeleted.emplace_back(m_chunks.Remove(ax, ay));
+	}
+	else if (x < 0) {
+		for (int ax = WORLD_SIZE_X - 1; ax >= 0; --ax)
+			for (int ay = WORLD_SIZE_Y - 1; ay >= 0; --ay)
+				if (ax - x < WORLD_SIZE_X) {
+					m_chunks.Set(ax - x, ay,
+						m_chunks.Remove(ax, ay));
+					if (ax == 0 && m_chunks.Get(ax - x, ay))
+						m_chunks.Get(ax - x, ay)->MakeDirty();
+				}
+				else if (m_chunks.Get(ax, ay)) m_tbDeleted.emplace_back(m_chunks.Remove(ax, ay));
+	}
+
+	if (y > 0) {
+		for (int ax = 0; ax < WORLD_SIZE_X; ++ax)
+			for (int ay = 0; ay < WORLD_SIZE_Y; ++ay)
+				if (ay - y >= 0) {
+					m_chunks.Set(ax, ay - y,
+						m_chunks.Remove(ax, ay));
+					if (ay == WORLD_SIZE_Y - 1 && m_chunks.Get(ax, ay - y))
+						m_chunks.Get(ax, ay - y)->MakeDirty();
+				}
+				else if (m_chunks.Get(ax, ay)) m_tbDeleted.emplace_back(m_chunks.Remove(ax, ay));
+	}
+	else if (y < 0) {
+		for (int ax = WORLD_SIZE_X - 1; ax >= 0; --ax)
+			for (int ay = WORLD_SIZE_Y - 1; ay >= 0; --ay)
+				if (ay - y < WORLD_SIZE_Y) {
+					m_chunks.Set(ax, ay - y,
+						m_chunks.Remove(ax, ay));
+					if (ay == 0 && m_chunks.Get(ax, ay - y))
+						m_chunks.Get(ax, ay - y)->MakeDirty();
+				}
+				else if (m_chunks.Get(ax, ay)) m_tbDeleted.emplace_back(m_chunks.Remove(ax, ay));
+	}
+
+	m_center[0] += x; m_center[1] += y;
+	player.x -= x * CHUNK_SIZE_X;
+	player.z -= y * CHUNK_SIZE_Z;
+
+	for (int index = 0; index < MAX_BULLETS; ++index)
+		if (bullets[index]) bullets[index]->Transpose(x, y);
+}
+
+void World::CleanUpWorld(int& deleteframes, bool clear = false) {
+	if (clear) {
+		while (m_tbDeleted.size() > 0) {
+			delete m_tbDeleted.back();
+			m_tbDeleted.pop_back();
+		}
+	}
+	if (!m_tbDeleted.empty() && !deleteframes) {
+		int deleted = 0;
+		while (deleted < THREADS_DELETE_CHUNKS) {
+
+
+		}
+		delete m_tbDeleted.back();
+		m_tbDeleted.pop_back();
+		deleteframes = FRAMES_DELETE_CHUNKS;
+	}
+}
+
+void World::GetScope(unsigned int& x, unsigned int& y) {
+	x = m_center[0];
+	y = m_center[1];
+}
+
+void World::Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]) {
+	UpdateWorld(player_pos, blockinfo);
+	//TransposeWorld(player_pos, bullets);
+}
+//
+//void World::UpdateChunk(int& updates, unsigned int chx, unsigned int chy, BlockInfo* blockinfo[BTYPE_LAST]) {
+//	if (updates == 0 && ChunkAt(chx, 1, chy) &&
+//		ChunkAt(chx, 1, chy)->IsDirty()) {
+//		ChunkAt(chx, 1, chy)->Update(blockinfo, this);
+//		updates = FRAMES_UPDATE_CHUNKS;
+//	}
+//
+//}
+
+void World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block) {
+	Vector3f currentPos = player_pos;
+	Vector3f currentBlock = currentPos;
+	Vector3f ray = player_dir;
+	bool found = false;
+
+	if (block) return;
+
+	while ((currentPos - currentBlock).Length() <= MAX_SELECTION_DISTANCE && !found) {
+		currentBlock += ray / 10.f;
+
+		BlockType bt = BlockAt(currentBlock);
+
+		if (bt != BTYPE_AIR)
+			found = true;
+	}
+
+	if (found)
+		if (blockType != BTYPE_AIR) {
+			found = false;
+			while ((currentPos - currentBlock).Length() >= 1.7f && !found) {
+				currentBlock -= ray / 10.f;
+
+				BlockType bt = BlockAt(currentBlock);
+
+				if (bt == BTYPE_AIR) { // V<>rification pour <20>tre s<>r que le bloc <20> changer n'est pas dans le joueur.
+					int Bx = (int)currentBlock.x;
+					int By = (int)currentBlock.y;
+					int Bz = (int)currentBlock.z;
+
+					int Px = (int)currentPos.x;
+					int PyA = (int)currentPos.y;
+					int PyB = (int)(currentPos.y - .9f);
+					int PyC = (int)(currentPos.y - 1.7f);
+					int Pz = (int)currentPos.z;
+
+					if (!(Bx == Px &&
+						(By == PyA ||
+							By == PyB ||
+							By == PyC) &&
+						Bz == Pz))
+						found = true;
+				}
+			}
+		}
+
+	if (found && (int)currentBlock.y < CHUNK_SIZE_Y) {
+		int bx = (int)currentBlock.x % CHUNK_SIZE_X;
+		int by = (int)currentBlock.y % CHUNK_SIZE_Y;
+		int bz = (int)currentBlock.z % CHUNK_SIZE_Z;
+
+		ChunkAt(currentBlock)->SetBlock(bx, by, bz, blockType, this);
+		ChunkAt(currentBlock)->MakeModified();
+		block = true;
+	}
+}
+
+void World::ChangeBlockAtPosition(BlockType blockType, Vector3f pos) {
+	int bx = (int)pos.x % CHUNK_SIZE_X;
+	int by = (int)pos.y % CHUNK_SIZE_Y;
+	int bz = (int)pos.z % CHUNK_SIZE_Z;
+
+	ChunkAt(pos)->SetBlock(bx, by, bz, blockType, this);
+	ChunkAt(pos)->MakeModified();
+}
+
+void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]) {
+	int cx = player.x;
+	int cy = player.z;
+	static int frameGenerate = 1;
+	static int frameUpdate = 2;
+	static int frameDelete = 3;
+	int side = 0;
+	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;
+	
+	if (!frameGenerate)
+		while (side * CHUNK_SIZE_X <= VIEW_DISTANCE * 2 + CHUNK_SIZE_X) {
+			int tx = -side, ty = -side;
+			int chx = 0;
+			int chy = 0;
+
+			for (; tx <= side; ++tx) {
+				if (frameGenerate)
+					break;
+				chx = cx + tx * CHUNK_SIZE_X;
+				chy = cy + ty * CHUNK_SIZE_Z;
+				if (chx < WORLD_SIZE_X * CHUNK_SIZE_X && chy < WORLD_SIZE_Y * CHUNK_SIZE_Z &&
+					chx >= 0 && chy >= 0 && !ChunkAt(chx, 1, chy))
+					genThList[threads++] = std::async(std::launch::async, 
+						[](unsigned int x, unsigned int y, uint64_t seed) { 
+							return new Chunk(x, y, seed); }, 
+							chx / CHUNK_SIZE_X + m_center[0], 
+							chy / CHUNK_SIZE_Z + m_center[1], 
+							m_seed);
+				if (threads == THREADS_GENERATE_CHUNKS) frameGenerate = FRAMES_RENDER_CHUNKS;
+			}
+			for (; ty <= side; ++ty) {
+				if (frameGenerate)
+					break;
+				chx = cx + tx * CHUNK_SIZE_X;
+				chy = cy + ty * CHUNK_SIZE_Z;
+				if (chx < WORLD_SIZE_X * CHUNK_SIZE_X && chy < WORLD_SIZE_Y * CHUNK_SIZE_Z &&
+					chx >= 0 && chy >= 0 && !ChunkAt(chx, 1, chy))
+					genThList[threads++] = std::async(std::launch::async, 
+						[](unsigned int x, unsigned int y, uint64_t seed) { 
+							return new Chunk(x, y, seed); }, 
+							chx / CHUNK_SIZE_X + m_center[0], 
+							chy / CHUNK_SIZE_Z + m_center[1], 
+							m_seed);
+				if (threads == THREADS_GENERATE_CHUNKS) frameGenerate = FRAMES_RENDER_CHUNKS;
+			}
+			for (; tx >= -side; --tx) {
+				if (frameGenerate)
+					break;
+				chx = cx + tx * CHUNK_SIZE_X;
+				chy = cy + ty * CHUNK_SIZE_Z;
+				if (chx < WORLD_SIZE_X * CHUNK_SIZE_X && chy < WORLD_SIZE_Y * CHUNK_SIZE_Z &&
+					chx >= 0 && chy >= 0 && !ChunkAt(chx, 1, chy))
+					genThList[threads++] = std::async(std::launch::async, 
+						[](unsigned int x, unsigned int y, uint64_t seed) { 
+							return new Chunk(x, y, seed); }, 
+							chx / CHUNK_SIZE_X + m_center[0], 
+							chy / CHUNK_SIZE_Z + m_center[1], 
+							m_seed);
+				if (threads == THREADS_GENERATE_CHUNKS) frameGenerate = FRAMES_RENDER_CHUNKS;
+			}
+			for (; ty >= -side; --ty) {
+				if (frameGenerate)
+					break;
+				chx = cx + tx * CHUNK_SIZE_X;
+				chy = cy + ty * CHUNK_SIZE_Z;
+				if (chx < WORLD_SIZE_X * CHUNK_SIZE_X && chy < WORLD_SIZE_Y * CHUNK_SIZE_Z &&
+					chx >= 0 && chy >= 0 && !ChunkAt(chx, 1, chy))
+					genThList[threads++] = std::async(std::launch::async, 
+						[](unsigned int x, unsigned int y, uint64_t seed) { 
+							return new Chunk(x, y, seed); }, 
+							chx / CHUNK_SIZE_X + m_center[0], 
+							chy / CHUNK_SIZE_Z + m_center[1],
+							m_seed);
+				if (threads == THREADS_GENERATE_CHUNKS) frameGenerate = FRAMES_RENDER_CHUNKS;
+			}
+			if (frameGenerate)
+				break;
+			++side;
+		}
+
+	if (threads > 0) {
+		for (int i = 0; i < threads; ++i)
+			genThList[i].wait();
+
+		for (int i = 0; i < threads; ++i) {
+			unsigned int x, y;
+			Chunk* chunk = genThList[i].get();
+			chunk->GetPosition(x, y);
+			m_chunks.Set(x - m_center[0], y - m_center[1], chunk);
+		}
+	}
+
+	side = 0;
+	threads = 0;
+
+	//if (!frameUpdate)
+	//	while (side * CHUNK_SIZE_X <= VIEW_DISTANCE * 2) {
+	//		int tx = -side, ty = -side;
+
+	//		for (; tx <= side; ++tx) {
+	//			if (frameUpdate)
+	//				break;
+	//			unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
+	//			if (ChunkAt(chx, 1, chy) &&
+	//				ChunkAt(chx, 1, chy)->IsDirty()) {
+	//				updateThList[threads++] =
+	//					std::async(std::launch::async,
+	//						[](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
+	//							chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
+	//				if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
+	//			}
+	//		}
+	//		for (; ty <= side; ++ty) {
+	//			if (frameUpdate)
+	//				break;
+	//			unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
+	//			if (ChunkAt(chx, 1, chy) &&
+	//				ChunkAt(chx, 1, chy)->IsDirty()) {
+	//				updateThList[threads++] =
+	//					std::async(std::launch::async,
+	//						[](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
+	//							chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
+	//				if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
+	//			}
+	//		}
+	//		for (; tx >= -side; --tx) {
+	//			if (frameUpdate)
+	//				break;
+	//			unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
+	//			if (ChunkAt(chx, 1, chy) &&
+	//				ChunkAt(chx, 1, chy)->IsDirty()) {
+	//				updateThList[threads++] =
+	//					std::async(std::launch::async,
+	//						[](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
+	//							chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
+	//				if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
+	//			}
+	//		}
+	//		for (; ty >= -side; --ty) {
+	//			if (frameUpdate)
+	//				break;
+	//			unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
+	//			if (ChunkAt(chx, 1, chy) &&
+	//				ChunkAt(chx, 1, chy)->IsDirty()) {
+	//				updateThList[threads++] =
+	//					std::async(std::launch::async,
+	//						[](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
+	//							chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
+	//				if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
+	//			}
+	//		}
+	//		if (frameUpdate)
+	//			break;
+	//		++side;
+	//	}
+
+	//if (threads > 0) {
+	//	for (int i = 0; i < threads; ++i) {
+	//		updateThList[i].wait();
+	//		Chunk* chunk = updateThList[i].get();
+	//		chunk->FlushMeshToVBO();
+	//	}
+	//}
+
+	threads = 0;
+
+	//int del = THREADS_DELETE_CHUNKS;
+	//while (!m_tbDeleted.empty() && del--) { // Moins rapide que le bout en dessous, mais -beaucoup- plus stable.
+	//	m_tbDeleted.back()->FlushVBO();
+	//	m_tbDeleted.back()->~Chunk();
+	//	m_tbDeleted.pop_back();
+	//}
+
+	/*while (!m_tbDeleted.empty() && !frameDelete) {
+		if (m_tbDeleted.back()) {
+			m_tbDeleted.back()->FlushVBO();
+			delThList[threads] =
+				std::async(std::launch::async,
+					[](Chunk* chunk) { delete chunk; }, m_tbDeleted.back());
+			m_tbDeleted.pop_back();
+			if (++threads > THREADS_DELETE_CHUNKS) frameDelete = FRAMES_DELETE_CHUNKS;
+		}
+		else m_tbDeleted.pop_back();
+	}*/
+
+	/*for (int x = 0; x < threads; ++x) {
+		delThList[x].wait();
+		delThList[x].get();
+	}*/
+}
+
+int World::GettbDeleted() const { return m_tbDeleted.size(); }

SQCSim-common/world.h

@@ -1,22 +1,18 @@
 #ifndef WORLD_H__
 #define WORLD_H__
+
 #include <fstream>
 #include <string>
 #include <vector>
 #include <future>
 #include <thread>
 #include "define.h"
-#include "chunk.h"
-#include "array2d.h"
 #include "vector3.h"
-#include "player.h"
-#include "transformation.h"
-#include "shader.h"
+#include "array2d.h"
 #include "bullet.h"
-#include "textureatlas.h"
+#include "chunk.h"
 
 class Chunk;
-class Player;
 class Bullet;
 
 class World {
@@ -25,6 +21,9 @@ public:
 	~World();
 
 	Array2d<Chunk*>& GetChunks();
+	void BuildWorld();
+
+	void SetSeed(uint64_t seed);
 
 	Chunk* ChunkAt(float x, float y, float z) const;
 	Chunk* ChunkAt(const Vector3f& pos) const;
@@ -32,24 +31,24 @@ public:
 	BlockType BlockAt(float x, float y, float z, BlockType defaultBlockType = BTYPE_AIR) const;
 	BlockType BlockAt(const Vector3f& pos, BlockType defaultBlockType = BTYPE_AIR) const;
 
-	void Update(int& rendercount, Bullet* bullets[MAX_BULLETS], Player& player, Transformation& world, Shader& shader, TextureAtlas& atlas, BlockInfo* blockinfo[BTYPE_LAST]);
+	void Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]);
 
 	void GetScope(unsigned int& x, unsigned int& y);
 
-	void ChangeBlockAtCursor(BlockType blockType, Player& player, bool& block);
+	void ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block);
 	void ChangeBlockAtPosition(BlockType blockType, Vector3f pos);
 	void CleanUpWorld(int& deleteframes, bool clear);
 	int GettbDeleted() const;
 private:
 	Array2d<Chunk*> m_chunks = Array2d<Chunk*>(WORLD_SIZE_X, WORLD_SIZE_Y);
 	std::vector<Chunk*> m_tbDeleted;
+	uint64_t m_seed = 0;
 
 	unsigned int m_center[2] = { UINT16_MAX / 2 - WORLD_SIZE_X, UINT16_MAX / 2 - WORLD_SIZE_Y };
 
-	void UpdateChunk(int& updates, unsigned int chx, unsigned int chy, BlockInfo* blockinfo[BTYPE_LAST]);
-	void RenderWorld(int& rendercount, Player& player, Transformation& world, Shader& shader);
-	void UpdateWorld(Player& player, BlockInfo* blockinfo[BTYPE_LAST]);
-	void TransposeWorld(Player& player, Bullet* bullets[MAX_BULLETS]);
+	//void UpdateChunk(int& updates, unsigned int chx, unsigned int chy, BlockInfo* blockinfo[BTYPE_LAST]);
+	void UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]);
+	void TransposeWorld(Vector3f& player, Bullet* bullets[MAX_BULLETS]);
 
 };
 #endif // WORLD_H__

SQCSim-srv/SQCSim-srv.vcxproj

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{d3bb3300-25f0-42bf-a934-fac33b5c7d25}</ProjectGuid>
+    <RootNamespace>SQCSimsrv</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="connection.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="server.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="connection.h" />
+    <ClInclude Include="define.h" />
+    <ClInclude Include="server.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SQCSim-common\SQCSim-common.vcxproj">
+      <Project>{ee91ab12-4225-4a4d-931d-69d72f6d91fb}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

SQCSim-srv/SQCSim-srv.vcxproj.filters

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Fichiers sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Fichiers d%27en-tête">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Fichiers de ressources">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="server.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="connection.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="define.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="server.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="connection.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

SQCSim-srv/cmake/CMakeLists.txt

@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.18.4)
+
+project(SQCSim-Server VERSION 0.1)
+
+add_compile_options("-Wno-narrowing")
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_STANDARD_REQUIRED True)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../out")
+
+set(SQCSIM_COMMON_DIR "../../SQCSim-common/")
+
+add_library(SQCSim-common
+			"${SQCSIM_COMMON_DIR}blockinfo.cpp"
+			"${SQCSIM_COMMON_DIR}bullet.cpp"
+			"${SQCSIM_COMMON_DIR}chunk.cpp"
+			"${SQCSIM_COMMON_DIR}netprotocol.cpp"
+			"${SQCSIM_COMMON_DIR}opensimplex.cpp"
+			"${SQCSIM_COMMON_DIR}player.cpp"
+			"${SQCSIM_COMMON_DIR}transformation.cpp"
+			"${SQCSIM_COMMON_DIR}world.cpp"
+)
+
+add_executable(SQCSim-server
+			"../connection.cpp"
+			"../server.cpp"
+			"../main.cpp"
+			)
+
+target_link_libraries(SQCSim-server PUBLIC SQCSim-common)

SQCSim-srv/connection.cpp

@@ -0,0 +1,55 @@
+#include "connection.h"
+
+
+
+Connection::Connection(SOCKET sock, 
+					   sockaddr_in sockaddr, 
+					   LoginInfo log, 
+					   PlayerInfo play):
+	m_sock(sock), 
+	m_addr(sockaddr), 
+	m_loginfo(log), 
+	m_playinfo(play) {
+
+}
+
+Connection::~Connection() { closesocket(m_sock); }
+
+uint64_t Connection::GetHash(bool self) const { return self? m_loginfo.sid: m_playinfo.id; }
+
+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 }); }
+
+Output* Connection::getOutput(Timestamp time) {
+	auto out = m_output_manifest.find(time);
+	if (out != m_output_manifest.end())
+		return &out->second;
+	return nullptr;
+}
+
+Sync Connection::getSync(Timestamp time) {
+	Sync sync;
+	auto out = m_output_manifest.find(time);
+	if (out != m_output_manifest.end()) {
+		sync.timestamp = out->second.timestamp;
+		sync.position = out->second.position;
+		sync.sid = m_loginfo.sid;
+	}
+	return sync;
+}
+
+SOCKET Connection::getSock() const { return m_sock; }
+
+PlayerInfo* Connection::getInfo() const { return (PlayerInfo*)&m_playinfo; }
+
+sockaddr_in* Connection::getAddr() const { return (sockaddr_in*)&m_addr; }
+
+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

@@ -0,0 +1,47 @@
+#ifndef CONNECTION_H__
+#define CONNECTION_H__
+
+#include <deque>
+#include <map>
+#include "../SQCSim-common/player.h"
+#include "../SQCSim-common/vector3.h"
+#include "../SQCSim-common/netprotocol.h"
+#include "define.h"
+
+using namespace netprot;
+
+class Connection {
+public:
+	Connection(
+		SOCKET sock,
+		sockaddr_in sockaddr,
+		LoginInfo log,
+		PlayerInfo play);
+	~Connection();
+
+	std::unique_ptr<Player> player = nullptr;
+
+	uint64_t GetHash(bool self = true) const;
+	uint64_t GetTeamHash() const;
+	std::string GetName() const;
+
+	void AddInput(Input in);
+	Output* getOutput(Timestamp time);
+	Sync getSync(Timestamp time);
+	SOCKET getSock() const;
+	PlayerInfo* getInfo() const;
+	sockaddr_in* getAddr() const;
+
+	void CleanInputManifest(Timestamp time);
+private:
+	std::map<Timestamp, Input> m_input_manifest;
+	std::map<Timestamp, Output> m_output_manifest;
+	std::map<Timestamp, Chat> m_chatlog;
+
+	SOCKET m_sock;
+	sockaddr_in m_addr;
+	LoginInfo m_loginfo;
+	PlayerInfo m_playinfo;
+
+};
+#endif

SQCSim-srv/define.h

@@ -0,0 +1,14 @@
+#ifndef SRV_DEFINE_H__
+#define SRV_DEFINE_H__
+
+#include "../SQCSim-common/define.h"
+#include <iostream>
+#include <sstream>
+#include <cctype>
+#include <string>
+
+#define MAX_CONNECTIONS 16
+#define ID_LIST_SIZE 127
+#define SRV_MANUAL_SETUP true
+
+#endif

SQCSim-srv/main.cpp

@@ -0,0 +1,8 @@
+#include "server.h"
+
+int main() {
+	std::unique_ptr<Server> server = std::make_unique<Server>();
+	if (server->Init() == 0)
+		if (server->Ready() == 0)
+			server->Run();
+}

SQCSim-srv/server.cpp

@@ -0,0 +1,291 @@
+#include "server.h"
+
+Server::Server(LOG_DEST log) {
+	m_log = log;
+	if (log == LOG_DEST::LOGFILE) {
+		m_logfile = std::ofstream("server.log", std::ofstream::out);
+		if (!m_logfile.is_open()) {
+			m_log = LOG_DEST::CONSOLE; // Fallback console.
+			Log("Ouverture fichier log: repli vers console.", true, false);
+		}
+	}
+}
+
+Server::~Server() {
+	if (m_logfile.is_open())
+		m_logfile.close();
+	if (m_sock_udp)
+		closesocket(m_sock_udp);
+	if (m_sock_tcp)
+		closesocket(m_sock_tcp);	
+	for (const auto& [key, player] : m_players)
+			closesocket(player->getSock());
+		m_players.clear();
+#ifdef _WIN32
+	WSACleanup();
+#endif
+}
+
+int Server::Init() {
+	Log("Initialisation du serveur...", false, false);
+
+#ifdef _WIN32
+	if (WSAStartup(MAKEWORD(2, 2), &m_wsaData) != 0) { /* Initialisation de l'environnement reseau (Windows only) */
+		Log("Initialisation WinSock.", true, true);
+		return 1;
+	}
+#endif
+
+	m_sock_udp = socket(AF_INET, SOCK_DGRAM, 0);
+	if (m_sock_udp == INVALID_SOCKET) { /* Creation du socket UDP */
+		Log("Creation Socket UDP.", true, true);
+		return 2;
+	}
+
+	m_sock_tcp = socket(AF_INET, SOCK_STREAM, 0);
+	if (m_sock_tcp == INVALID_SOCKET) { /* Creation du socket TCP */
+		Log("Creation Socket TCP.", true, true);
+		return 3;
+	}
+
+	/* Creation structure donnes descripteur du socket serveur */
+	sockaddr_in addr;
+	addr.sin_family = AF_INET;
+	addr.sin_port = htons(SRV_PORT);
+	addr.sin_addr.s_addr = htonl(INADDR_ANY);
+
+	if (bind(m_sock_udp, (sockaddr*)&addr, sizeof(addr)) != 0) { /* Associer le socket UDP au port */
+		Log("Association Socket UDP.", true, true);
+		return 4;
+	}
+
+	if (bind(m_sock_tcp, (sockaddr*)&addr, sizeof(addr)) != 0) { /* Associer le socket TCP au port */
+		Log("Association Socket TCP.", true, true);
+		return 5;
+	}
+
+	return 0;
+}
+
+int Server::Ready() {
+	int nbrjoueurs = 0, 
+		nbrconn = 0;
+	bool readystart = false;
+	do {
+		Log("Entrez la duree de la partie: ", false, false);
+		std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
+		try {	
+			m_game.countdown = std::stoi(m_buf.ptr);
+		} catch(const std::exception& e) {
+			Log(e.what(), true, false);
+			m_game.countdown = 0;
+		}
+	} while (m_game.countdown < 1);
+	do {
+		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);
+		} catch(const std::exception& e) {
+			Log(e.what(), true, false);
+			m_game.seed = 0;
+		}
+	} while (m_game.seed < 1);
+	do {
+		Log("Entrez le nombre de joueurs: ", false, false);
+		std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
+		try {	
+			nbrjoueurs = std::stoi(m_buf.ptr);
+		} catch(const std::exception& e) {
+			Log(e.what(), true, false);
+			nbrjoueurs = 0;
+		}
+		if (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS)
+			Log("Nombre de joueurs invalide.", true, false);
+	} while (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS);
+
+	m_game.gameType = 1;
+
+	if (listen(m_sock_tcp, MAX_CONNECTIONS) < 0) {
+		Log("Ecoute sur le port TCP.", true, true);
+		return 1;
+	}
+
+	buildIdList(ID_LIST_SIZE);
+	
+	Log("A l'ecoute sur le port: " + std::to_string(SRV_PORT), false, false);
+	
+	while (!readystart) {
+		sockaddr_in sockad;
+		addrlen_t addrlen = sizeof(sockad);
+		SOCKET sock = accept(m_sock_tcp, (sockaddr*)&sockad, &addrlen);
+
+		if (sock < 0)
+			Log("Erreur de connexion", true, false);
+		else if (sock > 0) {
+			std::string str = "Nouvelle connexion provenant de: ";
+			str.append(inet_ntop(AF_INET, &sockad.sin_addr, m_buf.ptr, m_buf.len)).append(": ").append(std::to_string(sockad.sin_port));
+
+			if (recv(sock, m_buf.ptr, m_buf.len, 0) > 0) {
+				PlayerInfo play;
+
+				Packet pck = getPack(&m_buf);
+				if (pck.type != PACKET_TYPE::LOGINF) {
+					Log("Paquet invalide.", true, false);
+					if (pck.type != PACKET_TYPE::ERR)
+						netprot::emptyPack(pck); 
+					continue; // Passer au prochain appel si c'est pas un LoginInfo ou un LoginInfo invalide qui rentre.
+				}
+				LoginInfo* log = (LoginInfo*)pck.ptr;
+
+				log->sid = getUniqueId();
+				log->tid = 0; // 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);
+				
+				play.id = getUniqueId();
+				strcpy(play.name, log->name);
+				
+				play.tid = log->tid;
+
+				sendPack<GameInfo>(sock, &m_game, &m_buf.ptr, &m_buf.len);
+				std::unique_ptr<Connection> conn = std::make_unique<Connection>(sock, sockad, *log, play);
+
+				for (auto& [key, player] : m_players) {
+					sendPack<PlayerInfo>(player->getSock(), &play, &m_buf); // Envoyer les infos de joueur distant aux joueurs d<>j<EFBFBD> connect<63>s		
+					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;
+
+				if (++nbrconn >= nbrjoueurs)
+					readystart = true;
+			}
+		}
+	}
+	return 0;
+}
+
+void Server::Run() {
+	Input in;
+	sockaddr_in sockad;
+	addrlen_t socklen = sizeof(sockad);
+	
+	Log("Debut de la partie...", false, false);
+
+	m_world = std::make_unique<World>();
+	m_world->SetSeed(m_game.seed);
+	m_world->GetChunks().Reset(nullptr);
+	m_world->BuildWorld();
+
+	for (auto& [key, conn] : m_players) { // Creation des instances de joueurs et premier sync.
+		conn->player = std::make_unique<Player>(Vector3f(8.5f, CHUNK_SIZE_Y + 1.8f, 8.5f));
+		Sync sync;
+		sync.position = conn->player->GetPosition();
+		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);
+	}
+
+	while (true) {
+		if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
+			Packet pck = getPack(&m_buf);
+			switch (pck.type) {
+				using enum netprot::PACKET_TYPE;
+            	case ERR:			std::puts("ERROR!");		break;
+                case INPUT:			std::puts("INPUT!");		break;
+                case OUTPUT:		std::puts("OUTPUT!");		break;
+				case SYNC:			std::puts("SYNC!");			break;
+                case TEAMINF:		std::puts("TEAMINF!");		break;
+                case SELFINF:		std::puts("SELFINF!");		break;
+                case PLAYINF:		std::puts("PLAYINF!");		break;
+                case LOGINF:		std::puts("LOGINF!");		break;
+                case CHUNKMOD:		std::puts("CHUNKMOD!");		break;
+                case PLAYERMOD:		std::puts("PLAYERMOD!");	break;
+                case PICKUPMOD:		std::puts("PICKUPMOD!");	break;
+                case GAMEINFO:		std::puts("GAMEINFO!");		break;
+                case ENDINFO:		std::puts("ENDINFO!");		break;
+                case CHAT:			std::puts("CHAT!");			break;
+                case ERRLOG:		std::puts("ERRLOG!");		break;
+				case LAST_PACK:									[[falltrough]];
+				default:			std::puts("wtf?!");			break;
+            }
+			netprot::emptyPack(pck);
+        }
+	}
+}
+
+inline std::string Server::LogTimestamp() {
+	time_t rawtime;
+	tm timeinfo;
+	char buffer[50];
+
+	time(&rawtime);
+
+#ifdef _WIN32
+	localtime_s(&timeinfo, &rawtime);
+#else
+	localtime_r(&rawtime, &timeinfo);
+#endif
+
+	strftime(buffer, sizeof(buffer), "%d-%m-%Y %H:%M:%S", &timeinfo);
+	std::string str(buffer);
+
+	return "[" + str + "] ";
+}
+
+void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) {
+	switch (m_log) {
+		using enum LOG_DEST; // C++20!
+		case LOGFILE:
+			m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
+			break;
+		case CONSOLE: [[fallthrough]]; // Pour dire que c'est voulu que ça traverse vers le case en dessous (C++17!)
+		default:
+			std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
+			break;
+	}
+
+	if (is_fatal) {
+		if (m_logfile.is_open())
+			m_logfile.close();
+		if (m_sock_udp)
+			closesocket(m_sock_udp);
+		if (m_sock_tcp)
+			closesocket(m_sock_tcp);
+		for (const auto& [key, player] : m_players) {
+			closesocket(player->getSock());
+		}
+		m_players.clear();
+#ifdef _WIN32
+		WSACleanup();
+#endif
+		exit(-1);
+	}
+}
+
+void Server::buildIdList(size_t size) {
+	std::set<uint64_t> lst;
+
+	srand(time(NULL));
+	do lst.insert(((uint64_t)rand() << 32 | rand()));
+	while (lst.size() < size);
+	
+	m_ids = std::vector<uint64_t>(lst.begin(), lst.end());
+}
+
+uint64_t Server::getUniqueId() {
+	uint64_t id = m_ids.back();
+	m_ids.pop_back();
+	return id;
+}

SQCSim-srv/server.h

@@ -0,0 +1,54 @@
+#ifndef SERVER_H__
+#define SERVER_H__
+
+#include <fstream>
+#include <vector>
+#include <set>
+#include <string>
+#include "../SQCSim-common/world.h"
+#include "../SQCSim-common/netprotocol.h"
+#include "define.h"
+#include "connection.h"
+
+using namespace netprot;
+
+class Server {
+public:
+	enum LOG_DEST: unsigned char { CONSOLE, LOGFILE, LOG_LAST };
+
+	Server(LOG_DEST log = LOG_DEST::CONSOLE);
+	~Server();
+
+	int Init();
+	int Ready();
+	void Run();
+
+private:
+
+#ifdef _WIN32
+	WSADATA m_wsaData;
+#endif
+	SOCKET m_sock_udp = 0,
+		   m_sock_tcp = 0;
+	LOG_DEST m_log;
+	std::ofstream m_logfile;
+
+	Buffer m_buf;
+
+	std::map<uint64_t, std::unique_ptr<Connection>> m_players;
+	std::map <Timestamp, Chat> m_chatlog;
+	std::vector<uint64_t> m_ids;
+	GameInfo m_game;
+
+	std::unique_ptr<World> m_world = nullptr;
+	const bool m_manual_setup = SRV_MANUAL_SETUP;
+
+	std::string LogTimestamp();
+	void Log(std::string str, bool is_error, bool is_fatal);
+	void buildIdList(size_t size);
+
+	uint64_t getUniqueId(); 	
+
+};
+
+#endif

SQCSim2021/SQCSim2021.vcxproj

@@ -19,46 +19,41 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="array2d.h" />
-    <ClInclude Include="array3d.h" />
     <ClInclude Include="audio.h" />
-    <ClInclude Include="blockinfo.h" />
-    <ClInclude Include="bullet.h" />
-    <ClInclude Include="chunk.h" />
+    <ClInclude Include="connector.h" />
     <ClInclude Include="define.h" />
     <ClInclude Include="engine.h" />
-    <ClInclude Include="matrix4.h" />
+    <ClInclude Include="mesh.h" />
     <ClInclude Include="openglcontext.h" />
-    <ClInclude Include="opensimplex.h" />
-    <ClInclude Include="player.h" />
+    <ClInclude Include="remoteplayer.h" />
     <ClInclude Include="shader.h" />
     <ClInclude Include="skybox.h" />
     <ClInclude Include="texture.h" />
     <ClInclude Include="textureatlas.h" />
     <ClInclude Include="tool.h" />
-    <ClInclude Include="transformation.h" />
-    <ClInclude Include="vector3.h" />
     <ClInclude Include="vertexbuffer.h" />
-    <ClInclude Include="world.h" />
+    <ClInclude Include="renderer.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="audio.cpp" />
-    <ClCompile Include="blockinfo.cpp" />
-    <ClCompile Include="bullet.cpp" />
-    <ClCompile Include="chunk.cpp" />
+    <ClCompile Include="connector.cpp" />
     <ClCompile Include="engine.cpp" />
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="mesh.cpp" />
     <ClCompile Include="openglcontext.cpp" />
-    <ClCompile Include="opensimplex.cpp" />
-    <ClCompile Include="player.cpp" />
+    <ClCompile Include="remoteplayer.cpp" />
     <ClCompile Include="shader.cpp" />
     <ClCompile Include="skybox.cpp" />
     <ClCompile Include="texture.cpp" />
     <ClCompile Include="textureatlas.cpp" />
     <ClCompile Include="tool.cpp" />
-    <ClCompile Include="transformation.cpp" />
     <ClCompile Include="vertexbuffer.cpp" />
-    <ClCompile Include="world.cpp" />
+    <ClCompile Include="renderer.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SQCSim-common\SQCSim-common.vcxproj">
+      <Project>{ee91ab12-4225-4a4d-931d-69d72f6d91fb}</Project>
+    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A21FD938-1FEA-4687-AB86-0EABAC30877B}</ProjectGuid>
@@ -112,8 +107,8 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>external\irrKlang-1.6.0\include;external\glew170\include;external\devil178\include;external\sfml23\include;$(IncludePath)</IncludePath>
-    <LibraryPath>external\glew170\lib;external\devil178\lib;external\sfml23\lib;$(LibraryPath);external\irrKlang-1.6.0\lib\Win32-visualStudio</LibraryPath>
+    <IncludePath>external\irrKlang-1.6.0\include;external\glew210\include;external\devil180\include;external\sfml251-32\include;$(IncludePath)</IncludePath>
+    <LibraryPath>external\glew210\lib\Release\Win32;external\sfml251-32\lib;external\devil180\lib\x86\Release;external\irrKlang-1.6.0\lib\Win32-visualStudio;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -122,8 +117,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>external\irrKlang-1.6.0\include;external\sfml23\include;external\devil178\include;external\glew170\include;$(IncludePath)</IncludePath>
-    <LibraryPath>external\sfml23\lib;external\devil178\lib;external\glew170\lib;$(LibraryPath);external\irrKlang-1.6.0\lib\Win32-visualStudio</LibraryPath>
+    <IncludePath>external\devil180\include;external\irrKlang-1.6.0\include;external\sfml251-32\include;external\glew210\include;$(IncludePath)</IncludePath>
+    <LibraryPath>external\sfml251-32\lib;external\devil180\lib\x86\Release;external\glew210\lib\Release\Win32;$(LibraryPath);external\irrKlang-1.6.0\lib\Win32-visualStudio</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -137,7 +132,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -152,7 +147,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -169,14 +164,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>irrKlang.lib;sfml-main.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;GlU32.Lib;OpenGL32.Lib;DevIL.lib;ILU.lib;ILUT.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -191,14 +186,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>irrKlang.lib;sfml-main.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;GlU32.Lib;OpenGL32.Lib;DevIL.lib;ILU.lib;ILUT.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>

SQCSim2021/SQCSim2021.vcxproj.filters

@@ -11,51 +11,21 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="array3d.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="blockinfo.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="chunk.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
     <ClInclude Include="define.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
     <ClInclude Include="engine.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="matrix4.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="openglcontext.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
     <ClInclude Include="texture.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="transformation.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="vector3.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
-    <ClInclude Include="player.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
     <ClInclude Include="shader.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="tool.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
     <ClInclude Include="vertexbuffer.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="array2d.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
     <ClInclude Include="skybox.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
@@ -65,23 +35,26 @@
     <ClInclude Include="textureatlas.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="world.h">
+    <ClInclude Include="connector.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="bullet.h">
+    <ClInclude Include="openglcontext.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="opensimplex.h">
+    <ClInclude Include="tool.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="mesh.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="renderer.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="remoteplayer.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="blockinfo.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="chunk.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
     <ClCompile Include="engine.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
@@ -94,18 +67,9 @@
     <ClCompile Include="texture.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="transformation.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="player.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
     <ClCompile Include="shader.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="tool.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
     <ClCompile Include="vertexbuffer.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
@@ -118,13 +82,19 @@
     <ClCompile Include="textureatlas.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="world.cpp">
+    <ClCompile Include="connector.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="bullet.cpp">
+    <ClCompile Include="tool.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="opensimplex.cpp">
+    <ClCompile Include="mesh.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="renderer.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="remoteplayer.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
   </ItemGroup>

SQCSim2021/audio.cpp

@@ -2,17 +2,17 @@
 
 Audio::Audio() {
 	m_engine = irrklang::createIrrKlangDevice();
-	m_engine->setDopplerEffectParameters(1);
-	m_engine->setRolloffFactor(1);
-	m_engine->setDefault3DSoundMinDistance(1);
+	m_engine->setDopplerEffectParameters(10);
+	m_engine->setRolloffFactor(2);
+	m_engine->setDefault3DSoundMinDistance(.1);
 	m_engine->setDefault3DSoundMaxDistance(1000);
 }
 
 Audio::Audio(const char * music) {
 	m_engine = irrklang::createIrrKlangDevice();
 	m_engine->setDopplerEffectParameters(1);
-	m_engine->setRolloffFactor(1);
-	m_engine->setDefault3DSoundMinDistance(1);
+	m_engine->setRolloffFactor(2);
+	m_engine->setDefault3DSoundMinDistance(.1);
 	m_engine->setDefault3DSoundMaxDistance(1000);
 	m_music = m_engine->play2D(music, false, true, true, irrklang::ESM_STREAMING);
 }
@@ -28,10 +28,11 @@ void Audio::Update3DAudio(Vector3f pos, Vector3f dir, Vector3f vel) {
 								  irrklang::vec3df(vel.x, vel.y, vel.z));
 }
 
-void Audio::Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, float volume = 1) {
-	sound = m_engine->play3D(name, irrklang::vec3df(pos.x, pos.y, pos.z), false, false, true, irrklang::ESM_NO_STREAMING, true);
+irrklang::ISound* Audio::Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, bool is_looped = false, float volume = 1) {
+	sound = m_engine->play3D(name, irrklang::vec3df(pos.x, pos.y, pos.z), is_looped, false, true, is_looped? irrklang::ESM_STREAMING: irrklang::ESM_NO_STREAMING, true);
 	sound->setVelocity(irrklang::vec3df(vel.x, vel.y, vel.z));
 	sound->setVolume(volume);
+	return sound;
 }
 
 void Audio::Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& vel, float volume = 1) {

SQCSim2021/audio.h

@@ -1,24 +1,30 @@
 #ifndef AUDIO_H__
 #define AUDIO_H__
 
+#ifdef _WIN32
 #include <irrKlang.h>
 #include <ik_ISoundSource.h>
+#else
+#include "./external/irrKlang-64bit-1.6.0/include/irrKlang.h"
+#include "./external/irrKlang-64bit-1.6.0/include/ik_ISoundSource.h"
+#endif
+
+#include "../SQCSim-common/vector3.h"
 #include "define.h"
-#include "vector3.h"
 
 class Audio {
 private:
-	irrklang::ISoundEngine* m_engine;
 	irrklang::ISound* m_music;
 
 public:
 	Audio();
 	Audio(const char* music);
 	~Audio();
+	irrklang::ISoundEngine* m_engine;
 
 	void Update3DAudio(Vector3f pos, Vector3f dir, Vector3f speed);
 
-	void Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, float volume);
+	irrklang::ISound* Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, bool is_looped, float volume);
 
 	void Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& vel, float volume);
 

SQCSim2021/bullet.cpp

@@ -1,32 +0,0 @@
-#include "bullet.h"
-#include "world.h"
-
-Bullet::Bullet(Player& player) {
-	m_startpos = m_currentpos = player.GetPOV() + player.GetDirection();
-	m_velocity = player.GetDirection();
-}
-
-Bullet::~Bullet() {}
-
-bool Bullet::Update(World* world, Transformation& tran, float elapsedtime) {
-	for (int x = 0; x < 1000; ++x) {
-		m_currentpos += m_velocity * elapsedtime;
-
-		if (!world->ChunkAt(m_currentpos))
-			return true;
-		else if (world->BlockAt(m_currentpos) != BTYPE_AIR) {
-			world->ChangeBlockAtPosition(BTYPE_AIR, m_currentpos);
-			return true;
-		}
-		else if ((m_currentpos - m_startpos).Length() > VIEW_DISTANCE) return true;
-	}
-
-	return false;
-}
-
-void Bullet::Transpose(int& x, int& z) {
-	m_currentpos.x -= x * CHUNK_SIZE_X;
-	m_currentpos.z -= z * CHUNK_SIZE_Z;
-	m_startpos.x -= x * CHUNK_SIZE_X;
-	m_startpos.z -= z * CHUNK_SIZE_Z;
-}

SQCSim2021/bullet.h

@@ -1,27 +0,0 @@
-#ifndef BULLET_H__
-#define BULLET_H__
-
-#include "audio.h"
-#include "player.h"
-#include "vertexbuffer.h"
-#include "texture.h"
-
-class World;
-
-class Bullet {
-public:
-	Bullet(Player& player);
-	~Bullet();
-
-	bool Update(World* world, Transformation& tran, float elapsedtime);
-	void Transpose(int& x, int& z);
-
-private:
-	Vector3f m_startpos;
-	Vector3f m_currentpos;
-	Vector3f m_velocity;
-
-};
-
-#endif // BULLET_H__
-

SQCSim2021/cmake/CMakeLists.txt

@@ -0,0 +1,69 @@
+cmake_minimum_required(VERSION 3.18.4)
+
+project(SQCSim-Client VERSION 0.8)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_STANDARD_REQUIRED True)
+
+set(CMAKE_BUILD_DIRECTORY "./build")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../")
+
+set(SQCSIM_COMMON_DIR "../../SQCSim-common/")
+set(SQCSIM_EXTERN_DIR "../external/")
+
+find_package(SFML COMPONENTS system window graphics REQUIRED)
+find_package(DevIL REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(GLEW REQUIRED)
+
+find_library(IRRKLANG_LIBRARY
+	NAMES libIrrKlang.so
+	PATHS "${SQCSIM_EXTERN_DIR}/irrKlang-64bit-1.6.0/lib/linux-gcc-64/")
+
+include_directories(
+	${SQCSIM_EXTERN_DIR}/irrKlang-64bit-1.6.0/include/
+			${SFML_INCLUDE_DIRS}
+			${IL_INCLUDE_DIR}
+			)
+
+
+add_library(SQCSim-common
+			"${SQCSIM_COMMON_DIR}blockinfo.cpp"
+			"${SQCSIM_COMMON_DIR}bullet.cpp"
+			"${SQCSIM_COMMON_DIR}chunk.cpp"
+			"${SQCSIM_COMMON_DIR}netprotocol.cpp"
+			"${SQCSIM_COMMON_DIR}opensimplex.cpp"
+			"${SQCSIM_COMMON_DIR}player.cpp"
+			"${SQCSIM_COMMON_DIR}transformation.cpp"
+			"${SQCSIM_COMMON_DIR}world.cpp"
+)
+
+add_executable(SQCSim-client
+			"../audio.cpp"
+			"../connector.cpp"
+			"../engine.cpp"
+			"../mesh.cpp"
+			"../openglcontext.cpp"
+			"../shader.cpp"
+			"../skybox.cpp"
+			"../texture.cpp"
+			"../textureatlas.cpp"
+			"../tool.cpp"
+			"../vertexbuffer.cpp"
+			"../renderer.cpp"
+			"../remoteplayer.cpp"
+			"../main.cpp"
+			)
+
+target_link_libraries(SQCSim-client PUBLIC SQCSim-common
+			${IRRKLANG_LIBRARY}
+			sfml-system
+			sfml-window
+			sfml-graphics
+			GL
+			GLU
+			GLEW
+			${IL_LIBRARIES}
+			${ILU_LIBRARIES}
+			)
+

SQCSim2021/connector.cpp

@@ -0,0 +1,119 @@
+#include "connector.h"
+
+Connector::Connector() {}
+
+Connector::~Connector() {}
+
+int Connector::Init() {
+#ifdef _WIN32
+	if (WSAStartup(MAKEWORD(2, 2), &m_wsaData) != 0) { /* Initialisation de l'environnement reseau (Windows only) */
+		std::cout << "Initialisation WinSock." << std::endl;
+		return 1;
+	}
+#endif
+
+	m_sock_udp = socket(AF_INET, SOCK_DGRAM, 0);
+	if (m_sock_udp == INVALID_SOCKET) { /* Creation du socket UDP */
+		std::cout << "Creation Socket UDP." << std::endl;
+		return 2;
+	}
+
+	m_sock_tcp = socket(AF_INET, SOCK_STREAM, 0);
+	if (m_sock_tcp == INVALID_SOCKET) { /* Creation du socket TCP */
+		std::cout << "Creation Socket TCP." << std::endl;
+		return 3;
+	}
+
+	/* Creation structure donnes descripteur du socket serveur */
+	sockaddr_in addr;
+	addr.sin_family = AF_INET;
+	addr.sin_port = htons(CLI_PORT);
+	addr.sin_addr.s_addr = htonl(INADDR_ANY);
+
+	if (bind(m_sock_udp, (sockaddr*)&addr, sizeof(addr)) != 0) { /* Associer le socket UDP au port */
+		std::cout << "Association Socket UDP." << std::endl;
+		return 4;
+	}
+
+	if (bind(m_sock_tcp, (sockaddr*)&addr, sizeof(addr)) != 0) { /* Associer le socket TCP au port */
+		std::cout << "Association Socket TCP." << std::endl;
+		return 5;
+	}
+	return 0;
+}
+
+int Connector::Connect(const char* srv_addr, std::string name) {
+	sockaddr_in add;
+	m_srvsockaddr.sin_family = AF_INET;
+	m_srvsockaddr.sin_port = htons(SRV_PORT);
+
+	if (inet_pton(AF_INET, srv_addr, &m_srvsockaddr.sin_addr) <= 0) {
+		std::cout << "Addresse serveur invalide." << std::endl;
+		return 1;
+	}
+
+	if (connect(m_sock_tcp, (sockaddr*)&m_srvsockaddr, sizeof(m_srvsockaddr)) < 0) {
+		std::cout << "<EFBFBD>chec de la connexion." << std::endl;
+		return 2;
+	}
+
+	flag_t flag = 1;
+	if (ioctl(m_sock_tcp, SOCK_NONBLOCK, &flag) < 0) {
+		std::cout << "Impossible de mettre le socket en mode non-bloquant." << std::endl;
+		return 3;
+	}
+
+	netprot::Buffer bf;
+	netprot::LoginInfo log;
+	strcpy(log.name, name.c_str());
+
+	netprot::sendPack(m_sock_tcp, &log, &bf);
+
+	bool ready = false;
+	int errors = 0;
+	std::vector<netprot::Packet> lsPck;
+	while (!ready) {
+		lsPck = netprot::recvPacks(m_sock_tcp, &bf);
+
+		for (auto& pck : lsPck) {
+			bool bypass_delete = false;
+			netprot::PlayerInfo* pl = nullptr;
+			switch (pck.type) {
+				using enum netprot::PACKET_TYPE;
+			case LOGINF:
+				m_loginfo = netprot::LoginInfo((netprot::LoginInfo*)pck.ptr);
+				break;
+			case GAMEINFO:
+				m_gameinfo = netprot::GameInfo((netprot::GameInfo*)pck.ptr);
+				break;
+			case PLAYINF:
+				pl = (netprot::PlayerInfo*)pck.ptr;
+				m_players[pl->id] = pl;
+				bypass_delete = true;
+				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);
+				ready = true;
+				break;
+			default:
+				errors++;
+				break;
+			}
+			if (!bypass_delete)
+				netprot::emptyPack(pck);
+		}
+		lsPck.clear();
+		if (errors > 100)
+			return 4;
+	}
+	return 0;
+}
+
+uint64_t Connector::getId() const { return m_loginfo.sid; }
+
+unsigned int Connector::getSeed() const { return m_gameinfo.seed; }
+
+netprot::Sync Connector::getOrigin() const { return m_origin; }

SQCSim2021/connector.h

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

SQCSim2021/define.h

@@ -1,72 +1,38 @@
-#ifndef DEFINE_H__
-#define DEFINE_H__
+#ifndef CLI_DEFINE_H__
+#define CLI_DEFINE_H__
 
+//#define SFML_STATIC true
+
+#include <iostream>
+#include <chrono>
+#include <iomanip>
+#include <GL/glew.h>
 #include <SFML/Window.hpp>
 #include <SFML/Graphics.hpp>
-#include <iostream>
+#include "../SQCSim-common/define.h"
 
 #ifdef _WIN32
-#include <windows.h>
-#include <GL/glew.h>
 #include <gl/GL.h>
 #include <gl/GLU.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include <climits>
 #endif
 
-#define CHUNK_SIZE_X  16
-#define CHUNK_SIZE_Y  128
-#define CHUNK_SIZE_Z  16
-#define MAX_SELECTION_DISTANCE 5
-#define SEED 12345
+#define SRV_ADDR "127.0.0.1"
+#define COUNTDOWN 300
 
-#ifdef _DEBUG
-#define WORLD_SIZE_X 64
-#define WORLD_SIZE_Y 64
-
-#define FRAMES_RENDER_CHUNKS 4
-#define FRAMES_UPDATE_CHUNKS 4
-#define FRAMES_DELETE_CHUNKS 4
-
-#define THREADS_GENERATE_CHUNKS 1
-#define THREADS_UPDATE_CHUNKS 1
-#define THREADS_DELETE_CHUNKS 1
-
-#define VIEW_DISTANCE 256
-#define TEXTURE_SIZE 128
-#define MAX_BULLETS 64
+#define BULLET_UPDATES_PER_FRAME 20
 
 #define BASE_WIDTH 640
 #define BASE_HEIGHT 480
-#endif
 
-#ifdef NDEBUG
-#define WORLD_SIZE_X 16
-#define WORLD_SIZE_Y 16
-
-#define FRAMES_RENDER_CHUNKS 1
-#define FRAMES_UPDATE_CHUNKS 1
-#define FRAMES_DELETE_CHUNKS 1
-
-#define THREADS_GENERATE_CHUNKS 12
-#define THREADS_UPDATE_CHUNKS 5
-#define THREADS_DELETE_CHUNKS 2
-
-#define VIEW_DISTANCE 1024
-#define TEXTURE_SIZE 512
-#define MAX_BULLETS 512
-#endif
-
-
-typedef uint8_t BlockType;
-enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_LAST };
-
-//#define TEXTURE_PATH        "../SQCSim2021/media/textures/"
-//#define SHADER_PATH		    "../SQCSim2021/media/shaders/"
-//#define AUDIO_PATH			"../SQCSim2021/media/audio/"
-//#define CHUNK_PATH			"../SQCSim2021/media/chunks/"
 
 #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/"
 
 #endif // DEFINE_H__

SQCSim2021/docs/analyse_serveur.md

@@ -0,0 +1 @@
+

SQCSim2021/engine.h

@@ -1,25 +1,32 @@
 #ifndef ENGINE_H__
 #define ENGINE_H__
 
+#include <algorithm>
+#include <cmath>
+#include "../SQCSim-common/array2d.h"
+#include "../SQCSim-common/blockinfo.h"
+#include "../SQCSim-common/bullet.h"
+#include "../SQCSim-common/chunk.h"
+#include "../SQCSim-common/world.h"
+#include "../SQCSim-common/transformation.h"
+#include "../SQCSim-common/player.h"
 #include "define.h"
 #include "openglcontext.h"
 #include "texture.h"
-#include "transformation.h"
 #include "shader.h"
-#include "player.h"
-#include "chunk.h"
 #include "skybox.h"
 #include "audio.h"
 #include "textureatlas.h"
-#include "blockinfo.h"
-#include "array2d.h"
-#include "world.h"
-#include "bullet.h"
+#include "connector.h"
+#include "renderer.h"
+#include "remoteplayer.h"
 
 class Engine : public OpenglContext {
 public:
     Engine();
     virtual ~Engine();
+    virtual void DrawMenu();
+    virtual void DrawSplachScreen();
     virtual void Init();
     virtual void DeInit();
     virtual void LoadResource();
@@ -32,43 +39,76 @@ public:
     virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y);
 
 private:
-    float GetScale() const;
+    std::pair<float, float> GetScale() const;
 
     int GetFps(float elapsedTime) const;
+    int GetCountdown(float elapsedTime);
 
     bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
 
+    void InstantDamage();
+    void SystemNotification(std::string systemLog);
+    void KillNotification(Player killer, Player killed);
+    void DisplayNotification(std::string message);
+    void ProcessNotificationQueue();
     void DisplayCrosshair();
+    void DisplayPovGun();
     void DisplayCurrentItem();
-    void DisplayHud();
+    void DisplayHud(int timer);
     void DisplayInfo(float elapsedTime, BlockType bloc);
+    void DisplaySingleOrMultiplayerMenu();
     void DrawHud(float elapsedTime, BlockType bloc);
-    void PrintText(float x, float y, float scale, const std::string& t);
+    void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
 
+    Connector m_conn;
     Shader m_shader01;
     BlockInfo* m_blockinfo[BTYPE_LAST];
     TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
 
     World m_world = World();
+    Renderer m_renderer = Renderer();
 
-    Texture m_textureSkybox;
-    Texture m_textureFont;
     Texture m_textureCrosshair;
+    Texture m_textureFont;
     Texture m_textureGun;
+    Texture m_texturePovGun;
+    Texture m_textureSkybox;
+    Texture m_textureSoloMultiMenu;
+    Texture m_textureTitle;
 
     Skybox m_skybox;
     Audio m_audio = Audio(AUDIO_PATH "start.wav");
 
-    irrklang::ISound* m_powpow;
-    irrklang::ISound* m_scream;
+    irrklang::ISound* m_powpow,
+        * m_scream;
+    irrklang::ISound *m_whoosh[MAX_BULLETS];
 
     Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
     
     Bullet* m_bullets[MAX_BULLETS];
 
+    std::map<uint64_t, Player*> m_players;
+
+    //Menu
+    enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
+    GameState m_gamestate = GameState::MAIN_MENU;
+    Texture MenuTitleTexture;
+    Texture MenuBGTexture;
+    Texture MenuStartTexture;
+    Texture MenuQuitTexture;
+    Texture MenuOptionsTexture;
+    Texture SplachScreenTexture;
+
     float m_scale;
+    float m_time = 0;
+    float m_time_SplashScreen = 0;
+    float m_Width = 0;
+    float m_Height = 0;
 
     int m_renderCount = 0;
+    int m_countdown = COUNTDOWN;
+
+    bool m_damage = false;
 
     bool m_wireframe = false;
     bool m_isSkybox = true;
@@ -77,7 +117,12 @@ private:
     bool m_displayCrosshair = true;
     bool m_displayHud = true;
     bool m_displayInfo = false;
+    bool m_resetcountdown = false;
+    bool m_soloMultiChoiceMade = true;
+    bool m_stopcountdown = false;
     
+    bool m_keyK = false;
+    bool m_keyL = false;
     bool m_keyW = false;
     bool m_keyA = false;
     bool m_keyS = false;
@@ -88,6 +133,13 @@ private:
     bool m_mouseC = false;
     bool m_mouseWU = false;
     bool m_mouseWD = false;
+    //Pour trouver ou est la souris
+    float m_mousemx = 0;
+    float m_mousemy = 0;
+
+    bool m_networkgame = false;
+
+    std::string m_messageNotification = "";
 };
 
 #endif // ENGINE_H__

SQCSim2021/external/sfml251-32/doc/html/GpuPreference_8hpp.html

@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>SFML - Simple and Fast Multimedia Library</title>
+        <meta http-equiv="Content-Type" content="text/html;"/>
+        <meta charset="utf-8"/>
+        <!--<link rel='stylesheet' type='text/css' href="https://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic"/>-->
+        <link rel="stylesheet" type="text/css" href="doxygen.css" title="default" media="screen,print" />
+        <script type="text/javascript" src="jquery.js"></script>
+        <script type="text/javascript" src="dynsections.js"></script>
+    </head>
+    <body>
+        <div id="banner-container">
+            <div id="banner">
+                <span id="sfml">SFML 2.5.1</span>
+            </div>
+        </div>
+        <div id="content">
+<!-- Generated by Doxygen 1.8.14 -->
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="namespaces.html"><span>Namespaces</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_c0a853e81d6f1c1f0a3eb7a27dc24256.html">SFML</a></li>  </ul>
+</div>
+</div><!-- top -->
+<div class="header">
+  <div class="summary">
+<a href="#define-members">Macros</a>  </div>
+  <div class="headertitle">
+<div class="title">GpuPreference.hpp File Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+
+<p>Headers.  
+<a href="#details">More...</a></p>
+<div class="textblock"><code>#include &lt;SFML/Config.hpp&gt;</code><br />
+</div>
+<p><a href="GpuPreference_8hpp_source.html">Go to the source code of this file.</a></p>
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ab0233c2d867cbd561036ed2440a4fec0"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="GpuPreference_8hpp.html#ab0233c2d867cbd561036ed2440a4fec0">SFML_DEFINE_DISCRETE_GPU_PREFERENCE</a></td></tr>
+<tr class="memdesc:ab0233c2d867cbd561036ed2440a4fec0"><td class="mdescLeft">&#160;</td><td class="mdescRight">A macro to encourage usage of the discrete GPU.  <a href="#ab0233c2d867cbd561036ed2440a4fec0">More...</a><br /></td></tr>
+<tr class="separator:ab0233c2d867cbd561036ed2440a4fec0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+</table>
+<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
+<div class="textblock"><p>Headers. </p>
+<p>File containing SFML_DEFINE_DISCRETE_GPU_PREFERENCE </p>
+
+<p class="definition">Definition in file <a class="el" href="GpuPreference_8hpp_source.html">GpuPreference.hpp</a>.</p>
+</div><h2 class="groupheader">Macro Definition Documentation</h2>
+<a id="ab0233c2d867cbd561036ed2440a4fec0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ab0233c2d867cbd561036ed2440a4fec0">&#9670;&nbsp;</a></span>SFML_DEFINE_DISCRETE_GPU_PREFERENCE</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define SFML_DEFINE_DISCRETE_GPU_PREFERENCE</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>A macro to encourage usage of the discrete GPU. </p>
+<p>In order to inform the Nvidia/AMD driver that an SFML application could benefit from using the more powerful discrete GPU, special symbols have to be publicly exported from the final executable.</p>
+<p>SFML defines a helper macro to easily do this.</p>
+<p>Place SFML_DEFINE_DISCRETE_GPU_PREFERENCE in the global scope of a source file that will be linked into the final executable. Typically it is best to place it where the main function is also defined. </p>
+
+<p class="definition">Definition at line <a class="el" href="GpuPreference_8hpp_source.html#l00069">69</a> of file <a class="el" href="GpuPreference_8hpp_source.html">GpuPreference.hpp</a>.</p>
+
+</div>
+</div>
+</div><!-- contents -->
+        </div>
+        <div id="footer-container">
+            <div id="footer">
+                SFML is licensed under the terms and conditions of the <a href="https://www.sfml-dev.org/license.php">zlib/png license</a>.<br>
+                Copyright &copy; Laurent Gomila &nbsp;::&nbsp;
+                Documentation generated by <a href="http://www.doxygen.org/" title="doxygen website">doxygen</a> &nbsp;::&nbsp;
+            </div>
+        </div>
+    </body>
+</html>