Ajouts dans netprotocol

Sqc 13 connexion srv

SQCSim-common/SQCSim-common.vcxproj

@@ -137,6 +137,7 @@
     <ClInclude Include="matrix4.h" />
     <ClInclude Include="opensimplex.h" />
     <ClInclude Include="player.h" />
+    <ClInclude Include="netprotocol.h" />
     <ClInclude Include="vector3.h" />
     <ClInclude Include="world.h" />
   </ItemGroup>
@@ -144,6 +145,7 @@
     <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="world.cpp" />

SQCSim-common/SQCSim-common.vcxproj.filters

@@ -48,6 +48,9 @@
     <ClInclude Include="vector3.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
+    <ClInclude Include="netprotocol.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="world.cpp">
@@ -68,5 +71,8 @@
     <ClCompile Include="player.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="netprotocol.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

SQCSim-common/bullet.cpp

@@ -1,10 +1,9 @@
 #include "bullet.h"
 #include "world.h"
 
-Bullet::Bullet(Player& player) {
+Bullet::Bullet(Vector3f pos, Vector3f dir) : m_startpos(pos), m_currentpos(pos), m_velocity(dir) {}
-	m_startpos = m_currentpos = player.GetPOV() + player.GetDirection();
+
-	m_velocity = player.GetDirection();
+Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_tid(tid) {}
-}
 
 Bullet::~Bullet() {}
 
@@ -30,3 +29,11 @@ void Bullet::Transpose(int& x, int& z) {
 	m_startpos.x -= x * CHUNK_SIZE_X;
 	m_startpos.z -= z * CHUNK_SIZE_Z;
 }
+
+Vector3f Bullet::getPos() {
+	return m_currentpos;
+}
+
+uint64_t Bullet::getTeamID(){
+	return m_tid;
+}

SQCSim-common/bullet.h

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

SQCSim-common/define.h

@@ -2,51 +2,55 @@
 #define DEFINE_H__
 
 #include <iostream>
-
+#include <chrono>
-#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_PORT 1025
 #define CLI_PORT 1026
 
-#ifdef _DEBUG
+#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 4
+#define VIEW_DISTANCE 512
-#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
-#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 };
+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 popen _popen
+#define pclose _pclose
+
+#else // Pas _WIN32
+
+#include <unistd.h>
+#include <time.h>
+#include <stdio.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#define SOCKET int
+#define INVALID_SOCKET -1
+#define closesocket close
+
+#endif // _WIN32
+
 
 #endif // DEFINE_H__

SQCSim-common/netprotocol.cpp

@@ -0,0 +1,506 @@
+#include "netprotocol.h"
+
+void netprot::Serialize(Input* in, char* buf[], uint32_t* buflen) {
+	*buf[0] = netprot::PACKET_TYPE::INPUT;
+
+	uint64_t time = in->timestamp;
+	uint8_t time8[sizeof(uint64_t)] = {(time >> 56) & 0xFF,
+									   (time >> 48) & 0xFF,
+									   (time >> 40) & 0xFF,
+									   (time >> 32) & 0xFF,
+									   (time >> 24) & 0xFF,
+									   (time >> 16) & 0xFF,
+									   (time >> 8 ) & 0xFF,
+									    time		& 0xFF};
+
+	memcpy(*buf + 1, time8, sizeof(uint64_t));
+
+	uint64_t sid = in->sid;
+	uint8_t sid8[sizeof(uint64_t)] = {(sid >> 56) & 0xFF,
+									  (sid >> 48) & 0xFF,
+									  (sid >> 40) & 0xFF,
+									  (sid >> 32) & 0xFF,
+									  (sid >> 24) & 0xFF,
+									  (sid >> 16) & 0xFF,
+									  (sid >> 8 ) & 0xFF,
+									   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, &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)] = {
+							(vec[0] >> 24) & 0xFF,
+							(vec[0] >> 16) & 0xFF,
+							(vec[0] >> 8) & 0xFF,
+							 vec[0] & 0xFF,
+						(vec[1] >> 24) & 0xFF,
+						(vec[1] >> 16) & 0xFF,
+						(vec[1] >> 8) & 0xFF,
+						 vec[1] & 0xFF,
+					(vec[2] >> 24) & 0xFF,
+					(vec[2] >> 16) & 0xFF,
+					(vec[2] >> 8) & 0xFF,
+					 vec[2] & 0xFF};
+
+	memcpy(*buf + sizeof(uint64_t) + 3, vec8, sizeof(uint32_t) * 3);
+
+	*buflen = sizeof(uint64_t) + 3 + sizeof(uint32_t) * 3;
+}
+
+void netprot::Serialize(Output* out, char* buf[], uint32_t* buflen) {
+
+}
+
+void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
+	
+}
+
+void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) {
+	*buf[0] = 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)] = {
+									   (tid >> 56) & 0xFF,
+									   (tid >> 48) & 0xFF,
+									   (tid >> 40) & 0xFF,
+									   (tid >> 32) & 0xFF,
+									   (tid >> 24) & 0xFF,
+									   (tid >> 16) & 0xFF,
+									   (tid >> 8) & 0xFF,
+									   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] = 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)] = { 
+									   (sid >> 56) & 0xFF,
+									   (sid >> 48) & 0xFF,
+									   (sid >> 40) & 0xFF,
+									   (sid >> 32) & 0xFF,
+									   (sid >> 24) & 0xFF,
+									   (sid >> 16) & 0xFF,
+									   (sid >> 8) & 0xFF,
+									   sid & 0xFF
+	};
+
+	memcpy(*buf + namesize + 2, sid8, sizeof(uint64_t));
+
+	uint64_t tid = linfo->tid;
+	uint8_t tid8[sizeof(uint64_t)] = {
+									   (tid >> 56) & 0xFF,
+									   (tid >> 48) & 0xFF,
+									   (tid >> 40) & 0xFF,
+									   (tid >> 32) & 0xFF,
+									   (tid >> 24) & 0xFF,
+									   (tid >> 16) & 0xFF,
+									   (tid >> 8) & 0xFF,
+									   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] = 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)] = {
+									   (id >> 56) & 0xFF,
+									   (id >> 48) & 0xFF,
+									   (id >> 40) & 0xFF,
+									   (id >> 32) & 0xFF,
+									   (id >> 24) & 0xFF,
+									   (id >> 16) & 0xFF,
+									   (id >> 8) & 0xFF,
+									   id & 0xFF
+	};
+
+	memcpy(*buf + namesize + 2, id8, sizeof(uint64_t));
+
+	uint64_t tid = pinfo->tid;
+	uint8_t tid8[sizeof(uint64_t)] = {
+									   (tid >> 56) & 0xFF,
+									   (tid >> 48) & 0xFF,
+									   (tid >> 40) & 0xFF,
+									   (tid >> 32) & 0xFF,
+									   (tid >> 24) & 0xFF,
+									   (tid >> 16) & 0xFF,
+									   (tid >> 8) & 0xFF,
+									   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] = netprot::PACKET_TYPE::GAMEINFO;
+
+	uint64_t game = ginfo->seed;
+	uint8_t seed8[sizeof(uint64_t)] = {
+									   (game >> 56) & 0xFF,
+									   (game >> 48) & 0xFF,
+									   (game >> 40) & 0xFF,
+									   (game >> 32) & 0xFF,
+									   (game >> 24) & 0xFF,
+									   (game >> 16) & 0xFF,
+									   (game >> 8) & 0xFF,
+									   game & 0xFF
+	};
+
+	memcpy(*buf + 1, seed8, sizeof(uint64_t));
+
+	game = ginfo->countdown;
+	uint8_t count8[sizeof(uint64_t)] = {
+									   (game >> 56) & 0xFF,
+									   (game >> 48) & 0xFF,
+									   (game >> 40) & 0xFF,
+									   (game >> 32) & 0xFF,
+									   (game >> 24) & 0xFF,
+									   (game >> 16) & 0xFF,
+									   (game >> 8) & 0xFF,
+									   game & 0xFF
+	};
+
+	memcpy(*buf + sizeof(uint64_t) + 1, count8, sizeof(uint64_t));
+
+	game = ginfo->countdown;
+	uint8_t gtype8[sizeof(uint64_t)] = {
+									   (game >> 56) & 0xFF,
+									   (game >> 48) & 0xFF,
+									   (game >> 40) & 0xFF,
+									   (game >> 32) & 0xFF,
+									   (game >> 24) & 0xFF,
+									   (game >> 16) & 0xFF,
+									   (game >> 8) & 0xFF,
+									   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] = netprot::PACKET_TYPE::CHAT;
+
+	uint64_t src = chat->src_id;
+	uint8_t src8[sizeof(uint64_t)] = {
+									   (src >> 56) & 0xFF,
+									   (src >> 48) & 0xFF,
+									   (src >> 40) & 0xFF,
+									   (src >> 32) & 0xFF,
+									   (src >> 24) & 0xFF,
+									   (src >> 16) & 0xFF,
+									   (src >> 8) & 0xFF,
+									   src & 0xFF
+	};
+
+	memcpy(*buf + 1, src8, sizeof(uint64_t));
+
+	uint64_t dst = chat->dest_id;
+	uint8_t dst8[sizeof(uint64_t)] = {
+									   (dst >> 56) & 0xFF,
+									   (dst >> 48) & 0xFF,
+									   (dst >> 40) & 0xFF,
+									   (dst >> 32) & 0xFF,
+									   (dst >> 24) & 0xFF,
+									   (dst >> 16) & 0xFF,
+									   (dst >> 8) & 0xFF,
+									   dst & 0xFF
+	};
+
+	memcpy(*buf + 1 + sizeof(uint64_t), dst8, sizeof(uint64_t));
+
+	uint64_t dstteam = chat->dest_id;
+	uint8_t dstt8[sizeof(uint64_t)] = {
+									   (dstteam >> 56) & 0xFF,
+									   (dstteam >> 48) & 0xFF,
+									   (dstteam >> 40) & 0xFF,
+									   (dstteam >> 32) & 0xFF,
+									   (dstteam >> 24) & 0xFF,
+									   (dstteam >> 16) & 0xFF,
+									   (dstteam >> 8) & 0xFF,
+									   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] = 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) {
+	return false;
+}
+
+bool netprot::Deserialize(Output* out, char* buf, const uint32_t buflen) {
+	return false;
+}
+
+bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) {
+	return false;
+}
+
+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::PacketType netprot::getType(char* buf, const uint32_t buflen) {
+	if (buflen < 1 || 
+		buf[0] >= netprot::PACKET_TYPE::LAST_PACK || 
+		buf[0] <= netprot::PACKET_TYPE::ERR)
+		return netprot::PACKET_TYPE::ERR;
+	return buf[0];
+}

SQCSim-common/netprotocol.h

@@ -0,0 +1,119 @@
+#ifndef NETPROTOCOL_H__
+#define NETPROTOCOL_H__
+#include "define.h"
+#include <string>
+#include "vector3.h"
+
+/* Protocole Particulier de Partie <20> Plusieurs Personnes (PPPPP) */
+
+// Packet: packet[0] = PacketType, packet[1..n-1] = {packet}
+
+namespace netprot {
+	typedef uint8_t PacketType;
+	enum PACKET_TYPE {
+				ERR, INPUT, OUTPUT, SYNC,
+				TEAMINF, SELFINF, PLAYINF, LOGINF,
+				CHUNKMOD, PLAYERMOD, PICKUPMOD,
+				GAMEINFO, ENDINFO , CHAT, ERRLOG,
+				LAST_PACK
+			};
+
+	struct Keys {
+		bool forward, 
+			 backward, 
+			 left, 
+			 right, 
+			 jump, 
+			 shoot,
+			 block;
+	};
+
+	struct States {
+		bool jumping, 
+			 shooting, 
+			 hit, 
+			 powerup;
+	};
+
+	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;
+	};
+
+	struct TeamInfo {									// cli <-> srv			TCP			once
+		char name[32];
+		uint64_t id = 0;
+	};
+
+	struct LoginInfo {									// cli <-> srv			TCP			once
+		char name[32];
+		uint64_t sid = 0, 
+			     tid = 0;
+	};
+
+	struct PlayerInfo {									// cli <-> srv			TCP			once
+		char name[32];
+		uint64_t id = 0,
+				 tid = 0;
+	};
+
+	struct GameInfo {									// cli <-> srv			TCP			event (before game start)/ once
+		uint64_t seed;
+		uint32_t countdown;
+		uint8_t gameType; // TOOD: enum.
+	};
+
+	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.
+	};
+
+	struct ErrorLog {									// srv -> cli			TCP			event
+		char mess[140];
+		bool is_fatal;
+	};
+
+	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
+
+	PacketType getType(char* buf, uint32_t buflen); // srv/cli
+} 
+#endif

SQCSim-srv/connection.cpp

@@ -1,48 +1,46 @@
 #include "connection.h"
 
-Connection::Connection(in_addr addr, 
+
-					   std::string name, 
+
-					   UINT64 id, 
+Connection::Connection(SOCKET sock, 
-					   UINT64 self_id,
+					   sockaddr_in sockaddr, 
-				       UINT64 team_id): 
+					   netprot::LoginInfo log, 
-	m_addr(addr), 
+					   netprot::PlayerInfo play):
-	m_id(id), 
+	m_sock(sock), 
-	m_sid(self_id),
+	m_addr(sockaddr), 
-	m_tid(team_id), 
+	m_loginfo(log), 
-	m_name(name) {
+	m_playinfo(play) {
 
 }
 
 Connection::~Connection() {
-
+	closesocket(m_sock);
 }
 
-in_addr Connection::GetAddr() const { return m_addr; }
+uint64_t Connection::GetHash(bool self) const { return self? m_loginfo.sid: m_playinfo.id; }
 
-UINT64 Connection::GetHash(bool self) const { return self? m_sid: m_id; }
+uint64_t Connection::GetTeamHash() const { return m_loginfo.tid; }
 
-UINT64 Connection::GetTeamHash() const { return m_tid; }
+std::string Connection::GetName() const { return m_loginfo.name; }
 
-std::string Connection::GetName() const { return m_name; }
+void Connection::AddInput(netprot::Input in) {
-
+	m_input_manifest.insert({ in.timestamp, in });
-void Connection::AddInput(Input in) {
-	m_input_manifest.insert({in.timestamp, in});
 }
 
-Output* Connection::getOutput(Timestamp time) {
+netprot::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) {
+netprot::Sync Connection::getSync(Timestamp time) {
-	Sync sync;
+	netprot::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_sid;
+		sync.sid = m_loginfo.sid;
 	}
 	return sync;
 }

SQCSim-srv/connection.h

@@ -4,57 +4,38 @@
 #include <map>
 #include "../SQCSim-common/player.h"
 #include "../SQCSim-common/vector3.h"
+#include "../SQCSim-common/netprotocol.h"
 #include "define.h"
 
-struct Input {
-	Timestamp timestamp;
-	UINT8 keys; // 0bFBLRJS__
-	Vector3f direction;
-};
-
-struct Output {
-	Timestamp timestamp;
-	UINT64 id = 0;
-	Vector3f position, direction;
-	bool is_shooting, is_jumping;
-};
-
-struct Sync {
-	Timestamp timestamp;
-	UINT64 sid = 0;
-	Vector3f position;
-};
-
 class Connection {
 public:
 	Connection(
-		in_addr addr, 
+		SOCKET sock,
-		std::string name, 
+		sockaddr_in sockaddr,
-		UINT64 hash, 
+		netprot::LoginInfo log,
-		UINT64 self_hash, 
+		netprot::PlayerInfo play);
-		UINT64 team_hash);
 	~Connection();
 
 	Player* player = nullptr;
 
-	in_addr GetAddr() const;
+	uint64_t GetHash(bool self = true) const;
-	UINT64 GetHash(bool self = true) const;
+	uint64_t GetTeamHash() const;
-	UINT64 GetTeamHash() const;
 	std::string GetName() const;
 
-	void AddInput(Input in);
+	void AddInput(netprot::Input in);
-	Output* getOutput(Timestamp time);
+	netprot::Output* getOutput(Timestamp time);
-	Sync getSync(Timestamp time);
+	netprot::Sync getSync(Timestamp time);
 
 	void CleanInputManifest(Timestamp time);
 private:
-	std::map<Timestamp, Input> m_input_manifest;
+	std::map<Timestamp, netprot::Input> m_input_manifest;
-	std::map<Timestamp, Output> m_output_manifest;
+	std::map<Timestamp, netprot::Output> m_output_manifest;
-	in_addr m_addr;
+	std::map<Timestamp, netprot::Chat> m_chatlog;
-	UINT64 m_id,
+
-		   m_sid,
+	SOCKET m_sock;
-		   m_tid;
+	sockaddr_in m_addr;
-	std::string m_name;
+	netprot::LoginInfo m_loginfo;
+	netprot::PlayerInfo m_playinfo;
 
 };
 #endif

SQCSim-srv/define.h

@@ -6,38 +6,12 @@
 #include <sstream>
 #include <cctype>
 #include <string>
-#include <chrono>
 
 #define MAX_CONNECTIONS 16
+#define ID_LIST_SIZE 127
+#define BUFFER_LENGTH 150
+
 typedef unsigned char LogDest;
 enum LOG_DEST { CONSOLE, LOGFILE, LOG_LAST };
-typedef std::chrono::system_clock::time_point Timestamp;
-
-
-#ifdef _WIN32
-
-#pragma comment(lib,"wsock32.lib") // Pour pouvoir faire fonctionner le linker sans le vcxproject
-
-#include <Windows.h>
-#include <cstdio>
-#include <ctime>
-
-#define popen _popen
-#define pclose _pclose
-
-#else // Pas _WIN32
-
-#include <unistd.h>
-#include <time.h>
-#include <stdio.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-
-#define SOCKET int
-#define INVALID_SOCKET -1
-#define closesocket close
-
-#endif // _WIN32
 
 #endif

SQCSim-srv/main.cpp

@@ -1,4 +1,3 @@
-#include "define.h"
 #include "server.h"
 
 int main() {

SQCSim-srv/server.cpp

@@ -61,9 +61,6 @@ int Server::Init() {
 		return 5;
 	}
 
-	for (auto& conn : m_conn)
-		conn = nullptr;
-
 	return 0;
 }
 
@@ -73,20 +70,73 @@ int Server::Ready() {
 		return 1;
 	}
 
-	char buffer[2048];
+	char* buf = new char[150];
+	uint32_t buflen = 150;
 	bool readystart = false;
+	srand(time(NULL));
 
 	Log("<EFBFBD> l'<27>coute sur le port: " + std::to_string(SRV_PORT), false, false);
 
+	buildIdList(ID_LIST_SIZE);
+
+	m_game.countdown = 360;
+	m_game.gameType = 1;
+	m_game.seed = 9370707;
+
 	while (!readystart) {
-		
+		sockaddr_in sockad;
-		Log("trololo", false, false);
+		int addrlen = sizeof(sockad);
-		readystart = true;
+		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 connection provenant de: ";
+			char* strbuf = new char[BUFFER_LENGTH];
+			uint32_t strbuflen = BUFFER_LENGTH;
+
+			str.append(inet_ntop(AF_INET, &sockad.sin_addr, strbuf, strbuflen)).append(": ").append(std::to_string(sockad.sin_port));
+
+			if (recv(sock, buf, buflen, 0) > 0) {
+				netprot::LoginInfo log;
+				netprot::PlayerInfo play;
+				if (netprot::Deserialize(&log, buf, buflen)) {
+					log.sid = getUniqueId();
+
+					log.tid = 0;
+
+					str.append(" Nom: ").append(log.name); 
+					Log(str, false, false);
+					str = "";
+					
+					str.append(log.name).append(" SID: [").append(std::to_string(log.sid).append("]"));
+					Log(str, false, false);
+
+					//netprot::Serialize(&log, &buf, &buflen);
+					//send(sock, buf, buflen, 0);
+					//buflen = 150;
+					sendPack<netprot::LoginInfo>(sock, &log, &buf, &buflen);
+
+					play.id = getUniqueId();
+					memcpy(play.name, log.name, std::strlen(log.name) + 1);
+					play.tid = log.tid;
+
+					//netprot::Serialize(&m_game, &buf, &buflen);
+					//send(sock, buf, buflen, 0);
+					sendPack<netprot::GameInfo>(sock, &m_game, &buf, &buflen);
+					Connection* conn = new Connection(sock, sockad, log, play);
+
+					m_players[log.sid] = conn;
+					readystart = true;
+				}
+			}
+		}
 	}
 	return 0;
 }
 
 void Server::Run() {
+
 	Log("Partie en cours...", false, false);
 }
 
@@ -116,7 +166,7 @@ void Server::Log(std::string str, bool is_error = false, bool is_fatal = false)
 		break;
 	case LOG_DEST::CONSOLE:
 	default:
-		std::cout << Timestamp() << (is_fatal? "FATAL ": "") << (is_error ? "ERROR ": "") << str << std::endl;
+		std::cout << Timestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
 		break;
 	}
 
@@ -131,6 +181,41 @@ void Server::Log(std::string str, bool is_error = false, bool is_fatal = false)
 	}
 }
 
+void Server::buildIdList(size_t size) {
+	std::set<uint64_t> lst;
+
+	do lst.insert(((uint64_t)rand() << 25) % 8675309); // EIGHT SIX SEVENFIVE THREE AUGHT NIIIIIIiIIiiIiINE!
+	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;
+}
+
+// Test serialize/deserialize:
+/*
+	netprot::LoginInfo log, log2;
+	std::cout << "Nom? ";
+	std::cin.getline(log.name, 32); // NO! STD::CIN >> VARIABLE;! EVEEEEEERRRR!!!
+	log.sid = 12345;
+	char* buf = new char[150];
+	uint32_t buflen = 150;
+
+	netprot::Serialize(&log, &buf, &buflen);
+
+	bool is_work = netprot::Deserialize(&log2, buf, buflen);
+
+	std::string str;
+	str.append(is_work ? "Y " : "N ").append(log2.name).append(": ").append(std::to_string(log2.sid));
+
+	Log(str, false, false);
+*/
+
+
 ///* Recevoir paquet */
 //while (true) {
 //	char buffer[2048];

SQCSim-srv/server.h

@@ -3,8 +3,10 @@
 
 #include <fstream>
 #include <vector>
+#include <set>
 #include <string>
 #include "../SQCSim-common/world.h"
+#include "../SQCSim-common/netprotocol.h"
 #include "define.h"
 #include "connection.h"
 
@@ -26,10 +28,27 @@ private:
 	LogDest m_log;
 	std::ofstream m_logfile;
 
-	Connection* m_conn[MAX_CONNECTIONS];
+	std::map<uint64_t, Connection*> m_players;
+	std::map <Timestamp, netprot::Chat> m_chatlog;
+	std::vector<uint64_t> m_ids;
+	netprot::GameInfo m_game;
+
 	World* m_world = nullptr;
 
 	std::string Timestamp();
 	void Log(std::string str, bool is_error, bool is_fatal);
+	void buildIdList(size_t size);
+
+	uint64_t getUniqueId(); 
+	template <class T> void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen);
+
 };
+
+template <class T>
+void Server::sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen) {
+	netprot::Serialize(pack, buf, buflen);
+	send(sock, *buf, *buflen, 0);
+	*buflen = BUFFER_LENGTH;
+}
+
 #endif

SQCSim2021/SQCSim2021.vcxproj

@@ -19,17 +19,12 @@
     </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="openglcontext.h" />
-    <ClInclude Include="opensimplex.h" />
     <ClInclude Include="player.h" />
     <ClInclude Include="shader.h" />
     <ClInclude Include="skybox.h" />
@@ -37,19 +32,16 @@
     <ClInclude Include="textureatlas.h" />
     <ClInclude Include="tool.h" />
     <ClInclude Include="transformation.h" />
-    <ClInclude Include="vector3.h" />
     <ClInclude Include="vertexbuffer.h" />
     <ClInclude Include="world.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="openglcontext.cpp" />
-    <ClCompile Include="opensimplex.cpp" />
     <ClCompile Include="player.cpp" />
     <ClCompile Include="shader.cpp" />
     <ClCompile Include="skybox.cpp" />
@@ -60,6 +52,11 @@
     <ClCompile Include="vertexbuffer.cpp" />
     <ClCompile Include="world.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>
     <Keyword>Win32Proj</Keyword>

SQCSim2021/SQCSim2021.vcxproj.filters

@@ -11,12 +11,6 @@
     </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>
@@ -26,36 +20,21 @@
     <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>
@@ -68,17 +47,17 @@
     <ClInclude Include="world.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="bullet.h">
+    <ClInclude Include="connector.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="opensimplex.h">
+    <ClInclude Include="openglcontext.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="tool.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>
@@ -103,9 +82,6 @@
     <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>
@@ -121,10 +97,10 @@
     <ClCompile Include="world.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="bullet.cpp">
+    <ClCompile Include="connector.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="opensimplex.cpp">
+    <ClCompile Include="tool.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
   </ItemGroup>

SQCSim2021/array2d.h

@@ -1,61 +0,0 @@
-#ifndef ARRAY2D_H__
-#define ARRAY2D_H__
-
-#include "define.h"
-
-template <class T>
-class Array2d {
-    public:
-        Array2d(int x, int y);
-        ~Array2d();
-        Array2d(const Array2d& array);
-
-        void Set(int x, int y, T type);
-        T Get(int x, int y) const;
-        T Remove(int x, int y);
-
-        void Reset(T type);
-
-    private:
-        int m_x, m_y;
-        T* m_array;
-
-        int To1dIndex(int x, int y) const;
-};
-
-template <class T>
-Array2d<T>::Array2d(int x, int y) : m_x(x), m_y(y) { m_array = new T[m_x * m_y]; }
-
-template <class T>
-Array2d<T>::~Array2d() { delete[] m_array; }
-
-template <class T>
-Array2d<T>::Array2d(const Array2d<T>& array) : m_x(array.m_x), m_y(array.m_y) {
-    m_array = new T[m_x * m_y];
-    for (int i = 0; i < m_x * m_y; ++i)
-        m_array[i] = array.m_array[i];
-}
-
-template <class T>
-void Array2d<T>::Set(int x, int y, T type) { m_array[To1dIndex(x, y)] = type; }
-
-template <class T>
-T Array2d<T>::Get(int x, int y) const { return m_array[To1dIndex(x, y)]; }
-
-template <class T>
-T Array2d<T>::Remove(int x, int y) { 
-    T thing = std::move(m_array[To1dIndex(x, y)]);
-    m_array[To1dIndex(x, y)] = nullptr;
-    return thing;
-}
-
-template <class T>
-void Array2d<T>::Reset(T type) {
-    for (int i = 0; i < m_x * m_y; ++i)
-        m_array[i] = type;
-}
-
-template <class T>
-int Array2d<T>::To1dIndex(int x, int y) const { return x + (y * m_x); }
-
-#endif // ARRAY2D_H__

SQCSim2021/array3d.h

@@ -1,55 +0,0 @@
-#ifndef ARRAY3D_H__
-#define ARRAY3D_H__
-
-#include "define.h"
-
-template <class T>
-class Array3d {
-    public:
-        Array3d(int x, int y, int z);
-        ~Array3d();
-        Array3d(const Array3d& array);
-
-        void Set(int x, int y, int z, T type);
-        T Get(int x, int y, int z) const;
-
-        void Reset(T type);
-
-    private:
-        int m_x, m_y, m_z;
-        T* m_array;
-
-        int To1dIndex(int x, int y, int z) const;
-};
-
-template <class T>
-Array3d<T>::Array3d(int x, int y, int z) : m_x(x), m_y(y), m_z(z) { m_array = new T[m_x * m_y * m_z]; }
-
-template <class T>
-Array3d<T>::~Array3d() { delete[] m_array; }
-
-template <class T>
-Array3d<T>::Array3d(const Array3d<T>& array) : m_x(array.m_x), m_y(array.m_y), m_z(array.m_z) {
-    m_array = new T[m_x * m_y * m_z];
-    for (int i = 0; i < m_x * m_y * m_z; ++i)
-        m_array[i] = array.m_array[i];
-}
-
-template <class T>
-void Array3d<T>::Set(int x, int y, int z, T type) { 
-    m_array[To1dIndex(x, y, z)] = type; 
-}
-
-template <class T>
-T Array3d<T>::Get(int x, int y, int z) const { return m_array[To1dIndex(x, y, z)]; }
-       
-template <class T>
-void Array3d<T>::Reset(T type) {
-    for (int i = 0; i < m_x * m_y * m_z; ++i)
-        m_array[i] = type;
-}
-
-template <class T>
-int Array3d<T>::To1dIndex(int x, int y, int z) const { return x + (z * m_x) + (y * m_z * m_x); }
-
-#endif // ARRAY3D_H__

SQCSim2021/audio.h

@@ -4,7 +4,7 @@
 #include <irrKlang.h>
 #include <ik_ISoundSource.h>
 #include "define.h"
-#include "vector3.h"
+#include "../SQCSim-common/vector3.h"
 
 class Audio {
 private:

SQCSim2021/blockinfo.cpp

@@ -1,42 +0,0 @@
-#include "blockinfo.h"
-#include <iostream>
-
-BlockInfo::BlockInfo(BlockType type, const std::string& name, float u, float v, float s, int dur) : m_type(type), m_name(name), m_u(u), m_v(v), m_s(s), m_durability(dur)
-{
-}
-
-BlockInfo::~BlockInfo()
-{
-}
-
-BlockType BlockInfo::GetType() const
-{
-    return m_type;
-}
-
-void BlockInfo::SetDurability(int durability)
-{
-    m_durability = durability;
-}
-
-int BlockInfo::GetDurability() const
-{
-    return m_durability;
-}
-
-void BlockInfo::GetTexture(float& u, float& v, float& s)
-{
-    u = m_u;
-    v = m_v;
-    s = m_s;
-}
-
-void BlockInfo::Show() const
-{
-    std::cout << "Type: " << m_type << std::endl;
-    std::cout << "Nom: " << m_name << std::endl;
-    std::cout << "Durabilite: " << m_durability << std::endl;
-    std::cout << "Coordonnees Texture: " << m_u << ", " << m_v << ", " << m_s << std::endl;
-}
-
-

SQCSim2021/blockinfo.h

@@ -1,32 +0,0 @@
-#ifndef BLOCKINFO_H__
-#define BLOCKINFO_H__
-
-#include <string>
-#include "define.h"
-
-class BlockInfo
-{
-    public:
-    BlockInfo(BlockType type, const std::string& name, float u, float v, float s, int dur);
-    ~BlockInfo();
-
-    BlockType GetType() const;
-
-    void SetDurability(int durability);
-    int GetDurability() const;
-
-    void GetTexture(float& u, float& v, float& s);
-
-    void Show() const;
-
-    private:
-    BlockType m_type;
-    float m_u;
-    float m_v;
-    float m_s;
-    std::string m_name;
-    int m_durability;
-
-};
-
-#endif // BLOCKINFO_H__

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

SQCSim2021/chunk.h

@@ -1,11 +1,11 @@
 #ifndef CHUNK_H__
 #define CHUNK_H__
 #include "define.h"
-#include "array3d.h"
+#include "../SQCSim-common/array2d.h"
-#include "array2d.h"
+#include "../SQCSim-common/array3d.h"
+#include "../SQCSim-common/blockinfo.h"
+#include "../SQCSim-common/opensimplex.h"
 #include "vertexbuffer.h"
-#include "blockinfo.h"
-#include "opensimplex.h"
 
 class World;
 
@@ -25,7 +25,7 @@ class Chunk {
         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);

SQCSim2021/connector.cpp

@@ -0,0 +1,101 @@
+#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(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;
+	}
+
+	char* buf = new char[150];
+	uint32_t buflen = 150;
+	netprot::LoginInfo log;
+	memcpy(&log.name, name.c_str(), name.size() + 1);
+
+	netprot::Serialize(&log, &buf, &buflen);
+
+	int se = send(m_sock_tcp, buf, buflen, 0);
+
+	delete[] buf;
+	buf = new char[150] {0};
+	buflen = 150;
+	int rpack = 0;
+
+	while (rpack < 2) {
+		recv(m_sock_tcp, buf, buflen, 0);
+
+		switch (netprot::getType(buf, buflen)) {
+		case netprot::PACKET_TYPE::LOGINF:
+			if (!netprot::Deserialize(&m_loginfo, buf, buflen)) {
+				std::cout << "Packet LoginInfo invalide." << std::endl;
+				return 2;
+			}
+			++rpack;
+			break;
+		case netprot::PACKET_TYPE::GAMEINFO:
+			if (!netprot::Deserialize(&m_gameinfo, buf, buflen)) {
+				std::cout << "Packet GameInfo invalide." << std::endl;
+				return 3;
+			}
+			++rpack;
+			break;
+		default:
+			std::cout << "Packet invalide." << std::endl;
+			break;
+		}
+	}
+	return 0;
+}
+
+uint64_t Connector::getId() const { return m_loginfo.sid; }
+
+unsigned int Connector::getSeed() const { return m_gameinfo.seed; }

SQCSim2021/connector.h

@@ -0,0 +1,36 @@
+#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(char* srv_addr, std::string name);
+	uint64_t getId() const;
+	unsigned int getSeed() const;
+
+	//void SendInput();
+	//int Sync();
+private:
+#ifdef _WIN32
+	WSADATA m_wsaData;
+#endif
+	std::map<Timestamp, netprot::Input> m_inputmanifest;
+	std::map<uint64_t, netprot::PlayerInfo> m_players;
+	std::map<uint64_t, netprot::TeamInfo> m_teams;
+
+	netprot::LoginInfo m_loginfo;
+	netprot::GameInfo m_gameinfo;
+
+	sockaddr_in m_srvsockaddr;
+	SOCKET m_sock_udp = 0,
+		   m_sock_tcp = 0;
+
+};
+#endif

SQCSim2021/define.h

@@ -1,28 +1,22 @@
-#ifndef DEFINE_H__
+#ifndef CLI_DEFINE_H__
-#define DEFINE_H__
+#define CLI_DEFINE_H__
 
+#include <iostream>
+#include <chrono>
+#include <iomanip>
 #include <SFML/Window.hpp>
 #include <SFML/Graphics.hpp>
-#include <iostream>
+#include "../SQCSim-common/define.h"
-#include <iomanip>
 
 #ifdef _WIN32
-#include <windows.h>
 #include <GL/glew.h>
 #include <gl/GL.h>
 #include <gl/GLU.h>
 #endif
 
-#define CHUNK_SIZE_X  4
+#define NETWORK_TEST false
-#define CHUNK_SIZE_Y  64
+#define SRV_ADDR "127.0.0.1"
-#define CHUNK_SIZE_Z  4
+#define COUNTDOWN 300
-#define MAX_SELECTION_DISTANCE 5
-#define BASE_WIDTH 640
-#define BASE_HEIGHT 480
-#define SEED 12345
-
-#define WORLD_SIZE_X 64
-#define WORLD_SIZE_Y 64
 
 #define FRAMES_RENDER_CHUNKS 1
 #define FRAMES_UPDATE_CHUNKS 1
@@ -32,13 +26,8 @@
 #define THREADS_UPDATE_CHUNKS 3
 #define THREADS_DELETE_CHUNKS 3
 
-#define VIEW_DISTANCE 512
+#define BASE_WIDTH 640
-#define TEXTURE_SIZE 512
+#define BASE_HEIGHT 480
-#define MAX_BULLETS 512
-
-
-typedef uint8_t BlockType;
-enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_LAST };
 
 #define TEXTURE_PATH        "./media/textures/"
 #define SHADER_PATH		    "./media/shaders/"

SQCSim2021/engine.cpp

@@ -1,8 +1,4 @@
 #include "engine.h"
-#include <algorithm>
-#include <cmath>
-#include "transformation.h"
-#include "player.h"
 
 Engine::Engine() {}
 
@@ -44,12 +40,29 @@ void Engine::Init() {
 	m_skybox.Init(0.2f);
 
 	// Objet de musique!
-	m_audio.ToggleMusicState();
+	//m_audio.ToggleMusicState();
 
 	// Array pour les balles.
 	for (int x = 0; x < MAX_BULLETS; ++x)
 		m_bullets[x] = nullptr;
 
+	uint64_t seed = SEED;
+	std::string playname = "La Chienne <20> Jacques";
+	if (NETWORK_TEST) { // Test connexion r<>seau.
+		if (!m_conn.Init()) {
+			if (!m_conn.Connect(SRV_ADDR, playname)) {
+				// setup jeu en r<>seau.
+				std::cout << "ID re<72>u du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
+				std::cout << "Seed re<72>u du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
+				seed = m_conn.getSeed();
+			}
+			else std::cout << "Erreur de connexion." << std::endl;
+		}
+		else std::cout << "Erreur de cr<63>ation de socket." << std::endl;
+	}
+
+	m_world.SetSeed(seed);
+
 	// Init Chunks
 	m_world.GetChunks().Reset(nullptr);
 
@@ -192,7 +205,6 @@ void Engine::DisplayHud(int timer) {
 	ss << "Time: " << (int)(timer / 60) << ":" << std::setw(2) << std::setfill('0') << timer % 60;
 	PrintText(Width() - Width() * 0.15, Height() - (Height() / 19.2), scale, ss.str());
 	
-
 }
 
 void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
@@ -362,12 +374,12 @@ void Engine::Render(float elapsedTime) {
 		else if (bulletTime <= 0.f) {
 			for (int x = 0; x < MAX_BULLETS; ++x)  // Ajouter une balle dans l'array (aussi connu sous le nom de "faire pow pow").
 				if (!m_bullets[x]) {
-					m_bullets[x] = new Bullet(m_player);
+					m_bullets[x] = new Bullet(m_player.GetPOV() + m_player.GetDirection(), m_player.GetDirection());
 					break;
 				}
 				else if (x == MAX_BULLETS - 1) { // S'il y a pas d'espace dans l'array, prendre la place de la premi<6D>re balle de l'array.
 					m_bullets[0]->~Bullet();
-					m_bullets[0] = new Bullet(m_player);
+					m_bullets[0] = new Bullet(m_player.GetPOV() + m_player.GetDirection(), m_player.GetDirection());
 				}
 			bulletTime = .1f;
 			m_audio.Create3DAudioObj(m_powpow, AUDIO_PATH "windowsaccount.wav", m_player.GetPOV(), m_player.GetDirection() * 10, .5f);
@@ -384,7 +396,7 @@ void Engine::Render(float elapsedTime) {
 
 	for (int x = 0; x < MAX_BULLETS; ++x) // Array de bullets en jeu.
 		if (m_bullets[x])
-			if (m_bullets[x]->Update(&m_world, all, elapsedTime)) {
+			if (m_bullets[x]->Update(&m_world, elapsedTime)) {
 				m_bullets[x]->~Bullet();
 				m_bullets[x] = nullptr;
 			}

SQCSim2021/engine.h

@@ -1,6 +1,11 @@
 #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 "define.h"
 #include "openglcontext.h"
 #include "texture.h"
@@ -11,10 +16,8 @@
 #include "skybox.h"
 #include "audio.h"
 #include "textureatlas.h"
-#include "blockinfo.h"
-#include "array2d.h"
 #include "world.h"
-#include "bullet.h"
+#include "connector.h"
 
 class Engine : public OpenglContext {
 public:
@@ -46,6 +49,7 @@ private:
     void DrawHud(float elapsedTime, BlockType bloc);
     void PrintText(float x, float y, float scale, const std::string& t);
 
+    Connector m_conn;
     Shader m_shader01;
     BlockInfo* m_blockinfo[BTYPE_LAST];
     TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);

SQCSim2021/matrix4.h

@@ -1,571 +0,0 @@
-#ifndef MATRIX4_H__
-#define MATRIX4_H__
-
-#include <ostream>
-#include <sstream>
-#include <string>
-
-#include "define.h"
-#include "vector3.h"
-
-#ifndef M_PI
-#define M_PI 3.14159265f
-#endif
-
-#define DEGTORAD(x) ((x * M_PI) / 180.f)
-#define RADTODEG(x) ((180.f * x) / M_PI)
-
-template <class T>
-class Matrix4
-{
-    public:
-        typedef T Type;
-
-    public:
-        static const Matrix4<T> ZERO;
-        static const Matrix4<T> IDENTITY;
-
-    public:
-        Matrix4();
-        Matrix4(const T& v);
-        Matrix4(const Matrix4<T>& m);
-        Matrix4(const T& m_11, const T& m_12, const T& m_13, const T& m_14,
-                const T& m_21, const T& m_22, const T& m_23, const T& m_24,
-                const T& m_31, const T& m_32, const T& m_33, const T& m_34,
-                const T& m_41, const T& m_42, const T& m_43, const T& m_44);
-
-        const T& Get11() const;
-        const T& Get12() const;
-        const T& Get13() const;
-        const T& Get14() const;
-        const T& Get21() const;
-        const T& Get22() const;
-        const T& Get23() const;
-        const T& Get24() const;
-        const T& Get31() const;
-        const T& Get32() const;
-        const T& Get33() const;
-        const T& Get34() const;
-        const T& Get41() const;
-        const T& Get42() const;
-        const T& Get43() const;
-        const T& Get44() const;
-
-        Matrix4<T>& operator=(const Matrix4<T>& m);
-
-        Matrix4<T> operator+(const Matrix4<T>& m) const;
-        const Matrix4<T>& operator+=(const Matrix4<T>& m);
-
-        Matrix4<T> operator-(const Matrix4<T>& m) const;
-        Matrix4<T> operator-() const;
-        const Matrix4<T>& operator-=(const Matrix4<T>& m);
-
-        Matrix4<T> operator*(const Matrix4<T>& m) const;
-        Matrix4<T> operator*(const T& v) const;
-        const Matrix4<T>& operator*=(const Matrix4<T>& m);
-        const Matrix4<T>& operator*=(const T& v);
-
-        Matrix4<T> operator/(const T& v) const;
-        const Matrix4<T>& operator/=(const T& v);
-
-        bool operator==(const Matrix4<T>& m) const;
-        bool operator!=(const Matrix4<T>& m) const;
-
-        void SetZero();
-        void SetIdentity();
-        void SetPerspectiveProjection(const T& fov, const T& aspect, const T& nearPlane, const T& farPlane);
-        void SetOrthographicProjection(const T& left, const T& right, const T& bottom, const T& top, const T& nearPlane, const T& farPlane);
-
-        void SetLookAt(const Vector3<T>& eyePosition, const Vector3<T>& lookAtPosition, Vector3<T> upVector = Vector3<T>(T(0), T(1), T(0)));
-
-        bool IsZero() const;
-        bool IsIdentity() const;
-
-        void ApplyTranslation(const T& x, const T& y, const T& z);
-        void ApplyRotation(const T& angle, const T& x, const T& y, const T& z);
-        void ApplyScale(const T& x, const T& y, const T& z);
-
-        Vector3<T> GetTranslation() const;
-
-        const T* GetInternalValues() const;
-        T* GetInternalValues();
-        std::string ToString(const std::string& lineBegin = "|", const std::string& lineEnd = "|\n") const;
-
-    private:
-        union {
-            // column-major matrix
-            struct
-            {
-                T m_11, m_21, m_31, m_41, m_12, m_22, m_32, m_42, m_13, m_23, m_33, m_43, m_14, m_24, m_34, m_44;
-            };
-            T m_values[16];
-        };
-};
-
-typedef Matrix4<int> Matrix4i;
-typedef Matrix4<float> Matrix4f;
-typedef Matrix4<double> Matrix4d;
-
-template <class T>
-const Matrix4<T> Matrix4<T>::ZERO = Matrix4<T>(0);
-
-template <class T>
-const Matrix4<T> Matrix4<T>::IDENTITY = Matrix4<T>(
-        1, 0, 0, 0,
-        0, 1, 0, 0,
-        0, 0, 1, 0,
-        0, 0, 0, 1);
-
-    template <class T>
-std::ostream& operator<<(std::ostream& out, const Matrix4<T>& m)
-{
-    out << m.ToString();
-    return out;
-}
-
-    template <class T>
-Matrix4<T>::Matrix4()
-{
-    // Leave matrix uninitialized
-}
-
-    template <class T>
-Matrix4<T>::Matrix4(const T& v)
-{
-    for(int i = 0; i < 16; ++i)
-        m_values[i] = v;
-}
-
-    template <class T>
-Matrix4<T>::Matrix4(const Matrix4<T>& m)
-{
-    for(int i = 0; i < 16; ++i)
-        m_values[i] = m.m_values[i];
-}
-
-    template <class T>
-Matrix4<T>::Matrix4(const T& m_11, const T& m_12, const T& m_13, const T& m_14,
-        const T& m_21, const T& m_22, const T& m_23, const T& m_24,
-        const T& m_31, const T& m_32, const T& m_33, const T& m_34,
-        const T& m_41, const T& m_42, const T& m_43, const T& m_44)
-{
-    this->m_11 = m_11;
-    this->m_12 = m_12;
-    this->m_13 = m_13;
-    this->m_14 = m_14;
-    this->m_21 = m_21;
-    this->m_22 = m_22;
-    this->m_23 = m_23;
-    this->m_24 = m_24;
-    this->m_31 = m_31;
-    this->m_32 = m_32;
-    this->m_33 = m_33;
-    this->m_34 = m_34;
-    this->m_41 = m_41;
-    this->m_42 = m_42;
-    this->m_43 = m_43;
-    this->m_44 = m_44;
-}
-
-template <class T>
-const T& Matrix4<T>::Get11() const
-{
-    return m_11;
-}
-
-template <class T>
-const T& Matrix4<T>::Get12() const
-{
-    return m_12;
-}
-
-template <class T>
-const T& Matrix4<T>::Get13() const
-{
-    return m_13;
-}
-
-template <class T>
-const T& Matrix4<T>::Get14() const
-{
-    return m_14;
-}
-
-template <class T>
-const T& Matrix4<T>::Get21() const
-{
-    return m_21;
-}
-
-template <class T>
-const T& Matrix4<T>::Get22() const
-{
-    return m_22;
-}
-
-template <class T>
-const T& Matrix4<T>::Get23() const
-{
-    return m_23;
-}
-
-template <class T>
-const T& Matrix4<T>::Get24() const
-{
-    return m_24;
-}
-
-template <class T>
-const T& Matrix4<T>::Get31() const
-{
-    return m_31;
-}
-
-template <class T>
-const T& Matrix4<T>::Get32() const
-{
-    return m_32;
-}
-
-template <class T>
-const T& Matrix4<T>::Get33() const
-{
-    return m_33;
-}
-
-template <class T>
-const T& Matrix4<T>::Get34() const
-{
-    return m_34;
-}
-
-template <class T>
-const T& Matrix4<T>::Get41() const
-{
-    return m_41;
-}
-
-template <class T>
-const T& Matrix4<T>::Get42() const
-{
-    return m_42;
-}
-
-template <class T>
-const T& Matrix4<T>::Get43() const
-{
-    return m_43;
-}
-
-template <class T>
-const T& Matrix4<T>::Get44() const
-{
-    return m_44;
-}
-
-    template <class T>
-Matrix4<T>& Matrix4<T>::operator=(const Matrix4<T>& m)
-{
-    if(this != &m)
-    {
-        for(int i = 0; i < 16; ++i)
-            m_values[i] = m.m_values[i];
-    }
-
-    return *this;
-}
-
-template <class T>
-Matrix4<T> Matrix4<T>::operator+(const Matrix4<T>& m) const
-{
-    return Matrix4<T>(
-            m_11 + m.m_11, m_12 + m.m_12, m_13 + m.m_13, m_14 + m.m_14,
-            m_21 + m.m_21, m_22 + m.m_22, m_23 + m.m_23, m_24 + m.m_24,
-            m_31 + m.m_31, m_32 + m.m_32, m_33 + m.m_33, m_34 + m.m_34,
-            m_41 + m.m_41, m_42 + m.m_42, m_43 + m.m_43, m_44 + m.m_44);
-}
-
-    template <class T>
-const Matrix4<T>& Matrix4<T>::operator+=(const Matrix4<T>& m)
-{
-    *this = *this + m;
-    return *this;
-}
-
-template <class T>
-Matrix4<T> Matrix4<T>::operator-(const Matrix4<T>& m) const
-{
-    return Matrix4<T>(
-            m_11 - m.m_11, m_12 - m.m_12, m_13 - m.m_13, m_14 - m.m_14,
-            m_21 - m.m_21, m_22 - m.m_22, m_23 - m.m_23, m_24 - m.m_24,
-            m_31 - m.m_31, m_32 - m.m_32, m_33 - m.m_33, m_34 - m.m_34,
-            m_41 - m.m_41, m_42 - m.m_42, m_43 - m.m_43, m_44 - m.m_44);
-}
-
-template <class T>
-Matrix4<T> Matrix4<T>::operator-() const
-{
-    return Matrix4<T>(
-            -m_11, -m_12, -m_13, -m_14,
-            -m_21, -m_22, -m_23, -m_24,
-            -m_31, -m_32, -m_33, -m_34,
-            -m_41, -m_42, -m_43, -m_44);
-}
-
-    template <class T>
-const Matrix4<T>& Matrix4<T>::operator-=(const Matrix4<T>& m)
-{
-    *this = *this - m;
-    return *this;
-}
-
-template <class T>
-Matrix4<T> Matrix4<T>::operator*(const Matrix4<T>& m) const
-{
-    return Matrix4<T>(
-            m_11 * m.m_11 + m_12 * m.m_21 + m_13 * m.m_31 + m_14 * m.m_41,
-            m_11 * m.m_12 + m_12 * m.m_22 + m_13 * m.m_32 + m_14 * m.m_42,
-            m_11 * m.m_13 + m_12 * m.m_23 + m_13 * m.m_33 + m_14 * m.m_43,
-            m_11 * m.m_14 + m_12 * m.m_24 + m_13 * m.m_34 + m_14 * m.m_44,
-
-            m_21 * m.m_11 + m_22 * m.m_21 + m_23 * m.m_31 + m_24 * m.m_41,
-            m_21 * m.m_12 + m_22 * m.m_22 + m_23 * m.m_32 + m_24 * m.m_42,
-            m_21 * m.m_13 + m_22 * m.m_23 + m_23 * m.m_33 + m_24 * m.m_43,
-            m_21 * m.m_14 + m_22 * m.m_24 + m_23 * m.m_34 + m_24 * m.m_44,
-
-            m_31 * m.m_11 + m_32 * m.m_21 + m_33 * m.m_31 + m_34 * m.m_41,
-            m_31 * m.m_12 + m_32 * m.m_22 + m_33 * m.m_32 + m_34 * m.m_42,
-            m_31 * m.m_13 + m_32 * m.m_23 + m_33 * m.m_33 + m_34 * m.m_43,
-            m_31 * m.m_14 + m_32 * m.m_24 + m_33 * m.m_34 + m_34 * m.m_44,
-
-            m_41 * m.m_11 + m_42 * m.m_21 + m_43 * m.m_31 + m_44 * m.m_41,
-            m_41 * m.m_12 + m_42 * m.m_22 + m_43 * m.m_32 + m_44 * m.m_42,
-            m_41 * m.m_13 + m_42 * m.m_23 + m_43 * m.m_33 + m_44 * m.m_43,
-            m_41 * m.m_14 + m_42 * m.m_24 + m_43 * m.m_34 + m_44 * m.m_44);
-}
-
-template <class T>
-Matrix4<T> Matrix4<T>::operator*(const T& v) const
-{
-    return Matrix4<T>(
-            m_11 * v, m_12 * v, m_13 * v, m_14 * v,
-            m_21 * v, m_22 * v, m_23 * v, m_24 * v,
-            m_31 * v, m_32 * v, m_33 * v, m_34 * v,
-            m_41 * v, m_42 * v, m_43 * v, m_44 * v);
-}
-
-    template <class T>
-const Matrix4<T>& Matrix4<T>::operator*=(const Matrix4<T>& m)
-{
-    *this = *this * m;
-    return *this;
-}
-
-    template <class T>
-const Matrix4<T>& Matrix4<T>::operator*=(const T& v)
-{
-    *this = *this * v;
-    return *this;
-}
-
-template <class T>
-Matrix4<T> Matrix4<T>::operator/(const T& v) const
-{
-    return Matrix4<T>(
-            m_11 / v, m_12 / v, m_13 / v, m_14 / v,
-            m_21 / v, m_22 / v, m_23 / v, m_24 / v,
-            m_31 / v, m_32 / v, m_33 / v, m_34 / v,
-            m_41 / v, m_42 / v, m_43 / v, m_44 / v);
-}
-
-    template <class T>
-const Matrix4<T>& Matrix4<T>::operator/=(const T& v)
-{
-    *this = *this / v;
-    return *this;
-}
-
-template <class T>
-bool Matrix4<T>::operator==(const Matrix4<T>& m) const
-{
-    for(int i = 0; i < 16; ++i)
-        if(m_values[i] != m.m_values[i])
-            return false;
-
-    return true;
-}
-
-template <class T>
-bool Matrix4<T>::operator!=(const Matrix4<T>& m) const
-{
-    return !(*this == m);
-}
-
-    template <class T>
-void Matrix4<T>::SetZero()
-{
-    *this = ZERO;
-}
-
-    template <class T>
-void Matrix4<T>::SetIdentity()
-{
-    *this = IDENTITY;
-}
-
-    template <class T>
-void Matrix4<T>::SetPerspectiveProjection(const T& fov, const T& aspect, const T& nearPlane, const T& farPlane)
-{
-    const float h = T(1) / tan(fov * T(M_PI / 360.f));
-    T negDepth = nearPlane - farPlane;
-
-    SetZero();
-
-    m_11 = h / aspect;
-    m_22 = h;
-    m_33 = (farPlane + nearPlane) / negDepth;
-    m_34 = T(2) * (nearPlane * farPlane) / negDepth;
-    m_43 = -T(1);
-}
-
-    template <class T>
-void Matrix4<T>::SetOrthographicProjection(const T& left, const T& right, const T& bottom, const T& top, const T& nearPlane, const T& farPlane)
-{
-    m_11 = T(2) / (right - left);
-    m_12 = T(0);
-    m_13 = T(0);
-    m_14 = -(right + left) / (right - left);
-
-    m_21 = T(0);
-    m_22 = T(2) / (top - bottom);
-    m_23 = T(0);
-    m_24 = -(top + bottom) / (top - bottom);
-
-    m_31 = T(0);
-    m_32 = T(0);
-    m_33 = -T(2) / (farPlane - nearPlane);
-    m_34 = -(farPlane + nearPlane) / (farPlane - nearPlane);
-
-    m_41 = T(0);
-    m_42 = T(0);
-    m_43 = T(0);
-    m_44 = T(1);
-}
-
-    template <class T>
-void Matrix4<T>::SetLookAt(const Vector3<T>& eyePosition, const Vector3<T>& lookAtPosition, Vector3<T> upVector)
-{
-    Vector3f L = lookAtPosition - eyePosition;
-    L.Normalize();
-
-    upVector.Normalize();
-    Vector3f S = L.Cross(upVector);
-    S.Normalize();
-
-    Vector3f U = S.Cross(L);
-
-    Matrix4<T> M;
-    M.m_11 = S.x;
-    M.m_12 = S.y;
-    M.m_13 = S.z;
-    M.m_14 = 0;
-
-    M.m_21 = U.x;
-    M.m_22 = U.y;
-    M.m_23 = U.z;
-    M.m_24 = 0;
-
-    M.m_31 = -L.x;
-    M.m_32 = -L.y;
-    M.m_33 = -L.z;
-    M.m_34 = 0;
-
-    M.m_41 = 0;
-    M.m_42 = 0;
-    M.m_43 = 0;
-    M.m_44 = 1.f;
-
-    SetIdentity();
-    *this *= M;
-    ApplyTranslation(-eyePosition.x, -eyePosition.y, -eyePosition.z);
-}
-
-    template <class T>
-void Matrix4<T>::ApplyTranslation(const T& x, const T& y, const T& z)
-{
-    Matrix4<T> tmp(
-            1, 0, 0, x,
-            0, 1, 0, y,
-            0, 0, 1, z,
-            0, 0, 0, 1);
-
-    *this *= tmp;
-}
-
-    template <class T>
-void Matrix4<T>::ApplyRotation(const T& angle, const T& x, const T& y, const T& z)
-{
-    // TODO axis (x, y, z) must be normalized...
-
-    T s = sin(DEGTORAD(angle));
-    T c = cos(DEGTORAD(angle));
-    T ic = T(1) - c;
-
-    Matrix4<T> tmp(
-            x * x * ic + c, y * x * ic + (z * s), z * x * ic - (y * s), 0,
-            x * y * ic - (z * s), y * y * ic + c, z * y * ic + (x * s), 0,
-            x * z * ic + (y * s), y * z * ic - (x * s), z * z * ic + c, 0,
-            0, 0, 0, 1);
-
-    *this *= tmp;
-}
-
-    template <class T>
-void Matrix4<T>::ApplyScale(const T& x, const T& y, const T& z)
-{
-    Matrix4<T> tmp(
-            x, 0, 0, 0,
-            0, y, 0, 0,
-            0, 0, z, 0,
-            0, 0, 0, 1);
-
-    *this *= tmp;
-}
-
-template <class T>
-Vector3<T> Matrix4<T>::GetTranslation() const
-{
-    // NOTE: Works only if the matrix doesn't contains scale information (only rotation and translation)
-    // Reference: http://www.gamedev.net/topic/397751-how-to-get-camera-position/
-    T x = -(m_11 * m_14 + m_21 * m_24 + m_31 * m_34);
-    T y = -(m_12 * m_14 + m_22 * m_24 + m_32 * m_34);
-    T z = -(m_13 * m_14 + m_23 * m_24 + m_33 * m_34);
-
-    return Vector3<T>(x, y, z);
-}
-
-    template <class T>
-T* Matrix4<T>::GetInternalValues()
-{
-    return m_values;
-}
-
-template <class T>
-const T* Matrix4<T>::GetInternalValues() const
-{
-    return m_values;
-}
-
-template <class T>
-std::string Matrix4<T>::ToString(const std::string& lineBegin, const std::string& lineEnd) const
-{
-    std::ostringstream ss;
-    ss << lineBegin << m_11 << " " << m_12 << " " << m_13 << " " << m_14 << lineEnd;
-    ss << lineBegin << m_21 << " " << m_22 << " " << m_23 << " " << m_24 << lineEnd;
-    ss << lineBegin << m_31 << " " << m_32 << " " << m_33 << " " << m_34 << lineEnd;
-    ss << lineBegin << m_41 << " " << m_42 << " " << m_43 << " " << m_44 << lineEnd;
-
-    return ss.str();
-}
-
-#endif // MATRIX4_H__

SQCSim2021/opensimplex.h

@@ -1,51 +0,0 @@
-/**
-  Open Simple Noise for C++
-
-  Port to C++ from https://gist.github.com/KdotJPG/b1270127455a94ac5d19
-  by Rickard Lundberg, 2019.
-*/
-#ifndef _OPENSIMPLEX_H__
-#define _OPENSIMPLEX_H__
-
-#include <cstdint>
-#include <array>
-
-namespace OpenSimplexNoise
-{
-  class Noise
-  {
-  public:
-    Noise();
-    Noise(int64_t seed);
-    //2D Open Simplex Noise.
-    double eval(const double x, const double y) const;
-    //3D Open Simplex Noise.
-    double eval(double x, double y, double z) const;
-    //4D Open Simplex Noise.
-    double eval(double x, double y, double z, double w) const;
-  private:
-    const double m_stretch2d;
-    const double m_squish2d;
-    const double m_stretch3d;
-    const double m_squish3d;
-    const double m_stretch4d;
-    const double m_squish4d;
-
-    const double m_norm2d;
-    const double m_norm3d;
-    const double m_norm4d;
-
-    const long m_defaultSeed;
-
-    std::array<short, 256> m_perm;
-    std::array<short, 256> m_permGradIndex3d;
-    std::array<char, 16> m_gradients2d;
-    std::array<char, 72> m_gradients3d;
-    std::array<char, 256> m_gradients4d;
-    double extrapolate(int xsb, int ysb, double dx, double dy) const;
-    double extrapolate(int xsb, int ysb, int zsb, double dx, double dy, double dz) const;
-    double extrapolate(int xsb, int ysb, int zsb, int wsb, double dx, double dy, double dz, double dw) const;
-  };
-}
-
-#endif // _OPENSIMPLEX_H__

SQCSim2021/player.h

@@ -1,6 +1,6 @@
-#ifndef _PLAYER_H__
+#ifndef CLI_PLAYER_H__
-#define _PLAYER_H__
+#define CLI_PLAYER_H__
-#include "vector3.h"
+#include "../SQCSim-common/vector3.h"
 #include "transformation.h"
 #include "audio.h"
 #include <cmath>

SQCSim2021/transformation.h

@@ -1,9 +1,10 @@
 #ifndef TRANSFORMATION_H__
 #define TRANSFORMATION_H__
 
-#include "matrix4.h"
-#include "vector3.h"
 #include <stack>
+#include "../SQCSim-common/matrix4.h"
+#include "../SQCSim-common/vector3.h"
+#include "define.h"
 
 class Transformation
 {

SQCSim2021/vector3.h

@@ -1,219 +0,0 @@
-#ifndef VECTOR3_H__
-#define VECTOR3_H__
-
-#include <iostream>
-#include <cmath>
-
-template <class T>
-class Vector3
-{
-public:
-	Vector3();
-	Vector3(const T& x, const T& y, const T& z);
-	~Vector3();
-
-	T Length() const;
-	void Normalize();
-	void Zero();
-
-	T Dot(const Vector3<T>& v) const;
-	Vector3<T> Cross(const Vector3<T>& v) const;
-
-	Vector3<T> operator+(const Vector3<T>& v) const;
-	Vector3<T> operator-(const Vector3<T>& v) const;
-	Vector3<T> operator-() const;
-	Vector3<T> operator+(const T& v) const;
-	Vector3<T> operator-(const T& v) const;
-	Vector3<T> operator/(const T& v) const;
-	Vector3<T> operator*(const T& v) const;
-
-	Vector3<T>& operator=(const Vector3<T>& v);
-
-	Vector3<T>& operator+=(const Vector3<T>& v);
-	Vector3<T>& operator-=(const Vector3<T>& v);
-	Vector3<T>& operator+=(const T& v);
-	Vector3<T>& operator-=(const T& v);
-	Vector3<T>& operator/=(const T& v);
-	Vector3<T>& operator*=(const T& v);
-
-	bool operator==(const Vector3<T>& v) const;
-	bool operator!=(const Vector3<T>& v) const;
-
-	void Afficher() const;
-
-public:
-	T x, y, z;
-};
-
-typedef Vector3<int> Vector3i;
-typedef Vector3<float> Vector3f;
-
-template <class T>
-inline std::ostream& operator<<(std::ostream& out, const Vector3<T>& v)
-{
-	out << "[" << v.x << ", " << v.y << ", " << v.z << "]";
-    return out;
-}
-
-
-template <class T>
-Vector3<T>::Vector3()
-{
-}
-
-template <class T>
-Vector3<T>::Vector3(const T& x, const T& y, const T& z) : x(x), y(y), z(z)
-{
-}
-
-template <class T>
-Vector3<T>::~Vector3()
-{
-}
-
-template <class T>
-T Vector3<T>::Length() const
-{
-	return sqrt(x*x + y*y + z*z);
-}
-
-template <class T>
-void Vector3<T>::Normalize()
-{
-	T len = Length();
-	if (len != 0)
-	{
-		x /= len;
-		y /= len;
-		z /= len;
-	}
-}
-
-template <class T>
-void Vector3<T>::Zero()
-{
-	x = y = z = 0;
-}
-
-template <class T>
-T Vector3<T>::Dot(const Vector3<T>& v) const
-{
-	return (x * v.x) + (y * v.y) + (z * v.z);
-}
-
-template <class T>
-Vector3<T> Vector3<T>::Cross(const Vector3<T>& v) const
-{
-	return Vector3<T>(
-		y * v.z - v.y * z,
-		z * v.x - v.z * x,
-		x * v.y - v.x * y);
-}
-
-template <class T>
-Vector3<T> Vector3<T>::operator+(const Vector3<T>& v) const
-{
-	return Vector3<T>(x + v.x, y + v.y, z + v.z);
-}
-
-template <class T>
-Vector3<T> Vector3<T>::operator-(const Vector3<T>& v) const
-{
-	return Vector3<T>(x - v.x, y - v.y, z - v.z);
-}
-
-template <class T>
-Vector3<T> Vector3<T>::operator-() const
-{
-	return Vector3<T>(-x, -y, -z);
-}
-
-template <class T>
-Vector3<T> Vector3<T>::operator+(const T& v) const
-{
-	return Vector3<T>(x + v, y + v, z + v);
-}
-
-template <class T>
-Vector3<T> Vector3<T>::operator-(const T& v) const
-{
-	return Vector3<T>(x - v, y - v, z - v);
-}
-
-template <class T>
-Vector3<T> Vector3<T>::operator/(const T& v) const
-{
-	return Vector3<T>(x / v, y / v, z / v);
-}
-
-template <class T>
-Vector3<T> Vector3<T>::operator*(const T& v) const
-{
-	return Vector3<T>(x * v, y * v, z * v);
-}
-
-template <class T>
-Vector3<T>& Vector3<T>::operator=(const Vector3<T>& v)
-{
-	x = v.x;
-	y = v.y;
-	z = v.z;
-	return *this;
-}
-
-template <class T>
-Vector3<T>& Vector3<T>::operator+=(const Vector3<T>& v)
-{
-	return (*this = *this + v);
-}
-
-template <class T>
-Vector3<T>& Vector3<T>::operator-=(const Vector3<T>& v)
-{
-	return (*this = *this - v);
-}
-
-template <class T>
-Vector3<T>& Vector3<T>::operator+=(const T& v)
-{
-	return (*this = *this + v);
-}
-
-template <class T>
-Vector3<T>& Vector3<T>::operator-=(const T& v)
-{
-	return (*this = *this - v);
-}
-
-template <class T>
-Vector3<T>& Vector3<T>::operator/=(const T& v)
-{
-	return (*this = *this / v);
-}
-
-template <class T>
-Vector3<T>& Vector3<T>::operator*=(const T& v)
-{
-	return (*this = *this * v);
-}
-
-template <class T>
-bool Vector3<T>::operator==(const Vector3<T>& v) const
-{
-	return (x == v.x && y == v.y && z == v.z);
-}
-
-template <class T>
-bool Vector3<T>::operator!=(const Vector3<T>& v) const
-{
-	return !(*this == v);
-}
-
-template <class T>
-void Vector3<T>::Afficher() const
-{
-	std::cout << "[" << x << ", " << y << ", " << z << "]" << std::endl;
-}
-
-
-#endif // VECTOR3_H__

SQCSim2021/vertexbuffer.h

@@ -1,8 +1,8 @@
 #ifndef VERTEXBUFFER_H__
 #define VERTEXBUFFER_H__
 
-#include "define.h"
 #include <mutex>
+#include "define.h"
 
 class VertexBuffer
 {

SQCSim2021/world.cpp

@@ -6,6 +6,10 @@ World::~World() {}
 
 Array2d<Chunk*>& World::GetChunks() { return m_chunks; }
 
+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;
@@ -330,7 +334,12 @@ void World::UpdateWorld(Player& player, BlockInfo* blockinfo[BTYPE_LAST]) {
 				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) { return new Chunk(x, y); }, chx / CHUNK_SIZE_X + m_center[0], chy / CHUNK_SIZE_Z + m_center[1]);
+					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) {
@@ -340,7 +349,12 @@ void World::UpdateWorld(Player& player, BlockInfo* blockinfo[BTYPE_LAST]) {
 				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) { return new Chunk(x, y); }, chx / CHUNK_SIZE_X + m_center[0], chy / CHUNK_SIZE_Z + m_center[1]);
+					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) {
@@ -350,7 +364,12 @@ void World::UpdateWorld(Player& player, BlockInfo* blockinfo[BTYPE_LAST]) {
 				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) { return new Chunk(x, y); }, chx / CHUNK_SIZE_X + m_center[0], chy / CHUNK_SIZE_Z + m_center[1]);
+					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) {
@@ -360,7 +379,12 @@ void World::UpdateWorld(Player& player, BlockInfo* blockinfo[BTYPE_LAST]) {
 				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) { return new Chunk(x, y); }, chx / CHUNK_SIZE_X + m_center[0], chy / CHUNK_SIZE_Z + m_center[1]);
+					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)

SQCSim2021/world.h

@@ -5,14 +5,14 @@
 #include <vector>
 #include <future>
 #include <thread>
+#include "../SQCSim-common/vector3.h"
+#include "../SQCSim-common/array2d.h"
+#include "../SQCSim-common/bullet.h"
 #include "define.h"
-#include "chunk.h"
-#include "array2d.h"
-#include "vector3.h"
 #include "player.h"
+#include "chunk.h"
 #include "transformation.h"
 #include "shader.h"
-#include "bullet.h"
 #include "textureatlas.h"
 
 class Chunk;
@@ -26,6 +26,8 @@ public:
 
 	Array2d<Chunk*>& GetChunks();
 
+	void SetSeed(uint64_t seed);
+
 	Chunk* ChunkAt(float x, float y, float z) const;
 	Chunk* ChunkAt(const Vector3f& pos) const;
 
@@ -43,6 +45,7 @@ public:
 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 };